Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC-Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
c99733a5
Commit
c99733a5
authored
Mar 01, 2017
by
Geoffrey Métais
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Factorize audio player layout
parent
c418caf8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
50 deletions
+22
-50
vlc-android/res/layout/audioplayercontainer.xml
vlc-android/res/layout/audioplayercontainer.xml
+17
-0
vlc-android/res/layout/info_activity.xml
vlc-android/res/layout/info_activity.xml
+2
-13
vlc-android/res/layout/main.xml
vlc-android/res/layout/main.xml
+1
-12
vlc-android/res/layout/playlist_activity.xml
vlc-android/res/layout/playlist_activity.xml
+1
-13
vlc-android/res/layout/secondary.xml
vlc-android/res/layout/secondary.xml
+1
-12
No files found.
vlc-android/res/layout/audioplayercontainer.xml
0 → 100644
View file @
c99733a5
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/audio_player_container"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:elevation=
"@dimen/audio_player_elevation"
android:visibility=
"gone"
app:layout_behavior=
"org.videolan.vlc.gui.helpers.BottomSheetBehavior"
tools:targetApi=
"lollipop"
>
<android.support.v7.widget.ViewStubCompat
android:id=
"@+id/audio_player_stub"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout=
"@layout/audioplayer"
/>
</FrameLayout>
\ No newline at end of file
vlc-android/res/layout/info_activity.xml
View file @
c99733a5
...
...
@@ -159,18 +159,7 @@
android:src=
"@drawable/ic_fab_play"
android:tint=
"@color/grey50"
/>
<FrameLayout
android:id=
"@+id/audio_player_container"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:elevation=
"@dimen/audio_player_elevation"
android:visibility=
"gone"
vlc:layout_behavior=
"android.support.design.widget.BottomSheetBehavior"
>
<android.support.v7.widget.ViewStubCompat
android:id=
"@+id/audio_player_stub"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout=
"@layout/audioplayer"
/>
</FrameLayout>
<include
layout=
"@layout/audioplayercontainer"
/>
</android.support.design.widget.CoordinatorLayout>
</layout>
\ No newline at end of file
vlc-android/res/layout/main.xml
View file @
c99733a5
...
...
@@ -24,18 +24,7 @@
android:layout_height=
"match_parent"
app:layout_behavior=
"@string/appbar_scrolling_view_behavior"
/>
<FrameLayout
android:id=
"@+id/audio_player_container"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:visibility=
"gone"
app:layout_behavior=
"org.videolan.vlc.gui.helpers.BottomSheetBehavior"
>
<android.support.v7.widget.ViewStubCompat
android:id=
"@+id/audio_player_stub"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout=
"@layout/audioplayer"
/>
</FrameLayout>
<include
layout=
"@layout/audioplayercontainer"
/>
<android.support.design.widget.FloatingActionButton
android:id=
"@+id/fab"
...
...
vlc-android/res/layout/playlist_activity.xml
View file @
c99733a5
...
...
@@ -75,18 +75,6 @@
android:src=
"@drawable/ic_fab_play"
android:tint=
"@color/grey50"
/>
<FrameLayout
android:id=
"@+id/audio_player_container"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:visibility=
"gone"
android:elevation=
"@dimen/audio_player_elevation"
vlc:layout_behavior=
"android.support.design.widget.BottomSheetBehavior"
>
<android.support.v7.widget.ViewStubCompat
android:id=
"@+id/audio_player_stub"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout=
"@layout/audioplayer"
/>
</FrameLayout>
<include
layout=
"@layout/audioplayercontainer"
/>
</android.support.design.widget.CoordinatorLayout>
</layout>
\ No newline at end of file
vlc-android/res/layout/secondary.xml
View file @
c99733a5
...
...
@@ -17,18 +17,7 @@
vlc:layout_behavior=
"@string/appbar_scrolling_view_behavior"
android:layout_height=
"match_parent"
/>
<FrameLayout
android:id=
"@+id/audio_player_container"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:visibility=
"gone"
vlc:layout_behavior=
"org.videolan.vlc.gui.helpers.BottomSheetBehavior"
>
<android.support.v7.widget.ViewStubCompat
android:id=
"@+id/audio_player_stub"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout=
"@layout/audioplayer"
/>
</FrameLayout>
<include
layout=
"@layout/audioplayercontainer"
/>
<android.support.design.widget.FloatingActionButton
vlc:borderWidth=
"0dp"
...
...
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