Code cleanup after inspection

rozPierog · Apr 26, 2024 · 522e100 · 522e100
1 parent c5a464c
commit 522e100
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 25 deletions.
diff --git a/app/src/full/java/com/omelan/cofi/utils/InstantUtils.kt b/app/src/full/java/com/omelan/cofi/utils/InstantUtils.kt
@@ -5,7 +5,6 @@ package com.omelan.cofi.utils
 import android.app.Activity
 import android.content.Context
 
-@Suppress("unused", "unused")
 object InstantUtils {
     fun isInstantApp(@Suppress("UNUSED_PARAMETER") context: Context) = false
 

diff --git a/app/src/full/java/com/omelan/cofi/utils/WearUtils.kt b/app/src/full/java/com/omelan/cofi/utils/WearUtils.kt
@@ -1,4 +1,4 @@
-@file:Suppress("EmptyMethod", "SameReturnValue", "UNUSED_PARAMETER", "unused")
+@file:Suppress("EmptyMethod", "SameReturnValue", "UNUSED_PARAMETER")
 
 package com.omelan.cofi.utils
 

diff --git a/app/src/main/java/com/omelan/cofi/components/RecipeInfo.kt b/app/src/main/java/com/omelan/cofi/components/RecipeInfo.kt
@@ -1,9 +1,6 @@
-@file:OptIn(ExperimentalFoundationApi::class)
-
 package com.omelan.cofi.components
 
 import androidx.compose.animation.*
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.material3.HorizontalDivider

diff --git a/app/src/main/java/com/omelan/cofi/components/RecipeItem.kt b/app/src/main/java/com/omelan/cofi/components/RecipeItem.kt
@@ -1,9 +1,6 @@
-@file:OptIn(ExperimentalFoundationApi::class)
-
 package com.omelan.cofi.components
 
 import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.grid.GridCells

diff --git a/app/src/main/java/com/omelan/cofi/pages/RecipeEdit.kt b/app/src/main/java/com/omelan/cofi/pages/RecipeEdit.kt
@@ -1,7 +1,6 @@
 @file:OptIn(
     ExperimentalMaterial3Api::class,
     ExperimentalMaterial3WindowSizeClassApi::class,
-    ExperimentalComposeUiApi::class,
     ExperimentalFoundationApi::class,
     ExperimentalLayoutApi::class,
 )

diff --git a/app/src/main/java/com/omelan/cofi/pages/details/DynamicLayout.kt b/app/src/main/java/com/omelan/cofi/pages/details/DynamicLayout.kt
@@ -1,8 +1,7 @@
-@file:OptIn(ExperimentalMaterial3WindowSizeClassApi::class, ExperimentalFoundationApi::class)
+@file:OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
 
 package com.omelan.cofi.pages.details
 
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn

diff --git a/app/src/main/java/com/omelan/cofi/pages/list/RecipeListHeaderInfo.kt b/app/src/main/java/com/omelan/cofi/pages/list/RecipeListHeaderInfo.kt
@@ -9,12 +9,12 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.omelan.cofi.BuildConfig
 import com.omelan.cofi.R
 import com.omelan.cofi.components.RecipeListInfoBox

diff --git a/app/src/main/java/com/omelan/cofi/pages/settings/AppSettings.kt b/app/src/main/java/com/omelan/cofi/pages/settings/AppSettings.kt
@@ -13,13 +13,13 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.omelan.cofi.R
 import com.omelan.cofi.components.PiPAwareAppBar
 import com.omelan.cofi.components.createAppBarBehavior

diff --git a/app/src/main/java/com/omelan/cofi/utils/AnnotatedStringUtils.kt b/app/src/main/java/com/omelan/cofi/utils/AnnotatedStringUtils.kt
@@ -11,8 +11,6 @@ import androidx.compose.ui.text.style.TextDecoration
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
-const val URL_ANNOTATION = "URL"
-
 fun linkSpanStyle(color: Color) = SpanStyle(
     color = color,
     textDecoration = TextDecoration.Underline,

diff --git a/app/src/main/java/com/omelan/cofi/utils/FocusUtils.kt b/app/src/main/java/com/omelan/cofi/utils/FocusUtils.kt
@@ -1,4 +1,4 @@
-@file:Suppress("UnusedReceiverParameter", "UnusedReceiverParameter")
+@file:Suppress("UnusedReceiverParameter")
 
 package com.omelan.cofi.utils
 

diff --git a/cofi-share/build.gradle b/cofi-share/build.gradle
@@ -70,7 +70,7 @@ dependencies {
     implementation 'androidx.test:core-ktx:1.5.0'
     implementation "androidx.compose.ui:ui"
     implementation "androidx.compose.foundation:foundation"
-    implementation "androidx.compose.material:material"
+    implementation "androidx.compose.material3:material3"
     api "androidx.datastore:datastore-preferences:1.1.0"
 
     //Room

diff --git a/cofi-share/src/main/java/com/omelan/cofi/share/components/TimerText.kt b/cofi-share/src/main/java/com/omelan/cofi/share/components/TimerText.kt
@@ -5,7 +5,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue

diff --git a/wearOS/src/main/java/com/omelan/cofi/wearos/presentation/components/RecipeListItem.kt b/wearOS/src/main/java/com/omelan/cofi/wearos/presentation/components/RecipeListItem.kt
@@ -1,9 +1,12 @@
-@file:OptIn(ExperimentalWearMaterialApi::class, ExperimentalAnimationApi::class)
+@file:OptIn(ExperimentalWearMaterialApi::class)
 
 package com.omelan.cofi.wearos.presentation.components
 
 import androidx.annotation.DrawableRes
-import androidx.compose.animation.*
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -64,7 +67,9 @@ fun RecipeListItem(modifier: Modifier = Modifier, recipe: Recipe?, onClick: () -
     }
     AnimatedContent(targetState = recipe, transitionSpec = {
         fadeIn() togetherWith  fadeOut()
-    }) {
+    },
+        label = "RecipeListItemAnimation"
+    ) {
         if (it != null) {
             RecipeListItemRaw(
                 onClick = onClick,

diff --git a/wearOS/src/main/java/com/omelan/cofi/wearos/presentation/pages/details/MultiplierPage.kt b/wearOS/src/main/java/com/omelan/cofi/wearos/presentation/pages/details/MultiplierPage.kt
@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalAnimationApi::class)
-
 package com.omelan.cofi.wearos.presentation.pages.details
 
 import androidx.annotation.DrawableRes

diff --git a/wearOS/src/main/java/com/omelan/cofi/wearos/presentation/pages/details/TimerPage.kt b/wearOS/src/main/java/com/omelan/cofi/wearos/presentation/pages/details/TimerPage.kt
@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalAnimationApi::class)
-
 package com.omelan.cofi.wearos.presentation.pages.details
 
 import android.view.KeyEvent