From c01b426c2e5289f630a4811219a2d9e66fc95bd4 Mon Sep 17 00:00:00 2001
From: Gracia <hotmauligracia@gmail.com>
Date: Sat, 29 Mar 2025 01:50:10 +0700
Subject: [PATCH] themes bug fixing

---
 app/build.gradle.kts                          | 12 +++++-----
 .../balance/BalanceTransactionAdapter.kt      |  4 ++--
 app/src/main/res/values/themes.xml            |  8 ++++++-
 gradle/libs.versions.toml                     | 23 ++++++++++++++-----
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cf9e078..2ae92ff 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -66,13 +66,13 @@ dependencies {
     androidTestImplementation(libs.androidx.espresso.core)
 
     //retrofit
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
-    implementation("com.squareup.okhttp3:logging-interceptor:4.11.0")
+    implementation(libs.retrofit)
+    implementation(libs.converter.gson)
+    implementation(libs.logging.interceptor)
 
-    implementation("com.github.bumptech.glide:glide:4.16.0")
-    implementation("androidx.paging:paging-runtime:3.2.1")
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+    implementation(libs.glide)
+    implementation(libs.androidx.paging.runtime)
+    implementation(libs.androidx.swiperefreshlayout)
 
 
 //    implementation(libs.hilt.android)
diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/balance/BalanceTransactionAdapter.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/balance/BalanceTransactionAdapter.kt
index 4fbf61f..efa6f87 100644
--- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/balance/BalanceTransactionAdapter.kt
+++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/balance/BalanceTransactionAdapter.kt
@@ -2,8 +2,8 @@ package com.alya.ecommerce_serang.ui.profile.mystore.balance
 
 import com.alya.ecommerce_serang.data.model.BalanceTransaction
 
-class BalanceTransactionAdapter(private val balanceTransactionList: List<BalanceTransaction>) :
+/* class BalanceTransactionAdapter(private val balanceTransactionList: List<BalanceTransaction>) :
     RecyclerView.Adapter<BalanceTransactionAdapter.TransactionViewHolder>() {
 
 
-}
\ No newline at end of file
+}*/
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b41bfef..c277cdb 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,10 +1,14 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.Ecommerce_serang" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="Theme.Ecommerce_serang" parent="Theme.Material3.Light.NoActionBar">
         <!-- Customize your light theme here. -->
         <item name="colorPrimary">@color/blue_500</item>
         <item name="colorPrimaryDark">@color/white</item>
         <item name="colorAccent">@color/black</item>
+        <item name="colorSurface">@color/white</item>
+        <item name="colorOnSurface">@color/black</item>
+        <item name="colorPrimaryContainer">@color/blue_500</item>
+        <item name="colorOnPrimaryContainer">@color/white</item>
         <item name="android:contentInsetStart">0dp</item>
         <item name="android:contentInsetLeft">0dp</item>
     </style>
@@ -146,6 +150,7 @@
         <item name="android:padding">10.91dp</item>
         <item name="android:layout_height">40dp</item>
         <item name="android:textAllCaps">false</item>
+        <item name="backgroundTint">@null</item>
     </style>
 
         <style name="button.large.active">
@@ -215,6 +220,7 @@
         <item name="android:padding">7dp</item>
         <item name="android:layout_height">30dp</item>
         <item name="android:textAllCaps">false</item>
+        <item name="backgroundTint">@null</item>
     </style>
 
         <style name="button.small.active">
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 76e39cf..5751043 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,33 +1,43 @@
 [versions]
 agp = "8.5.2"
+glide = "4.16.0"
 hiltAndroid = "2.51"
 hiltLifecycleViewmodel = "1.0.0-alpha03"
 kotlin = "1.9.0"
-coreKtx = "1.10.1"
+coreKtx = "1.15.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
 appcompat = "1.7.0"
+loggingInterceptor = "4.11.0"
 material = "1.12.0"
-activity = "1.9.2"
-constraintlayout = "2.1.4"
+activity = "1.10.1"
+constraintlayout = "2.2.1"
 legacySupportV4 = "1.0.0"
 lifecycleLivedataKtx = "2.8.7"
 lifecycleViewmodelKtx = "2.8.7"
-fragmentKtx = "1.5.6"
-navigationFragmentKtx = "2.8.5"
-navigationUiKtx = "2.8.5"
+fragmentKtx = "1.8.6"
+navigationFragmentKtx = "2.8.9"
+navigationUiKtx = "2.8.9"
+pagingRuntime = "3.3.6"
 recyclerview = "1.4.0"
+retrofit = "2.9.0"
+swiperefreshlayout = "1.1.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-hilt-lifecycle-viewmodel = { module = "androidx.hilt:hilt-lifecycle-viewmodel", version.ref = "hiltLifecycleViewmodel" }
+androidx-paging-runtime = { module = "androidx.paging:paging-runtime", version.ref = "pagingRuntime" }
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
+androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" }
+converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
+glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hiltAndroid" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "loggingInterceptor" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
@@ -37,6 +47,7 @@ androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifec
 androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragmentKtx" }
 androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigationFragmentKtx" }
 androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigationUiKtx" }
+retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }