Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
531
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
38d76ce1
Commit
38d76ce1
authored
3 years ago
by
Nicolas Pomepuy
Browse files
Options
Downloads
Patches
Plain Diff
Code cleanup
parent
afa672cf
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1015
Code cleanup
Pipeline
#109746
passed with stage
in 2 minutes and 43 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
application/television/src/main/java/org/videolan/television/ui/TvUtil.kt
+33
-42
33 additions, 42 deletions
...vision/src/main/java/org/videolan/television/ui/TvUtil.kt
with
33 additions
and
42 deletions
application/television/src/main/java/org/videolan/television/ui/TvUtil.kt
+
33
−
42
View file @
38d76ce1
...
...
@@ -134,20 +134,20 @@ object TvUtil {
@Suppress
(
"UNCHECKED_CAST"
)
fun
openMedia
(
activity
:
FragmentActivity
,
item
:
Any
?,
model
:
BaseModel
<
out
MediaLibraryItem
>?)
{
when
(
item
)
{
is
MediaWrapper
->
when
{
item
.
type
==
MediaWrapper
.
TYPE_AUDIO
->
{
is
MediaWrapper
->
when
(
item
.
type
)
{
MediaWrapper
.
TYPE_AUDIO
->
{
val
list
=
(
model
?.
dataset
?.
getList
()
as
?
List
<
MediaWrapper
>)
?.
filter
{
it
.
type
!=
MediaWrapper
.
TYPE_DIR
}
?:
return
?:
return
val
position
=
list
.
getposition
(
item
)
playAudioList
(
activity
,
list
,
position
)
}
item
.
type
==
MediaWrapper
.
TYPE_DIR
->
{
MediaWrapper
.
TYPE_DIR
->
{
val
intent
=
Intent
(
activity
,
VerticalGridActivity
::
class
.
java
)
intent
.
putExtra
(
MainTvActivity
.
BROWSER_TYPE
,
if
(
"file"
==
item
.
uri
.
scheme
)
HEADER_DIRECTORIES
else
HEADER_NETWORK
)
intent
.
data
=
item
.
uri
activity
.
startActivity
(
intent
)
}
item
.
type
==
MediaWrapper
.
TYPE_GROUP
->
{
MediaWrapper
.
TYPE_GROUP
->
{
val
intent
=
Intent
(
activity
,
VerticalGridActivity
::
class
.
java
)
intent
.
putExtra
(
MainTvActivity
.
BROWSER_TYPE
,
HEADER_VIDEO
)
val
title
=
item
.
title
.
substring
(
if
(
item
.
title
.
toLowerCase
().
startsWith
(
"the"
))
4
else
0
)
...
...
@@ -162,14 +162,14 @@ object TvUtil {
}
?:
MediaUtils
.
openMedia
(
activity
,
item
)
}
}
is
DummyItem
->
when
{
item
.
id
==
HEADER_STREAM
->
{
is
DummyItem
->
when
(
item
.
id
)
{
HEADER_STREAM
->
{
val
intent
=
Intent
(
activity
,
TVActivity
::
class
.
java
)
intent
.
putExtra
(
MainTvActivity
.
BROWSER_TYPE
,
HEADER_STREAM
)
activity
.
startActivity
(
intent
)
}
item
.
id
==
HEADER_SERVER
->
activity
.
startActivity
(
Intent
(
activity
,
DialogActivity
::
class
.
java
).
setAction
(
DialogActivity
.
KEY_SERVER
)
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
))
HEADER_SERVER
->
activity
.
startActivity
(
Intent
(
activity
,
DialogActivity
::
class
.
java
).
setAction
(
DialogActivity
.
KEY_SERVER
)
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
))
else
->
{
val
intent
=
Intent
(
activity
,
VerticalGridActivity
::
class
.
java
)
intent
.
putExtra
(
MainTvActivity
.
BROWSER_TYPE
,
item
.
id
)
...
...
@@ -183,19 +183,19 @@ object TvUtil {
@Suppress
(
"UNCHECKED_CAST"
)
fun
openMedia
(
activity
:
FragmentActivity
,
item
:
Any
?,
model
:
BrowserModel
)
{
when
(
item
)
{
is
MediaWrapper
->
when
{
item
.
type
==
MediaWrapper
.
TYPE_AUDIO
->
{
is
MediaWrapper
->
when
(
item
.
type
)
{
MediaWrapper
.
TYPE_AUDIO
->
{
val
list
=
(
model
.
dataset
.
getList
()
as
List
<
MediaWrapper
>).
filter
{
it
.
type
!=
MediaWrapper
.
TYPE_DIR
}
val
position
=
list
.
getposition
(
item
)
playAudioList
(
activity
,
list
,
position
)
}
item
.
type
==
MediaWrapper
.
TYPE_DIR
->
{
MediaWrapper
.
TYPE_DIR
->
{
val
intent
=
Intent
(
activity
,
VerticalGridActivity
::
class
.
java
)
intent
.
putExtra
(
MainTvActivity
.
BROWSER_TYPE
,
if
(
"file"
==
item
.
uri
.
scheme
)
HEADER_DIRECTORIES
else
HEADER_NETWORK
)
intent
.
data
=
item
.
uri
activity
.
startActivity
(
intent
)
}
item
.
type
==
MediaWrapper
.
TYPE_GROUP
->
{
MediaWrapper
.
TYPE_GROUP
->
{
val
intent
=
Intent
(
activity
,
VerticalGridActivity
::
class
.
java
)
intent
.
putExtra
(
MainTvActivity
.
BROWSER_TYPE
,
HEADER_VIDEO
)
val
title
=
item
.
title
.
substring
(
if
(
item
.
title
.
toLowerCase
().
startsWith
(
"the"
))
4
else
0
)
...
...
@@ -210,14 +210,14 @@ object TvUtil {
}
}
}
is
DummyItem
->
when
{
item
.
id
==
HEADER_STREAM
->
{
is
DummyItem
->
when
(
item
.
id
)
{
HEADER_STREAM
->
{
val
intent
=
Intent
(
activity
,
TVActivity
::
class
.
java
)
intent
.
putExtra
(
MainTvActivity
.
BROWSER_TYPE
,
HEADER_STREAM
)
activity
.
startActivity
(
intent
)
}
item
.
id
==
HEADER_SERVER
->
activity
.
startActivity
(
Intent
(
activity
,
DialogActivity
::
class
.
java
).
setAction
(
DialogActivity
.
KEY_SERVER
)
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
))
HEADER_SERVER
->
activity
.
startActivity
(
Intent
(
activity
,
DialogActivity
::
class
.
java
).
setAction
(
DialogActivity
.
KEY_SERVER
)
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
))
else
->
{
val
intent
=
Intent
(
activity
,
VerticalGridActivity
::
class
.
java
)
intent
.
putExtra
(
MainTvActivity
.
BROWSER_TYPE
,
item
.
id
)
...
...
@@ -231,21 +231,21 @@ object TvUtil {
@Suppress
(
"UNCHECKED_CAST"
)
suspend
fun
openMediaFromPaged
(
activity
:
FragmentActivity
,
item
:
Any
?,
provider
:
MedialibraryProvider
<
out
MediaLibraryItem
>)
{
when
(
item
)
{
is
MediaWrapper
->
when
{
item
.
type
==
MediaWrapper
.
TYPE_AUDIO
->
{
is
MediaWrapper
->
when
(
item
.
type
)
{
MediaWrapper
.
TYPE_AUDIO
->
{
val
list
=
withContext
(
Dispatchers
.
IO
)
{
(
provider
.
getAll
().
toList
()).
filter
{
it
.
itemType
!=
MediaWrapper
.
TYPE_DIR
}
as
ArrayList
<
MediaWrapper
>
}
val
position
=
list
.
getposition
(
item
)
playAudioList
(
activity
,
list
,
position
)
}
item
.
type
==
MediaWrapper
.
TYPE_DIR
->
{
MediaWrapper
.
TYPE_DIR
->
{
val
intent
=
Intent
(
activity
,
VerticalGridActivity
::
class
.
java
)
intent
.
putExtra
(
MainTvActivity
.
BROWSER_TYPE
,
if
(
"file"
==
item
.
uri
.
scheme
)
HEADER_DIRECTORIES
else
HEADER_NETWORK
)
intent
.
data
=
item
.
uri
activity
.
startActivity
(
intent
)
}
item
.
type
==
MediaWrapper
.
TYPE_GROUP
->
{
MediaWrapper
.
TYPE_GROUP
->
{
val
intent
=
Intent
(
activity
,
VerticalGridActivity
::
class
.
java
)
intent
.
putExtra
(
MainTvActivity
.
BROWSER_TYPE
,
HEADER_VIDEO
)
val
title
=
item
.
title
.
substring
(
if
(
item
.
title
.
toLowerCase
().
startsWith
(
"the"
))
4
else
0
)
...
...
@@ -260,14 +260,14 @@ object TvUtil {
MediaUtils
.
openList
(
activity
,
list
,
position
)
}
}
is
DummyItem
->
when
{
item
.
id
==
HEADER_STREAM
->
{
is
DummyItem
->
when
(
item
.
id
)
{
HEADER_STREAM
->
{
val
intent
=
Intent
(
activity
,
TVActivity
::
class
.
java
)
intent
.
putExtra
(
MainTvActivity
.
BROWSER_TYPE
,
HEADER_STREAM
)
activity
.
startActivity
(
intent
)
}
item
.
id
==
HEADER_SERVER
->
activity
.
startActivity
(
Intent
(
activity
,
DialogActivity
::
class
.
java
).
setAction
(
DialogActivity
.
KEY_SERVER
)
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
))
HEADER_SERVER
->
activity
.
startActivity
(
Intent
(
activity
,
DialogActivity
::
class
.
java
).
setAction
(
DialogActivity
.
KEY_SERVER
)
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
))
else
->
{
val
intent
=
Intent
(
activity
,
VerticalGridActivity
::
class
.
java
)
intent
.
putExtra
(
MainTvActivity
.
BROWSER_TYPE
,
item
.
id
)
...
...
@@ -286,17 +286,6 @@ object TvUtil {
activity
.
startActivity
(
intent
)
}
fun
browseFolder
(
activity
:
Activity
,
type
:
Long
,
uri
:
Uri
)
{
val
intent
=
Intent
(
activity
,
VerticalGridActivity
::
class
.
java
)
intent
.
putExtra
(
MainTvActivity
.
BROWSER_TYPE
,
type
)
intent
.
data
=
uri
activity
.
startActivity
(
intent
)
}
private
fun
playAudioList
(
activity
:
Activity
,
array
:
Array
<
MediaWrapper
>,
position
:
Int
)
{
playAudioList
(
activity
,
array
.
toList
(),
position
)
}
private
fun
playAudioList
(
activity
:
Activity
,
list
:
List
<
MediaWrapper
>,
position
:
Int
)
{
MediaUtils
.
openList
(
activity
,
list
,
position
)
val
intent
=
Intent
(
activity
,
AudioPlayerActivity
::
class
.
java
)
...
...
@@ -304,13 +293,13 @@ object TvUtil {
}
fun
openAudioCategory
(
context
:
Activity
,
mediaLibraryItem
:
MediaLibraryItem
)
{
when
{
mediaLibraryItem
.
itemType
==
MediaLibraryItem
.
TYPE_ALBUM
||
mediaLibraryItem
.
itemType
==
MediaLibraryItem
.
TYPE_PLAYLIST
->
{
when
(
mediaLibraryItem
.
itemType
)
{
MediaLibraryItem
.
TYPE_ALBUM
,
MediaLibraryItem
.
TYPE_PLAYLIST
->
{
val
intent
=
Intent
(
context
,
MediaListActivity
::
class
.
java
)
intent
.
putExtra
(
ITEM
,
mediaLibraryItem
)
context
.
startActivity
(
intent
)
}
mediaLibraryItem
.
itemType
==
MediaLibraryItem
.
TYPE_MEDIA
->
{
MediaLibraryItem
.
TYPE_MEDIA
->
{
val
list
=
ArrayList
<
MediaWrapper
>().
apply
{
add
(
mediaLibraryItem
as
MediaWrapper
)
}
playAudioList
(
context
,
list
,
0
)
}
...
...
@@ -325,6 +314,8 @@ object TvUtil {
}
}
@ObsoleteCoroutinesApi
@ExperimentalCoroutinesApi
@Suppress
(
"UNNECESSARY_SAFE_CALL"
)
@RequiresApi
(
api
=
Build
.
VERSION_CODES
.
JELLY_BEAN_MR1
)
fun
CoroutineScope
.
updateBackground
(
activity
:
Activity
,
bm
:
BackgroundManager
?,
item
:
Any
?)
{
...
...
@@ -341,7 +332,7 @@ fun CoroutineScope.updateBackground(activity: Activity, bm: BackgroundManager?,
UiTools
.
blurBitmap
(
cover
,
10f
)
}
if
(!
isActive
)
return
@launch
blurred
?.
let
{
bm
?.
drawable
=
BitmapDrawable
(
activity
.
resources
,
blurred
)
}
blurred
?.
let
{
bm
?.
drawable
=
BitmapDrawable
(
activity
.
resources
,
it
)
}
}
else
if
(
item
.
itemType
==
MediaLibraryItem
.
TYPE_PLAYLIST
)
{
val
blurred
=
withContext
(
Dispatchers
.
IO
)
{
var
cover
:
Bitmap
?
=
ThumbnailsProvider
.
getPlaylistOrGenreImage
(
"playlist:${item.id}_512"
,
item
.
tracks
.
toList
(),
512
)
...
...
@@ -350,7 +341,7 @@ fun CoroutineScope.updateBackground(activity: Activity, bm: BackgroundManager?,
UiTools
.
blurBitmap
(
cover
,
10f
)
}
if
(!
isActive
)
return
@launch
blurred
?.
let
{
bm
?.
drawable
=
BitmapDrawable
(
activity
.
resources
,
blurred
)
}
blurred
?.
let
{
bm
?.
drawable
=
BitmapDrawable
(
activity
.
resources
,
it
)
}
}
}
else
if
(
item
is
MediaMetadataWithImages
)
launch
{
val
blurred
=
withContext
(
Dispatchers
.
IO
)
{
...
...
@@ -359,7 +350,7 @@ fun CoroutineScope.updateBackground(activity: Activity, bm: BackgroundManager?,
UiTools
.
blurBitmap
(
cover
,
10f
)
}
if
(!
isActive
)
return
@launch
blurred
?.
let
{
bm
?.
drawable
=
BitmapDrawable
(
activity
.
resources
,
blurred
)
}
blurred
?.
let
{
bm
?.
drawable
=
BitmapDrawable
(
activity
.
resources
,
it
)
}
}
}
...
...
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