From 59eb8eb4d5c28047dd155b30e9db1c0aa2cc2035 Mon Sep 17 00:00:00 2001 From: 0xd9a <0xd9a@noreply.codeberg.org> Date: Wed, 27 Oct 2021 00:08:42 +0530 Subject: [PATCH 1/2] Remove unused layouts in settings --- .../res/layout/fragment_settings_admin.xml | 139 +- .../res/layout/fragment_settings_compose.xml | 1066 +++++++------ .../layout/fragment_settings_interface.xml | 1346 ++++++++--------- .../res/layout/fragment_settings_language.xml | 196 ++- .../res/layout/fragment_settings_menu.xml | 797 +++++----- .../fragment_settings_notifications.xml | 1155 +++++++------- .../res/layout/fragment_settings_privacy.xml | 979 ++++++------ .../res/layout/fragment_settings_timeline.xml | 1206 ++++++++------- 8 files changed, 3341 insertions(+), 3543 deletions(-) diff --git a/app/src/main/res/layout/fragment_settings_admin.xml b/app/src/main/res/layout/fragment_settings_admin.xml index 1e8e30151..4e9e229e7 100644 --- a/app/src/main/res/layout/fragment_settings_admin.xml +++ b/app/src/main/res/layout/fragment_settings_admin.xml @@ -1,97 +1,68 @@ - + android:layout_height="match_parent" + android:layout_marginStart="@dimen/fab_margin" + android:layout_marginLeft="@dimen/fab_margin" + android:layout_marginEnd="@dimen/fab_margin" + android:layout_marginRight="@dimen/fab_margin" + android:layout_marginBottom="20dp" + android:paddingLeft="@dimen/drawer_padding" + android:paddingRight="@dimen/drawer_padding" + android:scrollbars="none"> - + android:layout_height="match_parent" + android:paddingLeft="@dimen/fab_margin" + android:paddingRight="@dimen/fab_margin" + android:orientation="vertical"> - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/settings_option_margin" + android:layout_marginBottom="@dimen/settings_option_margin" + android:gravity="center_vertical" + android:orientation="horizontal"> - - + android:layout_marginEnd="10dp" + android:layout_weight="1" + android:text="@string/set_display_admin_menu" + android:textSize="16sp" /> + - - + - + - + - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_settings_compose.xml b/app/src/main/res/layout/fragment_settings_compose.xml index 857266128..d1970e48b 100644 --- a/app/src/main/res/layout/fragment_settings_compose.xml +++ b/app/src/main/res/layout/fragment_settings_compose.xml @@ -1,559 +1,533 @@ - + android:layout_height="match_parent" + android:layout_marginStart="@dimen/fab_margin" + android:layout_marginLeft="@dimen/fab_margin" + android:layout_marginEnd="@dimen/fab_margin" + android:layout_marginRight="@dimen/fab_margin" + android:layout_marginBottom="20dp" + android:paddingLeft="@dimen/drawer_padding" + android:paddingRight="@dimen/drawer_padding" + android:scrollbars="none"> - + android:layout_height="wrap_content" + android:orientation="vertical"> - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/settings_option_margin" + android:layout_marginBottom="@dimen/settings_option_margin" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_gravity="center_vertical" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_settings_interface.xml b/app/src/main/res/layout/fragment_settings_interface.xml index 35f75c745..e0c9464f1 100644 --- a/app/src/main/res/layout/fragment_settings_interface.xml +++ b/app/src/main/res/layout/fragment_settings_interface.xml @@ -1,709 +1,681 @@ - + android:layout_height="match_parent" + android:layout_marginStart="@dimen/fab_margin" + android:layout_marginLeft="@dimen/fab_margin" + android:layout_marginEnd="@dimen/fab_margin" + android:layout_marginRight="@dimen/fab_margin" + android:layout_marginBottom="20dp" + android:paddingLeft="@dimen/drawer_padding" + android:paddingRight="@dimen/drawer_padding" + android:scrollbars="none"> - - - + android:paddingLeft="@dimen/fab_margin" + android:paddingRight="@dimen/fab_margin" + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_gravity="center_vertical" + android:orientation="horizontal"> + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:text="@string/set_security_provider" + android:textSize="16sp" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:text="@string/set_security_provider_indication" + android:textColor="@color/mastodonC2" + android:textSize="12sp" /> - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_settings_language.xml b/app/src/main/res/layout/fragment_settings_language.xml index ed899a412..649b2e393 100644 --- a/app/src/main/res/layout/fragment_settings_language.xml +++ b/app/src/main/res/layout/fragment_settings_language.xml @@ -1,122 +1,106 @@ - + android:layout_height="match_parent" + android:layout_marginStart="@dimen/fab_margin" + android:layout_marginLeft="@dimen/fab_margin" + android:layout_marginEnd="@dimen/fab_margin" + android:layout_marginRight="@dimen/fab_margin" + android:layout_marginBottom="20dp" + android:paddingLeft="@dimen/drawer_padding" + android:paddingRight="@dimen/drawer_padding" + android:scrollbars="none"> - + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:orientation="vertical" + android:paddingLeft="@dimen/fab_margin" + android:paddingRight="@dimen/fab_margin" + tools:ignore="UselessParent"> - + - + android:orientation="vertical"> + + + + android:layout_gravity="center_vertical" + android:layout_marginTop="10dp" + android:orientation="horizontal"> - - - - + - - - - - - - - - - - - - - - - - - - - -