diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2069822..ece4e69 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -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")
diff --git a/app/src/main/java/com/example/myapp_1/GetStart1Activity.java b/app/src/main/java/com/example/myapp_1/GetStart1Activity.java
index fb298e9..206e881 100644
--- a/app/src/main/java/com/example/myapp_1/GetStart1Activity.java
+++ b/app/src/main/java/com/example/myapp_1/GetStart1Activity.java
@@ -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);
}
});
diff --git a/app/src/main/java/com/example/myapp_1/HomeActivity.java b/app/src/main/java/com/example/myapp_1/HomeActivity.java
index 161bd49..cfe3625 100644
--- a/app/src/main/java/com/example/myapp_1/HomeActivity.java
+++ b/app/src/main/java/com/example/myapp_1/HomeActivity.java
@@ -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;
}
});
+
}
}
diff --git a/app/src/main/java/com/example/myapp_1/LoginActivity.java b/app/src/main/java/com/example/myapp_1/LoginActivity.java
index fff44fc..18a3b5b 100644
--- a/app/src/main/java/com/example/myapp_1/LoginActivity.java
+++ b/app/src/main/java/com/example/myapp_1/LoginActivity.java
@@ -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) {
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index ce73015..52cab26 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -7,7 +7,7 @@
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 1d6161a..3d7a92a 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -5,91 +5,85 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_notification.xml b/app/src/main/res/layout/activity_notification.xml
index 20bca53..06bad89 100644
--- a/app/src/main/res/layout/activity_notification.xml
+++ b/app/src/main/res/layout/activity_notification.xml
@@ -6,7 +6,7 @@
android:layout_height="match_parent">
+ app:layout_constraintTop_toBottomOf="@+id/userGreeting" />
+ app:layout_constraintTop_toBottomOf="@+id/userGreeting" />
-
diff --git a/local.properties b/local.properties
deleted file mode 100644
index 0fc1191..0000000
--- a/local.properties
+++ /dev/null
@@ -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