diff --git a/ring-android/app/src/main/res/drawable/baseline_copyright_24.xml b/ring-android/app/src/main/res/drawable/baseline_copyright_24.xml
new file mode 100755
index 0000000000000000000000000000000000000000..ea10b49dacaf383f687ca5514852351b63e2a180
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/baseline_copyright_24.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?attr/colorControlNormal">
+ <group>
+ <clip-path android:pathData="M24,0v24H0V0h24z M 0,0"/>
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M10.08,10.86c0.05,-0.33 0.16,-0.62 0.3,-0.87s0.34,-0.46 0.59,-0.62c0.24,-0.15 0.54,-0.22 0.91,-0.23 0.23,0.01 0.44,0.05 0.63,0.13 0.2,0.09 0.38,0.21 0.52,0.36s0.25,0.33 0.34,0.53 0.13,0.42 0.14,0.64h1.79c-0.02,-0.47 -0.11,-0.9 -0.28,-1.29s-0.4,-0.73 -0.7,-1.01 -0.66,-0.5 -1.08,-0.66 -0.88,-0.23 -1.39,-0.23c-0.65,0 -1.22,0.11 -1.7,0.34s-0.88,0.53 -1.2,0.92 -0.56,0.84 -0.71,1.36S8,11.29 8,11.87v0.27c0,0.58 0.08,1.12 0.23,1.64s0.39,0.97 0.71,1.35 0.72,0.69 1.2,0.91 1.05,0.34 1.7,0.34c0.47,0 0.91,-0.08 1.32,-0.23s0.77,-0.36 1.08,-0.63 0.56,-0.58 0.74,-0.94 0.29,-0.74 0.3,-1.15h-1.79c-0.01,0.21 -0.06,0.4 -0.15,0.58s-0.21,0.33 -0.36,0.46 -0.32,0.23 -0.52,0.3c-0.19,0.07 -0.39,0.09 -0.6,0.1 -0.36,-0.01 -0.66,-0.08 -0.89,-0.23 -0.25,-0.16 -0.45,-0.37 -0.59,-0.62s-0.25,-0.55 -0.3,-0.88 -0.08,-0.67 -0.08,-1v-0.27c0,-0.35 0.03,-0.68 0.08,-1.01zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+ </group>
+</vector>
+
diff --git a/ring-android/app/src/main/res/drawable/baseline_feedback_24.xml b/ring-android/app/src/main/res/drawable/baseline_feedback_24.xml
new file mode 100755
index 0000000000000000000000000000000000000000..58d6b3f2f2533bf1f94d57cbfef2139f1d67a67e
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/baseline_feedback_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM13,14h-2v-2h2v2zM13,10h-2L11,6h2v4z"/>
+</vector>
diff --git a/ring-android/app/src/main/res/drawable/baseline_insert_drive_file_24.xml b/ring-android/app/src/main/res/drawable/baseline_insert_drive_file_24.xml
new file mode 100755
index 0000000000000000000000000000000000000000..f6bbf3cd0978e11ac11b457991afe0663b6a65fb
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/baseline_insert_drive_file_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"/>
+</vector>
diff --git a/ring-android/app/src/main/res/layout/dialog_about.xml b/ring-android/app/src/main/res/layout/dialog_about.xml
index a7b25cbea580047ba6a6557a2f185fcb35b40fd3..d0e2b65cf0277dc4aa48fe163eeef68f36bac351 100644
--- a/ring-android/app/src/main/res/layout/dialog_about.xml
+++ b/ring-android/app/src/main/res/layout/dialog_about.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -7,47 +7,41 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="@dimen/padding_small">
+ android:padding="@dimen/padding_large">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- android:layout_marginTop="5dp"
android:text="@string/developed_by"
- android:textColor="@color/color_primary_dark"
- android:textSize="18sp" />
+ android:textColor="@color/textColorAccent"
+ android:textSize="18sp"
+ android:layout_margin="@dimen/padding_small"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="5dp"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
android:text="@string/credits_developer"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_margin="@dimen/padding_small"
+ android:textColor="@color/textColorPrimary" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- android:layout_marginTop="5dp"
android:text="@string/ringtones_by"
- android:textColor="@color/color_primary_dark"
- android:textSize="18sp" />
+ android:textColor="@color/textColorAccent"
+ android:textSize="18sp"
+ android:layout_margin="@dimen/padding_small" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="5dp"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
android:text="@string/credits_ringtones"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_margin="@dimen/padding_small"
+ android:textColor="@color/textColorPrimary" />
</LinearLayout>
-</ScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/frag_about.xml b/ring-android/app/src/main/res/layout/frag_about.xml
index 173dd4ee2ee85253a0d20e8eec621af38f39316a..9f582a5a28114c69f5ab44ab300c49ecfefa01b0 100644
--- a/ring-android/app/src/main/res/layout/frag_about.xml
+++ b/ring-android/app/src/main/res/layout/frag_about.xml
@@ -17,167 +17,253 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<cx.ring.views.BoundedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:layout_centerHorizontal="true"
+ android:layout_gravity="center_horizontal"
+ app:bounded_width="600dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingTop="8dp"
- android:paddingBottom="8dp">
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp">
<ImageView
android:id="@+id/logo"
android:layout_width="wrap_content"
android:layout_height="80dp"
- android:layout_gravity="center_horizontal"
android:layout_marginTop="5dp"
android:contentDescription="@string/app_name"
- android:maxWidth="250dp"
android:scaleType="fitCenter"
- app:srcCompat="@drawable/ic_jami_full_logo" />
+ android:layout_gravity="center_horizontal"
+ app:srcCompat="@drawable/ic_jami" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="16dp"
- android:text="@string/description"
- android:textAlignment="center" />
+ android:layout_marginStart="72dp"
+ android:layout_marginEnd="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginBottom="16dp"
+ android:text="@string/description" />
- <LinearLayout
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/credits"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:text="@string/credits"
+ android:layout_marginBottom="16dp" />
+
+ <RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="@dimen/padding_small"
- android:gravity="center_vertical"
- android:orientation="vertical">
+ android:padding="@dimen/padding_large">
+
+ <ImageView
+ android:id="@+id/version_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_gravity="start"
+ android:contentDescription="@string/version_section"
+ app:srcCompat="@drawable/ic_ring_logo_white"
+ android:tint="@color/colorPrimary"
+ android:layout_marginEnd="32dp"/>
<TextView
+ android:id="@+id/version_title"
+ style="@style/ListPrimary"
+ android:textColor="@color/textColorAccent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:maxLines="3"
+ android:singleLine="false"
android:text="@string/version_section"
- android:textColor="@color/textColorAccent"
- android:textSize="18sp" />
+ android:layout_toEndOf="@id/version_image"
+ android:layout_marginEnd="16dp" />
<TextView
android:id="@+id/release"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:layout_toEndOf="@id/version_image"
+ android:layout_marginEnd="16dp"
+ android:layout_below="@id/version_title"
+ tools:text="2.0"/>
- </LinearLayout>
+ </RelativeLayout>
- <LinearLayout
+ <RelativeLayout
android:id="@+id/contribute_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="@dimen/padding_small"
+ android:padding="@dimen/padding_large"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
- android:gravity="center_vertical"
- android:orientation="vertical">
+ android:gravity="center_vertical">
+
+ <ImageView
+ android:id="@+id/contribute_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_gravity="start"
+ android:contentDescription="@string/contribute_section"
+ app:srcCompat="@drawable/baseline_person_add_24"
+ android:layout_marginEnd="32dp"/>
<TextView
+ android:id="@+id/contribute_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/contribute_section"
+ style="@style/ListPrimary"
android:textColor="@color/textColorAccent"
- android:textSize="18sp" />
+ android:layout_toEndOf="@id/contribute_image" />
<TextView
android:id="@+id/web_site"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_website_contribute"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_toEndOf="@id/contribute_image"
+ android:layout_below="@id/contribute_title" />
- </LinearLayout>
+ </RelativeLayout>
- <LinearLayout
+ <RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="@dimen/padding_small"
- android:gravity="center_vertical"
- android:orientation="vertical">
+ android:padding="@dimen/padding_large">
+
+ <ImageView
+ android:id="@+id/copyright_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_gravity="start"
+ android:contentDescription="@string/copyright_section"
+ app:srcCompat="@drawable/baseline_copyright_24"
+ android:layout_marginEnd="32dp"/>
<TextView
+ android:id="@+id/copyright_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/copyright_section"
+ style="@style/ListPrimary"
android:textColor="@color/textColorAccent"
- android:textSize="18sp" />
+ android:layout_toEndOf="@id/copyright_image" />
<TextView
android:id="@+id/copyright"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/copyright"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_toEndOf="@id/copyright_image"
+ android:layout_below="@id/copyright_title"/>
- </LinearLayout>
+ </RelativeLayout>
- <LinearLayout
+
+ <RelativeLayout
android:id="@+id/license_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="@dimen/padding_small"
+ android:padding="@dimen/padding_large"
android:background="?attr/selectableItemBackground"
android:clickable="true"
- android:focusable="true"
- android:gravity="center_vertical"
- android:orientation="vertical">
+ android:focusable="true">
+
+ <ImageView
+ android:id="@+id/license_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_gravity="start"
+ android:contentDescription="@string/copyright_section"
+ app:srcCompat="@drawable/baseline_insert_drive_file_24"
+ android:layout_marginEnd="32dp"/>
<TextView
+ android:id="@+id/license_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/section_license"
+ style="@style/ListPrimary"
android:textColor="@color/textColorAccent"
- android:textSize="18sp" />
+ android:layout_toEndOf="@id/license_image" />
<TextView
android:id="@+id/license"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="false"
- android:text="@string/license" />
+ android:text="@string/license"
+ android:layout_toEndOf="@id/license_image"
+ android:layout_below="@id/license_title"/>
- </LinearLayout>
+ </RelativeLayout>
- <LinearLayout
+ <RelativeLayout
android:id="@+id/email_report_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="@dimen/padding_small"
+ android:padding="@dimen/padding_large"
android:background="?attr/selectableItemBackground"
android:clickable="true"
- android:focusable="true"
- android:gravity="center_vertical"
- android:orientation="vertical">
+ android:focusable="true">
+
+ <ImageView
+ android:id="@+id/feedback_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_gravity="start"
+ android:contentDescription="@string/copyright_section"
+ app:srcCompat="@drawable/baseline_feedback_24"
+ android:layout_marginEnd="32dp"/>
<TextView
+ android:id="@+id/feedback_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:text="@string/feedback_section"
+ style="@style/ListPrimary"
android:textColor="@color/textColorAccent"
- android:textSize="18sp" />
+ android:layout_toEndOf="@id/feedback_image" />
<TextView
android:id="@+id/email_report"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
- android:text="@string/report" />
+ android:text="@string/report"
+ android:layout_toEndOf="@id/feedback_image"
+ android:layout_below="@id/feedback_title" />
- </LinearLayout>
+ </RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="@dimen/padding_small"
+ android:padding="@dimen/padding_large"
+ android:layout_marginStart="56dp"
android:gravity="center_vertical"
android:orientation="vertical">
@@ -185,34 +271,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:id="@+id/developped_by"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:gravity="center_vertical"
android:text="@string/sponsor_section"
android:textColor="@color/textColorAccent"
android:textSize="15sp" />
<ImageView
android:id="@+id/sfl_logo"
- android:layout_width="200dp"
- android:layout_height="50dp"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="5dp"
+ android:layout_width="wrap_content"
+ android:layout_height="56dp"
+ android:layout_marginTop="16dp"
android:contentDescription="@string/app_author"
- android:maxWidth="250dp"
- android:scaleType="fitCenter"
+ android:scaleType="fitStart"
android:src="@drawable/logo_sfl_coul_rgb" />
</LinearLayout>
- <com.google.android.material.button.MaterialButton
- android:id="@+id/credits"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:paddingLeft="24dp"
- android:paddingRight="24dp"
- android:text="@string/credits" />
-
</LinearLayout>
-</ScrollView>
+</cx.ring.views.BoundedScrollView>
diff --git a/ring-android/app/src/main/res/layout/frag_settings.xml b/ring-android/app/src/main/res/layout/frag_settings.xml
index 99c2fcb06723d7bbbb2d9e37ef71324aef882519..b4fb70bb72dff963ce9a1ded2a0b396c3dc1409d 100644
--- a/ring-android/app/src/main/res/layout/frag_settings.xml
+++ b/ring-android/app/src/main/res/layout/frag_settings.xml
@@ -38,8 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:id="@+id/settings_dark_theme_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:padding="16dp">
+ android:padding="@dimen/padding_large">
<ImageView
android:id="@+id/theme_image"
@@ -52,28 +51,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:src="@drawable/baseline_invert_colors_24"
android:layout_marginEnd="32dp"/>
- <LinearLayout
- android:layout_width="wrap_content"
+ <TextView
+ android:id="@+id/theme_title"
+ style="@style/ListPrimary"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
+ android:lines="1"
+ android:text="@string/pref_darkTheme_title"
android:layout_toStartOf="@id/settings_dark_theme"
- android:layout_toEndOf="@id/theme_image"
- android:orientation="vertical">
-
- <TextView
- style="@style/ListPrimary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:lines="1"
- android:text="@string/pref_darkTheme_title" />
+ android:layout_toEndOf="@id/theme_image" />
- <TextView
- style="@style/ListSecondary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/pref_darkTheme_summary" />
-
- </LinearLayout>
+ <TextView
+ style="@style/ListSecondary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/pref_darkTheme_summary"
+ android:layout_toStartOf="@id/settings_dark_theme"
+ android:layout_toEndOf="@id/theme_image"
+ android:layout_below="@id/theme_title" />
<Switch
android:id="@+id/settings_dark_theme"
@@ -81,19 +76,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:checked="false"
- android:layout_marginStart="16dp"/>
+ android:layout_marginStart="16dp"
+ android:layout_centerVertical="true"/>
</RelativeLayout>
-
<!-- Network settings -->
<RelativeLayout
android:id="@+id/settings_video_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:padding="16dp">
+ android:padding="@dimen/padding_large">
<ImageView
android:id="@+id/hwenc_image"
@@ -101,35 +95,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
- android:layout_gravity="start"
android:contentDescription="@string/pref_hwEncode_summary"
app:srcCompat="@drawable/baseline_memory_24"
android:layout_marginEnd="32dp"/>
- <LinearLayout
- android:layout_width="wrap_content"
+ <TextView
+ android:id="@+id/hwenc_title"
+ style="@style/ListPrimary"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
+ android:maxLines="3"
+ android:singleLine="false"
+ android:text="@string/pref_video_advanced_title"
android:layout_toEndOf="@id/hwenc_image"
- android:orientation="vertical"
- android:layout_marginEnd="16dp">
-
- <TextView
- style="@style/ListPrimary"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:maxLines="3"
- android:singleLine="false"
- android:text="@string/pref_video_advanced_title" />
-
- <TextView
- style="@style/ListSecondary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/pref_video_advanced_summary" />
+ android:layout_marginEnd="16dp" />
- </LinearLayout>
+ <TextView
+ style="@style/ListSecondary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/pref_video_advanced_summary"
+ android:layout_toEndOf="@id/hwenc_image"
+ android:layout_marginEnd="16dp"
+ android:layout_below="@id/hwenc_title"/>
</RelativeLayout>
@@ -148,14 +136,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
android:padding="16dp">
<ImageView
android:id="@+id/contacts_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="start"
android:contentDescription="@string/pref_systemContacts_summary"
app:srcCompat="@drawable/baseline_group_24"
android:layout_alignParentStart="true"
@@ -209,8 +195,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:id="@+id/settings_push_notifications_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:padding="16dp">
+ android:padding="@dimen/padding_large">
<ImageView
android:id="@+id/push_image"
@@ -218,7 +203,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
- android:layout_gravity="start"
android:contentDescription="@string/pref_pushNotifications_summary"
android:src="@drawable/baseline_notification_important_24"
android:layout_marginEnd="32dp"/>
@@ -252,21 +236,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:checked="false"
- android:layout_marginStart="16dp"/>
+ android:layout_marginStart="16dp"
+ android:layout_centerVertical="true"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:padding="16dp">
+ android:padding="@dimen/padding_large">
<ImageView
android:id="@+id/system_dialer_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="start"
android:contentDescription="@string/pref_systemDialer_summary"
app:srcCompat="@drawable/baseline_dialpad_24"
android:layout_alignParentStart="true"
@@ -303,21 +286,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:checked="false"
- android:layout_marginStart="16dp" />
+ android:layout_marginStart="16dp"
+ android:layout_centerVertical="true"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:padding="16dp">
+ android:padding="@dimen/padding_large">
<ImageView
android:id="@+id/system_startOnBoot_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="start"
android:contentDescription="@string/pref_startOnBoot_summary"
app:srcCompat="@drawable/baseline_android_24"
android:layout_alignParentStart="true"
@@ -354,7 +336,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:checked="false"
- android:layout_marginStart="16dp" />
+ android:layout_marginStart="16dp"
+ android:layout_centerVertical="true"/>
</RelativeLayout>
@@ -363,14 +346,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="horizontal"
- android:padding="16dp">
+ android:padding="@dimen/padding_large">
<ImageView
android:id="@+id/system_persistNotification_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="start"
android:contentDescription="@string/pref_persistNotification_summary"
android:src="@drawable/baseline_dns_24"
android:layout_alignParentStart="true"
@@ -407,7 +388,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:checked="false"
- android:layout_marginStart="16dp"/>
+ android:layout_marginStart="16dp"
+ android:layout_centerVertical="true"/>
</RelativeLayout>
@@ -424,10 +406,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:id="@+id/settings_clear_history"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="horizontal"
- android:weightSum="1"
android:background="?attr/selectableItemBackground"
- android:padding="16dp">
+ android:padding="@dimen/padding_large">
<ImageView
android:id="@+id/system_clear_history_image"