From 8f736c5b05e2b3c61d35631d78533743e21f75b9 Mon Sep 17 00:00:00 2001
From: machiav3lli <antonios.hazim@tutanota.com>
Date: Sat, 8 Oct 2022 01:43:15 +0200
Subject: [PATCH] Fix: Theme references

---
 src/main/AndroidManifest.xml                              | 2 +-
 .../com/machiav3lli/fdroid/screen/ScreenshotsFragment.kt  | 2 +-
 .../com/machiav3lli/fdroid/service/DownloadService.kt     | 2 +-
 .../kotlin/com/machiav3lli/fdroid/service/SyncService.kt  | 2 +-
 .../com/machiav3lli/fdroid/utility/NotificationUtils.kt   | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index ed6bccf3..d8e24755 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -19,8 +19,8 @@
         android:label="@string/application_name"
         android:roundIcon="${appIconRound}"
         android:supportsRtl="true"
-        android:theme="@style/MainTheme"
         tools:ignore="GoogleAppIndexingWarning">
+            android:theme="@style/Theme.Main.Amoled"
 
         <receiver
             android:name=".MainApplication$BootReceiver"
diff --git a/src/main/kotlin/com/machiav3lli/fdroid/screen/ScreenshotsFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/screen/ScreenshotsFragment.kt
index 1ce3688d..96b12d22 100644
--- a/src/main/kotlin/com/machiav3lli/fdroid/screen/ScreenshotsFragment.kt
+++ b/src/main/kotlin/com/machiav3lli/fdroid/screen/ScreenshotsFragment.kt
@@ -63,7 +63,7 @@ class ScreenshotsFragment() : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val packageName = requireArguments().getString(EXTRA_PACKAGE_NAME)!!
         val repositoryId = requireArguments().getLong(EXTRA_REPOSITORY_ID)
-        val dialog = Dialog(requireContext(), R.style.Theme_Main_Dark)
+        val dialog = Dialog(requireContext(), R.style.Theme_Main_Amoled)
 
         val window = dialog.window
         val decorView = window?.decorView
diff --git a/src/main/kotlin/com/machiav3lli/fdroid/service/DownloadService.kt b/src/main/kotlin/com/machiav3lli/fdroid/service/DownloadService.kt
index ba77d109..bfe92523 100644
--- a/src/main/kotlin/com/machiav3lli/fdroid/service/DownloadService.kt
+++ b/src/main/kotlin/com/machiav3lli/fdroid/service/DownloadService.kt
@@ -256,7 +256,7 @@ class DownloadService : ConnectionService<DownloadService.Binder>() {
             .Builder(this, NOTIFICATION_CHANNEL_DOWNLOADING)
             .setSmallIcon(android.R.drawable.stat_sys_download)
             .setColor(
-                ContextThemeWrapper(this, R.style.Theme_Main_Light)
+                ContextThemeWrapper(this, R.style.Theme_Main_Amoled)
                     .getColorFromAttr(android.R.attr.colorPrimary).defaultColor
             )
             .addAction(
diff --git a/src/main/kotlin/com/machiav3lli/fdroid/service/SyncService.kt b/src/main/kotlin/com/machiav3lli/fdroid/service/SyncService.kt
index 2c8e14a7..5b640633 100644
--- a/src/main/kotlin/com/machiav3lli/fdroid/service/SyncService.kt
+++ b/src/main/kotlin/com/machiav3lli/fdroid/service/SyncService.kt
@@ -238,7 +238,7 @@ class SyncService : ConnectionService<SyncService.Binder>() {
             .Builder(this, NOTIFICATION_CHANNEL_SYNCING)
             .setSmallIcon(R.drawable.ic_sync)
             .setColor(
-                ContextThemeWrapper(this, R.style.Theme_Main_Light)
+                ContextThemeWrapper(this, R.style.Theme_Main_Amoled)
                     .getColorFromAttr(android.R.attr.colorPrimary).defaultColor
             )
             .addAction(
diff --git a/src/main/kotlin/com/machiav3lli/fdroid/utility/NotificationUtils.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/NotificationUtils.kt
index 511d1a2a..c4285658 100644
--- a/src/main/kotlin/com/machiav3lli/fdroid/utility/NotificationUtils.kt
+++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/NotificationUtils.kt
@@ -56,7 +56,7 @@ fun Context.displayUpdatesNotification(
                     else null
                 )
                 .setColor(
-                    ContextThemeWrapper(this, R.style.Theme_Main_Light)
+                    ContextThemeWrapper(this, R.style.Theme_Main_Amoled)
                         .getColorFromAttr(android.R.attr.colorPrimary).defaultColor
                 )
                 .setContentIntent(
@@ -106,7 +106,7 @@ fun Context.showNotificationError(repository: Repository, exception: Exception)
             .Builder(this, NOTIFICATION_CHANNEL_SYNCING)
             .setSmallIcon(android.R.drawable.stat_sys_warning)
             .setColor(
-                ContextThemeWrapper(this, R.style.Theme_Main_Light)
+                ContextThemeWrapper(this, R.style.Theme_Main_Amoled)
                     .getColorFromAttr(android.R.attr.colorPrimary).defaultColor
             )
             .setContentTitle(getString(R.string.could_not_sync_FORMAT, repository.name))
@@ -138,7 +138,7 @@ fun Context.showNotificationError(
             .setAutoCancel(true)
             .setSmallIcon(android.R.drawable.stat_sys_warning)
             .setColor(
-                ContextThemeWrapper(this, R.style.Theme_Main_Light)
+                ContextThemeWrapper(this, R.style.Theme_Main_Amoled)
                     .getColorFromAttr(R.attr.colorPrimary).defaultColor
             )
             .setContentIntent(
@@ -239,7 +239,7 @@ fun InstallerService.notifyStatus(intent: Intent?) {
         .Builder(this, NOTIFICATION_CHANNEL_INSTALLER)
         .setAutoCancel(true)
         .setColor(
-            ContextThemeWrapper(this, R.style.Theme_Main_Light)
+            ContextThemeWrapper(this, R.style.Theme_Main_Amoled)
                 .getColorFromAttr(R.attr.colorPrimary).defaultColor
         )