diff options
| author | Alex Ning <chineseperson5@gmail.com> | 2020-06-17 03:59:09 +0000 |
|---|---|---|
| committer | Alex Ning <chineseperson5@gmail.com> | 2020-06-17 03:59:09 +0000 |
| commit | ab14405b7756c17312ed06c0b356c3245861a476 (patch) | |
| tree | ef41bf04816fd9a615dabafb3f9a711af44a3b55 /app/src/main | |
| parent | 72f176201ee4bdb2b7057f5b5443cf232debd0c2 (diff) | |
| download | infinity-for-reddit-ab14405b7756c17312ed06c0b356c3245861a476.tar infinity-for-reddit-ab14405b7756c17312ed06c0b356c3245861a476.tar.gz infinity-for-reddit-ab14405b7756c17312ed06c0b356c3245861a476.tar.bz2 infinity-for-reddit-ab14405b7756c17312ed06c0b356c3245861a476.tar.lz infinity-for-reddit-ab14405b7756c17312ed06c0b356c3245861a476.tar.xz infinity-for-reddit-ab14405b7756c17312ed06c0b356c3245861a476.tar.zst infinity-for-reddit-ab14405b7756c17312ed06c0b356c3245861a476.zip | |
Fix text color in SetAsWallpaperBottomSheet.
Diffstat (limited to '')
5 files changed, 5 insertions, 7 deletions
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> |