Fix caching cases

app-sandbox/src/main/java/com/crisiscleanup/sandbox/SandboxApp.kt

@@ -24,13 +24,14 @@ import androidx.navigation.NavController
 import com.crisiscleanup.core.designsystem.component.CrisisCleanupBackground
 import com.crisiscleanup.core.designsystem.component.CrisisCleanupTextButton
 import com.crisiscleanup.core.designsystem.theme.listItemSpacedBy
-import com.crisiscleanup.sandbox.navigation.ASYNC_IMAGE_ROUTE
+import com.crisiscleanup.sandbox.navigation.ROW_BADGE_ROUTE
 import com.crisiscleanup.sandbox.navigation.SandboxNavHost
 import com.crisiscleanup.sandbox.navigation.navigateToAsyncImage
 import com.crisiscleanup.sandbox.navigation.navigateToBottomNav
 import com.crisiscleanup.sandbox.navigation.navigateToCheckboxes
 import com.crisiscleanup.sandbox.navigation.navigateToChips
 import com.crisiscleanup.sandbox.navigation.navigateToMultiImage
+import com.crisiscleanup.sandbox.navigation.navigateToRowBadge
 import com.crisiscleanup.sandbox.navigation.navigateToSingleImage
 
 @Composable
@@ -66,7 +67,7 @@ fun SandboxApp(
                     SandboxNavHost(
                         appState.navController,
                         appState::onBack,
-                        ASYNC_IMAGE_ROUTE,
+                        ROW_BADGE_ROUTE,
                     )
                 }
             }
@@ -102,6 +103,9 @@ fun RootRoute(navController: NavController) {
             CrisisCleanupTextButton(text = "Async image") {
                 navController.navigateToAsyncImage()
             }
+            CrisisCleanupTextButton(text = "Row badge") {
+                navController.navigateToRowBadge()
+            }
         }
     }
 }

app-sandbox/src/main/java/com/crisiscleanup/sandbox/navigation/SandboxNavigation.kt

@@ -11,6 +11,7 @@ import com.crisiscleanup.sandbox.ui.BottomNavRoute
 import com.crisiscleanup.sandbox.ui.CheckboxesRoute
 import com.crisiscleanup.sandbox.ui.ChipsRoute
 import com.crisiscleanup.sandbox.ui.MultiImageRoute
+import com.crisiscleanup.sandbox.ui.RowBadgeView
 import com.crisiscleanup.sandbox.ui.SingleImageRoute
 
 const val ROOT_ROUTE = "root"
@@ -20,6 +21,7 @@ private const val BOTTOM_NAV_ROUTE = "bottom-nav"
 const val SINGLE_IMAGE_ROUTE = "single-image"
 const val MULTI_IMAGE_ROUTE = "multi-image"
 const val ASYNC_IMAGE_ROUTE = "async-image"
+const val ROW_BADGE_ROUTE = "row-badge"
 
 fun NavController.navigateToBottomNav() {
     this.navigate(BOTTOM_NAV_ROUTE)
@@ -45,6 +47,10 @@ fun NavController.navigateToAsyncImage() {
     this.navigate(ASYNC_IMAGE_ROUTE)
 }
 
+fun NavController.navigateToRowBadge() {
+    this.navigate(ROW_BADGE_ROUTE)
+}
+
 @Composable
 fun SandboxNavHost(
     navController: NavHostController,
@@ -82,5 +88,9 @@ fun SandboxNavHost(
         composable(ASYNC_IMAGE_ROUTE) {
             AsyncImageView()
         }
+
+        composable(ROW_BADGE_ROUTE) {
+            RowBadgeView()
+        }
     }
 }

app-sandbox/src/main/java/com/crisiscleanup/sandbox/ui/RowBadgeView.kt

@@ -0,0 +1,116 @@
+package com.crisiscleanup.sandbox.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material3.Badge
+import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.Button
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+
+@Composable
+private fun RowScope.BadgedText(
+    alignment: Alignment,
+    text: String,
+) {
+    BadgedBox(
+        {
+            Badge(
+                Modifier
+                    .align(alignment)
+                    .size(20.dp),
+                containerColor = Color.Red,
+            ) {
+                Icon(
+                    imageVector = Icons.Default.Check,
+                    contentDescription = null,
+                )
+            }
+        },
+        Modifier
+            .background(Color.LightGray)
+            .weight(1f),
+    ) {
+        Text(
+            text,
+            Modifier
+                .align(Alignment.CenterStart)
+                .background(Color.Yellow),
+        )
+    }
+}
+
+@Composable
+private fun RowBadge(
+    alignment: Alignment,
+    text: String,
+    buttonText: String = "Press me",
+) {
+    Row(
+        Modifier
+            .fillMaxWidth()
+            .padding(8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        BadgedText(alignment, text)
+        Button({}) {
+            Text(buttonText)
+        }
+    }
+}
+
+@Composable
+private fun ReverseRowBadge(
+    alignment: Alignment,
+    text: String,
+    buttonText: String = "Press me",
+) {
+    Row(
+        Modifier
+            .fillMaxWidth()
+            .padding(8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Button({}) {
+            Text(buttonText)
+        }
+        BadgedText(alignment, text)
+    }
+}
+
+@Composable
+fun RowBadgeView() {
+    Column(
+        Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState()),
+    ) {
+        RowBadge(Alignment.TopStart, "Top start")
+        RowBadge(Alignment.TopCenter, "Top center")
+        RowBadge(Alignment.TopEnd, "Top end")
+        RowBadge(Alignment.BottomEnd, "Bottom end")
+        RowBadge(Alignment.BottomCenter, "Bottom center")
+        RowBadge(Alignment.BottomStart, "Bottom start")
+        ReverseRowBadge(Alignment.TopStart, "Top start")
+        ReverseRowBadge(Alignment.TopCenter, "Top center")
+        ReverseRowBadge(Alignment.TopEnd, "Top end")
+        ReverseRowBadge(Alignment.BottomEnd, "Bottom end")
+        ReverseRowBadge(Alignment.BottomCenter, "Bottom center")
+        ReverseRowBadge(Alignment.BottomStart, "Bottom start")
+    }
+}

app/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 
 android {
     defaultConfig {
-        val buildVersion = 268
+        val buildVersion = 277
         applicationId = "com.crisiscleanup"
         versionCode = buildVersion
         versionName = "0.9.${buildVersion - 168}"

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

@@ -20,7 +20,7 @@ class CrisisCleanupAppEnv @Inject constructor(
             val apiUrl = settingsProvider.apiBaseUrl
             return when {
                 apiUrl.startsWith("https://api.dev.crisiscleanup.io") -> "Dev"
-                apiUrl.startsWith("https://api.staging.crisiscleanup.io") -> "Staging"
+                apiUrl.startsWith("https://crisiscleanup-3-api-staging.up.railway.app") -> "Staging"
                 apiUrl.startsWith("https://api.crisiscleanup.org") -> "Production"
                 else -> "Local?"
             }

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

@@ -1,17 +1,14 @@
 package com.crisiscleanup
 
 import android.content.Intent
-import android.graphics.Color
 import android.os.Bundle
 import androidx.activity.ComponentActivity
-import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -24,7 +21,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.metrics.performance.JankStats
 import com.crisiscleanup.MainActivityViewState.Loading
-import com.crisiscleanup.MainActivityViewState.Success
 import com.crisiscleanup.core.common.NetworkMonitor
 import com.crisiscleanup.core.common.PermissionManager
 import com.crisiscleanup.core.common.PhoneNumberPicker
@@ -38,7 +34,6 @@ import com.crisiscleanup.core.data.repository.EndOfLifeRepository
 import com.crisiscleanup.core.data.repository.LanguageTranslationsRepository
 import com.crisiscleanup.core.data.repository.LocalAppMetricsRepository
 import com.crisiscleanup.core.designsystem.theme.CrisisCleanupTheme
-import com.crisiscleanup.core.model.data.DarkThemeConfig
 import com.crisiscleanup.sync.initializers.scheduleSyncWorksites
 import com.crisiscleanup.ui.CrisisCleanupApp
 import com.crisiscleanup.ui.rememberCrisisCleanupAppState
@@ -118,18 +113,15 @@ class MainActivity : ComponentActivity() {
         }
 
         setContent {
-            val darkTheme = shouldUseDarkTheme(viewState)
+            val darkTheme = isSystemInDarkTheme()
 
             val windowSizeClass = calculateWindowSizeClass(this)
             val appState = rememberCrisisCleanupAppState(
                 networkMonitor = networkMonitor,
                 windowSizeClass = windowSizeClass,
             )
 
-            enableEdgeToEdge(
-                statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT),
-                navigationBarStyle = SystemBarStyle.dark(Color.TRANSPARENT),
-            )
+            enableEdgeToEdge()
 
             CompositionLocalProvider {
                 CrisisCleanupTheme(
@@ -217,19 +209,3 @@ class MainActivity : ComponentActivity() {
         }
     }
 }
-
-/**
- * Returns `true` if dark theme should be used, as a function of the [viewState] and the
- * current system context.
- */
-@Composable
-private fun shouldUseDarkTheme(
-    viewState: MainActivityViewState,
-): Boolean = when (viewState) {
-    Loading -> isSystemInDarkTheme()
-    is Success -> when (viewState.userData.darkThemeConfig) {
-        DarkThemeConfig.FOLLOW_SYSTEM -> isSystemInDarkTheme()
-        DarkThemeConfig.LIGHT -> false
-        DarkThemeConfig.DARK -> true
-    }
-}

app/src/main/java/com/crisiscleanup/network/CrisisCleanupInterceptorProvider.kt

@@ -123,20 +123,17 @@ class CrisisCleanupInterceptorProvider @Inject constructor(
             .build()
     }
 
-    private fun isExpiredToken(response: Response, logPaths: String): Pair<Boolean, Response> {
+    private fun isExpiredToken(response: Response): Pair<Boolean, Response> {
         if (response.code == 401) {
             return Pair(true, response)
         }
-        response.body?.let { responseBody ->
+        response.body.let { responseBody ->
             val body = responseBody.string()
             val errors = json.parseNetworkErrors(body)
             val bodyCopy = body.toResponseBody(responseBody.contentType())
             val copyResponse = response.newBuilder().body(bodyCopy).build()
             return Pair(errors.hasExpiredToken, copyResponse)
         }
-        // TODO If body is null from above wouldn't response need to close (and rebuild)?
-        logger.logCapture("Token was not expired and body was null for $logPaths. Incoming exception?")
-        return Pair(false, response)
     }
 
     private val invalidRefreshTokenErrorMessages = setOf(
@@ -169,10 +166,7 @@ class CrisisCleanupInterceptorProvider @Inject constructor(
     private fun tryAuthRequest(chain: Interceptor.Chain, request: Request): Response {
         val response = chain.proceed(request)
 
-        val (isExpired, nextResponse) = isExpiredToken(
-            response,
-            request.pathsForLog,
-        )
+        val (isExpired, nextResponse) = isExpiredToken(response)
         if (isExpired) {
             logger.logCapture("Expired token trying refresh ${request.pathsForLog}")
             runBlocking {