From aaadef3b7791f4b6d8b390f22ef907a77ec8c5dd Mon Sep 17 00:00:00 2001 From: Daniel Kift Date: Fri, 7 Aug 2026 14:11:06 +0100 Subject: [PATCH] Enable file naming lint rules Assisted-By: devx/e2f77bde-d08f-41c4-a14f-b50a215d784a --- .../common/{ModelMappingExt.kt => ID.kt} | 0 .../common/navigation/CheckoutKitNavHost.kt | 54 ------------------ .../androiddemo/common/navigation/Screen.kt | 55 +++++++++++++++++++ .../CheckoutKitAndroidDemo/detekt.config.yml | 4 +- 4 files changed, 57 insertions(+), 56 deletions(-) rename platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/{ModelMappingExt.kt => ID.kt} (100%) create mode 100644 platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/Screen.kt diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ModelMappingExt.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ID.kt similarity index 100% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ModelMappingExt.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ID.kt diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/CheckoutKitNavHost.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/CheckoutKitNavHost.kt index 25c915be8..69d5177ca 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/CheckoutKitNavHost.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/CheckoutKitNavHost.kt @@ -1,7 +1,6 @@ package com.shopify.checkoutkit.androiddemo.common.navigation import androidx.compose.runtime.Composable -import androidx.navigation.NavBackStackEntry import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable @@ -18,59 +17,6 @@ import com.shopify.checkoutkit.androiddemo.settings.SettingsView import com.shopify.checkoutkit.androiddemo.settings.SettingsViewModel import com.shopify.checkoutkit.androiddemo.settings.account.AccountView import com.shopify.checkoutkit.androiddemo.settings.authentication.LoginView -import java.net.URLEncoder -import java.nio.charset.StandardCharsets - -sealed class Screen(val route: String) { - data object Home : Screen("home") - data object Product : Screen("product/{productId}") { - fun productIdRouteVariable(backStackEntry: NavBackStackEntry): String { - return backStackEntry.arguments?.getString("productId") ?: "" - } - - fun route(productId: String): String { - return route.replace("{productId}", URLEncoder.encode(productId, StandardCharsets.UTF_8.name())) - } - } - - data object Products : Screen("product") - data object ProductCollection : Screen("collection/{collectionHandle}") { - fun collectionHandleRouteVariable(backStackEntry: NavBackStackEntry): String { - return backStackEntry.arguments?.getString("collectionHandle") ?: "" - } - - fun route(collectionHandle: String): String { - return route.replace( - "{collectionHandle}", - URLEncoder.encode(collectionHandle, StandardCharsets.UTF_8.name()) - ) - } - } - - data object Cart : Screen("cart") - data object Settings : Screen("settings") - data object Logs : Screen("logs") - data object Login : Screen("login") - data object Account : Screen("account") - - companion object { - fun fromRoute(route: String): Screen { - return when (route) { - Home.route -> Home - ProductCollection.route -> ProductCollection - Product.route -> Product - Products.route -> Products - Cart.route -> Cart - Settings.route -> Settings - Logs.route -> Logs - Login.route -> Login - Account.route -> Account - else -> throw RuntimeException("Unknown route") - } - } - } -} - @Composable fun CheckoutKitNavHost( navController: NavHostController = rememberNavController(), diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/Screen.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/Screen.kt new file mode 100644 index 000000000..c8c54db23 --- /dev/null +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/Screen.kt @@ -0,0 +1,55 @@ +package com.shopify.checkoutkit.androiddemo.common.navigation + +import androidx.navigation.NavBackStackEntry +import java.net.URLEncoder +import java.nio.charset.StandardCharsets + +sealed class Screen(val route: String) { + data object Home : Screen("home") + data object Product : Screen("product/{productId}") { + fun productIdRouteVariable(backStackEntry: NavBackStackEntry): String { + return backStackEntry.arguments?.getString("productId") ?: "" + } + + fun route(productId: String): String { + return route.replace("{productId}", URLEncoder.encode(productId, StandardCharsets.UTF_8.name())) + } + } + + data object Products : Screen("product") + data object ProductCollection : Screen("collection/{collectionHandle}") { + fun collectionHandleRouteVariable(backStackEntry: NavBackStackEntry): String { + return backStackEntry.arguments?.getString("collectionHandle") ?: "" + } + + fun route(collectionHandle: String): String { + return route.replace( + "{collectionHandle}", + URLEncoder.encode(collectionHandle, StandardCharsets.UTF_8.name()) + ) + } + } + + data object Cart : Screen("cart") + data object Settings : Screen("settings") + data object Logs : Screen("logs") + data object Login : Screen("login") + data object Account : Screen("account") + + companion object { + fun fromRoute(route: String): Screen { + return when (route) { + Home.route -> Home + ProductCollection.route -> ProductCollection + Product.route -> Product + Products.route -> Products + Cart.route -> Cart + Settings.route -> Settings + Logs.route -> Logs + Login.route -> Login + Account.route -> Account + else -> throw RuntimeException("Unknown route") + } + } + } +} diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/detekt.config.yml b/platforms/android/samples/CheckoutKitAndroidDemo/detekt.config.yml index 72a13eae4..29331f9cb 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/detekt.config.yml +++ b/platforms/android/samples/CheckoutKitAndroidDemo/detekt.config.yml @@ -20,7 +20,7 @@ naming: FunctionNaming: ignoreAnnotated: [ 'Composable', 'Test' ] MatchingDeclarationName: - active: false + active: true style: MagicNumber: @@ -40,7 +40,7 @@ style: formatting: active: true Filename: - active: false + active: true autoCorrect: true MaximumLineLength: active: true