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
b910db32
Commit
b910db32
authored
Oct 20, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed snackbar behavior in contrast with bottom navigation
parent
c44a942f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
81 additions
and
1 deletion
+81
-1
MainActivity.kt
...c/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt
+4
-0
HideBottomViewOnScrollBehavior.kt
.../topjohnwu/magisk/utils/HideBottomViewOnScrollBehavior.kt
+77
-0
activity_main_md2.xml
app/src/main/res/layout/activity_main_md2.xml
+0
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt
View file @
b910db32
...
@@ -24,6 +24,7 @@ import com.topjohnwu.magisk.redesign.log.LogFragment
...
@@ -24,6 +24,7 @@ import com.topjohnwu.magisk.redesign.log.LogFragment
import
com.topjohnwu.magisk.redesign.module.ModuleFragment
import
com.topjohnwu.magisk.redesign.module.ModuleFragment
import
com.topjohnwu.magisk.redesign.settings.SettingsFragment
import
com.topjohnwu.magisk.redesign.settings.SettingsFragment
import
com.topjohnwu.magisk.redesign.superuser.SuperuserFragment
import
com.topjohnwu.magisk.redesign.superuser.SuperuserFragment
import
com.topjohnwu.magisk.utils.HideBottomViewOnScrollBehavior
import
com.topjohnwu.magisk.utils.HideTopViewOnScrollBehavior
import
com.topjohnwu.magisk.utils.HideTopViewOnScrollBehavior
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
...
@@ -62,6 +63,9 @@ open class MainActivity : CompatActivity<MainViewModel, ActivityMainMd2Binding>(
...
@@ -62,6 +63,9 @@ open class MainActivity : CompatActivity<MainViewModel, ActivityMainMd2Binding>(
binding
.
mainToolbarWrapper
.
updateLayoutParams
<
CoordinatorLayout
.
LayoutParams
>
{
binding
.
mainToolbarWrapper
.
updateLayoutParams
<
CoordinatorLayout
.
LayoutParams
>
{
behavior
=
HideTopViewOnScrollBehavior
<
MaterialCardView
>()
behavior
=
HideTopViewOnScrollBehavior
<
MaterialCardView
>()
}
}
binding
.
mainBottomBar
.
updateLayoutParams
<
CoordinatorLayout
.
LayoutParams
>
{
behavior
=
HideBottomViewOnScrollBehavior
<
MaterialCardView
>()
}
binding
.
mainNavigation
.
setOnNavigationItemSelectedListener
{
binding
.
mainNavigation
.
setOnNavigationItemSelectedListener
{
when
(
it
.
itemId
)
{
when
(
it
.
itemId
)
{
R
.
id
.
homeFragment
->
Navigation
.
home
()
R
.
id
.
homeFragment
->
Navigation
.
home
()
...
...
app/src/main/java/com/topjohnwu/magisk/utils/HideBottomViewOnScrollBehavior.kt
0 → 100644
View file @
b910db32
package
com.topjohnwu.magisk.utils
import
android.view.View
import
android.view.ViewGroup
import
androidx.coordinatorlayout.widget.CoordinatorLayout
import
androidx.core.view.isVisible
import
androidx.core.view.updateLayoutParams
import
androidx.interpolator.view.animation.FastOutSlowInInterpolator
import
com.google.android.material.behavior.HideBottomViewOnScrollBehavior
import
com.google.android.material.snackbar.Snackbar
import
com.topjohnwu.magisk.R
import
kotlin.math.roundToInt
class
HideBottomViewOnScrollBehavior
<
T
:
View
>
:
HideBottomViewOnScrollBehavior
<
T
>()
{
override
fun
layoutDependsOn
(
parent
:
CoordinatorLayout
,
child
:
T
,
dependency
:
View
)
=
super
.
layoutDependsOn
(
parent
,
child
,
dependency
)
or
(
dependency
is
Snackbar
.
SnackbarLayout
)
override
fun
onDependentViewChanged
(
parent
:
CoordinatorLayout
,
child
:
T
,
dependency
:
View
)
=
when
(
dependency
)
{
is
Snackbar
.
SnackbarLayout
->
onDependentViewChanged
(
parent
,
child
,
dependency
)
else
->
super
.
onDependentViewChanged
(
parent
,
child
,
dependency
)
}
override
fun
onDependentViewRemoved
(
parent
:
CoordinatorLayout
,
child
:
T
,
dependency
:
View
)
=
when
(
dependency
)
{
is
Snackbar
.
SnackbarLayout
->
onDependentViewRemoved
(
parent
,
child
,
dependency
)
else
->
super
.
onDependentViewRemoved
(
parent
,
child
,
dependency
)
}
//---
private
fun
onDependentViewChanged
(
parent
:
CoordinatorLayout
,
child
:
T
,
dependency
:
Snackbar
.
SnackbarLayout
):
Boolean
{
val
viewMargin
=
(
child
.
layoutParams
as
ViewGroup
.
MarginLayoutParams
).
bottomMargin
val
additionalMargin
=
dependency
.
resources
.
getDimension
(
R
.
dimen
.
l1
).
roundToInt
()
val
translation
=
dependency
.
height
+
additionalMargin
dependency
.
updateLayoutParams
<
ViewGroup
.
MarginLayoutParams
>
{
bottomMargin
=
viewMargin
}
// checks whether the navigation is not hidden via scroll
if
(
child
.
isVisible
&&
child
.
translationY
<=
0
)
{
child
.
translationY
(-
translation
.
toFloat
())
}
return
false
}
private
fun
onDependentViewRemoved
(
parent
:
CoordinatorLayout
,
child
:
T
,
dependency
:
Snackbar
.
SnackbarLayout
)
{
// checks whether the navigation is not hidden via scroll
if
(
child
.
isVisible
&&
child
.
translationY
<=
0
)
{
child
.
translationY
(
0f
)
}
}
//---
private
fun
View
.
translationY
(
destination
:
Float
)
=
animate
()
.
translationY
(
destination
)
.
setInterpolator
(
FastOutSlowInInterpolator
())
.
start
()
}
\ No newline at end of file
app/src/main/res/layout/activity_main_md2.xml
View file @
b910db32
...
@@ -56,7 +56,6 @@
...
@@ -56,7 +56,6 @@
style=
"?styleCardElevated"
style=
"?styleCardElevated"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
app:layout_behavior=
"com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
android:layout_gravity=
"bottom"
android:layout_gravity=
"bottom"
android:layout_marginStart=
"@dimen/l1"
android:layout_marginStart=
"@dimen/l1"
android:layout_marginEnd=
"@dimen/l1"
android:layout_marginEnd=
"@dimen/l1"
...
...
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