From 861ad9881ca3110554506cb8061d63bcff1de206 Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <neytireyqa@gmail.com>
Date: Sun, 14 Apr 2019 11:51:47 +0200
Subject: [PATCH] Updated design of the front page (with removed cards and
 added dividers)

Also updated material library and injected backported styles which were incompatible with the current UI for the most part and as it was over-carded all cards were removed and replaced with flat UI components.
This change is temporary and *will* be redone to the final redesign, in other words this is sufficient for the transition period.

All themers should refrain from trying to theme the app until the redesign is done. It will break your efforts with every other release.
---
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |   4 +-
 .../com/topjohnwu/magisk/view/SafetyNet.java  |  18 +-
 app/src/main/res/layout/fragment_magisk.xml   | 779 +++++++++---------
 .../main/res/layout/include_update_card.xml   | 210 +++--
 app/src/main/res/values/styles_new.xml        |   8 +-
 6 files changed, 487 insertions(+), 534 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fc25ba0cb..488a7dc75 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,7 +56,7 @@ dependencies {
     implementation "androidx.preference:preference:${androidXVersion}"
     implementation "androidx.recyclerview:recyclerview:${androidXVersion}"
     implementation "androidx.cardview:cardview:${androidXVersion}"
-    implementation "com.google.android.material:material:${androidXVersion}"
+    implementation "com.google.android.material:material:1.1.0-alpha05"
     implementation 'androidx.work:work-runtime:2.0.1'
     implementation 'androidx.transition:transition:1.1.0-beta01'
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index beb5505cd..e8ff18386 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
     <application
         android:allowBackup="true"
         android:name="a.e"
-        android:theme="@style/AppTheme"
+        android:theme="@style/MagiskTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
 
@@ -74,4 +74,4 @@
 
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/com/topjohnwu/magisk/view/SafetyNet.java b/app/src/main/java/com/topjohnwu/magisk/view/SafetyNet.java
index 8796bac8d..e445439d1 100644
--- a/app/src/main/java/com/topjohnwu/magisk/view/SafetyNet.java
+++ b/app/src/main/java/com/topjohnwu/magisk/view/SafetyNet.java
@@ -9,7 +9,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-
+import androidx.annotation.StringRes;
+import androidx.cardview.widget.CardView;
+import butterknife.BindColor;
+import butterknife.BindView;
+import butterknife.OnClick;
+import butterknife.Unbinder;
 import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.R;
@@ -17,23 +22,16 @@ import com.topjohnwu.magisk.utils.ISafetyNetHelper;
 import com.topjohnwu.magisk.view.dialogs.CustomAlertDialog;
 import com.topjohnwu.net.Networking;
 import com.topjohnwu.superuser.Shell;
+import dalvik.system.DexClassLoader;
 
 import java.io.File;
 
-import androidx.annotation.StringRes;
-import androidx.cardview.widget.CardView;
-import butterknife.BindColor;
-import butterknife.BindView;
-import butterknife.OnClick;
-import butterknife.Unbinder;
-import dalvik.system.DexClassLoader;
-
 public class SafetyNet implements ISafetyNetHelper.Callback {
 
     private static final File EXT_APK =
             new File(App.self.getFilesDir().getParent() + "/snet", "snet.apk");
 
-    @BindView(R.id.safetyNet_card) CardView safetyNetCard;
+    /*@BindView(R.id.safetyNet_card) */ CardView safetyNetCard;
     @BindView(R.id.safetyNet_refresh) ImageView safetyNetRefreshIcon;
     @BindView(R.id.safetyNet_status) TextView safetyNetStatusText;
     @BindView(R.id.safetyNet_check_progress) ProgressBar safetyNetProgress;
diff --git a/app/src/main/res/layout/fragment_magisk.xml b/app/src/main/res/layout/fragment_magisk.xml
index 10c6dd845..6e58db6cf 100644
--- a/app/src/main/res/layout/fragment_magisk.xml
+++ b/app/src/main/res/layout/fragment_magisk.xml
@@ -32,57 +32,49 @@
                 android:id="@+id/linearLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:padding="@dimen/margin_generic">
 
-                <androidx.cardview.widget.CardView
-                    style="?attr/cardStyle"
-                    android:layout_width="fill_parent"
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="4dp"
-                    app:cardCornerRadius="@dimen/card_corner_radius"
-                    app:cardElevation="@dimen/card_elevation">
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp">
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="match_parent"
+                    <ImageView
+                        android:id="@+id/icon"
+                        android:layout_width="wrap_content"
+                        android:layout_height="0dp"
+                        android:layout_marginEnd="16dp"
+                        app:layout_constraintBottom_toBottomOf="@+id/app_name"
+                        app:layout_constraintEnd_toStartOf="@+id/app_name"
+                        app:layout_constraintHorizontal_bias="0.42"
+                        app:layout_constraintHorizontal_chainStyle="packed"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="@+id/app_name"
+                        app:srcCompat="@drawable/ic_logo" />
+
+                    <TextView
+                        android:id="@+id/app_name"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginBottom="5dp">
+                        android:layout_gravity="center_vertical"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp"
+                        android:text="@string/app_name"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.5"
+                        app:layout_constraintStart_toEndOf="@+id/icon"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-                        <ImageView
-                            android:id="@+id/icon"
-                            android:layout_width="wrap_content"
-                            android:layout_height="0dp"
-                            android:layout_marginEnd="16dp"
-                            app:layout_constraintBottom_toBottomOf="@+id/app_name"
-                            app:layout_constraintEnd_toStartOf="@+id/app_name"
-                            app:layout_constraintHorizontal_bias="0.42"
-                            app:layout_constraintHorizontal_chainStyle="packed"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="@+id/app_name"
-                            app:srcCompat="@drawable/ic_logo" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-                        <TextView
-                            android:id="@+id/app_name"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:paddingTop="10dp"
-                            android:paddingBottom="10dp"
-                            android:text="@string/app_name"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintHorizontal_bias="0.5"
-                            app:layout_constraintStart_toEndOf="@+id/icon"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                </androidx.cardview.widget.CardView>
+                <View
+                    style="@style/Widget.Divider.Horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_margin="@dimen/margin_generic" />
 
                 <include
                     android:id="@+id/home_magisk_version"
@@ -102,414 +94,379 @@
                     latestVersion="@{viewModel.managerLatestVersion}"
                     layout="@layout/include_update_card"
                     state="@{viewModel.managerState}"
-                    text="@{viewModel.managerStateText}" />
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/install_option_card"
-                    style="?attr/cardStyle"
+                    text="@{viewModel.managerStateText}"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="4dp"
-                    app:cardCornerRadius="@dimen/card_corner_radius"
-                    app:cardElevation="@dimen/card_elevation">
+                    android:layout_marginTop="@dimen/margin_generic" />
 
-                    <LinearLayout
+                <View
+                    style="@style/Widget.Divider.Horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_margin="@dimen/margin_generic" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:animateLayoutChanges="true"
+                    android:onClick="@{() -> viewModel.advancedPressed()}"
+                    android:orientation="vertical"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:onClick="@{() -> viewModel.advancedPressed()}"
-                        android:orientation="vertical"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp">
+                        android:layout_height="wrap_content"
+                        android:background="?attr/selectableItemBackground"
+                        android:minHeight="48dp">
 
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
-
-                            <ImageView
-                                android:id="@+id/arrow"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="16dp"
-                                android:rotation="@{viewModel.isAdvancedExpanded ? 180 : 0}"
-                                android:tint="?attr/imageColorTint"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintStart_toEndOf="@+id/title"
-                                app:layout_constraintTop_toTopOf="parent"
-                                app:srcCompat="@drawable/ic_arrow" />
-
-                            <TextView
-                                android:id="@+id/title"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center"
-                                android:text="@string/advanced_settings_title"
-                                android:textStyle="bold"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                        <LinearLayout
-                            android:id="@+id/install_option_expand"
-                            gone="@{!viewModel.isAdvancedExpanded}"
-                            android:layout_width="match_parent"
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:id="@+id/arrow"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:orientation="vertical">
+                            android:layout_marginStart="16dp"
+                            android:rotation="@{viewModel.isAdvancedExpanded ? 180 : 0}"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toEndOf="@+id/title"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:srcCompat="@drawable/ic_arrow"
+                            app:tint="?attr/imageColorTint" />
 
-                            <CheckBox
-                                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:checked="@={viewModel.isForceEncryption}"
-                                android:text="@string/keep_force_encryption" />
+                        <TextView
+                            android:id="@+id/title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:text="@string/advanced_settings_title"
+                            android:textStyle="bold"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
 
-                            <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:checked="@={viewModel.isKeepVerity}"
-                                android:text="@string/keep_dm_verity" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
-                        </LinearLayout>
-
-                    </LinearLayout>
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/safetyNet_card"
-                    style="?attr/cardStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="4dp"
-                    app:cardCornerRadius="@dimen/card_corner_radius"
-                    app:cardElevation="@dimen/card_elevation">
-
-                    <LinearLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/install_option_expand"
+                        gone="@{!viewModel.isAdvancedExpanded}"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
 
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
-
-                            <ImageView
-                                android:id="@+id/sn_logo"
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
-                                android:layout_marginTop="12dp"
-                                android:layout_marginEnd="24dp"
-                                android:layout_marginBottom="12dp"
-                                android:tint="@color/green500"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toStartOf="@+id/safetyNet_status"
-                                app:layout_constraintTop_toTopOf="parent"
-                                app:srcCompat="@drawable/ic_safetynet" />
-
-                            <ImageView
-                                android:id="@+id/safetyNet_refresh"
-                                android:layout_width="25dp"
-                                android:layout_height="25dp"
-                                android:layout_marginStart="24dp"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintStart_toEndOf="@+id/safetyNet_status"
-                                app:layout_constraintTop_toTopOf="parent"
-                                app:srcCompat="@drawable/ic_refresh" />
-
-                            <ProgressBar
-                                android:id="@+id/safetyNet_check_progress"
-                                android:layout_width="0dp"
-                                android:layout_height="0dp"
-                                android:visibility="gone"
-                                app:layout_constraintBottom_toBottomOf="@+id/safetyNet_refresh"
-                                app:layout_constraintEnd_toEndOf="@+id/safetyNet_refresh"
-                                app:layout_constraintStart_toStartOf="@+id/safetyNet_refresh"
-                                app:layout_constraintTop_toTopOf="@+id/safetyNet_refresh" />
-
-                            <TextView
-                                android:id="@+id/safetyNet_status"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:gravity="center"
-                                android:maxLines="1"
-                                android:minWidth="200dp"
-                                android:text="@string/safetyNet_check_text"
-                                android:textStyle="bold"
-                                app:autoSizeMaxTextSize="14sp"
-                                app:autoSizeTextType="uniform"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toStartOf="@+id/sn_status_end"
-                                app:layout_constraintStart_toStartOf="@+id/sn_status_start"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <androidx.constraintlayout.widget.Guideline
-                                android:id="@+id/sn_status_start"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:orientation="vertical"
-                                app:layout_constraintGuide_percent="0.25" />
-
-                            <androidx.constraintlayout.widget.Guideline
-                                android:id="@+id/sn_status_end"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:orientation="vertical"
-                                app:layout_constraintGuide_percent="0.75" />
-
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/safetyNet_expand"
-                            android:layout_width="match_parent"
+                        <CheckBox
+                            android:id="@+id/keep_force_enc"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:paddingBottom="10dp">
+                            android:checked="@={viewModel.isForceEncryption}"
+                            android:text="@string/keep_force_encryption"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintWidth_default="wrap"
+                            app:layout_constraintWidth_min="300dp" />
 
-                            <ImageView
-                                android:id="@+id/cts_status_icon"
-                                android:layout_width="25dp"
-                                android:layout_height="25dp"
-                                android:layout_marginEnd="8dp"
-                                app:layout_constraintBottom_toBottomOf="@+id/cts_status"
-                                app:layout_constraintEnd_toStartOf="@+id/cts_status"
-                                app:layout_constraintTop_toTopOf="@+id/cts_status" />
+                        <CheckBox
+                            android:id="@+id/keep_verity"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:checked="@={viewModel.isKeepVerity}"
+                            android:text="@string/keep_dm_verity"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/keep_force_enc"
+                            app:layout_constraintWidth_default="wrap"
+                            app:layout_constraintWidth_min="300dp" />
 
-                            <ImageView
-                                android:id="@+id/basic_status_icon"
-                                android:layout_width="25dp"
-                                android:layout_height="25dp"
-                                android:layout_marginEnd="8dp"
-                                app:layout_constraintBottom_toBottomOf="@+id/basic_status"
-                                app:layout_constraintEnd_toStartOf="@+id/basic_status"
-                                app:layout_constraintHorizontal_bias="0.5"
-                                app:layout_constraintHorizontal_chainStyle="packed"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="@+id/basic_status" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
-                            <TextView
-                                android:id="@+id/cts_status"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:padding="6dp"
-                                android:textStyle="bold"
-                                app:layout_constraintEnd_toEndOf="@+id/basic_status"
-                                app:layout_constraintStart_toStartOf="@+id/basic_status"
-                                app:layout_constraintTop_toTopOf="parent" />
+                </LinearLayout>
 
-                            <TextView
-                                android:id="@+id/basic_status"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="4dp"
-                                android:padding="6dp"
-                                android:textStyle="bold"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintHorizontal_bias="0.5"
-                                app:layout_constraintStart_toEndOf="@+id/basic_status_icon"
-                                app:layout_constraintTop_toBottomOf="@+id/cts_status" />
-
-
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    </LinearLayout>
-
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    style="?attr/cardStyle"
+                <View
+                    style="@style/Widget.Divider.Horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="4dp"
-                    app:cardCornerRadius="@dimen/card_corner_radius"
-                    app:cardElevation="@dimen/card_elevation">
+                    android:layout_margin="@dimen/margin_generic" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
-                        <FrameLayout
-                            android:id="@+id/twitter"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:clickable="true"
-                            android:focusable="true"
-                            android:foreground="?android:attr/selectableItemBackground"
-                            android:onClick="@{() -> viewModel.twitterPressed()}"
+                        <ImageView
+                            android:id="@+id/sn_logo"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+                            android:layout_marginTop="12dp"
+                            android:layout_marginEnd="24dp"
+                            android:layout_marginBottom="12dp"
+                            android:tint="@color/green500"
                             app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toStartOf="@+id/github"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/paypal">
+                            app:layout_constraintEnd_toStartOf="@+id/safetyNet_status"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:srcCompat="@drawable/ic_safetynet" />
 
-                            <ImageView
-                                android:layout_width="35dp"
-                                android:layout_height="35dp"
-                                android:layout_gravity="center_horizontal"
-                                android:layout_margin="10dp"
-                                android:tint="?attr/imageColorTint"
-                                app:srcCompat="@drawable/ic_twitter" />
-
-                        </FrameLayout>
-
-                        <FrameLayout
-                            android:id="@+id/github"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:clickable="true"
-                            android:focusable="true"
-                            android:foreground="?android:attr/selectableItemBackground"
-                            android:onClick="@{() -> viewModel.githubPressed()}"
+                        <ImageView
+                            android:id="@+id/safetyNet_refresh"
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_marginStart="24dp"
                             app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toStartOf="@+id/xda"
-                            app:layout_constraintStart_toEndOf="@+id/twitter">
+                            app:layout_constraintStart_toEndOf="@+id/safetyNet_status"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:srcCompat="@drawable/ic_refresh" />
 
-                            <ImageView
-                                android:layout_width="35dp"
-                                android:layout_height="35dp"
-                                android:layout_gravity="center_horizontal"
-                                android:layout_margin="10dp"
-                                android:tint="?attr/imageColorTint"
-                                app:srcCompat="@drawable/ic_github" />
+                        <ProgressBar
+                            android:id="@+id/safetyNet_check_progress"
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:visibility="gone"
+                            app:layout_constraintBottom_toBottomOf="@+id/safetyNet_refresh"
+                            app:layout_constraintEnd_toEndOf="@+id/safetyNet_refresh"
+                            app:layout_constraintStart_toStartOf="@+id/safetyNet_refresh"
+                            app:layout_constraintTop_toTopOf="@+id/safetyNet_refresh" />
 
-                        </FrameLayout>
-
-                        <FrameLayout
-                            android:id="@+id/xda"
+                        <TextView
+                            android:id="@+id/safetyNet_status"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:clickable="true"
-                            android:focusable="true"
-                            android:foreground="?android:attr/selectableItemBackground"
-                            android:onClick="@{() -> viewModel.xdaPressed()}"
+                            android:gravity="center"
+                            android:maxLines="1"
+                            android:minWidth="200dp"
+                            android:text="@string/safetyNet_check_text"
+                            android:textStyle="bold"
+                            app:autoSizeMaxTextSize="14sp"
+                            app:autoSizeTextType="uniform"
                             app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toEndOf="@id/github">
+                            app:layout_constraintEnd_toStartOf="@+id/sn_status_end"
+                            app:layout_constraintStart_toStartOf="@+id/sn_status_start"
+                            app:layout_constraintTop_toTopOf="parent" />
 
-                            <ImageView
-                                android:layout_width="35dp"
-                                android:layout_height="35dp"
-                                android:layout_gravity="center_horizontal"
-                                android:layout_margin="10dp"
-                                android:tint="?attr/imageColorTint"
-                                app:srcCompat="@drawable/ic_xda" />
-
-                        </FrameLayout>
-
-                        <LinearLayout
-                            android:id="@+id/patreon"
-                            android:layout_width="0dp"
+                        <androidx.constraintlayout.widget.Guideline
+                            android:id="@+id/sn_status_start"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:background="?android:attr/selectableItemBackground"
-                            android:clickable="true"
-                            android:focusable="true"
-                            android:gravity="center_horizontal"
-                            android:onClick="@{() -> viewModel.patreonPressed()}"
-                            android:orientation="horizontal"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toEndOf="@+id/paypal"
-                            app:layout_constraintTop_toTopOf="parent">
+                            android:orientation="vertical"
+                            app:layout_constraintGuide_percent="0.25" />
 
-                            <ImageView
-                                android:layout_width="35dp"
-                                android:layout_height="35dp"
-                                android:layout_gravity="center"
-                                android:layout_margin="10dp"
-                                android:tint="?attr/imageColorTint"
-                                app:srcCompat="@drawable/ic_patreon" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center"
-                                android:layout_margin="5dp"
-                                android:text="Patreon"
-                                android:textAppearance="?android:attr/textAppearanceMedium"
-                                android:textStyle="bold" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/paypal"
-                            android:layout_width="0dp"
+                        <androidx.constraintlayout.widget.Guideline
+                            android:id="@+id/sn_status_end"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:background="?android:attr/selectableItemBackground"
-                            android:clickable="true"
-                            android:focusable="true"
-                            android:gravity="center_horizontal"
-                            android:onClick="@{() -> viewModel.paypalPressed()}"
-                            android:orientation="horizontal"
-                            app:layout_constraintEnd_toStartOf="@+id/patreon"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent">
-
-                            <ImageView
-                                android:layout_width="35dp"
-                                android:layout_height="35dp"
-                                android:layout_gravity="center"
-                                android:layout_margin="10dp"
-                                android:tint="?attr/imageColorTint"
-                                app:srcCompat="@drawable/ic_paypal" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center"
-                                android:layout_margin="5dp"
-                                android:text="PayPal"
-                                android:textAppearance="?android:attr/textAppearanceMedium"
-                                android:textStyle="bold" />
-                        </LinearLayout>
+                            android:orientation="vertical"
+                            app:layout_constraintGuide_percent="0.75" />
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/uninstall_button"
-                    style="?attr/cardStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="4dp"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:foreground="?android:attr/selectableItemBackground"
-                    android:onClick="@{() -> viewModel.uninstallPressed()}"
-                    app:cardCornerRadius="@dimen/card_corner_radius"
-                    app:cardElevation="@dimen/card_elevation">
-
-                    <TextView
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/safetyNet_expand"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:layout_marginBottom="10dp"
-                        android:ems="10"
-                        android:fontFamily="sans-serif"
-                        android:gravity="center"
-                        android:text="@string/uninstall"
-                        android:textAllCaps="false"
-                        android:textSize="20sp"
-                        android:textStyle="bold" />
+                        android:paddingBottom="10dp">
 
-                </androidx.cardview.widget.CardView>
+                        <ImageView
+                            android:id="@+id/cts_status_icon"
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_marginEnd="8dp"
+                            app:layout_constraintBottom_toBottomOf="@+id/cts_status"
+                            app:layout_constraintEnd_toStartOf="@+id/cts_status"
+                            app:layout_constraintTop_toTopOf="@+id/cts_status" />
+
+                        <ImageView
+                            android:id="@+id/basic_status_icon"
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_marginEnd="8dp"
+                            app:layout_constraintBottom_toBottomOf="@+id/basic_status"
+                            app:layout_constraintEnd_toStartOf="@+id/basic_status"
+                            app:layout_constraintHorizontal_bias="0.5"
+                            app:layout_constraintHorizontal_chainStyle="packed"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="@+id/basic_status" />
+
+                        <TextView
+                            android:id="@+id/cts_status"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:padding="6dp"
+                            android:textStyle="bold"
+                            app:layout_constraintEnd_toEndOf="@+id/basic_status"
+                            app:layout_constraintStart_toStartOf="@+id/basic_status"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <TextView
+                            android:id="@+id/basic_status"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:padding="6dp"
+                            android:textStyle="bold"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintHorizontal_bias="0.5"
+                            app:layout_constraintStart_toEndOf="@+id/basic_status_icon"
+                            app:layout_constraintTop_toBottomOf="@+id/cts_status" />
+
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <View
+                    style="@style/Widget.Divider.Horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_margin="@dimen/margin_generic" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <FrameLayout
+                        android:id="@+id/twitter"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:foreground="?android:attr/selectableItemBackground"
+                        android:onClick="@{() -> viewModel.twitterPressed()}"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/github"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/paypal">
+
+                        <ImageView
+                            android:layout_width="35dp"
+                            android:layout_height="35dp"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_margin="10dp"
+                            android:tint="?attr/imageColorTint"
+                            app:srcCompat="@drawable/ic_twitter" />
+
+                    </FrameLayout>
+
+                    <FrameLayout
+                        android:id="@+id/github"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:foreground="?android:attr/selectableItemBackground"
+                        android:onClick="@{() -> viewModel.githubPressed()}"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/xda"
+                        app:layout_constraintStart_toEndOf="@+id/twitter">
+
+                        <ImageView
+                            android:layout_width="35dp"
+                            android:layout_height="35dp"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_margin="10dp"
+                            android:tint="?attr/imageColorTint"
+                            app:srcCompat="@drawable/ic_github" />
+
+                    </FrameLayout>
+
+                    <FrameLayout
+                        android:id="@+id/xda"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:foreground="?android:attr/selectableItemBackground"
+                        android:onClick="@{() -> viewModel.xdaPressed()}"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@id/github">
+
+                        <ImageView
+                            android:layout_width="35dp"
+                            android:layout_height="35dp"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_margin="10dp"
+                            android:tint="?attr/imageColorTint"
+                            app:srcCompat="@drawable/ic_xda" />
+
+                    </FrameLayout>
+
+                    <LinearLayout
+                        android:id="@+id/patreon"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:gravity="center_horizontal"
+                        android:onClick="@{() -> viewModel.patreonPressed()}"
+                        android:orientation="horizontal"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/paypal"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <ImageView
+                            android:layout_width="35dp"
+                            android:layout_height="35dp"
+                            android:layout_gravity="center"
+                            android:layout_margin="10dp"
+                            android:tint="?attr/imageColorTint"
+                            app:srcCompat="@drawable/ic_patreon" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_margin="5dp"
+                            android:text="Patreon"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textStyle="bold" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/paypal"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:gravity="center_horizontal"
+                        android:onClick="@{() -> viewModel.paypalPressed()}"
+                        android:orientation="horizontal"
+                        app:layout_constraintEnd_toStartOf="@+id/patreon"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <ImageView
+                            android:layout_width="35dp"
+                            android:layout_height="35dp"
+                            android:layout_gravity="center"
+                            android:layout_margin="10dp"
+                            android:tint="?attr/imageColorTint"
+                            app:srcCompat="@drawable/ic_paypal" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_margin="5dp"
+                            android:text="PayPal"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textStyle="bold" />
+                    </LinearLayout>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <View
+                    style="@style/Widget.Divider.Horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_margin="@dimen/margin_generic" />
+
+                <com.google.android.material.button.MaterialButton
+                    style="@style/Widget.Button.Text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:onClick="@{() -> viewModel.uninstallPressed()}"
+                    android:text="@string/uninstall" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/include_update_card.xml b/app/src/main/res/layout/include_update_card.xml
index a772a4811..68c7d9f3d 100644
--- a/app/src/main/res/layout/include_update_card.xml
+++ b/app/src/main/res/layout/include_update_card.xml
@@ -39,123 +39,115 @@
 
     </data>
 
-    <androidx.cardview.widget.CardView
-        style="?attr/cardStyle"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="5dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginEnd="5dp"
-        android:layout_marginBottom="4dp"
-        android:foreground="?android:attr/selectableItemBackground"
-        android:onClick="@{() -> viewModel.cardPressed(item)}"
-        app:cardCornerRadius="@dimen/card_corner_radius"
-        app:cardElevation="@dimen/card_elevation">
+        android:layout_height="match_parent"
+        android:animateLayoutChanges="true"
+        android:background="?android:attr/selectableItemBackground"
+        android:onClick="@{() -> viewModel.cardPressed(item)}">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp">
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/install"
+            style="@style/Widget.Button.Text"
+            gone="@{state == MagiskState.LOADING}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:onClick="@{() -> viewModel.installPressed(item)}"
+            android:text="@{state != MagiskState.OBSOLETE ? @string/install : @string/update}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@string/install" />
 
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/install"
-                gone="@{state == MagiskState.LOADING}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:onClick="@{() -> viewModel.installPressed(item)}"
-                android:text="@{state != MagiskState.OBSOLETE ? @string/install : @string/update}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="@string/install" />
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/status_icon"
+            invisible="@{state == MagiskState.LOADING}"
+            srcCompat="@{state == MagiskState.UP_TO_DATE ? R.drawable.ic_check_circle : (state == MagiskState.OBSOLETE ? R.drawable.ic_update : R.drawable.ic_help)}"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/status"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@{state == MagiskState.UP_TO_DATE ? @color/colorCorrect : (state == MagiskState.OBSOLETE ? @color/colorUpdate : @color/colorError)}" />
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/status_icon"
-                invisible="@{state == MagiskState.LOADING}"
-                srcCompat="@{state == MagiskState.UP_TO_DATE ? R.drawable.ic_check_circle : (state == MagiskState.OBSOLETE ? R.drawable.ic_update : R.drawable.ic_help)}"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                app:tint="@{state == MagiskState.UP_TO_DATE ? @color/colorCorrect : (state == MagiskState.OBSOLETE ? @color/colorUpdate : @color/colorError)}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/status"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+        <ProgressBar
+            android:id="@+id/progress"
+            style="@style/Widget.Progress"
+            gone="@{state != MagiskState.LOADING}"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="@+id/status_icon"
+            app:layout_constraintEnd_toEndOf="@+id/status_icon"
+            app:layout_constraintStart_toStartOf="@+id/status_icon"
+            app:layout_constraintTop_toTopOf="@+id/status_icon" />
 
-            <ProgressBar
-                android:id="@+id/progress"
-                gone="@{state != MagiskState.LOADING}"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintBottom_toBottomOf="@+id/status_icon"
-                app:layout_constraintEnd_toEndOf="@+id/status_icon"
-                app:layout_constraintStart_toStartOf="@+id/status_icon"
-                app:layout_constraintTop_toTopOf="@+id/status_icon" />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/status"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:maxLines="1"
+            android:paddingTop="3dp"
+            android:paddingBottom="3dp"
+            android:text="@{text}"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            app:autoSizeMinTextSize="1sp"
+            app:autoSizeTextType="uniform"
+            app:layout_constraintBottom_toTopOf="@+id/current_version"
+            app:layout_constraintEnd_toStartOf="@+id/install"
+            app:layout_constraintStart_toEndOf="@+id/status_icon"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
+            tools:text="Magisk is up to date" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/current_version"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:text="@{state != MagiskState.LOADING ? currentVersion : @string/checking_for_updates}"
-                app:autoSizeMinTextSize="1sp"
-                app:autoSizeTextType="uniform"
-                app:layout_constraintEnd_toEndOf="@+id/status"
-                app:layout_constraintStart_toStartOf="@+id/status"
-                app:layout_constraintTop_toBottomOf="@+id/status"
-                tools:text="@string/checking_for_updates" />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/current_version"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:text="@{state != MagiskState.LOADING ? currentVersion : @string/checking_for_updates}"
+            app:autoSizeMinTextSize="1sp"
+            app:autoSizeTextType="uniform"
+            app:layout_constraintBottom_toTopOf="@+id/latest_version"
+            app:layout_constraintEnd_toEndOf="@+id/status"
+            app:layout_constraintStart_toStartOf="@+id/status"
+            app:layout_constraintTop_toBottomOf="@+id/status"
+            tools:text="@string/checking_for_updates" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/latest_version"
-                gone="@{currentVersion == latestVersion}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:text="@{state != MagiskState.LOADING ? latestVersion : @string/checking_for_updates}"
-                app:autoSizeMinTextSize="1sp"
-                app:autoSizeTextType="uniform"
-                app:layout_constraintEnd_toEndOf="@+id/status"
-                app:layout_constraintStart_toStartOf="@+id/status"
-                app:layout_constraintTop_toBottomOf="@+id/current_version"
-                tools:text="@string/checking_for_updates" />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/latest_version"
+            gone="@{currentVersion == latestVersion}"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:text="@{state != MagiskState.LOADING ? latestVersion : @string/checking_for_updates}"
+            app:autoSizeMinTextSize="1sp"
+            app:autoSizeTextType="uniform"
+            app:layout_constraintBottom_toTopOf="@+id/additional"
+            app:layout_constraintEnd_toEndOf="@+id/status"
+            app:layout_constraintStart_toStartOf="@+id/status"
+            app:layout_constraintTop_toBottomOf="@+id/current_version"
+            tools:text="@string/checking_for_updates" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/additional"
-                gone="@{additionalInfo.length == 0}"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:text="@{additionalInfo}"
-                app:autoSizeMinTextSize="1sp"
-                app:autoSizeTextType="uniform"
-                app:layout_constraintEnd_toEndOf="@+id/status"
-                app:layout_constraintStart_toStartOf="@+id/status"
-                app:layout_constraintTop_toBottomOf="@+id/latest_version"
-                tools:text="@string/checking_for_updates" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/status"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:maxLines="1"
-                android:paddingTop="3dp"
-                android:paddingBottom="3dp"
-                android:text="@{text}"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                app:autoSizeMinTextSize="1sp"
-                app:autoSizeTextType="uniform"
-                app:layout_constraintEnd_toStartOf="@+id/install"
-                app:layout_constraintStart_toEndOf="@+id/status_icon"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="Magisk is up to date" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/additional"
+            gone="@{additionalInfo.length == 0}"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:text="@{additionalInfo}"
+            app:autoSizeMinTextSize="1sp"
+            app:autoSizeTextType="uniform"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/status"
+            app:layout_constraintStart_toStartOf="@+id/status"
+            app:layout_constraintTop_toBottomOf="@+id/latest_version"
+            tools:text="@string/checking_for_updates" />
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
diff --git a/app/src/main/res/values/styles_new.xml b/app/src/main/res/values/styles_new.xml
index 66e4f51ea..cc4fa1c1e 100644
--- a/app/src/main/res/values/styles_new.xml
+++ b/app/src/main/res/values/styles_new.xml
@@ -14,7 +14,13 @@
 
     <style name="ThemeFoundation.Colored.ExtraProps" />
 
-    <style name="MagiskTheme" parent="ThemeFoundation.Colored.ExtraProps" />
+    <style name="MagiskTheme" parent="ThemeFoundation.Colored.ExtraProps">
+        <!--All of these attributes are deprecated and will be removed-->
+        <item name="cardStyle">@style/CardViewStyle.Light</item>
+        <item name="imageColorTint">@color/icon_grey</item>
+        <item name="colorControl">?android:attr/textColorSecondary</item>
+        <item name="colorAccentFallback">@color/accentFallback</item>
+    </style>
 
     <style name="MagiskTheme.Flashing" parent="Theme.MaterialComponents.NoActionBar">
         <item name="colorPrimary">@android:color/black</item>