From e39d2567ea1bb3f316b3dea28d24b3a01fb926b4 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 3 Feb 2019 04:59:04 -0500
Subject: [PATCH] More SDK 16 fixes

---
 app/src/full/res/layout/activity_flash.xml    | 17 +++----
 app/src/full/res/layout/activity_request.xml  |  8 ++--
 app/src/full/res/layout/alert_dialog.xml      | 31 ++++++-------
 .../full/res/layout/custom_channel_dialog.xml | 12 ++---
 app/src/full/res/layout/fragment_log.xml      | 19 ++++----
 app/src/full/res/layout/fragment_magisk.xml   | 28 ++++++------
 app/src/full/res/layout/list_item_app.xml     |  8 +++-
 app/src/full/res/layout/list_item_module.xml  | 13 +++---
 app/src/full/res/layout/list_item_policy.xml  |  8 +++-
 app/src/full/res/layout/list_item_repo.xml    |  4 +-
 app/src/full/res/layout/list_item_sulog.xml   | 45 +++++++++----------
 app/src/full/res/layout/markdown_window.xml   |  4 +-
 app/src/full/res/layout/update_card.xml       |  6 ++-
 app/src/full/res/values/styles.xml            |  4 +-
 14 files changed, 103 insertions(+), 104 deletions(-)

diff --git a/app/src/full/res/layout/activity_flash.xml b/app/src/full/res/layout/activity_flash.xml
index e8bf225d8..5a8e2eb68 100644
--- a/app/src/full/res/layout/activity_flash.xml
+++ b/app/src/full/res/layout/activity_flash.xml
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:background="@color/flashing_background_color"
-    tools:context="com.topjohnwu.magisk.FlashActivity">
+    android:orientation="vertical">
 
-    <include layout="@layout/toolbar"/>
+    <include layout="@layout/toolbar" />
 
-    <HorizontalScrollView
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_weight="1"
         android:layout_width="match_parent"
-        android:layout_height="0dp">
+        android:layout_height="0dp"
+        android:layout_weight="1">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
     </HorizontalScrollView>
diff --git a/app/src/full/res/layout/activity_request.xml b/app/src/full/res/layout/activity_request.xml
index f25d25905..b0efb9d26 100644
--- a/app/src/full/res/layout/activity_request.xml
+++ b/app/src/full/res/layout/activity_request.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:id="@+id/su_popup"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
     android:background="?attr/colorBackgroundFloating"
     android:minWidth="350dp"
-    android:orientation="vertical"
-    tools:context=".SuRequestActivity">
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/request_title"
@@ -29,8 +27,8 @@
         android:layout_marginTop="10dp"
         android:layout_marginBottom="10dp"
         android:orientation="horizontal"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp">
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp">
 
         <ImageView
             android:id="@+id/app_icon"
diff --git a/app/src/full/res/layout/alert_dialog.xml b/app/src/full/res/layout/alert_dialog.xml
index e0037ec22..fc2f55ac1 100644
--- a/app/src/full/res/layout/alert_dialog.xml
+++ b/app/src/full/res/layout/alert_dialog.xml
@@ -1,39 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dialog_layout"
-    android:orientation="vertical"
-    android:paddingTop="5dp"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="5dp">
 
     <TextView
         android:id="@+id/message"
         style="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorPrimary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingLeft="25dp"
+        android:paddingTop="12dp"
+        android:paddingRight="25dp"
         android:paddingBottom="12dp"
-        android:paddingEnd="25dp"
-        android:paddingStart="25dp"
-        android:paddingTop="12dp" />
+        android:textColor="?android:attr/textColorPrimary" />
 
     <LinearLayout
-        style="?android:attr/buttonBarStyle"
         android:id="@+id/button_panel"
+        style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="54dip"
         android:measureWithLargestChild="true"
+        android:minHeight="54dp"
         android:orientation="horizontal"
-        android:paddingEnd="2dip"
-        android:paddingStart="2dip"
-        android:paddingTop="4dip">
+        android:padding="2dp">
 
         <Button
             android:id="@+id/negative"
             style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dip"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_gravity="start"
             android:layout_weight="1"
@@ -42,7 +39,7 @@
         <Button
             android:id="@+id/neutral"
             style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dip"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_gravity="center_horizontal"
             android:layout_weight="1"
@@ -51,7 +48,7 @@
         <Button
             android:id="@+id/positive"
             style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dip"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_gravity="end"
             android:layout_weight="1"
diff --git a/app/src/full/res/layout/custom_channel_dialog.xml b/app/src/full/res/layout/custom_channel_dialog.xml
index 601a7144c..e80f4b1f3 100644
--- a/app/src/full/res/layout/custom_channel_dialog.xml
+++ b/app/src/full/res/layout/custom_channel_dialog.xml
@@ -3,10 +3,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingBottom="5dp"
-    android:paddingEnd="15dp"
-    android:paddingStart="15dp"
-    android:paddingTop="5dp">
+    android:paddingLeft="15dp"
+    android:paddingTop="5dp"
+    android:paddingRight="15dp"
+    android:paddingBottom="5dp">
 
     <TextView
         android:layout_width="match_parent"
@@ -14,8 +14,8 @@
         android:layout_margin="5dp"
         android:labelFor="@id/custom_url"
         android:text="@string/settings_update_custom_msg"
-        android:textColor="?android:textColorPrimary"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?android:textColorPrimary" />
 
     <EditText
         android:id="@+id/custom_url"
diff --git a/app/src/full/res/layout/fragment_log.xml b/app/src/full/res/layout/fragment_log.xml
index 895f1afb1..bae93490d 100644
--- a/app/src/full/res/layout/fragment_log.xml
+++ b/app/src/full/res/layout/fragment_log.xml
@@ -1,27 +1,24 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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:orientation="vertical"
-    tools:context="com.topjohnwu.magisk.fragments.LogFragment">
+    android:orientation="vertical">
 
     <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tab"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
-        android:id="@+id/tab"
-        app:tabPaddingEnd="20dp"
-        app:tabPaddingStart="20dp"
         android:elevation="4dp"
-        android:visibility="gone">
+        android:visibility="gone"
+        app:tabPaddingEnd="20dp"
+        app:tabPaddingStart="20dp">
 
     </com.google.android.material.tabs.TabLayout>
 
 
     <androidx.viewpager.widget.ViewPager
-        android:layout_height="match_parent"
+        android:id="@+id/container"
         android:layout_width="match_parent"
-        android:id="@+id/container"/>
+        android:layout_height="match_parent" />
 </LinearLayout>
diff --git a/app/src/full/res/layout/fragment_magisk.xml b/app/src/full/res/layout/fragment_magisk.xml
index fbd56ac32..06202066b 100644
--- a/app/src/full/res/layout/fragment_magisk.xml
+++ b/app/src/full/res/layout/fragment_magisk.xml
@@ -23,9 +23,9 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginStart="5dp"
+                android:layout_marginLeft="5dp"
                 android:layout_marginTop="4dp"
-                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
                 android:layout_marginBottom="4dp"
                 app:cardCornerRadius="@dimen/card_corner_radius"
                 app:cardElevation="@dimen/card_elevation">
@@ -75,9 +75,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginStart="5dp"
+                android:layout_marginLeft="5dp"
                 android:layout_marginTop="4dp"
-                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
                 android:layout_marginBottom="4dp"
                 app:cardCornerRadius="@dimen/card_corner_radius"
                 app:cardElevation="@dimen/card_elevation">
@@ -129,16 +129,16 @@
                             android:id="@+id/keep_force_enc"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="50dp"
-                            android:layout_marginEnd="50dp"
+                            android:layout_marginLeft="50dp"
+                            android:layout_marginRight="50dp"
                             android:text="@string/keep_force_encryption" />
 
                         <CheckBox
                             android:id="@+id/keep_verity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="50dp"
-                            android:layout_marginEnd="50dp"
+                            android:layout_marginLeft="50dp"
+                            android:layout_marginRight="50dp"
                             android:text="@string/keep_dm_verity" />
 
                     </LinearLayout>
@@ -152,9 +152,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginStart="5dp"
+                android:layout_marginLeft="5dp"
                 android:layout_marginTop="4dp"
-                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
                 android:layout_marginBottom="4dp"
                 app:cardCornerRadius="@dimen/card_corner_radius"
                 app:cardElevation="@dimen/card_elevation">
@@ -298,9 +298,9 @@
                 style="?attr/cardStyle"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
+                android:layout_marginLeft="5dp"
                 android:layout_marginTop="4dp"
-                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
                 android:layout_marginBottom="4dp"
                 app:cardCornerRadius="@dimen/card_corner_radius"
                 app:cardElevation="@dimen/card_elevation">
@@ -445,9 +445,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
-                android:layout_marginStart="5dp"
+                android:layout_marginLeft="5dp"
                 android:layout_marginTop="4dp"
-                android:layout_marginEnd="5dp"
+                android:layout_marginRight="5dp"
                 android:layout_marginBottom="4dp"
                 android:clickable="true"
                 android:focusable="true"
diff --git a/app/src/full/res/layout/list_item_app.xml b/app/src/full/res/layout/list_item_app.xml
index bf7fdc040..24a3ec8da 100644
--- a/app/src/full/res/layout/list_item_app.xml
+++ b/app/src/full/res/layout/list_item_app.xml
@@ -6,9 +6,9 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:layout_marginStart="@dimen/card_horizontal_margin"
+    android:layout_marginLeft="@dimen/card_horizontal_margin"
     android:layout_marginTop="@dimen/card_vertical_margin"
-    android:layout_marginEnd="@dimen/card_horizontal_margin"
+    android:layout_marginRight="@dimen/card_horizontal_margin"
     android:layout_marginBottom="@dimen/card_vertical_margin"
     android:minHeight="?android:attr/listPreferredItemHeight"
     app:cardCornerRadius="@dimen/card_corner_radius"
@@ -24,8 +24,10 @@
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
             android:layout_marginBottom="8dp"
             android:gravity="end"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -67,7 +69,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
+            android:layout_marginLeft="5dp"
             android:layout_marginEnd="5dp"
+            android:layout_marginRight="5dp"
             android:checked="false"
             android:focusable="false"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/full/res/layout/list_item_module.xml b/app/src/full/res/layout/list_item_module.xml
index 88d25def1..f6cce9a3c 100644
--- a/app/src/full/res/layout/list_item_module.xml
+++ b/app/src/full/res/layout/list_item_module.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<androidx.cardview.widget.CardView 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"
     style="?attr/cardStyle"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:layout_marginBottom="@dimen/card_vertical_margin"
-    android:layout_marginEnd="@dimen/card_horizontal_margin"
-    android:layout_marginStart="@dimen/card_horizontal_margin"
+    android:layout_marginLeft="@dimen/card_horizontal_margin"
     android:layout_marginTop="@dimen/card_vertical_margin"
+    android:layout_marginRight="@dimen/card_horizontal_margin"
+    android:layout_marginBottom="@dimen/card_vertical_margin"
     android:minHeight="?android:attr/listPreferredItemHeight"
     app:cardCornerRadius="@dimen/card_corner_radius"
     app:cardElevation="@dimen/card_elevation">
@@ -91,7 +90,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
+            android:layout_marginLeft="5dp"
             android:layout_marginEnd="5dp"
+            android:layout_marginRight="5dp"
             android:focusable="false"
             app:layout_constraintBottom_toTopOf="@+id/description"
             app:layout_constraintEnd_toStartOf="@+id/delete"
diff --git a/app/src/full/res/layout/list_item_policy.xml b/app/src/full/res/layout/list_item_policy.xml
index 4aca77e2b..7969b8460 100644
--- a/app/src/full/res/layout/list_item_policy.xml
+++ b/app/src/full/res/layout/list_item_policy.xml
@@ -5,9 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:layout_marginStart="@dimen/card_horizontal_margin"
+    android:layout_marginLeft="@dimen/card_horizontal_margin"
     android:layout_marginTop="@dimen/card_vertical_margin"
-    android:layout_marginEnd="@dimen/card_horizontal_margin"
+    android:layout_marginRight="@dimen/card_horizontal_margin"
     android:layout_marginBottom="@dimen/card_vertical_margin"
     android:minHeight="?android:attr/listPreferredItemHeight"
     app:cardCornerRadius="@dimen/card_corner_radius"
@@ -28,8 +28,10 @@
                 android:layout_width="50dp"
                 android:layout_height="50dp"
                 android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
                 android:layout_marginBottom="8dp"
                 android:gravity="end"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -93,7 +95,9 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
                 android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
                 android:checked="false"
                 android:gravity="center_vertical"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/full/res/layout/list_item_repo.xml b/app/src/full/res/layout/list_item_repo.xml
index 8f8be8b77..370cdffac 100644
--- a/app/src/full/res/layout/list_item_repo.xml
+++ b/app/src/full/res/layout/list_item_repo.xml
@@ -5,9 +5,9 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:layout_marginStart="@dimen/card_horizontal_margin"
+    android:layout_marginLeft="@dimen/card_horizontal_margin"
     android:layout_marginTop="@dimen/card_vertical_margin"
-    android:layout_marginEnd="@dimen/card_horizontal_margin"
+    android:layout_marginRight="@dimen/card_horizontal_margin"
     android:layout_marginBottom="@dimen/card_vertical_margin"
     android:minHeight="?android:attr/listPreferredItemHeight"
     app:cardCornerRadius="@dimen/card_corner_radius"
diff --git a/app/src/full/res/layout/list_item_sulog.xml b/app/src/full/res/layout/list_item_sulog.xml
index a124c3658..95f4a5f8f 100644
--- a/app/src/full/res/layout/list_item_sulog.xml
+++ b/app/src/full/res/layout/list_item_sulog.xml
@@ -1,58 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     style="?attr/cardStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:layout_marginBottom="2dp"
-    android:layout_marginEnd="@dimen/card_horizontal_margin"
-    android:layout_marginStart="@dimen/card_horizontal_margin"
+    android:layout_marginLeft="@dimen/card_horizontal_margin"
     android:layout_marginTop="2dp"
+    android:layout_marginRight="@dimen/card_horizontal_margin"
+    android:layout_marginBottom="2dp"
     card_view:cardCornerRadius="@dimen/card_corner_radius"
     card_view:cardElevation="@dimen/card_elevation">
 
     <LinearLayout
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
         <LinearLayout
-            android:orientation="horizontal"
+            android:id="@+id/info_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/info_layout"
+            android:orientation="horizontal"
             android:padding="10dp">
 
             <TextView
                 android:id="@+id/app_name"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:maxLines="1"
+                android:layout_weight="2"
                 android:ellipsize="end"
+                android:maxLines="1"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?android:attr/textColorPrimary"
-                android:textIsSelectable="false"
-                android:layout_weight="2" />
+                android:textIsSelectable="false" />
 
             <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
                 android:id="@+id/action"
-                android:layout_weight="1"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
-                android:gravity="center_horizontal" />
-
-            <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:id="@+id/time"
                 android:layout_weight="1"
+                android:gravity="center_horizontal"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
-                android:gravity="center_horizontal" />
+                android:textColor="?android:attr/textColorSecondary" />
+
+            <TextView
+                android:id="@+id/time"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorSecondary" />
 
         </LinearLayout>
 
diff --git a/app/src/full/res/layout/markdown_window.xml b/app/src/full/res/layout/markdown_window.xml
index f5b3d43be..55780cc55 100644
--- a/app/src/full/res/layout/markdown_window.xml
+++ b/app/src/full/res/layout/markdown_window.xml
@@ -7,8 +7,8 @@
         android:id="@+id/md_txt"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
-        android:layout_marginEnd="15dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
         android:paddingTop="10dp" />
 
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/full/res/layout/update_card.xml b/app/src/full/res/layout/update_card.xml
index 2fc7a0529..f59288154 100644
--- a/app/src/full/res/layout/update_card.xml
+++ b/app/src/full/res/layout/update_card.xml
@@ -4,9 +4,9 @@
     style="?attr/cardStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="5dp"
+    android:layout_marginLeft="5dp"
     android:layout_marginTop="4dp"
-    android:layout_marginEnd="5dp"
+    android:layout_marginRight="5dp"
     android:layout_marginBottom="4dp"
     android:foreground="?android:attr/selectableItemBackground"
     app:cardCornerRadius="@dimen/card_corner_radius"
@@ -23,7 +23,9 @@
             android:layout_width="25dp"
             android:layout_height="25dp"
             android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/status"
diff --git a/app/src/full/res/values/styles.xml b/app/src/full/res/values/styles.xml
index 66e60ea8a..411d2a9b4 100644
--- a/app/src/full/res/values/styles.xml
+++ b/app/src/full/res/values/styles.xml
@@ -10,7 +10,7 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="imageColorTint">@color/icon_grey</item>
-        <item name="colorControl">?android:colorControlNormal</item>
+        <item name="colorControl">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="AppTheme" parent="AppTheme.Base"/>
@@ -24,7 +24,7 @@
         <item name="windowNoTitle">true</item>
         <item name="android:textColorSecondary">@color/dark_secondary_text</item>
         <item name="imageColorTint">@color/dark_secondary_text</item>
-        <item name="colorControl">?android:colorControlNormal</item>
+        <item name="colorControl">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.Dark.Base"/>