Compare revisions

Nicolas Pomepuy · Geoffrey Métais · Nicolas Pomepuy · Geoffrey Métais · Geoffrey Métais · Nicolas Pomepuy
--- a/vlc-android/assets/licence.htm
+++ b/vlc-android/assets/licence.htm
@@ -9,7 +9,7 @@

 <body id="top" style="background-color: #EBEBEE">
    <h1>VLC for Android</h1>
-    <p>Copyleft &copy; 1996-2018 VideoLAN, VLC authors</p>
+    <p>Copyleft &copy; 1996-2019 VideoLAN, VLC authors</p>
    <div>
      <h2>License</h2>
        <p>VLC for Android is licensed under the <a href="#gpl">GNU General Public License, version 3 or later</a> (herein referred to as GPL).</p>

--- a/vlc-android/res/layout/audio_browser_card_item.xml
+++ b/vlc-android/res/layout/audio_browser_card_item.xml
@@ -59,19 +59,19 @@
            <!-- Image loading is handled by org.videolan.vlc.gui.helpers.ImageLoader.loadImage() -->

            <ImageView
-                android:id="@+id/media_cover"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_gravity="center"
-                android:background="@{cover}"
-                android:visibility="@{(item.getItemType() &amp; (MediaLibraryItem.TYPE_ALBUM|MediaLibraryItem.TYPE_ARTIST|MediaLibraryItem.TYPE_MEDIA|MediaLibraryItem.TYPE_PLAYLIST)) != 0 ? View.VISIBLE : View.GONE, default=gone}"
-                tools:srcCompat="@tools:sample/avatars"
-                vlc:imageWidth="@{imageWidth}"
-                vlc:layout_constraintDimensionRatio="1"
-                vlc:layout_constraintEnd_toEndOf="parent"
-                vlc:layout_constraintStart_toStartOf="parent"
-                vlc:layout_constraintTop_toTopOf="parent"
-                vlc:mediaWithWidth="@{item}" />
+                    android:id="@+id/media_cover"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_gravity="center"
+                    android:background="@{cover}"
+                    android:visibility="@{(item.getItemType() &amp; (MediaLibraryItem.TYPE_ALBUM|MediaLibraryItem.TYPE_ARTIST|MediaLibraryItem.TYPE_MEDIA|MediaLibraryItem.TYPE_PLAYLIST)) != 0 ? View.VISIBLE : View.GONE, default=gone}"
+                    tools:srcCompat="@tools:sample/avatars"
+                    vlc:imageWidth="@{imageWidth}"
+                    vlc:layout_constraintDimensionRatio="1"
+                    vlc:layout_constraintEnd_toEndOf="parent"
+                    vlc:layout_constraintStart_toStartOf="parent"
+                    vlc:layout_constraintTop_toTopOf="parent"
+                    vlc:media="@{item}"/>


            <!-- TextView must be set to singleLine

--- a/vlc-android/res/layout/playlist_item.xml
+++ b/vlc-android/res/layout/playlist_item.xml
@@ -48,10 +48,11 @@
                app:layout_constraintStart_toStartOf="parent"
                />

-        <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+        <org.videolan.vlc.gui.view.MiniVisualizer
+                android:layout_width="24dp"
+                android:layout_height="24dp"
                android:id="@+id/playing"
+                app:bar_color="?attr/player_icon_color"
                app:layout_constraintTop_toTopOf="parent"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toStartOf="@+id/item_more"

--- a/vlc-android/res/layout/tv_playlist_item.xml
+++ b/vlc-android/res/layout/tv_playlist_item.xml
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+    <data>
+        <import type="org.videolan.vlc.media.MediaUtils" />
+        <variable
+            name="bgColor"
+            type="int" />
+        <variable
+            name="media"
+            type="org.videolan.medialibrary.interfaces.media.AbstractMediaWrapper" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:focusable="true"
+            android:clickable="true"
+            android:background="@{bgColor}">
+
+        <TextView
+                android:id="@+id/title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="@{MediaUtils.INSTANCE.getMediaTitle(media)}"
+                android:textColor="@color/grey50"
+                app:layout_constraintStart_toStartOf="parent"
+                tools:text="Symphony n°1"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintBottom_toTopOf="@+id/artist"
+                app:layout_constraintEnd_toStartOf="@+id/playing"
+                android:layout_marginEnd="8dp"
+                android:textStyle="bold"
+                android:layout_marginStart="8dp"
+                app:layout_constraintVertical_chainStyle="packed"/>
+
+        <TextView
+                android:id="@+id/artist"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="@{MediaUtils.INSTANCE.getMediaArtist(context, media)}"
+                android:textColor="@color/grey50"
+                tools:text="Beethoven"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/title"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintEnd_toStartOf="@+id/playing"
+                android:layout_marginEnd="8dp"
+                android:layout_marginStart="8dp"/>
+
+        <org.videolan.vlc.gui.view.MiniVisualizer
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:id="@+id/playing"
+                app:bar_color="?attr/player_icon_color"
+                android:layout_marginBottom="8dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_marginEnd="8dp"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
--- a/vlc-android/res/layout/tv_simple_list_item.xml
+++ b/vlc-android/res/layout/tv_simple_list_item.xml
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-    <data>
-        <import type="org.videolan.vlc.media.MediaUtils" />
-        <variable
-            name="bgColor"
-            type="int" />
-        <variable
-            name="media"
-            type="org.videolan.medialibrary.interfaces.media.AbstractMediaWrapper" />
-    </data>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:padding="@dimen/half_default_margin"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:focusable="true"
-    android:clickable="true"
-    android:orientation="vertical"
-    android:background="@{bgColor}">
-
-    <TextView android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@{MediaUtils.INSTANCE.getMediaTitle(media)}"
-        android:textColor="@color/grey50" />
-
-    <TextView android:id="@+id/artist"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@{MediaUtils.INSTANCE.getMediaArtist(context, media)}"
-        android:textColor="@color/grey50" />
-
-</LinearLayout>
-</layout>
\ No newline at end of file
--- a/vlc-android/res/layout/view_mini_visualizer.xml
+++ b/vlc-android/res/layout/view_mini_visualizer.xml
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <View
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/visualizer1"
+            android:layout_margin="1dp"
+            android:layout_weight="1"/>
+
+    <View
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/visualizer2"
+            android:layout_margin="1dp"
+            android:layout_weight="1"/>
+
+    <View
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/visualizer3"
+            android:layout_margin="1dp"
+            android:layout_weight="1"/>
+</LinearLayout>
\ No newline at end of file
--- a/vlc-android/res/values/attrs.xml
+++ b/vlc-android/res/values/attrs.xml
@@ -86,6 +86,10 @@
        <attr name="overhangSize" format="dimension" />
    </declare-styleable>

+    <declare-styleable name="MiniVisualizer">
+        <attr name="bar_color" format="reference"/>
+    </declare-styleable>
+
    <attr name="marginTopContent" format="dimension" />

 </resources>
--- a/vlc-android/src/org/videolan/vlc/ExternalMonitor.kt
+++ b/vlc-android/src/org/videolan/vlc/ExternalMonitor.kt
@@ -43,6 +43,7 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.actor
 import org.videolan.libvlc.util.AndroidUtil
+import org.videolan.medialibrary.interfaces.AbstractMedialibrary
 import org.videolan.vlc.gui.helpers.UiTools
 import org.videolan.vlc.gui.helpers.hf.OtgAccess
 import org.videolan.vlc.util.*
@@ -74,7 +75,7 @@ object ExternalMonitor : BroadcastReceiver(), LifecycleObserver, CoroutineScope
            }
            is MediaUnmounted -> {
                delay(100L)
-                VLCApplication.mlInstance.removeDevice(action.uuid, action.path)
+                AbstractMedialibrary.getInstance().removeDevice(action.uuid, action.path)
                if (storageUnplugged.hasActiveObservers()) storageUnplugged.postValue(action.uri)
            }
        }
@@ -176,7 +177,7 @@ object ExternalMonitor : BroadcastReceiver(), LifecycleObserver, CoroutineScope
    @ExperimentalCoroutinesApi
    @ObsoleteCoroutinesApi
    private fun checkNewStorages(ctx: Context) {
-        if (VLCApplication.mlInstance.isStarted) {
+        if (AbstractMedialibrary.getInstance().isStarted) {
            val scanOpt = if (Settings.showTvUi) ML_SCAN_ON
            else Settings.getInstance(ctx).getInt(KEY_MEDIALIBRARY_SCAN, -1)
            if (scanOpt == ML_SCAN_ON)

--- a/vlc-android/src/org/videolan/vlc/PlaybackService.kt
+++ b/vlc-android/src/org/videolan/vlc/PlaybackService.kt
@@ -450,7 +450,7 @@ class PlaybackService : MediaBrowserServiceCompat(), CoroutineScope, LifecycleOw
        playlistManager = PlaylistManager(this)
        Util.checkCpuCompatibility(this)

-        medialibrary = VLCApplication.mlInstance
+        medialibrary = AbstractMedialibrary.getInstance()
        if (!medialibrary.isInitiated) registerMedialibrary(null)

        detectHeadset = settings.getBoolean("enable_headset_detection", true)

--- a/vlc-android/src/org/videolan/vlc/RecommendationsService.kt
+++ b/vlc-android/src/org/videolan/vlc/RecommendationsService.kt
@@ -32,6 +32,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import kotlinx.coroutines.*
+import org.videolan.medialibrary.interfaces.AbstractMedialibrary
 import org.videolan.medialibrary.interfaces.media.AbstractMediaWrapper
 import org.videolan.vlc.gui.helpers.BitmapUtil
 import org.videolan.vlc.gui.video.VideoPlayerActivity
@@ -87,7 +88,7 @@ class RecommendationsService : IntentService("RecommendationService"), Coroutine

    private fun doRecommendations() = launch {
        mNotificationManager.cancelAll()
-        val videoList = withContext(Dispatchers.IO) { VLCApplication.mlInstance.recentVideos }
+        val videoList = withContext(Dispatchers.IO) { AbstractMedialibrary.getInstance().recentVideos }
        if (Util.isArrayEmpty(videoList)) return@launch
        for ((id, mediaWrapper) in videoList.withIndex()) {
            buildRecommendation(mediaWrapper, id, NotificationManagerCompat.IMPORTANCE_DEFAULT)

--- a/vlc-android/src/org/videolan/vlc/VLCApplication.kt
+++ b/vlc-android/src/org/videolan/vlc/VLCApplication.kt
@@ -88,7 +88,6 @@ class VLCApplication : Application() {
    init {
        instance = this
        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
-
    }

    @TargetApi(Build.VERSION_CODES.O)
@@ -206,9 +205,6 @@ class VLCApplication : Application() {
            dataMap.clear()
        }

-        val mlInstance: AbstractMedialibrary
-            get() = AbstractMedialibrary.getInstance()
-
        /**
         * Check if application is currently displayed
         * @return true if an activity is displayed, false if app is in background.

--- a/vlc-android/src/org/videolan/vlc/gui/InfoActivity.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/InfoActivity.kt
@@ -22,6 +22,7 @@ import kotlinx.coroutines.*
 import org.videolan.libvlc.Media
 import org.videolan.libvlc.util.Extensions
 import org.videolan.medialibrary.Tools
+import org.videolan.medialibrary.interfaces.AbstractMedialibrary
 import org.videolan.medialibrary.interfaces.media.AbstractArtist
 import org.videolan.medialibrary.interfaces.media.AbstractMediaWrapper
 import org.videolan.medialibrary.media.MediaLibraryItem
@@ -69,7 +70,7 @@ class InfoActivity : AudioPlayerContainerActivity(), View.OnClickListener, PathA
        }
        this.item = item
        if (item.id == 0L) {
-            val libraryItem = VLCApplication.mlInstance.getMedia((item as AbstractMediaWrapper).uri)
+            val libraryItem = AbstractMedialibrary.getInstance().getMedia((item as AbstractMediaWrapper).uri)
            if (libraryItem != null)
                this.item = libraryItem
        }

--- a/vlc-android/src/org/videolan/vlc/gui/MainActivity.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/MainActivity.kt
@@ -117,7 +117,7 @@ class MainActivity : ContentActivity(), ExtensionManagerService.ExtensionManager
        /* Reload the latest preferences */
        scanNeeded = savedInstanceState == null && settings.getBoolean("auto_rescan", true)
        if (BuildConfig.DEBUG) extensionsManager = ExtensionsManager.getInstance()
-        mediaLibrary = VLCApplication.mlInstance
+        mediaLibrary = AbstractMedialibrary.getInstance()


        val typedValue = TypedValue()

--- a/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.kt
@@ -47,6 +47,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import kotlinx.coroutines.*
+import org.videolan.medialibrary.interfaces.AbstractMedialibrary
 import org.videolan.medialibrary.interfaces.media.AbstractMediaWrapper
 import org.videolan.medialibrary.interfaces.media.AbstractPlaylist
 import org.videolan.medialibrary.media.MediaLibraryItem
@@ -81,7 +82,7 @@ import java.util.*
 open class PlaylistActivity : AudioPlayerContainerActivity(), IEventsHandler, IListEventsHandler, ActionMode.Callback, View.OnClickListener, CtxActionReceiver {

    private lateinit var audioBrowserAdapter: AudioBrowserAdapter
-    private val mediaLibrary = VLCApplication.mlInstance
+    private val mediaLibrary = AbstractMedialibrary.getInstance()
    private lateinit var binding: PlaylistActivityBinding
    private var actionMode: ActionMode? = null
    private var isPlaylist: Boolean = false

--- a/vlc-android/src/org/videolan/vlc/gui/PlaylistFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/PlaylistFragment.kt
@@ -106,7 +106,7 @@ class PlaylistFragment : BaseAudioBrowser<PlaylistsViewModel>(), SwipeRefreshLay

        //size of an item
        val spacing = resources.getDimension(R.dimen.kl_half).toInt()
-        val itemSize = RecyclerSectionItemGridDecoration.getItemSize(requireActivity().getScreenWidth(), nbColumns, spacing)
+        val itemSize = RecyclerSectionItemGridDecoration.getItemSize(requireActivity().getScreenWidth() - spacing * 2, nbColumns, spacing)

        playlistAdapter = AudioBrowserAdapter(MediaLibraryItem.TYPE_PLAYLIST, this, itemSize)
        adapter = playlistAdapter

--- a/vlc-android/src/org/videolan/vlc/gui/SearchActivity.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/SearchActivity.kt
@@ -46,7 +46,7 @@ open class SearchActivity : BaseActivity(), TextWatcher, TextView.OnEditorAction
        binding = DataBindingUtil.setContentView(this, R.layout.search_activity)
        binding.handler = clickHandler
        binding.searchAggregate = SearchAggregate()
-        medialibrary = VLCApplication.mlInstance
+        medialibrary = AbstractMedialibrary.getInstance()
        if (Intent.ACTION_SEARCH == intent.action || "com.google.android.gms.actions.SEARCH_ACTION" == intent.action) {
            val query = intent.getStringExtra(SearchManager.QUERY)
            initializeLists()

--- a/vlc-android/src/org/videolan/vlc/gui/SecondaryActivity.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/SecondaryActivity.kt
@@ -33,6 +33,7 @@ import androidx.fragment.app.Fragment
 import com.google.android.material.appbar.AppBarLayout
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.ObsoleteCoroutinesApi
+import org.videolan.medialibrary.interfaces.AbstractMedialibrary
 import org.videolan.vlc.R
 import org.videolan.vlc.VLCApplication
 import org.videolan.vlc.gui.audio.AudioAlbumsSongsFragment
@@ -105,7 +106,7 @@ class SecondaryActivity : ContentActivity() {
        // Handle item selection
        when (item.itemId) {
            R.id.ml_menu_refresh -> {
-                val ml = VLCApplication.mlInstance
+                val ml = AbstractMedialibrary.getInstance()
                if (!ml.isWorking) this.rescan()
                return true
            }

--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt
@@ -230,6 +230,7 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, CoroutineS
            drawableSmall.start()
        }

+        playlistAdapter.setCurrentlyPlaying(playing)
        binding.playPause.contentDescription = text
        binding.headerPlayPause.contentDescription = text
        wasPlaying = playing

--- a/vlc-android/src/org/videolan/vlc/gui/audio/PlaylistAdapter.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/PlaylistAdapter.kt
@@ -25,7 +25,6 @@ package org.videolan.vlc.gui.audio

 import android.annotation.TargetApi
 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Message
 import android.view.LayoutInflater
@@ -36,8 +35,6 @@ import androidx.annotation.MainThread
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
-import androidx.vectordrawable.graphics.drawable.Animatable2Compat
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.ObsoleteCoroutinesApi
 import org.videolan.libvlc.util.AndroidUtil
@@ -47,6 +44,7 @@ import org.videolan.vlc.VLCApplication
 import org.videolan.vlc.databinding.PlaylistItemBinding
 import org.videolan.vlc.gui.DiffUtilAdapter
 import org.videolan.vlc.gui.helpers.UiTools
+import org.videolan.vlc.gui.view.MiniVisualizer
 import org.videolan.vlc.interfaces.SwipeDragHelperAdapter
 import org.videolan.vlc.media.MediaUtils
 import org.videolan.vlc.util.MediaItemDiffCallback
@@ -59,6 +57,7 @@ import java.util.*
 class PlaylistAdapter(private val player: IPlayer) : DiffUtilAdapter<AbstractMediaWrapper, PlaylistAdapter.ViewHolder>(), SwipeDragHelperAdapter {

    private var mModel: PlaylistModel? = null
+    private var currentPlayingVisu: MiniVisualizer? = null

    var currentIndex = 0
        set(position) {
@@ -87,30 +86,26 @@ class PlaylistAdapter(private val player: IPlayer) : DiffUtilAdapter<AbstractMed
    }

    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val ctx = holder.itemView.context
        val media = getItem(position)
        holder.binding.media = media
        holder.binding.subTitle = MediaUtils.getMediaSubtitle(media)
-        val drawableNowPlaying = AnimatedVectorDrawableCompat.create(ctx, R.drawable.anim_now_playing)!!
        if (currentIndex == position) {
-
-            holder.binding.playing.setImageDrawable(drawableNowPlaying)
-            drawableNowPlaying.start()
-            drawableNowPlaying.registerAnimationCallback(object : Animatable2Compat.AnimationCallback() {
-                override fun onAnimationEnd(drawable: Drawable?) {
-                    super.onAnimationEnd(drawable)
-                    drawableNowPlaying.start()
-                }
-            })
+            if (mModel?.playing != false) holder.binding.playing.start() else holder.binding.playing.stop()
            holder.binding.playing.visibility = View.VISIBLE
+            currentPlayingVisu = holder.binding.playing
        } else {
-            holder.binding.playing.setImageDrawable(drawableNowPlaying)
+            holder.binding.playing.stop()
            holder.binding.playing.visibility = View.INVISIBLE
        }

        holder.binding.executePendingBindings()
    }

+    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
+        super.onDetachedFromRecyclerView(recyclerView)
+        currentPlayingVisu = null
+    }
+
    override fun getItemCount(): Int {
        return dataset.size
    }
@@ -218,4 +213,8 @@ class PlaylistAdapter(private val player: IPlayer) : DiffUtilAdapter<AbstractMed
    override fun createCB(): DiffCallback<AbstractMediaWrapper> {
        return MediaItemDiffCallback()
    }
+
+    fun setCurrentlyPlaying(playing: Boolean) {
+        if (playing) currentPlayingVisu?.start() else currentPlayingVisu?.stop()
+    }
 }
--- a/vlc-android/src/org/videolan/vlc/gui/browser/MediaBrowserFragment.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/MediaBrowserFragment.kt
@@ -90,7 +90,7 @@ abstract class MediaBrowserFragment<T : SortableModel> : Fragment(), ActionMode.

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        mediaLibrary = VLCApplication.mlInstance
+        mediaLibrary = AbstractMedialibrary.getInstance()
        setHasOptionsMenu(!AndroidDevices.isAndroidTv)
    }
No results found