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

Merge pull request #7 from LinlyBoi/data

Browse Source 
Minor UI fixes
This commit is contained in:
Linly
2023-12-20 10:36:51 +02:00
committed by GitHub
parent ed67063f3d b16f330ceb
commit b8da1da801
10 changed files with 117 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle.kts
View File

@@ -34,6 +34,9 @@ dependencies {
implementation("com.google.android.material:material:1.10.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("com.google.android.gms:play-services-maps:18.2.0")
implementation("com.google.code.gson:gson:2.10.1")
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
implementation("com.squareup.retrofit2:retrofit:2.9.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")

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

@@ -26,7 +26,7 @@ public class GetStart1Activity extends AppCompatActivity {
@Override
public void onClick(View view) {
Intent newScreen = new Intent(getApplicationContext(), GetStart2Activity.class);
Intent newScreen = new Intent(getApplicationContext(), LoginActivity.class);
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.os.Bundle;
import android.view.MenuItem;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
@@ -21,7 +20,7 @@ public class HomeActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_home);
BottomNavigationView bottomNavigationView = findViewById(R.id.bottomview);
BottomNavigationView bottomNavigationView = findViewById(R.id.homeBottomView);
bottomNavigationView.setOnNavigationItemSelectedListener(
new BottomNavigationView.OnNavigationItemSelectedListener() {
@Override
@@ -43,6 +42,7 @@ public class HomeActivity extends AppCompatActivity {
return true;
}
});
}
}

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

@@ -19,7 +19,10 @@ public class LoginActivity extends AppCompatActivity {
TextView forgetpassword;
Button login;
Button signup;
DBOperations dbOperations = new DBOperations(this);
Button guestLogin;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -27,17 +30,17 @@ public class LoginActivity extends AppCompatActivity {
username = findViewById(R.id.editTextText);
password = findViewById(R.id.editTextTextPassword);
forgetpassword = findViewById(R.id.forgetpass);
// forgetpassword = findViewById(R.id.forgetpass);
login = findViewById(R.id.button);
signup = findViewById(R.id.button2);
forgetpassword.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent newScreen = new Intent(getApplicationContext(), PasswordResetActivity.class);
startActivity(newScreen);
}
});
guestLogin= findViewById(R.id.button3);
// forgetpassword.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// Intent newScreen = new Intent(getApplicationContext(), PasswordResetActivity.class);
// startActivity(newScreen);
// }
// });
signup.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -45,6 +48,16 @@ public class LoginActivity extends AppCompatActivity {
startActivity(newScreen);
}
});
guestLogin.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View v) {
Intent newScreen = new Intent(getApplicationContext(), HomeActivity.class);
startActivity(newScreen);
}
});
login.setOnClickListener(new View.OnClickListener() {
@Override
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
android:id="@+id/bottomview"
android:id="@+id/homeBottomView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/material_dynamic_primary60"
@@ -30,7 +30,7 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar2"
android:id="@+id/homeToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/material_dynamic_primary60"
@@ -44,7 +44,7 @@
app:titleCentered="true" />
<TextView
android:id="@+id/textView3"
android:id="@+id/userGreeting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
@@ -65,11 +65,11 @@
android:layout_marginLeft="20dp"
android:text="Predict your tram arrival time at any station!"
android:textSize="18dp"
app:layout_constraintBottom_toTopOf="@+id/bottomview"
app:layout_constraintBottom_toTopOf="@+id/homeBottomView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView3"
app:layout_constraintTop_toBottomOf="@+id/userGreeting"
app:layout_constraintVertical_bias="0.296" />

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

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

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

@@ -6,7 +6,7 @@
android:layout_height="match_parent">
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottomview2"
android:id="@+id/notifBottomView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/material_dynamic_primary60"
@@ -34,7 +34,7 @@
<ListView
android:layout_width="409dp"
android:layout_height="471dp"
app:layout_constraintBottom_toTopOf="@+id/bottomview2"
app:layout_constraintBottom_toTopOf="@+id/notifBottomView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
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" />
<TextView
android:id="@+id/textView3"
android:id="@+id/userGreeting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Arrival Time:"
@@ -115,10 +115,10 @@
android:layout_marginTop="4dp"
android:contentDescription="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_constraintStart_toEndOf="@+id/arrval_bus_icon"
app:layout_constraintTop_toBottomOf="@+id/textView3" />
app:layout_constraintTop_toBottomOf="@+id/userGreeting" />
<TextView
android:id="@+id/predicted_time"
@@ -129,10 +129,10 @@
android:layout_marginEnd="4dp"
android:text="@string/predicted_time_string"
android:textSize="13sp"
app:layout_constraintEnd_toEndOf="@+id/textView3"
app:layout_constraintEnd_toEndOf="@+id/userGreeting"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/arrival_carton_icon"
app:layout_constraintTop_toBottomOf="@+id/textView3" />
app:layout_constraintTop_toBottomOf="@+id/userGreeting" />
<TextView
android:id="@+id/textView4"
@@ -142,7 +142,7 @@
android:text="Station"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.602"
app:layout_constraintStart_toEndOf="@+id/textView3"
app:layout_constraintStart_toEndOf="@+id/userGreeting"
app:layout_constraintTop_toBottomOf="@+id/button4" />
<ProgressBar

2
app/src/main/res/values/styles.xml
View File

@@ -2,7 +2,7 @@
<resources>
<!-- begin styles -->
<style name="AppTheme" parent="Theme.MaterialComponents.Light">
<style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
</style>

8
local.properties
View File

@@ -1,8 +0,0 @@
## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Sun Dec 10 14:55:12 EET 2023
sdk.dir=C\:\\Users\\ahmed\\AppData\\Local\\Android\\Sdk