WTA #71: Fixed detekt config and code issues.

Jacob3075 · Sep 9, 2023 · c074777 · c074777
1 parent cb970ff
commit c074777
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/details/src/main/java/com/jacob/wakatimeapp/details/ui/DetailsPage.kt b/details/src/main/java/com/jacob/wakatimeapp/details/ui/DetailsPage.kt
@@ -31,6 +31,7 @@ import com.jacob.wakatimeapp.details.ui.components.TabBar
 import com.jacob.wakatimeapp.details.ui.components.Tabs
 import com.jacob.wakatimeapp.details.ui.components.TimeTab
 import com.ramcosta.composedestinations.annotation.Destination
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.launch
 
 @Composable
@@ -91,7 +92,7 @@ private fun DetailsPageLoaded(viewState: DetailsPageViewState.Loaded) {
         Tabs.Languages,
         Tabs.Editors,
         Tabs.OperatingSystems,
-    )
+    ).toImmutableList()
 
     Column {
         Spacer(modifier = Modifier.height(MaterialTheme.spacing.small))

diff --git a/details/src/main/java/com/jacob/wakatimeapp/details/ui/components/DetailsPageHeader.kt b/details/src/main/java/com/jacob/wakatimeapp/details/ui/components/DetailsPageHeader.kt
@@ -62,6 +62,6 @@ private fun DetailsPageHeaderPreview(
 private class DetailPageHeaderPreviewProvider : CollectionPreviewParameterProvider<String>(
     listOf(
         "Project Name",
-        "Some very long project name"
+        "Some very long project name",
     ),
 )
diff --git a/details/src/main/java/com/jacob/wakatimeapp/details/ui/components/TabBar.kt b/details/src/main/java/com/jacob/wakatimeapp/details/ui/components/TabBar.kt
@@ -15,24 +15,29 @@ import androidx.compose.ui.unit.dp
 import com.google.accompanist.pager.ExperimentalPagerApi
 import com.google.accompanist.pager.PagerState
 import com.jacob.wakatimeapp.core.ui.theme.spacing
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalPagerApi::class)
 @Composable
-fun TabBar(pagerState: PagerState, pages: List<Tabs>) {
+internal fun TabBar(
+    pagerState: PagerState,
+    pages: ImmutableList<Tabs>,
+    modifier: Modifier = Modifier,
+) {
     val scope = rememberCoroutineScope()
     ScrollableTabRow(
         selectedTabIndex = pagerState.currentPage,
         contentColor = MaterialTheme.colorScheme.onSurface,
         divider = { },
         edgePadding = 0.dp,
-        modifier = Modifier.fillMaxWidth(),
+        modifier = modifier.fillMaxWidth(),
     ) {
         pages.forEachIndexed { index, tab ->
             val isSelected = pagerState.currentPage == index
             Tab(
                 selected = isSelected,
-                onClick = { scope.launch { pagerState.animateScrollToPage(index) } }
+                onClick = { scope.launch { pagerState.animateScrollToPage(index) } },
             ) {
                 Text(
                     text = tab.title,

diff --git a/details/src/main/java/com/jacob/wakatimeapp/details/ui/modiffiers/PagerTabIndicatorOffset.kt b/details/src/main/java/com/jacob/wakatimeapp/details/ui/modiffiers/PagerTabIndicatorOffset.kt
@@ -30,13 +30,13 @@ fun Modifier.pagerTabIndicatorOffset(
         fraction > 0 && nextTab != null -> lerp(
             currentTab.width,
             nextTab.width,
-            fraction
+            fraction,
         ).roundToPx()
 
         fraction < 0 && previousTab != null -> lerp(
             currentTab.width,
             previousTab.width,
-            -fraction
+            -fraction,
         ).roundToPx()
 
         else -> currentTab.width.roundToPx()
@@ -46,13 +46,13 @@ fun Modifier.pagerTabIndicatorOffset(
         fraction > 0 && nextTab != null -> lerp(
             currentTab.left,
             nextTab.left,
-            fraction
+            fraction,
         ).roundToPx()
 
         fraction < 0 && previousTab != null -> lerp(
             currentTab.left,
             previousTab.left,
-            -fraction
+            -fraction,
         ).roundToPx()
 
         else -> currentTab.left.roundToPx()
@@ -63,14 +63,14 @@ fun Modifier.pagerTabIndicatorOffset(
             minWidth = indicatorWidth,
             maxWidth = indicatorWidth,
             minHeight = 0,
-            maxHeight = constraints.maxHeight
-        )
+            maxHeight = constraints.maxHeight,
+        ),
     )
 
     return@layout layout(constraints.maxWidth, maxOf(placeable.height, constraints.minHeight)) {
         placeable.placeRelative(
             indicatorOffset,
-            maxOf(constraints.minHeight - placeable.height, 0)
+            maxOf(constraints.minHeight - placeable.height, 0),
         )
     }
 }
diff --git a/tools/detekt-config.yml b/tools/detekt-config.yml
@@ -601,7 +601,7 @@ style:
     ignoreConstantDeclaration: true
     ignoreCompanionObjectPropertyDeclaration: true
     ignoreAnnotation: true
-    ignoreAnnotated: [ 'Preview', 'WtaPreviews'. 'WtaComponentPreviews', 'WtaDevicePreviews' ]
+    ignoreAnnotated: [ 'Preview', 'WtaPreviews', 'WtaComponentPreviews', 'WtaDevicePreviews' ]
     ignoreNamedArgument: true
     ignoreEnums: true
     ignoreRanges: false
@@ -712,7 +712,7 @@ style:
   UnusedPrivateMember:
     active: true
     allowedNames: '(_|ignored|expected|serialVersionUID|preview)'
-    ignoreAnnotated: [ 'Preview', 'WtaPreviews' ]
+    ignoreAnnotated: [ 'Preview', 'WtaPreviews', 'WtaComponentPreviews', 'WtaDevicePreviews' ]
   UseAnyOrNoneInsteadOfFind:
     active: true
   UseArrayLiteralsInAnnotations: