Merge pull request #325 from touchlab/ks/UpdateKtLint

Updating KtLint

Author: KevinSchildhorn

.editorconfig

@@ -1,4 +1,23 @@
-# noinspection EditorConfigKeyCorrectness
+# .editorconfig
+root = true
+
 [*.{kt,kts}]
+end_of_line = lf
+ij_kotlin_packages_to_use_import_on_demand = true
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ij_kotlin_imports_layout = *
+ij_kotlin_indent_before_arrow_on_new_line = false
+ij_kotlin_line_break_after_multiline_when_entry = true
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than = 8
+ktlint_chain_method_rule_force_multiline_when_chain_operator_count_greater_or_equal_than = 4
 ktlint_code_style = android_studio
-ktlint_function_naming_ignore_when_annotated_with=Composable
+ktlint_enum_entry_name_casing = upper_or_camel_cases
+ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_function_signature_body_expression_wrapping = default
+ktlint_ignore_back_ticked_identifier = false
+max_line_length = 140
+parameter-list-wrapping = true

.idea/codeStyles/Project.xml

@@ -20,7 +20,7 @@ android {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
     }

app/build.gradle.kts

@@ -11,7 +11,9 @@ import co.touchlab.kermit.Logger
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.component.KoinComponent
 
-class MainActivity : ComponentActivity(), KoinComponent {
+class MainActivity :
+    ComponentActivity(),
+    KoinComponent {
 
     private val log: Logger by injectLogger("MainActivity")
     private val viewModel: BreedViewModel by viewModel()

app/src/main/kotlin/co/touchlab/kampkit/android/MainActivity.kt

@@ -22,14 +22,14 @@ class MainApp : Application() {
                 single<SharedPreferences> {
                     get<Context>().getSharedPreferences(
                         "KAMPSTARTER_SETTINGS",
-                        Context.MODE_PRIVATE
+                        Context.MODE_PRIVATE,
                     )
                 }
                 single<AppInfo> { AndroidAppInfo }
                 single {
                     { Log.i("Startup", "Hello from Android/Kotlin!") }
                 }
-            }
+            },
         )
     }
 }

app/src/main/kotlin/co/touchlab/kampkit/android/MainApp.kt

@@ -55,7 +55,7 @@ fun MainScreen(viewModel: BreedViewModel, log: Logger) {
         onRefresh = { scope.launch { viewModel.refreshBreeds() } },
         onSuccess = { data -> log.v { "View updating with ${data.size} breeds" } },
         onError = { exception -> log.e { "Displaying error: $exception" } },
-        onFavorite = { scope.launch { viewModel.updateBreedFavorite(it) } }
+        onFavorite = { scope.launch { viewModel.updateBreedFavorite(it) } },
     )
 }
 
@@ -66,11 +66,11 @@ fun MainScreenContent(
     onRefresh: () -> Unit = {},
     onSuccess: (List<Breed>) -> Unit = {},
     onError: (String) -> Unit = {},
-    onFavorite: (Breed) -> Unit = {}
+    onFavorite: (Breed) -> Unit = {},
 ) {
     Surface(
         color = MaterialTheme.colors.background,
-        modifier = Modifier.fillMaxSize()
+        modifier = Modifier.fillMaxSize(),
     ) {
         val refreshState = rememberPullRefreshState(dogsState.isLoading, onRefresh)
 
@@ -97,7 +97,7 @@ fun MainScreenContent(
             PullRefreshIndicator(
                 dogsState.isLoading,
                 refreshState,
-                Modifier.align(Alignment.TopCenter)
+                Modifier.align(Alignment.TopCenter),
             )
         }
     }
@@ -110,7 +110,7 @@ fun Empty() {
             .fillMaxSize()
             .verticalScroll(rememberScrollState()),
         verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally
+        horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         Text(stringResource(R.string.empty_breeds))
     }
@@ -123,7 +123,7 @@ fun Error(error: String) {
             .fillMaxSize()
             .verticalScroll(rememberScrollState()),
         verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally
+        horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         Text(text = error)
     }
@@ -151,7 +151,7 @@ fun DogRow(breed: Breed, onClick: (Breed) -> Unit) {
     Row(
         Modifier
             .clickable { onClick(breed) }
-            .padding(10.dp)
+            .padding(10.dp),
     ) {
         Text(breed.name, Modifier.weight(1F))
         FavoriteIcon(breed)
@@ -164,19 +164,19 @@ fun FavoriteIcon(breed: Breed) {
         targetState = !breed.favorite,
         animationSpec = TweenSpec(
             durationMillis = 500,
-            easing = FastOutSlowInEasing
+            easing = FastOutSlowInEasing,
         ),
-        label = "CrossFadeFavoriteIcon"
+        label = "CrossFadeFavoriteIcon",
     ) { fav ->
         if (fav) {
             Image(
                 painter = painterResource(id = R.drawable.ic_favorite_border_24px),
-                contentDescription = stringResource(R.string.favorite_breed, breed.name)
+                contentDescription = stringResource(R.string.favorite_breed, breed.name),
             )
         } else {
             Image(
                 painter = painterResource(id = R.drawable.ic_favorite_24px),
-                contentDescription = stringResource(R.string.unfavorite_breed, breed.name)
+                contentDescription = stringResource(R.string.unfavorite_breed, breed.name),
             )
         }
     }
@@ -189,9 +189,9 @@ fun MainScreenContentPreview_Success() {
         dogsState = BreedViewState.Content(
             breeds = listOf(
                 Breed(0, "appenzeller", false),
-                Breed(1, "australian", true)
-            )
-        )
+                Breed(1, "australian", true),
+            ),
+        ),
     )
 }
 

app/src/main/kotlin/co/touchlab/kampkit/android/ui/Composables.kt

@@ -7,5 +7,5 @@ import androidx.compose.ui.unit.dp
 val Shapes = Shapes(
     small = RoundedCornerShape(4.dp),
     medium = RoundedCornerShape(4.dp),
-    large = RoundedCornerShape(0.dp)
+    large = RoundedCornerShape(0.dp),
 )

app/src/main/kotlin/co/touchlab/kampkit/android/ui/theme/Shapes.kt

@@ -9,13 +9,13 @@ import androidx.compose.runtime.Composable
 private val DarkColorPalette = darkColors(
     primary = Purple200,
     primaryVariant = Purple700,
-    secondary = Teal200
+    secondary = Teal200,
 )
 
 private val LightColorPalette = lightColors(
     primary = Purple500,
     primaryVariant = Purple700,
-    secondary = Teal200
+    secondary = Teal200,
 
     // Other default colors to override
     //
@@ -39,6 +39,6 @@ fun KaMPKitTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composabl
         colors = colors,
         typography = Typography,
         shapes = Shapes,
-        content = content
+        content = content,
     )
 }

app/src/main/kotlin/co/touchlab/kampkit/android/ui/theme/Theme.kt

@@ -11,8 +11,8 @@ val Typography = Typography(
     body1 = TextStyle(
         fontFamily = FontFamily.Default,
         fontWeight = FontWeight.Normal,
-        fontSize = 16.sp
-    )
+        fontSize = 16.sp,
+    ),
     // Other default text styles to override
     //
     // button = TextStyle(

app/src/main/kotlin/co/touchlab/kampkit/android/ui/theme/Typography.kt

@@ -14,9 +14,17 @@ subprojects {
     apply(plugin = rootProject.libs.plugins.ktlint.get().pluginId)
 
     configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
+        version.set("1.4.0")
+        enableExperimentalRules.set(true)
         verbose.set(true)
         filter {
             exclude { it.file.path.contains("build/") }
         }
     }
+
+    afterEvaluate {
+        tasks.named("check") {
+            dependsOn(tasks.getByName("ktlintCheck"))
+        }
+    }
 }