Merge pull request #409 from JohnDominicJasmin/407-remove-all-dialogs

407 remove all dialogs
JohnDominicJasmin · Sep 16, 2023 · b40daba · b40daba
2 parents 99c2b32 + 5c67d6a
commit b40daba
Show file tree

Hide file tree

Showing 32 changed files with 192 additions and 167 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/Cyclistance_Emulator_Suite_Data/auth_export/accounts.json b/Cyclistance_Emulator_Suite_Data/auth_export/accounts.json
@@ -1 +1 @@
-{"kind":"identitytoolkit#DownloadAccountResponse","users":[{"localId":"lK93X1kAIm4T4JTnPJLJniLeFPd5","createdAt":"1694790328813","lastLoginAt":"1694790328813","passwordHash":"fakeHash:salt=fakeSaltRlu7voOy5QaLW9usXVEN:password=12341234","salt":"fakeSaltRlu7voOy5QaLW9usXVEN","passwordUpdatedAt":1694799350055,"providerUserInfo":[{"providerId":"password","email":"xiaomi@gmail.com","federatedId":"xiaomi@gmail.com","rawId":"xiaomi@gmail.com"}],"validSince":"1694799350","email":"xiaomi@gmail.com","emailVerified":true,"disabled":false},{"localId":"mbmckVyzZYezIE8KzjYcj4NTcrGn","createdAt":"1694790336580","lastLoginAt":"1694790336580","passwordHash":"fakeHash:salt=fakeSaltfMICIPb1s3nYCZG4WD46:password=12341234","salt":"fakeSaltfMICIPb1s3nYCZG4WD46","passwordUpdatedAt":1694799350056,"providerUserInfo":[{"providerId":"password","email":"emulator@gmail.com","federatedId":"emulator@gmail.com","rawId":"emulator@gmail.com"}],"validSince":"1694799350","email":"emulator@gmail.com","emailVerified":true,"disabled":false}]}
+{"kind":"identitytoolkit#DownloadAccountResponse","users":[{"localId":"lK93X1kAIm4T4JTnPJLJniLeFPd5","createdAt":"1694790328813","lastLoginAt":"1694790328813","passwordHash":"fakeHash:salt=fakeSaltRlu7voOy5QaLW9usXVEN:password=12341234","salt":"fakeSaltRlu7voOy5QaLW9usXVEN","passwordUpdatedAt":1694828548236,"providerUserInfo":[{"providerId":"password","email":"xiaomi@gmail.com","federatedId":"xiaomi@gmail.com","rawId":"xiaomi@gmail.com"}],"validSince":"1694828548","email":"xiaomi@gmail.com","emailVerified":true,"disabled":false},{"localId":"mbmckVyzZYezIE8KzjYcj4NTcrGn","createdAt":"1694790336580","lastLoginAt":"1694790336580","passwordHash":"fakeHash:salt=fakeSaltfMICIPb1s3nYCZG4WD46:password=12341234","salt":"fakeSaltfMICIPb1s3nYCZG4WD46","passwordUpdatedAt":1694828548236,"providerUserInfo":[{"providerId":"password","email":"emulator@gmail.com","federatedId":"emulator@gmail.com","rawId":"emulator@gmail.com"}],"validSince":"1694828548","email":"emulator@gmail.com","emailVerified":true,"disabled":false}]}
diff --git a/...e_Data/firestore_export/all_namespaces/all_kinds/all_namespaces_all_kinds.export_metadata b/...e_Data/firestore_export/all_namespaces/all_kinds/all_namespaces_all_kinds.export_metadata
diff --git a/...com/example/cyclistance/feature_mapping/presentation/mapping_main_screen/MappingScreen.kt b/...com/example/cyclistance/feature_mapping/presentation/mapping_main_screen/MappingScreen.kt
@@ -690,16 +690,12 @@ fun MappingScreen(
         )
     }}
 
-    val sinoTrackWebViewVisibility = remember{{visible: Boolean ->
-        uiState = uiState.copy(
-            isSinoTrackWebViewVisible = visible
-        )
+    val openSinoTrack = remember{{
+        navController.navigateScreen(Screens.MappingNavigation.SinoTrack.screenRoute)
     }}
 
-    val rescueResultsDialogVisibility = remember{{ visibility: Boolean ->
-        uiState = uiState.copy(
-            isRescueResultsDialogVisible = visibility
-        )
+    val openRescueResults = remember{{
+        navController.navigateScreen(Screens.MappingNavigation.RescueResults.screenRoute)
     }}
 
 
@@ -1053,7 +1049,6 @@ fun MappingScreen(
                     ).also {
                         expandBottomSheet()
                         rescueRequestDialogVisibility(false)
-                        rescueResultsDialogVisibility(false)
 
                     }
                 }
@@ -1323,8 +1318,6 @@ fun MappingScreen(
 
                 is MappingUiEvent.OnMapLongClick -> onMapLongClick(event.latLng)
                 is MappingUiEvent.OnReportIncident -> onClickReportIncident(event.labelIncident)
-                is MappingUiEvent.SinoTrackWebViewVisibility -> sinoTrackWebViewVisibility(event.visibility)
-                is MappingUiEvent.RescueResultsDialog -> rescueResultsDialogVisibility(event.visibility)
                 is MappingUiEvent.OnEmergencyCall -> onEmergencyCall(event.phoneNumber)
                 is MappingUiEvent.OnAddEmergencyContact -> onAddEmergencyContact()
                 is MappingUiEvent.MapTypeBottomSheet -> mapTypeBottomSheetVisibility(event.visibility)
@@ -1348,6 +1341,8 @@ fun MappingScreen(
                 is MappingUiEvent.CancelOnGoingRescueDialog -> cancelOnGoingRescueDialogVisibility(event.visibility)
                 is MappingUiEvent.NotificationPermissionDialog ->  notificationPermissionDialogVisibility(event.visibility)
                 is MappingUiEvent.NotifyUser -> notifyUser(title = event.title, message = event.message)
+                MappingUiEvent.OpenSinoTrack -> openSinoTrack()
+                MappingUiEvent.OpenRescueResults -> openRescueResults()
             }
         }
     )

diff --git a/...tance/feature_mapping/presentation/mapping_main_screen/components/MappingScreenContent.kt b/...tance/feature_mapping/presentation/mapping_main_screen/components/MappingScreenContent.kt
@@ -50,8 +50,6 @@ import com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.
 import com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.request.MappingRequestAccepted
 import com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.request.MappingRequestCancelled
 import com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.rescue_request.RescueRequestDialog
-import com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.rescue_results.RescueResultsDialog
-import com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.sino_track.SinoTrackWebView
 import com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.event.MappingUiEvent
 import com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.state.MappingState
 import com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.state.MappingUiState
@@ -119,19 +117,6 @@ fun MappingScreenContent(
                 )
             }
 
-
-            if(uiState.isRescueResultsDialogVisible){
-
-                RescueResultsDialog(
-                    modifier = Modifier.fillMaxSize(),
-                    mappingState = state,
-                    uiState = uiState,
-                    event = event
-                )
-
-            }
-
-
             MappingBottomSheet(
                 state = state,
                 event = event,
@@ -213,11 +198,7 @@ fun MappingScreenContent(
                         onClickFamilyTracker = { event(MappingUiEvent.OpenFamilyTracker) },
                         onClickRescueRequest = { event(MappingUiEvent.RescueRequestDialog(visibility = true)) },
                         onClickFab = { event(MappingUiEvent.ExpandableFab(expanded = !uiState.isFabExpanded)) },
-                        onClickBikeTracker = {
-                            event(
-                                MappingUiEvent.SinoTrackWebViewVisibility(
-                                    visibility = true))
-                        },
+                        onClickBikeTracker = { event(MappingUiEvent.OpenSinoTrack) },
                         isFabExpanded = uiState.isFabExpanded,
                         badgeCount = respondentCount,
                         modifier = Modifier.constrainAs(expandableFabSection) {
@@ -454,13 +435,7 @@ fun MappingScreenContent(
             }
 
 
-            if (uiState.isSinoTrackWebViewVisible) {
-                SinoTrackWebView(onDismiss = {
-                    event(
-                        MappingUiEvent.SinoTrackWebViewVisibility(
-                            visibility = false))
-                })
-            }
+
 
         }
     }

diff --git a/...mapping/presentation/mapping_main_screen/components/rescue_details/RescueDetailsDialog.kt b/...mapping/presentation/mapping_main_screen/components/rescue_details/RescueDetailsDialog.kt
diff --git a/...mapping/presentation/mapping_main_screen/components/rescue_results/RescueResultsDialog.kt b/...mapping/presentation/mapping_main_screen/components/rescue_results/RescueResultsDialog.kt
diff --git a/...eature_mapping/presentation/mapping_main_screen/components/sino_track/SinoTrackWebView.kt b/...eature_mapping/presentation/mapping_main_screen/components/sino_track/SinoTrackWebView.kt
diff --git a/...mple/cyclistance/feature_mapping/presentation/mapping_main_screen/event/MappingUiEvent.kt b/...mple/cyclistance/feature_mapping/presentation/mapping_main_screen/event/MappingUiEvent.kt
@@ -26,7 +26,8 @@ sealed class MappingUiEvent {
     data object RouteOverview : MappingUiEvent()
     data object RecenterRoute : MappingUiEvent()
     data object OpenNavigation : MappingUiEvent()
-
+    data object OpenSinoTrack : MappingUiEvent()
+    data object OpenRescueResults : MappingUiEvent()
     data object OnRequestNavigationCameraToOverview : MappingUiEvent()
 
     data object OpenFamilyTracker : MappingUiEvent()
@@ -45,7 +46,6 @@ sealed class MappingUiEvent {
     // Events with Parameters
 
     data class NotifyUser(val title: String, val message: String) : MappingUiEvent()
-    data class SinoTrackWebViewVisibility(val visibility: Boolean) : MappingUiEvent()
     data class HazardousLaneMarkerDialog(val visibility: Boolean) : MappingUiEvent()
     data class DiscardChangesMarkerDialog(val visibility: Boolean) : MappingUiEvent()
     data class CancelSearchDialog(val visibility: Boolean) : MappingUiEvent()
@@ -56,7 +56,6 @@ sealed class MappingUiEvent {
     data class EmergencyCallDialog(val visibility: Boolean) : MappingUiEvent()
     data class RescueRequestDialog(val visibility: Boolean) : MappingUiEvent()
     data class AlertDialog(val alertDialogState: AlertDialogState = AlertDialogState()): MappingUiEvent()
-    data class RescueResultsDialog(val visibility: Boolean) : MappingUiEvent()
     data class NotificationPermissionDialog(val visibility: Boolean) : MappingUiEvent()
     data class OnInitializeMap(val mapboxMap: MapboxMap) : MappingUiEvent()
     data class OnMapLongClick(val latLng: LatLng) : MappingUiEvent()

diff --git a/...mple/cyclistance/feature_mapping/presentation/mapping_main_screen/state/MappingUiState.kt b/...mple/cyclistance/feature_mapping/presentation/mapping_main_screen/state/MappingUiState.kt
@@ -24,9 +24,7 @@ data class MappingUiState(
     val isFabExpanded: Boolean = false,
     val alertDialogState: AlertDialogState = AlertDialogState(),
     val isRescueRequestDialogVisible: Boolean = false,
-    val isSinoTrackWebViewVisible: Boolean = false,
     val isEmergencyCallDialogVisible: Boolean = false,
-    val isRescueResultsDialogVisible: Boolean = false,
     val selectedPhoneNumber: String = "",
     val lastLongPressedLocation: LatLng? = null,
     val selectedIncidentLabel: String = "",

diff --git a/...le/cyclistance/feature_mapping/presentation/mapping_rescue_details/RescueDetailsScreen.kt b/...le/cyclistance/feature_mapping/presentation/mapping_rescue_details/RescueDetailsScreen.kt
@@ -0,0 +1,19 @@
+package com.example.cyclistance.feature_mapping.presentation.mapping_rescue_details
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavController
+import com.example.cyclistance.feature_mapping.presentation.mapping_rescue_details.components.RescueDetailsScreenContent
+
+@Composable
+fun RescueDetailsScreen(
+    paddingValues: PaddingValues,
+    navController: NavController
+) {
+
+    RescueDetailsScreenContent(
+        modifier = Modifier.padding(paddingValues)
+    )
+}
diff --git a/...details/components/PointToPointDisplay.kt → ...details/components/PointToPointDisplay.kt b/...details/components/PointToPointDisplay.kt → ...details/components/PointToPointDisplay.kt
@@ -1,4 +1,4 @@
-package com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.rescue_details.components
+package com.example.cyclistance.feature_mapping.presentation.mapping_rescue_details.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement

diff --git a/...ts/rescue_details/components/RatingBar.kt → ...ng_rescue_details/components/RatingBar.kt b/...ts/rescue_details/components/RatingBar.kt → ...ng_rescue_details/components/RatingBar.kt
@@ -1,4 +1,4 @@
-package com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.rescue_details.components
+package com.example.cyclistance.feature_mapping.presentation.mapping_rescue_details.components
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.material.Icon

diff --git a/...s/rescue_details/components/RatingCard.kt → ...g_rescue_details/components/RatingCard.kt b/...s/rescue_details/components/RatingCard.kt → ...g_rescue_details/components/RatingCard.kt
@@ -1,4 +1,4 @@
-package com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.rescue_details.components
+package com.example.cyclistance.feature_mapping.presentation.mapping_rescue_details.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row

diff --git a/...e_details/components/RescueDescription.kt → ...e_details/components/RescueDescription.kt b/...e_details/components/RescueDescription.kt → ...e_details/components/RescueDescription.kt
@@ -1,4 +1,4 @@
-package com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.rescue_details.components
+package com.example.cyclistance.feature_mapping.presentation.mapping_rescue_details.components
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.Arrangement

diff --git a/.../components/RescueDetailsScreenContent.kt → .../components/RescueDetailsScreenContent.kt b/.../components/RescueDetailsScreenContent.kt → .../components/RescueDetailsScreenContent.kt
@@ -1,4 +1,4 @@
-package com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.rescue_details.components
+package com.example.cyclistance.feature_mapping.presentation.mapping_rescue_details.components
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement

diff --git a/...tails/components/RescueLocationDetails.kt → ...tails/components/RescueLocationDetails.kt b/...tails/components/RescueLocationDetails.kt → ...tails/components/RescueLocationDetails.kt
@@ -1,4 +1,4 @@
-package com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.rescue_details.components
+package com.example.cyclistance.feature_mapping.presentation.mapping_rescue_details.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

diff --git a/.../rescue_details/components/RescueStats.kt → ..._rescue_details/components/RescueStats.kt b/.../rescue_details/components/RescueStats.kt → ..._rescue_details/components/RescueStats.kt
@@ -1,4 +1,4 @@
-package com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.rescue_details.components
+package com.example.cyclistance.feature_mapping.presentation.mapping_rescue_details.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

diff --git a/...le/cyclistance/feature_mapping/presentation/mapping_rescue_results/RescueResultsScreen.kt b/...le/cyclistance/feature_mapping/presentation/mapping_rescue_results/RescueResultsScreen.kt
@@ -0,0 +1,27 @@
+package com.example.cyclistance.feature_mapping.presentation.mapping_rescue_results
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavController
+import com.example.cyclistance.feature_mapping.presentation.mapping_rescue_results.components.RescueResultsScreenContent
+import com.example.cyclistance.feature_mapping.presentation.mapping_rescue_results.event.RescueResultUiEvent
+
+@Composable
+fun RescueResultsScreen(
+    paddingValues: PaddingValues,
+    navController: NavController
+
+) {
+
+
+    RescueResultsScreenContent(modifier = Modifier.padding(paddingValues), event = { event ->
+        when (event) {
+            RescueResultUiEvent.CloseRescueResults -> navController.popBackStack()
+        }
+
+    })
+
+
+}
diff --git a/.../rescue_results/components/RateRescuer.kt → ..._rescue_results/components/RateRescuer.kt b/.../rescue_results/components/RateRescuer.kt → ..._rescue_results/components/RateRescuer.kt
@@ -1,4 +1,4 @@
-package com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.rescue_results.components
+package com.example.cyclistance.feature_mapping.presentation.mapping_rescue_results.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

diff --git a/...lts/components/RescueGoodToHearSection.kt → ...lts/components/RescueGoodToHearSection.kt b/...lts/components/RescueGoodToHearSection.kt → ...lts/components/RescueGoodToHearSection.kt
@@ -1,4 +1,4 @@
-package com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.rescue_results.components
+package com.example.cyclistance.feature_mapping.presentation.mapping_rescue_results.components
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background

diff --git a/.../components/RescueReportAccountSection.kt → .../components/RescueReportAccountSection.kt b/.../components/RescueReportAccountSection.kt → .../components/RescueReportAccountSection.kt
@@ -1,4 +1,4 @@
-package com.example.cyclistance.feature_mapping.presentation.mapping_main_screen.components.rescue_results.components
+package com.example.cyclistance.feature_mapping.presentation.mapping_rescue_results.components
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background