linly/WITL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored login, fixed skip and variable names

Browse Source
This commit is contained in:
Aura Farmer
2023-12-20 10:32:38 +02:00
parent 5979ccc5ef
commit b16f330ceb
7 changed files with 98 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/example/myapp_1/GetStart1Activity.java
View File

@@ -26,7 +26,7 @@ public class GetStart1Activity extends AppCompatActivity {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
Intent newScreen = new Intent(getApplicationContext(), GetStart2Activity.class); Intent newScreen = new Intent(getApplicationContext(), LoginActivity.class);
startActivity(newScreen); startActivity(newScreen);
} }
}); });

4
app/src/main/java/com/example/myapp_1/HomeActivity.java
View File

@@ -3,7 +3,6 @@ package com.example.myapp_1;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
@@ -21,7 +20,7 @@ public class HomeActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_home); setContentView(R.layout.activity_home);
BottomNavigationView bottomNavigationView = findViewById(R.id.bottomview); BottomNavigationView bottomNavigationView = findViewById(R.id.homeBottomView);
bottomNavigationView.setOnNavigationItemSelectedListener( bottomNavigationView.setOnNavigationItemSelectedListener(
new BottomNavigationView.OnNavigationItemSelectedListener() { new BottomNavigationView.OnNavigationItemSelectedListener() {
@Override @Override
@@ -43,6 +42,7 @@ public class HomeActivity extends AppCompatActivity {
return true; return true;
} }
}); });
} }
} }

16
app/src/main/java/com/example/myapp_1/LoginActivity.java
View File

@@ -30,17 +30,17 @@ public class LoginActivity extends AppCompatActivity {
username = findViewById(R.id.editTextText); username = findViewById(R.id.editTextText);
password = findViewById(R.id.editTextTextPassword); password = findViewById(R.id.editTextTextPassword);
forgetpassword = findViewById(R.id.forgetpass); // forgetpassword = findViewById(R.id.forgetpass);
login = findViewById(R.id.button); login = findViewById(R.id.button);
signup = findViewById(R.id.button2); signup = findViewById(R.id.button2);
guestLogin= findViewById(R.id.button3); guestLogin= findViewById(R.id.button3);
forgetpassword.setOnClickListener(new View.OnClickListener() { // forgetpassword.setOnClickListener(new View.OnClickListener() {
@Override // @Override
public void onClick(View v) { // public void onClick(View v) {
Intent newScreen = new Intent(getApplicationContext(), PasswordResetActivity.class); // Intent newScreen = new Intent(getApplicationContext(), PasswordResetActivity.class);
startActivity(newScreen); // startActivity(newScreen);
} // }
}); // });
signup.setOnClickListener(new View.OnClickListener() { signup.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

10
app/src/main/res/layout/activity_home.xml
View File

@@ -7,7 +7,7 @@
<com.google.android.material.bottomnavigation.BottomNavigationView <com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottomview" android:id="@+id/homeBottomView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/material_dynamic_primary60" android:background="@color/material_dynamic_primary60"
@@ -30,7 +30,7 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar2" android:id="@+id/homeToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/material_dynamic_primary60" android:background="@color/material_dynamic_primary60"
@@ -44,7 +44,7 @@
app:titleCentered="true" /> app:titleCentered="true" />
<TextView <TextView
android:id="@+id/textView3" android:id="@+id/userGreeting"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
@@ -65,11 +65,11 @@
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:text="Predict your tram arrival time at any station!" android:text="Predict your tram arrival time at any station!"
android:textSize="18dp" android:textSize="18dp"
app:layout_constraintBottom_toTopOf="@+id/bottomview" app:layout_constraintBottom_toTopOf="@+id/homeBottomView"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView3" app:layout_constraintTop_toBottomOf="@+id/userGreeting"
app:layout_constraintVertical_bias="0.296" /> app:layout_constraintVertical_bias="0.296" />

170
app/src/main/res/layout/activity_login.xml
View File

@@ -5,107 +5,85 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView <LinearLayout
android:id="@+id/imageView" android:layout_width="match_parent"
android:layout_width="222dp" android:layout_height="match_parent"
android:layout_height="194dp" android:orientation="vertical">
android:layout_marginTop="52dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/train_image_3" />
<EditText <ImageView
android:id="@+id/editTextText" android:id="@+id/imageView"
android:layout_width="372dp" android:layout_gravity="center"
android:layout_height="60dp" android:layout_width="222dp"
android:layout_marginTop="44dp" android:layout_height="194dp"
android:drawableStart="@drawable/baseline_person" android:layout_marginTop="52dp"
android:drawablePadding="16dp" app:srcCompat="@drawable/train_image_3" />
android:ems="10"
android:hint="Username"
android:inputType="text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.487"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView" />
<EditText <EditText
android:id="@+id/editTextTextPassword" android:id="@+id/editTextText"
android:layout_width="372dp" android:layout_gravity="center"
android:layout_height="60dp" android:layout_width="372dp"
android:layout_marginTop="28dp" android:layout_height="60dp"
android:drawableStart="@drawable/baseline_lock" android:layout_marginTop="44dp"
android:drawablePadding="16dp" android:drawableStart="@drawable/baseline_person"
android:ems="10" android:drawablePadding="16dp"
android:hint="Password" android:ems="10"
android:inputType="textPassword" android:hint="Username"
app:layout_constraintEnd_toEndOf="parent" android:inputType="text" />
app:layout_constraintHorizontal_bias="0.487"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/editTextText" />
<TextView <EditText
android:id="@+id/forgetpass" android:id="@+id/editTextTextPassword"
android:layout_width="140dp" android:layout_width="372dp"
android:layout_height="31dp" android:layout_height="60dp"
android:layout_marginTop="24dp" android:layout_marginTop="28dp"
android:gravity="center" android:drawableStart="@drawable/baseline_lock"
android:text="Forog Password?" android:layout_gravity="center"
android:textColor="#000000" android:drawablePadding="16dp"
android:textStyle="bold" android:ems="10"
app:layout_constraintEnd_toEndOf="parent" android:hint="Password"
app:layout_constraintHorizontal_bias="0.498" android:inputType="textPassword" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword" />
<Button <Button
android:id="@+id/button" android:id="@+id/button"
style="@android:style/Widget.Material.Button.Inset" style="@android:style/Widget.Material.Button.Inset"
android:layout_width="372dp" android:layout_width="311dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_marginTop="24dp" android:layout_gravity="center"
android:background="#2155F3" android:layout_marginTop="30dp"
android:text="Login" android:background="#2155F3"
android:textColorHint="#2155F3" android:text="Login"
app:iconTint="#2155F3" android:textColorHint="#2155F3"
app:layout_constraintEnd_toEndOf="parent" app:iconTint="#2155F3"
app:layout_constraintHorizontal_bias="0.41" app:rippleColor="#2155F3" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/forgetpass"
app:rippleColor="#2155F3" />
<Button <LinearLayout
android:id="@+id/button2" android:layout_width="309dp"
style="@style/Widget.MaterialComponents.Button.UnelevatedButton" android:layout_height="125dp"
android:layout_width="372dp" android:layout_gravity="center"
android:layout_height="60dp" android:orientation="horizontal">
android:layout_marginTop="20dp"
android:background="#2155F3"
android:backgroundTint="#2155F3"
android:text="SignUp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.407"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button"
app:layout_constraintVertical_bias="0.0" />
<Button
android:id="@+id/button3" <Button
style="@style/Widget.MaterialComponents.Button.UnelevatedButton" android:id="@+id/button3"
android:layout_width="372dp" style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:layout_height="60dp" android:layout_width="150dp"
android:layout_marginTop="20dp" android:layout_height="60dp"
android:background="#2155F3" android:layout_gravity="center"
android:backgroundTint="#2155F3" android:layout_marginTop="20dp"
android:text="Guest Login" android:background="#2155F3"
app:layout_constraintBottom_toBottomOf="parent" android:backgroundTint="#2155F3"
app:layout_constraintEnd_toEndOf="parent" android:text="Guest Login" />
app:layout_constraintHorizontal_bias="0.41"
app:layout_constraintStart_toStartOf="parent" <Button
app:layout_constraintTop_toBottomOf="@+id/button" android:id="@+id/button2"
app:layout_constraintVertical_bias="0.278" /> style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:layout_width="150dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:background="#2155F3"
android:backgroundTint="#2155F3"
android:text="SignUp" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/activity_notification.xml
View File

@@ -6,7 +6,7 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.google.android.material.bottomnavigation.BottomNavigationView <com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottomview2" android:id="@+id/notifBottomView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/material_dynamic_primary60" android:background="@color/material_dynamic_primary60"
@@ -34,7 +34,7 @@
<ListView <ListView
android:layout_width="409dp" android:layout_width="409dp"
android:layout_height="471dp" android:layout_height="471dp"
app:layout_constraintBottom_toTopOf="@+id/bottomview2" app:layout_constraintBottom_toTopOf="@+id/notifBottomView"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

12
app/src/main/res/layout/activity_predict.xml
View File

@@ -85,7 +85,7 @@
app:layout_constraintTop_toBottomOf="@+id/editTextText2" /> app:layout_constraintTop_toBottomOf="@+id/editTextText2" />
<TextView <TextView
android:id="@+id/textView3" android:id="@+id/userGreeting"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Arrival Time:" android:text="Arrival Time:"
@@ -115,10 +115,10 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:contentDescription="arrival_carton_icon" android:contentDescription="arrival_carton_icon"
android:src="@drawable/arrival_carton_icon" android:src="@drawable/arrival_carton_icon"
app:layout_constraintEnd_toEndOf="@+id/textView3" app:layout_constraintEnd_toEndOf="@+id/userGreeting"
app:layout_constraintHorizontal_bias="0.176" app:layout_constraintHorizontal_bias="0.176"
app:layout_constraintStart_toEndOf="@+id/arrval_bus_icon" app:layout_constraintStart_toEndOf="@+id/arrval_bus_icon"
app:layout_constraintTop_toBottomOf="@+id/textView3" /> app:layout_constraintTop_toBottomOf="@+id/userGreeting" />
<TextView <TextView
android:id="@+id/predicted_time" android:id="@+id/predicted_time"
@@ -129,10 +129,10 @@
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:text="@string/predicted_time_string" android:text="@string/predicted_time_string"
android:textSize="13sp" android:textSize="13sp"
app:layout_constraintEnd_toEndOf="@+id/textView3" app:layout_constraintEnd_toEndOf="@+id/userGreeting"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/arrival_carton_icon" app:layout_constraintStart_toStartOf="@+id/arrival_carton_icon"
app:layout_constraintTop_toBottomOf="@+id/textView3" /> app:layout_constraintTop_toBottomOf="@+id/userGreeting" />
<TextView <TextView
android:id="@+id/textView4" android:id="@+id/textView4"
@@ -142,7 +142,7 @@
android:text="Station" android:text="Station"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.602" app:layout_constraintHorizontal_bias="0.602"
app:layout_constraintStart_toEndOf="@+id/textView3" app:layout_constraintStart_toEndOf="@+id/userGreeting"
app:layout_constraintTop_toBottomOf="@+id/button4" /> app:layout_constraintTop_toBottomOf="@+id/button4" />
<ProgressBar <ProgressBar