Refactor code

Author: nsh07

app/src/main/java/org/nsh07/wikireader/ui/AppScreen.kt

@@ -736,7 +736,6 @@ fun calculateGradientHeight(): () -> Float {
     return { statusBars.getTop(density).times(1.2f) }
 }
 
-
 @Serializable
 data class HomeScreen(
     val lang: String? = null,

app/src/main/java/org/nsh07/wikireader/ui/homeScreen/AppHomeScreen.kt

@@ -167,10 +167,6 @@ fun AppHomeScreen(
 
     var isRefreshing by remember { mutableStateOf(false) }
 
-    var s = homeScreenState.extract.size
-    if (s > 1) s -= 2
-    else s = 0
-
     val sendIntent: Intent = remember(homeScreenState.title, preferencesState.lang) {
         Intent()
             .apply {

app/src/main/java/org/nsh07/wikireader/ui/homeScreen/ArticleFeed.kt

@@ -328,9 +328,11 @@ fun SharedTransitionScope.ArticleFeed(
                                     Row(
                                         modifier = Modifier
                                             .clip(
-                                                if (i == it * 5) topListItemShape
-                                                else if (i == it * 5 + 4) bottomListItemShape
-                                                else middleListItemShape
+                                                when (i) {
+                                                    it * 5 -> topListItemShape
+                                                    it * 5 + 4 -> bottomListItemShape
+                                                    else -> middleListItemShape
+                                                }
                                             )
                                             .background(colorScheme.surfaceContainer)
                                             .clickable(

app/src/main/java/org/nsh07/wikireader/ui/homeScreen/AsyncWikitable.kt

@@ -109,8 +109,7 @@ fun AsyncWikitable(
                     Icon(Icons.Outlined.KeyboardArrowUp, contentDescription = null)
             }
             Text(
-                if (rows.first.isNotEmpty()) rows.first
-                else tableTitle,
+                rows.first.ifEmpty { tableTitle },
                 modifier = Modifier
                     .weight(1f)
                     .padding(vertical = 16.dp)

app/src/main/java/org/nsh07/wikireader/ui/image/PageImage.kt

@@ -34,43 +34,49 @@ fun PageImage(
     contentScale: ContentScale,
     modifier: Modifier = Modifier
 ) {
-    if (painterState is AsyncImagePainter.State.Success) {
-        Image(
-            painter = painter,
-            contentDescription = photoDesc,
-            contentScale = contentScale,
-            modifier = modifier
-                .aspectRatio(photo.width.toFloat() / photo.height.toFloat())
-                .background(if (background) Color.White else Color.Transparent)
-        )
-    } else if (painterState is AsyncImagePainter.State.Loading) {
-        Box(
-            contentAlignment = Alignment.Center,
-            modifier = modifier
-                .fillMaxWidth()
-                .aspectRatio(
-                    photo.width.toFloat() / photo.height.toFloat()
-                )
-        ) {
-            CircularWavyProgressIndicator()
+    when (painterState) {
+        is AsyncImagePainter.State.Success -> {
+            Image(
+                painter = painter,
+                contentDescription = photoDesc,
+                contentScale = contentScale,
+                modifier = modifier
+                    .aspectRatio(photo.width.toFloat() / photo.height.toFloat())
+                    .background(if (background) Color.White else Color.Transparent)
+            )
         }
-    } else {
-        Box(
-            contentAlignment = Alignment.Center,
-            modifier = modifier
-                .fillMaxWidth()
-                .aspectRatio(
-                    photo.width.toFloat() / photo.height.toFloat()
+
+        is AsyncImagePainter.State.Loading -> {
+            Box(
+                contentAlignment = Alignment.Center,
+                modifier = modifier
+                    .fillMaxWidth()
+                    .aspectRatio(
+                        photo.width.toFloat() / photo.height.toFloat()
+                    )
+            ) {
+                CircularWavyProgressIndicator()
+            }
+        }
+
+        else -> {
+            Box(
+                contentAlignment = Alignment.Center,
+                modifier = modifier
+                    .fillMaxWidth()
+                    .aspectRatio(
+                        photo.width.toFloat() / photo.height.toFloat()
+                    )
+            ) {
+                Icon(
+                    painterResource(R.drawable.error),
+                    contentDescription = stringResource(R.string.errorLoadingImage),
+                    modifier = Modifier
+                        .padding(vertical = 16.dp)
+                        .size(64.dp),
+                    tint = colorScheme.error
                 )
-        ) {
-            Icon(
-                painterResource(R.drawable.error),
-                contentDescription = stringResource(R.string.errorLoadingImage),
-                modifier = Modifier
-                    .padding(vertical = 16.dp)
-                    .size(64.dp),
-                tint = colorScheme.error
-            )
+            }
         }
     }
 }