Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
533
Issue boards
Milestones
Wiki
Code
Merge requests
11
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
23e8b21c
Commit
23e8b21c
authored
5 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
About: remove FAB
parent
0bbe0ec5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!264
Fixes for beta
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vlc-android/src/org/videolan/vlc/gui/AboutFragment.kt
+11
-7
11 additions, 7 deletions
vlc-android/src/org/videolan/vlc/gui/AboutFragment.kt
with
11 additions
and
7 deletions
vlc-android/src/org/videolan/vlc/gui/AboutFragment.kt
+
11
−
7
View file @
23e8b21c
...
...
@@ -33,12 +33,15 @@ import androidx.appcompat.app.AppCompatActivity
import
androidx.core.widget.NestedScrollView
import
androidx.fragment.app.Fragment
import
androidx.viewpager.widget.ViewPager
import
com.google.android.material.floatingactionbutton.FloatingActionButton
import
com.google.android.material.tabs.TabLayout
import
kotlinx.coroutines.ExperimentalCoroutinesApi
import
kotlinx.coroutines.ObsoleteCoroutinesApi
import
kotlinx.coroutines.launch
import
org.videolan.tools.coroutineScope
import
org.videolan.tools.setGone
import
org.videolan.vlc.BuildConfig
import
org.videolan.vlc.R
import
org.videolan.vlc.gui.audio.AudioPagerAdapter
import
org.videolan.vlc.gui.helpers.UiTools
...
...
@@ -50,7 +53,7 @@ private const val MODE_TOTAL = 2 // Number of audio browser modes
class
AboutFragment
:
Fragment
()
{
override
fun
onCreateView
(
inflater
:
LayoutInflater
,
container
:
ViewGroup
?,
savedInstanceState
:
Bundle
?):
View
{
return
inflater
.
inflate
(
org
.
videolan
.
vlc
.
R
.
layout
.
about
,
container
,
false
)
return
inflater
.
inflate
(
R
.
layout
.
about
,
container
,
false
)
}
override
fun
onViewCreated
(
view
:
View
,
savedInstanceState
:
Bundle
?)
{
...
...
@@ -58,17 +61,18 @@ class AboutFragment : Fragment() {
(
activity
as
?
AppCompatActivity
)
?.
supportActionBar
?.
title
=
"VLC ${BuildConfig.VERSION_NAME}"
val
aboutMain
=
view
.
findViewById
<
NestedScrollView
>(
org
.
videolan
.
vlc
.
R
.
id
.
about_main
)
val
webView
=
view
.
findViewById
<
WebView
>(
org
.
videolan
.
vlc
.
R
.
id
.
webview
)
val
revision
=
getString
(
org
.
videolan
.
vlc
.
R
.
string
.
build_revision
)
requireActivity
().
findViewById
<
FloatingActionButton
>(
R
.
id
.
fab
).
setGone
()
val
aboutMain
=
view
.
findViewById
<
NestedScrollView
>(
R
.
id
.
about_main
)
val
webView
=
view
.
findViewById
<
WebView
>(
R
.
id
.
webview
)
val
revision
=
getString
(
R
.
string
.
build_revision
)
val
lists
=
arrayOf
(
aboutMain
,
webView
)
val
titles
=
arrayOf
(
getString
(
org
.
videolan
.
vlc
.
R
.
string
.
about
),
getString
(
org
.
videolan
.
vlc
.
R
.
string
.
licence
))
val
viewPager
=
view
.
findViewById
<
ViewPager
>(
org
.
videolan
.
vlc
.
R
.
id
.
pager
).
apply
{
val
titles
=
arrayOf
(
getString
(
R
.
string
.
about
),
getString
(
R
.
string
.
licence
))
val
viewPager
=
view
.
findViewById
<
ViewPager
>(
R
.
id
.
pager
).
apply
{
offscreenPageLimit
=
MODE_TOTAL
-
1
adapter
=
AudioPagerAdapter
(
lists
as
Array
<
View
>,
titles
)
}
requireActivity
().
findViewById
<
TabLayout
>(
org
.
videolan
.
vlc
.
R
.
id
.
sliding_tabs
).
apply
{
requireActivity
().
findViewById
<
TabLayout
>(
R
.
id
.
sliding_tabs
).
apply
{
visibility
=
View
.
VISIBLE
setupWithViewPager
(
viewPager
)
}
...
...
This diff is collapsed.
Click to expand it.
Geoffrey Métais
@Dekans
mentioned in commit
78660e74
·
5 years ago
mentioned in commit
78660e74
mentioned in commit 78660e743a25d93a2996e41af2d9a05064dcf660
Toggle commit list
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