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
550f6aff
Commit
550f6aff
authored
Nov 21, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated showing / hiding filters
parent
67c50d75
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
12 deletions
+23
-12
HideFragment.kt
...n/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt
+11
-5
ModuleFragment.kt
...va/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt
+12
-7
No files found.
app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt
View file @
550f6aff
...
@@ -33,6 +33,13 @@ class HideFragment : CompatFragment<HideViewModel, FragmentHideMd2Binding>() {
...
@@ -33,6 +33,13 @@ class HideFragment : CompatFragment<HideViewModel, FragmentHideMd2Binding>() {
override
val
layoutRes
=
R
.
layout
.
fragment_hide_md2
override
val
layoutRes
=
R
.
layout
.
fragment_hide_md2
override
val
viewModel
by
viewModel
<
HideViewModel
>()
override
val
viewModel
by
viewModel
<
HideViewModel
>()
private
var
isFilterVisible
get
()
=
binding
.
hideFilter
.
isVisible
set
(
value
)
{
if
(!
value
)
hideKeyboard
()
MotionRevealHelper
.
withViews
(
binding
.
hideFilter
,
binding
.
hideFilterToggle
,
value
)
}
override
fun
consumeSystemWindowInsets
(
insets
:
Insets
)
=
insets
override
fun
consumeSystemWindowInsets
(
insets
:
Insets
)
=
insets
override
fun
onAttach
(
context
:
Context
)
{
override
fun
onAttach
(
context
:
Context
)
{
...
@@ -45,11 +52,10 @@ class HideFragment : CompatFragment<HideViewModel, FragmentHideMd2Binding>() {
...
@@ -45,11 +52,10 @@ class HideFragment : CompatFragment<HideViewModel, FragmentHideMd2Binding>() {
super
.
onViewCreated
(
view
,
savedInstanceState
)
super
.
onViewCreated
(
view
,
savedInstanceState
)
binding
.
hideFilterToggle
.
setOnClickListener
{
binding
.
hideFilterToggle
.
setOnClickListener
{
MotionRevealHelper
.
withViews
(
binding
.
hideFilter
,
binding
.
hideFilterToggle
,
true
)
isFilterVisible
=
true
}
}
binding
.
hideFilterInclude
.
hideFilterDone
.
setOnClickListener
{
binding
.
hideFilterInclude
.
hideFilterDone
.
setOnClickListener
{
hideKeyboard
()
isFilterVisible
=
false
MotionRevealHelper
.
withViews
(
binding
.
hideFilter
,
binding
.
hideFilterToggle
,
false
)
}
}
binding
.
hideContent
.
addOnScrollListener
(
object
:
RecyclerView
.
OnScrollListener
()
{
binding
.
hideContent
.
addOnScrollListener
(
object
:
RecyclerView
.
OnScrollListener
()
{
override
fun
onScrollStateChanged
(
recyclerView
:
RecyclerView
,
newState
:
Int
)
{
override
fun
onScrollStateChanged
(
recyclerView
:
RecyclerView
,
newState
:
Int
)
{
...
@@ -64,8 +70,8 @@ class HideFragment : CompatFragment<HideViewModel, FragmentHideMd2Binding>() {
...
@@ -64,8 +70,8 @@ class HideFragment : CompatFragment<HideViewModel, FragmentHideMd2Binding>() {
override
fun
onPreBind
(
binding
:
FragmentHideMd2Binding
)
=
Unit
override
fun
onPreBind
(
binding
:
FragmentHideMd2Binding
)
=
Unit
override
fun
onBackPressed
():
Boolean
{
override
fun
onBackPressed
():
Boolean
{
if
(
binding
.
hideFilter
.
is
Visible
)
{
if
(
isFilter
Visible
)
{
binding
.
hideFilterInclude
.
hideFilterDone
.
performClick
()
isFilterVisible
=
false
return
true
return
true
}
}
return
super
.
onBackPressed
()
return
super
.
onBackPressed
()
...
...
app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt
View file @
550f6aff
...
@@ -29,6 +29,14 @@ class ModuleFragment : CompatFragment<ModuleViewModel, FragmentModuleMd2Binding>
...
@@ -29,6 +29,14 @@ class ModuleFragment : CompatFragment<ModuleViewModel, FragmentModuleMd2Binding>
private
val
listeners
=
hashSetOf
<
EndlessRecyclerScrollListener
>()
private
val
listeners
=
hashSetOf
<
EndlessRecyclerScrollListener
>()
private
var
isFilterVisible
get
()
=
binding
.
moduleFilter
.
isVisible
set
(
value
)
{
if
(!
value
)
hideKeyboard
()
(
activity
as
?
MainActivity
)
?.
requestNavigationHidden
(
value
)
MotionRevealHelper
.
withViews
(
binding
.
moduleFilter
,
binding
.
moduleFilterToggle
,
value
)
}
override
fun
consumeSystemWindowInsets
(
insets
:
Insets
)
=
insets
override
fun
consumeSystemWindowInsets
(
insets
:
Insets
)
=
insets
override
fun
onActivityResult
(
requestCode
:
Int
,
resultCode
:
Int
,
data
:
Intent
?)
{
override
fun
onActivityResult
(
requestCode
:
Int
,
resultCode
:
Int
,
data
:
Intent
?)
{
...
@@ -48,13 +56,10 @@ class ModuleFragment : CompatFragment<ModuleViewModel, FragmentModuleMd2Binding>
...
@@ -48,13 +56,10 @@ class ModuleFragment : CompatFragment<ModuleViewModel, FragmentModuleMd2Binding>
setEndlessSearch
()
setEndlessSearch
()
binding
.
moduleFilterToggle
.
setOnClickListener
{
binding
.
moduleFilterToggle
.
setOnClickListener
{
(
activity
as
?
MainActivity
)
?.
requestNavigationHidden
()
isFilterVisible
=
true
MotionRevealHelper
.
withViews
(
binding
.
moduleFilter
,
binding
.
moduleFilterToggle
,
true
)
}
}
binding
.
moduleFilterInclude
.
moduleFilterDone
.
setOnClickListener
{
binding
.
moduleFilterInclude
.
moduleFilterDone
.
setOnClickListener
{
(
activity
as
?
MainActivity
)
?.
requestNavigationHidden
(
false
)
isFilterVisible
=
false
hideKeyboard
()
MotionRevealHelper
.
withViews
(
binding
.
moduleFilter
,
binding
.
moduleFilterToggle
,
false
)
}
}
binding
.
moduleFilterInclude
.
moduleFilterList
.
addOnScrollListener
(
object
:
binding
.
moduleFilterInclude
.
moduleFilterList
.
addOnScrollListener
(
object
:
RecyclerView
.
OnScrollListener
()
{
RecyclerView
.
OnScrollListener
()
{
...
@@ -73,8 +78,8 @@ class ModuleFragment : CompatFragment<ModuleViewModel, FragmentModuleMd2Binding>
...
@@ -73,8 +78,8 @@ class ModuleFragment : CompatFragment<ModuleViewModel, FragmentModuleMd2Binding>
}
}
override
fun
onBackPressed
():
Boolean
{
override
fun
onBackPressed
():
Boolean
{
if
(
binding
.
moduleFilter
.
is
Visible
)
{
if
(
isFilter
Visible
)
{
binding
.
moduleFilterInclude
.
moduleFilterDone
.
performClick
()
isFilterVisible
=
false
return
true
return
true
}
}
return
super
.
onBackPressed
()
return
super
.
onBackPressed
()
...
...
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