Merge pull request #262 from naz013/feature/REM-905_Update_theme_colors

REM-905 - Update theme colors

Author: naz013

app/build.gradle.kts

@@ -10,6 +10,7 @@ plugins {
   alias(libs.plugins.crashlytics.gradle)
   alias(libs.plugins.google.services)
   alias(libs.plugins.ktlint)
+  alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -31,6 +32,7 @@ android {
   buildFeatures {
     viewBinding = true
     buildConfig = true
+    compose = true
   }
 
   val propsFile = file("${rootProject.rootDir}/keystore.properties")
@@ -138,6 +140,9 @@ android {
       }
     }
   }
+  composeOptions {
+    kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get()
+  }
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
@@ -282,6 +287,12 @@ dependencies {
   implementation(libs.slf4j.api)
   implementation(libs.logback.android)
 
+  implementation(platform(libs.compose.bom))
+  implementation(libs.compose.material3)
+
+  debugImplementation(libs.compose.ui.test.manifest)
+  debugImplementation(libs.compose.ui.tooling.preview)
+
   testImplementation(libs.junit)
   testImplementation(libs.androidx.test.core)
   testImplementation(libs.mockk)

app/src/main/res/layout/fragment_google_tasks.xml

@@ -97,6 +97,7 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
+        android:background="?android:colorBackground"
         android:visibility="gone"
         tools:visibility="visible">
 

gradle/libs.versions.toml

@@ -39,6 +39,7 @@ androidx-dynamicanimation-ktx = "1.0.0-alpha03"
 androidx-work-runtime = "2.10.0"
 androidx-work-runtime-ktx = "2.10.0"
 androidx-localbroadcastmanager = "1.1.0"
+androidx-activity-compose = "1.9.3"
 
 glance = "1.1.1"
 compose-bom = "2024.12.01"
@@ -124,6 +125,8 @@ glance-material3 = { group = "androidx.glance", name = "glance-material3", versi
 glance-preview = { group = "androidx.glance", name = "glance-preview", version.ref = "glance" }
 glance-appwidget-preview = { group = "androidx.glance", name = "glance-appwidget-preview", version.ref = "glance" }
 
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx-activity-compose" }
+
 compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
 compose-animation-animation = { module = "androidx.compose.animation:animation" }
 compose-foundation-foundation = { module = "androidx.compose.foundation:foundation" }
@@ -139,6 +142,8 @@ compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
 compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
 compose-ui-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-util = { module = "androidx.compose.ui:util" }
+compose-ui-text-google-fonts = { module = "androidx.compose.ui:ui-text-google-fonts" }
+compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
 
 androidx-lifecycle-extensions = { group = "androidx.lifecycle", name = "lifecycle-extensions", version.ref = "androidx-lifecycle-extensions" }
 androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }

ui-common/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.ktlint)
+  alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -16,13 +17,17 @@ android {
   }
   buildFeatures {
     viewBinding = true
+    compose = true
   }
   buildTypes {
     release {
       isMinifyEnabled = false
       proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
     }
   }
+  composeOptions {
+    kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get()
+  }
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
@@ -53,9 +58,12 @@ dependencies {
 
   implementation(platform(libs.compose.bom))
   implementation(libs.compose.material3)
+  implementation(libs.compose.foundation.foundation)
+  implementation(libs.compose.ui.tooling.preview)
+  implementation(libs.androidx.activity.compose)
 
   debugImplementation(libs.compose.ui.test.manifest)
-  debugImplementation(libs.compose.ui.tooling.preview)
+  debugImplementation(libs.compose.ui.tooling)
 
   testImplementation(libs.junit)
   testImplementation(libs.androidx.test.core)

ui-common/src/main/kotlin/com/github/naz013/ui/common/Dialogues.kt

@@ -28,7 +28,7 @@ class Dialogues(
     propertyDialog(context, selectionList, onOk, onCancel).show()
   }
 
-  fun propertyDialog(
+  private fun propertyDialog(
     context: Context,
     selectionList: SelectionList,
     onOk: (position: Int) -> Unit,

ui-common/src/main/kotlin/com/github/naz013/ui/common/activity/LightThemedActivity.kt

@@ -52,10 +52,6 @@ abstract class LightThemedActivity : AppCompatActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    AppCompatDelegate.setDefaultNightMode(themePreferences.nightMode)
-    if (themePreferences.useDynamicColors) {
-      DynamicColors.applyToActivityIfAvailable(this)
-    }
     if (savedInstanceState == null) {
       loginStateViewModel.isLogged = isLogged()
     }
@@ -99,6 +95,22 @@ abstract class LightThemedActivity : AppCompatActivity() {
     }
   }
 
+  override fun onResume() {
+    super.onResume()
+    AppCompatDelegate.setDefaultNightMode(themePreferences.nightMode)
+    if (themePreferences.useDynamicColors) {
+      DynamicColors.applyToActivityIfAvailable(this)
+    }
+  }
+
+  override fun onRestart() {
+    super.onRestart()
+    AppCompatDelegate.setDefaultNightMode(themePreferences.nightMode)
+    if (themePreferences.useDynamicColors) {
+      DynamicColors.applyToActivityIfAvailable(this)
+    }
+  }
+
   override fun attachBaseContext(newBase: Context) {
     super.attachBaseContext(language.onAttach(newBase))
   }