Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
c5f2f634
Commit
c5f2f634
authored
Nov 12, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed slow scrolling and list updates on hide screen
parent
b2b81a5d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
128 additions
and
135 deletions
+128
-135
HideFragment.kt
...n/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt
+10
-1
ModuleFragment.kt
...va/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt
+1
-2
fragment_hide_md2.xml
app/src/main/res/layout/fragment_hide_md2.xml
+116
-131
item_hide_md2.xml
app/src/main/res/layout/item_hide_md2.xml
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt
View file @
c5f2f634
...
@@ -2,6 +2,7 @@ package com.topjohnwu.magisk.redesign.hide
...
@@ -2,6 +2,7 @@ package com.topjohnwu.magisk.redesign.hide
import
android.content.Context
import
android.content.Context
import
android.graphics.Insets
import
android.graphics.Insets
import
android.os.Bundle
import
android.view.Menu
import
android.view.Menu
import
android.view.MenuInflater
import
android.view.MenuInflater
import
android.view.MenuItem
import
android.view.MenuItem
...
@@ -24,13 +25,21 @@ class HideFragment : CompatFragment<HideViewModel, FragmentHideMd2Binding>() {
...
@@ -24,13 +25,21 @@ class HideFragment : CompatFragment<HideViewModel, FragmentHideMd2Binding>() {
setHasOptionsMenu
(
true
)
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
)
{
override
fun
onCreateOptionsMenu
(
menu
:
Menu
,
inflater
:
MenuInflater
)
{
inflater
.
inflate
(
R
.
menu
.
menu_hide_md2
,
menu
)
inflater
.
inflate
(
R
.
menu
.
menu_hide_md2
,
menu
)
}
}
override
fun
onOptionsItemSelected
(
item
:
MenuItem
):
Boolean
{
override
fun
onOptionsItemSelected
(
item
:
MenuItem
):
Boolean
{
when
(
item
.
itemId
)
{
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
)
return
super
.
onOptionsItemSelected
(
item
)
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt
View file @
c5f2f634
...
@@ -3,7 +3,6 @@ package com.topjohnwu.magisk.redesign.module
...
@@ -3,7 +3,6 @@ package com.topjohnwu.magisk.redesign.module
import
android.graphics.Insets
import
android.graphics.Insets
import
android.os.Bundle
import
android.os.Bundle
import
android.view.View
import
android.view.View
import
androidx.recyclerview.widget.StaggeredGridLayoutManager
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding
import
com.topjohnwu.magisk.redesign.compat.CompatFragment
import
com.topjohnwu.magisk.redesign.compat.CompatFragment
...
@@ -37,7 +36,7 @@ class ModuleFragment : CompatFragment<ModuleViewModel, FragmentModuleMd2Binding>
...
@@ -37,7 +36,7 @@ class ModuleFragment : CompatFragment<ModuleViewModel, FragmentModuleMd2Binding>
}
}
private
fun
setEndlessScroller
()
{
private
fun
setEndlessScroller
()
{
val
lama
=
binding
.
moduleRemote
.
layoutManager
as
?
StaggeredGridLayoutManager
?:
return
val
lama
=
binding
.
moduleRemote
.
layoutManager
?:
return
lama
.
isAutoMeasureEnabled
=
false
lama
.
isAutoMeasureEnabled
=
false
listener
=
EndlessRecyclerScrollListener
(
lama
,
viewModel
::
loadRemote
)
listener
=
EndlessRecyclerScrollListener
(
lama
,
viewModel
::
loadRemote
)
...
...
app/src/main/res/layout/fragment_hide_md2.xml
View file @
c5f2f634
...
@@ -17,28 +17,33 @@
...
@@ -17,28 +17,33 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
>
<androidx.core.widget.NestedScrollView
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/hide_scroll_container"
android:id=
"@+id/hide_content"
onScrollStateChanged=
"@{() -> viewModel.hideFilter()}"
dividerVertical=
"@{R.drawable.divider_l1}"
invisibleUnless=
"@{viewModel.loaded || !viewModel.items.empty}"
itemBinding=
"@{viewModel.itemBinding}"
items=
"@{viewModel.items}"
nestedScrollingEnabled=
"@{false}"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:clipToPadding=
"false"
android:fillViewport=
"true"
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}"
android:paddingBottom=
"@{viewModel.insets.bottom}"
android:paddingBottom=
"@{viewModel.insets.bottom}"
tools:paddingTop=
"40dp"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
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"
/>
<com.google.android.material.card.MaterialCardView
<com.google.android.material.card.MaterialCardView
style=
"?styleCardVariant
"
style=
"?styleCardElevated
"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"bottom"
android:layout_marginStart=
"@dimen/l1"
android:layout_marginStart=
"@dimen/l1"
android:layout_marginEnd=
"@dimen/l1"
android:layout_marginEnd=
"@dimen/l1"
android:layout_marginBottom=
"@{viewModel.insets.bottom + (int) @dimen/l1}"
app:cardCornerRadius=
"24dp"
>
app:cardCornerRadius=
"24dp"
>
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
...
@@ -142,26 +147,6 @@
...
@@ -142,26 +147,6 @@
</com.google.android.material.card.MaterialCardView>
</com.google.android.material.card.MaterialCardView>
<androidx.recyclerview.widget.RecyclerView
dividerVertical=
"@{R.drawable.divider_l1}"
invisibleUnless=
"@{viewModel.loaded || !viewModel.items.empty}"
itemBinding=
"@{viewModel.itemBinding}"
items=
"@{viewModel.items}"
nestedScrollingEnabled=
"@{false}"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginTop=
"@dimen/l1"
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"
/>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<LinearLayout
<LinearLayout
goneUnless=
"@{viewModel.loading && viewModel.items.empty}"
goneUnless=
"@{viewModel.loading && viewModel.items.empty}"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
app/src/main/res/layout/item_hide_md2.xml
View file @
c5f2f634
...
@@ -125,7 +125,7 @@
...
@@ -125,7 +125,7 @@
style=
"?styleProgressDeterminate"
style=
"?styleProgressDeterminate"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_gravity=
"top"
android:layout_gravity=
"top"
progressAnimated
=
"@{item.itemsCheckedPercent}"
/>
android:progress
=
"@{item.itemsCheckedPercent}"
/>
</com.google.android.material.card.MaterialCardView>
</com.google.android.material.card.MaterialCardView>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment