refactor: make use of when guards

Author: w2sv

build-logic/src/main/kotlin/w2sv.android-library.gradle.kts

@@ -35,4 +35,6 @@ android {
     }
 
     publishing { singleVariant("release") { withSourcesJar() } }
+
+    kotlin.compilerOptions.freeCompilerArgs.add("-Xwhen-guards")
 }

composed-core/src/main/kotlin/com/w2sv/composed/core/Resources.kt

@@ -59,7 +59,7 @@ fun rememberStyledTextResource(@StringRes id: Int, vararg formatArgs: Any): Anno
 
 /**
  * Converts a html-styled resource text to an [AnnotatedString].
- * #
+ *
  * Tested with:
  * - bold: <b>
  * - italic: <i>
@@ -103,24 +103,20 @@ private fun spannableStringToAnnotatedString(text: Spanned, density: Density?):
             .forEach { span ->
                 addStyle(
                     when (span) {
-                        is StyleSpan -> when (span.style) {
-                            Typeface.NORMAL -> SpanStyle(
-                                fontWeight = FontWeight.Normal,
-                                fontStyle = FontStyle.Normal
-                            )
-
-                            Typeface.BOLD -> SpanStyle(
-                                fontWeight = FontWeight.Bold,
-                                fontStyle = FontStyle.Normal
-                            )
+                        is StyleSpan if span.style == Typeface.NORMAL -> SpanStyle(
+                            fontWeight = FontWeight.Normal,
+                            fontStyle = FontStyle.Normal
+                        )
 
-                            Typeface.ITALIC -> SpanStyle(
-                                fontWeight = FontWeight.Normal,
-                                fontStyle = FontStyle.Italic
-                            )
+                        is StyleSpan if span.style == Typeface.BOLD -> SpanStyle(
+                            fontWeight = FontWeight.Bold,
+                            fontStyle = FontStyle.Normal
+                        )
 
-                            else -> SpanStyle()
-                        }
+                        is StyleSpan if span.style == Typeface.ITALIC -> SpanStyle(
+                            fontWeight = FontWeight.Normal,
+                            fontStyle = FontStyle.Italic
+                        )
 
                         is TypefaceSpan -> SpanStyle(
                             fontFamily = when (span.family) {
@@ -135,9 +131,7 @@ private fun spannableStringToAnnotatedString(text: Spanned, density: Density?):
                         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."
-                                )
+                                ?: error("Found AbsoluteSizeSpan but passed density null. Pass a Density to convert.")
                         }
 
                         is RelativeSizeSpan -> SpanStyle(fontSize = span.sizeChange.em)

composed-core/src/test/kotlin/com/w2sv/composed/core/ResourcesKtTest.kt

@@ -26,7 +26,7 @@ class ResourcesKtTest {
     val composeTestRule = createComposeRule()
 
     @Test
-    fun conversion() {
+    fun `test rememberStyledTextResource`() {
         composeTestRule.setContent {
             testStyledText(
                 id = R.string.bold,
@@ -87,7 +87,6 @@ private fun testStyledText(
 ) {
     val styled = rememberStyledTextResource(id = id)
     assertEquals(stringResource(id = id), styled.toString())
-    println(styled.spanStyles)
     assertEquals(expectedSpanStyleCount, styled.spanStyles.size)
     assertTrue(checkFirstSpanStyle(styled.spanStyles.first().item))
 }

composed-core/src/test/res/values/strings.xml

@@ -10,4 +10,4 @@
     <string name="underline">Sample text with <u>underline</u> to test.</string>
     <string name="colored">Sample text with <font color="#9900FF">colored</font> to test.</string>
     <string name="monospace">Sample text with <font face="monospace">monospace</font> to test.</string>
-</resources>
+</resources>