diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt index e9bd00667..39ba0df14 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt +++ b/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) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt index cfe0815c4..fd273b40c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt +++ b/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(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 { + 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()) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt index 386bd560d..20bc42fb9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt +++ b/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, - 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 diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt index 20ffc192d..efcd62edd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt +++ b/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 { - return mutableListOf( - Manifest.permission.READ_EXTERNAL_STORAGE, - if (VersionUtils.hasS()) Manifest.permission.BLUETOOTH_CONNECT - else Manifest.permission.BLUETOOTH - ).apply { + return mutableListOf(Manifest.permission.READ_EXTERNAL_STORAGE).apply { if (!VersionUtils.hasQ()) { add(Manifest.permission.WRITE_EXTERNAL_STORAGE) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt index 44db2f4d4..541010167 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt +++ b/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, - lastPlaybackControlsColor.ripAlpha(), - true - ) + + binding.playbackControlsFragment.progressSlider.applyColor(lastPlaybackControlsColor.ripAlpha()) updateRepeatState() updateShuffleState() diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt index 5d2f23a87..313b2746e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt +++ b/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 - findPreference?.summary = resources.getString(R.string.no_equalizer) + eqPreference?.isEnabled = false + 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 { diff --git a/app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt b/app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt index 21df2fa0f..00dacb1d7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt +++ b/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() } } diff --git a/app/src/main/res/drawable/ic_bluetooth_connect.xml b/app/src/main/res/drawable/ic_bluetooth_connect.xml new file mode 100644 index 000000000..7c1a6e322 --- /dev/null +++ b/app/src/main/res/drawable/ic_bluetooth_connect.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/activity_permission.xml b/app/src/main/res/layout/activity_permission.xml index 9a25d7d37..d25afeb41 100644 --- a/app/src/main/res/layout/activity_permission.xml +++ b/app/src/main/res/layout/activity_permission.xml @@ -43,26 +43,39 @@ android:orientation="@integer/permission_orientation"> + + @@ -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" diff --git a/app/src/main/res/values/permission_item.xml b/app/src/main/res/values/permission_item.xml index 8bf73d450..3147cd4e6 100644 --- a/app/src/main/res/values/permission_item.xml +++ b/app/src/main/res/values/permission_item.xml @@ -1,10 +1,10 @@ - - + + - - + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 38100d4f9..109040f4e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -93,6 +93,7 @@ Biography Just Black Blacklist + The app needs nearby devices permission to check for bluetooth devices Blur Blur Card Unable to send report @@ -196,6 +197,7 @@ Genres Fork the project on GitHub Gradient + Grant access 1 2 3 @@ -234,6 +236,7 @@ Labeled Last added Last song + Let\'s go Library categories Licenses Clearly White @@ -293,6 +296,7 @@ Paste Lyrics Here Paste timeframe lyrics here Peek + Nearby devices permission denied. Permission to access external storage denied. The app needs permission to access your device storage for playing music Storage Access @@ -362,6 +366,7 @@ Display synced lyrics over album cover Show New Music Mix on homescreen Enables changing song by swiping anywhere on the now playing screen + Swipe down to dismiss mini player Immersive mode Start playing immediately after headphones are connected Shuffle mode will turn off when playing a new list of songs @@ -408,6 +413,7 @@ Show lyrics Show suggestions Swipe anywhere to change song + Dismiss with swipe down Tab titles mode Carousel effect Fullscreen app @@ -553,6 +559,5 @@ You have to select at least one category. You will be forwarded to the issue tracker website. Your account data is only used for authentication. - Swipe down to dismiss mini player - Dismiss with swipe down + Nearby devices