Merge pull request #59 from 2rabs/rt/kotlin-js

✨ Kotlin/JS を追加
nitoclub · Nov 23, 2023 · 354e4b5 · 354e4b5
2 parents 345215b + 0b511c9
commit 354e4b5
Show file tree

Hide file tree

Showing 23 changed files with 92 additions and 27 deletions.
diff --git a/app/shared/build.gradle.kts b/app/shared/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("nito.primitive.kmp")
     id("nito.primitive.kmp.android")
     id("nito.primitive.kmp.ios")
+    id("nito.primitive.kmp.js")
     id("nito.primitive.kmp.compose")
     id("nito.primitive.detekt")
 }

diff --git a/app/shared/src/commonMain/kotlin/club/nito/app/shared/NitoApp.kt b/app/shared/src/commonMain/kotlin/club/nito/app/shared/NitoApp.kt
@@ -24,7 +24,7 @@ import org.koin.dsl.module
 
 @Composable
 fun NitoApp(
-    shouldKeepOnScreen: (Boolean) -> Unit,
+    shouldKeepOnScreen: (Boolean) -> Unit = {},
     modifier: Modifier = Modifier,
 ) {
     PreComposeApp {

diff --git a/app/shared/src/jsMain/kotlin/club/nito/app/shared/di/NitoDateTimeFormatterModule.js.kt b/app/shared/src/jsMain/kotlin/club/nito/app/shared/di/NitoDateTimeFormatterModule.js.kt
@@ -0,0 +1,12 @@
+package club.nito.app.shared.di
+
+import club.nito.core.common.NitoDateTimeFormatter
+import kotlinx.datetime.Instant
+
+actual fun createNitoDateTimeFormatter(): NitoDateTimeFormatter {
+    return object : NitoDateTimeFormatter {
+        override fun formatDateTimeString(instant: Instant): String {
+            return instant.toString()
+        }
+    }
+}
diff --git a/app/web/build.gradle.kts b/app/web/build.gradle.kts
@@ -1,40 +1,42 @@
 plugins {
     id("nito.primitive.kmp")
-    alias(libs.plugins.composeGradlePlugin)
+    id("nito.primitive.kmp.js")
+    id("nito.primitive.kmp.compose")
 }
 
-@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
 kotlin {
-    targetHierarchy.default()
+    applyDefaultHierarchyTemplate()
 
     js {
         browser()
         binaries.executable()
     }
 
     sourceSets {
-        val commonMain by getting {
+        val jsMain by getting {
             dependencies {
+                implementation(projects.app.shared)
+
+                implementation(projects.core.common)
+                implementation(projects.core.model)
+                implementation(projects.core.data)
+                implementation(projects.core.network)
+                implementation(projects.core.domain)
                 implementation(projects.core.designsystem)
+                implementation(projects.core.ui)
 
-                implementation(compose.runtime)
-                implementation(compose.foundation)
-                implementation(compose.material3)
+                implementation(projects.feature.top)
+                implementation(projects.feature.auth)
+                implementation(projects.feature.schedule)
+                implementation(projects.feature.settings)
+
+                implementation(compose.html.core)
                 implementation(compose.materialIconsExtended)
-                @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
-                implementation(compose.components.resources)
-            }
-        }
 
-        val commonTest by getting {
-            dependencies {
-//                implementation(kotlin("test"))
-            }
-        }
+                implementation(libs.precompose)
+                implementation(libs.kermit)
 
-        val jsMain by getting {
-            dependencies {
-                implementation(compose.html.core)
+                implementation(libs.koinCompose)
             }
         }
     }
@@ -43,6 +45,3 @@ kotlin {
 compose.experimental {
     web.application {}
 }
-
-//tasks.getByPath("jsProcessResources").dependsOn("libresGenerateResources")
-
diff --git a/app/web/src/jsMain/kotlin/main.kt b/app/web/src/jsMain/kotlin/main.kt
@@ -1,6 +1,6 @@
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.window.CanvasBasedWindow
-import club.nito.web.NitoApp
+import club.nito.app.shared.NitoApp
 import org.jetbrains.skiko.wasm.onWasmReady
 
 @OptIn(ExperimentalComposeUiApi::class)

diff --git a/app/web/src/jsMain/resources/favicon.ico b/app/web/src/jsMain/resources/favicon.ico
diff --git a/app/web/src/jsMain/resources/index.html b/app/web/src/jsMain/resources/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="ja">
 <head>
     <meta charset="UTF-8">
     <title>NITO</title>

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -54,6 +54,10 @@ gradlePlugin {
             id = "nito.primitive.kmp.android"
             implementationClass = "club.nito.primitive.KmpAndroidPlugin"
         }
+        register("kmpJs") {
+            id = "nito.primitive.kmp.js"
+            implementationClass = "club.nito.primitive.KmpJsPlugin"
+        }
         register("kmpCompose") {
             id = "nito.primitive.kmp.compose"
             implementationClass = "club.nito.primitive.KmpComposePlugin"

diff --git a/build-logic/src/main/kotlin/club/nito/convention/FeaturePlugin.kt b/build-logic/src/main/kotlin/club/nito/convention/FeaturePlugin.kt
@@ -12,6 +12,7 @@ class FeaturePlugin : Plugin<Project> {
                 apply("nito.primitive.kmp")
                 apply("nito.primitive.kmp.android")
                 apply("nito.primitive.kmp.ios")
+                apply("nito.primitive.kmp.js")
                 apply("nito.primitive.kmp.compose")
                 apply("nito.primitive.detekt")
                 apply("nito.primitive.kotest")

diff --git a/build-logic/src/main/kotlin/club/nito/primitive/KmpComposePlugin.kt b/build-logic/src/main/kotlin/club/nito/primitive/KmpComposePlugin.kt
@@ -25,7 +25,7 @@ class KmpComposePlugin : Plugin<Project> {
                             implementation(libs.library("precompose"))
                         }
                     }
-                    getByName("androidMain").apply {
+                    findByName("androidMain")?.apply {
                         dependencies {
                             implementation(libs.library("androidxActivityActivityCompose"))
                         }

diff --git a/build-logic/src/main/kotlin/club/nito/primitive/KmpJsPlugin.kt b/build-logic/src/main/kotlin/club/nito/primitive/KmpJsPlugin.kt
@@ -0,0 +1,17 @@
+package club.nito.primitive
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+@Suppress("unused")
+class KmpJsPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            kotlin {
+                js {
+                    browser()
+                }
+            }
+        }
+    }
+}
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("nito.primitive.kmp")
     id("nito.primitive.kmp.android")
     id("nito.primitive.kmp.ios")
+    id("nito.primitive.kmp.js")
     id("nito.primitive.detekt")
 }
 

diff --git a/core/common/src/jsMain/kotlin/club/nito/core/common/RandomUUID.js.kt b/core/common/src/jsMain/kotlin/club/nito/core/common/RandomUUID.js.kt
@@ -0,0 +1,8 @@
+package club.nito.core.common
+
+import kotlin.random.Random
+
+// Number of bytes in a UUID
+internal const val UUID_BYTES = 16
+
+public actual fun randomUUIDHash(): Int = Random.Default.nextBytes(UUID_BYTES).hashCode()
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("nito.primitive.kmp")
     id("nito.primitive.kmp.android")
     id("nito.primitive.kmp.ios")
+    id("nito.primitive.kmp.js")
     id("nito.primitive.detekt")
 }
 

diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("nito.primitive.kmp")
     id("nito.primitive.kmp.android")
     id("nito.primitive.kmp.ios")
+    id("nito.primitive.kmp.js")
     id("nito.primitive.detekt")
 }
 

diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("nito.primitive.kmp")
     id("nito.primitive.kmp.android")
     id("nito.primitive.kmp.ios")
+    id("nito.primitive.kmp.js")
     id("nito.primitive.kmp.compose")
     id("nito.primitive.detekt")
 }

diff --git a/core/designsystem/src/jsMain/kotlin/club/nito/core/designsystem/theme/Theme.js.kt b/core/designsystem/src/jsMain/kotlin/club/nito/core/designsystem/theme/Theme.js.kt
@@ -1,5 +1,6 @@
 package club.nito.core.designsystem.theme
 
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 
 @Composable
@@ -8,4 +9,9 @@ public actual fun NitoTheme(
     dynamicColor: Boolean,
     content: @Composable () -> Unit,
 ) {
+    MaterialTheme(
+        colorScheme = if (useDarkTheme) DarkColorScheme else LightColorScheme,
+        typography = Typography,
+        content = content,
+    )
 }
diff --git a/core/domain/build.gradle.kts b/core/domain/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("nito.primitive.kmp")
     id("nito.primitive.kmp.android")
     id("nito.primitive.kmp.ios")
+    id("nito.primitive.kmp.js")
     id("nito.primitive.detekt")
 }
 

diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("nito.primitive.kmp")
     id("nito.primitive.kmp.android")
     id("nito.primitive.kmp.ios")
+    id("nito.primitive.kmp.js")
     id("nito.primitive.detekt")
 }
 

diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("nito.primitive.kmp")
     id("nito.primitive.kmp.android")
     id("nito.primitive.kmp.ios")
+    id("nito.primitive.kmp.js")
     id("nito.primitive.detekt")
     id("nito.primitive.kmp.serialization")
 }

diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("nito.primitive.kmp")
     id("nito.primitive.kmp.android")
     id("nito.primitive.kmp.ios")
+    id("nito.primitive.kmp.js")
     id("nito.primitive.kmp.compose")
     id("nito.primitive.detekt")
 }

diff --git a/core/ui/src/jsMain/kotlin/club/nito/core/ui/ProfileImage.js.kt b/core/ui/src/jsMain/kotlin/club/nito/core/ui/ProfileImage.js.kt
@@ -0,0 +1,9 @@
+package club.nito.core.ui
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import club.nito.core.model.UserProfile
+
+@Composable
+public actual fun ProfileImage(profile: UserProfile, modifier: Modifier) {
+}
diff --git a/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreen.kt b/feature/auth/src/commonMain/kotlin/club/nito/feature/auth/LoginScreen.kt
@@ -103,7 +103,7 @@ private fun LoginScreen(
                     placeholder = { Text(text = "password") },
                     visualTransformation = PasswordVisualTransformation(),
                     keyboardOptions = KeyboardOptions(
-                        keyboardType = KeyboardType.Email,
+                        keyboardType = KeyboardType.Password,
                         imeAction = ImeAction.Done,
                     ),
                     singleLine = true,