From 1ca3577c0fe415dd4e83a2bb31298ed5506e64ec Mon Sep 17 00:00:00 2001
From: fadhilAmri <13521066@std.stei.itb.ac.id>
Date: Mon, 1 Apr 2024 11:02:33 +0700
Subject: [PATCH] fix: Back Button Navigation from Maps Activity to Main
 Activity

---
 .../java/com/example/nerbos/MapsActivity.kt   |  3 ++-
 app/src/main/res/layout/activity_maps.xml     | 20 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/example/nerbos/MapsActivity.kt b/app/src/main/java/com/example/nerbos/MapsActivity.kt
index 00fbc24..d4ccc07 100644
--- a/app/src/main/java/com/example/nerbos/MapsActivity.kt
+++ b/app/src/main/java/com/example/nerbos/MapsActivity.kt
@@ -10,6 +10,7 @@ import android.location.Location
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
+import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
@@ -51,7 +52,7 @@ class MapsActivity : AppCompatActivity(), OnMapReadyCallback {
         }
 
         // Navigation
-        findViewById<TextView>(R.id.title).setOnClickListener {
+        findViewById<ImageView>(R.id.backButton).setOnClickListener {
             val mainIntent: Intent = Intent(this, MainActivity::class.java)
             startActivity(mainIntent)
             finish()
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index 9b9619a..827f664 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -17,7 +17,6 @@
         android:layout_height="match_parent"
         map:layout_constraintTop_toTopOf="parent"
     />
-
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
@@ -26,11 +25,22 @@
         android:textColor="@color/white"
         android:background="@color/base_bg"
         android:text="@string/maps"
-        android:padding = "10dp"
+        android:paddingTop = "5dp"
+        android:paddingStart="40dp"
+        android:paddingEnd="10dp"
+        android:paddingBottom="10dp"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:drawableStartCompat="@drawable/ic_back"
-
+        app:layout_constraintStart_toEndOf="@id/backButton"
         />
 
+    <ImageView
+        android:id="@+id/backButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:paddingBottom="5dp"
+        android:src="@drawable/ic_back"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        />
 </androidx.constraintlayout.widget.ConstraintLayout>
-- 
GitLab