From 299cc4e11ae941c3bb2ac391ff31e85ff872fad7 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Fri, 18 Aug 2023 20:52:49 +0530
Subject: [PATCH] Enable nonTransitiveRClass flag

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 .../java/com/aurora/store/data/service/NotificationService.kt   | 2 +-
 .../java/com/aurora/store/view/ui/sheets/BaseBottomSheet.kt     | 2 +-
 app/src/main/res/values/styles.xml                              | 2 ++
 gradle.properties                                               | 2 --
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/data/service/NotificationService.kt b/app/src/main/java/com/aurora/store/data/service/NotificationService.kt
index db4197cb4..be67ef5ad 100644
--- a/app/src/main/java/com/aurora/store/data/service/NotificationService.kt
+++ b/app/src/main/java/com/aurora/store/data/service/NotificationService.kt
@@ -400,7 +400,7 @@ class NotificationService : Service() {
 
     private fun notifyInstallationStatus(app: App, status: String?) {
         val builder = NotificationCompat.Builder(this, Constants.NOTIFICATION_CHANNEL_ALERT)
-        builder.color = getStyledAttributeColor(R.attr.colorAccent)
+        builder.color = getStyledAttributeColor(R.color.colorAccent)
         builder.setSmallIcon(R.drawable.ic_install)
         builder.setContentTitle(app.displayName)
         builder.setContentText(status)
diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/BaseBottomSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/BaseBottomSheet.kt
index 68c00e0ed..c6ffd3376 100644
--- a/app/src/main/java/com/aurora/store/view/ui/sheets/BaseBottomSheet.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/sheets/BaseBottomSheet.kt
@@ -45,7 +45,7 @@ abstract class BaseBottomSheet : BottomSheetDialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val bottomSheetDialog = BottomSheetDialog(
             requireContext(),
-            R.style.Theme_Material3_DayNight_BottomSheetDialog
+            R.style.AppTheme_Dialog
         )
 
         VM = SheetBaseBinding.inflate(layoutInflater)
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 556e2ac04..6d32e06b6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -111,4 +111,6 @@
     <style name="AppTheme.SwitchPreference" parent="@style/Preference.SwitchPreferenceCompat.Material">
         <item name="widgetLayout">@layout/preference_material_switch</item>
     </style>
+
+    <style name="AppTheme.Dialog" parent="Theme.Material3.DayNight.BottomSheetDialog" />
 </resources>
diff --git a/gradle.properties b/gradle.properties
index 3721c84b1..39b451648 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -47,5 +47,3 @@ android.lifecycleProcessor.incremental=true
 # turn off AP discovery in compile path, and therefore turn on Compile Avoidance
 kapt.include.compile.classpath=false
 android.enableR8.fullMode=false
-android.nonTransitiveRClass=false
-