Changes 2

app/src/main/java/com/ss/smartfilter/MainActivity.kt

@@ -1,21 +1,23 @@
 package com.ss.smartfilter
 
 import android.os.Bundle
-import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import com.ss.smartfilter.databinding.ActivityMainBinding
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.material3.Surface
 import com.ss.smartfilter.screens.FilterScreen
-import com.ss.smartfilterlib.SmartFilter
-import com.ss.smartfilterlib.utils.toast
+import com.ss.smartfilter.theme.smartFilterTheme
 
 
-class MainActivity : ComponentActivity() {
-    private lateinit var binding: ActivityMainBinding
+class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            FilterScreen()
+            smartFilterTheme() {
+                Surface {
+                    FilterScreen()
+                }
+            }
         }
     }
 

app/src/main/java/com/ss/smartfilter/theme/Color.kt

@@ -2,10 +2,7 @@ package com.ss.smartfilter.theme
 
 import androidx.compose.ui.graphics.Color
 
-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFFEFB8C8)
-
-val Purple40 = Color(0xFF6650a4)
-val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
+val purple200 = Color(0xFFBB86FC)
+val purple500 = Color(0xFF6200EE)
+val purple700 = Color(0xFF3700B3)
+val teal200 = Color(0xFF03DAC5)

app/src/main/java/com/ss/smartfilter/theme/Theme.kt

@@ -1,19 +1,62 @@
 package com.ss.smartfilter.theme
 
+import android.os.Build
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 
-private val DarkColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80
+private val DarkColorPalette = darkColorScheme(
+    primary = purple200,
+    secondary = teal200,
+    tertiary = purple700,
+    error = Color(0xFFB3261E),
+    background = Color(0xFF1C1B1F),
+    surface = Color(0xFF201F24),
+    onPrimary = Color.Black,
+    onSecondary = Color.White,
+    onBackground = Color(0xFFE6E1E5),
+    onSurface = Color(0xFFE6E1E5),
+    onError = Color.White
 )
 
-private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
-
+private val LightColorPalette = lightColorScheme(
+    primary = purple500,
+    secondary = teal200,
+    tertiary = purple700,
+    error = Color(0xFFF2B8B5),
+    surface = Color(0xFFE6E1E5),
+    background = Color(0xFFE6E1E5),
+    onPrimary = Color.White,
+    onSecondary = Color.White,
+    onBackground = Color(0xFF201F24),
+    onSurface = Color(0xFF201F24),
+    onError = Color(0xFF601410)
 )
 
+@Composable
+fun smartFilterTheme(
+    darkTheme: Boolean = false,
+    dynamicColor: Boolean = true,
+    content: @Composable () -> Unit
+) {
+    val colorScheme = when {
+        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+            val context = LocalContext.current
+            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+        }
+
+        darkTheme -> DarkColorPalette
+        else -> LightColorPalette
+    }
 
+    MaterialTheme(
+        colorScheme = colorScheme,
+        typography = Typography,
+        content = content
+    )
+}

app/src/main/res/values-night/themes.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.MultiLineRadioGroup" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.SmartFilter" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>

app/src/main/res/values/themes.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.SmartFilter" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.SmartFilter" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>

ss-smart-filter/src/main/res/drawable/multiline_default.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@android:color/transparent" />
+    <solid android:color="@android:color/white" />
 
     <stroke
         android:width="1dp"

ss-smart-filter/src/main/res/drawable/row_item_default.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@android:color/transparent" />
+    <solid android:color="@android:color/white" />
     <stroke
         android:width="0.2dp"
         android:color="@color/white" />