TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-25 21:07:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update home screen layout (yet again)

Browse Source
This commit is contained in:
topjohnwu 2020-02-11 19:46:29 -08:00
parent e5ea3e4a43
commit ffa85a616a
4 changed files with 512 additions and 579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/res/layout/fragment_home_md2.xml
View File

@ -40,7 +40,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView <TextView
android:id="@+id/home_notice_content" android:id="@+id/home_notice_content"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -73,6 +73,8 @@
viewModel="@{viewModel}" viewModel="@{viewModel}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/l1"
android:layout_marginEnd="@dimen/l1"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<include <include
@ -81,7 +83,9 @@
viewModel="@{viewModel}" viewModel="@{viewModel}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/l_50" android:layout_marginStart="@dimen/l1"
android:layout_marginEnd="@dimen/l1"
android:layout_marginTop="@dimen/l1"
app:layout_constraintTop_toBottomOf="@+id/home_device_wrapper" /> app:layout_constraintTop_toBottomOf="@+id/home_device_wrapper" />
<include <include
@ -90,7 +94,9 @@
viewModel="@{viewModel}" viewModel="@{viewModel}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/l_50" android:layout_marginStart="@dimen/l1"
android:layout_marginEnd="@dimen/l1"
android:layout_marginTop="@dimen/l1"
app:layout_constraintTop_toBottomOf="@+id/home_magisk_wrapper" /> app:layout_constraintTop_toBottomOf="@+id/home_magisk_wrapper" />
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
@ -106,7 +112,7 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="@dimen/l1"> android:paddingTop="@dimen/l1">
<androidx.appcompat.widget.AppCompatTextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/l1" android:layout_marginStart="@dimen/l1"
@ -114,7 +120,7 @@
android:text="@string/home_support_title" android:text="@string/home_support_title"
android:textAppearance="@style/AppearanceFoundation.Title" /> android:textAppearance="@style/AppearanceFoundation.Title" />
<androidx.appcompat.widget.AppCompatTextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/l1" android:layout_marginStart="@dimen/l1"
@ -132,7 +138,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/l1" android:layout_marginTop="@dimen/l1"
android:clipToPadding="false" android:clipToPadding="false"
android:nestedScrollingEnabled="@{false}" android:nestedScrollingEnabled="false"
android:orientation="horizontal" android:orientation="horizontal"
android:overScrollMode="ifContentScrolls" android:overScrollMode="ifContentScrolls"
android:paddingStart="@dimen/l1" android:paddingStart="@dimen/l1"

71
app/src/main/res/layout/include_home_device.xml
View File

@ -21,21 +21,29 @@
</data> </data>
<com.google.android.material.card.MaterialCardView
style="@style/WidgetFoundation.Card"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/l_50"
android:paddingStart="@dimen/l1"
android:paddingEnd="@dimen/l1"
android:paddingBottom="@dimen/l1"
tools:layout_gravity="center"> tools:layout_gravity="center">
<androidx.appcompat.widget.AppCompatImageView <ImageView
android:id="@+id/home_device_icon" android:id="@+id/home_device_icon"
style="@style/WidgetFoundation.Icon.Primary" style="@style/WidgetFoundation.Icon.Primary"
android:layout_marginStart="@dimen/l1"
android:padding="@dimen/l_50" android:padding="@dimen/l_50"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_device" /> app:srcCompat="@drawable/ic_device" />
<androidx.appcompat.widget.AppCompatTextView <TextView
android:id="@+id/home_device_title" android:id="@+id/home_device_title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -46,7 +54,7 @@
app:layout_constraintBottom_toBottomOf="@+id/home_device_icon" app:layout_constraintBottom_toBottomOf="@+id/home_device_icon"
app:layout_constraintEnd_toStartOf="@+id/home_device_action_reboot" app:layout_constraintEnd_toStartOf="@+id/home_device_action_reboot"
app:layout_constraintStart_toEndOf="@+id/home_device_icon" app:layout_constraintStart_toEndOf="@+id/home_device_icon"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="@+id/home_device_icon" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/home_device_action_reboot" android:id="@+id/home_device_action_reboot"
@ -56,7 +64,6 @@
popupMenuOnClickListener="@{RebootEvent::reboot}" popupMenuOnClickListener="@{RebootEvent::reboot}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/l_50"
android:text="@string/reboot" android:text="@string/reboot"
android:textAllCaps="false" android:textAllCaps="false"
app:icon="@drawable/ic_restart" app:icon="@drawable/ic_restart"
@ -75,9 +82,7 @@
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:paddingStart="@dimen/l1"
android:paddingTop="@dimen/l_50" android:paddingTop="@dimen/l_50"
android:paddingEnd="@dimen/l1"
android:requiresFadingEdge="horizontal" android:requiresFadingEdge="horizontal"
android:scrollbars="none" android:scrollbars="none"
app:layout_constraintTop_toBottomOf="@+id/home_device_title_barrier"> app:layout_constraintTop_toBottomOf="@+id/home_device_title_barrier">
@ -96,31 +101,24 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/home_device_info_title"
style="@style/W.Home.Title"
android:text="@string/info"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View <View
style="@style/W.Home.Section" style="@style/W.Home.Section"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_device_info_title" /> app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <LinearLayout
android:id="@+id/home_device_info_manufacturer" android:id="@+id/home_device_info_manufacturer"
style="@style/W.Home.Item.Top" style="@style/W.Home.Item.Top"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_device_info_title"> app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent" style="@style/W.Home.ItemContent"
android:text="@string/home_device_extra_manufacturer" /> android:text="@string/home_device_extra_manufacturer" />
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent.Right" style="@style/W.Home.ItemContent.Right"
android:text="@{Build.MANUFACTURER}" android:text="@{Build.MANUFACTURER}"
tools:text="Google" /> tools:text="Google" />
@ -133,11 +131,11 @@
app:layout_constraintStart_toStartOf="@+id/home_device_info_manufacturer" app:layout_constraintStart_toStartOf="@+id/home_device_info_manufacturer"
app:layout_constraintTop_toBottomOf="@+id/home_device_info_manufacturer"> app:layout_constraintTop_toBottomOf="@+id/home_device_info_manufacturer">
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent" style="@style/W.Home.ItemContent"
android:text="@string/home_device_extra_model" /> android:text="@string/home_device_extra_model" />
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent.Right" style="@style/W.Home.ItemContent.Right"
android:text="@{Build.DEVICE ?? Build.PRODUCT}" android:text="@{Build.DEVICE ?? Build.PRODUCT}"
tools:text="Pixel 4" /> tools:text="Pixel 4" />
@ -150,11 +148,11 @@
app:layout_constraintStart_toStartOf="@+id/home_device_info_product" app:layout_constraintStart_toStartOf="@+id/home_device_info_product"
app:layout_constraintTop_toBottomOf="@+id/home_device_info_product"> app:layout_constraintTop_toBottomOf="@+id/home_device_info_product">
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent" style="@style/W.Home.ItemContent"
android:text="@string/home_device_extra_board" /> android:text="@string/home_device_extra_board" />
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent.Right" style="@style/W.Home.ItemContent.Right"
android:text="@{Build.BOARD}" android:text="@{Build.BOARD}"
tools:text="flame" /> tools:text="flame" />
@ -167,11 +165,11 @@
app:layout_constraintStart_toStartOf="@+id/home_device_info_board" app:layout_constraintStart_toStartOf="@+id/home_device_info_board"
app:layout_constraintTop_toBottomOf="@+id/home_device_info_board"> app:layout_constraintTop_toBottomOf="@+id/home_device_info_board">
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent" style="@style/W.Home.ItemContent"
android:text="@string/home_device_system" /> android:text="@string/home_device_system" />
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent.Right" style="@style/W.Home.ItemContent.Right"
android:text="@{Build.VERSION.RELEASE}" android:text="@{Build.VERSION.RELEASE}"
tools:text="10" /> tools:text="10" />
@ -191,31 +189,24 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/home_device_details_title"
style="@style/W.Home.Title"
android:text="@string/details"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View <View
style="@style/W.Home.Section" style="@style/W.Home.Section"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_device_details_title" /> app:layout_constraintTop_toTopOf="parent"/>
<LinearLayout <LinearLayout
android:id="@+id/home_device_details_ab" android:id="@+id/home_device_details_ab"
style="@style/W.Home.Item.Top" style="@style/W.Home.Item.Top"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_device_details_title"> app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent" style="@style/W.Home.ItemContent"
android:text="A/B" /> android:text="A/B" />
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent.Right" style="@style/W.Home.ItemContent.Right"
android:text="@{Info.isAB ? @string/yes : @string/no}" android:text="@{Info.isAB ? @string/yes : @string/no}"
tools:text="Yes" /> tools:text="Yes" />
@ -228,11 +219,11 @@
app:layout_constraintStart_toStartOf="@+id/home_device_details_ab" app:layout_constraintStart_toStartOf="@+id/home_device_details_ab"
app:layout_constraintTop_toBottomOf="@+id/home_device_details_ab"> app:layout_constraintTop_toBottomOf="@+id/home_device_details_ab">
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent" style="@style/W.Home.ItemContent"
android:text="SAR" /> android:text="SAR" />
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent.Right" style="@style/W.Home.ItemContent.Right"
android:text="@{Info.isSAR ? @string/yes : @string/no}" android:text="@{Info.isSAR ? @string/yes : @string/no}"
tools:text="Yes" /> tools:text="Yes" />
@ -245,11 +236,11 @@
app:layout_constraintStart_toStartOf="@+id/home_device_details_sar" app:layout_constraintStart_toStartOf="@+id/home_device_details_sar"
app:layout_constraintTop_toBottomOf="@+id/home_device_details_sar"> app:layout_constraintTop_toBottomOf="@+id/home_device_details_sar">
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent" style="@style/W.Home.ItemContent"
android:text="Ramdisk" /> android:text="Ramdisk" />
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent.Right" style="@style/W.Home.ItemContent.Right"
android:text="@{Info.ramdisk ? @string/yes : @string/no }" android:text="@{Info.ramdisk ? @string/yes : @string/no }"
tools:text="Yes" /> tools:text="Yes" />
@ -266,4 +257,6 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</layout> </layout>

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

@ -17,21 +17,29 @@
</data> </data>
<com.google.android.material.card.MaterialCardView
style="@style/WidgetFoundation.Card"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/l_50"
android:paddingStart="@dimen/l1"
android:paddingEnd="@dimen/l1"
android:paddingBottom="@dimen/l1"
tools:layout_gravity="center"> tools:layout_gravity="center">
<androidx.appcompat.widget.AppCompatImageView <ImageView
android:id="@+id/home_magisk_icon" android:id="@+id/home_magisk_icon"
style="@style/WidgetFoundation.Icon.Primary" style="@style/WidgetFoundation.Icon.Primary"
android:layout_marginStart="@dimen/l1"
android:padding="@dimen/l_25" android:padding="@dimen/l_25"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_magisk" /> app:srcCompat="@drawable/ic_magisk_outline" />
<androidx.appcompat.widget.AppCompatTextView <TextView
android:id="@+id/home_magisk_title" android:id="@+id/home_magisk_title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -40,10 +48,21 @@
android:textAppearance="@style/AppearanceFoundation.Title" android:textAppearance="@style/AppearanceFoundation.Title"
android:textColor="?colorPrimary" android:textColor="?colorPrimary"
app:layout_constraintBottom_toBottomOf="@+id/home_magisk_icon" app:layout_constraintBottom_toBottomOf="@+id/home_magisk_icon"
app:layout_constraintEnd_toStartOf="@+id/home_magisk_action" app:layout_constraintEnd_toStartOf="@+id/home_magisk_uninstall"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/home_magisk_icon" app:layout_constraintStart_toEndOf="@+id/home_magisk_icon"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="@+id/home_magisk_icon" />
<ImageView
android:id="@+id/home_magisk_uninstall"
style="@style/WidgetFoundation.Icon.Error"
android:background="?attr/selectableItemBackground"
android:clickable="true"
gone="@{Info.env.magiskVersionCode &lt; 0 || viewModel.stateMagisk == MagiskState.LOADING || !viewModel.isConnected}"
android:onClick="@{() -> viewModel.onDeletePressed()}"
app:layout_constraintBottom_toBottomOf="@+id/home_magisk_title"
app:layout_constraintEnd_toStartOf="@+id/home_magisk_action"
app:layout_constraintTop_toTopOf="@+id/home_magisk_title"
app:srcCompat="@drawable/ic_delete_md2" />
<FrameLayout <FrameLayout
android:id="@+id/home_magisk_action" android:id="@+id/home_magisk_action"
@ -60,7 +79,6 @@
isEnabled="@{viewModel.stateManager == MagiskState.UP_TO_DATE &amp;&amp; (viewModel.stateMagiskProgress == 0 || viewModel.stateMagiskProgress == 100)}" isEnabled="@{viewModel.stateManager == MagiskState.UP_TO_DATE &amp;&amp; (viewModel.stateMagiskProgress == 0 || viewModel.stateMagiskProgress == 100)}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/l_50"
android:onClick="@{() -> viewModel.onMagiskPressed()}" android:onClick="@{() -> viewModel.onMagiskPressed()}"
android:text="@string/update" android:text="@string/update"
android:textAllCaps="false" android:textAllCaps="false"
@ -72,7 +90,6 @@
isEnabled="@{viewModel.stateManager == MagiskState.UP_TO_DATE &amp;&amp; (viewModel.stateMagiskProgress == 0 || viewModel.stateMagiskProgress == 100)}" isEnabled="@{viewModel.stateManager == MagiskState.UP_TO_DATE &amp;&amp; (viewModel.stateMagiskProgress == 0 || viewModel.stateMagiskProgress == 100)}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/l_50"
android:onClick="@{() -> viewModel.onMagiskPressed()}" android:onClick="@{() -> viewModel.onMagiskPressed()}"
android:text="@string/install" android:text="@string/install"
android:textAllCaps="false" android:textAllCaps="false"
@ -91,9 +108,7 @@
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:paddingStart="@dimen/l1"
android:paddingTop="@dimen/l_50" android:paddingTop="@dimen/l_50"
android:paddingEnd="@dimen/l1"
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">
@ -112,31 +127,24 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/home_magisk_info_title"
style="@style/W.Home.Title"
android:text="@string/info"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View <View
style="@style/W.Home.Section" style="@style/W.Home.Section"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/home_magisk_info_title" /> app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <LinearLayout
android:id="@+id/home_magisk_latest_version" android:id="@+id/home_magisk_latest_version"
style="@style/W.Home.Item.Top" style="@style/W.Home.Item.Top"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/home_magisk_info_title" > app:layout_constraintTop_toTopOf="parent" >
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent" style="@style/W.Home.ItemContent"
android:text="@string/module_section_remote" /> android:text="@string/module_section_remote" />
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent.Right" style="@style/W.Home.ItemContent.Right"
android:text="@{viewModel.isConnected ? viewModel.stateMagiskRemoteVersion : @string/not_available}" android:text="@{viewModel.isConnected ? viewModel.stateMagiskRemoteVersion : @string/not_available}"
tools:text="20.1 (12345)" /> tools:text="20.1 (12345)" />
@ -149,11 +157,11 @@
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">
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent" style="@style/W.Home.ItemContent"
android:text="@string/installed" /> android:text="@string/installed" />
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent.Right" style="@style/W.Home.ItemContent.Right"
android:text="@{Info.env.isActive ? viewModel.stateMagiskInstalledVersion : @string/not_available}" android:text="@{Info.env.isActive ? viewModel.stateMagiskInstalledVersion : @string/not_available}"
tools:text="20.1 (12345)" /> tools:text="20.1 (12345)" />
@ -166,11 +174,11 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_magisk_installed_version"> app:layout_constraintTop_toBottomOf="@+id/home_magisk_installed_version">
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent" style="@style/W.Home.ItemContent"
android:text="@string/status" /> android:text="@string/status" />
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent.Right" style="@style/W.Home.ItemContent.Right"
android:text="@{Info.env.isActive ? viewModel.stateMagiskMode : @string/not_available}" android:text="@{Info.env.isActive ? viewModel.stateMagiskMode : @string/not_available}"
tools:text="Normal" /> tools:text="Normal" />
@ -189,58 +197,12 @@
</com.google.android.material.card.MaterialCardView> </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="match_parent"
android:clickable="true"
android:onClick="@{() -> viewModel.onDeletePressed()}">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<View
android:id="@+id/view"
style="@style/W.Home.Section"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_magisk_delete" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/home_magisk_delete"
style="@style/W.Home.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/uninstall"
android:textColor="?colorError"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
style="@style/WidgetFoundation.Icon.Error"
android:background="@null"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_magisk_delete"
app:srcCompat="@drawable/ic_delete_md2" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout> </LinearLayout>
</HorizontalScrollView> </HorizontalScrollView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</layout> </layout>

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

@ -17,21 +17,29 @@
</data> </data>
<com.google.android.material.card.MaterialCardView
style="@style/WidgetFoundation.Card"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/l_50"
android:paddingStart="@dimen/l1"
android:paddingEnd="@dimen/l1"
android:paddingBottom="@dimen/l1"
tools:layout_gravity="center"> tools:layout_gravity="center">
<androidx.appcompat.widget.AppCompatImageView <ImageView
android:id="@+id/home_manager_icon" android:id="@+id/home_manager_icon"
style="@style/WidgetFoundation.Icon.Primary" style="@style/WidgetFoundation.Icon.Primary"
android:layout_marginStart="@dimen/l1"
android:padding="@dimen/l_50" android:padding="@dimen/l_50"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_manager" /> app:srcCompat="@drawable/ic_manager" />
<androidx.appcompat.widget.AppCompatTextView <TextView
android:id="@+id/home_manager_title" android:id="@+id/home_manager_title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -59,7 +67,6 @@
gone="@{viewModel.stateManager != MagiskState.OBSOLETE}" gone="@{viewModel.stateManager != MagiskState.OBSOLETE}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/l_50"
android:onClick="@{() -> viewModel.onManagerPressed()}" android:onClick="@{() -> viewModel.onManagerPressed()}"
android:text="@string/update" android:text="@string/update"
android:textAllCaps="false" android:textAllCaps="false"
@ -70,7 +77,6 @@
gone="@{viewModel.stateManager == MagiskState.OBSOLETE}" gone="@{viewModel.stateManager == MagiskState.OBSOLETE}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/l_50"
android:onClick="@{() -> viewModel.onManagerPressed()}" android:onClick="@{() -> viewModel.onManagerPressed()}"
android:text="@string/install" android:text="@string/install"
android:textAllCaps="false" android:textAllCaps="false"
@ -89,9 +95,7 @@
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:paddingStart="@dimen/l1"
android:paddingTop="@dimen/l_50" android:paddingTop="@dimen/l_50"
android:paddingEnd="@dimen/l1"
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">
@ -110,31 +114,24 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/home_manager_info_title"
style="@style/W.Home.Title"
android:text="@string/info"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View <View
style="@style/W.Home.Section" style="@style/W.Home.Section"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_manager_info_title" /> app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <LinearLayout
android:id="@+id/home_manager_latest_version" android:id="@+id/home_manager_latest_version"
style="@style/W.Home.Item.Top" style="@style/W.Home.Item.Top"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_manager_info_title"> app:layout_constraintTop_toTopOf="parent" >
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent" style="@style/W.Home.ItemContent"
android:text="@string/module_section_remote" /> android:text="@string/module_section_remote" />
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent.Right" style="@style/W.Home.ItemContent.Right"
android:text="@{viewModel.isConnected ? viewModel.stateManagerRemoteVersion : @string/not_available}" android:text="@{viewModel.isConnected ? viewModel.stateManagerRemoteVersion : @string/not_available}"
tools:text="8.0.0 (123) (10)" /> tools:text="8.0.0 (123) (10)" />
@ -143,21 +140,56 @@
<LinearLayout <LinearLayout
android:id="@+id/home_manager_installed_version" android:id="@+id/home_manager_installed_version"
style="@style/W.Home.Item.Bottom" style="@style/W.Home.Item"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_manager_latest_version"> app:layout_constraintTop_toBottomOf="@+id/home_manager_latest_version">
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent" style="@style/W.Home.ItemContent"
android:text="@string/installed" /> android:text="@string/installed" />
<androidx.appcompat.widget.AppCompatTextView <TextView
style="@style/W.Home.ItemContent.Right" style="@style/W.Home.ItemContent.Right"
android:text="@{viewModel.stateManagerInstalledVersion}" android:text="@{viewModel.stateManagerInstalledVersion}"
tools:text="8.0.0 (123) (10)" /> tools:text="8.0.0 (123) (10)" />
</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
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">
<TextView
style="@style/W.Home.ItemContent"
android:text="@string/home_package" />
<TextView
android:id="@+id/home_manager_extra_connection_value"
style="@style/W.Home.ItemContent.Right"
android:text="@{viewModel.statePackageName}"
tools:text="com.topjohnwu.magisk" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<ProgressBar <ProgressBar
@ -170,72 +202,12 @@
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
style="@style/W.Home.Card"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/home_manager_details_title"
style="@style/W.Home.Title"
android:text="@string/details"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
style="@style/W.Home.Section"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_manager_details_title" />
<LinearLayout
android:id="@+id/home_manager_internal_mode"
style="@style/W.Home.Item.Top"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_manager_details_title">
<androidx.appcompat.widget.AppCompatTextView
style="@style/W.Home.ItemContent"
android:text="@string/status" />
<androidx.appcompat.widget.AppCompatTextView
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">
<androidx.appcompat.widget.AppCompatTextView
style="@style/W.Home.ItemContent"
android:text="@string/home_package" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/home_manager_extra_connection_value"
style="@style/W.Home.ItemContent.Right"
android:text="@{viewModel.statePackageName}"
tools:text="com.topjohnwu.magisk" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout> </LinearLayout>
</HorizontalScrollView> </HorizontalScrollView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</layout> </layout>