style(format): run `./gradlew --init-script gradle/init.gradle.kts --…

…no-configuration-cache spotlessApply` to fix spotless lint + format errors in project Commands ran: - ./gradlew --init-script gradle/init.gradle.kts --no-configuration-cache spotlessCheck - ./gradlew --init-script gradle/init.gradle.kts --no-configuration-cache spotlessApply
CrisisCleanup · Aug 21, 2023 · 01ce3d5 · 01ce3d5
1 parent a55f283
commit 01ce3d5
Show file tree

Hide file tree

Showing 474 changed files with 2,255 additions and 1,819 deletions.
diff --git a/app/src/androidTest/java/com/crisiscleanup/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/crisiscleanup/ExampleInstrumentedTest.kt
@@ -19,4 +19,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         Assert.assertEquals("com.crisiscleanup.demo.debug", appContext.packageName)
     }
-}
+}
diff --git a/app/src/androidTest/java/com/crisiscleanup/ui/CrisisCleanupAppStateTest.kt b/app/src/androidTest/java/com/crisiscleanup/ui/CrisisCleanupAppStateTest.kt
@@ -58,7 +58,7 @@ class CrisisCleanupAppStateTest {
                     windowSizeClass = getCompactWindowClass(),
                     navController = navController,
                     networkMonitor = networkMonitor,
-                    coroutineScope = backgroundScope
+                    coroutineScope = backgroundScope,
                 )
             }
 
@@ -89,7 +89,7 @@ class CrisisCleanupAppStateTest {
         for (i in destinations.indices) {
             assertEquals(
                 destinations[i],
-                state.topLevelDestinations[i].name.lowercase(Locale.getDefault())
+                state.topLevelDestinations[i].name.lowercase(Locale.getDefault()),
             )
         }
     }
@@ -101,7 +101,7 @@ class CrisisCleanupAppStateTest {
                 windowSizeClass = getCompactWindowClass(),
                 navController = NavHostController(LocalContext.current),
                 networkMonitor = networkMonitor,
-                coroutineScope = backgroundScope
+                coroutineScope = backgroundScope,
             )
         }
 
@@ -116,7 +116,7 @@ class CrisisCleanupAppStateTest {
                 windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(800.dp, 800.dp)),
                 navController = NavHostController(LocalContext.current),
                 networkMonitor = networkMonitor,
-                coroutineScope = backgroundScope
+                coroutineScope = backgroundScope,
             )
         }
 
@@ -126,13 +126,12 @@ class CrisisCleanupAppStateTest {
 
     @Test
     fun CrisisCleanupAppState_showNavRail_large() = runTest {
-
         composeTestRule.setContent {
             state = CrisisCleanupAppState(
                 windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),
                 navController = NavHostController(LocalContext.current),
                 networkMonitor = networkMonitor,
-                coroutineScope = backgroundScope
+                coroutineScope = backgroundScope,
             )
         }
 
@@ -142,21 +141,20 @@ class CrisisCleanupAppStateTest {
 
     @Test
     fun stateIsOfflineWhenNetworkMonitorIsOffline() = runTest(UnconfinedTestDispatcher()) {
-
         composeTestRule.setContent {
             state = CrisisCleanupAppState(
                 windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),
                 navController = NavHostController(LocalContext.current),
                 networkMonitor = networkMonitor,
-                coroutineScope = backgroundScope
+                coroutineScope = backgroundScope,
             )
         }
 
         backgroundScope.launch { state.isOffline.collect() }
         networkMonitor.setConnected(false)
         assertEquals(
             true,
-            state.isOffline.value
+            state.isOffline.value,
         )
     }
 

diff --git a/app/src/demo/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/demo/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>

diff --git a/app/src/demoDebug/AndroidManifest.xml b/app/src/demoDebug/AndroidManifest.xml
@@ -1,7 +1,3 @@
-<!-- The application element should be a copy of the prod manifest with the additional attribute
-     android:usesCleartextTraffic="true"
-     This allows for http (non-secure) requests. The server must whitelist the device/emulator host.
--->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 

diff --git a/app/src/demoDebug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/demoDebug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>

diff --git a/app/src/demoDebug/res/values/strings.xml b/app/src/demoDebug/res/values/strings.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name_short">ccu</string>
 </resources>
diff --git a/app/src/earlybird/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/earlybird/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 

diff --git a/app/src/main/java/com/crisiscleanup/AndroidLocationProvider.kt b/app/src/main/java/com/crisiscleanup/AndroidLocationProvider.kt
@@ -53,4 +53,4 @@ class AndroidLocationProvider @Inject constructor(
         }
         return null
     }
-}
+}
diff --git a/app/src/main/java/com/crisiscleanup/AndroidPermissionManager.kt b/app/src/main/java/com/crisiscleanup/AndroidPermissionManager.kt
@@ -37,8 +37,11 @@ class AndroidPermissionManager @Inject constructor(
     private var activityWr: WeakReference<ComponentActivity> = WeakReference(null)
 
     private val screenshotReadPermission =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) READ_MEDIA_IMAGES
-        else READ_EXTERNAL_STORAGE
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            READ_MEDIA_IMAGES
+        } else {
+            READ_EXTERNAL_STORAGE
+        }
 
     override fun onCreate(owner: LifecycleOwner) {
         (owner as? ComponentActivity)?.let { activity ->
@@ -50,8 +53,11 @@ class AndroidPermissionManager @Inject constructor(
                     // Assume unchanged permission since requested
                     val permission = permissionChanges.value.first
                     val status =
-                        if (isGranted) PermissionStatus.Granted
-                        else PermissionStatus.Denied
+                        if (isGranted) {
+                            PermissionStatus.Granted
+                        } else {
+                            PermissionStatus.Denied
+                        }
                     permissionChanges.value = Pair(permission, status)
 
                     if (permission == ACCESS_COARSE_LOCATION || permission == ACCESS_FINE_LOCATION) {
@@ -67,7 +73,7 @@ class AndroidPermissionManager @Inject constructor(
 
     private fun publishLocationPermission() {
         hasLocationPermission.value = hasPermission(ACCESS_COARSE_LOCATION) ||
-                hasPermission(ACCESS_FINE_LOCATION)
+            hasPermission(ACCESS_FINE_LOCATION)
     }
 
     private fun hasPermission(permission: String): Boolean {

diff --git a/app/src/main/java/com/crisiscleanup/AppVisualAlertManager.kt b/app/src/main/java/com/crisiscleanup/AppVisualAlertManager.kt
@@ -16,4 +16,4 @@ class AppVisualAlertManager @Inject constructor() : VisualAlertManager {
     override fun setNonProductionAppAlert(show: Boolean) {
         showNonProductionAlert.set(show)
     }
-}
+}
diff --git a/app/src/main/java/com/crisiscleanup/CrisisCleanupAppEnv.kt b/app/src/main/java/com/crisiscleanup/CrisisCleanupAppEnv.kt
@@ -17,4 +17,4 @@ class CrisisCleanupAppEnv @Inject constructor() : AppEnv {
             block()
         }
     }
-}
+}
diff --git a/app/src/main/java/com/crisiscleanup/FirebaseFeedbackReceiver.kt b/app/src/main/java/com/crisiscleanup/FirebaseFeedbackReceiver.kt
@@ -17,4 +17,4 @@ class FirebaseFeedbackReceiver @Inject constructor(
 
         Firebase.appDistribution.startFeedback("Do share O_o")
     }
-}
+}
diff --git a/app/src/main/java/com/crisiscleanup/MainActivityViewModel.kt b/app/src/main/java/com/crisiscleanup/MainActivityViewModel.kt
@@ -98,8 +98,11 @@ class MainActivityViewModel @Inject constructor(
         .map {
             isAccountExpired.value = !it.areTokensValid
 
-            if (it.hasAuthenticated) AuthState.Authenticated(it)
-            else AuthState.NotAuthenticated
+            if (it.hasAuthenticated) {
+                AuthState.Authenticated(it)
+            } else {
+                AuthState.NotAuthenticated
+            }
         }
         .stateIn(
             scope = viewModelScope,
@@ -200,4 +203,4 @@ sealed interface AuthState {
     data object Loading : AuthState
     data class Authenticated(val accountData: AccountData) : AuthState
     data object NotAuthenticated : AuthState
-}
+}
diff --git a/app/src/main/java/com/crisiscleanup/di/AppModule.kt b/app/src/main/java/com/crisiscleanup/di/AppModule.kt
@@ -39,13 +39,13 @@ interface AppModule {
     @Singleton
     @Binds
     fun bindsCrisisCleanupAuthInterceptorProvider(
-        provider: CrisisCleanupAuthInterceptorProvider
+        provider: CrisisCleanupAuthInterceptorProvider,
     ): AuthInterceptorProvider
 
     @Singleton
     @Binds
     fun bindsCrisisCleanupInterceptorProvider(
-        provider: CrisisCleanupInterceptorProvider
+        provider: CrisisCleanupInterceptorProvider,
     ): RetrofitInterceptorProvider
 
     @Singleton
@@ -84,4 +84,4 @@ object AppObjectModule {
     fun firebaseAnalytics(
         @ApplicationContext context: Context,
     ): FirebaseAnalytics = FirebaseAnalytics.getInstance(context)
-}
+}
diff --git a/app/src/main/java/com/crisiscleanup/di/JankStatsModule.kt b/app/src/main/java/com/crisiscleanup/di/JankStatsModule.kt
@@ -31,7 +31,7 @@ object JankStatsModule {
     @Provides
     fun providesJankStats(
         window: Window,
-        frameListener: JankStats.OnFrameListener
+        frameListener: JankStats.OnFrameListener,
     ): JankStats {
         return JankStats.createAndTrack(window, frameListener)
     }

diff --git a/app/src/main/java/com/crisiscleanup/log/CrisisCleanupAppLogger.kt b/app/src/main/java/com/crisiscleanup/log/CrisisCleanupAppLogger.kt
@@ -41,4 +41,4 @@ class CrisisCleanupAppLogger @Inject constructor(
             crashlytics.log(message)
         }
     }
-}
+}
diff --git a/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupNavigationObserver.kt b/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupNavigationObserver.kt
@@ -23,4 +23,4 @@ class CrisisCleanupNavigationObserver @Inject constructor(
     override fun onRouteChange(route: String?, arguments: Bundle?) {
         navigationRoute.value = Pair(navigationRoute.value.second, route)
     }
-}
+}
diff --git a/app/src/main/java/com/crisiscleanup/navigation/TopLevelDestination.kt b/app/src/main/java/com/crisiscleanup/navigation/TopLevelDestination.kt
@@ -29,5 +29,5 @@ enum class TopLevelDestination(
         selectedIcon = ImageVectorIcon(CrisisCleanupIcons.Menu),
         unselectedIcon = ImageVectorIcon(CrisisCleanupIcons.Menu),
         titleTranslateKey = "nav.menu",
-    )
+    ),
 }
diff --git a/app/src/main/java/com/crisiscleanup/network/CrisisCleanupInterceptorProvider.kt b/app/src/main/java/com/crisiscleanup/network/CrisisCleanupInterceptorProvider.kt
@@ -280,4 +280,4 @@ class CrisisCleanupAuthInterceptorProvider @Inject constructor() : AuthIntercept
     }
 }
 
-private class NetworkAuthException(message: String) : IOException(message)
+private class NetworkAuthException(message: String) : IOException(message)
diff --git a/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupApp.kt b/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupApp.kt
@@ -94,7 +94,6 @@ fun CrisisCleanupApp(
 ) {
     CrisisCleanupBackground {
         Box(Modifier.fillMaxSize()) {
-
             val snackbarHostState = remember { SnackbarHostState() }
 
             val isOffline by appState.isOffline.collectAsStateWithLifecycle()
@@ -104,11 +103,13 @@ fun CrisisCleanupApp(
 
             LaunchedEffect(isOffline) {
                 val notConnectedMessage = translator("info.no_internet")
-                if (isOffline) snackbarHostState.showSnackbar(
-                    message = notConnectedMessage,
-                    duration = SnackbarDuration.Indefinite,
-                    withDismissAction = true,
-                )
+                if (isOffline) {
+                    snackbarHostState.showSnackbar(
+                        message = notConnectedMessage,
+                        duration = SnackbarDuration.Indefinite,
+                        withDismissAction = true,
+                    )
+                }
             }
 
             val authState by viewModel.authState.collectAsStateWithLifecycle()
@@ -320,8 +321,11 @@ private fun NavigableContent(
                 .padding(padding)
                 .consumeWindowInsets(padding)
                 .windowInsetsPadding(
-                    if (isFullscreen) WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal)
-                    else WindowInsets.safeDrawing,
+                    if (isFullscreen) {
+                        WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal)
+                    } else {
+                        WindowInsets.safeDrawing
+                    },
                 ),
         ) {
             if (showNavigation && appState.shouldShowNavRail) {
@@ -341,7 +345,11 @@ private fun NavigableContent(
                     if (!showNavigation &&
                         snackbarHostState.currentSnackbarData != null &&
                         keyboardVisibility == ScreenKeyboardVisibility.NotVisible
-                    ) 64.dp else 0.dp
+                    ) {
+                        64.dp
+                    } else {
+                        0.dp
+                    }
 
                 CompositionLocalProvider(
                     LocalAppLayout provides AppLayoutArea(snackbarHostState),
@@ -431,8 +439,11 @@ private fun AppHeader(
 
 @Composable
 private fun TopLevelDestination.Icon(isSelected: Boolean, description: String) {
-    val icon = if (isSelected) selectedIcon
-    else unselectedIcon
+    val icon = if (isSelected) {
+        selectedIcon
+    } else {
+        unselectedIcon
+    }
     when (icon) {
         is ImageVectorIcon -> Icon(
             imageVector = icon.imageVector,
@@ -489,7 +500,7 @@ private fun CrisisCleanupBottomBar(
                 selected = selected,
                 onClick = { onNavigateToDestination(destination) },
                 icon = { destination.Icon(selected, title) },
-                modifier = Modifier.testTag("navItem_${title}"),
+                modifier = Modifier.testTag("navItem_$title"),
                 label = {
                     Text(
                         title,

diff --git a/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupAppHeaderUiState.kt b/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupAppHeaderUiState.kt
@@ -28,4 +28,4 @@ class CrisisCleanupAppHeaderUiState @Inject constructor(
     override fun setTitle(title: String) {
         this.title.value = title
     }
-}
+}
diff --git a/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupAppState.kt b/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupAppState.kt
@@ -45,7 +45,7 @@ fun rememberCrisisCleanupAppState(
     networkMonitor: NetworkMonitor,
     navigationObserver: NavigationObserver,
     coroutineScope: CoroutineScope = rememberCoroutineScope(),
-    navController: NavHostController = rememberNavController()
+    navController: NavHostController = rememberNavController(),
 ): CrisisCleanupAppState {
     NavigationTrackingSideEffect(navController)
     NavigationObserverSideEffect(navController, navigationObserver)
@@ -97,7 +97,7 @@ class CrisisCleanupAppState(
         .stateIn(
             scope = coroutineScope,
             started = SharingStarted.WhileSubscribed(5_000),
-            initialValue = false
+            initialValue = false,
         )
 
     val hideLoginAlert: Boolean

diff --git a/app/src/main/java/com/crisiscleanup/ui/EndOfLifeView.kt b/app/src/main/java/com/crisiscleanup/ui/EndOfLifeView.kt
@@ -61,4 +61,4 @@ internal fun EndOfLifeView(
             )
         }
     }
-}
+}
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_beta_foreground"/>

diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
@@ -1,10 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   Sample backup rules file; uncomment and customize as necessary.
-   See https://developer.android.com/guide/topics/data/autobackup
-   for details.
-   Note: This file is ignored for devices older that API 31
-   See https://developer.android.com/about/versions/12/backup-restore
--->
 <full-backup-content>
     <!--
    <include domain="sharedpref" path="."/>

diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
@@ -1,8 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   Sample data extraction rules file; uncomment and customize as necessary.
-   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
-   for details.
--->
 <data-extraction-rules>
     <cloud-backup>
         <!-- TODO: Use <include> and <exclude> to control what is backed up.