From 5f529534d5712b4ea1c771f66dc2fdafeadd7daa Mon Sep 17 00:00:00 2001
From: huixing <wanghuixing24@gmail.com>
Date: Sun, 7 Nov 2021 11:29:57 +0800
Subject: [PATCH 1/6] support multiple platforms

---
 app/build.gradle                              |  66 ------------
 app/build.gradle.kts                          | 102 ++++++++++++++++++
 app/src/main/AndroidManifest.xml              |   4 +-
 .../colorpicker/SampleColorPickerActivity.kt  |   3 -
 app/src/main/res/values-night/themes.xml      |  16 ---
 app/src/main/res/values/themes.xml            |  25 -----
 build.gradle                                  |  19 ----
 build.gradle.kts                              |  25 +++++
 color-picker/build.gradle                     |  61 -----------
 color-picker/build.gradle.kts                 |  65 +++++++++++
 .../{main => androidMain}/AndroidManifest.xml |   5 +-
 .../kotlin/me/lierxiao/common/platform.kt     |   5 +
 .../godaddy/android/colorpicker/AlphaBar.kt   |   0
 .../android/colorpicker/ClassicColorPicker.kt |   2 +-
 .../godaddy/android/colorpicker/HsvColor.kt   |  82 ++++++++++++++
 .../com/godaddy/android/colorpicker/HueBar.kt |   0
 .../colorpicker/SaturationValueArea.kt        |   0
 .../android/colorpicker/SelectorIndicator.kt  |   0
 .../godaddy/android/colorpicker/DesktopApp.kt |  10 ++
 .../godaddy/android/colorpicker/platform.kt   |   5 +
 .../godaddy/android/colorpicker/HsvColor.kt   |  76 -------------
 gradle.properties                             |   5 +-
 settings.gradle                               |  10 --
 settings.gradle.kts                           |  11 ++
 24 files changed, 313 insertions(+), 284 deletions(-)
 delete mode 100644 app/build.gradle
 create mode 100644 app/build.gradle.kts
 delete mode 100644 app/src/main/res/values-night/themes.xml
 delete mode 100644 app/src/main/res/values/themes.xml
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts
 delete mode 100644 color-picker/build.gradle
 create mode 100644 color-picker/build.gradle.kts
 rename color-picker/src/{main => androidMain}/AndroidManifest.xml (61%)
 create mode 100644 color-picker/src/androidMain/kotlin/me/lierxiao/common/platform.kt
 rename color-picker/src/{main/java => commonMain/kotlin}/com/godaddy/android/colorpicker/AlphaBar.kt (100%)
 rename color-picker/src/{main/java => commonMain/kotlin}/com/godaddy/android/colorpicker/ClassicColorPicker.kt (97%)
 create mode 100644 color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/HsvColor.kt
 rename color-picker/src/{main/java => commonMain/kotlin}/com/godaddy/android/colorpicker/HueBar.kt (100%)
 rename color-picker/src/{main/java => commonMain/kotlin}/com/godaddy/android/colorpicker/SaturationValueArea.kt (100%)
 rename color-picker/src/{main/java => commonMain/kotlin}/com/godaddy/android/colorpicker/SelectorIndicator.kt (100%)
 create mode 100644 color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/DesktopApp.kt
 create mode 100644 color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/platform.kt
 delete mode 100644 color-picker/src/main/java/com/godaddy/android/colorpicker/HsvColor.kt
 delete mode 100644 settings.gradle
 create mode 100644 settings.gradle.kts

diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index d3a8fd2..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,66 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-}
-
-android {
-    compileSdk 31
-
-    defaultConfig {
-        applicationId "com.godaddy.android.colorpicker"
-        minSdk 21
-        targetSdk 31
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-        useIR = true
-    }
-    buildFeatures {
-        compose true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-        kotlinCompilerVersion kotlin_version
-    }
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
-        }
-    }
-}
-
-dependencies {
-
-    implementation project(":color-picker")
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.activity:activity-compose:1.3.1'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..4fdab12
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,102 @@
+//plugins {
+//    id 'com.android.application'
+//    id 'kotlin-android'
+//}
+//
+//android {
+//    compileSdk 31
+//
+//    defaultConfig {
+//        applicationId "com.godaddy.android.colorpicker"
+//        minSdk 21
+//        targetSdk 31
+//        versionCode 1
+//        versionName "1.0"
+//
+//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//        vectorDrawables {
+//            useSupportLibrary true
+//        }
+//    }
+//
+//    buildTypes {
+//        release {
+//            minifyEnabled false
+//            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+//        }
+//    }
+//    compileOptions {
+//        sourceCompatibility JavaVersion.VERSION_1_8
+//        targetCompatibility JavaVersion.VERSION_1_8
+//    }
+//    kotlinOptions {
+//        jvmTarget = '1.8'
+//        useIR = true
+//    }
+//    buildFeatures {
+//        compose true
+//    }
+//    composeOptions {
+//        kotlinCompilerExtensionVersion compose_version
+//        kotlinCompilerVersion kotlin_version
+//    }
+//    packagingOptions {
+//        resources {
+//            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+//        }
+//    }
+//}
+//
+//dependencies {
+//
+//    implementation project(":color-picker")
+//    implementation 'androidx.core:core-ktx:1.6.0'
+//    implementation 'androidx.appcompat:appcompat:1.3.1'
+//    implementation 'com.google.android.material:material:1.4.0'
+//    implementation "androidx.compose.ui:ui:$compose_version"
+//    implementation "androidx.compose.material:material:$compose_version"
+//    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
+//    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+//    implementation 'androidx.activity:activity-compose:1.3.1'
+//    testImplementation 'junit:junit:4.+'
+//    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+//    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+//    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
+//    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
+//}
+
+
+plugins {
+    id("org.jetbrains.compose") version "1.0.0-beta5"
+    id("com.android.application")
+    kotlin("android")
+}
+
+group = "me.godaddy"
+version = "1.0"
+
+
+dependencies {
+    implementation(project(":color-picker"))
+    implementation ("androidx.activity:activity-compose:1.3.1")
+}
+
+android {
+    compileSdkVersion(31)
+    defaultConfig {
+        applicationId = "com.godaddy.android.colorpicker"
+        minSdkVersion(21)
+        targetSdkVersion(31)
+        versionCode = 1
+        versionName = "1.0"
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9b479ba..c8083f8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,12 +8,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.ComposeColorPicker">
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar">
         <activity
             android:name=".SampleColorPickerActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.ComposeColorPicker.NoActionBar">
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/godaddy/android/colorpicker/SampleColorPickerActivity.kt b/app/src/main/java/com/godaddy/android/colorpicker/SampleColorPickerActivity.kt
index bea66b6..954961a 100644
--- a/app/src/main/java/com/godaddy/android/colorpicker/SampleColorPickerActivity.kt
+++ b/app/src/main/java/com/godaddy/android/colorpicker/SampleColorPickerActivity.kt
@@ -23,7 +23,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ExperimentalGraphicsApi
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.godaddy.android.colorpicker.theme.ComposeColorPickerTheme
 
@@ -87,7 +86,6 @@ fun ColorPreviewInfo(currentColor: Color) {
 
 
 @ExperimentalGraphicsApi
-@Preview(showBackground = true)
 @Composable
 fun DefaultPreview() {
     ComposeColorPickerTheme {
@@ -102,7 +100,6 @@ fun DefaultPreview() {
 }
 
 @ExperimentalGraphicsApi
-@Preview(showBackground = true)
 @Composable
 fun NoAlphaBarPreview() {
     ComposeColorPickerTheme {
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 4cd385e..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.ComposeColorPicker" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
deleted file mode 100644
index 47098e8..0000000
--- a/app/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.ComposeColorPicker" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-
-    <style name="Theme.ComposeColorPicker.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="Theme.ComposeColorPicker.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="Theme.ComposeColorPicker.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-</resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index a780741..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,19 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    ext {
-        compose_version = '1.0.4'
-        kotlin_version = '1.5.31'
-    }
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:7.0.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.18.0'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..f57efff
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,25 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
+        classpath("com.android.tools.build:gradle:4.1.3")
+        classpath("com.vanniktech:gradle-maven-publish-plugin:0.18.0")
+    }
+}
+
+group = "com.godaddy"
+version = "1.0"
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    }
+}
\ No newline at end of file
diff --git a/color-picker/build.gradle b/color-picker/build.gradle
deleted file mode 100644
index 7fb94b9..0000000
--- a/color-picker/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-parcelize'
-}
-
-android {
-    compileSdk 31
-
-    defaultConfig {
-        minSdk 21
-        targetSdk 31
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-        useIR = true
-    }
-    buildFeatures {
-        compose true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-        kotlinCompilerVersion kotlin_version
-    }
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
-        }
-    }
-}
-
-dependencies {
-
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.activity:activity-compose:1.3.1'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-}
-
-apply plugin: "com.vanniktech.maven.publish"
\ No newline at end of file
diff --git a/color-picker/build.gradle.kts b/color-picker/build.gradle.kts
new file mode 100644
index 0000000..09a8bf0
--- /dev/null
+++ b/color-picker/build.gradle.kts
@@ -0,0 +1,65 @@
+import org.jetbrains.compose.compose
+
+plugins {
+    kotlin("multiplatform")
+    id("org.jetbrains.compose") version "1.0.0-beta5"
+    id("com.android.library")
+    id("kotlin-android-extensions")
+}
+
+group = "me.godaddy"
+version = "1.0"
+
+kotlin {
+    android()
+    jvm("desktop") {
+        compilations.all {
+            kotlinOptions.jvmTarget = "11"
+        }
+    }
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                api(compose.runtime)
+                api(compose.foundation)
+                api(compose.material)
+                implementation("com.github.ajalt.colormath:colormath:3.1.1")
+            }
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+            }
+        }
+        val androidMain by getting {
+            dependencies {
+                api("androidx.appcompat:appcompat:1.2.0")
+                api("androidx.core:core-ktx:1.3.1")
+            }
+        }
+        val androidTest by getting {
+            dependencies {
+                implementation("junit:junit:4.13")
+            }
+        }
+        val desktopMain by getting {
+            dependencies {
+                api(compose.preview)
+            }
+        }
+        val desktopTest by getting
+    }
+}
+
+android {
+    compileSdkVersion(31)
+    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+    defaultConfig {
+        minSdkVersion(21)
+        targetSdkVersion(31)
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
\ No newline at end of file
diff --git a/color-picker/src/main/AndroidManifest.xml b/color-picker/src/androidMain/AndroidManifest.xml
similarity index 61%
rename from color-picker/src/main/AndroidManifest.xml
rename to color-picker/src/androidMain/AndroidManifest.xml
index 98892b5..81e8a40 100644
--- a/color-picker/src/main/AndroidManifest.xml
+++ b/color-picker/src/androidMain/AndroidManifest.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.godaddy.android.colorpicker">
-
-</manifest>
\ No newline at end of file
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="me.lierxiao.common"/>
\ No newline at end of file
diff --git a/color-picker/src/androidMain/kotlin/me/lierxiao/common/platform.kt b/color-picker/src/androidMain/kotlin/me/lierxiao/common/platform.kt
new file mode 100644
index 0000000..22dc1a3
--- /dev/null
+++ b/color-picker/src/androidMain/kotlin/me/lierxiao/common/platform.kt
@@ -0,0 +1,5 @@
+package me.lierxiao.common
+
+//actual fun getPlatformName(): String {
+//    return "Android"
+//}
\ No newline at end of file
diff --git a/color-picker/src/main/java/com/godaddy/android/colorpicker/AlphaBar.kt b/color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/AlphaBar.kt
similarity index 100%
rename from color-picker/src/main/java/com/godaddy/android/colorpicker/AlphaBar.kt
rename to color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/AlphaBar.kt
diff --git a/color-picker/src/main/java/com/godaddy/android/colorpicker/ClassicColorPicker.kt b/color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/ClassicColorPicker.kt
similarity index 97%
rename from color-picker/src/main/java/com/godaddy/android/colorpicker/ClassicColorPicker.kt
rename to color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/ClassicColorPicker.kt
index 466a23b..32e72bd 100644
--- a/color-picker/src/main/java/com/godaddy/android/colorpicker/ClassicColorPicker.kt
+++ b/color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/ClassicColorPicker.kt
@@ -33,7 +33,7 @@ fun ClassicColorPicker(
     showAlphaBar: Boolean = true,
     onColorChanged: (HsvColor) -> Unit
 ) {
-    val colorPickerValueState = rememberSaveable {
+    val colorPickerValueState = rememberSaveable(stateSaver = HsvColor.Saver) {
         mutableStateOf(HsvColor.from(color))
     }
     Row(modifier = modifier) {
diff --git a/color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/HsvColor.kt b/color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/HsvColor.kt
new file mode 100644
index 0000000..31c7631
--- /dev/null
+++ b/color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/HsvColor.kt
@@ -0,0 +1,82 @@
+package com.godaddy.android.colorpicker
+
+
+/**
+ * A representation of Color in Hue, Saturation and Value form.
+ */
+import androidx.compose.runtime.saveable.Saver
+import androidx.compose.runtime.saveable.listSaver
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ExperimentalGraphicsApi
+import com.github.ajalt.colormath.model.HSV
+import com.github.ajalt.colormath.model.RGB
+
+/**
+ * A representation of Color in Hue, Saturation and Value form.
+ */
+data class HsvColor(
+
+    //from = 0.0, to = 360.0
+    val hue: Float,
+
+    //from = 0.0, to = 1.0
+    val saturation: Float,
+
+    //from = 0.0, to = 1.0
+    val value: Float,
+
+    //from = 0.0, to = 1.0
+    val alpha: Float
+) {
+
+    @ExperimentalGraphicsApi
+    fun toColor(): Color {
+        return Color.hsv(hue, saturation, value, alpha)
+    }
+
+
+    companion object {
+
+        val DEFAULT = HsvColor(360f, 1.0f, 1.0f, 1.0f)
+
+        /**
+         *  the color math hsv to local hsv color
+         */
+        private fun HSV.toColor(): HsvColor {
+            return HsvColor(
+                hue = this.h,
+                saturation = this.s,
+                value = this.v,
+                alpha = this.alpha
+            )
+        }
+
+        fun from(color: Color): HsvColor {
+            return RGB(
+                color.red,
+                color.green,
+                color.blue,
+                color.alpha,
+            ).toHSV().toColor()
+        }
+
+        val Saver: Saver<HsvColor, *> = listSaver(
+            save = {
+                listOf(
+                    it.hue,
+                    it.saturation,
+                    it.value,
+                    it.alpha
+                )
+            },
+            restore = {
+                HsvColor(
+                    it[0],
+                    it[1],
+                    it[2],
+                    it[3]
+                )
+            }
+        )
+    }
+}
diff --git a/color-picker/src/main/java/com/godaddy/android/colorpicker/HueBar.kt b/color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/HueBar.kt
similarity index 100%
rename from color-picker/src/main/java/com/godaddy/android/colorpicker/HueBar.kt
rename to color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/HueBar.kt
diff --git a/color-picker/src/main/java/com/godaddy/android/colorpicker/SaturationValueArea.kt b/color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/SaturationValueArea.kt
similarity index 100%
rename from color-picker/src/main/java/com/godaddy/android/colorpicker/SaturationValueArea.kt
rename to color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/SaturationValueArea.kt
diff --git a/color-picker/src/main/java/com/godaddy/android/colorpicker/SelectorIndicator.kt b/color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/SelectorIndicator.kt
similarity index 100%
rename from color-picker/src/main/java/com/godaddy/android/colorpicker/SelectorIndicator.kt
rename to color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/SelectorIndicator.kt
diff --git a/color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/DesktopApp.kt b/color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/DesktopApp.kt
new file mode 100644
index 0000000..1b2b3c5
--- /dev/null
+++ b/color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/DesktopApp.kt
@@ -0,0 +1,10 @@
+package me.lierxiao.common
+
+import androidx.compose.desktop.ui.tooling.preview.Preview
+import androidx.compose.runtime.Composable
+
+@Preview
+@Composable
+fun AppPreview() {
+    App()
+}
\ No newline at end of file
diff --git a/color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/platform.kt b/color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/platform.kt
new file mode 100644
index 0000000..f296db8
--- /dev/null
+++ b/color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/platform.kt
@@ -0,0 +1,5 @@
+package me.godaddy.android.colorpicker
+
+//actual fun getPlatformName(): String {
+//    return "Desktop"
+//}
\ No newline at end of file
diff --git a/color-picker/src/main/java/com/godaddy/android/colorpicker/HsvColor.kt b/color-picker/src/main/java/com/godaddy/android/colorpicker/HsvColor.kt
deleted file mode 100644
index 959b9de..0000000
--- a/color-picker/src/main/java/com/godaddy/android/colorpicker/HsvColor.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.godaddy.android.colorpicker
-
-import android.os.Parcelable
-import androidx.annotation.ColorInt
-import androidx.annotation.FloatRange
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.ExperimentalGraphicsApi
-import androidx.compose.ui.graphics.toArgb
-import kotlinx.parcelize.Parcelize
-
-/**
- * A representation of Color in Hue, Saturation and Value form.
- */
-@Parcelize
-data class HsvColor(
-
-    @FloatRange(from = 0.0, to = 360.0)
-    val hue: Float,
-
-    @FloatRange(from = 0.0, to = 1.0)
-    val saturation: Float,
-
-    @FloatRange(from = 0.0, to = 1.0)
-    val value: Float,
-
-    @FloatRange(from = 0.0, to = 1.0)
-    val alpha: Float
-) : Parcelable {
-
-    @ExperimentalGraphicsApi
-    fun toColor(): Color {
-        return Color.hsv(hue, saturation, value, alpha)
-    }
-
-    /**
-     * Transforms HsvColor to Color Int value.
-     */
-    @ColorInt
-    fun toColorInt(): Int {
-        return android.graphics.Color.HSVToColor((alpha * 255).toInt(), floatArrayOf(hue, saturation, value))
-    }
-
-    companion object {
-
-        val DEFAULT = HsvColor(360f, 1.0f, 1.0f, 1.0f)
-
-        /**
-         * Creates an HsvColor from Color Int
-         */
-        fun from(@ColorInt color: Int): HsvColor {
-            val extractedHsvArray = FloatArray(3)
-            android.graphics.Color.colorToHSV(color, extractedHsvArray)
-            return HsvColor(
-                hue = extractedHsvArray[0],
-                saturation = extractedHsvArray[1],
-                value = extractedHsvArray[2],
-                alpha = android.graphics.Color.alpha(color) / 255f
-            )
-        }
-
-        /**
-         * Creates an HsvColor from Color
-         */
-        fun from(color: Color): HsvColor {
-            val extractedHsvArray = FloatArray(3)
-            val argb = color.toArgb()
-            android.graphics.Color.colorToHSV(argb, extractedHsvArray)
-            return HsvColor(
-                hue = extractedHsvArray[0],
-                saturation = extractedHsvArray[1],
-                value = extractedHsvArray[2],
-                alpha = color.alpha
-            )
-        }
-    }
-}
diff --git a/gradle.properties b/gradle.properties
index f26cbc8..257cd22 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -37,4 +37,7 @@ POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/godaddy/compose-color-picker
 
 POM_DEVELOPER_ID=godaddy
 POM_DEVELOPER_NAME=GoDaddy
-POM_DEVELOPER_URL=https://github.com/godaddy/
\ No newline at end of file
+POM_DEVELOPER_URL=https://github.com/godaddy/
+
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+kotlin.native.enableDependencyPropagation=false
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 5674d8e..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,10 +0,0 @@
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-rootProject.name = "Compose Color Picker"
-include ':app'
-include ':color-picker'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..fd5c612
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,11 @@
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        mavenCentral()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    }
+}
+rootProject.name = "Compose Color Picker"
+include (":app")
+include (":color-picker")

From f9c540eaf17cab5f822b97aa101e873feb7ea9e5 Mon Sep 17 00:00:00 2001
From: huixing <wanghuixing24@gmail.com>
Date: Sun, 7 Nov 2021 11:49:03 +0800
Subject: [PATCH 2/6] clean

---
 app/build.gradle.kts                          | 74 ++-----------------
 color-picker/build.gradle.kts                 | 13 ++--
 .../src/androidMain/AndroidManifest.xml       |  5 +-
 .../kotlin/me/lierxiao/common/platform.kt     |  5 --
 .../godaddy/android/colorpicker/DesktopApp.kt | 10 ---
 .../godaddy/android/colorpicker/platform.kt   |  5 --
 6 files changed, 16 insertions(+), 96 deletions(-)
 delete mode 100644 color-picker/src/androidMain/kotlin/me/lierxiao/common/platform.kt
 delete mode 100644 color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/DesktopApp.kt
 delete mode 100644 color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/platform.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4fdab12..ec27111 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,70 +1,3 @@
-//plugins {
-//    id 'com.android.application'
-//    id 'kotlin-android'
-//}
-//
-//android {
-//    compileSdk 31
-//
-//    defaultConfig {
-//        applicationId "com.godaddy.android.colorpicker"
-//        minSdk 21
-//        targetSdk 31
-//        versionCode 1
-//        versionName "1.0"
-//
-//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-//        vectorDrawables {
-//            useSupportLibrary true
-//        }
-//    }
-//
-//    buildTypes {
-//        release {
-//            minifyEnabled false
-//            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-//        }
-//    }
-//    compileOptions {
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
-//    }
-//    kotlinOptions {
-//        jvmTarget = '1.8'
-//        useIR = true
-//    }
-//    buildFeatures {
-//        compose true
-//    }
-//    composeOptions {
-//        kotlinCompilerExtensionVersion compose_version
-//        kotlinCompilerVersion kotlin_version
-//    }
-//    packagingOptions {
-//        resources {
-//            excludes += '/META-INF/{AL2.0,LGPL2.1}'
-//        }
-//    }
-//}
-//
-//dependencies {
-//
-//    implementation project(":color-picker")
-//    implementation 'androidx.core:core-ktx:1.6.0'
-//    implementation 'androidx.appcompat:appcompat:1.3.1'
-//    implementation 'com.google.android.material:material:1.4.0'
-//    implementation "androidx.compose.ui:ui:$compose_version"
-//    implementation "androidx.compose.material:material:$compose_version"
-//    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-//    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-//    implementation 'androidx.activity:activity-compose:1.3.1'
-//    testImplementation 'junit:junit:4.+'
-//    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-//    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-//    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
-//    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-//}
-
 
 plugins {
     id("org.jetbrains.compose") version "1.0.0-beta5"
@@ -72,13 +5,13 @@ plugins {
     kotlin("android")
 }
 
-group = "me.godaddy"
+group = "com.godaddy"
 version = "1.0"
 
 
 dependencies {
     implementation(project(":color-picker"))
-    implementation ("androidx.activity:activity-compose:1.3.1")
+    implementation ("androidx.activity:activity-compose:1.4.0")
 }
 
 android {
@@ -94,6 +27,9 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
+    packagingOptions {
+        excludes += "/META-INF/{AL2.0,LGPL2.1}"
+    }
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
diff --git a/color-picker/build.gradle.kts b/color-picker/build.gradle.kts
index 09a8bf0..2127480 100644
--- a/color-picker/build.gradle.kts
+++ b/color-picker/build.gradle.kts
@@ -5,9 +5,10 @@ plugins {
     id("org.jetbrains.compose") version "1.0.0-beta5"
     id("com.android.library")
     id("kotlin-android-extensions")
+    id("com.vanniktech.maven.publish")
 }
 
-group = "me.godaddy"
+group = "com.godaddy"
 version = "1.0"
 
 kotlin {
@@ -33,13 +34,13 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                api("androidx.appcompat:appcompat:1.2.0")
-                api("androidx.core:core-ktx:1.3.1")
+                api("androidx.appcompat:appcompat:1.3.1")
+                api("androidx.core:core-ktx:1.6.0")
             }
         }
         val androidTest by getting {
             dependencies {
-                implementation("junit:junit:4.13")
+                implementation("junit:junit:4.13.2")
             }
         }
         val desktopMain by getting {
@@ -59,7 +60,7 @@ android {
         targetSdkVersion(31)
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 }
\ No newline at end of file
diff --git a/color-picker/src/androidMain/AndroidManifest.xml b/color-picker/src/androidMain/AndroidManifest.xml
index 81e8a40..7c5c01d 100644
--- a/color-picker/src/androidMain/AndroidManifest.xml
+++ b/color-picker/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="me.lierxiao.common"/>
\ No newline at end of file
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.godaddy.common.colorpicker">
+
+</manifest>
\ No newline at end of file
diff --git a/color-picker/src/androidMain/kotlin/me/lierxiao/common/platform.kt b/color-picker/src/androidMain/kotlin/me/lierxiao/common/platform.kt
deleted file mode 100644
index 22dc1a3..0000000
--- a/color-picker/src/androidMain/kotlin/me/lierxiao/common/platform.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package me.lierxiao.common
-
-//actual fun getPlatformName(): String {
-//    return "Android"
-//}
\ No newline at end of file
diff --git a/color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/DesktopApp.kt b/color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/DesktopApp.kt
deleted file mode 100644
index 1b2b3c5..0000000
--- a/color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/DesktopApp.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package me.lierxiao.common
-
-import androidx.compose.desktop.ui.tooling.preview.Preview
-import androidx.compose.runtime.Composable
-
-@Preview
-@Composable
-fun AppPreview() {
-    App()
-}
\ No newline at end of file
diff --git a/color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/platform.kt b/color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/platform.kt
deleted file mode 100644
index f296db8..0000000
--- a/color-picker/src/desktopMain/kotlin/me/godaddy/android/colorpicker/platform.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package me.godaddy.android.colorpicker
-
-//actual fun getPlatformName(): String {
-//    return "Desktop"
-//}
\ No newline at end of file

From edf75d44c715907fc6d87047b681b1a3610fcc00 Mon Sep 17 00:00:00 2001
From: huixing <wanghuixing24@gmail.com>
Date: Sun, 7 Nov 2021 12:16:02 +0800
Subject: [PATCH 3/6] add desktop sample

---
 desktop/.gitignore                 |  1 +
 desktop/build.gradle.kts           | 38 +++++++++++++++
 desktop/src/jvmMain/kotlin/Main.kt | 75 ++++++++++++++++++++++++++++++
 settings.gradle.kts                |  1 +
 4 files changed, 115 insertions(+)
 create mode 100644 desktop/.gitignore
 create mode 100644 desktop/build.gradle.kts
 create mode 100644 desktop/src/jvmMain/kotlin/Main.kt

diff --git a/desktop/.gitignore b/desktop/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/desktop/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
new file mode 100644
index 0000000..cbb8d28
--- /dev/null
+++ b/desktop/build.gradle.kts
@@ -0,0 +1,38 @@
+import org.jetbrains.compose.compose
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+
+plugins {
+    kotlin("multiplatform")
+    id("org.jetbrains.compose") version "1.0.0-beta5"
+}
+
+group = "me.lierxiao"
+version = "1.0"
+
+kotlin {
+    jvm {
+        compilations.all {
+            kotlinOptions.jvmTarget = "11"
+        }
+    }
+    sourceSets {
+        val jvmMain by getting {
+            dependencies {
+                implementation(project(":color-picker"))
+                implementation(compose.desktop.currentOs)
+            }
+        }
+        val jvmTest by getting
+    }
+}
+
+compose.desktop {
+    application {
+        mainClass = "MainKt"
+        nativeDistributions {
+            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
+            packageName = "jvm"
+            packageVersion = "1.0.0"
+        }
+    }
+}
\ No newline at end of file
diff --git a/desktop/src/jvmMain/kotlin/Main.kt b/desktop/src/jvmMain/kotlin/Main.kt
new file mode 100644
index 0000000..6717c68
--- /dev/null
+++ b/desktop/src/jvmMain/kotlin/Main.kt
@@ -0,0 +1,75 @@
+import androidx.compose.desktop.DesktopMaterialTheme
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ExperimentalGraphicsApi
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Window
+import androidx.compose.ui.window.application
+import com.godaddy.android.colorpicker.ClassicColorPicker
+import com.godaddy.android.colorpicker.HsvColor
+
+@OptIn(ExperimentalGraphicsApi::class)
+fun main() = application {
+    Window(onCloseRequest = ::exitApplication) {
+        DesktopMaterialTheme {
+            Surface(color = MaterialTheme.colors.background) {
+                Column {
+                    TopAppBar(title = {
+                        Text("compose desktop color picker")
+                    })
+                    val currentColor = remember {
+                        mutableStateOf(Color.Red)
+                    }
+                    ColorPreviewInfo(currentColor = currentColor.value)
+
+                    // Here is how to add a Color Picker to your compose tree:
+                    ClassicColorPicker(
+                        color = currentColor.value,
+                        modifier = Modifier
+                            .height(300.dp)
+                            .padding(16.dp),
+                        onColorChanged = { hsvColor: HsvColor ->
+                            // Triggered when the color changes, do something with the newly picked color here!
+                            currentColor.value = hsvColor.toColor()
+                        }
+                    )
+                }
+            }
+
+        }
+    }
+}
+
+@Composable
+fun ColorPreviewInfo(currentColor: Color) {
+    Column(modifier = Modifier.fillMaxWidth()) {
+        Text(
+            modifier = Modifier.padding(16.dp),
+            text = "a: ${currentColor.alpha} \n" +
+                    "r: ${currentColor.red} \n" +
+                    "g: ${currentColor.green} \n" +
+                    "b: ${currentColor.blue}"
+        )
+        Spacer(
+            modifier = Modifier
+                .background(
+                    currentColor,
+                    shape = CircleShape
+                )
+                .size(48.dp)
+                .align(Alignment.CenterHorizontally)
+        )
+        Spacer(Modifier.height(16.dp))
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index fd5c612..788c04a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,4 +8,5 @@ pluginManagement {
 }
 rootProject.name = "Compose Color Picker"
 include (":app")
+include (":desktop")
 include (":color-picker")

From c260f8f443191bb2f204c2965d4d05f76cac2240 Mon Sep 17 00:00:00 2001
From: huixing <wanghuixing24@gmail.com>
Date: Sun, 7 Nov 2021 15:58:44 +0800
Subject: [PATCH 4/6] rename

---
 desktop/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
index cbb8d28..e704579 100644
--- a/desktop/build.gradle.kts
+++ b/desktop/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.jetbrains.compose") version "1.0.0-beta5"
 }
 
-group = "me.lierxiao"
+group = "com.godaddy"
 version = "1.0"
 
 kotlin {

From fbbe03778465b3005aecf845f100c142cb4634c5 Mon Sep 17 00:00:00 2001
From: huixing <wanghuixing24@gmail.com>
Date: Sun, 7 Nov 2021 16:13:49 +0800
Subject: [PATCH 5/6] fix 'Multiply' mode not work on desktop (it seems no need
 alpha channel here and 'Modulate' mode no required Android API level 29 and
 above )

---
 .../com/godaddy/android/colorpicker/SaturationValueArea.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/SaturationValueArea.kt b/color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/SaturationValueArea.kt
index 31b140e..4dd6c09 100644
--- a/color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/SaturationValueArea.kt
+++ b/color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/SaturationValueArea.kt
@@ -68,7 +68,7 @@ internal fun SaturationValueArea(
         }
     ) {
         drawRect(blackGradientBrush)
-        drawRect(currentColorGradientBrush, blendMode = BlendMode.Multiply)
+        drawRect(currentColorGradientBrush, blendMode = BlendMode.Modulate)
         drawRect(Color.Gray, style = Stroke(0.5.dp.toPx()))
 
         drawCircleSelector(currentColor)

From d0d93baea4c72ed7ab3bed261b1f87d252a9a23b Mon Sep 17 00:00:00 2001
From: huixing <wanghuixing24@gmail.com>
Date: Sun, 7 Nov 2021 17:20:38 +0800
Subject: [PATCH 6/6] resolve changes

---
 app/build.gradle.kts                     |  1 +
 app/src/main/AndroidManifest.xml         |  4 ++--
 app/src/main/res/values-night/themes.xml | 16 +++++++++++++++
 app/src/main/res/values/themes.xml       | 25 ++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values-night/themes.xml
 create mode 100644 app/src/main/res/values/themes.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ec27111..e4fcbb8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,6 +12,7 @@ version = "1.0"
 dependencies {
     implementation(project(":color-picker"))
     implementation ("androidx.activity:activity-compose:1.4.0")
+    implementation("com.google.android.material:material:1.4.0")
 }
 
 android {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c8083f8..9b479ba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,12 +8,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        android:theme="@style/Theme.ComposeColorPicker">
         <activity
             android:name=".SampleColorPickerActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            android:theme="@style/Theme.ComposeColorPicker.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..4cd385e
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.ComposeColorPicker" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_200</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/black</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_200</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000..47098e8
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,25 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.ComposeColorPicker" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+
+    <style name="Theme.ComposeColorPicker.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="Theme.ComposeColorPicker.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="Theme.ComposeColorPicker.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+</resources>
\ No newline at end of file