From fc6b02f607a110ef1139b1f699c4535a2fb6f825 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Sun, 12 Sep 2021 00:39:24 -0700 Subject: [PATCH] Move denylist fragment to its own section --- .../com/topjohnwu/magisk/ui/MainActivity.kt | 7 ++++--- .../magisk/ui/superuser/SuperuserViewModel.kt | 18 +++--------------- app/src/main/res/layout/fragment_hide_md2.xml | 3 ++- app/src/main/res/menu/menu_bottom_nav.xml | 6 ++++++ app/src/main/res/navigation/main.xml | 15 +++------------ 5 files changed, 18 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt index 4601b1bcd..339b85506 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt @@ -11,7 +11,6 @@ import android.view.View import android.view.WindowManager import androidx.core.content.pm.ShortcutManagerCompat import androidx.core.view.forEach -import androidx.core.view.isGone import androidx.interpolator.view.animation.FastOutLinearInInterpolator import androidx.interpolator.view.animation.LinearOutSlowInInterpolator import androidx.navigation.NavDirections @@ -61,6 +60,7 @@ open class MainActivity : BaseUIActivity( R.id.homeFragment, R.id.modulesFragment, R.id.superuserFragment, + R.id.hideFragment, R.id.logFragment -> true else -> false } @@ -77,11 +77,11 @@ open class MainActivity : BaseUIActivity( setSupportActionBar(binding.mainToolbar) - binding.mainNavigation.setOnNavigationItemSelectedListener { + binding.mainNavigation.setOnItemSelectedListener { getScreen(it.itemId)?.navigate() true } - binding.mainNavigation.setOnNavigationItemReselectedListener { + binding.mainNavigation.setOnItemReselectedListener { (currentFragment as? ReselectionTarget)?.onReselected() } @@ -183,6 +183,7 @@ open class MainActivity : BaseUIActivity( R.id.modulesFragment -> MainDirections.actionModuleFragment() R.id.superuserFragment -> MainDirections.actionSuperuserFragment() R.id.logFragment -> MainDirections.actionLogFragment() + R.id.hideFragment -> MainDirections.actionHideFragment() else -> null } } diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt index 4190e6d44..ffde23fc9 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt @@ -5,7 +5,6 @@ import androidx.lifecycle.viewModelScope import com.topjohnwu.magisk.BR import com.topjohnwu.magisk.R import com.topjohnwu.magisk.arch.BaseViewModel -import com.topjohnwu.magisk.core.Config import com.topjohnwu.magisk.core.magiskdb.PolicyDao import com.topjohnwu.magisk.core.model.su.SuPolicy import com.topjohnwu.magisk.core.utils.BiometricHelper @@ -19,7 +18,6 @@ import com.topjohnwu.magisk.events.dialog.BiometricEvent import com.topjohnwu.magisk.events.dialog.SuperuserRevokeDialog import com.topjohnwu.magisk.utils.Utils import com.topjohnwu.magisk.utils.asText -import com.topjohnwu.magisk.view.TappableHeadlineItem import com.topjohnwu.magisk.view.TextItem import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -28,7 +26,7 @@ import me.tatarka.bindingcollectionadapter2.collections.MergeObservableList class SuperuserViewModel( private val db: PolicyDao -) : BaseViewModel(), TappableHeadlineItem.Listener { +) : BaseViewModel() { private val itemNoData = TextItem(R.string.superuser_policy_none) @@ -36,10 +34,8 @@ class SuperuserViewModel( private val itemsHelpers = ObservableArrayList() val adapter = adapterOf() - val items = MergeObservableList().apply { - if (Config.magiskHide) - insertItem(TappableHeadlineItem.Hide) - }.insertList(itemsHelpers) + val items = MergeObservableList() + .insertList(itemsHelpers) .insertList(itemsPolicies) val itemBinding = itemBindingOf { it.bindExtra(BR.listener, this) @@ -73,14 +69,6 @@ class SuperuserViewModel( // --- - override fun onItemPressed(item: TappableHeadlineItem) = when (item) { - TappableHeadlineItem.Hide -> hidePressed() - else -> Unit - } - - private fun hidePressed() = - SuperuserFragmentDirections.actionSuperuserFragmentToHideFragment().navigate() - fun deletePressed(item: PolicyRvItem) { fun updateState() = viewModelScope.launch { db.delete(item.item.uid) diff --git a/app/src/main/res/layout/fragment_hide_md2.xml b/app/src/main/res/layout/fragment_hide_md2.xml index 82832b517..8dc415aa9 100644 --- a/app/src/main/res/layout/fragment_hide_md2.xml +++ b/app/src/main/res/layout/fragment_hide_md2.xml @@ -38,7 +38,7 @@ android:layout_gravity="bottom|end" android:layout_marginStart="@dimen/l1" android:layout_marginEnd="@dimen/l1" - android:layout_marginBottom="@dimen/l1" + android:layout_marginBottom="72dp" app:backgroundTint="?colorSurfaceSurfaceVariant" app:layout_fitsSystemWindowsInsets="bottom" app:srcCompat="@drawable/ic_search_md2" @@ -52,6 +52,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:visibility="invisible" + app:layout_fitsSystemWindowsInsets="bottom" app:cardCornerRadius="0dp"> + + - - - - + tools:layout="@layout/fragment_superuser_md2" /> + app:popExitAnim="@anim/fragment_exit_pop" + app:popUpTo="@id/homeFragment"/>