WTA #82: cleaned up some detekt issues

Jacob3075 · Dec 3, 2023 · 295ee19 · 295ee19
1 parent 3f8f6b6
commit 295ee19
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 28 deletions.
diff --git a/core/models/src/main/java/com/jacob/wakatimeapp/core/models/DailyStats.kt b/core/models/src/main/java/com/jacob/wakatimeapp/core/models/DailyStats.kt
@@ -10,5 +10,4 @@ data class DailyStats(
     val mostUsedEditor: String,
     val mostUsedOs: String,
     val date: LocalDate,
-) {
-}
+)
diff --git a/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/theme/assets/Animations.kt b/core/ui/src/main/java/com/jacob/wakatimeapp/core/ui/theme/assets/Animations.kt
@@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package com.jacob.wakatimeapp.core.ui.theme.assets
 
 import androidx.annotation.RawRes
@@ -180,10 +182,10 @@ object Animations {
     )
 
     private val dataAnimations = listOf(
-//        cloudFileAccess,
-//        cloudReporting,
-//        dataCenter,
-//        networkFolder,
+        //        cloudFileAccess,
+        //        cloudReporting,
+        //        dataCenter,
+        //        networkFolder,
         transferFiles,
     )
 

diff --git a/login/src/main/java/com/jacob/wakatimeapp/login/data/dtos/StatsDTO.kt b/login/src/main/java/com/jacob/wakatimeapp/login/data/dtos/StatsDTO.kt
@@ -1,6 +1,5 @@
 package com.jacob.wakatimeapp.login.data.dtos
 
-
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

diff --git a/login/src/main/java/com/jacob/wakatimeapp/login/ui/extract/ExtractUserDataPage.kt b/login/src/main/java/com/jacob/wakatimeapp/login/ui/extract/ExtractUserDataPage.kt
@@ -20,7 +20,6 @@ import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -48,14 +47,12 @@ import timber.log.Timber
 @Destination
 fun ExtractUserDataPage(
     navigator: ExtractUserDataNavigator,
-    snackbarHostState: SnackbarHostState,
     modifier: Modifier = Modifier,
-) = ExtractUserDataScreen(navigator, snackbarHostState, modifier, hiltViewModel())
+) = ExtractUserDataScreen(navigator, modifier, hiltViewModel())
 
 @Composable
 private fun ExtractUserDataScreen(
     navigator: ExtractUserDataNavigator,
-    snackbarHostState: SnackbarHostState,
     modifier: Modifier = Modifier,
     viewModel: ExtractUseDataViewModel = hiltViewModel(),
 ) {
@@ -82,22 +79,7 @@ private fun ExtractUserDataScreen(
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        AnimatedContent(
-            targetState = viewState,
-            label = "",
-            transitionSpec = { createContentTransform() },
-            modifier = Modifier,
-            contentKey = { it is Error },
-        ) {
-            when (it) {
-                is Error -> ExtractStateAnimation(
-                    Animations.randomErrorAnimation,
-                    it.error.errorDisplayMessage(),
-                )
-
-                else -> ExtractStateAnimation(Animations.randomDataTransferAnimations, "")
-            }
-        }
+        ExtractCreationAnimation(viewState)
 
         AnimatedContent(
             targetState = viewState,
@@ -128,6 +110,26 @@ private fun ExtractUserDataScreen(
     }
 }
 
+@Composable
+private fun ExtractCreationAnimation(viewState: ViewState) {
+    AnimatedContent(
+        targetState = viewState,
+        label = "",
+        transitionSpec = { createContentTransform() },
+        modifier = Modifier,
+        contentKey = { it is Error },
+    ) {
+        when (it) {
+            is Error -> ExtractStateAnimation(
+                Animations.randomErrorAnimation,
+                it.error.errorDisplayMessage(),
+            )
+
+            else -> ExtractStateAnimation(Animations.randomDataTransferAnimations, "")
+        }
+    }
+}
+
 @Composable
 private fun IdleContent(
     createExtract: () -> Unit,

diff --git a/login/src/main/java/com/jacob/wakatimeapp/login/ui/loading/LoadingPage.kt b/login/src/main/java/com/jacob/wakatimeapp/login/ui/loading/LoadingPage.kt
@@ -71,7 +71,7 @@ private fun LoadingPageContent(
             is LoadingPageViewState.Error -> viewStateInstance.error.errorDisplayMessage()
             else -> "Loading..."
         }
-        WtaAnimation(animation = Animations.randomLoadingAnimation, text = text, modifier = modifier)
+        WtaAnimation(animation = Animations.randomLoadingAnimation, text = text)
     }
 }