From ab14405b7756c17312ed06c0b356c3245861a476 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 17 Jun 2020 11:59:09 +0800
Subject: Fix text color in SetAsWallpaperBottomSheet.

---
 .../infinityforreddit/Activity/ViewImageOrGifActivity.java          | 2 --
 .../infinityforreddit/Activity/ViewImgurMediaActivity.java          | 2 --
 app/src/main/res/layout/fragment_set_as_wallpaper_bottom_sheet.xml  | 6 +++---
 app/src/main/res/values-night/colors.xml                            | 1 +
 app/src/main/res/values/colors.xml                                  | 1 +
 5 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageOrGifActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageOrGifActivity.java
index 68631472..1cc7e5f0 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageOrGifActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageOrGifActivity.java
@@ -99,8 +99,6 @@ public class ViewImageOrGifActivity extends AppCompatActivity implements SetAsWa
 
         ((Infinity) getApplication()).getAppComponent().inject(this);
 
-        getTheme().applyStyle(R.style.Theme_Normal, true);
-
         getTheme().applyStyle(FontStyle.valueOf(mSharedPreferences
                 .getString(SharedPreferencesUtils.FONT_SIZE_KEY, FontStyle.Normal.name())).getResId(), true);
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java
index e272ec51..4fa00e41 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java
@@ -89,8 +89,6 @@ public class ViewImgurMediaActivity extends AppCompatActivity implements SetAsWa
 
         ((Infinity) getApplication()).getAppComponent().inject(this);
 
-        getTheme().applyStyle(R.style.Theme_Normal, true);
-
         getTheme().applyStyle(FontStyle.valueOf(sharedPreferences
                 .getString(SharedPreferencesUtils.FONT_SIZE_KEY, FontStyle.Normal.name())).getResId(), true);
 
diff --git a/app/src/main/res/layout/fragment_set_as_wallpaper_bottom_sheet.xml b/app/src/main/res/layout/fragment_set_as_wallpaper_bottom_sheet.xml
index b8854ade..f2fcd3ea 100644
--- a/app/src/main/res/layout/fragment_set_as_wallpaper_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_set_as_wallpaper_bottom_sheet.xml
@@ -20,7 +20,7 @@
             android:paddingStart="32dp"
             android:paddingEnd="32dp"
             android:text="@string/set_to_home_screen"
-            android:textColor="?attr/primaryTextColor"
+            android:textColor="@color/primaryTextColor"
             android:textSize="?attr/font_default"
             android:fontFamily="?attr/font_family"
             android:drawableStart="@drawable/ic_wallpaper_home_screen_black_24dp"
@@ -40,7 +40,7 @@
             android:paddingStart="32dp"
             android:paddingEnd="32dp"
             android:text="@string/set_to_lock_screen"
-            android:textColor="?attr/primaryTextColor"
+            android:textColor="@color/primaryTextColor"
             android:textSize="?attr/font_default"
             android:fontFamily="?attr/font_family"
             android:drawableStart="@drawable/ic_wallpaper_lock_screen_black_24dp"
@@ -60,7 +60,7 @@
             android:paddingStart="32dp"
             android:paddingEnd="32dp"
             android:text="@string/set_to_both"
-            android:textColor="?attr/primaryTextColor"
+            android:textColor="@color/primaryTextColor"
             android:textSize="?attr/font_default"
             android:fontFamily="?attr/font_family"
             android:drawableStart="@drawable/ic_wallpaper_both_black_24dp"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 65ac8596..4ab1f8bd 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -8,4 +8,5 @@
     <color name="backgroundColor">#121212</color>
     <color name="playButtonBackgroundColor">#FFFFFF</color>
     <color name="roundedBottomSheetPrimaryBackground">#242424</color>
+    <color name="primaryTextColor">#FFFFFF</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 59bbdad0..c940e5fa 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,4 +9,5 @@
     <color name="playButtonBackgroundColor">#000000</color>
     <color name="roundedBottomSheetPrimaryBackground">#FFFFFF</color>
     <color name="roundedBottomSheetPrimaryNavigationBarColor">#000000</color>
+    <color name="primaryTextColor">#000000</color>
 </resources>
-- 
cgit v1.2.3