Remove material dependency

app/build.gradle.kts

@@ -1,38 +1,39 @@
 
 plugins {
-    id("org.jetbrains.compose") version "1.3.0"
+    id("org.jetbrains.compose") version "1.5.12"
     id("com.android.application")
     kotlin("android")
 }
 
 group = "com.godaddy"
 version = "1.0"
 
-
 dependencies {
     implementation(project(":color-picker"))
-    implementation ("androidx.activity:activity-compose:1.6.1")
-    implementation("com.google.android.material:material:1.7.0")
-    implementation("androidx.navigation:navigation-runtime-ktx:2.5.3")
-    implementation("androidx.navigation:navigation-compose:2.5.3")
-    implementation(compose.material)
+    implementation ("androidx.activity:activity-compose:1.8.2")
+    implementation("com.google.android.material:material:1.11.0")
+    implementation("androidx.navigation:navigation-runtime-ktx:2.7.6")
+    implementation("androidx.navigation:navigation-compose:2.7.6")
+    implementation(compose.runtime)
+    implementation(compose.material3)
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 android {
-    compileSdk = 33
+    namespace = "com.godaddy.android.colorpicker"
+    compileSdk = 34
     defaultConfig {
         applicationId = "com.godaddy.android.colorpicker"
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    packagingOptions {
+    packaging {
         resources.excludes += "/META-INF/{AL2.0,LGPL2.1}"
     }
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.godaddy.android.colorpicker">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
@@ -12,7 +11,6 @@
         <activity
             android:name=".SampleColorPickerActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.ComposeColorPicker.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/godaddy/android/colorpicker/ClassicColorPickerScreen.kt

@@ -3,8 +3,9 @@ package com.godaddy.android.colorpicker
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -18,6 +19,7 @@ import androidx.navigation.NavController
 import com.godaddy.android.colorpicker.theme.BackButton
 import com.godaddy.android.colorpicker.theme.ComposeColorPickerTheme
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ClassicColorPickerScreen(navController: NavController) {
     Column {

app/src/main/java/com/godaddy/android/colorpicker/ColorPreviewInfo.kt

@@ -14,7 +14,7 @@ import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier

app/src/main/java/com/godaddy/android/colorpicker/HarmonyColorPickerScreen.kt

@@ -1,16 +1,7 @@
 package com.godaddy.android.colorpicker
 
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.DropdownMenu
-import androidx.compose.material.DropdownMenuItem
-import androidx.compose.material.Switch
-import androidx.compose.material.Text
-import androidx.compose.material.TextButton
-import androidx.compose.material.TopAppBar
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -25,6 +16,7 @@ import com.godaddy.android.colorpicker.harmony.ColorHarmonyMode
 import com.godaddy.android.colorpicker.harmony.HarmonyColorPicker
 import com.godaddy.android.colorpicker.theme.BackButton
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun HarmonyColorPickerScreen(navController: NavController) {
     Column {
@@ -60,23 +52,34 @@ fun HarmonyColorPickerScreen(navController: NavController) {
         DropdownMenu(expanded, onDismissRequest = {
             expanded = false
         }) {
-            ColorHarmonyMode.values().forEach {
-                DropdownMenuItem(onClick = {
-                    harmonyMode = it
-                    expanded = false
-                }) {
-                    Text(it.name)
-                }
+            ColorHarmonyMode.entries.forEach {
+                DropdownMenuItem(
+                    onClick = {
+                        harmonyMode = it
+                        expanded = false
+                    },
+                    text = {
+                        Text(it.name)
+                    }
+                )
             }
         }
-        HarmonyColorPicker(
-            modifier = Modifier.size(400.dp),
-            harmonyMode = harmonyMode,
-            color = currentColor,
-            showBrightnessBar = showBrightnessBar
-        ) { color ->
-            currentColor = color
-            extraColors = color.getColors(colorHarmonyMode = harmonyMode)
+        Column(Modifier.width(IntrinsicSize.Min)) {
+            HarmonyColorPicker(
+                modifier = Modifier.size(400.dp),
+                harmonyMode = harmonyMode,
+                color = currentColor,
+            ) { color ->
+                currentColor = color
+                extraColors = color.getColors(colorHarmonyMode = harmonyMode)
+            }
+            if (showBrightnessBar) {
+                Slider(
+                    modifier = Modifier.padding(16.dp),
+                    value = currentColor.value,
+                    onValueChange = { currentColor = currentColor.copy(value = it) }
+                )
+            }
         }
         ColorPaletteBar(modifier = Modifier.fillMaxWidth().height(70.dp), colors = extraColors)
         Row {

app/src/main/java/com/godaddy/android/colorpicker/SampleColorPickerActivity.kt

@@ -11,12 +11,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.AlertDialog
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.TextButton
-import androidx.compose.material.TopAppBar
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -44,7 +39,7 @@ class SampleColorPickerActivity : ComponentActivity() {
                 var currentColor by remember {
                     mutableStateOf(HsvColor.from(Color.Black))
                 }
-                Surface(color = MaterialTheme.colors.background) {
+                Surface {
                     val scrollState = rememberScrollState()
                     Column(modifier = Modifier.verticalScroll(scrollState)) {
                         val navController = rememberNavController()
@@ -103,6 +98,7 @@ class SampleColorPickerActivity : ComponentActivity() {
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ColorPickerTypeScreen(navController: NavController) {
     Column(modifier = Modifier.fillMaxWidth()) {

app/src/main/java/com/godaddy/android/colorpicker/theme/Components.kt

@@ -1,11 +1,10 @@
 // ktlint-disable filename
 package com.godaddy.android.colorpicker.theme
 
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.godaddy.android.colorpicker.R
@@ -19,7 +18,6 @@ fun BackButton(onBackPress: () -> Unit) {
     ) {
         Icon(
             Icons.Filled.ArrowBack,
-            tint = MaterialTheme.colors.onPrimary,
             contentDescription = stringResource(id = R.string.content_description_back_button)
         )
     }

app/src/main/java/com/godaddy/android/colorpicker/theme/ComposeColorPickerTheme.kt

@@ -1,21 +1,19 @@
 package com.godaddy.android.colorpicker.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.darkColors
-import androidx.compose.material.lightColors
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 
-private val DarkColorPalette = darkColors(
+private val DarkColorPalette = darkColorScheme(
     primary = Purple200,
-    primaryVariant = Purple700,
-    secondary = Teal200
+    secondary = Purple700,
+    tertiary = Teal200
 )
 
-private val LightColorPalette = lightColors(
+private val LightColorPalette = lightColorScheme(
     primary = Purple500,
-    primaryVariant = Purple700,
-    secondary = Teal200
+    secondary = Purple700,
+    tertiary = Teal200
 
     /* Other default colors to override
     background = Color.White,
@@ -39,7 +37,7 @@ fun ComposeColorPickerTheme(
     }
 
     MaterialTheme(
-        colors = colors,
+        colorScheme = colors,
         content = content
     )
 }

build.gradle.kts

@@ -7,8 +7,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
-        classpath("com.android.tools.build:gradle:7.3.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
+        classpath("com.android.tools.build:gradle:8.2.2")
     }
 }
 
@@ -25,6 +25,7 @@ allprojects {
 
 plugins {
     id("com.diffplug.spotless") version "6.10.0"
+    id("org.jetbrains.compose") version "1.5.12" apply false
 }
 
 apply("${project.rootDir}/gradle/spotless.gradle")