Rename client to app

README.md

@@ -3,7 +3,7 @@
 # <img src=".idea/icon.svg" height="23"/>  NYTimes-KMP
 
 [![Build](https://github.com/xxfast/NYTimes-KMP/actions/workflows/build.yml/badge.svg)](https://github.com/xxfast/NYTimes-KMP/actions/workflows/build.yml)
-[![Kotlin](https://img.shields.io/badge/Kotlin-1.9.20-blue.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/Kotlin-2.0.10-blue.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
 
 ![badge-android](http://img.shields.io/badge/platform-android-6EDB8D.svg?style=flat)
 ![badge-wearos](http://img.shields.io/badge/platform-wearos-8ECDA0.svg?style=flat)

client/android/build.gradle.kts → app/android/build.gradle.kts

@@ -68,7 +68,7 @@ android {
 }
 
 dependencies {
-  implementation(project(":client"))
+  implementation(project(":app"))
   implementation(compose.runtime)
   implementation(compose.foundation)
   implementation(compose.material3)

client/desktop/build.gradle.kts → app/desktop/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 dependencies {
-  implementation(project(":client"))
+  implementation(project(":app"))
   implementation(compose.desktop.currentOs)
   implementation(compose.runtime)
   implementation(compose.foundation)

client/ios/ios.xcodeproj/project.pbxproj → app/ios/ios.xcodeproj/project.pbxproj

@@ -179,7 +179,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"$SRCROOT/../..\"\n./gradlew :client:embedAndSignAppleFrameworkForXcode\n";
+			shellScript = "cd \"$SRCROOT/../..\"\n./gradlew :app:embedAndSignAppleFrameworkForXcode\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -322,7 +322,7 @@
 				ENABLE_PREVIEWS = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SRCROOT)/../../client/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+					"$(SRCROOT)/../../app/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = ios/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NYTimes;
@@ -334,7 +334,7 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
-					NyTimes,
+					App,
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.xxfast.nytimes.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -355,7 +355,7 @@
 				ENABLE_PREVIEWS = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SRCROOT)/../../client/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+					"$(SRCROOT)/../../app/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = ios/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NYTimes;
@@ -367,7 +367,7 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
-					NyTimes,
+					App,
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.xxfast.nytimes.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";

client/wear/build.gradle.kts → app/wear/build.gradle.kts

@@ -73,7 +73,7 @@ android {
 }
 
 dependencies {
-  implementation(project(":client"))
+  implementation(project(":app"))
   implementation(compose.uiTooling)
   implementation(compose.materialIconsExtended)
   implementation(libs.horologist.compose.layouts)

client/web/build.gradle.kts → app/web/build.gradle.kts

@@ -13,7 +13,7 @@ kotlin {
   sourceSets {
     val jsMain by getting {
       dependencies {
-        implementation(project(":client"))
+        implementation(project(":app"))
         implementation(compose.runtime)
         implementation(compose.foundation)
         implementation(compose.material3)

client/web/src/jsMain/kotlin/io/github/xxfast/nytimes/web/Application.kt → app/web/src/jsMain/kotlin/io/github/xxfast/nytimes/web/Application.kt

@@ -8,19 +8,21 @@ import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.window.CanvasBasedWindow
+import androidx.compose.ui.window.ComposeViewport
 import io.github.xxfast.androidx.compose.material3.windowsizeclass.LocalWindowSizeClass
 import io.github.xxfast.decompose.router.LocalRouterContext
 import io.github.xxfast.decompose.router.RouterContext
 import io.github.xxfast.decompose.router.defaultRouterContext
 import io.github.xxfast.nytimes.screens.home.HomeScreen
+import kotlinx.browser.document
 import org.jetbrains.skiko.wasm.onWasmReady
 
 @OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3WindowSizeClassApi::class)
 fun main() {
   onWasmReady {
     val rootRouterContext: RouterContext = defaultRouterContext()
 
-    CanvasBasedWindow(title = "NYTime-KMP", canvasElementId = "ComposeTargetContainer") {
+    ComposeViewport(document.body!!) {
       BoxWithConstraints {
         val windowSizeClass: WindowSizeClass = calculateWindowSizeClass()
         CompositionLocalProvider(

settings.gradle.kts

@@ -15,8 +15,8 @@ dependencyResolutionManagement {
 
 rootProject.name = "NYTimes-KMP"
 
-include(":client")
-include(":client:android")
-include(":client:desktop")
-include(":client:web")
-include(":client:wear")
+include(":app")
+include(":app:android")
+include(":app:desktop")
+include(":app:web")
+include(":app:wear")