From f2f338f1d4850f177021a5e4316bde3675e5640b Mon Sep 17 00:00:00 2001 From: yattoz <12408848+yattoz@users.noreply.github.com> Date: Thu, 27 Feb 2020 21:02:40 +0100 Subject: [PATCH] Fix : autoplay as setting, sensor to fullUser, close button, keep volume --- app/src/main/AndroidManifest.xml | 2 +- .../tsumugi/NowPlayingNotification.kt | 4 ++-- .../java/fr/forum_thalie/tsumugi/RadioService.kt | 2 +- .../tsumugi/ui/nowplaying/NowPlayingViewModel.kt | 6 ++++++ app/src/main/res/drawable-anydpi/ic_close.xml | 11 +++++++++++ app/src/main/res/drawable-hdpi/ic_close.png | Bin 0 -> 205 bytes app/src/main/res/drawable-mdpi/ic_close.png | Bin 0 -> 157 bytes app/src/main/res/drawable-xhdpi/ic_close.png | Bin 0 -> 235 bytes app/src/main/res/drawable-xxhdpi/ic_close.png | Bin 0 -> 318 bytes app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/customize_preferences.xml | 10 +++++++++- 12 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 app/src/main/res/drawable-anydpi/ic_close.xml create mode 100644 app/src/main/res/drawable-hdpi/ic_close.png create mode 100644 app/src/main/res/drawable-mdpi/ic_close.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_close.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_close.png 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 0000000000000000000000000000000000000000..c661d153a3e668732f3d973efa221ab40e1aabd3 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBrg*wIhE&{oJ1v^)fC3N8S2NqT z@{eiX7OZS)b>i+_U!rL};d~C;Z-aA!PA6mqZx;P*tcy2FJJ}MW8UAMCDx-~QEt2ZN zP2Zw?gT!ZUw&$ID#d$$g){^q74@NWRF`iD1Vw-s~gKgGnjU{hV#& zJ+#nSxbC6J_J(DSE|)!)Wg0E5bX)8m=y>~3o(PXV14FBDYmHvO>VH7{7(8A5T-G@y GGywpv*EqWX literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..91f6c7a8b0bb701ab40aaf9f070dda9e14473862 GIT binary patch literal 235 zcmVxoOZg(T zNmb1dUB33-#Uw<(I@_sKLR{pJ%E9OsSIrO>J*O==U0!qHW%3#V%jLg_xRHM&&t_P>TYOtFFxi z_010)%w(o4O^{A+jbsrzQEj~PZ>8}fhi$w-U0_fr=wy*JcVpQ>p6XKt8B>ane%d&v zWr@o1r99K6Jk2fRoG$tHg)6^wJQv`}UsU4Z^?vvHkZ?~{%llU54_z;MdQ7U>_G`iA z6B9XX=FXXTaQRf@MU5|?e#uFZw6v9q^7A`=Y}(Yziw-`0x+n8W&zxCpXHTx2km7%C z{-m5!nF^V;mij6;Ck88?oF~Kbv1_Bp=b6vlC$43i9Xi>%@?4XJ!Q&I970!1uA|@O; zx^U8iJEzyHbbg#(M2JA(%poT4@i3QOk#$5=fyMTwclqmPxFcW2omvh L^>bP0l+XkK*Ykp( literal 0 HcmV?d00001 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 @@ - + +