diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt index de2ad1975..9b85ca37e 100644 --- a/app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt @@ -2,6 +2,7 @@ package com.topjohnwu.magisk.redesign.hide import android.content.Context import android.graphics.Insets +import android.os.Bundle import android.view.Menu import android.view.MenuInflater import android.view.MenuItem @@ -24,13 +25,21 @@ class HideFragment : CompatFragment() { setHasOptionsMenu(true) } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + val lama = binding.hideContent.layoutManager ?: return + lama.isAutoMeasureEnabled = false + } + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { inflater.inflate(R.menu.menu_hide_md2, menu) } override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - R.id.action_focus_up -> binding.hideScrollContainer.fullScroll(View.FOCUS_UP) + R.id.action_focus_up -> binding.hideContent + .also { it.scrollToPosition(10) } + .also { it.smoothScrollToPosition(0) } } return super.onOptionsItemSelected(item) } diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt index 5dcd3d5d3..5cb682805 100644 --- a/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt @@ -3,7 +3,6 @@ package com.topjohnwu.magisk.redesign.module import android.graphics.Insets import android.os.Bundle import android.view.View -import androidx.recyclerview.widget.StaggeredGridLayoutManager import com.topjohnwu.magisk.R import com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding import com.topjohnwu.magisk.redesign.compat.CompatFragment @@ -37,7 +36,7 @@ class ModuleFragment : CompatFragment } private fun setEndlessScroller() { - val lama = binding.moduleRemote.layoutManager as? StaggeredGridLayoutManager ?: return + val lama = binding.moduleRemote.layoutManager ?: return lama.isAutoMeasureEnabled = false listener = EndlessRecyclerScrollListener(lama, viewModel::loadRemote) diff --git a/app/src/main/res/layout/fragment_hide_md2.xml b/app/src/main/res/layout/fragment_hide_md2.xml index bd68014c8..61493935d 100644 --- a/app/src/main/res/layout/fragment_hide_md2.xml +++ b/app/src/main/res/layout/fragment_hide_md2.xml @@ -17,150 +17,135 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:layout_height="match_parent" + android:clipToPadding="false" + android:orientation="vertical" + android:paddingStart="@dimen/l1" + android:paddingEnd="@dimen/l1" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:listitem="@layout/item_hide_md2" + tools:paddingTop="40dp" /> - + + + android:layout_height="wrap_content"> + + + + + + + + + + + + + android:layout_marginStart="@dimen/l_50" + android:layout_marginEnd="@dimen/l_50" + android:layout_marginBottom="@dimen/l_50" + android:visibility="gone" + app:cardCornerRadius="18dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/hide_filter_barrier" + tools:visibility="visible"> - + + - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="wrap_content" + android:layout_marginStart="48dp" + android:background="@null" + android:hint="@string/hide_filter_hint" + android:inputType="textUri" + android:minHeight="36dp" + android:paddingStart="0dp" + android:paddingEnd="@dimen/l1" + android:singleLine="true" + android:text="@={viewModel.query}" + android:textAppearance="?appearanceTextBodyNormal" + android:textColor="?colorTextTransient" + android:textColorHint="?colorOnSurfaceVariant" /> - + - - - + + android:progress="@{item.itemsCheckedPercent}" />