diff options
| author | Alex Ning <chineseperson5@gmail.com> | 2020-06-10 07:43:34 +0000 |
|---|---|---|
| committer | Alex Ning <chineseperson5@gmail.com> | 2020-06-10 07:43:34 +0000 |
| commit | 54a9f241d473765c963161a5c27d9b03d8b42e1e (patch) | |
| tree | 4d61203e85a1289a1e08f76d2fc40e67f1298d6c /app/src/main/res/values | |
| parent | 4cd07e3bb61d848590a953a37c8501962e2c0bd8 (diff) | |
| download | infinity-for-reddit-54a9f241d473765c963161a5c27d9b03d8b42e1e.tar infinity-for-reddit-54a9f241d473765c963161a5c27d9b03d8b42e1e.tar.gz infinity-for-reddit-54a9f241d473765c963161a5c27d9b03d8b42e1e.tar.bz2 infinity-for-reddit-54a9f241d473765c963161a5c27d9b03d8b42e1e.tar.lz infinity-for-reddit-54a9f241d473765c963161a5c27d9b03d8b42e1e.tar.xz infinity-for-reddit-54a9f241d473765c963161a5c27d9b03d8b42e1e.tar.zst infinity-for-reddit-54a9f241d473765c963161a5c27d9b03d8b42e1e.zip | |
Changing font is available. Fix subtitle on toolbar being cut if the font is large.
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/arrays.xml | 12 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 9 |
3 files changed, 26 insertions, 4 deletions
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 5fce9e21..feb9b16e 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -122,6 +122,18 @@ <item>XLarge</item> <item>XXLarge</item> </string-array> + + <string-array name="settings_font_family"> + <item>Default</item> + <item>Balsamiq Sans</item> + <item>Noto Sans</item> + </string-array> + + <string-array name="settings_font_family_values"> + <item>Default</item> + <item>BalsamiqSans</item> + <item>NotoSans</item> + </string-array> <string-array name="settings_tab_post_type"> <item>Home</item> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bdd8df76..a8d9f21f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -348,6 +348,13 @@ <string name="settings_lock_bottom_app_bar_title">Lock Bottom Navigation Bar</string> <string name="settings_swipe_up_to_hide_jump_to_next_top_level_comment_button_title">Swipe Up to Hide Jump to Next Top-level Comment Button</string> <string name="settings_lazy_mode_interval_title">Lazy Mode Interval</string> + <string name="settings_font_title">Font</string> + <string name="settings_font_summary">Font</string> + <string name="settings_title_font_summary">Title</string> + <string name="settings_content_font_summary">Content</string> + <string name="settings_font_family_title">Font Family</string> + <string name="settings_title_font_family_title">Title Font Family</string> + <string name="settings_content_font_family_title">Content Font Family</string> <string name="settings_font_size_title">Font Size</string> <string name="settings_title_font_size_title">Title Font Size</string> <string name="settings_content_font_size_title">Content Font Size</string> @@ -711,7 +718,7 @@ <string name="post_content_preview">This gravity joke is getting a bit old, but I fall for it every time.</string> <string name="post_type_preview">POST</string> <string name="flair_preview">Flair</string> - <string name="gilded_preview">x4</string> + <string name="awards_preview">4 Awards</string> <string name="author_flair_preview">Author Flair</string> <string name="comment_content_preview">I got my girlfriend a “Get better soon” card.\nShe\'s not ill or anything, but she could definitely get better.</string> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d09b0c72..cec4a93e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -39,14 +39,15 @@ <item name="android:windowIsTranslucent">true</item> <item name="android:windowTranslucentStatus">true</item> <item name="android:windowBackground">@android:color/black</item> + <item name="android:fontFamily">?attr/font_family</item> </style> - <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" /> + <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar"> + <item name="android:fontFamily">?attr/font_family</item> + </style> <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight" /> - <style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar" /> - <style name="CustomTabLayout" parent="Widget.Design.TabLayout"> <item name="tabIndicatorColor">@android:color/white</item> <item name="tabIndicatorHeight">3dp</item> @@ -105,10 +106,12 @@ <style name="PreferenceTitleTextStyle"> <item name="android:textSize">?attr/font_16</item> <item name="android:textColor">?attr/primaryTextColor</item> + <item name="android:fontFamily">?attr/font_family</item> </style> <style name="PreferenceSubtitleTextStyle"> <item name="android:textSize">?attr/font_default</item> + <item name="android:fontFamily">?attr/font_family</item> </style> <style name="ListPreferenceStyle" parent="ThemeOverlay.AppCompat.Dialog.Alert"> |