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
fe1ce08a
Commit
fe1ce08a
authored
Oct 05, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added self-handling event types
parent
1d64ddb7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
58 additions
and
0 deletions
+58
-0
EventExecutors.kt
.../java/com/topjohnwu/magisk/model/events/EventExecutors.kt
+23
-0
CompatActivity.kt
...va/com/topjohnwu/magisk/redesign/compat/CompatActivity.kt
+7
-0
CompatDelegate.kt
...va/com/topjohnwu/magisk/redesign/compat/CompatDelegate.kt
+21
-0
CompatFragment.kt
...va/com/topjohnwu/magisk/redesign/compat/CompatFragment.kt
+7
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/model/events/EventExecutors.kt
0 → 100644
View file @
fe1ce08a
package
com.topjohnwu.magisk.model.events
import
android.content.Context
import
androidx.appcompat.app.AppCompatActivity
import
androidx.fragment.app.Fragment
interface
ContextExecutor
{
operator
fun
invoke
(
context
:
Context
)
}
interface
ActivityExecutor
{
operator
fun
invoke
(
activity
:
AppCompatActivity
)
}
interface
FragmentExecutor
{
operator
fun
invoke
(
fragment
:
Fragment
)
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatActivity.kt
View file @
fe1ce08a
...
...
@@ -3,6 +3,7 @@ package com.topjohnwu.magisk.redesign.compat
import
android.os.Bundle
import
android.view.View
import
androidx.databinding.ViewDataBinding
import
com.skoumal.teanity.viewevents.ViewEvent
import
com.topjohnwu.magisk.ui.base.MagiskActivity
abstract
class
CompatActivity
<
ViewModel
:
CompatViewModel
,
Binding
:
ViewDataBinding
>
:
...
...
@@ -24,4 +25,10 @@ abstract class CompatActivity<ViewModel : CompatViewModel, Binding : ViewDataBin
delegate
.
onResume
()
}
override
fun
onEventDispatched
(
event
:
ViewEvent
)
{
super
.
onEventDispatched
(
event
)
delegate
.
onEventExecute
(
event
,
this
)
}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatDelegate.kt
View file @
fe1ce08a
package
com.topjohnwu.magisk.redesign.compat
import
android.graphics.Insets
import
androidx.appcompat.app.AppCompatActivity
import
androidx.core.view.ViewCompat
import
androidx.core.view.WindowInsetsCompat
import
androidx.fragment.app.Fragment
import
com.skoumal.teanity.viewevents.ViewEvent
import
com.topjohnwu.magisk.model.events.ActivityExecutor
import
com.topjohnwu.magisk.model.events.ContextExecutor
import
com.topjohnwu.magisk.model.events.FragmentExecutor
import
timber.log.Timber
class
CompatDelegate
internal
constructor
(
private
val
view
:
CompatView
<*>
...
...
@@ -12,6 +19,20 @@ class CompatDelegate internal constructor(
view
.
viewModel
.
requestRefresh
()
}
fun
onEventExecute
(
event
:
ViewEvent
,
activity
:
AppCompatActivity
)
{
(
event
as
?
ContextExecutor
)
?.
invoke
(
activity
)
(
event
as
?
ActivityExecutor
)
?.
invoke
(
activity
)
(
event
as
?
FragmentExecutor
)
?.
let
{
Timber
.
e
(
"Cannot run ${FragmentExecutor::class.java.simpleName} in Activity. Consider adding ${ContextExecutor::class.java.simpleName} as fallback."
)
}
}
fun
onEventExecute
(
event
:
ViewEvent
,
fragment
:
Fragment
)
{
(
event
as
?
ContextExecutor
)
?.
invoke
(
fragment
.
requireContext
())
(
event
as
?
FragmentExecutor
)
?.
invoke
(
fragment
)
(
event
as
?
ActivityExecutor
)
?.
invoke
(
fragment
.
requireActivity
()
as
AppCompatActivity
)
}
fun
ensureInsets
()
{
ViewCompat
.
setOnApplyWindowInsetsListener
(
view
.
viewRoot
)
{
_
,
insets
->
insets
.
asInsets
()
...
...
app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatFragment.kt
View file @
fe1ce08a
...
...
@@ -3,6 +3,7 @@ package com.topjohnwu.magisk.redesign.compat
import
android.os.Bundle
import
android.view.View
import
androidx.databinding.ViewDataBinding
import
com.skoumal.teanity.viewevents.ViewEvent
import
com.topjohnwu.magisk.ui.base.MagiskFragment
abstract
class
CompatFragment
<
ViewModel
:
CompatViewModel
,
Binding
:
ViewDataBinding
>
...
...
@@ -24,4 +25,10 @@ abstract class CompatFragment<ViewModel : CompatViewModel, Binding : ViewDataBin
delegate
.
onResume
()
}
override
fun
onEventDispatched
(
event
:
ViewEvent
)
{
super
.
onEventDispatched
(
event
)
delegate
.
onEventExecute
(
event
,
this
)
}
}
\ No newline at end of file
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