Set compileSdk to 36 | Format

w2sv · w2sv · commit 70ded1410713 · 2025-08-09T22:34:45.000+02:00
diff --git a/composed-permissions/build.gradle.kts b/composed-permissions/build.gradle.kts
@@ -1,7 +1,8 @@
 plugins {
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose.compiler)
+    alias(libs.plugins.ktlint)
     `maven-publish`
 }
 
diff --git a/composed-permissions/src/main/kotlin/com/w2sv/composed/permissions/extendedpermissionstate/ExtendedMultiplePermissionsState.kt b/composed-permissions/src/main/kotlin/com/w2sv/composed/permissions/extendedpermissionstate/ExtendedMultiplePermissionsState.kt
@@ -53,7 +53,6 @@ fun rememberExtendedMultiplePermissionsState(
     defaultOnLaunchingSuppressed: () -> Unit = {},
     scope: CoroutineScope = rememberCoroutineScope()
 ): ExtendedMultiplePermissionsState {
-
     val grantedFromRequest = remember {
         MutableSharedFlow<Boolean>()
     }
@@ -79,4 +78,4 @@ fun rememberExtendedMultiplePermissionsState(
             defaultOnLaunchingSuppressed = defaultOnLaunchingSuppressed
         )
     }
-}
+}
diff --git a/composed-permissions/src/main/kotlin/com/w2sv/composed/permissions/extendedpermissionstate/ExtendedPermissionState.kt b/composed-permissions/src/main/kotlin/com/w2sv/composed/permissions/extendedpermissionstate/ExtendedPermissionState.kt
@@ -21,4 +21,4 @@ interface ExtendedPermissionState {
      * Launches the permission request if launching is not suppressed, otherwise invokes [onSuppressed].
      */
     fun launchRequest(onSuppressed: (() -> Unit)? = null)
-}
+}
diff --git a/composed-permissions/src/main/kotlin/com/w2sv/composed/permissions/extendedpermissionstate/ExtendedSinglePermissionState.kt b/composed-permissions/src/main/kotlin/com/w2sv/composed/permissions/extendedpermissionstate/ExtendedSinglePermissionState.kt
@@ -52,7 +52,6 @@ fun rememberExtendedSinglePermissionState(
     defaultOnLaunchingSuppressed: () -> Unit = {},
     scope: CoroutineScope = rememberCoroutineScope()
 ): ExtendedSinglePermissionState {
-
     val grantedFromRequest = remember {
         MutableSharedFlow<Boolean>()
     }
@@ -78,4 +77,4 @@ fun rememberExtendedSinglePermissionState(
             defaultOnLaunchingSuppressed = defaultOnLaunchingSuppressed
         )
     }
-}
+}
diff --git a/composed-permissions/src/main/kotlin/com/w2sv/composed/permissions/extensions/PermissionState.kt b/composed-permissions/src/main/kotlin/com/w2sv/composed/permissions/extensions/PermissionState.kt
@@ -10,25 +10,21 @@ import com.google.accompanist.permissions.shouldShowRationale
 fun PermissionState.isLaunchingSuppressed(launchedBefore: Boolean): Boolean =
     !status.shouldShowRationale && launchedBefore
 
-inline fun PermissionState.launchPermissionRequest(
-    launchedBefore: Boolean,
-    onSuppressed: () -> Unit
-) {
-    if (!isLaunchingSuppressed(launchedBefore))
+inline fun PermissionState.launchPermissionRequest(launchedBefore: Boolean, onSuppressed: () -> Unit) {
+    if (!isLaunchingSuppressed(launchedBefore)) {
         launchPermissionRequest()
-    else
+    } else {
         onSuppressed()
+    }
 }
 
 fun MultiplePermissionsState.isLaunchingSuppressed(launchedBefore: Boolean): Boolean =
     !shouldShowRationale && launchedBefore
 
-inline fun MultiplePermissionsState.launchMultiplePermissionRequest(
-    launchedBefore: Boolean,
-    onSuppressed: () -> Unit
-) {
-    if (!isLaunchingSuppressed(launchedBefore))
+inline fun MultiplePermissionsState.launchMultiplePermissionRequest(launchedBefore: Boolean, onSuppressed: () -> Unit) {
+    if (!isLaunchingSuppressed(launchedBefore)) {
         launchMultiplePermissionRequest()
-    else
+    } else {
         onSuppressed()
-}
+    }
+}
diff --git a/composed/build.gradle.kts b/composed/build.gradle.kts
@@ -1,8 +1,9 @@
 plugins {
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose.compiler)
+    alias(libs.plugins.kover)
+    alias(libs.plugins.ktlint)
     `maven-publish`
 }
 
diff --git a/composed/src/main/kotlin/com/w2sv/composed/DisposableEffect.kt b/composed/src/main/kotlin/com/w2sv/composed/DisposableEffect.kt
@@ -47,4 +47,4 @@ fun OnDispose(callback: () -> Unit) {
             currentCallback()
         }
     }
-}
+}
diff --git a/composed/src/main/kotlin/com/w2sv/composed/LaunchedEffect.kt b/composed/src/main/kotlin/com/w2sv/composed/LaunchedEffect.kt
@@ -53,4 +53,4 @@ fun <T> OnChange(
     LaunchedEffect(value, key1, key2) {
         updatedCallback(value)
     }
-}
+}
diff --git a/composed/src/main/kotlin/com/w2sv/composed/Layout.kt b/composed/src/main/kotlin/com/w2sv/composed/Layout.kt
@@ -22,7 +22,7 @@ fun <T> InterElementDividedColumn(
     modifier: Modifier = Modifier,
     makeDivider: @Composable ColumnScope.() -> Unit = { HorizontalDivider() },
     verticalArrangement: Arrangement.Vertical = Arrangement.Top,
-    horizontalAlignment: Alignment.Horizontal = Alignment.Start,
+    horizontalAlignment: Alignment.Horizontal = Alignment.Start
 ) {
     Column(
         modifier = modifier,
@@ -48,7 +48,7 @@ fun <T> InterElementDividedRow(
     modifier: Modifier = Modifier,
     makeDivider: @Composable RowScope.() -> Unit = { VerticalDivider() },
     horizontalArrangement: Arrangement.Horizontal = Arrangement.Start,
-    verticalAlignment: Alignment.Vertical = Alignment.Top,
+    verticalAlignment: Alignment.Vertical = Alignment.Top
 ) {
     Row(
         modifier = modifier,
@@ -62,4 +62,4 @@ fun <T> InterElementDividedRow(
             }
         }
     }
-}
+}
diff --git a/composed/src/main/kotlin/com/w2sv/composed/Orientation.kt b/composed/src/main/kotlin/com/w2sv/composed/Orientation.kt
@@ -13,4 +13,4 @@ val isLandscapeModeActive: Boolean
 val isPortraitModeActive: Boolean
     @Composable
     @ReadOnlyComposable
-    get() = LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT
+    get() = LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT
diff --git a/composed/src/main/kotlin/com/w2sv/composed/Resources.kt b/composed/src/main/kotlin/com/w2sv/composed/Resources.kt
@@ -78,8 +78,8 @@ fun Resources.getAnnotatedString(
         density = density
     )
 
-private fun Resources.getHtmlText(@StringRes id: Int, vararg args: Any): Spanned {
-    return HtmlCompat.fromHtml(
+private fun Resources.getHtmlText(@StringRes id: Int, vararg args: Any): Spanned =
+    HtmlCompat.fromHtml(
         String.format(
             getText(id).toSpanned().toHtmlWithoutParagraphs(),
             *args
@@ -88,20 +88,15 @@ private fun Resources.getHtmlText(@StringRes id: Int, vararg args: Any): Spanned
         ),
         HtmlCompat.FROM_HTML_MODE_COMPACT
     )
-}
 
-private fun Spanned.toHtmlWithoutParagraphs(): String {
-    return HtmlCompat
+private fun Spanned.toHtmlWithoutParagraphs(): String =
+    HtmlCompat
         .toHtml(this, HtmlCompat.TO_HTML_PARAGRAPH_LINES_CONSECUTIVE)
         .substringAfter("<p dir=\"ltr\">")
         .substringBeforeLast("</p>")
-}
 
-private fun spannableStringToAnnotatedString(
-    text: Spanned,
-    density: Density?
-): AnnotatedString {
-    return buildAnnotatedString {
+private fun spannableStringToAnnotatedString(text: Spanned, density: Density?): AnnotatedString =
+    buildAnnotatedString {
         append(text)
         text.getSpans(0, text.length, Any::class.java)
             .forEach { span ->
@@ -139,7 +134,9 @@ private fun spannableStringToAnnotatedString(
                         is AbsoluteSizeSpan -> {
                             density
                                 ?.run { SpanStyle(fontSize = if (span.dip) span.size.dp.toSp() else span.size.toSp()) }
-                                ?: throw IllegalArgumentException("Found AbsoluteSizeSpan but passed density null. Pass a Density to convert.")
+                                ?: throw IllegalArgumentException(
+                                    "Found AbsoluteSizeSpan but passed density null. Pass a Density to convert."
+                                )
                         }
 
                         is RelativeSizeSpan -> SpanStyle(fontSize = span.sizeChange.em)
@@ -155,4 +152,3 @@ private fun spannableStringToAnnotatedString(
                 )
             }
     }
-}
diff --git a/composed/src/main/kotlin/com/w2sv/composed/Saver.kt b/composed/src/main/kotlin/com/w2sv/composed/Saver.kt
@@ -49,10 +49,7 @@ fun <Original, Saveable> nullableListSaver(
 /**
  * [mapSaver] for an optional object of type [T], that enables you to omit the handling of the case in which the state value == null. Only the saving and restoring of the non-null instance needs to be handled.
  */
-fun <T> nullableMapSaver(
-    saveNonNull: SaverScope.(value: T) -> Map<String, Any?>,
-    restoreNonNull: (Map<String, Any?>) -> T
-): Saver<T, Any> =
+fun <T> nullableMapSaver(saveNonNull: SaverScope.(value: T) -> Map<String, Any?>, restoreNonNull: (Map<String, Any?>) -> T): Saver<T, Any> =
     mapSaver(
         save = { original ->
             original?.let { saveNonNull(it) } ?: emptyMap()
@@ -64,4 +61,4 @@ fun <T> nullableMapSaver(
                 restoreNonNull(it)
             }
         }
-    )
+    )
diff --git a/composed/src/main/kotlin/com/w2sv/composed/extensions/DimensionConversion.kt b/composed/src/main/kotlin/com/w2sv/composed/extensions/DimensionConversion.kt
@@ -7,12 +7,15 @@ import androidx.compose.ui.unit.Dp
 
 @Composable
 @ReadOnlyComposable
-fun Dp.toPx() = with(LocalDensity.current) { this@toPx.toPx() }
+fun Dp.toPx() =
+    with(LocalDensity.current) { this@toPx.toPx() }
 
 @Composable
 @ReadOnlyComposable
-fun Int.toDp() = with(LocalDensity.current) { this@toDp.toDp() }
+fun Int.toDp() =
+    with(LocalDensity.current) { this@toDp.toDp() }
 
 @Composable
 @ReadOnlyComposable
-fun Float.toDp() = with(LocalDensity.current) { this@toDp.toDp() }
+fun Float.toDp() =
+    with(LocalDensity.current) { this@toDp.toDp() }
diff --git a/composed/src/main/kotlin/com/w2sv/composed/extensions/DrawerState.kt b/composed/src/main/kotlin/com/w2sv/composed/extensions/DrawerState.kt
@@ -13,14 +13,16 @@ import androidx.compose.runtime.remember
  * @param maxWidthPx The with in pixels upon the drawer being fully expanded. If unmodified, this will equal [DrawerDefaults.MaximumDrawerWidth].
  */
 fun DrawerState.visibilityPercentage(@FloatRange(from = 0.0) maxWidthPx: Float): State<Float> {
-    return derivedStateOf { currentOffset / maxWidthPx + 1 }  // currentOffset = -MAX when completely hidden, 0 when completely visible
+    return derivedStateOf { currentOffset / maxWidthPx + 1 } // currentOffset = -MAX when completely hidden, 0 when completely visible
 }
 
 /**
  * @see visibilityPercentage
  */
 @Composable
-fun DrawerState.rememberVisibilityPercentage(@FloatRange(from = 0.0) maxWidthPx: Float = DrawerDefaults.MaximumDrawerWidth.toPx()): State<Float> =
+fun DrawerState.rememberVisibilityPercentage(
+    @FloatRange(from = 0.0) maxWidthPx: Float = DrawerDefaults.MaximumDrawerWidth.toPx()
+): State<Float> =
     remember {
         visibilityPercentage(maxWidthPx)
-    }
+    }
diff --git a/composed/src/main/kotlin/com/w2sv/composed/extensions/Map.kt b/composed/src/main/kotlin/com/w2sv/composed/extensions/Map.kt
@@ -5,4 +5,4 @@ import androidx.compose.runtime.snapshots.SnapshotStateMap
 
 fun <K, V> Map<K, V>.toMutableStateMap(): SnapshotStateMap<K, V> =
     mutableStateMapOf<K, V>()
-        .apply { putAll(this@toMutableStateMap) }
+        .apply { putAll(this@toMutableStateMap) }
diff --git a/composed/src/main/kotlin/com/w2sv/composed/extensions/Modifier.kt b/composed/src/main/kotlin/com/w2sv/composed/extensions/Modifier.kt
@@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier
 inline fun Modifier.thenIf(
     condition: Boolean,
     onFalse: Modifier.() -> Modifier = { this },
-    onTrue: Modifier.() -> Modifier = { this },
+    onTrue: Modifier.() -> Modifier = { this }
 ): Modifier =
     if (condition) {
         onTrue()
@@ -21,17 +21,11 @@ inline fun Modifier.thenIf(
 /**
  * @see Modifier.thenIf
  */
-inline fun Modifier.thenIf(
-    condition: Boolean,
-    onTrue: Modifier.() -> Modifier,
-): Modifier =
+inline fun Modifier.thenIf(condition: Boolean, onTrue: Modifier.() -> Modifier): Modifier =
     thenIf(condition = condition, onFalse = { this }, onTrue = onTrue)
 
 /**
  * A convenience function that invokes the Modifier receiver function [onNotNull] which depends on an optional [instance], if that [instance] is not null.
  */
-inline fun <T> Modifier.thenIfNotNull(
-    instance: T?,
-    onNotNull: Modifier.(T) -> Modifier,
-): Modifier =
-    instance?.let { onNotNull(it) } ?: this
+inline fun <T> Modifier.thenIfNotNull(instance: T?, onNotNull: Modifier.(T) -> Modifier): Modifier =
+    instance?.let { onNotNull(it) } ?: this
diff --git a/composed/src/main/kotlin/com/w2sv/composed/extensions/SnackbarHostState.kt b/composed/src/main/kotlin/com/w2sv/composed/extensions/SnackbarHostState.kt
@@ -32,4 +32,4 @@ suspend fun SnackbarHostState.dismissCurrentSnackbarAndShow(
         withDismissAction = withDismissAction,
         duration = duration
     )
-}
+}
diff --git a/composed/src/main/kotlin/com/w2sv/composed/extensions/TimeInterpolator.kt b/composed/src/main/kotlin/com/w2sv/composed/extensions/TimeInterpolator.kt
@@ -3,6 +3,7 @@ package com.w2sv.composed.extensions
 import android.animation.TimeInterpolator
 import androidx.compose.animation.core.Easing
 
-fun TimeInterpolator.toEasing() = Easing {
-    getInterpolation(it)
-}
+fun TimeInterpolator.toEasing() =
+    Easing {
+        getInterpolation(it)
+    }
diff --git a/composed/src/test/kotlin/com/w2sv/composed/DisposableEffectsKtTest.kt b/composed/src/test/kotlin/com/w2sv/composed/DisposableEffectsKtTest.kt
@@ -120,4 +120,4 @@ class DisposableEffectsKtTest {
         composeTestRule.activityRule.scenario.moveToState(Lifecycle.State.DESTROYED)
         assertEquals("DESTROYED", receivedTriggerState)
     }
-}
+}
diff --git a/composed/src/test/kotlin/com/w2sv/composed/ResourcesKtTest.kt b/composed/src/test/kotlin/com/w2sv/composed/ResourcesKtTest.kt
@@ -28,19 +28,23 @@ class ResourcesKtTest {
     @Test
     fun conversion() {
         composeTestRule.setContent {
-            testStyledText(id = R.string.bold,
+            testStyledText(
+                id = R.string.bold,
                 expectedSpanStyleCount = 1,
                 checkFirstSpanStyle = { it.fontWeight == FontWeight(weight = 700) }
             )
-            testStyledText(id = R.string.italic,
+            testStyledText(
+                id = R.string.italic,
                 expectedSpanStyleCount = 1,
                 checkFirstSpanStyle = { it.fontStyle == FontStyle.Italic }
             )
-            testStyledText(id = R.string.bold_italic_consecutive,
+            testStyledText(
+                id = R.string.bold_italic_consecutive,
                 expectedSpanStyleCount = 2,
                 checkFirstSpanStyle = { it.fontWeight == FontWeight(weight = 700) }
             )
-            testStyledText(id = R.string.bold_italic_nested,
+            testStyledText(
+                id = R.string.bold_italic_nested,
                 expectedSpanStyleCount = 4,
                 checkFirstSpanStyle = { it.fontWeight == FontWeight(weight = 700) }
             )
@@ -60,11 +64,13 @@ class ResourcesKtTest {
                 expectedSpanStyleCount = 1,
                 checkFirstSpanStyle = { it.textDecoration == TextDecoration.Underline }
             )
-            testStyledText(id = R.string.colored,
+            testStyledText(
+                id = R.string.colored,
                 expectedSpanStyleCount = 1,
                 checkFirstSpanStyle = { it.color == Color(0.6f, 0.0f, 1.0f, 1.0f) }
             )
-            testStyledText(id = R.string.monospace,
+            testStyledText(
+                id = R.string.monospace,
                 expectedSpanStyleCount = 1,
                 checkFirstSpanStyle = { it.fontFamily == FontFamily.Monospace }
             )
@@ -84,4 +90,4 @@ private fun testStyledText(
     println(styled.spanStyles)
     assertEquals(expectedSpanStyleCount, styled.spanStyles.size)
     assertTrue(checkFirstSpanStyle(styled.spanStyles.first().item))
-}
+}
diff --git a/composed/src/test/kotlin/com/w2sv/composed/SaverKtTest.kt b/composed/src/test/kotlin/com/w2sv/composed/SaverKtTest.kt
@@ -101,4 +101,4 @@ class SaverKtTest {
             .onNodeWithTag("nullColorText")
             .assert(hasTextExactly("null"))
     }
-}
+}
diff --git a/composed/src/test/kotlin/com/w2sv/composed/extensions/DrawerStateKtTest.kt b/composed/src/test/kotlin/com/w2sv/composed/extensions/DrawerStateKtTest.kt
diff --git a/composed/src/test/kotlin/com/w2sv/composed/extensions/MapKtTest.kt b/composed/src/test/kotlin/com/w2sv/composed/extensions/MapKtTest.kt
diff --git a/composed/src/test/kotlin/com/w2sv/composed/extensions/ModifierKtTest.kt b/composed/src/test/kotlin/com/w2sv/composed/extensions/ModifierKtTest.kt
diff --git a/composed/src/test/kotlin/com/w2sv/composed/extensions/StringKtTest.kt b/composed/src/test/kotlin/com/w2sv/composed/extensions/StringKtTest.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`plugins {`
`2`		`- alias(libs.plugins.kotlin.android)`
`3`	`2`	`alias(libs.plugins.android.library)`
	`3`	`+ alias(libs.plugins.kotlin.android)`
`4`	`4`	`alias(libs.plugins.kotlin.compose.compiler)`
	`5`	`+ alias(libs.plugins.ktlint)`
`5`	`6`	`maven-publish`
`6`	`7`	`}`
`7`	`8`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ fun rememberExtendedMultiplePermissionsState(`
`53`	`53`	`defaultOnLaunchingSuppressed: () -> Unit = {},`
`54`	`54`	`scope: CoroutineScope = rememberCoroutineScope()`
`55`	`55`	`): ExtendedMultiplePermissionsState {`
`56`		`-`
`57`	`56`	`val grantedFromRequest = remember {`
`58`	`57`	`MutableSharedFlow<Boolean>()`
`59`	`58`	`}`
`@@ -79,4 +78,4 @@ fun rememberExtendedMultiplePermissionsState(`
`79`	`78`	`defaultOnLaunchingSuppressed = defaultOnLaunchingSuppressed`
`80`	`79`	`)`
`81`	`80`	`}`
`82`		`-}`
	`81`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ fun rememberExtendedSinglePermissionState(`
`52`	`52`	`defaultOnLaunchingSuppressed: () -> Unit = {},`
`53`	`53`	`scope: CoroutineScope = rememberCoroutineScope()`
`54`	`54`	`): ExtendedSinglePermissionState {`
`55`		`-`
`56`	`55`	`val grantedFromRequest = remember {`
`57`	`56`	`MutableSharedFlow<Boolean>()`
`58`	`57`	`}`
`@@ -78,4 +77,4 @@ fun rememberExtendedSinglePermissionState(`
`78`	`77`	`defaultOnLaunchingSuppressed = defaultOnLaunchingSuppressed`
`79`	`78`	`)`
`80`	`79`	`}`
`81`		`-}`
	`80`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,4 @@ fun OnDispose(callback: () -> Unit) {`
`47`	`47`	`currentCallback()`
`48`	`48`	`}`
`49`	`49`	`}`
`50`		`-}`
	`50`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -53,4 +53,4 @@ fun <T> OnChange(`
`53`	`53`	`LaunchedEffect(value, key1, key2) {`
`54`	`54`	`updatedCallback(value)`
`55`	`55`	`}`
`56`		`-}`
	`56`	`+}`