Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'categorize_settings' into 'develop' 

categorize settings

See merge request tom79/mastalab!1587
This commit is contained in:
Thomas 2019-01-23 14:29:09 +00:00
parent 62800aae38 a53f88f9bf
commit 405c530f0c
4 changed files with 306 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

216
app/src/main/res/layout-sw600dp/fragment_settings.xml
View File

@ -33,67 +33,86 @@
android:orientation="vertical"
tools:ignore="UselessParent">
<TextView
android:layout_marginTop="@dimen/settings_category_label_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_category_label_confirmations"/>
<CheckBox
android:id="@+id/set_share_validation"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_share_validation"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_share_validation_fav"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_share_validation_fav"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_auto_add_media_url"
<TextView
android:layout_marginTop="@dimen/settings_category_label_margin"
android:layout_width="wrap_content"
android:text="@string/set_auto_add_media_url"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_auto_store"
android:layout_width="wrap_content"
android:text="@string/set_auto_store_toot"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:text="@string/settings_category_label_timelines"/>
<CheckBox
android:id="@+id/set_display_direct"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_direct"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_local"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_local"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_global"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_global"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_art"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_art"
android:layout_height="wrap_content" />
<!-- CARRIAGE RETURN AFTER MENTION IN REPLIES -->
<CheckBox
android:id="@+id/set_capitalize"
android:id="@+id/set_old_direct_timeline"
android:layout_width="wrap_content"
android:text="@string/set_capitalize"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_old_direct_timeline"
android:layout_height="wrap_content" />
<TextView
android:layout_marginTop="@dimen/settings_category_label_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_category_label_notification"/>
<!-- LIVE NOTIFICATIONS SETTINGS -->
<CheckBox
android:id="@+id/set_live_notify"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/live_notif"
android:layout_height="wrap_content" />
@ -101,49 +120,23 @@
<CheckBox
android:id="@+id/set_keep_background_process"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_keep_background_process"
android:layout_height="wrap_content" />
<!-- GIF AVATARS -->
<CheckBox
android:id="@+id/set_disable_gif"
<TextView
android:layout_marginTop="@dimen/settings_category_label_margin"
android:layout_width="wrap_content"
android:text="@string/set_disable_gif"
android:layout_height="wrap_content" />
<!-- EXPAND CW -->
<CheckBox
android:id="@+id/set_expand_cw"
android:layout_width="wrap_content"
android:text="@string/expand_cw"
android:layout_height="wrap_content" />
<!-- EXPAND Images -->
<CheckBox
android:id="@+id/set_expand_image"
android:layout_width="wrap_content"
android:text="@string/expand_image"
android:layout_height="wrap_content" />
<!-- DISPLAY BOOKMARK BUTTON -->
<CheckBox
android:id="@+id/set_display_bookmarks"
android:layout_width="wrap_content"
android:text="@string/set_display_bookmark_button"
android:layout_height="wrap_content" />
<!-- FIT PREVIEWS -->
<CheckBox
android:id="@+id/set_fit_preview"
android:layout_width="wrap_content"
android:text="@string/set_fit_preview"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:text="@string/settings_category_label_interface"/>
<!-- COMPACT MODE -->
<CheckBox
android:id="@+id/set_compact_mode"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_compact_mode"
android:layout_height="wrap_content" />
@ -151,53 +144,152 @@
<CheckBox
android:id="@+id/set_display_follow_instance"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_follow_instance"
android:layout_height="wrap_content" />
<!-- PUT THE WHOLE CONTENT WHEN SHARING -->
<!-- DISPLAY BOOKMARK BUTTON -->
<CheckBox
android:id="@+id/set_share_details"
android:id="@+id/set_display_bookmarks"
android:layout_width="wrap_content"
android:text="@string/set_share_details"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_bookmark_button"
android:layout_height="wrap_content" />
<!-- FIT PREVIEWS -->
<CheckBox
android:id="@+id/set_automatically_split_toot"
android:id="@+id/set_fit_preview"
android:layout_width="wrap_content"
android:text="@string/set_automatically_split_toot"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_fit_preview"
android:layout_height="wrap_content" />
<!-- GIF AVATARS -->
<CheckBox
android:id="@+id/set_display_emoji"
android:id="@+id/set_disable_gif"
android:layout_width="wrap_content"
android:text="@string/set_display_emoji"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_disable_gif"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_card"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_card"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_video_preview"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_video_preview"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_old_direct_timeline"
android:layout_width="wrap_content"
android:text="@string/set_old_direct_timeline"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_content_after_fetch_more"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_content_after_fetch_more"
android:layout_height="wrap_content" />
<TextView
android:layout_marginTop="@dimen/settings_category_label_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_category_label_composing"/>
<CheckBox
android:id="@+id/set_auto_add_media_url"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_auto_add_media_url"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_auto_store"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_auto_store_toot"
android:layout_height="wrap_content" />
<!-- CARRIAGE RETURN AFTER MENTION IN REPLIES -->
<CheckBox
android:id="@+id/set_capitalize"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_capitalize"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_automatically_split_toot"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_automatically_split_toot"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_emoji"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_emoji"
android:layout_height="wrap_content" />
<!-- PUT THE WHOLE CONTENT WHEN SHARING -->
<CheckBox
android:id="@+id/set_share_details"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_share_details"
android:layout_height="wrap_content" />
<TextView
android:layout_marginTop="@dimen/settings_category_label_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_category_label_hiddencontent"/>
<!-- EXPAND CW -->
<CheckBox
android:id="@+id/set_expand_cw"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/expand_cw"
android:layout_height="wrap_content" />
<!-- EXPAND Images -->
<CheckBox
android:id="@+id/set_expand_image"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/expand_image"
android:layout_height="wrap_content" />
<!-- TRUNCATE LONG TOOTS -->
<TextView
android:layout_marginTop="10dp"

206
app/src/main/res/layout/fragment_settings.xml
View File

@ -37,6 +37,11 @@
android:paddingRight="@dimen/fab_margin"
android:orientation="vertical"
tools:ignore="UselessParent">
<TextView
android:layout_marginTop="@dimen/settings_category_label_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_category_label_confirmations"/>
<CheckBox
android:id="@+id/set_share_validation"
android:layout_width="wrap_content"
@ -46,57 +51,69 @@
<CheckBox
android:id="@+id/set_share_validation_fav"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_share_validation_fav"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_auto_add_media_url"
<TextView
android:layout_marginTop="@dimen/settings_category_label_margin"
android:layout_width="wrap_content"
android:text="@string/set_auto_add_media_url"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_auto_store"
android:layout_width="wrap_content"
android:text="@string/set_auto_store_toot"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:text="@string/settings_category_label_timelines"/>
<CheckBox
android:id="@+id/set_display_direct"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_direct"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_local"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_local"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_global"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_global"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_art"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_art"
android:layout_height="wrap_content" />
<!-- CARRIAGE RETURN AFTER MENTION IN REPLIES -->
<CheckBox
android:id="@+id/set_capitalize"
android:id="@+id/set_old_direct_timeline"
android:layout_width="wrap_content"
android:text="@string/set_capitalize"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_old_direct_timeline"
android:layout_height="wrap_content" />
<TextView
android:layout_marginTop="@dimen/settings_category_label_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_category_label_notification"/>
<!-- LIVE NOTIFICATIONS SETTINGS -->
<CheckBox
android:id="@+id/set_live_notify"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/live_notif"
android:layout_height="wrap_content" />
@ -104,49 +121,23 @@
<CheckBox
android:id="@+id/set_keep_background_process"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_keep_background_process"
android:layout_height="wrap_content" />
<!-- GIF AVATARS -->
<CheckBox
android:id="@+id/set_disable_gif"
<TextView
android:layout_marginTop="@dimen/settings_category_label_margin"
android:layout_width="wrap_content"
android:text="@string/set_disable_gif"
android:layout_height="wrap_content" />
<!-- EXPAND CW -->
<CheckBox
android:id="@+id/set_expand_cw"
android:layout_width="wrap_content"
android:text="@string/expand_cw"
android:layout_height="wrap_content" />
<!-- EXPAND Images -->
<CheckBox
android:id="@+id/set_expand_image"
android:layout_width="wrap_content"
android:text="@string/expand_image"
android:layout_height="wrap_content" />
<!-- DISPLAY BOOKMARK BUTTON -->
<CheckBox
android:id="@+id/set_display_bookmarks"
android:layout_width="wrap_content"
android:text="@string/set_display_bookmark_button"
android:layout_height="wrap_content" />
<!-- FIT PREVIEWS -->
<CheckBox
android:id="@+id/set_fit_preview"
android:layout_width="wrap_content"
android:text="@string/set_fit_preview"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:text="@string/settings_category_label_interface"/>
<!-- COMPACT MODE -->
<CheckBox
android:id="@+id/set_compact_mode"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_compact_mode"
android:layout_height="wrap_content" />
@ -154,53 +145,144 @@
<CheckBox
android:id="@+id/set_display_follow_instance"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_follow_instance"
android:layout_height="wrap_content" />
<!-- PUT THE WHOLE CONTENT WHEN SHARING -->
<!-- DISPLAY BOOKMARK BUTTON -->
<CheckBox
android:id="@+id/set_share_details"
android:id="@+id/set_display_bookmarks"
android:layout_width="wrap_content"
android:text="@string/set_share_details"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_bookmark_button"
android:layout_height="wrap_content" />
<!-- FIT PREVIEWS -->
<CheckBox
android:id="@+id/set_automatically_split_toot"
android:id="@+id/set_fit_preview"
android:layout_width="wrap_content"
android:text="@string/set_automatically_split_toot"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_fit_preview"
android:layout_height="wrap_content" />
<!-- GIF AVATARS -->
<CheckBox
android:id="@+id/set_display_emoji"
android:id="@+id/set_disable_gif"
android:layout_width="wrap_content"
android:text="@string/set_display_emoji"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_disable_gif"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_card"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_card"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_video_preview"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_video_preview"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_old_direct_timeline"
android:layout_width="wrap_content"
android:text="@string/set_old_direct_timeline"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_content_after_fetch_more"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_content_after_fetch_more"
android:layout_height="wrap_content" />
<TextView
android:layout_marginTop="@dimen/settings_category_label_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_category_label_composing"/>
<CheckBox
android:id="@+id/set_auto_add_media_url"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_auto_add_media_url"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_auto_store"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_auto_store_toot"
android:layout_height="wrap_content" />
<!-- CARRIAGE RETURN AFTER MENTION IN REPLIES -->
<CheckBox
android:id="@+id/set_capitalize"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_capitalize"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_automatically_split_toot"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_automatically_split_toot"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/set_display_emoji"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_display_emoji"
android:layout_height="wrap_content" />
<!-- PUT THE WHOLE CONTENT WHEN SHARING -->
<CheckBox
android:id="@+id/set_share_details"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/set_share_details"
android:layout_height="wrap_content" />
<TextView
android:layout_marginTop="@dimen/settings_category_label_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_category_label_hiddencontent"/>
<!-- EXPAND CW -->
<CheckBox
android:id="@+id/set_expand_cw"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/expand_cw"
android:layout_height="wrap_content" />
<!-- EXPAND Images -->
<CheckBox
android:id="@+id/set_expand_image"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:text="@string/expand_image"
android:layout_height="wrap_content" />
<!-- TRUNCATE LONG TOOTS -->
<TextView
android:layout_marginTop="10dp"

2
app/src/main/res/values/dimens.xml
View File

@ -12,4 +12,6 @@
<dimen name="layout_height_header">180dp</dimen>
<dimen name="fab_margin_floating">16dp</dimen>
<dimen name="item_offset">5dp</dimen>
<dimen name="settings_checkbox_margin">2dp</dimen>
<dimen name="settings_category_label_margin">2dp</dimen>
</resources>

6
app/src/main/res/values/strings.xml
View File

@ -835,6 +835,12 @@
<string name="toots_client">Toots (Device)</string>
<string name="modify">Modify</string>
<string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
<string name="settings_category_label_confirmations">Confirmations</string>
<string name="settings_category_label_timelines">Timelines</string>
<string name="settings_category_label_notification">Notification service</string>
<string name="settings_category_label_interface">Interface</string>
<string name="settings_category_label_hiddencontent">Hidden content</string>
<string name="settings_category_label_composing">Composing</string>
<!-- end languages -->