From ee048b25dd0d2a412271a17e954619702dcfae53 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Fri, 12 Jun 2020 22:05:12 +0800 Subject: Fix bugs related to favoriting multireddits. Add some fonts. --- app/src/main/res/font/manrope.xml | 17 ++++++++++++++ app/src/main/res/font/manrope_bold.ttf | Bin 0 -> 92240 bytes app/src/main/res/font/manrope_light.ttf | Bin 0 -> 92412 bytes app/src/main/res/font/manrope_medium.ttf | Bin 0 -> 92472 bytes app/src/main/res/font/manrope_regular.ttf | Bin 0 -> 92380 bytes app/src/main/res/font/rubik.xml | 32 +++++++++++++++++++++++++++ app/src/main/res/font/rubik_bold.ttf | Bin 0 -> 136068 bytes app/src/main/res/font/rubik_bold_italic.ttf | Bin 0 -> 139280 bytes app/src/main/res/font/rubik_italic.ttf | Bin 0 -> 136160 bytes app/src/main/res/font/rubik_light.ttf | Bin 0 -> 130688 bytes app/src/main/res/font/rubik_light_italic.ttf | Bin 0 -> 133940 bytes app/src/main/res/font/rubik_regular.ttf | Bin 0 -> 133376 bytes app/src/main/res/values/arrays.xml | 4 ++++ app/src/main/res/values/styles.xml | 24 ++++++++++++++++++++ 14 files changed, 77 insertions(+) create mode 100644 app/src/main/res/font/manrope.xml create mode 100644 app/src/main/res/font/manrope_bold.ttf create mode 100644 app/src/main/res/font/manrope_light.ttf create mode 100644 app/src/main/res/font/manrope_medium.ttf create mode 100644 app/src/main/res/font/manrope_regular.ttf create mode 100644 app/src/main/res/font/rubik.xml create mode 100644 app/src/main/res/font/rubik_bold.ttf create mode 100644 app/src/main/res/font/rubik_bold_italic.ttf create mode 100644 app/src/main/res/font/rubik_italic.ttf create mode 100644 app/src/main/res/font/rubik_light.ttf create mode 100644 app/src/main/res/font/rubik_light_italic.ttf create mode 100644 app/src/main/res/font/rubik_regular.ttf (limited to 'app/src/main/res') diff --git a/app/src/main/res/font/manrope.xml b/app/src/main/res/font/manrope.xml new file mode 100644 index 00000000..0193f184 --- /dev/null +++ b/app/src/main/res/font/manrope.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/manrope_bold.ttf b/app/src/main/res/font/manrope_bold.ttf new file mode 100644 index 00000000..0b2be328 Binary files /dev/null and b/app/src/main/res/font/manrope_bold.ttf differ diff --git a/app/src/main/res/font/manrope_light.ttf b/app/src/main/res/font/manrope_light.ttf new file mode 100644 index 00000000..5a771c80 Binary files /dev/null and b/app/src/main/res/font/manrope_light.ttf differ diff --git a/app/src/main/res/font/manrope_medium.ttf b/app/src/main/res/font/manrope_medium.ttf new file mode 100644 index 00000000..e704d983 Binary files /dev/null and b/app/src/main/res/font/manrope_medium.ttf differ diff --git a/app/src/main/res/font/manrope_regular.ttf b/app/src/main/res/font/manrope_regular.ttf new file mode 100644 index 00000000..8f414180 Binary files /dev/null and b/app/src/main/res/font/manrope_regular.ttf differ diff --git a/app/src/main/res/font/rubik.xml b/app/src/main/res/font/rubik.xml new file mode 100644 index 00000000..50596309 --- /dev/null +++ b/app/src/main/res/font/rubik.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + \ 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 new file mode 100644 index 00000000..4e77930f Binary files /dev/null and b/app/src/main/res/font/rubik_bold.ttf differ diff --git a/app/src/main/res/font/rubik_bold_italic.ttf b/app/src/main/res/font/rubik_bold_italic.ttf new file mode 100644 index 00000000..f6322472 Binary files /dev/null and b/app/src/main/res/font/rubik_bold_italic.ttf differ diff --git a/app/src/main/res/font/rubik_italic.ttf b/app/src/main/res/font/rubik_italic.ttf new file mode 100644 index 00000000..2ddac98e Binary files /dev/null and b/app/src/main/res/font/rubik_italic.ttf differ diff --git a/app/src/main/res/font/rubik_light.ttf b/app/src/main/res/font/rubik_light.ttf new file mode 100644 index 00000000..8189d848 Binary files /dev/null and b/app/src/main/res/font/rubik_light.ttf differ diff --git a/app/src/main/res/font/rubik_light_italic.ttf b/app/src/main/res/font/rubik_light_italic.ttf new file mode 100644 index 00000000..8a9ae95a Binary files /dev/null and b/app/src/main/res/font/rubik_light_italic.ttf differ diff --git a/app/src/main/res/font/rubik_regular.ttf b/app/src/main/res/font/rubik_regular.ttf new file mode 100644 index 00000000..52b59ca4 Binary files /dev/null and b/app/src/main/res/font/rubik_regular.ttf differ diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 5040291b..e5bcf611 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -131,6 +131,8 @@ Harmonia Sans Selawk Inter + Manrope + Rubik @@ -141,6 +143,8 @@ HarmoniaSans Selawk Inter + Manrope + Rubik diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 214e9a66..6e46c6cf 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -262,6 +262,14 @@ @font/inter + + + + + + + + + + + +