br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Update home fragment

Browse Source
This commit is contained in:
topjohnwu
2021-01-24 00:02:49 -08:00
parent 5113f6d375
commit 658d74e026
7 changed files with 53 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/fragment_home_md2.xml
+2 -2
View File
@@ -108,7 +108,7 @@
app:layout_constraintTop_toBottomOf="@+id/home_magisk_wrapper" />
<Space
gone="@{!viewModel.showSafetyNet &amp;&amp; !viewModel.showUninstall}"
gone="@{!viewModel.showSafetyNet &amp;&amp; !Info.env.isActive}"
android:layout_width="match_parent"
android:layout_height="@dimen/l1" />
@@ -128,7 +128,7 @@
<Button
style="@style/WidgetFoundation.Button.Outlined.Error"
gone="@{!viewModel.showUninstall}"
goneUnless="@{Info.env.isActive}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/l1"
app/src/main/res/layout/include_home_magisk.xml
+6 -42
View File
@@ -55,7 +55,6 @@
android:id="@+id/home_magisk_button"
style="@style/WidgetFoundation.Button"
invisible="@{viewModel.stateMagisk != MagiskState.OBSOLETE}"
android:enabled="@{viewModel.stateManager != MagiskState.OBSOLETE}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="@{() -> viewModel.onMagiskPressed()}"
@@ -69,7 +68,6 @@
<Button
style="@style/WidgetFoundation.Button.Text"
invisible="@{viewModel.stateMagisk == MagiskState.OBSOLETE}"
android:enabled="@{viewModel.stateManager != MagiskState.OBSOLETE}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="@{() -> viewModel.onMagiskPressed()}"
@@ -105,41 +103,24 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/home_magisk_latest_version"
android:id="@+id/home_magisk_installed_version"
style="@style/W.Home.Item.Top"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
style="@style/W.Home.ItemContent"
android:text="@string/home_latest_version" />
<TextView
style="@style/W.Home.ItemContent.Right"
android:text="@{viewModel.loadFailed ? @string/not_available : viewModel.magiskRemoteVersion }"
tools:text="20.1 (12345)" />
</LinearLayout>
<LinearLayout
android:id="@+id/home_magisk_installed_version"
style="@style/W.Home.Item"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_magisk_latest_version">
<TextView
style="@style/W.Home.ItemContent"
android:text="@string/home_installed_version" />
<TextView
style="@style/W.Home.ItemContent.Right"
android:text="@{Info.env.isActive ? viewModel.magiskInstalledVersion : @string/not_available}"
tools:text="20.1 (12345)" />
android:text="@{viewModel.magiskInstalledVersion}"
tools:text="22.0 (22000)" />
</LinearLayout>
<LinearLayout
android:id="@+id/home_device_details_recovery"
android:id="@+id/home_device_details_ramdisk"
style="@style/W.Home.Item.Bottom"
app:layout_constraintStart_toStartOf="@+id/home_magisk_installed_version"
app:layout_constraintTop_toBottomOf="@+id/home_magisk_installed_version">
@@ -160,7 +141,7 @@
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"/>
tools:constraint_referenced_ids="home_magisk_installed_version,home_device_details_ramdisk"/>
<LinearLayout
android:id="@+id/home_device_details_ab"
@@ -181,7 +162,7 @@
<LinearLayout
android:id="@+id/home_device_details_sar"
style="@style/W.Home.Item"
style="@style/W.Home.Item.Bottom"
app:layout_constraintStart_toStartOf="@+id/home_device_details_ab"
app:layout_constraintTop_toBottomOf="@+id/home_device_details_ab">
@@ -196,23 +177,6 @@
</LinearLayout>
<LinearLayout
android:id="@+id/home_device_details_crypto"
style="@style/W.Home.Item.Bottom"
app:layout_constraintStart_toStartOf="@+id/home_device_details_sar"
app:layout_constraintTop_toBottomOf="@+id/home_device_details_sar">
<TextView
style="@style/W.Home.ItemContent"
android:text="Crypto" />
<TextView
style="@style/W.Home.ItemContent.Right"
android:text="@{Info.cryptoText}"
tools:text="N/A" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
app/src/main/res/layout/include_home_manager.xml
+4 -4
View File
@@ -115,8 +115,8 @@
<TextView
style="@style/W.Home.ItemContent.Right"
android:text="@{viewModel.loadFailed ? @string/not_available : viewModel.managerRemoteVersion}"
tools:text="8.0.0 (123) (10)" />
android:text="@{viewModel.managerRemoteVersion}"
tools:text="22.0 (22000) (16)" />
</LinearLayout>
@@ -133,7 +133,7 @@
<TextView
style="@style/W.Home.ItemContent.Right"
android:text="@{viewModel.managerInstalledVersion}"
tools:text="8.0.0 (123) (10)" />
tools:text="22.0 (22000) (16)" />
</LinearLayout>
@@ -150,7 +150,7 @@
<TextView
android:id="@+id/home_manager_extra_connection_value"
style="@style/W.Home.ItemContent.Right"
android:text="@{viewModel.statePackageName}"
android:text="@{context.packageName}"
tools:text="com.topjohnwu.magisk" />
</LinearLayout>