Merge branch 'master' into 'IT19242996'

Master

See merge request !38

TravelTimePrediction/TravelTimePredictionNN.py

@@ -200,9 +200,9 @@ Distance =14.7 #Distance data come from seminas ----- data come from the Seminas
 #   callTimePrediction arguments should be dis, stops, hour, day
 
 # Get Prediction USing this Method after Seminas Calling
-def CallTimePrediction(distance,BuStops,TodayDate):
+def CallTimePrediction(distance,BuStops,hours,TodayDate):
         FnewDate = GetDateCode(TodayDate)
-        GetPrediction(time,FnewDate,special,Congestion,drivingspeedAVG,BuStops,weather,distance)
+        GetPrediction(hours,FnewDate,special,Congestion,drivingspeedAVG,BuStops,weather,distance)
 
 
 

app/src/main/java/com/app/travelle/Signup.java

@@ -2,11 +2,16 @@ package com.app.travelle;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 import android.view.WindowManager;
+import android.widget.Button;
 
 public class Signup extends AppCompatActivity {
-
+    private Button direct_to_login;
+    @SuppressLint("MissingInflatedId")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -14,5 +19,17 @@ public class Signup extends AppCompatActivity {
         this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
         getSupportActionBar().hide();
         setContentView(R.layout.activity_signup);
+
+        direct_to_login = (Button) findViewById(R.id.login_direct);
+        direct_to_login.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                direct_toLogin();
+            }
+        });
+    }
+    public void direct_toLogin(){
+        Intent intent = new Intent(this, Login.class);
+        startActivity(intent);
     }
 }
\ No newline at end of file

app/src/main/res/layout/activity_signup.xml

@@ -206,7 +206,7 @@
         app:layout_constraintStart_toStartOf="parent" />
 
     <Button
-        android:id="@+id/signup"
+        android:id="@+id/login_direct"
         android:layout_width="165dp"
         android:layout_height="49dp"
         android:layout_marginStart="204dp"

app/src/main/res/layout/activity_welcome.xml

@@ -6,85 +6,5 @@
     android:layout_height="match_parent"
     tools:context=".Welcome">
 
-    <!--
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/search_destination"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="340dp"
-        android:layout_height="59dp"
-        android:layout_marginStart="25dp"
-        android:layout_marginTop="230dp"
-        android:textColorHint="@color/white"
-        app:boxBackgroundColor="#0018A1"
-        app:boxCornerRadiusBottomEnd="60px"
-        app:boxCornerRadiusBottomStart="60px"
-        app:boxCornerRadiusTopEnd="60px"
-        app:boxCornerRadiusTopStart="60px"
-        app:boxStrokeColor="@color/white"
-        app:endIconMode="clear_text"
-        app:endIconTint="#FFFFFF"
-        app:layout_constraintBottom_toBottomOf="parent"
-
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.48000002"
-        app:startIconTint="@color/white">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/sans_bold"
-            android:hint="Where to?" />
-
-    </com.google.android.material.textfield.TextInputLayout>
--->
-
-    <ImageView
-        android:id="@+id/imageView10"
-        android:layout_width="508dp"
-        android:layout_height="297dp"
-        android:layout_marginStart="-60dp"
-        android:layout_marginTop="572dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/rectangle_16" />
-
-    <Button
-        android:id="@+id/button2"
-        android:layout_width="165dp"
-        android:layout_height="70dp"
-        android:layout_marginStart="120dp"
-        android:layout_marginBottom="16dp"
-        android:backgroundTint="#262730"
-        android:text="FIND "
-        android:textSize="60px"
-        app:cornerRadius="60px"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <ImageView
-        android:id="@+id/imageView7"
-        android:layout_width="340dp"
-        android:layout_height="59dp"
-        android:layout_marginStart="-50dp"
-        android:layout_marginBottom="520dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:srcCompat="@drawable/component_2__1" />
-
-    <AutoCompleteTextView
-        android:id="@+id/autoCompleteTextView"
-        android:layout_width="340dp"
-        android:layout_height="59dp"
-        android:layout_marginStart="32dp"
-        android:layout_marginBottom="12dp"
-        android:background="#FFFFFF"
-        android:completionThreshold="3"
-        android:text="Where to"
-
-        android:textAlignment="center"
-
-        app:layout_constraintBottom_toTopOf="@+id/button2"
-        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

pathplanner/AL.py

@@ -286,7 +286,7 @@ def main( val, start, destination):
     CallTimePrediction(dist,len(path),(dateTime.hour),(dateTime.strftime('%A')))
 
 
-main( 1, 8, 18)  
+main( 1, 0, 8)