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

Updated policy colors and internal ids

Browse Source
This commit is contained in:
Viktor De Pasquale 2019-11-01 21:10:00 +01:00
parent 8e412bee5f
commit 85f293a44e
3 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt
View File

@ -27,23 +27,6 @@ class PolicyRvItem(val item: MagiskPolicy, val icon: Drawable) : ComparableRvIte
val shouldLog = KObservableField(item.logging) val shouldLog = KObservableField(item.logging)
fun toggle() = isExpanded.toggle() fun toggle() = isExpanded.toggle()
fun toggleNotify() = shouldNotify.toggle()
fun toggleLog() = shouldLog.toggle()
fun toggleEnabled() {
if (isExpanded.value) {
return
}
isEnabled.toggle()
}
fun toggle(view: View) {
toggle()
view.rotationTo(if (isExpanded.value) 225 else 180)
(view.parent as ViewGroup)
.findViewById<View>(R.id.expand_layout)
.setRevealed(isExpanded.value)
}
private val rxBus: RxBus by inject() private val rxBus: RxBus by inject()
@ -100,7 +83,7 @@ class PolicyItem(val item: MagiskPolicy, val icon: Drawable) : ComparableRvItem<
isExpanded.toggle() isExpanded.toggle()
view.rotationTo(if (isExpanded.value) 225 else 180) view.rotationTo(if (isExpanded.value) 225 else 180)
(view.parent as ViewGroup) (view.parent as ViewGroup)
.findViewById<View>(R.id.expand_layout) .findViewById<View>(R.id.policy_expand_container)
.setRevealed(isExpanded.value) .setRevealed(isExpanded.value)
} }

7
app/src/main/res/color/color_state_primary_transient.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorPrimary" android:state_selected="true" />
<item android:color="?colorPrimary" android:state_checked="true" />
<item android:color="?colorDisabled" android:state_enabled="false" />
<item android:color="?colorOnSurfaceVariant" />
</selector>

43
app/src/main/res/layout/item_policy_md2.xml
View File

@ -33,7 +33,7 @@
android:paddingBottom="@dimen/l2"> android:paddingBottom="@dimen/l2">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/app_icon" android:id="@+id/policy_app_icon"
style="?styleImageBig" style="?styleImageBig"
android:src="@{item.icon}" android:src="@{item.icon}"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -42,7 +42,7 @@
tools:srcCompat="@drawable/ic_logo" /> tools:srcCompat="@drawable/ic_logo" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/app_name" android:id="@+id/policy_app_name"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_generic" android:layout_marginLeft="@dimen/margin_generic"
@ -56,11 +56,11 @@
android:textIsSelectable="false" android:textIsSelectable="false"
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/app_icon" app:layout_constraintTop_toBottomOf="@+id/policy_app_icon"
tools:text="@string/app_name" /> tools:text="@string/app_name" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/package_name" android:id="@+id/policy_package_name"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="middle" android:ellipsize="middle"
@ -71,58 +71,61 @@
android:textColor="@android:color/tertiary_text_dark" android:textColor="@android:color/tertiary_text_dark"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/app_name" app:layout_constraintEnd_toEndOf="@id/policy_app_name"
app:layout_constraintStart_toStartOf="@id/app_name" app:layout_constraintStart_toStartOf="@id/policy_app_name"
app:layout_constraintTop_toBottomOf="@id/app_name" app:layout_constraintTop_toBottomOf="@id/policy_app_name"
tools:text="com.topjohnwu.magisk" /> tools:text="com.topjohnwu.magisk" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/expand_layout" android:id="@+id/policy_expand_container"
revealFix="@{item.isExpanded()}" revealFix="@{item.isExpanded()}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_constraintTop_toBottomOf="@+id/policy_package_name"
android:background="?colorSurfaceVariant" android:background="?colorSurfaceVariant"
android:visibility="invisible" android:visibility="invisible"
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/package_name" tools:alpha="0.9"
tools:visibility="visible"> tools:visibility="visible">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/bell" android:id="@+id/policy_notify"
style="?styleIconNormal" style="?styleIconNormal"
android:background="?selectableItemBackground"
isSelected="@{item.shouldNotify}" isSelected="@{item.shouldNotify}"
tooltipText="@{@string/superuser_toggle_notification}" tooltipText="@{@string/superuser_toggle_notification}"
android:contentDescription="@string/superuser_toggle_notification" android:contentDescription="@string/superuser_toggle_notification"
android:onClick="@{() -> item.toggleNotify(viewModel)}" android:onClick="@{() -> item.toggleNotify(viewModel)}"
app:layout_constraintBottom_toTopOf="@+id/delete" app:layout_constraintBottom_toTopOf="@+id/policy_delete"
app:layout_constraintEnd_toStartOf="@+id/bug" app:layout_constraintEnd_toStartOf="@+id/policy_log"
app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" app:layout_constraintVertical_chainStyle="packed"
app:srcCompat="@drawable/ic_notifications" app:srcCompat="@drawable/ic_notifications"
app:tint="@color/color_error_primary_transient" /> app:tint="@color/color_state_primary_transient" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/bug" android:id="@+id/policy_log"
style="?styleIconNormal" style="?styleIconNormal"
android:background="?selectableItemBackground"
isSelected="@{item.shouldLog}" isSelected="@{item.shouldLog}"
tooltipText="@{@string/superuser_toggle_log}" tooltipText="@{@string/superuser_toggle_log}"
android:contentDescription="@string/superuser_toggle_log" android:contentDescription="@string/superuser_toggle_log"
android:onClick="@{() -> item.toggleLog(viewModel)}" android:onClick="@{() -> item.toggleLog(viewModel)}"
app:layout_constraintBottom_toBottomOf="@+id/bell" app:layout_constraintBottom_toBottomOf="@+id/policy_notify"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/bell" app:layout_constraintStart_toEndOf="@+id/policy_notify"
app:layout_constraintTop_toTopOf="@+id/bell" app:layout_constraintTop_toTopOf="@+id/policy_notify"
app:srcCompat="@drawable/ic_bug_report" app:srcCompat="@drawable/ic_bug_report"
app:tint="@color/color_error_primary_transient" /> app:tint="@color/color_state_primary_transient" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/delete" android:id="@+id/policy_delete"
style="?styleButtonText" style="?styleButtonText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -137,7 +140,7 @@
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/bell" app:layout_constraintTop_toBottomOf="@+id/policy_notify"
app:rippleColor="?colorError" /> app:rippleColor="?colorError" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>