MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup homescreen

Browse Source
This commit is contained in:
topjohnwu 2020-09-08 23:40:44 -07:00
parent 8aac373ca3
commit 5022f00a55
3 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
View File

@ -33,7 +33,7 @@ class HomeFragment : BaseUIFragment<HomeViewModel, FragmentHomeMd2Binding>() {
binding.homeMagiskWrapper.homeMagiskTitleBarrier.referencedIds = binding.homeMagiskWrapper.homeMagiskTitleBarrier.referencedIds =
intArrayOf(R.id.home_magisk_action, R.id.home_magisk_title, R.id.home_magisk_icon) intArrayOf(R.id.home_magisk_action, R.id.home_magisk_title, R.id.home_magisk_icon)
binding.homeMagiskWrapper.homeMagiskBarrier.referencedIds = 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 = binding.homeManagerWrapper.homeManagerTitleBarrier.referencedIds =
intArrayOf(R.id.home_manager_action, R.id.home_manager_title, R.id.home_manager_icon) intArrayOf(R.id.home_manager_action, R.id.home_manager_title, R.id.home_manager_icon)

24
app/src/main/res/layout/include_home_magisk.xml
View File

@ -26,7 +26,7 @@
android:paddingTop="@dimen/l_50" android:paddingTop="@dimen/l_50"
android:paddingStart="@dimen/l1" android:paddingStart="@dimen/l1"
android:paddingEnd="@dimen/l1" android:paddingEnd="@dimen/l1"
android:paddingBottom="@dimen/l1" android:paddingBottom="@dimen/l_50"
tools:layout_gravity="center"> tools:layout_gravity="center">
<ImageView <ImageView
@ -92,7 +92,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fadingEdgeLength="@dimen/l1" android:fadingEdgeLength="@dimen/l1"
android:paddingTop="@dimen/l_50"
android:requiresFadingEdge="horizontal" android:requiresFadingEdge="horizontal"
android:scrollbars="none" android:scrollbars="none"
app:layout_constraintTop_toBottomOf="@+id/home_magisk_title_barrier"> app:layout_constraintTop_toBottomOf="@+id/home_magisk_title_barrier">
@ -125,7 +124,7 @@
<LinearLayout <LinearLayout
android:id="@+id/home_magisk_installed_version" 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_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_magisk_latest_version"> app:layout_constraintTop_toBottomOf="@+id/home_magisk_latest_version">
@ -140,29 +139,12 @@
</LinearLayout> </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 <androidx.constraintlayout.widget.Barrier
android:id="@+id/home_magisk_barrier" android:id="@+id/home_magisk_barrier"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:barrierDirection="end" 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 <LinearLayout
android:id="@+id/home_device_details_ab" android:id="@+id/home_device_details_ab"

24
app/src/main/res/layout/include_home_manager.xml
View File

@ -7,8 +7,6 @@
<import type="com.topjohnwu.magisk.core.Info" /> <import type="com.topjohnwu.magisk.core.Info" />
<import type="com.topjohnwu.magisk.core.InfoKt" />
<import type="com.topjohnwu.magisk.ui.home.MagiskState" /> <import type="com.topjohnwu.magisk.ui.home.MagiskState" />
<variable <variable
@ -28,7 +26,7 @@
android:paddingTop="@dimen/l_50" android:paddingTop="@dimen/l_50"
android:paddingStart="@dimen/l1" android:paddingStart="@dimen/l1"
android:paddingEnd="@dimen/l1" android:paddingEnd="@dimen/l1"
android:paddingBottom="@dimen/l1" android:paddingBottom="@dimen/l_50"
tools:layout_gravity="center"> tools:layout_gravity="center">
<ImageView <ImageView
@ -95,7 +93,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fadingEdgeLength="@dimen/l1" android:fadingEdgeLength="@dimen/l1"
android:paddingTop="@dimen/l_50"
android:requiresFadingEdge="horizontal" android:requiresFadingEdge="horizontal"
android:scrollbars="none" android:scrollbars="none"
app:layout_constraintTop_toBottomOf="@+id/home_manager_title_barrier"> app:layout_constraintTop_toBottomOf="@+id/home_manager_title_barrier">
@ -143,28 +140,11 @@
</LinearLayout> </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 <LinearLayout
android:id="@+id/home_manager_internal_connection" android:id="@+id/home_manager_internal_connection"
style="@style/W.Home.Item.Bottom" style="@style/W.Home.Item.Bottom"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_manager_internal_mode"> app:layout_constraintTop_toBottomOf="@+id/home_manager_installed_version">
<TextView <TextView
style="@style/W.Home.ItemContent" style="@style/W.Home.ItemContent"