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

Added logic to redesigned home

Browse Source 
(partially)
This commit is contained in:
Viktor De Pasquale
2019-10-04 19:36:26 +02:00
parent 277d8773f2
commit 6afcc83955
4 changed files with 73 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/color/color_primary_delete_transient.xml
+1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorError" android:state_selected="true" />
<item android:color="?colorDisabled" android:state_enabled="false" />
<item android:color="?colorPrimary" />
</selector>
app/src/main/res/layout/fragment_home_md2.xml
+11
View File
@@ -5,6 +5,8 @@
<data>
<import type="com.topjohnwu.magisk.ui.home.MagiskState" />
<variable
name="viewModel"
type="com.topjohnwu.magisk.redesign.home.HomeViewModel" />
@@ -32,6 +34,7 @@
android:id="@+id/home_magisk_wrapper"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
app:layout_constraintEnd_toStartOf="@+id/home_manager_wrapper"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -39,6 +42,7 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/home_magisk_icon"
style="?styleIconPrimary"
isEnabled="@{viewModel.stateMagisk != MagiskState.LOADING}"
onSelectClick="@{() -> viewModel.onDeletePressed()}"
onSelectReset="@{10000L}"
android:padding="@dimen/l_25"
@@ -71,15 +75,18 @@
app:layout_constraintTop_toBottomOf="@+id/home_magisk_title" />
<FrameLayout
gone="@{viewModel.stateMagisk == MagiskState.LOADING}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/l1"
android:animateLayoutChanges="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_magisk_status">
<com.google.android.material.button.MaterialButton
style="?styleButtonDefault"
gone="@{viewModel.stateMagisk != MagiskState.OBSOLETE}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/update"
@@ -91,6 +98,7 @@
<com.google.android.material.button.MaterialButton
style="?styleButtonText"
gone="@{viewModel.stateMagisk == MagiskState.OBSOLETE}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/install"
@@ -147,6 +155,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/l1"
gone="@{viewModel.stateManager == MagiskState.LOADING}"
app:layout_constraintTop_toBottomOf="@+id/home_manager_status">
<com.google.android.material.button.MaterialButton
@@ -154,6 +163,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/update"
gone="@{viewModel.stateManager != MagiskState.OBSOLETE}"
app:icon="@drawable/ic_update_md2"
app:iconGravity="textEnd"
app:iconPadding="@dimen/l_50"
@@ -164,6 +174,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/install"
gone="@{viewModel.stateManager == MagiskState.OBSOLETE}"
app:icon="@drawable/ic_install"
app:iconGravity="textEnd"
app:iconPadding="@dimen/l_50"