aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r--app/src/main/res/values/arrays.xml6
-rw-r--r--app/src/main/res/values/strings.xml8
-rw-r--r--app/src/main/res/values/styles.xml29
3 files changed, 34 insertions, 9 deletions
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 79229db3..51015180 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -104,6 +104,7 @@
</string-array>
<string-array name="settings_font_size">
+ <item>@string/extra_small</item>
<item>@string/small</item>
<item>@string/normal</item>
<item>@string/large</item>
@@ -111,6 +112,7 @@
</string-array>
<string-array name="settings_font_size_values">
+ <item>XSmall</item>
<item>Small</item>
<item>Normal</item>
<item>Large</item>
@@ -118,6 +120,7 @@
</string-array>
<string-array name="settings_title_font_size">
+ <item>@string/extra_small</item>
<item>@string/small</item>
<item>@string/normal</item>
<item>@string/large</item>
@@ -125,6 +128,7 @@
</string-array>
<string-array name="settings_title_font_size_values">
+ <item>XSmall</item>
<item>Small</item>
<item>Normal</item>
<item>Large</item>
@@ -132,6 +136,7 @@
</string-array>
<string-array name="settings_content_font_size">
+ <item>@string/extra_small</item>
<item>@string/small</item>
<item>@string/normal</item>
<item>@string/large</item>
@@ -140,6 +145,7 @@
</string-array>
<string-array name="settings_content_font_size_values">
+ <item>XSmall</item>
<item>Small</item>
<item>Normal</item>
<item>Large</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7ebc76eb..89129fa9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -80,7 +80,6 @@
<string name="action_crosspost">Crosspost</string>
<string name="action_set_wallpaper">Set as Wallpaper</string>
<string name="action_send_private_message">Send Private Message</string>
- <string name="action_block_user">Block User</string>
<string name="action_select_user_flair">Select User Flair</string>
<string name="action_give_award">Give Award</string>
<string name="action_save_to_database">Save to Database</string>
@@ -1052,12 +1051,10 @@
<string name="login_activity_2fa_prompt">If you have 2-factor authentication enabled, kindly type your password like the following: &lt;password&gt;:&lt;2FA code&gt;.\nExample: yourpass:123456</string>
- <string name="block_user">Block User</string>
- <string name="block_user_success">Blocked</string>
- <string name="block_user_failed">Failed to block user</string>
-
<string name="select_user_flair_success">User flair selected</string>
<string name="select_this_user_flair">Select this user flair?</string>
+ <string name="clear_user_flair">Clear Flair</string>
+ <string name="clear_user_flair_success">User flair cleared</string>
<string name="select_header_size">Select Header Size</string>
<string name="large">Large</string>
@@ -1175,6 +1172,7 @@
<string name="only_on_wifi">Only on Wifi</string>
<string name="never">Never</string>
<string name="normal">Normal</string>
+ <string name="extra_small">Extra Small</string>
<string name="extra_large">Extra Large</string>
<string name="enormously_large">Enormously Large</string>
<string name="default_in_array">Default</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2694fc6f..40a2c351 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -34,10 +34,6 @@
<item name="android:fontFamily">?attr/font_family</item>
</style>
- <style name="AppTheme.SlidableWithTranslucentWindow" parent="AppTheme.Slidable">
- <item name="android:windowTranslucentStatus">true</item>
- </style>
-
<style name="AppTheme.Draggable" parent="AppTheme">
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowContentOverlay">@null</item>
@@ -147,6 +143,15 @@
<style name="FontStyle" />
+ <style name="FontStyle.XSmall">
+ <item name="font_default">10sp</item>
+ <item name="font_10">8sp</item>
+ <item name="font_12">10sp</item>
+ <item name="font_16">12sp</item>
+ <item name="font_18">14sp</item>
+ <item name="font_20">16sp</item>
+ </style>
+
<style name="FontStyle.Small">
<item name="font_default">12sp</item>
<item name="font_10">10sp</item>
@@ -185,6 +190,14 @@
<style name="TitleFontStyle" />
+ <style name="TitleFontStyle.XSmall">
+ <item name="title_font_default">10sp</item>
+ <item name="title_font_12">10sp</item>
+ <item name="title_font_16">12sp</item>
+ <item name="title_font_18">14sp</item>
+ <item name="title_font_20">16sp</item>
+ </style>
+
<style name="TitleFontStyle.Small">
<item name="title_font_default">12sp</item>
<item name="title_font_12">12sp</item>
@@ -219,6 +232,14 @@
<style name="ContentFontStyle" />
+ <style name="ContentFontStyle.XSmall">
+ <item name="content_font_default">10sp</item>
+ <item name="content_font_12">10sp</item>
+ <item name="content_font_16">12sp</item>
+ <item name="content_font_18">14sp</item>
+ <item name="content_font_20">16sp</item>
+ </style>
+
<style name="ContentFontStyle.Small">
<item name="content_font_default">12sp</item>
<item name="content_font_12">12sp</item>