diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt index 9e50a8cc9..056a45058 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt @@ -1,6 +1,5 @@ package com.topjohnwu.magisk.model.entity.recycler -import android.view.MenuItem import android.view.View import android.view.ViewGroup import com.topjohnwu.magisk.R @@ -43,13 +42,12 @@ class HideItem(val item: ProcessHideApp) : ComparableRvItem() { isExpanded.value = false } - fun expand(v: View) { + fun toggle(v: View) { (v.parent as? ViewGroup)?.startAnimations() - isExpanded.value = true + isExpanded.toggle() } - fun toggle(menuItem: MenuItem, viewModel: HideViewModel): Boolean { - if (menuItem.itemId != R.id.action_toggle) return false + fun toggle(viewModel: HideViewModel): Boolean { // contract implies that isHidden == all checked if (!isHidden) { items.filterNot { it.isHidden.value } diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml new file mode 100644 index 000000000..d76e3bf7a --- /dev/null +++ b/app/src/main/res/drawable/ic_close.xml @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_hide_md2.xml b/app/src/main/res/layout/item_hide_md2.xml index dd02ade2f..539b60c17 100644 --- a/app/src/main/res/layout/item_hide_md2.xml +++ b/app/src/main/res/layout/item_hide_md2.xml @@ -5,6 +5,8 @@ + + @@ -22,91 +24,98 @@ tools:layout_gravity="center" tools:layout_marginBottom="@dimen/l1"> - - - - - - - - - - - - - + android:layout_height="wrap_content" + android:background="?selectableItemBackground" + android:onClick="@{(v) -> item.toggle(v)}"> + + + + + + + + + + + +