Merge pull request #1 from yusuf0405/v1.0.1

V1.0.1

Author: yusuf0405

composeApp/build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(libs.versions.jvm.get().toInt())
     androidTarget {
         //https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-test.html
         instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
@@ -41,7 +41,11 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":designsystem"))
+            // Use internal library
+//            implementation(project(":designsystem"))
+            // Use remote library
+            implementation(libs.desingnsystem)
+
             implementation(compose.runtime)
             implementation(compose.foundation)
             implementation(compose.material3)
@@ -67,21 +71,20 @@ kotlin {
         jsMain.dependencies {
             implementation(compose.html.core)
         }
-
     }
 }
 
 android {
     namespace = "org.joseph.designsystem"
-    compileSdk = 35
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 35
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
 
         applicationId = "org.joseph.designsystem.androidApp"
-        versionCode = 1
-        versionName = "1.0.0"
+        versionCode = libs.versions.versionCode.get().toInt()
+        versionName = libs.versions.version.get()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -100,7 +103,7 @@ compose.desktop {
         nativeDistributions {
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
             packageName = "DesignSystem"
-            packageVersion = "1.0.0"
+            packageVersion = libs.versions.version.get()
 
             linux {
                 iconFile.set(project.file("desktopAppIcons/LinuxIcon.png"))
@@ -114,4 +117,4 @@ compose.desktop {
             }
         }
     }
-}
+}

composeApp/src/commonMain/kotlin/org/joseph/designsystem/App.kt

@@ -1,20 +1,48 @@
 package org.joseph.designsystem
 
-import androidx.compose.animation.core.*
+import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.tween
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ElevatedButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
-import designsystem.composeapp.generated.resources.*
+import designsystem.composeapp.generated.resources.IndieFlower_Regular
+import designsystem.composeapp.generated.resources.Res
+import designsystem.composeapp.generated.resources.cyclone
+import designsystem.composeapp.generated.resources.ic_cyclone
+import designsystem.composeapp.generated.resources.ic_dark_mode
+import designsystem.composeapp.generated.resources.ic_light_mode
+import designsystem.composeapp.generated.resources.ic_rotate_right
+import designsystem.composeapp.generated.resources.open_github
+import designsystem.composeapp.generated.resources.run
+import designsystem.composeapp.generated.resources.stop
+import designsystem.composeapp.generated.resources.theme
 import kotlinx.coroutines.isActive
 import org.jetbrains.compose.resources.Font
 import org.jetbrains.compose.resources.stringResource
@@ -33,11 +61,11 @@ internal fun App() = DesignSystemTheme {
         Text(
             text = stringResource(Res.string.cyclone),
             fontFamily = FontFamily(Font(Res.font.IndieFlower_Regular)),
-            style = MaterialTheme.typography.displayLarge
+            style = DesignSystemTheme.typography.titleLarge.bold,
+            color = DesignSystemTheme.colors.textPrimary
         )
 
         var isRotating by remember { mutableStateOf(false) }
-
         val rotate = remember { Animatable(0f) }
         val target = 360f
         if (isRotating) {
@@ -59,7 +87,7 @@ internal fun App() = DesignSystemTheme {
                 .padding(16.dp)
                 .run { rotate(rotate.value) },
             imageVector = vectorResource(Res.drawable.ic_cyclone),
-            colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
+            colorFilter = ColorFilter.tint(DesignSystemTheme.colors.primary),
             contentDescription = null
         )
 
@@ -72,9 +100,14 @@ internal fun App() = DesignSystemTheme {
                 Icon(vectorResource(Res.drawable.ic_rotate_right), contentDescription = null)
                 Spacer(Modifier.size(ButtonDefaults.IconSpacing))
                 Text(
-                    stringResource(if (isRotating) Res.string.stop else Res.string.run)
+                    text = stringResource(if (isRotating) Res.string.stop else Res.string.run),
+                    style = DesignSystemTheme.typography.bodySmall.bold,
+                    color = DesignSystemTheme.colors.textPrimary
                 )
-            }
+            },
+            colors = ButtonDefaults.elevatedButtonColors(
+                containerColor = DesignSystemTheme.colors.backgroundModal
+            ),
         )
 
         var isDark by LocalThemeIsDark.current
@@ -89,16 +122,27 @@ internal fun App() = DesignSystemTheme {
             content = {
                 Icon(vectorResource(icon), contentDescription = null)
                 Spacer(Modifier.size(ButtonDefaults.IconSpacing))
-                Text(stringResource(Res.string.theme))
-            }
+                Text(
+                    text = stringResource(Res.string.theme),
+                    style = DesignSystemTheme.typography.bodySmall.bold,
+                    color = DesignSystemTheme.colors.textPrimary
+                )
+            },
+            colors = ButtonDefaults.elevatedButtonColors(
+                containerColor = DesignSystemTheme.colors.backgroundModal
+            ),
         )
 
         val uriHandler = LocalUriHandler.current
         TextButton(
             modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp).widthIn(min = 200.dp),
             onClick = { uriHandler.openUri("https://github.com/terrakok") },
         ) {
-            Text(stringResource(Res.string.open_github))
+            Text(
+                text = stringResource(Res.string.open_github),
+                style = DesignSystemTheme.typography.bodyMedium.medium,
+                color = DesignSystemTheme.colors.textPrimary
+            )
         }
     }
 }

designsystem/build.gradle.kts

@@ -10,18 +10,17 @@ plugins {
     id("com.vanniktech.maven.publish") version "0.30.0"
 }
 
-group = "org.joseph.designsystem"
-version = "1.0.0"
+group = libs.versions.groupId.get()
+version = libs.versions.version.get()
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(libs.versions.jvm.get().toInt())
     jvm()
     androidTarget {
         publishLibraryVariants("release")
         withSourcesJar(publish = true)
     }
 
-
     js {
         browser()
         binaries.executable()
@@ -65,16 +64,15 @@ kotlin {
         jsMain.dependencies {
             implementation(compose.html.core)
         }
-
     }
 }
 
 android {
     namespace = "org.joseph.designsystem"
-    compileSdk = 35
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
+        minSdk = libs.versions.minSdk.get().toInt()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -92,15 +90,14 @@ dependencies {
 }
 
 mavenPublishing {
-    publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
+    publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = false)
     signAllPublications()
 }
 
-
 publishing.publications.withType<MavenPublication>()
     .configureEach {
-        groupId = "org.joseph.designsystem"
-        version = "1.0.0"
+        groupId = libs.versions.groupId.get()
+        version = libs.versions.version.get()
 
         pom {
             name.set("Designsystem")
@@ -138,15 +135,9 @@ publishing.publications.withType<MavenPublication>()
 publishing {
     repositories {
         mavenLocal()
-
         maven {
             name = "BuildDir"
             url = uri(rootProject.layout.buildDirectory.dir("maven-repo"))
         }
-
-        maven {
-
-        }
     }
-}
-
+}