diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7e20574..4bb94a6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:configChanges="orientation|screenSize" android:label="@string/app_name" android:launchMode="singleTask" - android:screenOrientation="fullSensor"> + android:screenOrientation="fullUser"> diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/NowPlayingNotification.kt b/app/src/main/java/fr/forum_thalie/tsumugi/NowPlayingNotification.kt index 2c8d0d4..c5c6b63 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/NowPlayingNotification.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/NowPlayingNotification.kt @@ -39,7 +39,7 @@ class NowPlayingNotification( mediaStyle = androidx.media.app.NotificationCompat.DecoratedMediaCustomViewStyle().also { it.setMediaSession(m.sessionToken) - it.setShowActionsInCompactView(0) // index 0 = show actions 0 and 1 (show action #0 (play/pause)) + it.setShowActionsInCompactView(0, 1) // index 0 = show actions 0 and 1 (show action #0 (play/pause)) it.setCancelButtonIntent(deleteIntent) } builder.setStyle(mediaStyle) @@ -83,7 +83,7 @@ class NowPlayingNotification( val intent2 = Intent(c, RadioService::class.java) intent2.putExtra("action", Actions.KILL.name) val pendingButtonIntent = PendingIntent.getService(c, 2, intent2, PendingIntent.FLAG_UPDATE_CURRENT) - val stopAction = NotificationCompat.Action.Builder(R.drawable.ic_stop,"Stop", pendingButtonIntent).build() + val stopAction = NotificationCompat.Action.Builder(R.drawable.ic_close,"Stop", pendingButtonIntent).build() builder.addAction(stopAction) if (isRinging) { diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt b/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt index 3c4a37e..c98f641 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/RadioService.kt @@ -72,7 +72,7 @@ class RadioService : MediaBrowserServiceCompat() { } 1 -> { //[REMOVE LOG CALLS]Log.d(tag, radioTag + "Headset is plugged") - headsetPluggedIn = true + headsetPluggedIn = true && PreferenceManager.getDefaultSharedPreferences(context).getBoolean("autoStartOnPlug", false) } else -> { //[REMOVE LOG CALLS]Log.d(tag, radioTag + "I have no idea what the headset state is") diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingViewModel.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingViewModel.kt index 627abeb..a6f56f3 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingViewModel.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingViewModel.kt @@ -1,9 +1,11 @@ package fr.forum_thalie.tsumugi.ui.nowplaying import android.widget.SeekBar +import androidx.core.content.edit import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import fr.forum_thalie.tsumugi.playerstore.PlayerStore +import fr.forum_thalie.tsumugi.preferenceStore class NowPlayingViewModel: ViewModel() { @@ -21,6 +23,10 @@ class NowPlayingViewModel: ViewModel() { override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) { // updated continuously as the user slides the thumb PlayerStore.instance.volume.value = progress + preferenceStore.edit { + putInt("volume", progress) + commit() + } } override fun onStartTrackingTouch(seekBar: SeekBar) { diff --git a/app/src/main/res/drawable-anydpi/ic_close.xml b/app/src/main/res/drawable-anydpi/ic_close.xml new file mode 100644 index 0000000..443f138 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_close.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-hdpi/ic_close.png b/app/src/main/res/drawable-hdpi/ic_close.png new file mode 100644 index 0000000..c661d15 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_close.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_close.png b/app/src/main/res/drawable-mdpi/ic_close.png new file mode 100644 index 0000000..6060ea2 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_close.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_close.png b/app/src/main/res/drawable-xhdpi/ic_close.png new file mode 100644 index 0000000..91f6c7a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_close.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_close.png b/app/src/main/res/drawable-xxhdpi/ic_close.png new file mode 100644 index 0000000..1e41c55 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_close.png differ diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0a381f0..865b547 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -54,5 +54,6 @@ Choisir la fréquence de mise à jour quand la radio est stoppée Actualisation… Raffraîchir les données + \"Play\" au branchement de la prise casque diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6408717..92e4587 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -74,5 +74,6 @@ Set update period when stopped Refreshing data… Refresh data + Auto play when plugging headphones diff --git a/app/src/main/res/xml/customize_preferences.xml b/app/src/main/res/xml/customize_preferences.xml index 6331d4a..1da9a2e 100644 --- a/app/src/main/res/xml/customize_preferences.xml +++ b/app/src/main/res/xml/customize_preferences.xml @@ -1,7 +1,7 @@ - + +