From c35d0207310d15c7cef75fc209770d314a3edc6a Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Sat, 1 Feb 2020 13:56:56 +0100
Subject: [PATCH] Added uninstall button to magisk details

---
 app/src/main/res/layout/fragment_home_md2.xml | 13 +------
 .../main/res/layout/include_home_magisk.xml   | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout/fragment_home_md2.xml b/app/src/main/res/layout/fragment_home_md2.xml
index 7baf550ab..e02dad46b 100644
--- a/app/src/main/res/layout/fragment_home_md2.xml
+++ b/app/src/main/res/layout/fragment_home_md2.xml
@@ -17,7 +17,7 @@
         android:clipToPadding="false"
         android:fillViewport="true"
         android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size}"
-        android:paddingBottom="@{viewModel.insets.bottom + (int) @dimen/l2}"
+        android:paddingBottom="@{viewModel.insets.bottom + (int) @dimen/l3}"
         tools:layout_marginTop="24dp">
 
         <LinearLayout
@@ -145,17 +145,6 @@
 
             </com.google.android.material.card.MaterialCardView>
 
-            <com.google.android.material.button.MaterialButton
-                style="@style/WidgetFoundation.Button.Error"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/l1"
-                android:layout_marginEnd="@dimen/l1"
-                android:onClick="@{() -> viewModel.onDeletePressed()}"
-                android:text="@string/uninstall"
-                android:textAllCaps="false"
-                app:icon="@drawable/ic_delete_md2" />
-
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/include_home_magisk.xml b/app/src/main/res/layout/include_home_magisk.xml
index 7dd7ce031..fbbdae119 100644
--- a/app/src/main/res/layout/include_home_magisk.xml
+++ b/app/src/main/res/layout/include_home_magisk.xml
@@ -300,6 +300,42 @@
 
                 </com.google.android.material.card.MaterialCardView>
 
+                <com.google.android.material.card.MaterialCardView
+                    style="@style/W.Home.Card"
+                    gone="@{Info.env.magiskVersionCode &lt; 0}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:clickable="true"
+                    android:onClick="@{() -> viewModel.onDeletePressed()}">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:paddingStart="@dimen/l1"
+                        android:paddingTop="@dimen/l_50"
+                        android:paddingEnd="@dimen/l1"
+                        android:paddingBottom="@dimen/l_50">
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            style="@style/WidgetFoundation.Icon.Error"
+                            android:background="@null"
+                            app:srcCompat="@drawable/ic_delete_md2" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:text="@string/uninstall"
+                            android:textAppearance="@style/AppearanceFoundation.Caption"
+                            android:textColor="?colorError"
+                            android:textStyle="bold" />
+
+                    </LinearLayout>
+
+                </com.google.android.material.card.MaterialCardView>
+
             </LinearLayout>
 
         </HorizontalScrollView>