Added Bluetooth connect permission and better UX for permissions

app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt

@@ -15,6 +15,7 @@
 package code.name.monkey.retromusic.activities
 
 import android.Manifest
+import android.Manifest.permission.BLUETOOTH_CONNECT
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
@@ -57,6 +58,15 @@ class PermissionActivity : AbsMusicServiceActivity() {
             }
         }
 
+        if (VersionUtils.hasS()) {
+            binding.bluetoothPermission.show()
+            binding.bluetoothPermission.setButtonClick {
+                ActivityCompat.requestPermissions(this,
+                    arrayOf(BLUETOOTH_CONNECT),
+                    PERMISSION_REQUEST)
+            }
+        }
+
         binding.finish.accentBackgroundColor()
         binding.finish.setOnClickListener {
             if (hasPermissions()) {
@@ -83,6 +93,7 @@ class PermissionActivity : AbsMusicServiceActivity() {
 
     override fun onResume() {
         super.onResume()
+        binding.finish.isEnabled = hasStoragePermission()
         if (hasStoragePermission()) {
             binding.storagePermission.checkImage.isVisible = true
             binding.storagePermission.checkImage.imageTintList =
@@ -95,6 +106,13 @@ class PermissionActivity : AbsMusicServiceActivity() {
                     ColorStateList.valueOf(accentColor())
             }
         }
+        if (VersionUtils.hasS()) {
+            if (hasBluetoothPermission()) {
+                binding.bluetoothPermission.checkImage.isVisible = true
+                binding.bluetoothPermission.checkImage.imageTintList =
+                    ColorStateList.valueOf(accentColor())
+            }
+        }
     }
 
     private fun hasStoragePermission(): Boolean {
@@ -102,6 +120,12 @@ class PermissionActivity : AbsMusicServiceActivity() {
             Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
     }
 
+    @RequiresApi(Build.VERSION_CODES.S)
+    private fun hasBluetoothPermission(): Boolean {
+        return ActivityCompat.checkSelfPermission(this,
+            BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED
+    }
+
     @RequiresApi(Build.VERSION_CODES.M)
     private fun hasAudioPermission(): Boolean {
         return Settings.System.canWrite(this)

app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt

@@ -14,6 +14,7 @@
  */
 package code.name.monkey.retromusic.activities
 
+import android.Manifest.permission.BLUETOOTH_CONNECT
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
@@ -22,14 +23,14 @@ import androidx.navigation.NavDestination
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsThemeActivity
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager
 import code.name.monkey.retromusic.databinding.ActivitySettingsBinding
 import code.name.monkey.retromusic.extensions.*
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.color.ColorCallback
 
-class SettingsActivity : AbsThemeActivity(), ColorCallback, OnThemeChangedListener {
+class SettingsActivity : AbsBaseActivity(), ColorCallback, OnThemeChangedListener {
     private lateinit var binding: ActivitySettingsBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         val mSavedInstanceState = extra<Bundle>(TAG).value ?: savedInstanceState
@@ -37,6 +38,7 @@ class SettingsActivity : AbsThemeActivity(), ColorCallback, OnThemeChangedListen
         binding = ActivitySettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
         setupToolbar()
+        setPermissionDeniedMessage(getString(R.string.permission_bluetooth_denied))
     }
 
     override fun onResume() {
@@ -81,6 +83,14 @@ class SettingsActivity : AbsThemeActivity(), ColorCallback, OnThemeChangedListen
         return super.onOptionsItemSelected(item)
     }
 
+    override fun getPermissionsToRequest(): Array<String> {
+        return if (VersionUtils.hasS()) {
+            arrayOf(BLUETOOTH_CONNECT)
+        } else {
+            arrayOf()
+        }
+    }
+
     override fun invoke(dialog: MaterialDialog, color: Int) {
         ThemeStore.editTheme(this).accentColor(color).commit()
         if (VersionUtils.hasNougatMR())

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt

@@ -95,7 +95,9 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
 
     protected fun hasPermissions(): Boolean {
         for (permission in permissions) {
-            if (ActivityCompat.checkSelfPermission(this, permission) != PackageManager.PERMISSION_GRANTED) {
+            if (ActivityCompat.checkSelfPermission(this,
+                    permission) != PackageManager.PERMISSION_GRANTED
+            ) {
                 return false
             }
         }
@@ -105,7 +107,7 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<String>,
-        grantResults: IntArray
+        grantResults: IntArray,
     ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         if (requestCode == PERMISSION_REQUEST) {
@@ -123,6 +125,22 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
                         )
                             .setAction(R.string.action_grant) { requestPermissions() }
                             .setActionTextColor(accentColor()).show()
+                    } else if (ActivityCompat.shouldShowRequestPermissionRationale(
+                            this@AbsBaseActivity, Manifest.permission.BLUETOOTH_CONNECT
+                        )
+                    ) {
+                        // User has deny from permission dialog
+                        Snackbar.make(
+                            snackBarContainer,
+                            R.string.permission_bluetooth_denied,
+                            Snackbar.LENGTH_INDEFINITE
+                        )
+                            .setAction(R.string.action_grant) {
+                                ActivityCompat.requestPermissions(this,
+                                    arrayOf(Manifest.permission.BLUETOOTH_CONNECT),
+                                    PERMISSION_REQUEST)
+                            }
+                            .setActionTextColor(accentColor()).show()
                     } else {
                         // User has deny permission and checked never show permission dialog so you can redirect to Application settings page
                         Snackbar.make(
@@ -154,7 +172,7 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
         const val PERMISSION_REQUEST = 100
     }
 
-    // this  lets keyboard close when clicked in backgroud
+    // this lets keyboard close when clicked in background
     override fun dispatchTouchEvent(event: MotionEvent): Boolean {
         if (event.action == MotionEvent.ACTION_DOWN) {
             val v = currentFocus

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt

@@ -189,11 +189,7 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), IMusicServiceEventLi
     }
 
     override fun getPermissionsToRequest(): Array<String> {
-        return mutableListOf(
+        return mutableListOf(Manifest.permission.READ_EXTERNAL_STORAGE).apply {
-            Manifest.permission.READ_EXTERNAL_STORAGE,
-            if (VersionUtils.hasS()) Manifest.permission.BLUETOOTH_CONNECT
-            else Manifest.permission.BLUETOOTH
-        ).apply {
             if (!VersionUtils.hasQ()) {
                 add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
             }

app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt

@@ -54,7 +54,6 @@ import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ViewUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetBehavior.*
@@ -264,11 +263,8 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         binding.playbackControlsFragment.songInfo.setTextColor(lastDisabledPlaybackControlsColor)
 
         volumeFragment?.setTintableColor(lastPlaybackControlsColor.ripAlpha())
-        ViewUtil.setProgressDrawable(
+
-            binding.playbackControlsFragment.progressSlider,
+        binding.playbackControlsFragment.progressSlider.applyColor(lastPlaybackControlsColor.ripAlpha())
-            lastPlaybackControlsColor.ripAlpha(),
-            true
-        )
 
         updateRepeatState()
         updateShuffleState()

app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt

@@ -14,10 +14,15 @@
  */
 package code.name.monkey.retromusic.fragments.settings
 
+import android.Manifest.permission.BLUETOOTH_CONNECT
 import android.content.Intent
+import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.media.audiofx.AudioEffect
 import android.os.Bundle
+import androidx.core.app.ActivityCompat
 import androidx.preference.Preference
+import code.name.monkey.appthemehelper.util.VersionUtils
+import code.name.monkey.retromusic.BLUETOOTH_PLAYBACK
 import code.name.monkey.retromusic.EQUALIZER
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.NavigationUtil
@@ -28,17 +33,31 @@ import code.name.monkey.retromusic.util.NavigationUtil
 
 class AudioSettings : AbsSettingsFragment() {
     override fun invalidateSettings() {
-        val findPreference: Preference? = findPreference(EQUALIZER)
+        val eqPreference: Preference? = findPreference(EQUALIZER)
         if (!hasEqualizer()) {
-            findPreference?.isEnabled = false
+            eqPreference?.isEnabled = false
-            findPreference?.summary = resources.getString(R.string.no_equalizer)
+            eqPreference?.summary = resources.getString(R.string.no_equalizer)
         } else {
-            findPreference?.isEnabled = true
+            eqPreference?.isEnabled = true
         }
-        findPreference?.setOnPreferenceClickListener {
+        eqPreference?.setOnPreferenceClickListener {
             NavigationUtil.openEqualizer(requireActivity())
             true
         }
+        val bluetoothPreference: Preference? = findPreference(BLUETOOTH_PLAYBACK)
+        if (VersionUtils.hasS()) {
+            bluetoothPreference?.setOnPreferenceChangeListener { preference, newValue ->
+                if (newValue as Boolean) {
+                    if (ActivityCompat.checkSelfPermission(requireContext(),
+                            BLUETOOTH_CONNECT) != PERMISSION_GRANTED
+                    ) {
+                        ActivityCompat.requestPermissions(requireActivity(), arrayOf(
+                            BLUETOOTH_CONNECT), 100)
+                    }
+                }
+                return@setOnPreferenceChangeListener true
+            }
+        }
     }
 
     private fun hasEqualizer(): Boolean {

app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt

@@ -39,7 +39,7 @@ class PermissionItem @JvmOverloads constructor(
             binding.number.backgroundTintList =
                 ColorStateList.valueOf(ColorUtil.withAlpha(color, 0.22f))
 
-            binding.button.accentOutlineColor()
+            if (!isInEditMode) binding.button.accentOutlineColor()
         }
     }
 

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,13c0.55,-0.55 0.55,-1.44 0,-1.99L6,11c-0.55,-0.55 -1.45,-0.55 -2,0s-0.55,1.45 0,2 1.45,0.55 2,0zM20,11c-0.56,-0.56 -1.45,-0.56 -2,-0.01L18,11c-0.55,0.55 -0.55,1.44 0,1.99L18,13c0.55,0.55 1.44,0.55 1.99,0L20,13c0.55,-0.55 0.55,-1.45 0,-2zM17,7l-4.29,-4.29c-0.63,-0.63 -1.71,-0.19 -1.71,0.7v6.18L7.11,5.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41L10.59,12 5.7,16.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L11,14.41v6.18c0,0.89 1.08,1.34 1.71,0.71L17,17c0.39,-0.39 0.39,-1.02 0,-1.42L13.41,12 17,8.42c0.39,-0.39 0.39,-1.03 0,-1.42zM14.88,16.29L13,18.17v-3.76l1.88,1.88zM13,9.59L13,5.83l1.88,1.88L13,9.59z"/>
+</vector>

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

@@ -43,26 +43,39 @@
             android:orientation="@integer/permission_orientation">
 
             <code.name.monkey.retromusic.views.PermissionItem
-                android:id="@+id/storagePermission"
+                android:id="@+id/storage_permission"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="@integer/permission_layout_weight"
-                app:permissionButtonTitle="Grant access"
+                app:permissionButtonTitle="@string/grant_access"
                 app:permissionIcon="@drawable/ic_sd_storage"
                 app:permissionTitle="@string/permission_title"
                 app:permissionTitleNumber="1"
                 app:permissionTitleSubTitle="@string/permission_summary" />
 
             <code.name.monkey.retromusic.views.PermissionItem
-                android:id="@+id/audioPermission"
+                android:id="@+id/bluetooth_permission"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="gone"
                 android:layout_weight="@integer/permission_layout_weight"
-                app:permissionButtonTitle="Grant access"
+                android:visibility="gone"
+                app:permissionButtonTitle="@string/grant_access"
+                app:permissionIcon="@drawable/ic_bluetooth_connect"
+                app:permissionTitle="@string/bluetooth_title"
+                app:permissionTitleNumber="2"
+                app:permissionTitleSubTitle="@string/bluetooth_summary"
+                tools:visibility="visible" />
+
+            <code.name.monkey.retromusic.views.PermissionItem
+                android:id="@+id/audio_permission"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="@integer/permission_layout_weight"
+                android:visibility="gone"
+                app:permissionButtonTitle="@string/grant_access"
                 app:permissionIcon="@drawable/ic_phonelink_ring"
                 app:permissionTitle="@string/ringtone_title"
-                app:permissionTitleNumber="2"
+                app:permissionTitleNumber="3"
                 app:permissionTitleSubTitle="@string/ringtone_summary"
                 tools:visibility="visible" />
         </LinearLayout>
@@ -76,7 +89,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:paddingVertical="12dp"
-        android:text="Let's go"
+        android:text="@string/lets_go"
         android:textAppearance="@style/TextViewButton"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="PermissionItem">
-        <attr name="permissionTitle" format="string" />
+        <attr name="permissionTitle" format="string" localization="suggested" />
-        <attr name="permissionTitleSubTitle" format="string" />
+        <attr name="permissionTitleSubTitle" format="string" localization="suggested" />
         <attr name="permissionTitleNumber" format="string" />
-        <attr name="permissionIcon" format="integer" />
+        <attr name="permissionIcon" format="reference" />
-        <attr name="permissionButtonTitle" format="string" />
+        <attr name="permissionButtonTitle" format="string" localization="suggested" />
     </declare-styleable>
 </resources>

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

@@ -93,6 +93,7 @@
     <string name="biography">Biography</string>
     <string name="black_theme_name">Just Black</string>
     <string name="blacklist">Blacklist</string>
+    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
     <string name="blur">Blur</string>
     <string name="blur_card">Blur Card</string>
     <string name="bug_report_failed">Unable to send report</string>
@@ -196,6 +197,7 @@
     <string name="genres">Genres</string>
     <string name="git_hub_summary">Fork the project on GitHub</string>
     <string name="gradient">Gradient</string>
+    <string name="grant_access">Grant access</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -234,6 +236,7 @@
     <string name="labeled">Labeled</string>
     <string name="last_added">Last added</string>
     <string name="last_song">Last song</string>
+    <string name="lets_go">Let\'s go</string>
     <string name="library_categories">Library categories</string>
     <string name="licenses">Licenses</string>
     <string name="light_theme_name">Clearly White</string>
@@ -293,6 +296,7 @@
     <string name="paste_lyrics_here">Paste Lyrics Here</string>
     <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
     <string name="peek">Peek</string>
+    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
     <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
     <string name="permission_title">Storage Access</string>
@@ -362,6 +366,7 @@
     <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
     <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
+    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
     <string name="pref_summary_toggle_full_screen">Immersive mode</string>
     <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</string>
     <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</string>
@@ -408,6 +413,7 @@
     <string name="pref_title_show_lyrics">Show lyrics</string>
     <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
+    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">Tab titles mode</string>
     <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
     <string name="pref_title_toggle_full_screen">Fullscreen app</string>
@@ -553,6 +559,5 @@
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
+    <string name="bluetooth_title">Nearby devices</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
 </resources>