diff options
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r-- | app/src/main/res/values/arrays.xml | 20 | ||||
-rw-r--r-- | app/src/main/res/values/attr.xml | 12 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 9 | ||||
-rw-r--r-- | app/src/main/res/values/styles.xml | 99 |
4 files changed, 136 insertions, 4 deletions
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 5fce9e21..5040291b 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -122,6 +122,26 @@ <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> + <item>Roboto Condensed</item> + <item>Harmonia Sans</item> + <item>Selawk</item> + <item>Inter</item> + </string-array> + + <string-array name="settings_font_family_values"> + <item>Default</item> + <item>BalsamiqSans</item> + <item>NotoSans</item> + <item>RobotoCondensed</item> + <item>HarmoniaSans</item> + <item>Selawk</item> + <item>Inter</item> + </string-array> <string-array name="settings_tab_post_type"> <item>Home</item> diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml index f9b5058b..0cfd9358 100644 --- a/app/src/main/res/values/attr.xml +++ b/app/src/main/res/values/attr.xml @@ -27,6 +27,18 @@ <attr name="content_font_20" format="dimension"/> </declare-styleable> + <declare-styleable name="FontFamily"> + <attr name="font_family" format="reference"/> + </declare-styleable> + + <declare-styleable name="TitleFontFamily"> + <attr name="title_font_family" format="reference"/> + </declare-styleable> + + <declare-styleable name="ContentFontFamily"> + <attr name="content_font_family" format="reference"/> + </declare-styleable> + <declare-styleable name="Theme"> <attr name="colorPrimary" format="color"/> <attr name="colorPrimaryDark" format="color"/> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2acbbc79..86d705aa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -349,6 +349,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> @@ -712,7 +719,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 a7e31f71..214e9a66 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"> @@ -229,6 +232,96 @@ <item name="content_font_20">26sp</item> </style> + <style name="FontFamily" /> + + <style name="FontFamily.Default"> + <item name="font_family">@null</item> + </style> + + <style name="FontFamily.BalsamiqSans"> + <item name="font_family">@font/balsamiq_sans</item> + </style> + + <style name="FontFamily.NotoSans"> + <item name="font_family">@font/noto_sans</item> + </style> + + <style name="FontFamily.RobotoCondensed"> + <item name="font_family">@font/roboto_condensed</item> + </style> + + <style name="FontFamily.HarmoniaSans"> + <item name="font_family">@font/harmonia_sans</item> + </style> + + <style name="FontFamily.Selawk"> + <item name="font_family">@font/selawk</item> + </style> + + <style name="FontFamily.Inter"> + <item name="font_family">@font/inter</item> + </style> + + <style name="TitleFontFamily" /> + + <style name="TitleFontFamily.Default"> + <item name="title_font_family">@null</item> + </style> + + <style name="TitleFontFamily.BalsamiqSans"> + <item name="title_font_family">@font/balsamiq_sans</item> + </style> + + <style name="TitleFontFamily.NotoSans"> + <item name="title_font_family">@font/noto_sans</item> + </style> + + <style name="TitleFontFamily.RobotoCondensed"> + <item name="title_font_family">@font/roboto_condensed</item> + </style> + + <style name="TitleFontFamily.HarmoniaSans"> + <item name="title_font_family">@font/harmonia_sans</item> + </style> + + <style name="TitleFontFamily.Selawk"> + <item name="title_font_family">@font/selawk</item> + </style> + + <style name="TitleFontFamily.Inter"> + <item name="title_font_family">@font/inter</item> + </style> + + <style name="ContentFontFamily" /> + + <style name="ContentFontFamily.Default"> + <item name="content_font_family">@null</item> + </style> + + <style name="ContentFontFamily.BalsamiqSans"> + <item name="content_font_family">@font/balsamiq_sans</item> + </style> + + <style name="ContentFontFamily.NotoSans"> + <item name="content_font_family">@font/noto_sans</item> + </style> + + <style name="ContentFontFamily.RobotoCondensed"> + <item name="content_font_family">@font/roboto_condensed</item> + </style> + + <style name="ContentFontFamily.HarmoniaSans"> + <item name="content_font_family">@font/harmonia_sans</item> + </style> + + <style name="ContentFontFamily.Selawk"> + <item name="content_font_family">@font/selawk</item> + </style> + + <style name="ContentFontFamily.Inter"> + <item name="content_font_family">@font/inter</item> + </style> + <style name="Theme" /> <style name="Theme.Normal"> |