diff options
Diffstat (limited to 'app')
38 files changed, 224 insertions, 96 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f26d5ef7..e3d8fa78 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,10 +23,11 @@ android:theme="@style/AppTheme" android:usesCleartextTraffic="true" tools:replace="android:label"> + <service android:name=".Service.DownloadRedditVideoService" android:enabled="true" - android:exported="false"></service> + android:exported="false" /> <activity android:name=".Activity.ViewImgurMediaActivity" @@ -323,4 +324,4 @@ android:exported="false" /> </application> -</manifest> +</manifest>
\ No newline at end of file diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SettingsActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SettingsActivity.java index ef91f34a..3c50caf8 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SettingsActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SettingsActivity.java @@ -26,6 +26,7 @@ import ml.docilealligator.infinityforreddit.Event.RecreateActivityEvent; import ml.docilealligator.infinityforreddit.Infinity; import ml.docilealligator.infinityforreddit.R; import ml.docilealligator.infinityforreddit.Settings.AboutPreferenceFragment; +import ml.docilealligator.infinityforreddit.Settings.FontPreferenceFragment; import ml.docilealligator.infinityforreddit.Settings.InterfacePreferenceFragment; import ml.docilealligator.infinityforreddit.Settings.MainPreferenceFragment; @@ -83,6 +84,8 @@ public class SettingsActivity extends BaseActivity implements setTitle(R.string.settings_about_master_title); } else if (getSupportFragmentManager().findFragmentById(R.id.frame_layout_settings_activity) instanceof InterfacePreferenceFragment) { setTitle(R.string.settings_interface_title); + } else if (getSupportFragmentManager().findFragmentById(R.id.frame_layout_settings_activity) instanceof FontPreferenceFragment) { + setTitle(R.string.settings_font_title); } }); } 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/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java index cad7a532..f1659d68 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java @@ -8,10 +8,11 @@ public enum ContentFontFamily { NotoSans(R.style.ContentFontFamily_NotoSans, "NotoSans"), RobotoCondensed(R.style.ContentFontFamily_RobotoCondensed, "RobotoCondensed"), HarmoniaSans(R.style.ContentFontFamily_HarmoniaSans, "HarmoniaSans"), - Selawk(R.style.ContentFontFamily_Selawk, "Selawk"), Inter(R.style.ContentFontFamily_Inter, "Inter"), Manrope(R.style.ContentFontFamily_Manrope, "Manrope"), - Rubik(R.style.ContentFontFamily_Rubik, "Rubik"); + Caveat(R.style.ContentFontFamily_Caveat, "Caveat"), + BadScript(R.style.ContentFontFamily_BadScript, "BadScript"), + Sriracha(R.style.ContentFontFamily_Sriracha, "Sriracha"); private int resId; private String title; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java index 88e89660..debd9b73 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java @@ -8,10 +8,11 @@ public enum FontFamily { NotoSans(R.style.FontFamily_NotoSans, "NotoSans"), RobotoCondensed(R.style.FontFamily_RobotoCondensed, "RobotoCondensed"), HarmoniaSans(R.style.FontFamily_HarmoniaSans, "HarmoniaSans"), - Selawk(R.style.FontFamily_Selawk, "Selawk"), Inter(R.style.FontFamily_Inter, "Inter"), Manrope(R.style.FontFamily_Manrope, "Manrope"), - Rubik(R.style.FontFamily_Rubik, "Rubik"); + Caveat(R.style.FontFamily_Caveat, "Caveat"), + BadScript(R.style.FontFamily_BadScript, "BadScript"), + Sriracha(R.style.FontFamily_Sriracha, "Sriracha"); private int resId; private String title; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java index 17ebf3bd..0548f4e0 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java @@ -8,10 +8,11 @@ public enum TitleFontFamily { NotoSans(R.style.TitleFontFamily_NotoSans, "NotoSans"), RobotoCondensed(R.style.TitleFontFamily_RobotoCondensed, "RobotoCondensed"), HarmoniaSans(R.style.TitleFontFamily_HarmoniaSans, "HarmoniaSans"), - Selawk(R.style.TitleFontFamily_Selawk, "Selawk"), Inter(R.style.TitleFontFamily_Inter, "Inter"), Manrope(R.style.TitleFontFamily_Manrope, "Manrope"), - Rubik(R.style.TitleFontFamily_Rubik, "Rubik"); + Caveat(R.style.TitleFontFamily_Caveat, "Caveat"), + BadScript(R.style.TitleFontFamily_BadScript, "BadScript"), + Sriracha(R.style.TitleFontFamily_Sriracha, "Sriracha"); private int resId; private String title; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/FontPreviewFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/FontPreviewFragment.java new file mode 100644 index 00000000..9cd93e01 --- /dev/null +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/FontPreviewFragment.java @@ -0,0 +1,29 @@ +package ml.docilealligator.infinityforreddit.Settings; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.fragment.app.Fragment; + +import ml.docilealligator.infinityforreddit.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link FontPreviewFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class FontPreviewFragment extends Fragment { + + public FontPreviewFragment() { + // Required empty public constructor + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View rootView = inflater.inflate(R.layout.fragment_font_preview, container, false); + return rootView; + } +}
\ No newline at end of file diff --git a/app/src/main/res/font/bad_script_regular.ttf b/app/src/main/res/font/bad_script_regular.ttf Binary files differnew file mode 100644 index 00000000..7dc02d4a --- /dev/null +++ b/app/src/main/res/font/bad_script_regular.ttf diff --git a/app/src/main/res/font/selawk.xml b/app/src/main/res/font/caveat.xml index 28f46f58..57393ffd 100644 --- a/app/src/main/res/font/selawk.xml +++ b/app/src/main/res/font/caveat.xml @@ -3,15 +3,10 @@ <font app:fontStyle="normal" app:fontWeight="400" - app:font="@font/selawk_regular" /> + app:font="@font/caveat_regular" /> <font app:fontStyle="normal" app:fontWeight="700" - app:font="@font/selawk_bold" /> - - <font - app:fontStyle="normal" - app:fontWeight="300" - app:font="@font/selawk_light" /> + app:font="@font/caveat_bold" /> </font-family>
\ No newline at end of file diff --git a/app/src/main/res/font/caveat_bold.ttf b/app/src/main/res/font/caveat_bold.ttf Binary files differnew file mode 100644 index 00000000..e7e6a837 --- /dev/null +++ b/app/src/main/res/font/caveat_bold.ttf diff --git a/app/src/main/res/font/caveat_regular.ttf b/app/src/main/res/font/caveat_regular.ttf Binary files differnew file mode 100644 index 00000000..278a61c8 --- /dev/null +++ b/app/src/main/res/font/caveat_regular.ttf diff --git a/app/src/main/res/font/inter.xml b/app/src/main/res/font/inter.xml index 3a0d1784..6b7e74f3 100644 --- a/app/src/main/res/font/inter.xml +++ b/app/src/main/res/font/inter.xml @@ -9,9 +9,4 @@ app:fontStyle="normal" app:fontWeight="700" app:font="@font/inter_bold" /> - - <font - app:fontStyle="normal" - app:fontWeight="300" - app:font="@font/inter_light" /> </font-family>
\ No newline at end of file diff --git a/app/src/main/res/font/inter_light.ttf b/app/src/main/res/font/inter_light.ttf Binary files differdeleted file mode 100644 index 8a2b98b5..00000000 --- a/app/src/main/res/font/inter_light.ttf +++ /dev/null diff --git a/app/src/main/res/font/manrope.xml b/app/src/main/res/font/manrope.xml index 0193f184..d9db58d6 100644 --- a/app/src/main/res/font/manrope.xml +++ b/app/src/main/res/font/manrope.xml @@ -9,9 +9,4 @@ app:fontStyle="normal" app:fontWeight="700" app:font="@font/manrope_bold" /> - - <font - app:fontStyle="normal" - app:fontWeight="300" - app:font="@font/manrope_light" /> </font-family>
\ No newline at end of file diff --git a/app/src/main/res/font/manrope_light.ttf b/app/src/main/res/font/manrope_light.ttf Binary files differdeleted file mode 100644 index 5a771c80..00000000 --- a/app/src/main/res/font/manrope_light.ttf +++ /dev/null diff --git a/app/src/main/res/font/roboto_condensed.xml b/app/src/main/res/font/roboto_condensed.xml index e2a5da42..64811d6e 100644 --- a/app/src/main/res/font/roboto_condensed.xml +++ b/app/src/main/res/font/roboto_condensed.xml @@ -11,16 +11,6 @@ app:font="@font/roboto_condensed_bold" /> <font - app:fontStyle="normal" - app:fontWeight="300" - app:font="@font/roboto_condensed_light" /> - - <font - app:fontStyle="italic" - app:fontWeight="300" - app:font="@font/roboto_condensed_light_italic" /> - - <font app:fontStyle="italic" app:fontWeight="400" app:font="@font/roboto_condensed_italic" /> diff --git a/app/src/main/res/font/roboto_condensed_light.ttf b/app/src/main/res/font/roboto_condensed_light.ttf Binary files differdeleted file mode 100644 index 43dd8f42..00000000 --- a/app/src/main/res/font/roboto_condensed_light.ttf +++ /dev/null diff --git a/app/src/main/res/font/roboto_condensed_light_italic.ttf b/app/src/main/res/font/roboto_condensed_light_italic.ttf Binary files differdeleted file mode 100644 index 99d491b9..00000000 --- a/app/src/main/res/font/roboto_condensed_light_italic.ttf +++ /dev/null diff --git a/app/src/main/res/font/rubik.xml b/app/src/main/res/font/rubik.xml deleted file mode 100644 index 50596309..00000000 --- a/app/src/main/res/font/rubik.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<font-family xmlns:app="http://schemas.android.com/apk/res-auto"> - <font - app:fontStyle="normal" - app:fontWeight="400" - app:font="@font/rubik_regular" /> - - <font - app:fontStyle="normal" - app:fontWeight="700" - app:font="@font/rubik_bold" /> - - <font - app:fontStyle="normal" - app:fontWeight="300" - app:font="@font/rubik_light" /> - - <font - app:fontStyle="italic" - app:fontWeight="300" - app:font="@font/rubik_light_italic" /> - - <font - app:fontStyle="italic" - app:fontWeight="400" - app:font="@font/rubik_italic" /> - - <font - app:fontStyle="italic" - app:fontWeight="700" - app:font="@font/rubik_bold_italic" /> -</font-family>
\ No newline at end of file diff --git a/app/src/main/res/font/rubik_bold.ttf b/app/src/main/res/font/rubik_bold.ttf Binary files differdeleted file mode 100644 index 4e77930f..00000000 --- a/app/src/main/res/font/rubik_bold.ttf +++ /dev/null diff --git a/app/src/main/res/font/rubik_bold_italic.ttf b/app/src/main/res/font/rubik_bold_italic.ttf Binary files differdeleted file mode 100644 index f6322472..00000000 --- a/app/src/main/res/font/rubik_bold_italic.ttf +++ /dev/null diff --git a/app/src/main/res/font/rubik_italic.ttf b/app/src/main/res/font/rubik_italic.ttf Binary files differdeleted file mode 100644 index 2ddac98e..00000000 --- a/app/src/main/res/font/rubik_italic.ttf +++ /dev/null diff --git a/app/src/main/res/font/rubik_light.ttf b/app/src/main/res/font/rubik_light.ttf Binary files differdeleted file mode 100644 index 8189d848..00000000 --- a/app/src/main/res/font/rubik_light.ttf +++ /dev/null diff --git a/app/src/main/res/font/rubik_light_italic.ttf b/app/src/main/res/font/rubik_light_italic.ttf Binary files differdeleted file mode 100644 index 8a9ae95a..00000000 --- a/app/src/main/res/font/rubik_light_italic.ttf +++ /dev/null diff --git a/app/src/main/res/font/rubik_regular.ttf b/app/src/main/res/font/rubik_regular.ttf Binary files differdeleted file mode 100644 index 52b59ca4..00000000 --- a/app/src/main/res/font/rubik_regular.ttf +++ /dev/null diff --git a/app/src/main/res/font/selawk_bold.ttf b/app/src/main/res/font/selawk_bold.ttf Binary files differdeleted file mode 100644 index 2134a765..00000000 --- a/app/src/main/res/font/selawk_bold.ttf +++ /dev/null diff --git a/app/src/main/res/font/selawk_light.ttf b/app/src/main/res/font/selawk_light.ttf Binary files differdeleted file mode 100644 index cbfaaf99..00000000 --- a/app/src/main/res/font/selawk_light.ttf +++ /dev/null diff --git a/app/src/main/res/font/selawk_regular.ttf b/app/src/main/res/font/selawk_regular.ttf Binary files differdeleted file mode 100644 index 736bac3c..00000000 --- a/app/src/main/res/font/selawk_regular.ttf +++ /dev/null diff --git a/app/src/main/res/font/sriracha_regular.ttf b/app/src/main/res/font/sriracha_regular.ttf Binary files differnew file mode 100644 index 00000000..cbc699a3 --- /dev/null +++ b/app/src/main/res/font/sriracha_regular.ttf diff --git a/app/src/main/res/layout/fragment_font_preview.xml b/app/src/main/res/layout/fragment_font_preview.xml new file mode 100644 index 00000000..4101473e --- /dev/null +++ b/app/src/main/res/layout/fragment_font_preview.xml @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + tools:context=".Settings.FontPreviewFragment"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="@string/default_font_font_preview" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Balsamiq Sans" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/balsamiq_sans" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Noto Sans" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/noto_sans" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Roboto Condensed" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/roboto_condensed" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Harmonia Sans" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/harmonia_sans" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Inter" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/inter" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Manrope" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/manrope" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Caveat" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/caveat" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Bad Script" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/bad_script_regular" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Sriracha" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/sriracha_regular" /> + +</LinearLayout>
\ No newline at end of file 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/arrays.xml b/app/src/main/res/values/arrays.xml index e5bcf611..768f5d0c 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -129,10 +129,11 @@ <item>Noto Sans</item> <item>Roboto Condensed</item> <item>Harmonia Sans</item> - <item>Selawk</item> <item>Inter</item> <item>Manrope</item> - <item>Rubik</item> + <item>Caveat</item> + <item>Bad Script</item> + <item>Sriracha</item> </string-array> <string-array name="settings_font_family_values"> @@ -141,10 +142,11 @@ <item>NotoSans</item> <item>RobotoCondensed</item> <item>HarmoniaSans</item> - <item>Selawk</item> <item>Inter</item> <item>Manrope</item> - <item>Rubik</item> + <item>Caveat</item> + <item>BadScript</item> + <item>Sriracha</item> </string-array> <string-array name="settings_tab_post_type"> 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> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cddcf9bf..53f28bc9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -358,6 +358,7 @@ <string name="settings_swipe_up_to_hide_jump_to_next_top_level_comment_button_title">Swipe Up to Hide Jump to Next Top-level Comment Button</string> <string name="settings_lazy_mode_interval_title">Lazy Mode Interval</string> <string name="settings_font_title">Font</string> + <string name="settings_preview_font_title">Font Preview</string> <string name="settings_font_summary">Font</string> <string name="settings_title_font_summary">Title</string> <string name="settings_content_font_summary">Content</string> @@ -778,4 +779,8 @@ <string name="set_to_lock_screen">Set to Lock Screen</string> <string name="set_to_both">Set to Both</string> + <string name="default_font_font_preview">Default</string> + <!-- TODO: Remove or change this placeholder text --> + <string name="hello_blank_fragment">Hello blank fragment</string> + </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6e46c6cf..770fc6b9 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -254,10 +254,6 @@ <item name="font_family">@font/harmonia_sans</item> </style> - <style name="FontFamily.Selawk"> - <item name="font_family">@font/selawk</item> - </style> - <style name="FontFamily.Inter"> <item name="font_family">@font/inter</item> </style> @@ -266,8 +262,16 @@ <item name="font_family">@font/manrope</item> </style> - <style name="FontFamily.Rubik"> - <item name="font_family">@font/rubik</item> + <style name="FontFamily.Caveat"> + <item name="font_family">@font/caveat</item> + </style> + + <style name="FontFamily.BadScript"> + <item name="font_family">@font/bad_script_regular</item> + </style> + + <style name="FontFamily.Sriracha"> + <item name="font_family">@font/sriracha_regular</item> </style> <style name="TitleFontFamily" /> @@ -292,10 +296,6 @@ <item name="title_font_family">@font/harmonia_sans</item> </style> - <style name="TitleFontFamily.Selawk"> - <item name="title_font_family">@font/selawk</item> - </style> - <style name="TitleFontFamily.Inter"> <item name="title_font_family">@font/inter</item> </style> @@ -304,8 +304,16 @@ <item name="title_font_family">@font/manrope</item> </style> - <style name="TitleFontFamily.Rubik"> - <item name="title_font_family">@font/rubik</item> + <style name="TitleFontFamily.Caveat"> + <item name="title_font_family">@font/caveat</item> + </style> + + <style name="TitleFontFamily.BadScript"> + <item name="title_font_family">@font/bad_script_regular</item> + </style> + + <style name="TitleFontFamily.Sriracha"> + <item name="title_font_family">@font/sriracha_regular</item> </style> <style name="ContentFontFamily" /> @@ -330,10 +338,6 @@ <item name="content_font_family">@font/harmonia_sans</item> </style> - <style name="ContentFontFamily.Selawk"> - <item name="content_font_family">@font/selawk</item> - </style> - <style name="ContentFontFamily.Inter"> <item name="content_font_family">@font/inter</item> </style> @@ -342,8 +346,16 @@ <item name="content_font_family">@font/manrope</item> </style> - <style name="ContentFontFamily.Rubik"> - <item name="content_font_family">@font/rubik</item> + <style name="ContentFontFamily.Caveat"> + <item name="content_font_family">@font/caveat</item> + </style> + + <style name="ContentFontFamily.BadScript"> + <item name="content_font_family">@font/bad_script_regular</item> + </style> + + <style name="ContentFontFamily.Sriracha"> + <item name="content_font_family">@font/sriracha_regular</item> </style> <style name="Theme" /> diff --git a/app/src/main/res/xml/font_preferences.xml b/app/src/main/res/xml/font_preferences.xml index 317894b0..83264ea0 100644 --- a/app/src/main/res/xml/font_preferences.xml +++ b/app/src/main/res/xml/font_preferences.xml @@ -2,6 +2,10 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> + <Preference + app:title="@string/settings_preview_font_title" + app:fragment="ml.docilealligator.infinityforreddit.Settings.FontPreviewFragment" /> + <PreferenceCategory app:title="@string/settings_font_summary" /> |