WIP: Handles navigating back from the tower map fragment

christianrowlands · Nov 1, 2024 · cfcbb6f · cfcbb6f
1 parent 5135ac9
commit cfcbb6f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/networksurvey/src/main/java/com/craxiom/networksurvey/fragments/TowerMapFragment.kt b/networksurvey/src/main/java/com/craxiom/networksurvey/fragments/TowerMapFragment.kt
@@ -18,7 +18,6 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import androidx.navigation.fragment.findNavController
 import com.craxiom.networksurvey.SimChangeReceiver
 import com.craxiom.networksurvey.listeners.ICellularSurveyRecordListener
 import com.craxiom.networksurvey.model.CellularProtocol
@@ -186,7 +185,7 @@ class TowerMapFragment : AServiceDataFragment(), ICellularSurveyRecordListener {
         builder.setNegativeButton("Reject") { dialog, _ ->
             PreferenceUtils.setAcceptMapPrivacy(requireContext(), false)
             dialog.dismiss()
-            findNavController().popBackStack() // Go back to the previous fragment // TODO WIP Test this
+            navigateBack()
         }
         builder.show()
     }
@@ -221,7 +220,7 @@ class TowerMapFragment : AServiceDataFragment(), ICellularSurveyRecordListener {
             }
 
             NsTheme {
-                TowerMapScreen(viewModel = viewModel!!)
+                TowerMapScreen(viewModel = viewModel!!, onBackButtonPressed = ::navigateBack)
             }
 
             if (servingCell != null)
@@ -231,4 +230,9 @@ class TowerMapFragment : AServiceDataFragment(), ICellularSurveyRecordListener {
                 )
         }
     }
+
+    private fun navigateBack() {
+        val nsActivity = activity ?: return
+        nsActivity.onBackPressed()
+    }
 }
diff --git a/networksurvey/src/main/java/com/craxiom/networksurvey/ui/cellular/TowerMapScreen.kt b/networksurvey/src/main/java/com/craxiom/networksurvey/ui/cellular/TowerMapScreen.kt
@@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
@@ -106,7 +107,10 @@ private const val MAX_TOWERS_ON_MAP = 5000
  * NS backend.
  */
 @Composable
-internal fun TowerMapScreen(viewModel: TowerMapViewModel = viewModel()) {
+internal fun TowerMapScreen(
+    viewModel: TowerMapViewModel = viewModel(),
+    onBackButtonPressed: () -> Unit
+) {
 
     val paddingInsets by viewModel.paddingInsets.collectAsStateWithLifecycle()
 
@@ -153,6 +157,22 @@ internal fun TowerMapScreen(viewModel: TowerMapViewModel = viewModel()) {
                     .padding(top = statusBarHeight + 4.dp, end = 16.dp)
             ) {
                 Row {
+                    Spacer(modifier = Modifier.width(8.dp))
+
+                    IconButton(onClick = { onBackButtonPressed() }) {
+                        Icon(
+                            Icons.AutoMirrored.Filled.ArrowBack,
+                            contentDescription = "Back button",
+                            tint = MaterialTheme.colorScheme.onSurface,
+                            modifier = Modifier
+                                .size(56.dp)
+                                .padding(0.dp)
+                                .background(color = MaterialTheme.colorScheme.primary)
+                        )
+                    }
+
+                    Spacer(modifier = Modifier.weight(1f))
+
                     IconButton(onClick = { showInfoDialog = true }) {
                         Icon(
                             Icons.Default.Info,
@@ -164,6 +184,7 @@ internal fun TowerMapScreen(viewModel: TowerMapViewModel = viewModel()) {
                                 .background(color = MaterialTheme.colorScheme.onSurface)
                         )
                     }
+
                     Spacer(modifier = Modifier.width(16.dp))
 
                     Button(