Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
532
Issue boards
Milestones
Wiki
Code
Merge requests
14
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
88569c0e
Commit
88569c0e
authored
4 years ago
by
Nicolas Pomepuy
Browse files
Options
Downloads
Patches
Plain Diff
Make Toolbar snap and expand when changing fragment
Fixes #1310
parent
9515dec7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!670
Fixes for beta
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
application/vlc-android/res/layout/toolbar.xml
+1
-1
1 addition, 1 deletion
application/vlc-android/res/layout/toolbar.xml
application/vlc-android/src/org/videolan/vlc/gui/helpers/Navigator.kt
+7
-0
7 additions, 0 deletions
...vlc-android/src/org/videolan/vlc/gui/helpers/Navigator.kt
with
8 additions
and
1 deletion
application/vlc-android/res/layout/toolbar.xml
+
1
−
1
View file @
88569c0e
...
...
@@ -14,7 +14,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/toolbar_height"
android:keyboardNavigationCluster=
"true"
app:layout_scrollFlags=
"scroll|enterAlways"
app:layout_scrollFlags=
"scroll|enterAlways
|snap
"
app:navigationContentDescription=
"@string/abc_action_bar_up_description"
app:navigationIcon=
"?attr/homeAsUpIndicator"
app:popupTheme=
"?attr/toolbar_popup_style"
...
...
This diff is collapsed.
Click to expand it.
application/vlc-android/src/org/videolan/vlc/gui/helpers/Navigator.kt
+
7
−
0
View file @
88569c0e
...
...
@@ -27,6 +27,7 @@ import android.content.*
import
android.os.Bundle
import
android.os.IBinder
import
android.view.MenuItem
import
androidx.coordinatorlayout.widget.CoordinatorLayout
import
androidx.core.content.edit
import
androidx.core.os.bundleOf
import
androidx.fragment.app.Fragment
...
...
@@ -34,6 +35,7 @@ import androidx.fragment.app.FragmentManager
import
androidx.lifecycle.Lifecycle
import
androidx.lifecycle.LifecycleObserver
import
androidx.lifecycle.OnLifecycleEvent
import
com.google.android.material.appbar.AppBarLayout
import
com.google.android.material.bottomnavigation.BottomNavigationView
import
kotlinx.coroutines.ExperimentalCoroutinesApi
import
kotlinx.coroutines.ObsoleteCoroutinesApi
...
...
@@ -67,6 +69,7 @@ class Navigator : BottomNavigationView.OnNavigationItemSelectedListener, Lifecyc
private
lateinit
var
settings
:
SharedPreferences
private
var
extensionsService
:
ExtensionManagerService
?
=
null
override
lateinit
var
navigationView
:
BottomNavigationView
override
lateinit
var
appbarLayout
:
AppBarLayout
override
lateinit
var
extensionsManager
:
ExtensionsManager
override
var
extensionServiceConnection
:
ServiceConnection
?
=
null
...
...
@@ -83,6 +86,7 @@ class Navigator : BottomNavigationView.OnNavigationItemSelectedListener, Lifecyc
}
lifecycle
.
addObserver
(
this
@Navigator
)
navigationView
=
findViewById
(
R
.
id
.
navigation
)
appbarLayout
=
findViewById
(
R
.
id
.
appbar
)
}
@OnLifecycleEvent
(
Lifecycle
.
Event
.
ON_START
)
...
...
@@ -174,6 +178,8 @@ class Navigator : BottomNavigationView.OnNavigationItemSelectedListener, Lifecyc
override
fun
onNavigationItemSelected
(
item
:
MenuItem
):
Boolean
{
val
id
=
item
.
itemId
val
current
=
currentFragment
appbarLayout
.
setExpanded
(
true
,
true
)
if
(
item
.
groupId
==
R
.
id
.
extensions_group
)
{
if
(
currentFragmentId
==
id
)
{
clearBackstackFromClass
(
ExtensionBrowser
::
class
.
java
)
...
...
@@ -300,6 +306,7 @@ class Navigator : BottomNavigationView.OnNavigationItemSelectedListener, Lifecyc
interface
INavigator
{
var
navigationView
:
BottomNavigationView
var
appbarLayout
:
AppBarLayout
var
currentFragmentId
:
Int
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment