From 2277c97cc0f922c527e5fbf16d6b468c558b953f Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Wed, 10 Jun 2020 21:08:13 +0800 Subject: Add more fonts. --- .../infinityforreddit/Font/ContentFontFamily.java | 6 ++- .../infinityforreddit/Font/FontFamily.java | 6 ++- .../infinityforreddit/Font/TitleFontFamily.java | 6 ++- app/src/main/res/font/harmonia_sans.xml | 17 ++++++++ app/src/main/res/font/harmonia_sans_bold.ttf | Bin 0 -> 29976 bytes app/src/main/res/font/harmonia_sans_italic.ttf | Bin 0 -> 166500 bytes app/src/main/res/font/harmonia_sans_regular.ttf | Bin 0 -> 30640 bytes app/src/main/res/font/inter.xml | 17 ++++++++ app/src/main/res/font/inter_bold.ttf | Bin 0 -> 293452 bytes app/src/main/res/font/inter_light.ttf | Bin 0 -> 288088 bytes app/src/main/res/font/inter_regular.ttf | Bin 0 -> 287928 bytes app/src/main/res/font/roboto_condensed.xml | 32 ++++++++++++++ app/src/main/res/font/roboto_condensed_bold.ttf | Bin 0 -> 169352 bytes .../main/res/font/roboto_condensed_bold_italic.ttf | Bin 0 -> 175420 bytes app/src/main/res/font/roboto_condensed_italic.ttf | Bin 0 -> 174736 bytes app/src/main/res/font/roboto_condensed_light.ttf | Bin 0 -> 167568 bytes .../res/font/roboto_condensed_light_italic.ttf | Bin 0 -> 174908 bytes app/src/main/res/font/roboto_condensed_regular.ttf | Bin 0 -> 169848 bytes app/src/main/res/font/selawk.xml | 17 ++++++++ app/src/main/res/font/selawk_bold.ttf | Bin 0 -> 44068 bytes app/src/main/res/font/selawk_light.ttf | Bin 0 -> 44232 bytes app/src/main/res/font/selawk_regular.ttf | Bin 0 -> 44224 bytes app/src/main/res/values/arrays.xml | 8 ++++ app/src/main/res/values/styles.xml | 48 +++++++++++++++++++++ 24 files changed, 154 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/font/harmonia_sans.xml create mode 100644 app/src/main/res/font/harmonia_sans_bold.ttf create mode 100644 app/src/main/res/font/harmonia_sans_italic.ttf create mode 100644 app/src/main/res/font/harmonia_sans_regular.ttf create mode 100644 app/src/main/res/font/inter.xml create mode 100644 app/src/main/res/font/inter_bold.ttf create mode 100644 app/src/main/res/font/inter_light.ttf create mode 100644 app/src/main/res/font/inter_regular.ttf create mode 100644 app/src/main/res/font/roboto_condensed.xml create mode 100644 app/src/main/res/font/roboto_condensed_bold.ttf create mode 100644 app/src/main/res/font/roboto_condensed_bold_italic.ttf create mode 100644 app/src/main/res/font/roboto_condensed_italic.ttf create mode 100644 app/src/main/res/font/roboto_condensed_light.ttf create mode 100644 app/src/main/res/font/roboto_condensed_light_italic.ttf create mode 100644 app/src/main/res/font/roboto_condensed_regular.ttf create mode 100644 app/src/main/res/font/selawk.xml create mode 100644 app/src/main/res/font/selawk_bold.ttf create mode 100644 app/src/main/res/font/selawk_light.ttf create mode 100644 app/src/main/res/font/selawk_regular.ttf (limited to 'app') 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 1ef28bbe..8b43545f 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java @@ -5,7 +5,11 @@ import ml.docilealligator.infinityforreddit.R; public enum ContentFontFamily { Default(R.style.ContentFontFamily, "Default"), BalsamiqSans(R.style.ContentFontFamily_BalsamiqSans, "BalsamiqSans"), - NotoSans(R.style.ContentFontFamily_NotoSans, "NotoSans"); + 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"); 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 f33873b2..40540060 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java @@ -5,7 +5,11 @@ import ml.docilealligator.infinityforreddit.R; public enum FontFamily { Default(R.style.FontFamily, "Default"), BalsamiqSans(R.style.FontFamily_BalsamiqSans, "BalsamiqSans"), - NotoSans(R.style.FontFamily_NotoSans, "NotoSans"); + 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"); 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 2b9a73b0..9e348bec 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java @@ -5,7 +5,11 @@ import ml.docilealligator.infinityforreddit.R; public enum TitleFontFamily { Default(R.style.TitleFontFamily, "Default"), BalsamiqSans(R.style.TitleFontFamily_BalsamiqSans, "BalsamiqSans"), - NotoSans(R.style.TitleFontFamily_NotoSans, "NotoSans"); + 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"); private int resId; private String title; diff --git a/app/src/main/res/font/harmonia_sans.xml b/app/src/main/res/font/harmonia_sans.xml new file mode 100644 index 00000000..4dff085f --- /dev/null +++ b/app/src/main/res/font/harmonia_sans.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/harmonia_sans_bold.ttf b/app/src/main/res/font/harmonia_sans_bold.ttf new file mode 100644 index 00000000..c5668b6c Binary files /dev/null and b/app/src/main/res/font/harmonia_sans_bold.ttf differ diff --git a/app/src/main/res/font/harmonia_sans_italic.ttf b/app/src/main/res/font/harmonia_sans_italic.ttf new file mode 100644 index 00000000..bc9f13a4 Binary files /dev/null and b/app/src/main/res/font/harmonia_sans_italic.ttf differ diff --git a/app/src/main/res/font/harmonia_sans_regular.ttf b/app/src/main/res/font/harmonia_sans_regular.ttf new file mode 100644 index 00000000..dbaed744 Binary files /dev/null and b/app/src/main/res/font/harmonia_sans_regular.ttf differ diff --git a/app/src/main/res/font/inter.xml b/app/src/main/res/font/inter.xml new file mode 100644 index 00000000..3a0d1784 --- /dev/null +++ b/app/src/main/res/font/inter.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/inter_bold.ttf b/app/src/main/res/font/inter_bold.ttf new file mode 100644 index 00000000..5b3865c8 Binary files /dev/null and b/app/src/main/res/font/inter_bold.ttf differ diff --git a/app/src/main/res/font/inter_light.ttf b/app/src/main/res/font/inter_light.ttf new file mode 100644 index 00000000..8a2b98b5 Binary files /dev/null and b/app/src/main/res/font/inter_light.ttf differ diff --git a/app/src/main/res/font/inter_regular.ttf b/app/src/main/res/font/inter_regular.ttf new file mode 100644 index 00000000..b1965d40 Binary files /dev/null and b/app/src/main/res/font/inter_regular.ttf differ diff --git a/app/src/main/res/font/roboto_condensed.xml b/app/src/main/res/font/roboto_condensed.xml new file mode 100644 index 00000000..e2a5da42 --- /dev/null +++ b/app/src/main/res/font/roboto_condensed.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/roboto_condensed_bold.ttf b/app/src/main/res/font/roboto_condensed_bold.ttf new file mode 100644 index 00000000..7fe31289 Binary files /dev/null and b/app/src/main/res/font/roboto_condensed_bold.ttf differ diff --git a/app/src/main/res/font/roboto_condensed_bold_italic.ttf b/app/src/main/res/font/roboto_condensed_bold_italic.ttf new file mode 100644 index 00000000..52ef6f37 Binary files /dev/null and b/app/src/main/res/font/roboto_condensed_bold_italic.ttf differ diff --git a/app/src/main/res/font/roboto_condensed_italic.ttf b/app/src/main/res/font/roboto_condensed_italic.ttf new file mode 100644 index 00000000..12216d67 Binary files /dev/null and b/app/src/main/res/font/roboto_condensed_italic.ttf differ diff --git a/app/src/main/res/font/roboto_condensed_light.ttf b/app/src/main/res/font/roboto_condensed_light.ttf new file mode 100644 index 00000000..43dd8f42 Binary files /dev/null and b/app/src/main/res/font/roboto_condensed_light.ttf differ diff --git a/app/src/main/res/font/roboto_condensed_light_italic.ttf b/app/src/main/res/font/roboto_condensed_light_italic.ttf new file mode 100644 index 00000000..99d491b9 Binary files /dev/null and b/app/src/main/res/font/roboto_condensed_light_italic.ttf differ diff --git a/app/src/main/res/font/roboto_condensed_regular.ttf b/app/src/main/res/font/roboto_condensed_regular.ttf new file mode 100644 index 00000000..62dd61e5 Binary files /dev/null and b/app/src/main/res/font/roboto_condensed_regular.ttf differ diff --git a/app/src/main/res/font/selawk.xml b/app/src/main/res/font/selawk.xml new file mode 100644 index 00000000..28f46f58 --- /dev/null +++ b/app/src/main/res/font/selawk.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/selawk_bold.ttf b/app/src/main/res/font/selawk_bold.ttf new file mode 100644 index 00000000..2134a765 Binary files /dev/null and b/app/src/main/res/font/selawk_bold.ttf differ diff --git a/app/src/main/res/font/selawk_light.ttf b/app/src/main/res/font/selawk_light.ttf new file mode 100644 index 00000000..cbfaaf99 Binary files /dev/null and b/app/src/main/res/font/selawk_light.ttf differ diff --git a/app/src/main/res/font/selawk_regular.ttf b/app/src/main/res/font/selawk_regular.ttf new file mode 100644 index 00000000..736bac3c Binary files /dev/null and b/app/src/main/res/font/selawk_regular.ttf differ diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index feb9b16e..5040291b 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -127,12 +127,20 @@ Default Balsamiq Sans Noto Sans + Roboto Condensed + Harmonia Sans + Selawk + Inter Default BalsamiqSans NotoSans + RobotoCondensed + HarmoniaSans + Selawk + Inter diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index cec4a93e..214e9a66 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -246,6 +246,22 @@ @font/noto_sans + + + + + + + + + + + + + + + + + + + + + + + +