Removed Navigator from codebase

ground/src/main/java/com/google/android/ground/MainActivity.kt

@@ -33,11 +33,6 @@
 import com.google.android.ground.system.ActivityCallback
 import com.google.android.ground.system.ActivityStreams
 import com.google.android.ground.ui.common.BackPressListener
-import com.google.android.ground.ui.common.FinishApp
-import com.google.android.ground.ui.common.NavigateTo
-import com.google.android.ground.ui.common.NavigateUp
-import com.google.android.ground.ui.common.NavigationRequest
-import com.google.android.ground.ui.common.Navigator
 import com.google.android.ground.ui.common.ViewModelFactory
 import com.google.android.ground.ui.common.modalSpinner
 import com.google.android.ground.ui.home.HomeScreenFragmentDirections
@@ -57,7 +52,6 @@
 class MainActivity : AbstractActivity() {
   @Inject lateinit var activityStreams: ActivityStreams
   @Inject lateinit var viewModelFactory: ViewModelFactory
-  @Inject lateinit var navigator: Navigator
   @Inject lateinit var userRepository: UserRepository
 
   private lateinit var viewModel: MainViewModel
@@ -79,8 +73,6 @@
       }
     }
 
-    lifecycleScope.launch { navigator.getNavigateRequests().collect { onNavigate(it) } }
-
     val binding = MainActBinding.inflate(layoutInflater)
     setContentView(binding.root)
 
@@ -100,16 +92,18 @@
         showPermissionDeniedDialog(viewGroup)
       }
       MainUiState.OnUserSignedOut -> {
-        navigator.navigate(SignInFragmentDirections.showSignInScreen())
+        navHostFragment.navController.navigate(SignInFragmentDirections.showSignInScreen())
       }
       MainUiState.TosNotAccepted -> {
-        navigator.navigate(SignInFragmentDirections.showTermsOfService(false))
+        navHostFragment.navController.navigate(SignInFragmentDirections.showTermsOfService(false))
       }
       MainUiState.NoActiveSurvey -> {
-        navigator.navigate(SurveySelectorFragmentDirections.showSurveySelectorScreen(true))
+        navHostFragment.navController.navigate(
+          SurveySelectorFragmentDirections.showSurveySelectorScreen(true)
+        )
       }
       MainUiState.ShowHomeScreen -> {
-        navigator.navigate(HomeScreenFragmentDirections.showHomeScreen())
+        navHostFragment.navController.navigate(HomeScreenFragmentDirections.showHomeScreen())
       }
       MainUiState.OnUserSigningIn -> {
         onSignInProgress(true)
@@ -137,7 +131,7 @@
                 },
                 onCloseApp = {
                   showDialog = false
-                  navigator.finishApp()
+                  finish()
                 },
               )
             }
@@ -152,14 +146,6 @@
     viewModel.windowInsets.postValue(insets)
   }
 
-  private fun onNavigate(navRequest: NavigationRequest) {
-    when (navRequest) {
-      is NavigateTo -> navHostFragment.navController.navigate(navRequest.directions)
-      is NavigateUp -> navigateUp()
-      is FinishApp -> finish()
-    }
-  }
-
   /**
    * The Android permissions API requires this callback to live in an Activity; here we dispatch the
    * result back to the PermissionManager for handling.

ground/src/main/java/com/google/android/ground/ui/offlineareas/OfflineAreasFragment.kt

@@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
+import com.google.android.ground.R
 import com.google.android.ground.databinding.OfflineAreasFragBinding
 import com.google.android.ground.ui.common.AbstractFragment
 import com.google.android.ground.ui.theme.AppTheme
@@ -70,7 +71,7 @@ class OfflineAreasFragment : AbstractFragment() {
     super.onViewCreated(view, savedInstanceState)
     lifecycleScope.launch {
       viewModel.navigateToOfflineAreaSelector.collect {
-        findNavController().navigate(OfflineAreasFragmentDirections.showOfflineAreaSelector())
+        findNavController().navigate(R.id.offline_area_selector_fragment)
       }
     }
   }

ground/src/test/java/com/google/android/ground/ui/surveyselector/SurveySelectorFragmentTest.kt

@@ -34,8 +34,6 @@ import com.google.android.ground.domain.usecases.survey.ActivateSurveyUseCase
 import com.google.android.ground.model.SurveyListItem
 import com.google.android.ground.repository.SurveyRepository
 import com.google.android.ground.repository.UserRepository
-import com.google.android.ground.ui.common.Navigator
-import com.google.android.ground.ui.home.HomeScreenFragmentDirections
 import com.google.common.truth.Truth.assertThat
 import com.sharedtest.FakeData
 import com.sharedtest.system.auth.FakeAuthenticationManager
@@ -63,7 +61,6 @@ import org.robolectric.shadows.ShadowToast
 @RunWith(RobolectricTestRunner::class)
 class SurveySelectorFragmentTest : BaseHiltTest() {
 
-  @BindValue @Mock lateinit var navigator: Navigator
   @BindValue @Mock lateinit var surveyRepository: SurveyRepository
   @BindValue @Mock lateinit var userRepository: UserRepository
   @BindValue @Mock lateinit var activateSurvey: ActivateSurveyUseCase
@@ -157,7 +154,13 @@ class SurveySelectorFragmentTest : BaseHiltTest() {
 
     setSurveyList(listOf(TEST_SURVEY_1, TEST_SURVEY_2))
     setLocalSurveys(listOf())
-    setUpFragment()
+
+    launchFragmentWithNavController<SurveySelectorFragment>(
+      fragmentArgs = bundleOf(Pair("shouldExitApp", false)),
+      destId = R.id.surveySelectorFragment,
+      navControllerCallback = { navController = it },
+    )
+    advanceUntilIdle()
 
     // Click second item
     onView(withId(R.id.recycler_view))
@@ -167,7 +170,7 @@ class SurveySelectorFragmentTest : BaseHiltTest() {
     // Assert survey is activated.
     verify(activateSurvey).invoke(TEST_SURVEY_2.id)
     // Assert that navigation to home screen was not requested
-    verify(navigator, times(0)).navigate(HomeScreenFragmentDirections.showHomeScreen())
+    assertThat(navController.currentDestination?.id).isEqualTo(R.id.surveySelectorFragment)
     // Error toast message
     assertThat(ShadowToast.shownToastCount()).isEqualTo(1)
   }