From 7ffa417a8d2cbfce2c1c412ad0297eab2cebd123 Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+NekoInverter@users.noreply.github.com>
Date: Sat, 14 Mar 2020 11:34:44 +0800
Subject: [PATCH] md2

---
 .../edxposed/manager/AboutActivity.java       |   4 +-
 .../edxposed/manager/BaseActivity.java        |   5 +-
 .../edxposed/manager/BlackListActivity.java   |  12 ++-
 .../edxposed/manager/CompatListActivity.java  |  12 ++-
 .../edxposed/manager/DownloadActivity.java    |  17 ++-
 .../edxposed/manager/LogsActivity.java        |   1 -
 .../edxposed/manager/ModulesActivity.java     |  11 +-
 .../edxposed/manager/SettingsActivity.java    |  24 ++++-
 .../main/res/drawable/item_background_md2.xml |  17 +++
 ...ckground.xml => item_background_round.xml} |   7 +-
 app/src/main/res/layout/activity_about.xml    | 100 ++++++++++--------
 .../main/res/layout/activity_black_list.xml   |  18 +++-
 app/src/main/res/layout/activity_download.xml |  17 ++-
 app/src/main/res/layout/activity_logs.xml     |  35 +++---
 app/src/main/res/layout/activity_main.xml     |   8 +-
 app/src/main/res/layout/activity_modules.xml  |  18 +++-
 app/src/main/res/layout/activity_settings.xml |  15 ++-
 app/src/main/res/layout/appbar_layout.xml     |  14 ---
 app/src/main/res/layout/item_download.xml     |  70 ++++++------
 app/src/main/res/layout/item_module.xml       |   6 +-
 .../main/res/layout/single_installer_view.xml |   8 +-
 app/src/main/res/layout/status_installer.xml  |  16 +--
 app/src/main/res/values-night/colors_md2.xml  |  10 ++
 app/src/main/res/values-zh-rCN/strings.xml    |   1 +
 app/src/main/res/values/attrs.xml             |   3 +
 app/src/main/res/values/colors_md2.xml        |  10 ++
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/styles.xml            |  18 +++-
 app/src/main/res/xml/prefs.xml                |   4 +
 29 files changed, 305 insertions(+), 177 deletions(-)
 create mode 100644 app/src/main/res/drawable/item_background_md2.xml
 rename app/src/main/res/drawable/{main_item_background.xml => item_background_round.xml} (69%)
 delete mode 100644 app/src/main/res/layout/appbar_layout.xml
 create mode 100644 app/src/main/res/values-night/colors_md2.xml
 create mode 100644 app/src/main/res/values/colors_md2.xml

diff --git a/app/src/main/java/org/meowcat/edxposed/manager/AboutActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/AboutActivity.java
index 68f80435..464c4b56 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/AboutActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/AboutActivity.java
@@ -23,8 +23,8 @@ public class AboutActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         binding = ActivityAboutBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
-        setSupportActionBar(binding.appbar.toolbar);
-        binding.appbar.toolbar.setNavigationOnClickListener(view -> finish());
+        setSupportActionBar(binding.toolbar);
+        binding.toolbar.setNavigationOnClickListener(view -> finish());
         ActionBar bar = getSupportActionBar();
         if (bar != null) {
             bar.setDisplayHomeAsUpEnabled(true);
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/BaseActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/BaseActivity.java
index 8d53298e..b4443bb0 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/BaseActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/BaseActivity.java
@@ -68,7 +68,7 @@ public class BaseActivity extends AppCompatActivity {
 
     @StyleRes
     private int getCustomTheme() {
-        String baseThemeName = XposedApp.getPreferences().getBoolean("colorized_action_bar", false) ?
+        String baseThemeName = XposedApp.getPreferences().getBoolean("colorized_action_bar", false) && !XposedApp.getPreferences().getBoolean("md2", false) ?
                 "ThemeOverlay.ActionBarPrimaryColor" : "ThemeOverlay";
         String customThemeName;
         String primaryColorEntryName = "colorPrimary";
@@ -143,6 +143,9 @@ public class BaseActivity extends AppCompatActivity {
             theme.applyStyle(resid, false);
         }
         theme.applyStyle(getCustomTheme(), true);
+        if (XposedApp.getPreferences().getBoolean("md2", false)) {
+            theme.applyStyle(R.style.ThemeOverlay_Md2, true);
+        }
         if (this instanceof MainActivity) {
             theme.applyStyle(R.style.ThemeOverlay_ActivityMain, true);
         }
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/BlackListActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/BlackListActivity.java
index b8ff2932..bc1e3337 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/BlackListActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/BlackListActivity.java
@@ -40,8 +40,8 @@ public class BlackListActivity extends BaseActivity implements AppAdapter.Callba
         super.onCreate(savedInstanceState);
         binding = ActivityBlackListBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
-        setSupportActionBar(binding.appbar.toolbar);
-        binding.appbar.toolbar.setNavigationOnClickListener(view -> finish());
+        setSupportActionBar(binding.toolbar);
+        binding.toolbar.setNavigationOnClickListener(view -> finish());
         ActionBar bar = getSupportActionBar();
         if (bar != null) {
             bar.setDisplayHomeAsUpEnabled(true);
@@ -51,9 +51,11 @@ public class BlackListActivity extends BaseActivity implements AppAdapter.Callba
         final boolean isWhiteListMode = isWhiteListMode();
         appAdapter = new BlackListAdapter(this, isWhiteListMode, binding);
         binding.recyclerView.setAdapter(appAdapter);
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this,
-                DividerItemDecoration.VERTICAL);
-        binding.recyclerView.addItemDecoration(dividerItemDecoration);
+        if (!XposedApp.getPreferences().getBoolean("md2", false)) {
+            DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this,
+                    DividerItemDecoration.VERTICAL);
+            binding.recyclerView.addItemDecoration(dividerItemDecoration);
+        }
         appAdapter.setCallback(this);
         handler.postDelayed(runnable, 300);
         binding.swipeRefreshLayout.setOnRefreshListener(appAdapter::refresh);
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/CompatListActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/CompatListActivity.java
index f0a32f33..5dcf221f 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/CompatListActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/CompatListActivity.java
@@ -30,8 +30,8 @@ public class CompatListActivity extends BaseActivity implements AppAdapter.Callb
         super.onCreate(savedInstanceState);
         binding = ActivityBlackListBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
-        setSupportActionBar(binding.appbar.toolbar);
-        binding.appbar.toolbar.setNavigationOnClickListener(view -> finish());
+        setSupportActionBar(binding.toolbar);
+        binding.toolbar.setNavigationOnClickListener(view -> finish());
         ActionBar bar = getSupportActionBar();
         if (bar != null) {
             bar.setDisplayHomeAsUpEnabled(true);
@@ -40,9 +40,11 @@ public class CompatListActivity extends BaseActivity implements AppAdapter.Callb
         binding.recyclerView.setLayoutManager(new LinearLayoutManager(this));
         appAdapter = new CompatListAdapter(this, binding);
         binding.recyclerView.setAdapter(appAdapter);
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this,
-                DividerItemDecoration.VERTICAL);
-        binding.recyclerView.addItemDecoration(dividerItemDecoration);
+        if (!XposedApp.getPreferences().getBoolean("md2", false)) {
+            DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this,
+                    DividerItemDecoration.VERTICAL);
+            binding.recyclerView.addItemDecoration(dividerItemDecoration);
+        }
         appAdapter.setCallback(this);
 
         binding.swipeRefreshLayout.setRefreshing(true);
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/DownloadActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/DownloadActivity.java
index c55599f3..6b7ed174 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/DownloadActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/DownloadActivity.java
@@ -9,7 +9,6 @@ import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.ConnectivityManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -66,8 +65,8 @@ public class DownloadActivity extends BaseActivity implements RepoLoader.RepoLis
         super.onCreate(savedInstanceState);
         binding = ActivityDownloadBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
-        setSupportActionBar(binding.appbar.toolbar);
-        binding.appbar.toolbar.setNavigationOnClickListener(view -> finish());
+        setSupportActionBar(binding.toolbar);
+        binding.toolbar.setNavigationOnClickListener(view -> finish());
         ActionBar bar = getSupportActionBar();
         if (bar != null) {
             bar.setDisplayHomeAsUpEnabled(true);
@@ -87,9 +86,7 @@ public class DownloadActivity extends BaseActivity implements RepoLoader.RepoLis
         sortingOrder = XposedApp.getPreferences().getInt("download_sorting_order", RepoDb.SORT_STATUS);
 
         ignoredUpdatesPref = getSharedPreferences("update_ignored", MODE_PRIVATE);
-        if (Build.VERSION.SDK_INT >= 26) {
-            binding.recyclerView.setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS);
-        }
+        binding.recyclerView.setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS);
         binding.swipeRefreshLayout.setOnRefreshListener(() -> {
             repoLoader.setSwipeRefreshLayout(binding.swipeRefreshLayout);
             repoLoader.triggerReload(true);
@@ -107,9 +104,11 @@ public class DownloadActivity extends BaseActivity implements RepoLoader.RepoLis
                 headersDecor.invalidateHeaders();
             }
         });
-
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this, DividerItemDecoration.VERTICAL);
-        binding.recyclerView.addItemDecoration(dividerItemDecoration);
+        if (!XposedApp.getPreferences().getBoolean("md2", false)) {
+            DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this,
+                    DividerItemDecoration.VERTICAL);
+            binding.recyclerView.addItemDecoration(dividerItemDecoration);
+        }
     }
 
 
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 dac68f6f..3cf661e5 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/LogsActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/LogsActivity.java
@@ -304,7 +304,6 @@ public class LogsActivity extends BaseActivity {
             this.logs.clear();
             this.logs.addAll(logs);
             notifyDataSetChanged();
-            binding.recyclerView.scrollToPosition(getItemCount() - 1);
         }
 
         void setEmpty() {
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 d75ace71..48470b38 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/ModulesActivity.java
@@ -175,8 +175,8 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
         super.onCreate(savedInstanceState);
         binding = ActivityModulesBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
-        setSupportActionBar(binding.appbar.toolbar);
-        binding.appbar.toolbar.setNavigationOnClickListener(view -> finish());
+        setSupportActionBar(binding.toolbar);
+        binding.toolbar.setNavigationOnClickListener(view -> finish());
         ActionBar bar = getSupportActionBar();
         if (bar != null) {
             bar.setDisplayHomeAsUpEnabled(true);
@@ -199,8 +199,11 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
         moduleUtil.addListener(this);
         binding.recyclerView.setAdapter(adapter);
         binding.recyclerView.setLayoutManager(new LinearLayoutManager(this));
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this, DividerItemDecoration.VERTICAL);
-        binding.recyclerView.addItemDecoration(dividerItemDecoration);
+        if (!XposedApp.getPreferences().getBoolean("md2", false)) {
+            DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this,
+                    DividerItemDecoration.VERTICAL);
+            binding.recyclerView.addItemDecoration(dividerItemDecoration);
+        }
         binding.swipeRefreshLayout.setOnRefreshListener(() -> reloadModules.run());
         reloadModules.run();
         mSearchListener = new SearchView.OnQueryTextListener() {
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/SettingsActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/SettingsActivity.java
index 2463a1fa..8895272f 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/SettingsActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/SettingsActivity.java
@@ -60,8 +60,8 @@ public class SettingsActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         binding = ActivitySettingsBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
-        setSupportActionBar(binding.appbar.toolbar);
-        binding.appbar.toolbar.setNavigationOnClickListener(view -> finish());
+        setSupportActionBar(binding.toolbar);
+        binding.toolbar.setNavigationOnClickListener(view -> finish());
         ActionBar bar = getSupportActionBar();
         if (bar != null) {
             bar.setDisplayHomeAsUpEnabled(true);
@@ -473,6 +473,19 @@ public class SettingsActivity extends BaseActivity {
                     return true;
                 });
             }
+
+            SwitchPreferenceCompat md2 = findPreference("md2");
+            if (md2 != null) {
+                md2.setOnPreferenceChangeListener((preference, newValue) -> {
+                    SettingsActivity activity = (SettingsActivity) getActivity();
+                    if (activity != null) {
+                        updatePreference(!md2.isChecked());
+                        activity.restart();
+                    }
+                    return true;
+                });
+                updatePreference(!md2.isChecked());
+            }
         }
 
         private void areYouSure(int contentTextId, DialogInterface.OnClickListener listener) {
@@ -487,6 +500,13 @@ public class SettingsActivity extends BaseActivity {
             }
         }
 
+        private void updatePreference(boolean show) {
+            findPreference("black_dark_theme").setVisible(show);
+            findPreference("transparent_status_bar").setVisible(show);
+            //findPreference("accent_color").setVisible(show);
+            findPreference("colorized_action_bar").setVisible(show);
+        }
+
         @Override
         public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
diff --git a/app/src/main/res/drawable/item_background_md2.xml b/app/src/main/res/drawable/item_background_md2.xml
new file mode 100644
index 00000000..fc19ef5b
--- /dev/null
+++ b/app/src/main/res/drawable/item_background_md2.xml
@@ -0,0 +1,17 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:color="?colorPrimary"
+    tools:ignore="PrivateResource">
+
+    <item
+        android:id="@android:id/mask"
+        android:bottom="4dp"
+        android:end="8dp"
+        android:left="8dp"
+        android:top="4dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/selectorTransparency_md2" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/main_item_background.xml b/app/src/main/res/drawable/item_background_round.xml
similarity index 69%
rename from app/src/main/res/drawable/main_item_background.xml
rename to app/src/main/res/drawable/item_background_round.xml
index d52cfb1d..70f4df8c 100644
--- a/app/src/main/res/drawable/main_item_background.xml
+++ b/app/src/main/res/drawable/item_background_round.xml
@@ -3,7 +3,12 @@
     android:color="?colorControlHighlight"
     tools:ignore="PrivateResource">
 
-    <item android:id="@android:id/mask">
+    <item
+        android:id="@android:id/mask"
+        android:bottom="4dp"
+        android:end="8dp"
+        android:left="8dp"
+        android:top="4dp">
         <shape android:shape="rectangle">
             <solid android:color="@android:color/white" />
             <corners android:radius="8dp" />
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 8b94da4e..3a967f30 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -8,10 +8,6 @@
     android:clipChildren="false"
     android:clipToPadding="false">
 
-    <include
-        android:id="@+id/appbar"
-        layout="@layout/appbar_layout" />
-
     <androidx.core.widget.NestedScrollView
         android:id="@+id/nestedScrollView"
         android:layout_width="match_parent"
@@ -25,14 +21,13 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="8dp">
+            android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="72dp"
                 android:orientation="horizontal"
-                android:padding="8dp">
+                android:padding="16dp">
 
                 <ImageView
                     android:layout_width="42dp"
@@ -47,8 +42,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="8dp"
-                    android:paddingHorizontal="8dp"
+                    android:paddingHorizontal="16dp"
                     android:text="@string/app_name"
                     android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
             </LinearLayout>
@@ -56,13 +50,13 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -98,13 +92,13 @@
                 android:id="@+id/changelogView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -127,12 +121,13 @@
                 android:id="@+id/licensesView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
+                android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -156,13 +151,13 @@
                 android:id="@+id/translatorsView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -198,13 +193,13 @@
                 android:id="@+id/tgChannelView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -235,13 +230,13 @@
                 android:id="@+id/qqGroupView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -272,13 +267,13 @@
                 android:id="@+id/tgGroupView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -310,13 +305,13 @@
                 android:id="@+id/sourceCodeView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -347,13 +342,13 @@
                 android:id="@+id/donateView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -390,13 +385,13 @@
                 android:id="@+id/faqView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -426,13 +421,13 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -470,13 +465,13 @@
                 android:id="@+id/installerSupportView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -507,9 +502,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="8dp"
+                android:paddingStart="16dp"
                 android:paddingTop="24dp"
-                android:paddingEnd="8dp"
+                android:paddingEnd="16dp"
                 android:paddingBottom="16dp"
                 android:text="@string/about_developers_label"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body2"
@@ -525,7 +520,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="8dp">
+                    android:paddingHorizontal="16dp">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -544,7 +539,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:padding="8dp">
+                    android:padding="16dp"
+                    android:paddingVertical="8dp">
 
                     <com.google.android.material.button.MaterialButton
                         style="@style/Widget.MaterialComponents.Button.TextButton"
@@ -586,7 +582,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="8dp">
+                    android:paddingHorizontal="16dp">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -605,7 +601,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:padding="8dp">
+                    android:padding="16dp"
+                    android:paddingVertical="8dp">
 
                     <com.google.android.material.button.MaterialButton
                         style="@style/Widget.MaterialComponents.Button.TextButton"
@@ -647,7 +644,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="8dp">
+                    android:paddingHorizontal="16dp">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -666,7 +663,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:padding="8dp">
+                    android:padding="16dp"
+                    android:paddingVertical="8dp">
 
                     <com.google.android.material.button.MaterialButton
                         style="@style/Widget.MaterialComponents.Button.TextButton"
@@ -700,7 +698,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="8dp">
+                    android:paddingHorizontal="16dp">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -719,7 +717,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:padding="8dp">
+                    android:padding="16dp"
+                    android:paddingVertical="8dp">
 
                     <com.google.android.material.button.MaterialButton
                         style="@style/Widget.MaterialComponents.Button.TextButton"
@@ -746,4 +745,19 @@
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="?actionBarTheme"
+        app:liftOnScrollTargetViewId="@id/nestedScrollView">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?colorActionBar"
+            app:popupTheme="?actionBarPopupTheme" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_black_list.xml b/app/src/main/res/layout/activity_black_list.xml
index fbdaa424..88c47dc6 100644
--- a/app/src/main/res/layout/activity_black_list.xml
+++ b/app/src/main/res/layout/activity_black_list.xml
@@ -7,10 +7,6 @@
     android:clipChildren="false"
     android:clipToPadding="false">
 
-    <include
-        android:id="@+id/appbar"
-        layout="@layout/appbar_layout" />
-
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeRefreshLayout"
         android:layout_width="match_parent"
@@ -29,5 +25,19 @@
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="?actionBarTheme"
+        app:liftOnScrollTargetViewId="@id/recyclerView">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?colorActionBar"
+            app:popupTheme="?actionBarPopupTheme" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_download.xml b/app/src/main/res/layout/activity_download.xml
index fb7d006f..df8ce5f6 100644
--- a/app/src/main/res/layout/activity_download.xml
+++ b/app/src/main/res/layout/activity_download.xml
@@ -7,10 +7,6 @@
     android:clipChildren="false"
     android:clipToPadding="false">
 
-    <include
-        android:id="@+id/appbar"
-        layout="@layout/appbar_layout" />
-
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeRefreshLayout"
         android:layout_width="match_parent"
@@ -29,4 +25,17 @@
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="?actionBarTheme"
+        app:liftOnScrollTargetViewId="@id/recyclerView">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?colorActionBar"
+            app:popupTheme="?actionBarPopupTheme" />
+    </com.google.android.material.appbar.AppBarLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_logs.xml b/app/src/main/res/layout/activity_logs.xml
index ca0b8be0..40c12eaf 100644
--- a/app/src/main/res/layout/activity_logs.xml
+++ b/app/src/main/res/layout/activity_logs.xml
@@ -7,6 +7,23 @@
     android:clipChildren="false"
     android:clipToPadding="false">
 
+    <HorizontalScrollView
+        android:id="@+id/horizontalScrollView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:orientation="vertical" />
+    </HorizontalScrollView>
+
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -39,22 +56,4 @@
         </com.google.android.material.tabs.TabLayout>
 
     </com.google.android.material.appbar.AppBarLayout>
-
-    <HorizontalScrollView
-        android:id="@+id/horizontalScrollView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:orientation="vertical" />
-    </HorizontalScrollView>
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7dab1485..16fbc1e5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -229,7 +229,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginHorizontal="16dp"
                 android:layout_marginTop="10dp"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:orientation="horizontal"
@@ -256,7 +256,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginHorizontal="16dp"
                 android:layout_marginTop="5dp"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:orientation="horizontal"
@@ -283,7 +283,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginHorizontal="16dp"
                 android:layout_marginTop="5dp"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:orientation="horizontal"
@@ -310,7 +310,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginHorizontal="16dp"
                 android:layout_marginTop="5dp"
-                android:background="@drawable/main_item_background"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:orientation="horizontal"
diff --git a/app/src/main/res/layout/activity_modules.xml b/app/src/main/res/layout/activity_modules.xml
index fbdaa424..35699310 100644
--- a/app/src/main/res/layout/activity_modules.xml
+++ b/app/src/main/res/layout/activity_modules.xml
@@ -7,10 +7,6 @@
     android:clipChildren="false"
     android:clipToPadding="false">
 
-    <include
-        android:id="@+id/appbar"
-        layout="@layout/appbar_layout" />
-
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeRefreshLayout"
         android:layout_width="match_parent"
@@ -29,5 +25,19 @@
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="?actionBarTheme"
+        app:liftOnScrollTargetViewId="@id/recyclerView">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?colorActionBar"
+            app:popupTheme="?actionBarPopupTheme" />
+    </com.google.android.material.appbar.AppBarLayout>
+
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index aa6c0440..dd189e51 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -7,9 +7,6 @@
     android:clipChildren="false"
     android:clipToPadding="false">
 
-    <include
-        android:id="@+id/appbar"
-        layout="@layout/appbar_layout" />
 
     <FrameLayout
         android:id="@+id/container"
@@ -19,4 +16,16 @@
         android:clipToPadding="false"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="?actionBarTheme">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?colorActionBar"
+            app:popupTheme="?actionBarPopupTheme" />
+    </com.google.android.material.appbar.AppBarLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/appbar_layout.xml b/app/src/main/res/layout/appbar_layout.xml
deleted file mode 100644
index 1024c311..00000000
--- a/app/src/main/res/layout/appbar_layout.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:theme="?actionBarTheme">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?colorActionBar"
-        app:popupTheme="?actionBarPopupTheme" />
-
-</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index c616c2e1..0a8ae7e9 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -1,46 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectableItemBackground">
+    android:background="?listItemBackground"
+    android:padding="16dp">
 
-    <RelativeLayout
+    <TextView
+        android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dip">
+        android:textAppearance="?attr/textAppearanceListItem"
+        android:textSize="16sp" />
 
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?attr/textAppearanceListItem"
-            android:textSize="16sp" />
+    <TextView
+        android:id="@+id/description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/title"
+        android:layout_alignStart="@id/title"
+        android:layout_marginBottom="8dip"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
 
-        <TextView
-            android:id="@+id/description"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/title"
-            android:layout_alignStart="@id/title"
-            android:layout_marginBottom="8dip"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+    <TextView
+        android:id="@+id/downloadStatus"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/description"
+        android:layout_alignStart="@id/description"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:textColorSecondary"
+        android:visibility="gone" />
 
-        <TextView
-            android:id="@+id/downloadStatus"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/description"
-            android:layout_alignStart="@id/description"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:textColorSecondary"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/timestamps"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/downloadStatus"
-            android:layout_alignStart="@id/description"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-</FrameLayout>
\ No newline at end of file
+    <TextView
+        android:id="@+id/timestamps"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/downloadStatus"
+        android:layout_alignStart="@id/description"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_module.xml b/app/src/main/res/layout/item_module.xml
index c73879a1..62f40ec7 100644
--- a/app/src/main/res/layout/item_module.xml
+++ b/app/src/main/res/layout/item_module.xml
@@ -3,11 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
+    android:background="?listItemBackground"
     android:clickable="true"
     android:focusable="true"
     android:minHeight="?attr/listPreferredItemHeight"
-    android:padding="8dp">
+    android:padding="?listItemPadding"
+    android:paddingStart="8dp"
+    tools:ignore="RtlSymmetry">
 
     <ImageView
         android:id="@+id/app_icon"
diff --git a/app/src/main/res/layout/single_installer_view.xml b/app/src/main/res/layout/single_installer_view.xml
index 8c932cd2..a9d6cb41 100644
--- a/app/src/main/res/layout/single_installer_view.xml
+++ b/app/src/main/res/layout/single_installer_view.xml
@@ -189,7 +189,7 @@
                 android:layout_below="@id/container"
                 android:layout_marginHorizontal="16dp"
                 android:layout_marginTop="4dp"
-                android:background="@drawable/main_item_background"
+                android:background="@drawable/item_background_round"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
@@ -230,7 +230,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/author_view"
                 android:layout_marginHorizontal="16dp"
-                android:background="@drawable/main_item_background"
+                android:background="@drawable/item_background_round"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
@@ -270,7 +270,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/show_on_xda"
                 android:layout_marginHorizontal="16dp"
-                android:background="@drawable/main_item_background"
+                android:background="@drawable/item_background_round"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
@@ -309,7 +309,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/updateDescription"
                 android:layout_marginHorizontal="16dp"
-                android:background="@drawable/main_item_background"
+                android:background="@drawable/item_background_round"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/status_installer.xml b/app/src/main/res/layout/status_installer.xml
index 4a79c357..a8278d69 100644
--- a/app/src/main/res/layout/status_installer.xml
+++ b/app/src/main/res/layout/status_installer.xml
@@ -25,7 +25,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/main_item_background"
+                    android:background="@drawable/item_background_round"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
@@ -64,7 +64,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/main_item_background"
+                    android:background="@drawable/item_background_round"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
@@ -103,7 +103,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/main_item_background"
+                    android:background="@drawable/item_background_round"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
@@ -141,7 +141,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/main_item_background"
+                    android:background="@drawable/item_background_round"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
@@ -178,7 +178,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/main_item_background"
+                    android:background="@drawable/item_background_round"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
@@ -214,7 +214,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/main_item_background"
+                    android:background="@drawable/item_background_round"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
@@ -250,7 +250,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/main_item_background"
+                    android:background="@drawable/item_background_round"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
@@ -311,7 +311,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/main_item_background"
+                    android:background="@drawable/item_background_round"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
diff --git a/app/src/main/res/values-night/colors_md2.xml b/app/src/main/res/values-night/colors_md2.xml
new file mode 100644
index 00000000..1bcc155d
--- /dev/null
+++ b/app/src/main/res/values-night/colors_md2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary_md2">@color/material_blue_700</color>
+    <color name="colorBackground_md2">#000</color>
+    <color name="colorPrimaryDark_md2">#000</color>
+    <color name="colorAccent_md2">@color/material_blue_700</color>
+    <color name="colorActionBar_md2">#000</color>
+    <color name="colorStickyHeader_md2">#ea000000</color>
+    <color name="selectorTransparency_md2">#eaffffff</color>
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d0545d8f..edb43361 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -301,4 +301,5 @@
     <string name="accent_color">强调色</string>
     <string name="colorized_action_bar">着色应用栏</string>
     <string name="settings_group_theme">主题</string>
+    <string name="material_design_2">质感设计 2</string>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 14d61f49..6924d63d 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -2,7 +2,10 @@
 <resources>
     <attr name="colorActionBar" format="color" />
     <attr name="colorStickyHeader" format="color" />
+    <attr name="listItemBackground" format="reference" />
+    <attr name="roundBackground" format="reference" />
     <attr name="actionBarTheme" format="reference" />
+    <attr name="listItemPadding" format="dimension" />
     <attr name="actionBarPopupTheme" format="reference" />
     <attr name="tabLayoutTheme" format="reference" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors_md2.xml b/app/src/main/res/values/colors_md2.xml
new file mode 100644
index 00000000..81709faa
--- /dev/null
+++ b/app/src/main/res/values/colors_md2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary_md2">@color/material_blue_700</color>
+    <color name="colorBackground_md2">#fff</color>
+    <color name="colorPrimaryDark_md2">#fff</color>
+    <color name="colorAccent_md2">@color/material_blue_700</color>
+    <color name="colorActionBar_md2">#fff</color>
+    <color name="colorStickyHeader_md2">#eaffffff</color>
+    <color name="selectorTransparency_md2">#3dffffff</color>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a3f51234..30336506 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -332,4 +332,5 @@
     <string name="accent_color">Accent color</string>
     <string name="colorized_action_bar">Colorized action bar</string>
     <string name="settings_group_theme">Theme</string>
+    <string name="material_design_2">Material Design 2</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9bc5850f..4f8fb84e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,9 +8,12 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorActionBar">@color/colorActionBar</item>
         <item name="colorStickyHeader">@color/colorStickyHeader</item>
+        <item name="listItemPadding">8dp</item>
         <item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item>
         <item name="android:colorBackground">@color/colorBackground</item>
         <item name="android:windowBackground">@color/colorBackground</item>
+        <item name="listItemBackground">?selectableItemBackground</item>
+        <item name="roundBackground">@drawable/item_background_round</item>
         <item name="actionBarPopupTheme">@style/AppTheme.PopupOverlay</item>
         <item name="android:windowLightStatusBar">@bool/lightSystemUI</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/lightSystemUI
@@ -19,6 +22,7 @@
         <item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog
         </item>
         <item name="tabLayoutTheme">@style/Widget.MaterialComponents.TabLayout</item>
+        <item name="liftOnScroll">false</item>
     </style>
 
     <style name="AppearanceFoundation.Caption" parent="TextAppearance.AppCompat.Caption">
@@ -30,6 +34,18 @@
 
     <style name="ThemeOverlay" />
 
+    <style name="ThemeOverlay.Md2">
+        <item name="colorPrimaryDark">@color/colorPrimaryDark_md2</item>
+        <item name="colorActionBar">@color/colorActionBar_md2</item>
+        <item name="colorStickyHeader">@color/colorStickyHeader_md2</item>
+        <item name="android:colorBackground">@color/colorBackground_md2</item>
+        <item name="android:windowBackground">@color/colorBackground_md2</item>
+        <item name="listItemPadding">16dp</item>
+        <item name="listItemBackground">@drawable/item_background_md2</item>
+        <item name="roundBackground">@drawable/item_background_md2</item>
+        <item name="liftOnScroll">true</item>
+    </style>
+
     <style name="ThemeOverlay.ActionBarPrimaryColor">
         <item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.Dark.ActionBar</item>
         <item name="android:windowLightStatusBar">false</item>
@@ -38,7 +54,7 @@
 
     <style name="ThemeOverlay.ActivityMain">
         <item name="android:windowLightStatusBar">@bool/lightSystemUI</item>
-        <item name="colorPrimaryDark">@color/colorBackground</item>
+        <item name="colorPrimaryDark">?android:colorBackground</item>
     </style>
 
     <style name="ThemeOverlay.Black">
diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml
index 2ba1d2c0..8e40f175 100644
--- a/app/src/main/res/xml/prefs.xml
+++ b/app/src/main/res/xml/prefs.xml
@@ -52,6 +52,10 @@
             android:summary="%s"
             android:title="@string/settings_theme"
             app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            android:key="md2"
+            android:title="@string/material_design_2"
+            app:iconSpaceReserved="false" />
         <SwitchPreferenceCompat
             android:key="colorized_action_bar"
             android:title="@string/colorized_action_bar"