Merge pull request #140 from CrisisCleanup/various-fixes

Various fixes

Author: hueachilles

app/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 
 android {
     defaultConfig {
-        val buildVersion = 256
+        val buildVersion = 264
         applicationId = "com.crisiscleanup"
         versionCode = buildVersion
         versionName = "0.9.${buildVersion - 168}"
@@ -43,7 +43,6 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
                 "proguard-playservices.pro",
-                "proguard-retrofit2.pro",
                 "proguard-crashlytics.pro",
             )
 

app/proguard-retrofit2.pro

@@ -57,7 +57,7 @@ import javax.inject.Inject
 @HiltViewModel
 class MainActivityViewModel @Inject constructor(
     private val appPreferencesRepository: LocalAppPreferencesRepository,
-    private val appMetricsRepository: LocalAppMetricsRepository,
+    appMetricsRepository: LocalAppMetricsRepository,
     accountDataRepository: AccountDataRepository,
     incidentSelector: IncidentSelector,
     appDataRepository: AppDataManagementRepository,
@@ -91,6 +91,8 @@ class MainActivityViewModel @Inject constructor(
             started = SharingStarted.WhileSubscribed(5_000),
         )
 
+    val isAppUpdateAvailable = appMetricsRepository.isAppUpdateAvailable
+
     /**
      * API account tokens need re-issuing
      */

app/src/main/java/com/crisiscleanup/MainActivityViewModel.kt

@@ -1,7 +1,10 @@
 package com.crisiscleanup.ui
 
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.sizeIn
+import androidx.compose.material3.Badge
+import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalContentColor
@@ -13,6 +16,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
@@ -25,8 +29,10 @@ import com.crisiscleanup.core.designsystem.component.CrisisCleanupNavigationBarI
 import com.crisiscleanup.core.designsystem.component.CrisisCleanupNavigationDefaults
 import com.crisiscleanup.core.designsystem.component.CrisisCleanupNavigationRail
 import com.crisiscleanup.core.designsystem.component.CrisisCleanupNavigationRailItem
+import com.crisiscleanup.core.designsystem.icon.CrisisCleanupIcons
 import com.crisiscleanup.core.designsystem.icon.Icon
 import com.crisiscleanup.core.designsystem.theme.disabledAlpha
+import com.crisiscleanup.core.designsystem.theme.primaryOrangeColor
 import com.crisiscleanup.navigation.TopLevelDestination
 
 @Composable
@@ -61,6 +67,7 @@ private fun NavItems(
     destinations: List<TopLevelDestination>,
     onNavigateToDestination: (TopLevelDestination) -> Unit,
     currentDestination: NavDestination?,
+    isAppUpdateAvailable: Boolean,
     itemContent: @Composable (
         Boolean,
         String,
@@ -77,12 +84,21 @@ private fun NavItems(
             t(destination.titleTranslateKey)
         }
         val selected = currentDestination.isTopLevelDestinationInHierarchy(destination)
+        val badgeImage = if (isAppUpdateAvailable && destination == TopLevelDestination.MENU) {
+            CrisisCleanupIcons.AppUpdateAvailable
+        } else {
+            null
+        }
         itemContent(
             selected,
             title,
             i == destinations.size - 1,
             { onNavigateToDestination(destination) },
-            { destination.Icon(selected, title) },
+            {
+                BadgedView(badgeImage) {
+                    destination.Icon(selected, title)
+                }
+            },
             {
                 Text(
                     title,
@@ -98,6 +114,7 @@ internal fun AppNavigationBar(
     destinations: List<TopLevelDestination>,
     onNavigateToDestination: (TopLevelDestination) -> Unit,
     currentDestination: NavDestination?,
+    isAppUpdateAvailable: Boolean,
     modifier: Modifier = Modifier,
     isRail: Boolean = false,
 ) {
@@ -106,13 +123,15 @@ internal fun AppNavigationBar(
             destinations,
             onNavigateToDestination,
             currentDestination,
+            isAppUpdateAvailable,
             modifier,
         )
     } else {
         CrisisCleanupBottomBar(
             destinations,
             onNavigateToDestination,
             currentDestination,
+            isAppUpdateAvailable,
             modifier,
         )
     }
@@ -121,23 +140,52 @@ internal fun AppNavigationBar(
 @Composable
 internal fun AppNavigationBar(
     appState: CrisisCleanupAppState,
+    isAppUpdateAvailable: Boolean,
     modifier: Modifier = Modifier,
     isRail: Boolean = false,
 ) {
     AppNavigationBar(
         appState.topLevelDestinations,
         appState::navigateToTopLevelDestination,
         appState.currentDestination,
+        isAppUpdateAvailable = isAppUpdateAvailable,
         modifier,
         isRail,
     )
 }
 
+@Composable
+private fun BadgedView(
+    badgeIcon: ImageVector?,
+    content: @Composable () -> Unit,
+) {
+    if (badgeIcon == null) {
+        content()
+    } else {
+        BadgedBox(
+            badge = {
+                Badge(
+                    Modifier.size(20.dp),
+                    containerColor = primaryOrangeColor,
+                ) {
+                    Icon(
+                        imageVector = badgeIcon,
+                        contentDescription = null,
+                    )
+                }
+            },
+        ) {
+            content()
+        }
+    }
+}
+
 @Composable
 private fun CrisisCleanupNavRail(
     destinations: List<TopLevelDestination>,
     onNavigateToDestination: (TopLevelDestination) -> Unit,
     currentDestination: NavDestination?,
+    isAppUpdateAvailable: Boolean,
     modifier: Modifier = Modifier,
 ) {
     CrisisCleanupNavigationRail(modifier = modifier) {
@@ -146,6 +194,7 @@ private fun CrisisCleanupNavRail(
             destinations = destinations,
             onNavigateToDestination = onNavigateToDestination,
             currentDestination = currentDestination,
+            isAppUpdateAvailable = isAppUpdateAvailable,
         ) {
                 isSelected: Boolean,
                 title: String,
@@ -180,13 +229,15 @@ private fun CrisisCleanupBottomBar(
     destinations: List<TopLevelDestination>,
     onNavigateToDestination: (TopLevelDestination) -> Unit,
     currentDestination: NavDestination?,
+    isAppUpdateAvailable: Boolean,
     modifier: Modifier = Modifier,
 ) {
     CrisisCleanupNavigationBar(modifier = modifier) {
         NavItems(
             destinations = destinations,
             onNavigateToDestination = onNavigateToDestination,
             currentDestination = currentDestination,
+            isAppUpdateAvailable = isAppUpdateAvailable,
         ) {
                 isSelected: Boolean,
                 title: String,

app/src/main/java/com/crisiscleanup/ui/AppNavigation.kt

@@ -162,7 +162,9 @@ private fun BoxScope.LoadedContent(
             val orgPersistentInvite by viewModel.orgPersistentInvites.collectAsStateWithLifecycle()
 
             if (showPasswordReset) {
-                appState.navController.navigateToPasswordReset(false)
+                LaunchedEffect(Unit) {
+                    appState.navController.navigateToPasswordReset(false)
+                }
             } else if (showMagicLinkLogin) {
                 appState.navController.navigateToMagicLinkLogin()
             } else if (orgUserInviteCode.isNotBlank()) {
@@ -202,10 +204,13 @@ private fun BoxScope.LoadedContent(
 
         val menuTutorialStep by viewModel.menuTutorialStep.collectAsStateWithLifecycle()
 
+        val isUpdateAvailable by viewModel.isAppUpdateAvailable.collectAsStateWithLifecycle(false)
+
         NavigableContent(
             snackbarHostState,
             appState,
-            isOnboarding,
+            isAppUpdateAvailable = isUpdateAvailable,
+            isOnboarding = isOnboarding,
             menuTutorialStep,
             viewModel.tutorialViewTracker.viewSizePositionLookup,
             viewModel::onMenuTutorialNext,
@@ -221,7 +226,9 @@ private fun BoxScope.LoadedContent(
         }
 
         if (showPasswordReset) {
-            appState.navController.navigateToPasswordReset(true)
+            LaunchedEffect(Unit) {
+                appState.navController.navigateToPasswordReset(true)
+            }
         }
     }
 
@@ -317,6 +324,7 @@ private fun AcceptTermsContent(
 private fun NavigableContent(
     snackbarHostState: SnackbarHostState,
     appState: CrisisCleanupAppState,
+    isAppUpdateAvailable: Boolean,
     isOnboarding: Boolean,
     menuTutorialStep: TutorialStep,
     tutorialViewLookup: SnapshotStateMap<TutorialViewId, LayoutSizePosition>,
@@ -348,6 +356,7 @@ private fun NavigableContent(
             ) {
                 AppNavigationBar(
                     appState,
+                    isAppUpdateAvailable,
                     navBarSizePositionModifier.testTag("AppNavigationBottomBar"),
                 )
             }
@@ -378,6 +387,7 @@ private fun NavigableContent(
             if (showNavigation && !layoutBottomNav) {
                 AppNavigationBar(
                     appState,
+                    isAppUpdateAvailable,
                     navBarSizePositionModifier
                         .safeDrawingPadding()
                         .testTag("AppNavigationSideRail"),

app/src/main/java/com/crisiscleanup/ui/CrisisCleanupApp.kt

@@ -21,6 +21,8 @@ dependencies {
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.datetime)
     implementation(libs.timeago)
+    implementation(libs.libphonenumber)
 
     testImplementation(libs.kotlinx.coroutines.test)
+    testImplementation(libs.mockk.android)
 }