diff options
author | tom79 <tschneider.ac@gmail.com> | 2019-04-28 18:51:16 +0200 |
---|---|---|
committer | tom79 <tschneider.ac@gmail.com> | 2019-04-28 18:51:16 +0200 |
commit | 4d665a0d9eea481ba6bbb075b72c7cc0cc9825c1 (patch) | |
tree | 668be3baaf1dd48b3b92e3c420985968dc5aecb6 /app/src/main/res/layout/fragment_settings.xml | |
parent | bdb6ac94be0e2d49e5a039982071a0fdde645b2b (diff) | |
parent | a925b454891f0e4b64080fbe68b1a11b308d34f8 (diff) |
Merge branch 'develop'
# Conflicts:
# fastlane/metadata/android/en-US/full_description.txt
# fastlane/metadata/android/en-US/short_description.txt
Diffstat (limited to 'app/src/main/res/layout/fragment_settings.xml')
-rw-r--r-- | app/src/main/res/layout/fragment_settings.xml | 42 |
1 files changed, 11 insertions, 31 deletions
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 242c624b8..0ff791af3 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -64,6 +64,8 @@ <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" /> @@ -99,37 +101,6 @@ android:layout_weight="1" android:background="?colorAccent" /> </LinearLayout> - <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" /> <CheckBox android:id="@+id/set_old_direct_timeline" @@ -252,6 +223,15 @@ android:text="@string/set_display_follow_instance" android:layout_height="wrap_content" /> + <!-- DISPLAY NEW BADGE --> + <CheckBox + android:id="@+id/set_display_new_badge" + android:layout_width="wrap_content" + android:layout_marginTop="@dimen/settings_checkbox_margin" + android:layout_marginBottom="@dimen/settings_checkbox_margin" + android:text="@string/set_display_new_badge" + android:layout_height="wrap_content" /> + <!-- DISPLAY BOOKMARK BUTTON --> <CheckBox android:id="@+id/set_display_bookmarks" |