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
44f7c9a5
Commit
44f7c9a5
authored
Oct 20, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added animations for toolbar transitions
parent
b910db32
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
XView.kt
app/src/main/java/com/topjohnwu/magisk/extensions/XView.kt
+10
-1
MainActivity.kt
...c/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt
+3
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/extensions/XView.kt
View file @
44f7c9a5
package
com.topjohnwu.magisk.extensions
package
com.topjohnwu.magisk.extensions
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewTreeObserver
import
android.view.ViewTreeObserver
import
androidx.interpolator.view.animation.FastOutSlowInInterpolator
import
androidx.transition.AutoTransition
import
androidx.transition.TransitionManager
fun
View
.
setOnViewReadyListener
(
callback
:
()
->
Unit
)
=
addOnGlobalLayoutListener
(
true
,
callback
)
fun
View
.
setOnViewReadyListener
(
callback
:
()
->
Unit
)
=
addOnGlobalLayoutListener
(
true
,
callback
)
...
@@ -11,4 +15,9 @@ fun View.addOnGlobalLayoutListener(oneShot: Boolean = false, callback: () -> Uni
...
@@ -11,4 +15,9 @@ fun View.addOnGlobalLayoutListener(oneShot: Boolean = false, callback: () -> Uni
if
(
oneShot
)
viewTreeObserver
.
removeOnGlobalLayoutListener
(
this
)
if
(
oneShot
)
viewTreeObserver
.
removeOnGlobalLayoutListener
(
this
)
callback
()
callback
()
}
}
})
})
\ No newline at end of file
fun
ViewGroup
.
startAnimations
()
{
val
transition
=
AutoTransition
().
setInterpolator
(
FastOutSlowInInterpolator
())
TransitionManager
.
beginDelayedTransition
(
this
,
transition
)
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt
View file @
44f7c9a5
...
@@ -16,6 +16,7 @@ import com.ncapdevi.fragnav.FragNavController
...
@@ -16,6 +16,7 @@ import com.ncapdevi.fragnav.FragNavController
import
com.topjohnwu.magisk.Const
import
com.topjohnwu.magisk.Const
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
import
com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
import
com.topjohnwu.magisk.extensions.startAnimations
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.redesign.compat.CompatActivity
import
com.topjohnwu.magisk.redesign.compat.CompatActivity
import
com.topjohnwu.magisk.redesign.compat.CompatNavigationDelegate
import
com.topjohnwu.magisk.redesign.compat.CompatNavigationDelegate
...
@@ -136,7 +137,8 @@ open class MainActivity : CompatActivity<MainViewModel, ActivityMainMd2Binding>(
...
@@ -136,7 +137,8 @@ open class MainActivity : CompatActivity<MainViewModel, ActivityMainMd2Binding>(
viewModel
.
insets
.
value
=
insets
viewModel
.
insets
.
value
=
insets
}
}
fun
setDisplayHomeAsUpEnabled
(
isEnabled
:
Boolean
)
{
private
fun
setDisplayHomeAsUpEnabled
(
isEnabled
:
Boolean
)
{
binding
.
mainToolbar
.
startAnimations
()
when
{
when
{
isEnabled
->
binding
.
mainToolbar
.
setNavigationIcon
(
R
.
drawable
.
ic_back_md2
)
isEnabled
->
binding
.
mainToolbar
.
setNavigationIcon
(
R
.
drawable
.
ic_back_md2
)
else
->
binding
.
mainToolbar
.
navigationIcon
=
null
else
->
binding
.
mainToolbar
.
navigationIcon
=
null
...
...
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