From f61aadf5098a9350fb705afabee8f8dc15c4ca7f Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+NekoInverter@users.noreply.github.com>
Date: Thu, 5 Mar 2020 18:31:21 +0800
Subject: [PATCH] Fixes

---
 .../edxposed/manager/EdDownloadActivity.java  |  4 +-
 .../edxposed/manager/LogsActivity.java        |  4 +-
 .../edxposed/manager/ModulesActivity.java     |  6 +--
 .../edxposed/manager/adapters/AppAdapter.java |  4 +-
 app/src/main/res/layout/activity_main.xml     |  2 +-
 .../res/layout/dialog_install_warning.xml     |  2 +-
 app/src/main/res/layout/item_module.xml       |  2 +-
 app/src/main/res/layout/item_version.xml      |  6 +--
 .../main/res/layout/single_installer_view.xml | 24 +++++-----
 app/src/main/res/layout/status_installer.xml  | 48 +++++++++----------
 .../res/layout/sticky_header_download.xml     |  6 +--
 11 files changed, 51 insertions(+), 57 deletions(-)

diff --git a/app/src/main/java/org/meowcat/edxposed/manager/EdDownloadActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/EdDownloadActivity.java
index 70433c3a..439b627d 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/EdDownloadActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/EdDownloadActivity.java
@@ -8,7 +8,6 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.View;
-import android.widget.CheckBox;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
@@ -18,6 +17,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
+import com.google.android.material.checkbox.MaterialCheckBox;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.tabs.TabLayout;
 import com.google.gson.Gson;
@@ -58,7 +58,7 @@ public class EdDownloadActivity extends BaseActivity {
                     .setTitle(R.string.install_warning_title)
                     .setView(dontShowAgainView)
                     .setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                        CheckBox checkBox = dontShowAgainView.findViewById(android.R.id.checkbox);
+                        MaterialCheckBox checkBox = dontShowAgainView.findViewById(android.R.id.checkbox);
                         if (checkBox.isChecked())
                             XposedApp.getPreferences().edit().putBoolean("hide_install_warning", true).apply();
                     })
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/LogsActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/LogsActivity.java
index d714c5db..07f7ab34 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/LogsActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/LogsActivity.java
@@ -11,7 +11,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CheckBox;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -23,6 +22,7 @@ import androidx.core.content.FileProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.checkbox.MaterialCheckBox;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
@@ -71,7 +71,7 @@ public class LogsActivity extends BaseActivity {
                     .setTitle(R.string.install_warning_title)
                     .setView(dontShowAgainView)
                     .setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                        CheckBox checkBox = dontShowAgainView.findViewById(android.R.id.checkbox);
+                        MaterialCheckBox checkBox = dontShowAgainView.findViewById(android.R.id.checkbox);
                         if (checkBox.isChecked())
                             XposedApp.getPreferences().edit().putBoolean("hide_logcat_warning", true).apply();
                     })
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java
index ff8d869b..38216d5e 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java
@@ -13,12 +13,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Filter;
 import android.widget.ImageView;
-import android.widget.Switch;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.SwitchCompat;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -482,7 +482,7 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
                 descriptionText.setTextColor(getResources().getColor(R.color.warning));
             }
 
-            Switch mSwitch = holder.mSwitch;
+            SwitchCompat mSwitch = holder.mSwitch;
             mSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
                 String packageName = item.packageName;
                 boolean changed = mModuleUtil.isModuleEnabled(packageName) ^ isChecked;
@@ -552,7 +552,7 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
             TextView appVersion;
             TextView timestamps;
             TextView warningText;
-            Switch mSwitch;
+            SwitchCompat mSwitch;
 
             ViewHolder(View itemView) {
                 super(itemView);
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppAdapter.java b/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppAdapter.java
index 96775ac0..f400fc18 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppAdapter.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppAdapter.java
@@ -11,10 +11,10 @@ import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.Filter;
 import android.widget.ImageView;
-import android.widget.Switch;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SwitchCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.meowcat.edxposed.manager.R;
@@ -224,7 +224,7 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.ViewHolder> {
         TextView appPackage;
         TextView appVersion;
         TextView timestamps;
-        Switch mSwitch;
+        SwitchCompat mSwitch;
 
         ViewHolder(View itemView) {
             super(itemView);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 62e6363b..2ff3d16b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -207,7 +207,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="10dp"
         android:background="@drawable/main_item_background"
         android:clickable="true"
         android:focusable="true"
diff --git a/app/src/main/res/layout/dialog_install_warning.xml b/app/src/main/res/layout/dialog_install_warning.xml
index 748c81ba..eb12b32c 100644
--- a/app/src/main/res/layout/dialog_install_warning.xml
+++ b/app/src/main/res/layout/dialog_install_warning.xml
@@ -15,7 +15,7 @@
             android:text="@string/install_warning"
             android:textSize="16sp" />
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
             android:id="@android:id/checkbox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_module.xml b/app/src/main/res/layout/item_module.xml
index 72305d6c..ed43fd86 100644
--- a/app/src/main/res/layout/item_module.xml
+++ b/app/src/main/res/layout/item_module.xml
@@ -100,7 +100,7 @@
 
         </LinearLayout>
 
-        <Switch
+        <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/checkbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_version.xml b/app/src/main/res/layout/item_version.xml
index e0f3c3ad..8c1163b0 100644
--- a/app/src/main/res/layout/item_version.xml
+++ b/app/src/main/res/layout/item_version.xml
@@ -5,10 +5,8 @@
     android:clipToPadding="false"
     android:minHeight="?attr/listPreferredItemHeight"
     android:orientation="vertical"
-    android:paddingStart="16dp"
-    android:paddingTop="11dp"
-    android:paddingEnd="16dp"
-    android:paddingBottom="11dp">
+    android:paddingHorizontal="8dp"
+    android:paddingVertical="8dp">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/single_installer_view.xml b/app/src/main/res/layout/single_installer_view.xml
index 887c3833..66199aed 100644
--- a/app/src/main/res/layout/single_installer_view.xml
+++ b/app/src/main/res/layout/single_installer_view.xml
@@ -187,15 +187,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/container"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginTop="4dp"
-                android:background="?attr/selectableItemBackground"
+                android:background="@drawable/main_item_background"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp">
+                android:paddingHorizontal="8dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -229,14 +229,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/author_view"
-                android:background="?attr/selectableItemBackground"
+                android:layout_marginHorizontal="8dp"
+                android:background="@drawable/main_item_background"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp">
+                android:paddingHorizontal="8dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -269,14 +269,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/show_on_xda"
-                android:background="?attr/selectableItemBackground"
+                android:layout_marginHorizontal="8dp"
+                android:background="@drawable/main_item_background"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp">
+                android:paddingHorizontal="8dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -308,14 +308,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/updateDescription"
-                android:background="?attr/selectableItemBackground"
+                android:layout_marginHorizontal="8dp"
+                android:background="@drawable/main_item_background"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp">
+                android:paddingHorizontal="8dp">
 
                 <ImageView
                     android:layout_width="24dp"
diff --git a/app/src/main/res/layout/status_installer.xml b/app/src/main/res/layout/status_installer.xml
index 88ea9f28..08c87e90 100644
--- a/app/src/main/res/layout/status_installer.xml
+++ b/app/src/main/res/layout/status_installer.xml
@@ -26,14 +26,14 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
+                    android:layout_marginHorizontal="8dp"
+                    android:background="@drawable/main_item_background"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp">
+                    android:paddingHorizontal="8dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -65,14 +65,14 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
+                    android:layout_marginHorizontal="8dp"
+                    android:background="@drawable/main_item_background"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp">
+                    android:paddingHorizontal="8dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -104,14 +104,14 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
+                    android:layout_marginHorizontal="8dp"
+                    android:background="@drawable/main_item_background"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp">
+                    android:paddingHorizontal="8dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -142,14 +142,14 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
+                    android:layout_marginHorizontal="8dp"
+                    android:background="@drawable/main_item_background"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp">
+                    android:paddingHorizontal="8dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -179,14 +179,14 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
+                    android:layout_marginHorizontal="8dp"
+                    android:background="@drawable/main_item_background"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp">
+                    android:paddingHorizontal="8dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -215,14 +215,14 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
+                    android:layout_marginHorizontal="8dp"
+                    android:background="@drawable/main_item_background"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp">
+                    android:paddingHorizontal="8dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -251,13 +251,13 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
+                    android:layout_marginHorizontal="8dp"
+                    android:background="@drawable/main_item_background"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp">
+                    android:paddingHorizontal="8dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -312,14 +312,14 @@
                     android:id="@+id/click_to_update"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
+                    android:layout_marginHorizontal="8dp"
+                    android:background="@drawable/main_item_background"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp">
+                    android:paddingHorizontal="8dp">
 
                     <ImageView
                         android:layout_width="24dp"
diff --git a/app/src/main/res/layout/sticky_header_download.xml b/app/src/main/res/layout/sticky_header_download.xml
index 92ddd79c..130ebffa 100644
--- a/app/src/main/res/layout/sticky_header_download.xml
+++ b/app/src/main/res/layout/sticky_header_download.xml
@@ -3,11 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/colorStickyHeader"
-    android:elevation="2dp"
-    android:paddingStart="16dp"
-    android:paddingTop="8dp"
-    android:paddingEnd="16dp"
-    android:paddingBottom="8dp">
+    android:padding="8dp">
 
     <TextView
         android:id="@android:id/title"