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

Fixed module filter list not respecting single column layout

Browse Source
This commit is contained in:
Viktor De Pasquale 2020-02-22 20:09:11 +01:00 committed by John Wu
parent c6b3f06b95
commit e6464c5c7f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/res/layout/include_module_filter.xml
View File

@ -5,6 +5,8 @@
<data> <data>
<import type="com.topjohnwu.magisk.core.Config" />
<variable <variable
name="viewModel" name="viewModel"
type="com.topjohnwu.magisk.ui.module.ModuleViewModel" /> type="com.topjohnwu.magisk.ui.module.ModuleViewModel" />
@ -26,18 +28,19 @@
dividerVertical="@{@drawable/divider_l1}" dividerVertical="@{@drawable/divider_l1}"
itemBinding="@{viewModel.itemSearchBinding}" itemBinding="@{viewModel.itemSearchBinding}"
items="@{viewModel.itemsSearch}" items="@{viewModel.itemsSearch}"
spanCount="@{Config.listSpanCount}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:fastScrollEnabled="true"
app:fastScrollHorizontalThumbDrawable="@drawable/fast_scroll_thumb"
app:fastScrollHorizontalTrackDrawable="@drawable/fast_scroll_track"
app:fastScrollVerticalThumbDrawable="@drawable/fast_scroll_thumb"
app:fastScrollVerticalTrackDrawable="@drawable/fast_scroll_track"
android:layout_marginBottom="@dimen/l1" android:layout_marginBottom="@dimen/l1"
android:clipToPadding="false" android:clipToPadding="false"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/l1" android:paddingStart="@dimen/l1"
android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size + (int) @dimen/l1}" android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size + (int) @dimen/l1}"
app:fastScrollEnabled="true"
app:fastScrollHorizontalThumbDrawable="@drawable/fast_scroll_thumb"
app:fastScrollHorizontalTrackDrawable="@drawable/fast_scroll_track"
app:fastScrollVerticalThumbDrawable="@drawable/fast_scroll_thumb"
app:fastScrollVerticalTrackDrawable="@drawable/fast_scroll_track"
app:layoutManager="androidx.recyclerview.widget.StaggeredGridLayoutManager" app:layoutManager="androidx.recyclerview.widget.StaggeredGridLayoutManager"
app:layout_constrainedHeight="true" app:layout_constrainedHeight="true"
app:layout_constraintBottom_toTopOf="@+id/module_filter_title_search" app:layout_constraintBottom_toTopOf="@+id/module_filter_title_search"
@ -113,12 +116,12 @@
android:layout_marginEnd="@dimen/l1" android:layout_marginEnd="@dimen/l1"
app:backgroundTint="?colorPrimary" app:backgroundTint="?colorPrimary"
app:elevation="0dp" app:elevation="0dp"
app:tint="?colorOnPrimary"
app:fabSize="mini" app:fabSize="mini"
app:layout_constraintBottom_toBottomOf="@+id/module_filter_search" app:layout_constraintBottom_toBottomOf="@+id/module_filter_search"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/module_filter_search" app:layout_constraintTop_toTopOf="@+id/module_filter_search"
app:srcCompat="@drawable/ic_check_md2" /> app:srcCompat="@drawable/ic_check_md2"
app:tint="?colorOnPrimary" />
<ProgressBar <ProgressBar
style="@style/WidgetFoundation.ProgressBar.Indeterminate.Circular" style="@style/WidgetFoundation.ProgressBar.Indeterminate.Circular"