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 50edebf..e95b0f4 100644 --- a/app/src/main/java/com/example/myapp_1/HomeActivity.java +++ b/app/src/main/java/com/example/myapp_1/HomeActivity.java @@ -4,6 +4,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.view.MenuItem; +import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; @@ -22,6 +23,7 @@ public class HomeActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_home); + ImageView vec_back = findViewById(R.id.homeBackButton); BottomNavigationView bottomNavigationView = findViewById(R.id.homeBottomView); bottomNavigationView.setOnNavigationItemSelectedListener( new BottomNavigationView.OnNavigationItemSelectedListener() { @@ -50,6 +52,11 @@ public class HomeActivity extends AppCompatActivity { if (user != null) userGreeting.setText("Welcome " + user + "!"); + vec_back.setOnClickListener(view -> { + Intent newScreen = new Intent(getApplicationContext(), LoginActivity.class); + startActivity(newScreen); + }); + } } diff --git a/app/src/main/java/com/example/myapp_1/Predict.java b/app/src/main/java/com/example/myapp_1/Predict.java index 3075362..1a7dcef 100644 --- a/app/src/main/java/com/example/myapp_1/Predict.java +++ b/app/src/main/java/com/example/myapp_1/Predict.java @@ -33,7 +33,7 @@ public class Predict extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_predict); - vec_back = findViewById(R.id.imageView2); + vec_back = findViewById(R.id.predictBackButton); edi_station = findViewById(R.id.editTextText); edi_weather = findViewById(R.id.editTextText2); btn_pred = findViewById(R.id.button4); @@ -41,12 +41,9 @@ public class Predict extends AppCompatActivity { txt_station = findViewById(R.id.textView4); txt_pred_time = findViewById(R.id.predicted_time); - vec_back.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Intent newScreen = new Intent(getApplicationContext(), HomeActivity.class); - startActivity(newScreen); - } + vec_back.setOnClickListener(view -> { + Intent newScreen = new Intent(getApplicationContext(), HomeActivity.class); + startActivity(newScreen); }); btn_pred.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 52cab26..0374534 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -29,19 +29,15 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + app:srcCompat="@drawable/_vector" /> + app:layout_constraintStart_toStartOf="@+id/predictBackButton" + app:layout_constraintTop_toBottomOf="@+id/predictBackButton" />