Add music players filter, fix #188

app/src/main/AndroidManifest.xml

@@ -37,6 +37,7 @@
         <activity android:name=".ui.activities.SupportDevActivity" android:launchMode="singleInstance" android:screenOrientation="portrait" />
         <activity android:name=".ui.activities.CustomDateActivity" android:launchMode="singleInstance" android:screenOrientation="portrait" />
         <activity android:name=".ui.activities.IntegrationsActivity" android:launchMode="singleInstance" android:screenOrientation="portrait" />
+        <activity android:name=".ui.activities.MusicPlayersFilterActivity" android:launchMode="singleInstance" android:screenOrientation="portrait" />
 
 
         <receiver android:name=".ui.widgets.MainWidget">

app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt

@@ -121,6 +121,7 @@ object Preferences : KotprefModel() {
     var mediaPlayerAlbum by stringPref(default = "")
     var mediaPlayerArtist by stringPref(default = "")
     var mediaPlayerPackage by stringPref(default = "")
+    var musicPlayersFilter by stringPref(default = "")
 
     // Integrations
     var installedIntegrations by intPref(default = 0)

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt

@@ -38,6 +38,8 @@ object MediaPlayerHelper {
                 )
             } catch (ex: Exception) {
                 emptyList<MediaController>()
+            }.filter {
+                Preferences.musicPlayersFilter == "" || isMusicPlayerAccepted(it.packageName)
             }
 
             if (list.isNotEmpty()) {
@@ -89,4 +91,14 @@ object MediaPlayerHelper {
             remove(Preferences::mediaPlayerPackage)
         }
     }
+
+    fun isMusicPlayerAccepted(appPkg: String): Boolean = Preferences.musicPlayersFilter.contains(appPkg)
+
+    fun toggleMusicPlayerFilter(appPkg: String) {
+        if (Preferences.musicPlayersFilter == "" || !Preferences.musicPlayersFilter.contains(appPkg)) {
+            Preferences.musicPlayersFilter = Preferences.musicPlayersFilter.split(",").union(listOf(appPkg)).joinToString(separator = ",")
+        } else {
+            Preferences.musicPlayersFilter = Preferences.musicPlayersFilter.split(",").filter { it != appPkg }.joinToString(separator = ",")
+        }
+    }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MusicPlayersFilterActivity.kt

@@ -0,0 +1,141 @@
+package com.tommasoberlose.anotherwidget.ui.activities
+
+import android.app.Activity
+import android.os.Bundle
+import com.tommasoberlose.anotherwidget.R
+import android.content.Intent
+import android.content.pm.ApplicationInfo
+import android.content.pm.ResolveInfo
+import android.util.Log
+import android.view.View
+import android.widget.ImageView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.bumptech.glide.Glide
+import com.tommasoberlose.anotherwidget.databinding.ActivityChooseApplicationBinding
+import com.tommasoberlose.anotherwidget.databinding.ActivityMusicPlayersFilterBinding
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
+import com.tommasoberlose.anotherwidget.ui.viewmodels.ChooseApplicationViewModel
+import com.tommasoberlose.anotherwidget.ui.viewmodels.MusicPlayersFilterViewModel
+import kotlinx.android.synthetic.main.activity_choose_application.*
+import kotlinx.android.synthetic.main.activity_choose_application.list_view
+import kotlinx.coroutines.*
+import net.idik.lib.slimadapter.SlimAdapter
+import kotlin.Comparator as Comparator1
+
+
+class MusicPlayersFilterActivity : AppCompatActivity() {
+
+    private lateinit var adapter: SlimAdapter
+    private lateinit var viewModel: MusicPlayersFilterViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        viewModel = ViewModelProvider(this).get(MusicPlayersFilterViewModel::class.java)
+        val binding = DataBindingUtil.setContentView<ActivityMusicPlayersFilterBinding>(this, R.layout.activity_music_players_filter)
+
+        list_view.setHasFixedSize(true)
+        val mLayoutManager = LinearLayoutManager(this)
+        list_view.layoutManager = mLayoutManager
+
+        adapter = SlimAdapter.create()
+        adapter
+            .register<ResolveInfo>(R.layout.application_info_layout) { item, injector ->
+                injector
+                    .text(R.id.text, item.loadLabel(viewModel.pm))
+                    .with<ImageView>(R.id.icon) {
+                        Glide
+                            .with(this)
+                            .load(item.loadIcon(viewModel.pm))
+                            .centerCrop()
+                            .into(it)
+                    }
+                    .visible(R.id.checkBox)
+                    .clicked(R.id.item) {
+                        toggleApp(item)
+                        adapter.notifyItemRangeChanged(0, adapter.data.size)
+                    }
+                    .clicked(R.id.checkBox) {
+                        toggleApp(item)
+                        adapter.notifyItemRangeChanged(0, adapter.data.size)
+                    }
+                    .checked(R.id.checkBox, MediaPlayerHelper.isMusicPlayerAccepted(item.activityInfo.packageName))
+            }
+            .attachTo(list_view)
+
+        setupListener()
+        subscribeUi(binding, viewModel)
+
+        search.requestFocus()
+    }
+
+    private var filterJob: Job? = null
+
+    private fun subscribeUi(binding: ActivityMusicPlayersFilterBinding, viewModel: MusicPlayersFilterViewModel) {
+        binding.viewModel = viewModel
+
+        viewModel.appList.observe(this, Observer {
+            updateList(list = it)
+            loader.visibility = View.INVISIBLE
+        })
+
+        viewModel.searchInput.observe(this, Observer { search ->
+            updateList(search = search)
+        })
+
+        viewModel.musicPlayersFilter.observe(this, {
+            updateList()
+        })
+    }
+
+    private fun updateList(list: List<ResolveInfo>? = viewModel.appList.value, search: String? = viewModel.searchInput.value) {
+        loader.visibility = View.VISIBLE
+        filterJob?.cancel()
+        filterJob = lifecycleScope.launch(Dispatchers.IO) {
+            if (list != null && list.isNotEmpty()) {
+                delay(200)
+                val filteredList: List<ResolveInfo> = if (search == null || search == "") {
+                    list
+                } else {
+                    list.filter {
+                        it.loadLabel(viewModel.pm).contains(search, true)
+                    }
+                }.sortedWith { app1, app2 ->
+                    if (MediaPlayerHelper.isMusicPlayerAccepted(app1.activityInfo.packageName) && MediaPlayerHelper.isMusicPlayerAccepted(app2.activityInfo.packageName)) {
+                        app1.loadLabel(viewModel.pm).toString().compareTo(app2.loadLabel(viewModel.pm).toString(), ignoreCase = true)
+                    } else if (MediaPlayerHelper.isMusicPlayerAccepted(app1.activityInfo.packageName)) {
+                        -1
+                    } else if (MediaPlayerHelper.isMusicPlayerAccepted(app2.activityInfo.packageName)) {
+                        1
+                    } else {
+                        app1.loadLabel(viewModel.pm).toString().compareTo(app2.loadLabel(viewModel.pm).toString(), ignoreCase = true)
+                    }
+                }
+
+
+                withContext(Dispatchers.Main) {
+                    adapter.updateData(filteredList)
+                    loader.visibility = View.INVISIBLE
+                }
+            }
+        }
+    }
+
+    private fun setupListener() {
+        action_back.setOnClickListener {
+            onBackPressed()
+        }
+    }
+
+    private fun toggleApp(app: ResolveInfo) {
+        MediaPlayerHelper.toggleMusicPlayerFilter(app.activityInfo.packageName)
+    }
+}

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GlanceTabFragment.kt

@@ -44,6 +44,7 @@ import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
 import com.tommasoberlose.anotherwidget.receivers.ActivityDetectionReceiver
 import com.tommasoberlose.anotherwidget.receivers.ActivityDetectionReceiver.Companion.FITNESS_OPTIONS
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
+import com.tommasoberlose.anotherwidget.ui.activities.MusicPlayersFilterActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import com.tommasoberlose.anotherwidget.utils.checkIfFitInstalled
@@ -136,6 +137,9 @@ class GlanceTabFragment : Fragment() {
             }
         })
 
+        viewModel.musicPlayersFilter.observe(viewLifecycleOwner, Observer {
+
+        })
     }
 
     private fun setupListener() {
@@ -242,6 +246,10 @@ class GlanceTabFragment : Fragment() {
                 CustomNotesDialog(requireContext()).show()
             }
         }
+
+        action_filter_music_players.setOnClickListener {
+            startActivity(Intent(requireContext(), MusicPlayersFilterActivity::class.java))
+        }
     }
 
     private fun updateNextAlarmWarningUi() {

app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt

@@ -75,6 +75,7 @@ class MainViewModel : ViewModel() {
     val showBatteryCharging = Preferences.asLiveData(Preferences::showBatteryCharging)
     val showDailySteps = Preferences.asLiveData(Preferences::showDailySteps)
     val customInfo = Preferences.asLiveData(Preferences::customNotes)
+    val musicPlayersFilter = Preferences.asLiveData(Preferences::musicPlayersFilter)
 
     // Advanced Settings
     val darkThemePreference = Preferences.asLiveData(Preferences::darkThemePreference)

app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MusicPlayersFilterViewModel.kt

@@ -0,0 +1,38 @@
+package com.tommasoberlose.anotherwidget.ui.viewmodels
+
+import android.app.Application
+import android.content.Intent
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageManager
+import android.content.pm.ResolveInfo
+import android.util.Log
+import androidx.lifecycle.*
+import com.chibatching.kotpref.livedata.asLiveData
+import com.tommasoberlose.anotherwidget.global.Preferences
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class MusicPlayersFilterViewModel(application: Application) : AndroidViewModel(application) {
+
+    val pm: PackageManager by lazy { application.packageManager }
+    val appList: MutableLiveData<List<ResolveInfo>> = MutableLiveData()
+    val searchInput: MutableLiveData<String> = MutableLiveData("")
+    var musicPlayersFilter = Preferences.asLiveData(Preferences::musicPlayersFilter)
+
+    init {
+        viewModelScope.launch(Dispatchers.IO) {
+            val mainIntent = Intent(Intent.ACTION_MAIN, null).apply {
+                addCategory(Intent.CATEGORY_LAUNCHER)
+            }
+
+            val app = application.packageManager.queryIntentActivities(mainIntent, 0)
+            val sortedApp = app.sortedWith(Comparator { app1: ResolveInfo, app2: ResolveInfo ->
+                app1.loadLabel(pm).toString().compareTo(app2.loadLabel(pm).toString())
+            })
+            withContext(Dispatchers.Main) {
+                appList.postValue(sortedApp)
+            }
+        }
+    }
+}

app/src/main/res/drawable/round_radio_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3.24,6.15C2.51,6.43 2,7.17 2,8v12c0,1.1 0.9,2 2,2h16c1.11,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2L8.3,6l7.43,-3c0.46,-0.19 0.68,-0.71 0.49,-1.17 -0.19,-0.46 -0.71,-0.68 -1.17,-0.49L3.24,6.15zM7,20c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM20,12h-2v-1c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v1L4,12L4,9c0,-0.55 0.45,-1 1,-1h14c0.55,0 1,0.45 1,1v3z"/>
+</vector>

app/src/main/res/layout/activity_music_players_filter.xml

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.tommasoberlose.anotherwidget.ui.viewmodels.MusicPlayersFilterViewModel" />
+    </data>
+
+    <LinearLayout 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:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@color/colorPrimaryDark"
+        tools:context="com.tommasoberlose.anotherwidget.ui.activities.MusicPlayersFilterActivity">
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cardElevation="2dp"
+            app:cardCornerRadius="0dp"
+            android:id="@+id/toolbar"
+            app:cardBackgroundColor="@color/colorPrimary">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp">
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="10dp"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:layout_centerVertical="true"
+                    android:id="@+id/action_back"
+                    android:layout_alignParentLeft="true"
+                    app:tint="@color/colorPrimaryText"
+                    android:src="@drawable/round_arrow_back" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_centerInParent="true"
+                    android:text="@string/settings_music_players_filter_title"
+                    android:gravity="center"
+                    style="@style/AnotherWidget.Main.Title"/>
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="10dp"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:layout_centerVertical="true"
+                    android:id="@+id/action_filter"
+                    android:layout_alignParentRight="true"
+                    android:visibility="gone"
+                    app:tint="@color/colorPrimaryText"
+                    android:src="@drawable/round_filter_list" />
+            </RelativeLayout>
+        </com.google.android.material.card.MaterialCardView>
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cardElevation="2dp"
+            app:cardCornerRadius="0dp"
+            app:cardBackgroundColor="@color/colorPrimary">
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/colorPrimaryDark"
+                app:cardCornerRadius="9dp"
+                app:cardElevation="0dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginBottom="16dp">
+                <EditText
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:background="@color/colorPrimaryDark"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:inputType="textCapWords"
+                    android:textColor="@color/colorPrimaryText"
+                    android:textColorHint="@color/colorSecondaryText"
+                    android:textAlignment="viewStart"
+                    android:id="@+id/search"
+                    android:fontFamily="@font/google_sans"
+                    android:gravity="center_vertical|start"
+                    android:hint="@string/search"
+                    android:text="@={viewModel.searchInput}"
+                    android:autofillHints="" />
+            </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.card.MaterialCardView>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+            <androidx.core.widget.ContentLoadingProgressBar
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:indeterminate="true"
+                android:indeterminateTint="@color/colorAccent"
+                android:layout_marginTop="-7dp"
+                android:id="@+id/loader"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
+            <androidx.recyclerview.widget.RecyclerView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/list_view" />
+        </RelativeLayout>
+    </LinearLayout>
+
+</layout>

app/src/main/res/layout/application_info_layout.xml

@@ -26,7 +26,8 @@
         tools:ignore="HardcodedText" />
     <TextView
         android:id="@+id/text"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
+        android:layout_weight="1"
         android:layout_height="match_parent"
         android:gravity="center_vertical|start"
         android:paddingEnd="24dp"
@@ -36,4 +37,10 @@
         android:ellipsize="end"
         android:textColor="@color/colorPrimaryText"
         style="@style/AnotherWidget.Settings.Title"/>
+    <com.google.android.material.checkbox.MaterialCheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/checkBox"
+        android:visibility="gone"
+        android:layout_gravity="center_vertical" />
 </LinearLayout>

app/src/main/res/layout/fragment_glance_settings.xml

@@ -338,7 +338,7 @@
                     <ImageView
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:padding="12dp"
+                        android:padding="11dp"
                         android:src="@drawable/round_flip_to_front"
                         app:tint="@color/colorPrimaryText"/>
                     <LinearLayout
@@ -359,6 +359,43 @@
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                 </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:id="@+id/action_filter_music_players"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_radio"
+                        app:tint="@color/colorPrimaryText"/>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/AnotherWidget.Settings.Title"
+                            android:text="@string/settings_music_players_filter_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/settings_music_players_filter_subtitle"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

app/src/main/res/values-it/strings.xml

@@ -153,6 +153,8 @@
     <string name="charging">Carica</string>
     <string name="providers">Providers</string>
     <string name="glance_info">Glance info will show up only when there are no events displayed and only when a few conditions are verified.</string>
+    <string name="settings_music_players_filter_title">Player Musica</string>
+    <string name="settings_music_players_filter_subtitle">Scegli i player musical che ti interessano</string>
 
     <!-- Settings -->
     <string name="action_share">Condividi</string>

app/src/main/res/values/strings.xml

@@ -157,6 +157,8 @@
     <string name="charging">Charged</string>
     <string name="providers">Providers</string>
     <string name="glance_info">Glance info will show up only when there are no events displayed and only when a few conditions are verified.</string>
+    <string name="settings_music_players_filter_title">Music Players</string>
+    <string name="settings_music_players_filter_subtitle">Choose your relevant music players</string>
 
     <!-- Settings -->
     <string name="action_share">Share</string>