From 5022f00a55c5b051ef58df33f32c1abdb8869f34 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Tue, 8 Sep 2020 23:40:44 -0700
Subject: [PATCH] Cleanup homescreen

---
 .../topjohnwu/magisk/ui/home/HomeFragment.kt  |  2 +-
 .../main/res/layout/include_home_magisk.xml   | 24 +++----------------
 .../main/res/layout/include_home_manager.xml  | 24 ++-----------------
 3 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
index 00a2dc235..958863b15 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
@@ -33,7 +33,7 @@ class HomeFragment : BaseUIFragment<HomeViewModel, FragmentHomeMd2Binding>() {
         binding.homeMagiskWrapper.homeMagiskTitleBarrier.referencedIds =
             intArrayOf(R.id.home_magisk_action, R.id.home_magisk_title, R.id.home_magisk_icon)
         binding.homeMagiskWrapper.homeMagiskBarrier.referencedIds =
-            intArrayOf(R.id.home_magisk_latest_version, R.id.home_magisk_installed_version, R.id.home_magisk_mode)
+            intArrayOf(R.id.home_magisk_latest_version, R.id.home_magisk_installed_version)
         binding.homeManagerWrapper.homeManagerTitleBarrier.referencedIds =
             intArrayOf(R.id.home_manager_action, R.id.home_manager_title, R.id.home_manager_icon)
 
diff --git a/app/src/main/res/layout/include_home_magisk.xml b/app/src/main/res/layout/include_home_magisk.xml
index 2059316b3..5b71ea5ad 100644
--- a/app/src/main/res/layout/include_home_magisk.xml
+++ b/app/src/main/res/layout/include_home_magisk.xml
@@ -26,7 +26,7 @@
             android:paddingTop="@dimen/l_50"
             android:paddingStart="@dimen/l1"
             android:paddingEnd="@dimen/l1"
-            android:paddingBottom="@dimen/l1"
+            android:paddingBottom="@dimen/l_50"
             tools:layout_gravity="center">
 
             <ImageView
@@ -92,7 +92,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fadingEdgeLength="@dimen/l1"
-                android:paddingTop="@dimen/l_50"
                 android:requiresFadingEdge="horizontal"
                 android:scrollbars="none"
                 app:layout_constraintTop_toBottomOf="@+id/home_magisk_title_barrier">
@@ -125,7 +124,7 @@
 
                         <LinearLayout
                             android:id="@+id/home_magisk_installed_version"
-                            style="@style/W.Home.Item"
+                            style="@style/W.Home.Item.Bottom"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/home_magisk_latest_version">
 
@@ -140,29 +139,12 @@
 
                         </LinearLayout>
 
-                        <LinearLayout
-                            android:id="@+id/home_magisk_mode"
-                            style="@style/W.Home.Item.Bottom"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/home_magisk_installed_version">
-
-                            <TextView
-                                style="@style/W.Home.ItemContent"
-                                android:text="@string/status" />
-
-                            <TextView
-                                style="@style/W.Home.ItemContent.Right"
-                                android:text="@{Info.env.isActive ? @string/home_status_normal : @string/not_available}"
-                                tools:text="Normal" />
-
-                        </LinearLayout>
-
                         <androidx.constraintlayout.widget.Barrier
                             android:id="@+id/home_magisk_barrier"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             app:barrierDirection="end"
-                            tools:constraint_referenced_ids="home_magisk_latest_version,home_magisk_installed_version,home_magisk_mode"/>
+                            tools:constraint_referenced_ids="home_magisk_latest_version,home_magisk_installed_version"/>
 
                         <LinearLayout
                             android:id="@+id/home_device_details_ab"
diff --git a/app/src/main/res/layout/include_home_manager.xml b/app/src/main/res/layout/include_home_manager.xml
index db2ec4a99..31d342959 100644
--- a/app/src/main/res/layout/include_home_manager.xml
+++ b/app/src/main/res/layout/include_home_manager.xml
@@ -7,8 +7,6 @@
 
         <import type="com.topjohnwu.magisk.core.Info" />
 
-        <import type="com.topjohnwu.magisk.core.InfoKt" />
-
         <import type="com.topjohnwu.magisk.ui.home.MagiskState" />
 
         <variable
@@ -28,7 +26,7 @@
             android:paddingTop="@dimen/l_50"
             android:paddingStart="@dimen/l1"
             android:paddingEnd="@dimen/l1"
-            android:paddingBottom="@dimen/l1"
+            android:paddingBottom="@dimen/l_50"
             tools:layout_gravity="center">
 
             <ImageView
@@ -95,7 +93,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fadingEdgeLength="@dimen/l1"
-                android:paddingTop="@dimen/l_50"
                 android:requiresFadingEdge="horizontal"
                 android:scrollbars="none"
                 app:layout_constraintTop_toBottomOf="@+id/home_manager_title_barrier">
@@ -143,28 +140,11 @@
 
                         </LinearLayout>
 
-                        <LinearLayout
-                            android:id="@+id/home_manager_internal_mode"
-                            style="@style/W.Home.Item"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/home_manager_installed_version">
-
-                            <TextView
-                                style="@style/W.Home.ItemContent"
-                                android:text="@string/status" />
-
-                            <TextView
-                                style="@style/W.Home.ItemContent.Right"
-                                android:text="@{InfoKt.isRunningAsStub ? @string/home_status_stub : @string/home_status_normal}"
-                                tools:text="Normal" />
-
-                        </LinearLayout>
-
                         <LinearLayout
                             android:id="@+id/home_manager_internal_connection"
                             style="@style/W.Home.Item.Bottom"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/home_manager_internal_mode">
+                            app:layout_constraintTop_toBottomOf="@+id/home_manager_installed_version">
 
                             <TextView
                                 style="@style/W.Home.ItemContent"