aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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
-rw-r--r--app/src/main/res/font/bad_script_regular.ttfbin50768 -> 0 bytes
-rw-r--r--app/src/main/res/font/balsamiq_sans_bold_version.xml12
-rw-r--r--app/src/main/res/font/noto_sans_bold_version.xml12
-rw-r--r--app/src/main/res/font/roboto_condensed_bold_version.xml12
-rw-r--r--app/src/main/res/layout/fragment_font_preview.xml68
-rw-r--r--app/src/main/res/values/arrays.xml22
-rw-r--r--app/src/main/res/values/styles.xml72
-rw-r--r--build.gradle2
12 files changed, 211 insertions, 21 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));
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
--- a/app/src/main/res/font/bad_script_regular.ttf
+++ /dev/null
Binary files 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+ <font
+ app:fontStyle="normal"
+ app:fontWeight="700"
+ app:font="@font/balsamiq_sans_bold" />
+
+ <font
+ app:fontStyle="italic"
+ app:fontWeight="700"
+ app:font="@font/balsamiq_sans_bold_italic" />
+</font-family> \ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+ <font
+ app:fontStyle="normal"
+ app:fontWeight="700"
+ app:font="@font/noto_sans_bold" />
+
+ <font
+ app:fontStyle="italic"
+ app:fontWeight="700"
+ app:font="@font/noto_sans_bold_italic" />
+</font-family> \ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+ <font
+ app:fontStyle="normal"
+ app:fontWeight="700"
+ app:font="@font/roboto_condensed_bold" />
+
+ <font
+ app:fontStyle="italic"
+ app:fontWeight="700"
+ app:font="@font/roboto_condensed_bold_italic" />
+</font-family> \ 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
@@ -36,6 +36,18 @@
android:paddingBottom="16dp"
android:paddingStart="72dp"
android:paddingEnd="16dp"
+ android:text="Balsamiq Sans Bold"
+ android:textColor="?attr/primaryTextColor"
+ android:textSize="?attr/font_default"
+ android:fontFamily="@font/balsamiq_sans_bold_version" />
+
+ <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"
@@ -48,10 +60,10 @@
android:paddingBottom="16dp"
android:paddingStart="72dp"
android:paddingEnd="16dp"
- android:text="Roboto Condensed"
+ android:text="Noto Sans Bold"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
- android:fontFamily="@font/roboto_condensed" />
+ android:fontFamily="@font/noto_sans_bold_version" />
<TextView
android:layout_width="match_parent"
@@ -72,6 +84,42 @@
android:paddingBottom="16dp"
android:paddingStart="72dp"
android:paddingEnd="16dp"
+ android:text="Harmonia Sans Bold"
+ android:textColor="?attr/primaryTextColor"
+ android:textSize="?attr/font_default"
+ android:fontFamily="@font/harmonia_sans_bold" />
+
+ <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="Roboto Condensed Bold"
+ android:textColor="?attr/primaryTextColor"
+ android:textSize="?attr/font_default"
+ android:fontFamily="@font/roboto_condensed_bold_version" />
+
+ <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"
@@ -84,6 +132,18 @@
android:paddingBottom="16dp"
android:paddingStart="72dp"
android:paddingEnd="16dp"
+ android:text="Inter Bold"
+ android:textColor="?attr/primaryTextColor"
+ android:textSize="?attr/font_default"
+ android:fontFamily="@font/inter_bold" />
+
+ <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"
@@ -96,10 +156,10 @@
android:paddingBottom="16dp"
android:paddingStart="72dp"
android:paddingEnd="16dp"
- android:text="Bad Script"
+ android:text="Manrope Bold"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
- android:fontFamily="@font/bad_script_regular" />
+ android:fontFamily="@font/manrope_bold" />
<TextView
android:layout_width="match_parent"
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 2d8cdce0..e3ad548e 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -130,24 +130,34 @@
<string-array name="settings_font_family">
<item>Default</item>
<item>Balsamiq Sans</item>
+ <item>Balsamiq Sans Bold</item>
<item>Noto Sans</item>
- <item>Roboto Condensed</item>
+ <item>Noto Sans Bold</item>
<item>Harmonia Sans</item>
- <item>Inter</item>
- <item>Manrope</item>
- <item>Bad Script</item>
+ <item>Harmonia Sans Bold (No Italic)</item>
+ <item>Roboto Condensed</item>
+ <item>Roboto Condensed Bold</item>
+ <item>Inter (No Italic)</item>
+ <item>Inter Bold (No Italic)</item>
+ <item>Manrope (No Italic)</item>
+ <item>Manrope Bold (No Italic)</item>
<item>Sriracha</item>
</string-array>
<string-array name="settings_font_family_values">
<item>Default</item>
<item>BalsamiqSans</item>
+ <item>BalsamiqSansBold</item>
<item>NotoSans</item>
- <item>RobotoCondensed</item>
+ <item>NotoSansBold</item>
<item>HarmoniaSans</item>
+ <item>HarmoniaSansBold</item>
+ <item>RobotoCondensed</item>
+ <item>RobotoCondensedBold</item>
<item>Inter</item>
+ <item>InterBold</item>
<item>Manrope</item>
- <item>BadScript</item>
+ <item>ManropeBold</item>
<item>Sriracha</item>
</string-array>
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 @@
<item name="font_family">@font/balsamiq_sans</item>
</style>
+ <style name="FontFamily.BalsamiqSansBold">
+ <item name="font_family">@font/balsamiq_sans_bold_version</item>
+ </style>
+
<style name="FontFamily.NotoSans">
<item name="font_family">@font/noto_sans</item>
</style>
+ <style name="FontFamily.NotoSansBold">
+ <item name="font_family">@font/noto_sans_bold_version</item>
+ </style>
+
<style name="FontFamily.RobotoCondensed">
<item name="font_family">@font/roboto_condensed</item>
</style>
+ <style name="FontFamily.RobotoCondensedBold">
+ <item name="font_family">@font/roboto_condensed_bold_version</item>
+ </style>
+
<style name="FontFamily.HarmoniaSans">
<item name="font_family">@font/harmonia_sans</item>
</style>
+ <style name="FontFamily.HarmoniaSansBold">
+ <item name="font_family">@font/harmonia_sans_bold</item>
+ </style>
+
<style name="FontFamily.Inter">
<item name="font_family">@font/inter</item>
</style>
+ <style name="FontFamily.InterBold">
+ <item name="font_family">@font/inter_bold</item>
+ </style>
+
<style name="FontFamily.Manrope">
<item name="font_family">@font/manrope</item>
</style>
- <style name="FontFamily.BadScript">
- <item name="font_family">@font/bad_script_regular</item>
+ <style name="FontFamily.ManropeBold">
+ <item name="font_family">@font/manrope_bold</item>
</style>
<style name="FontFamily.Sriracha">
@@ -295,28 +315,48 @@
<item name="title_font_family">@font/balsamiq_sans</item>
</style>
+ <style name="TitleFontFamily.BalsamiqSansBold">
+ <item name="title_font_family">@font/balsamiq_sans_bold_version</item>
+ </style>
+
<style name="TitleFontFamily.NotoSans">
<item name="title_font_family">@font/noto_sans</item>
</style>
+ <style name="TitleFontFamily.NotoSansBold">
+ <item name="title_font_family">@font/noto_sans_bold_version</item>
+ </style>
+
<style name="TitleFontFamily.RobotoCondensed">
<item name="title_font_family">@font/roboto_condensed</item>
</style>
+ <style name="TitleFontFamily.RobotoCondensedBold">
+ <item name="title_font_family">@font/roboto_condensed_bold_version</item>
+ </style>
+
<style name="TitleFontFamily.HarmoniaSans">
<item name="title_font_family">@font/harmonia_sans</item>
</style>
+ <style name="TitleFontFamily.HarmoniaSansBold">
+ <item name="title_font_family">@font/harmonia_sans_bold</item>
+ </style>
+
<style name="TitleFontFamily.Inter">
<item name="title_font_family">@font/inter</item>
</style>
+ <style name="TitleFontFamily.InterBold">
+ <item name="title_font_family">@font/inter_bold</item>
+ </style>
+
<style name="TitleFontFamily.Manrope">
<item name="title_font_family">@font/manrope</item>
</style>
- <style name="TitleFontFamily.BadScript">
- <item name="title_font_family">@font/bad_script_regular</item>
+ <style name="TitleFontFamily.ManropeBold">
+ <item name="title_font_family">@font/manrope_bold</item>
</style>
<style name="TitleFontFamily.Sriracha">
@@ -333,28 +373,48 @@
<item name="content_font_family">@font/balsamiq_sans</item>
</style>
+ <style name="ContentFontFamily.BalsamiqSansBold">
+ <item name="content_font_family">@font/balsamiq_sans_bold_version</item>
+ </style>
+
<style name="ContentFontFamily.NotoSans">
<item name="content_font_family">@font/noto_sans</item>
</style>
+ <style name="ContentFontFamily.NotoSansBold">
+ <item name="content_font_family">@font/noto_sans_bold_version</item>
+ </style>
+
<style name="ContentFontFamily.RobotoCondensed">
<item name="content_font_family">@font/roboto_condensed</item>
</style>
+ <style name="ContentFontFamily.RobotoCondensedBold">
+ <item name="content_font_family">@font/roboto_condensed_bold_version</item>
+ </style>
+
<style name="ContentFontFamily.HarmoniaSans">
<item name="content_font_family">@font/harmonia_sans</item>
</style>
+ <style name="ContentFontFamily.HarmoniaSansBold">
+ <item name="content_font_family">@font/harmonia_sans_bold</item>
+ </style>
+
<style name="ContentFontFamily.Inter">
<item name="content_font_family">@font/inter</item>
</style>
+ <style name="ContentFontFamily.InterBold">
+ <item name="content_font_family">@font/inter_bold</item>
+ </style>
+
<style name="ContentFontFamily.Manrope">
<item name="content_font_family">@font/manrope</item>
</style>
- <style name="ContentFontFamily.BadScript">
- <item name="content_font_family">@font/bad_script_regular</item>
+ <style name="ContentFontFamily.ManropeBold">
+ <item name="content_font_family">@font/manrope_bold</item>
</style>
<style name="ContentFontFamily.Sriracha">
diff --git a/build.gradle b/build.gradle
index 4ee976c2..c68c9f04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.0.0'
+ classpath 'com.android.tools.build:gradle:4.0.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
generated by cgit (git). Responsive design from responsive-cgit-css. Dark theme color palette from Dracula theme