aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2020-07-15 13:40:26 +0000
committerAlex Ning <chineseperson5@gmail.com>2020-07-15 13:40:26 +0000
commit7742a19abdbba56b3794065bf07b5c9271619140 (patch)
treede09d4d12e48eda88c09ed4cc184078008ef9cf0 /app/src/main/java
parent2d69170f4f6bd54efc472462d47f10988942bcba (diff)
downloadinfinity-for-reddit-7742a19abdbba56b3794065bf07b5c9271619140.tar
infinity-for-reddit-7742a19abdbba56b3794065bf07b5c9271619140.tar.gz
infinity-for-reddit-7742a19abdbba56b3794065bf07b5c9271619140.tar.bz2
infinity-for-reddit-7742a19abdbba56b3794065bf07b5c9271619140.tar.lz
infinity-for-reddit-7742a19abdbba56b3794065bf07b5c9271619140.tar.xz
infinity-for-reddit-7742a19abdbba56b3794065bf07b5c9271619140.tar.zst
infinity-for-reddit-7742a19abdbba56b3794065bf07b5c9271619140.zip
Remove font: Bad Script. Add some bold fonts.
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java9
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java7
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java7
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AcknowledgementFragment.java9
4 files changed, 28 insertions, 4 deletions
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));