Update project

michaelbel · Aug 23, 2024 · 89a4c88 · 89a4c88
1 parent 5edb31b
commit 89a4c88
Show file tree

Hide file tree

Showing 6 changed files with 3,116 additions and 9 deletions.
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -2,6 +2,7 @@
 
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
@@ -16,13 +17,13 @@ kotlin {
         browser {
             commonWebpackConfig {
                 outputFileName = "composeApp.js"
-                /*devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply {
+                devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply {
                     static = (static ?: mutableListOf()).apply {
                         // Serve sources to debug inside browser
                         add(project.rootDir.path)
                         add(project.projectDir.path)
                     }
-                }*/
+                }
             }
         }
         binaries.executable()
@@ -53,7 +54,6 @@ kotlin {
 
 compose.resources {
     publicResClass = true
-    packageOfResClass = "org.michaelbel.mobiledevemoji.resources"
     generateResClass = always
 }
 

diff --git a/composeApp/src/commonMain/kotlin/org/michaelbel/mobiledevemoji/MainContent.kt b/composeApp/src/commonMain/kotlin/org/michaelbel/mobiledevemoji/MainContent.kt
@@ -57,8 +57,8 @@ fun MainContent() {
                         )
                     },
                     actions = {
-                        TelegramIcon()
                         FigmaIcon()
+                        TelegramIcon()
                     }
                 )
             }

diff --git a/composeApp/src/commonMain/kotlin/org/michaelbel/mobiledevemoji/data/ProjectData.kt b/composeApp/src/commonMain/kotlin/org/michaelbel/mobiledevemoji/data/ProjectData.kt
@@ -1,8 +1,8 @@
 package org.michaelbel.mobiledevemoji.data
 
-import org.michaelbel.mobiledevemoji.resources.Res
-import org.michaelbel.mobiledevemoji.resources.ic_figma_24
-import org.michaelbel.mobiledevemoji.resources.ic_telegram_24
+import mobiledevemoji.composeapp.generated.resources.Res
+import mobiledevemoji.composeapp.generated.resources.ic_figma_24
+import mobiledevemoji.composeapp.generated.resources.ic_telegram_24
 
 const val APP_NAME = "MobileDevEmoji"
 

diff --git a/composeApp/src/commonMain/kotlin/org/michaelbel/mobiledevemoji/ui/EmojiIcon.kt b/composeApp/src/commonMain/kotlin/org/michaelbel/mobiledevemoji/ui/EmojiIcon.kt
@@ -10,9 +10,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
+import mobiledevemoji.composeapp.generated.resources.Res
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.michaelbel.mobiledevemoji.data.EmojiResponse
-import org.michaelbel.mobiledevemoji.resources.Res
 
 @Composable
 fun EmojiIcon(

diff --git a/composeApp/src/commonMain/kotlin/org/michaelbel/mobiledevemoji/ui/IconPreviewBox.kt b/composeApp/src/commonMain/kotlin/org/michaelbel/mobiledevemoji/ui/IconPreviewBox.kt
@@ -19,9 +19,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import mobiledevemoji.composeapp.generated.resources.Res
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.michaelbel.mobiledevemoji.data.EmojiResponse
-import org.michaelbel.mobiledevemoji.resources.Res
 
 @Composable
 fun IconPreviewBox(