From 7742a19abdbba56b3794065bf07b5c9271619140 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Wed, 15 Jul 2020 21:40:26 +0800 Subject: Remove font: Bad Script. Add some bold fonts. --- .../infinityforreddit/Font/ContentFontFamily.java | 9 ++- .../infinityforreddit/Font/FontFamily.java | 7 +- .../infinityforreddit/Font/TitleFontFamily.java | 7 +- .../Settings/AcknowledgementFragment.java | 9 +++ app/src/main/res/font/bad_script_regular.ttf | Bin 50768 -> 0 bytes .../main/res/font/balsamiq_sans_bold_version.xml | 12 ++++ app/src/main/res/font/noto_sans_bold_version.xml | 12 ++++ .../res/font/roboto_condensed_bold_version.xml | 12 ++++ app/src/main/res/layout/fragment_font_preview.xml | 68 +++++++++++++++++-- app/src/main/res/values/arrays.xml | 22 +++++-- app/src/main/res/values/styles.xml | 72 +++++++++++++++++++-- build.gradle | 2 +- 12 files changed, 211 insertions(+), 21 deletions(-) delete mode 100644 app/src/main/res/font/bad_script_regular.ttf create mode 100644 app/src/main/res/font/balsamiq_sans_bold_version.xml create mode 100644 app/src/main/res/font/noto_sans_bold_version.xml create mode 100644 app/src/main/res/font/roboto_condensed_bold_version.xml 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 6a00aec9..f24786fa 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java @@ -4,13 +4,18 @@ import ml.docilealligator.infinityforreddit.R; public enum ContentFontFamily { Default(R.style.ContentFontFamily, "Default"), - BalsamiqSans(R.style.ContentFontFamily_BalsamiqSans, "BalsamiqSans"), + BalsamiqSans(R.style.ContentFontFamily_BalsamiqSans, "BalsamiqSansBold"), + BalsamiqSansBold(R.style.ContentFontFamily_BalsamiqSansBold, "BalsamiqSansBold"), NotoSans(R.style.ContentFontFamily_NotoSans, "NotoSans"), + NotoSansBold(R.style.ContentFontFamily_NotoSansBold, "NotoSansBold"), RobotoCondensed(R.style.ContentFontFamily_RobotoCondensed, "RobotoCondensed"), + RobotoCondensedBold(R.style.ContentFontFamily_RobotoCondensedBold, "RobotoCondensedBold"), HarmoniaSans(R.style.ContentFontFamily_HarmoniaSans, "HarmoniaSans"), + HarmoniaSansBold(R.style.ContentFontFamily_HarmoniaSansBold, "HarmoniaSansBold"), Inter(R.style.ContentFontFamily_Inter, "Inter"), + InterBold(R.style.ContentFontFamily_InterBold, "InterBold"), Manrope(R.style.ContentFontFamily_Manrope, "Manrope"), - BadScript(R.style.ContentFontFamily_BadScript, "BadScript"), + ManropeBold(R.style.ContentFontFamily_ManropeBold, "ManropeBold"), Sriracha(R.style.ContentFontFamily_Sriracha, "Sriracha"); private int resId; 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 8a04a50e..09198c8f 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java @@ -5,12 +5,17 @@ import ml.docilealligator.infinityforreddit.R; public enum FontFamily { Default(R.style.FontFamily, "Default"), BalsamiqSans(R.style.FontFamily_BalsamiqSans, "BalsamiqSans"), + BalsamiqSansBold(R.style.FontFamily_BalsamiqSansBold, "BalsamiqSansBold"), NotoSans(R.style.FontFamily_NotoSans, "NotoSans"), + NotoSansBold(R.style.FontFamily_NotoSansBold, "NotoSansBold"), RobotoCondensed(R.style.FontFamily_RobotoCondensed, "RobotoCondensed"), + RobotoCondensedBold(R.style.FontFamily_RobotoCondensedBold, "RobotoCondensedBold"), HarmoniaSans(R.style.FontFamily_HarmoniaSans, "HarmoniaSans"), + HarmoniaSansBold(R.style.FontFamily_HarmoniaSansBold, "HarmoniaSansBold"), Inter(R.style.FontFamily_Inter, "Inter"), + InterBold(R.style.FontFamily_InterBold, "InterBold"), Manrope(R.style.FontFamily_Manrope, "Manrope"), - BadScript(R.style.FontFamily_BadScript, "BadScript"), + ManropeBold(R.style.FontFamily_ManropeBold, "ManropeBold"), Sriracha(R.style.FontFamily_Sriracha, "Sriracha"); private int resId; 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 ffe319c4..eff158d0 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java @@ -5,12 +5,17 @@ import ml.docilealligator.infinityforreddit.R; public enum TitleFontFamily { Default(R.style.TitleFontFamily, "Default"), BalsamiqSans(R.style.TitleFontFamily_BalsamiqSans, "BalsamiqSans"), + BalsamiqSansBold(R.style.TitleFontFamily_BalsamiqSansBold, "BalsamiqSansBold"), NotoSans(R.style.TitleFontFamily_NotoSans, "NotoSans"), + NotoSansBold(R.style.TitleFontFamily_NotoSansBold, "NotoSansBold"), RobotoCondensed(R.style.TitleFontFamily_RobotoCondensed, "RobotoCondensed"), + RobotoCondensedBold(R.style.TitleFontFamily_RobotoCondensedBold, "RobotoCondensedBold"), HarmoniaSans(R.style.TitleFontFamily_HarmoniaSans, "HarmoniaSans"), + HarmoniaSansBold(R.style.TitleFontFamily_HarmoniaSansBold, "HarmoniaSansBold"), Inter(R.style.TitleFontFamily_Inter, "Inter"), + InterBold(R.style.TitleFontFamily_InterBold, "InterBold"), Manrope(R.style.TitleFontFamily_Manrope, "Manrope"), - BadScript(R.style.TitleFontFamily_BadScript, "BadScript"), + ManropeBold(R.style.TitleFontFamily_ManropeBold, "ManropeBold"), Sriracha(R.style.TitleFontFamily_Sriracha, "Sriracha"); private int resId; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AcknowledgementFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AcknowledgementFragment.java index 7bf3a435..c765682e 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AcknowledgementFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AcknowledgementFragment.java @@ -112,6 +112,15 @@ public class AcknowledgementFragment extends Fragment { acknowledgements.add(new Acknowledgement("AndroidFastScroll", "Fast scroll for Android RecyclerView and more.", Uri.parse("https://github.com/zhanghai/AndroidFastScroll"))); + acknowledgements.add(new Acknowledgement("Subsampling Scale Image View", + "A custom image view for Android, designed for photo galleries and displaying " + + "huge images (e.g. maps and building plans) without OutOfMemoryErrors.", + Uri.parse("https://github.com/davemorrissey/subsampling-scale-image-view"))); + acknowledgements.add(new Acknowledgement("BigImageViewer", + "Big image viewer supporting pan and zoom, with very little memory " + + "usage and full featured image loading choices. Powered by Subsampling Scale " + + "Image View, Fresco, Glide, and Picasso. Even with gif and webp support!", + Uri.parse("https://github.com/Piasy/BigImageViewer"))); AcknowledgementRecyclerViewAdapter adapter = new AcknowledgementRecyclerViewAdapter(activity, acknowledgements); recyclerView.setLayoutManager(new LinearLayoutManager(activity)); diff --git a/app/src/main/res/font/bad_script_regular.ttf b/app/src/main/res/font/bad_script_regular.ttf deleted file mode 100644 index 7dc02d4a..00000000 Binary files a/app/src/main/res/font/bad_script_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/balsamiq_sans_bold_version.xml b/app/src/main/res/font/balsamiq_sans_bold_version.xml new file mode 100644 index 00000000..9e3495d7 --- /dev/null +++ b/app/src/main/res/font/balsamiq_sans_bold_version.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/noto_sans_bold_version.xml b/app/src/main/res/font/noto_sans_bold_version.xml new file mode 100644 index 00000000..93b119ba --- /dev/null +++ b/app/src/main/res/font/noto_sans_bold_version.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/roboto_condensed_bold_version.xml b/app/src/main/res/font/roboto_condensed_bold_version.xml new file mode 100644 index 00000000..ed3b6d33 --- /dev/null +++ b/app/src/main/res/font/roboto_condensed_bold_version.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_font_preview.xml b/app/src/main/res/layout/fragment_font_preview.xml index 8cc543c8..d1140996 100644 --- a/app/src/main/res/layout/fragment_font_preview.xml +++ b/app/src/main/res/layout/fragment_font_preview.xml @@ -29,6 +29,18 @@ android:textSize="?attr/font_default" android:fontFamily="@font/balsamiq_sans" /> + + + android:fontFamily="@font/noto_sans_bold_version" /> + + + + + + + + + android:fontFamily="@font/manrope_bold" /> Default Balsamiq Sans + Balsamiq Sans Bold Noto Sans - Roboto Condensed + Noto Sans Bold Harmonia Sans - Inter - Manrope - Bad Script + Harmonia Sans Bold (No Italic) + Roboto Condensed + Roboto Condensed Bold + Inter (No Italic) + Inter Bold (No Italic) + Manrope (No Italic) + Manrope Bold (No Italic) Sriracha Default BalsamiqSans + BalsamiqSansBold NotoSans - RobotoCondensed + NotoSansBold HarmoniaSans + HarmoniaSansBold + RobotoCondensed + RobotoCondensedBold Inter + InterBold Manrope - BadScript + ManropeBold Sriracha diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ec6ebc0d..0e0d703f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -257,28 +257,48 @@ @font/balsamiq_sans + + + + + + + + + + - + + + + + + + + + + - + + + + + + + + + + -