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
f88e812b
Commit
f88e812b
authored
Feb 13, 2021
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move behavior to XML
parent
be6386c4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
17 deletions
+12
-17
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+0
-10
HideBottomViewOnScrollBehavior.kt
.../topjohnwu/magisk/utils/HideBottomViewOnScrollBehavior.kt
+5
-3
HideTopViewOnScrollBehavior.kt
...com/topjohnwu/magisk/utils/HideTopViewOnScrollBehavior.kt
+5
-4
activity_main_md2.xml
app/src/main/res/layout/activity_main_md2.xml
+2
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
f88e812b
...
@@ -10,9 +10,7 @@ import android.view.WindowManager
...
@@ -10,9 +10,7 @@ import android.view.WindowManager
import
androidx.coordinatorlayout.widget.CoordinatorLayout
import
androidx.coordinatorlayout.widget.CoordinatorLayout
import
androidx.core.content.pm.ShortcutManagerCompat
import
androidx.core.content.pm.ShortcutManagerCompat
import
androidx.core.view.forEach
import
androidx.core.view.forEach
import
androidx.core.view.updateLayoutParams
import
androidx.navigation.NavDirections
import
androidx.navigation.NavDirections
import
com.google.android.material.card.MaterialCardView
import
com.topjohnwu.magisk.MainDirections
import
com.topjohnwu.magisk.MainDirections
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseUIActivity
import
com.topjohnwu.magisk.arch.BaseUIActivity
...
@@ -22,8 +20,6 @@ import com.topjohnwu.magisk.core.*
...
@@ -22,8 +20,6 @@ import com.topjohnwu.magisk.core.*
import
com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
import
com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
import
com.topjohnwu.magisk.ktx.startAnimations
import
com.topjohnwu.magisk.ktx.startAnimations
import
com.topjohnwu.magisk.ui.home.HomeFragmentDirections
import
com.topjohnwu.magisk.ui.home.HomeFragmentDirections
import
com.topjohnwu.magisk.utils.HideBottomViewOnScrollBehavior
import
com.topjohnwu.magisk.utils.HideTopViewOnScrollBehavior
import
com.topjohnwu.magisk.utils.HideableBehavior
import
com.topjohnwu.magisk.utils.HideableBehavior
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.magisk.view.MagiskDialog
...
@@ -77,12 +73,6 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
...
@@ -77,12 +73,6 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
setSupportActionBar
(
binding
.
mainToolbar
)
setSupportActionBar
(
binding
.
mainToolbar
)
binding
.
mainToolbarWrapper
.
updateLayoutParams
<
CoordinatorLayout
.
LayoutParams
>
{
behavior
=
HideTopViewOnScrollBehavior
<
MaterialCardView
>()
}
binding
.
mainBottomBar
.
updateLayoutParams
<
CoordinatorLayout
.
LayoutParams
>
{
behavior
=
HideBottomViewOnScrollBehavior
<
MaterialCardView
>()
}
binding
.
mainNavigation
.
setOnNavigationItemSelectedListener
{
binding
.
mainNavigation
.
setOnNavigationItemSelectedListener
{
getScreen
(
it
.
itemId
)
?.
navigate
()
getScreen
(
it
.
itemId
)
?.
navigate
()
true
true
...
...
app/src/main/java/com/topjohnwu/magisk/utils/HideBottomViewOnScrollBehavior.kt
View file @
f88e812b
package
com.topjohnwu.magisk.utils
package
com.topjohnwu.magisk.utils
import
android.content.Context
import
android.util.AttributeSet
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
import
androidx.coordinatorlayout.widget.CoordinatorLayout
import
androidx.coordinatorlayout.widget.CoordinatorLayout
...
@@ -13,8 +15,8 @@ import com.topjohnwu.magisk.R
...
@@ -13,8 +15,8 @@ import com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.Info
import
kotlin.math.roundToInt
import
kotlin.math.roundToInt
class
HideBottomViewOnScrollBehavior
<
V
:
View
>
:
HideBottomViewOnScrollBehavior
<
V
>(),
class
HideBottomViewOnScrollBehavior
<
V
:
View
>
(
context
:
Context
,
attrs
:
AttributeSet
)
:
HideableBehavior
<
V
>
{
Hide
BottomViewOnScrollBehavior
<
V
>(),
Hide
ableBehavior
<
V
>
{
private
var
lockState
:
Boolean
=
false
private
var
lockState
:
Boolean
=
false
private
var
isLaidOut
=
false
private
var
isLaidOut
=
false
...
@@ -122,4 +124,4 @@ class HideBottomViewOnScrollBehavior<V : View> : HideBottomViewOnScrollBehavior<
...
@@ -122,4 +124,4 @@ class HideBottomViewOnScrollBehavior<V : View> : HideBottomViewOnScrollBehavior<
.
setInterpolator
(
FastOutSlowInInterpolator
())
.
setInterpolator
(
FastOutSlowInInterpolator
())
.
start
()
.
start
()
}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/utils/HideTopViewOnScrollBehavior.kt
View file @
f88e812b
package
com.topjohnwu.magisk.utils
package
com.topjohnwu.magisk.utils
import
android.animation.TimeInterpolator
import
android.animation.TimeInterpolator
import
android.content.Context
import
android.util.AttributeSet
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
import
android.view.ViewPropertyAnimator
import
android.view.ViewPropertyAnimator
...
@@ -8,9 +10,8 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
...
@@ -8,9 +10,8 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
import
androidx.core.view.ViewCompat
import
androidx.core.view.ViewCompat
import
com.google.android.material.animation.AnimationUtils
import
com.google.android.material.animation.AnimationUtils
class
HideTopViewOnScrollBehavior
<
V
:
View
>
:
class
HideTopViewOnScrollBehavior
<
V
:
View
>(
context
:
Context
,
attrs
:
AttributeSet
)
:
CoordinatorLayout
.
Behavior
<
V
>(),
CoordinatorLayout
.
Behavior
<
V
>(),
HideableBehavior
<
V
>
{
HideableBehavior
<
V
>
{
companion
object
{
companion
object
{
private
const
val
STATE_SCROLLED_DOWN
=
1
private
const
val
STATE_SCROLLED_DOWN
=
1
...
@@ -139,4 +140,4 @@ class HideTopViewOnScrollBehavior<V : View> :
...
@@ -139,4 +140,4 @@ class HideTopViewOnScrollBehavior<V : View> :
.
setDuration
(
duration
)
.
setDuration
(
duration
)
.
withEndAction
{
currentAnimator
=
null
}
.
withEndAction
{
currentAnimator
=
null
}
.
let
{
currentAnimator
=
it
}
.
let
{
currentAnimator
=
it
}
}
}
\ No newline at end of file
app/src/main/res/layout/activity_main_md2.xml
View file @
f88e812b
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
style=
"@style/WidgetFoundation.Appbar"
style=
"@style/WidgetFoundation.Appbar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
app:layout_behavior=
".utils.HideTopViewOnScrollBehavior"
app:fitsSystemWindowsInsets=
"top"
>
app:fitsSystemWindowsInsets=
"top"
>
<com.google.android.material.appbar.MaterialToolbar
<com.google.android.material.appbar.MaterialToolbar
...
@@ -76,6 +77,7 @@
...
@@ -76,6 +77,7 @@
android:layout_marginBottom=
"@dimen/l1"
android:layout_marginBottom=
"@dimen/l1"
android:fitsSystemWindows=
"false"
android:fitsSystemWindows=
"false"
app:layout_fitsSystemWindowsInsets=
"bottom"
app:layout_fitsSystemWindowsInsets=
"bottom"
app:layout_behavior=
".utils.HideBottomViewOnScrollBehavior"
tools:layout_marginBottom=
"64dp"
>
tools:layout_marginBottom=
"64dp"
>
<com.google.android.material.bottomnavigation.BottomNavigationView
<com.google.android.material.bottomnavigation.BottomNavigationView
...
...
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