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"> + + android:exported="false" /> - + \ 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/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 new file mode 100644 index 00000000..7dc02d4a Binary files /dev/null and b/app/src/main/res/font/bad_script_regular.ttf differ diff --git a/app/src/main/res/font/selawk.xml b/app/src/main/res/font/caveat.xml similarity index 57% rename from app/src/main/res/font/selawk.xml rename to 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 @@ + app:font="@font/caveat_regular" /> - - + app:font="@font/caveat_bold" /> \ 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 new file mode 100644 index 00000000..e7e6a837 Binary files /dev/null and b/app/src/main/res/font/caveat_bold.ttf differ diff --git a/app/src/main/res/font/caveat_regular.ttf b/app/src/main/res/font/caveat_regular.ttf new file mode 100644 index 00000000..278a61c8 Binary files /dev/null and b/app/src/main/res/font/caveat_regular.ttf differ 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" /> - - \ 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 deleted file mode 100644 index 8a2b98b5..00000000 Binary files a/app/src/main/res/font/inter_light.ttf and /dev/null differ 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" /> - - \ 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 deleted file mode 100644 index 5a771c80..00000000 Binary files a/app/src/main/res/font/manrope_light.ttf and /dev/null differ 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 @@ -10,16 +10,6 @@ app:fontWeight="700" app:font="@font/roboto_condensed_bold" /> - - - - - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 4e77930f..00000000 Binary files a/app/src/main/res/font/rubik_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/rubik_bold_italic.ttf b/app/src/main/res/font/rubik_bold_italic.ttf deleted file mode 100644 index f6322472..00000000 Binary files a/app/src/main/res/font/rubik_bold_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/rubik_italic.ttf b/app/src/main/res/font/rubik_italic.ttf deleted file mode 100644 index 2ddac98e..00000000 Binary files a/app/src/main/res/font/rubik_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/rubik_light.ttf b/app/src/main/res/font/rubik_light.ttf deleted file mode 100644 index 8189d848..00000000 Binary files a/app/src/main/res/font/rubik_light.ttf and /dev/null differ diff --git a/app/src/main/res/font/rubik_light_italic.ttf b/app/src/main/res/font/rubik_light_italic.ttf deleted file mode 100644 index 8a9ae95a..00000000 Binary files a/app/src/main/res/font/rubik_light_italic.ttf and /dev/null differ diff --git a/app/src/main/res/font/rubik_regular.ttf b/app/src/main/res/font/rubik_regular.ttf deleted file mode 100644 index 52b59ca4..00000000 Binary files a/app/src/main/res/font/rubik_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/selawk_bold.ttf b/app/src/main/res/font/selawk_bold.ttf deleted file mode 100644 index 2134a765..00000000 Binary files a/app/src/main/res/font/selawk_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/selawk_light.ttf b/app/src/main/res/font/selawk_light.ttf deleted file mode 100644 index cbfaaf99..00000000 Binary files a/app/src/main/res/font/selawk_light.ttf and /dev/null differ diff --git a/app/src/main/res/font/selawk_regular.ttf b/app/src/main/res/font/selawk_regular.ttf deleted file mode 100644 index 736bac3c..00000000 Binary files a/app/src/main/res/font/selawk_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/sriracha_regular.ttf b/app/src/main/res/font/sriracha_regular.ttf new file mode 100644 index 00000000..cbc699a3 Binary files /dev/null and b/app/src/main/res/font/sriracha_regular.ttf differ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 @@ Noto Sans Roboto Condensed Harmonia Sans - Selawk Inter Manrope - Rubik + Caveat + Bad Script + Sriracha @@ -141,10 +142,11 @@ NotoSans RobotoCondensed HarmoniaSans - Selawk Inter Manrope - Rubik + Caveat + BadScript + Sriracha diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 032a47eb..7adda6a6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -352,6 +352,7 @@ Swipe Up to Hide Jump to Next Top-level Comment Button Lazy Mode Interval Font + Font Preview Font Title Content @@ -772,4 +773,8 @@ Set to Lock Screen Set to Both + Default + + Hello blank fragment + 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 @@ @font/harmonia_sans - - @@ -266,8 +262,16 @@ @font/manrope - + + + + - - @@ -304,8 +304,16 @@ @font/manrope - + + + + - - @@ -342,8 +346,16 @@ @font/manrope - + + + +