From 837e461451a877c581ea38e401863a266a1781ca Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Fri, 27 Sep 2019 00:30:24 +0800 Subject: Add title and content font size options. --- app/src/main/res/layout/activity_comment.xml | 4 +- app/src/main/res/layout/activity_edit_comment.xml | 2 +- app/src/main/res/layout/activity_edit_post.xml | 4 +- app/src/main/res/layout/activity_post_image.xml | 2 +- app/src/main/res/layout/activity_post_link.xml | 4 +- app/src/main/res/layout/activity_post_text.xml | 4 +- app/src/main/res/layout/activity_post_video.xml | 2 +- app/src/main/res/layout/dialog_edit_flair.xml | 1 + app/src/main/res/layout/item_comment.xml | 2 +- app/src/main/res/layout/item_post.xml | 2 +- app/src/main/res/layout/item_post_detail.xml | 4 +- app/src/main/res/layout/item_rule.xml | 4 +- app/src/main/res/values/arrays.xml | 30 +++++++++ app/src/main/res/values/attr.xml | 16 +++++ app/src/main/res/values/strings.xml | 2 + app/src/main/res/values/styles.xml | 79 ++++++++++++++++++++++- app/src/main/res/xml/font_size_preferences.xml | 29 +++++++++ app/src/main/res/xml/main_preferences.xml | 8 +-- 18 files changed, 174 insertions(+), 25 deletions(-) create mode 100644 app/src/main/res/xml/font_size_preferences.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml index f5c5afe1..2a3629d7 100644 --- a/app/src/main/res/layout/activity_comment.xml +++ b/app/src/main/res/layout/activity_comment.xml @@ -37,7 +37,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:textSize="?attr/font_16" /> + android:textSize="?attr/content_font_16" /> diff --git a/app/src/main/res/layout/activity_edit_comment.xml b/app/src/main/res/layout/activity_edit_comment.xml index 94f9b602..10b7241b 100644 --- a/app/src/main/res/layout/activity_edit_comment.xml +++ b/app/src/main/res/layout/activity_edit_comment.xml @@ -29,7 +29,7 @@ android:padding="16dp" android:hint="@string/post_text_content_hint" android:inputType="textCapSentences|textMultiLine" - android:textSize="?attr/font_18" + android:textSize="?attr/content_font_18" android:background="#00000000" android:textColor="@color/primaryTextColor" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> diff --git a/app/src/main/res/layout/activity_edit_post.xml b/app/src/main/res/layout/activity_edit_post.xml index e7645c5e..1606fc16 100644 --- a/app/src/main/res/layout/activity_edit_post.xml +++ b/app/src/main/res/layout/activity_edit_post.xml @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:gravity="top" android:padding="16dp" - android:textSize="?attr/font_18" + android:textSize="?attr/title_font_18" android:textColor="@color/primaryTextColor" /> diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml index 1cf36a16..93cfcf2b 100644 --- a/app/src/main/res/layout/activity_post_image.xml +++ b/app/src/main/res/layout/activity_post_image.xml @@ -137,7 +137,7 @@ android:padding="16dp" android:hint="@string/post_title_hint" android:inputType="textCapSentences|textMultiLine" - android:textSize="?attr/font_18" + android:textSize="?attr/title_font_18" android:background="#00000000" android:textColor="@color/primaryTextColor" /> diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml index 23374e78..a9e7c96d 100644 --- a/app/src/main/res/layout/activity_post_link.xml +++ b/app/src/main/res/layout/activity_post_link.xml @@ -137,7 +137,7 @@ android:padding="16dp" android:hint="@string/post_title_hint" android:inputType="textCapSentences|textMultiLine" - android:textSize="?attr/font_18" + android:textSize="?attr/title_font_18" android:background="#00000000" android:textColor="@color/primaryTextColor" /> @@ -154,7 +154,7 @@ android:padding="16dp" android:hint="@string/post_link_hint" android:inputType="textMultiLine" - android:textSize="?attr/font_18" + android:textSize="?attr/content_font_18" android:background="#00000000" android:textColor="@color/primaryTextColor" /> diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml index b10266f1..dcb00c5c 100644 --- a/app/src/main/res/layout/activity_post_text.xml +++ b/app/src/main/res/layout/activity_post_text.xml @@ -137,7 +137,7 @@ android:padding="16dp" android:hint="@string/post_title_hint" android:inputType="textCapSentences|textMultiLine" - android:textSize="?attr/font_18" + android:textSize="?attr/title_font_18" android:background="#00000000" android:textColor="@color/primaryTextColor" /> @@ -154,7 +154,7 @@ android:padding="16dp" android:hint="@string/post_text_content_hint" android:inputType="textCapSentences|textMultiLine" - android:textSize="?attr/font_18" + android:textSize="?attr/content_font_18" android:background="#00000000" android:textColor="@color/primaryTextColor" /> diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml index 086c63b8..9510db6b 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -137,7 +137,7 @@ android:padding="16dp" android:hint="@string/post_title_hint" android:inputType="textCapSentences|textMultiLine" - android:textSize="?attr/font_18" + android:textSize="?attr/title_font_18" android:background="#00000000" android:textColor="@color/primaryTextColor" /> diff --git a/app/src/main/res/layout/dialog_edit_flair.xml b/app/src/main/res/layout/dialog_edit_flair.xml index 5872be15..55efc339 100644 --- a/app/src/main/res/layout/dialog_edit_flair.xml +++ b/app/src/main/res/layout/dialog_edit_flair.xml @@ -10,6 +10,7 @@ android:layout_margin="24dp" android:background="#00000000" android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" android:hint="@string/flair" android:maxLength="64" /> diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index c286738a..1cac0a70 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -59,7 +59,7 @@ android:layout_marginEnd="32dp" android:layout_marginBottom="8dp" android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/content_font_default" /> + android:textSize="?attr/title_font_18" /> + android:textSize="?attr/content_font_default" /> + android:textSize="?attr/title_font_16" /> + android:textSize="?attr/content_font_default" /> \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 43b955c8..f50fe519 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -70,4 +70,34 @@ Large XLarge + + + Small + Normal + Large + Extra Large + + + + Small + Normal + Large + XLarge + + + + Small + Normal + Large + Extra Large + Enormous Large + + + + Small + Normal + Large + XLarge + XXLarge + \ No newline at end of file diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml index 64aa4b9e..201074bd 100644 --- a/app/src/main/res/values/attr.xml +++ b/app/src/main/res/values/attr.xml @@ -9,4 +9,20 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6d7b0153..e8cba1f9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -275,6 +275,8 @@ Device default Lazy Mode Interval Font Size + Title Font Size + Content Font Size Enable NSFW Blur NSFW images Display Under Navigation bar and Status Bar diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f066da89..2b6e10bb 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -85,8 +85,7 @@ ?attr/font_default - + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/xml/font_size_preferences.xml b/app/src/main/res/xml/font_size_preferences.xml new file mode 100644 index 00000000..40695b92 --- /dev/null +++ b/app/src/main/res/xml/font_size_preferences.xml @@ -0,0 +1,29 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml index e1f8a0a0..6567eb1b 100644 --- a/app/src/main/res/xml/main_preferences.xml +++ b/app/src/main/res/xml/main_preferences.xml @@ -24,13 +24,9 @@ app:title="@string/settings_lazy_mode_interval_title" app:useSimpleSummaryProvider="true" /> - + app:fragment="Settings.FontSizePreferenceFragment" />