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
a39577c4
Commit
a39577c4
authored
Dec 04, 2020
by
RikkaW
Committed by
John Wu
Dec 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix extra spacing in module list
parent
125ee466
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
9 deletions
+24
-9
RecyclerView.kt
app/src/main/java/com/topjohnwu/magisk/ktx/RecyclerView.kt
+19
-4
ModuleFragment.kt
...ain/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
+5
-5
No files found.
app/src/main/java/com/topjohnwu/magisk/ktx/RecyclerView.kt
View file @
a39577c4
...
@@ -10,6 +10,23 @@ import androidx.recyclerview.widget.LinearLayoutManager
...
@@ -10,6 +10,23 @@ import androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
import
androidx.recyclerview.widget.RecyclerView
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
fun
RecyclerView
.
addInvalidateItemDecorationsObserver
()
{
adapter
?.
registerAdapterDataObserver
(
object
:
RecyclerView
.
AdapterDataObserver
()
{
override
fun
onItemRangeInserted
(
positionStart
:
Int
,
itemCount
:
Int
)
{
invalidateItemDecorations
()
}
override
fun
onItemRangeRemoved
(
positionStart
:
Int
,
itemCount
:
Int
)
{
invalidateItemDecorations
()
}
override
fun
onItemRangeMoved
(
fromPosition
:
Int
,
toPosition
:
Int
,
itemCount
:
Int
)
{
invalidateItemDecorations
()
}
})
}
fun
RecyclerView
.
addVerticalPadding
(
paddingTop
:
Int
=
0
,
paddingBottom
:
Int
=
0
)
{
fun
RecyclerView
.
addVerticalPadding
(
paddingTop
:
Int
=
0
,
paddingBottom
:
Int
=
0
)
{
addItemDecoration
(
VerticalPaddingDecoration
(
paddingTop
,
paddingBottom
))
addItemDecoration
(
VerticalPaddingDecoration
(
paddingTop
,
paddingBottom
))
}
}
...
@@ -20,11 +37,9 @@ private class VerticalPaddingDecoration(private val paddingTop: Int = 0, private
...
@@ -20,11 +37,9 @@ private class VerticalPaddingDecoration(private val paddingTop: Int = 0, private
private
var
allowBottom
:
Boolean
=
true
private
var
allowBottom
:
Boolean
=
true
override
fun
getItemOffsets
(
outRect
:
Rect
,
view
:
View
,
parent
:
RecyclerView
,
state
:
RecyclerView
.
State
)
{
override
fun
getItemOffsets
(
outRect
:
Rect
,
view
:
View
,
parent
:
RecyclerView
,
state
:
RecyclerView
.
State
)
{
if
(
parent
.
adapter
==
null
)
{
val
adapter
=
parent
.
adapter
?:
return
return
}
val
position
=
parent
.
getChildAdapterPosition
(
view
)
val
position
=
parent
.
getChildAdapterPosition
(
view
)
val
count
=
parent
.
adapter
!!
.
itemCount
val
count
=
adapter
.
itemCount
if
(
position
==
0
&&
allowTop
)
{
if
(
position
==
0
&&
allowTop
)
{
outRect
.
top
=
paddingTop
outRect
.
top
=
paddingTop
}
else
if
(
position
==
count
-
1
&&
allowBottom
)
{
}
else
if
(
position
==
count
-
1
&&
allowBottom
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
View file @
a39577c4
...
@@ -13,10 +13,7 @@ import com.topjohnwu.magisk.arch.ReselectionTarget
...
@@ -13,10 +13,7 @@ import com.topjohnwu.magisk.arch.ReselectionTarget
import
com.topjohnwu.magisk.arch.ViewEvent
import
com.topjohnwu.magisk.arch.ViewEvent
import
com.topjohnwu.magisk.core.download.BaseDownloader
import
com.topjohnwu.magisk.core.download.BaseDownloader
import
com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding
import
com.topjohnwu.magisk.ktx.addSimpleItemDecoration
import
com.topjohnwu.magisk.ktx.*
import
com.topjohnwu.magisk.ktx.addVerticalPadding
import
com.topjohnwu.magisk.ktx.fixEdgeEffect
import
com.topjohnwu.magisk.ktx.hideKeyboard
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.utils.EndlessRecyclerScrollListener
import
com.topjohnwu.magisk.utils.EndlessRecyclerScrollListener
import
com.topjohnwu.magisk.utils.MotionRevealHelper
import
com.topjohnwu.magisk.utils.MotionRevealHelper
...
@@ -72,7 +69,7 @@ class ModuleFragment : BaseUIFragment<ModuleViewModel, FragmentModuleMd2Binding>
...
@@ -72,7 +69,7 @@ class ModuleFragment : BaseUIFragment<ModuleViewModel, FragmentModuleMd2Binding>
binding
.
moduleList
.
apply
{
binding
.
moduleList
.
apply
{
addVerticalPadding
(
addVerticalPadding
(
l_50
,
l_50
,
l1
+
resource
.
getDimensionPixelSize
(
R
.
dimen
.
internal_action_bar_size
)
l1
+
l_50
+
resource
.
getDimensionPixelSize
(
R
.
dimen
.
internal_action_bar_size
)
)
)
addSimpleItemDecoration
(
addSimpleItemDecoration
(
left
=
l1
,
left
=
l1
,
...
@@ -81,6 +78,9 @@ class ModuleFragment : BaseUIFragment<ModuleViewModel, FragmentModuleMd2Binding>
...
@@ -81,6 +78,9 @@ class ModuleFragment : BaseUIFragment<ModuleViewModel, FragmentModuleMd2Binding>
bottom
=
l_50
,
bottom
=
l_50
,
)
)
fixEdgeEffect
()
fixEdgeEffect
()
post
{
addInvalidateItemDecorationsObserver
()
}
}
}
binding
.
moduleFilterInclude
.
moduleFilterList
.
apply
{
binding
.
moduleFilterInclude
.
moduleFilterList
.
apply
{
...
...
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