Skip to content

Commit

Permalink
feat(app): add option to disable media buttons
Browse files Browse the repository at this point in the history
remove option to enable skipping unsaved presets

resolves #792
  • Loading branch information
ashutoshgngwr committed Sep 6, 2021
1 parent d13ce3a commit 51abc13
Show file tree
Hide file tree
Showing 25 changed files with 50 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class MediaPlayerService : Service() {
FOREGROUND_ID,
PlayerNotificationManager.createNotification(
this, mediaSession, title,
currentPreset != null || settingsRepository.shouldAllowSkippingUnsavedPresets()
currentPreset != null
)
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,35 @@ class PlayerManager(private val context: Context, private val mediaSession: Medi
init {
setAudioUsage(AudioAttributesCompat.USAGE_MEDIA)
mediaSession.setCallback(object : MediaSessionCompat.Callback() {
override fun onPlay() = resume()
override fun onStop() = stop()
override fun onPause() = pause()
override fun onSkipToPrevious() = skipPreset(SKIP_DIRECTION_PREV)
override fun onSkipToNext() = skipPreset(SKIP_DIRECTION_NEXT)
override fun onPlay() {
if (settingsRepository.isMediaButtonsEnabled()) {
resume()
}
}

override fun onStop() {
if (settingsRepository.isMediaButtonsEnabled()) {
stop()
}
}

override fun onPause() {
if (settingsRepository.isMediaButtonsEnabled()) {
pause()
}
}

override fun onSkipToPrevious() {
if (settingsRepository.isMediaButtonsEnabled()) {
skipPreset(SKIP_DIRECTION_PREV)
}
}

override fun onSkipToNext() {
if (settingsRepository.isMediaButtonsEnabled()) {
skipPreset(SKIP_DIRECTION_NEXT)
}
}
})
}

Expand Down Expand Up @@ -435,7 +459,6 @@ class PlayerManager(private val context: Context, private val mediaSession: Medi
val presets = presetRepository.list()
val currentPos = presets.indexOf(Preset.from("", players.values))
if (currentPos < 0) {
playRandomPreset()
return
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ class SettingsRepository private constructor(private val context: Context) {
}

/**
* Returns the value of switch preference with key [R.string.should_allow_skipping_unsaved_presets_key]
* Returns the value of switch preference with key [R.string.enable_media_buttons_key]
*/
fun shouldAllowSkippingUnsavedPresets(): Boolean {
fun isMediaButtonsEnabled(): Boolean {
return prefs.getBoolean(
context.getString(R.string.should_allow_skipping_unsaved_presets_key), true
context.getString(R.string.enable_media_buttons_key), true
)
}
}
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_settings_media_buttons.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:fillColor="#000000"
android:pathData="M30 19h4V5h-4zm8-14v14h4V5zM6.5 5v14l11-7zM6 30h2v12H6zm3.5 6l8.5 6V30zM30 42l8.5-6-8.5-6zm10-12v12h2V30z" />
</vector>
10 changes: 0 additions & 10 deletions app/src/main/res/drawable/ic_settings_skip_unsaved_presets.xml

This file was deleted.

2 changes: 0 additions & 2 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@
<string name="payment_pending">سنعلمك بمجرد الانتهاء من معالجة الدفع.</string>
<string name="failed_to_purchase">فشل بدء تدفق الدفع. الرجاء معاودة المحاولة في وقت لاحق!</string>
<string name="failed_to_load_inapp_purchases">فشل تحميل تفاصيل الشراء داخل التطبيق. الرجاء المحاولة مرة أخرى لاحقا!</string>
<string name="should_allow_skipping_unsaved_presets_summary">عند تشغيل الإعدادات المسبقة غير المحفوظة ، قم بتمكين أزرار التخطي في إشعار المشغل لإنشاء إعدادات مسبقة عشوائية</string>
<string name="should_allow_skipping_unsaved_presets">السماح بتخطي الإعدادات المسبقة غير المحفوظة</string>
<string name="should_share_usage_data_summary">مشاركة بيانات الاستخدام والسلوك تلقائيا مع المطورين</string>
<string name="should_share_usage_data">مشاركة بيانات الاستخدام والسلوك</string>
<string name="others">الاخرين</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@
<string name="add_to_app_shortcuts">Προσθήκη στις συντομεύσεις εφαρμογής</string>
<string name="app_authors">Εμφάνιση των συντελεστών του Noice</string>
<string name="should_display_sound_icons">Εμφάνιση εικονιδίων ήχων</string>
<string name="should_allow_skipping_unsaved_presets_summary">Κατά την αναπαραγωγή μη αποθηκευμένων συνθέσεων, να επιτρέπεται η δημιουργία τυχαίων συνθέσεων, με το πάτημα του κουμπιού για το επόμενο κομμάτι στην ειδοποίηση της εφαρμογής</string>
<string name="should_allow_skipping_unsaved_presets">Να επιτρέπεται η παράκαμψη μη αποθηκευμένων συνθέσεων</string>
<string name="should_share_usage_data_summary">Αυτόματη αποστολή δεδομένων χρήσης και συμπεριφοράς στον προγραμματιστή</string>
<string name="should_share_usage_data">Αποστολή δεδομένων χρήσης και συμπεριφοράς</string>
<string name="others">Αλλά</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-es-rES/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@
<string name="failed_to_read_file">No se pudo leer el archivo seleccionado!</string>
<string name="failed_to_purchase">No se ha podido iniciar el flujo de pagos. Vuelve a intentarlo más tarde!</string>
<string name="failed_to_load_inapp_purchases">No se han podido cargar los detalles de la compra en la aplicación. Vuelve a intentarlo más tarde!</string>
<string name="should_allow_skipping_unsaved_presets">Omitir preajustes no guardados</string>
<string name="should_share_usage_data_summary">Compartir automáticamente los datos de uso con los desarrolladores</string>
<string name="should_share_usage_data">Compartir datos de uso</string>
<string name="others">Otros</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@
<string name="import_presets_summary">وارد کردن گزینش‌های ذخیره شده از یک فایل خارج از برنامه موجب حذف تمام گزینش‌های موجود می‌شود</string>
<string name="import_presets">وارد کردن از فایل</string>
<string name="export_presets_summary">صادر کردن حالت فعلی گزینش‌های ذخیره شده به یک فایل خارج از برنامه</string>
<string name="should_allow_skipping_unsaved_presets">اجازه‌ی پرش از گزینش‌های ذخیره نشده</string>
<string name="should_share_usage_data_summary">اشتراک‌گذاری خودکار داده‌های استفاده و رفتار، با برنامه‌نویسان</string>
<string name="should_share_usage_data">اشتراک‌گذاری داده‌های استفاده و رفتار</string>
<string name="others">دیگران</string>
Expand All @@ -189,5 +188,4 @@
<string name="payment_pending">ما به محض پایان پردازش پرداخت شما، به شما خبر می‌دهیم.</string>
<string name="failed_to_purchase">نتوانست روند پرداخت را آغاز کند. لطفاً بعداً دوباره تلاش کنید!</string>
<string name="failed_to_load_inapp_purchases">نتوانست جزئیات خرید درون‌برنامه‌ای را بارگذاری کند. لطفاً بعداً دوباره تلاش کنید!</string>
<string name="should_allow_skipping_unsaved_presets_summary">فعال بودن دکمه‌های پرش در اعلان پخش برای ایجاد گزینش‌های تصادفی، در زمان پخش گزینش‌های ذخیره نشده</string>
</resources>
2 changes: 0 additions & 2 deletions app/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@
<string name="payment_pending">Ilmoitamme sinulle heti, kun olemme käsitelleet maksusi.</string>
<string name="failed_to_purchase">Maksuvirran käynnistäminen epäonnistui. Yritä myöhemmin uudelleen!</string>
<string name="failed_to_load_inapp_purchases">Sovelluksen sisäisen oston tietoja ei onnistuttu lataamaan. Yritä myöhemmin uudelleen!</string>
<string name="should_allow_skipping_unsaved_presets_summary">Kun toistat tallentamattomia esiasetuksia, ota käyttöön ohituspainikkeet soittimen ilmoituksessa satunnaisten esiasetusten luomiseksi</string>
<string name="should_allow_skipping_unsaved_presets">Salli tallentamattomien esiasetusten ohittaminen</string>
<string name="should_share_usage_data_summary">Jaa käyttö- ja käyttäytymistiedot automaattisesti kehittäjien kanssa</string>
<string name="should_share_usage_data">Jaa käyttö- ja käyttäytymistiedot</string>
<string name="others">Muut</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-fr-rFR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,6 @@
<string name="remove_all_app_shortcuts_confirmation">Ça supprimera tous les raccourcis prédéfinis du menu des raccourcis de l’application. Voulez-vous continuer \?</string>
<string name="remove_all_app_shortcuts">Retirer tous les raccourcis de l’appli</string>
<string name="should_display_sound_icons">Afficher les icônes de son</string>
<string name="should_allow_skipping_unsaved_presets_summary">Lors de la lecture de préréglages non sauvegardés, activez les boutons de saut dans la notification du lecteur pour générer des préréglages aléatoires</string>
<string name="should_allow_skipping_unsaved_presets">Permettre de sauter les préréglages non sauvegardés</string>
<string name="should_share_usage_data_summary">Partager automatiquement les données d\'utilisation et de comportement avec les développeurs</string>
<string name="should_share_usage_data">Partager les données d\'utilisation et de comportement</string>
<string name="others">Autres</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,6 @@
<string name="payment_pending">जैसे ही हम आपका भुगतान संसाधित कर लेंगे, हम आपको सूचित करेंगे।</string>
<string name="failed_to_purchase">भुगतान प्रवाह प्रारंभ करने में विफल. कृपया बाद में पुन: प्रयास करें!</string>
<string name="failed_to_load_inapp_purchases">इन-ऐप खरीदारी विवरण लोड करने में विफल। कृपया बाद में पुन: प्रयास करें!</string>
<string name="should_allow_skipping_unsaved_presets_summary">सहेजे नहीं गए प्रीसेट चलाते समय, यादृच्छिक प्रीसेट जेनरेट करने के लिए प्लेयर नोटिफिकेशन में स्किप बटन सक्षम करें</string>
<string name="should_allow_skipping_unsaved_presets">सहेजे नहीं गए प्रीसेट को छोड़ने की अनुमति दें</string>
<string name="should_share_usage_data_summary">डेवलपर्स के साथ स्वचालित रूप से उपयोग और व्यवहार डेटा साझा करें</string>
<string name="should_share_usage_data">शेयर यूसेज एंड बिहेवियर डेटा</string>
<string name="others">अन्य</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-in/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@
<string name="presets_as_home_screen">Preset tersimpan sebagai layar beranda</string>
<string name="app_authors">Lihat daftar Penulis Noice</string>
<string name="should_display_sound_icons">Tunjukkan ikon suara</string>
<string name="should_allow_skipping_unsaved_presets">Izinkan melewati preset tak tersimpan</string>
<string name="should_share_usage_data_summary">Secara otomatis berbagi data penggunaan dan perilaku dengan pengembang</string>
<string name="should_share_usage_data">Bagikan data penggunaan dan perilaku</string>
<string name="others">Lainnya</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-it-rIT/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,6 @@
<string name="payment_pending">Ti avviseremo non appena avremo finito di elaborare il tuo pagamento.</string>
<string name="failed_to_purchase">Impossibile avviare il flusso di pagamento. Si prega di riprovare più tardi!</string>
<string name="failed_to_load_inapp_purchases">Impossibile caricare i dettagli dell\'acquisto in-app. Si prega di riprovare più tardi!</string>
<string name="should_allow_skipping_unsaved_presets_summary">Durante la riproduzione di preimpostazioni non salvate, abilita i pulsanti di salto nella notifica del lettore per generare preimposatzioni casuali</string>
<string name="should_allow_skipping_unsaved_presets">Permetti di saltare le preimpostazioni non salvate</string>
<string name="should_share_usage_data_summary">Condividi automaticamente i dati di utilizzo e di comportamento con gli sviluppatori</string>
<string name="should_share_usage_data">Condividi i dati sull\'uso e sul comportamento</string>
<string name="others">Altri</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,6 @@
<string name="payment_pending">お支払いの処理が完了したら、すぐにお知らせします。</string>
<string name="failed_to_purchase">支払フローを開始できませんでした。後でもう一度お試しください!</string>
<string name="failed_to_load_inapp_purchases">アプリ内課金の詳細を読み込めませんでした。後でもう一度お試しください!</string>
<string name="should_allow_skipping_unsaved_presets_summary">保存されていないプリセットを再生する場合、プレーヤー通知にランダムプリセットを生成するためのスキップボタンを有効化する</string>
<string name="should_allow_skipping_unsaved_presets">保存されていないプリセットのスキップを許可</string>
<string name="should_share_usage_data_summary">使用状況と動作データを開発者と共有する</string>
<string name="should_share_usage_data">使用状況と動作データの共有</string>
<string name="others">その他</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-lt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@
<string name="sound_group__life">Gyvybė</string>
<string name="volume">Garsumas</string>
<string name="stop">Sustabdyti</string>
<string name="should_allow_skipping_unsaved_presets_summary">Grojant neišsaugotas parinktis, įgalinkite praleidimo mygtukus grotuvo pranešime, kad būtų generuojamos atsitiktinės parinktys</string>
<string name="sound_fade_in_duration_summary">Tolygaus garsėjimo pradžioje trukmė (sekundėmis)</string>
<string name="sound_fade_in_duration">Garso tolygaus garsėjimo pradžioje trukmė</string>
<string name="repeat_time_period">Pakartojimo laikotarpis</string>
Expand All @@ -182,7 +181,6 @@
<item quantity="few">%1$d minutės</item>
<item quantity="other">%1$d minučių</item>
</plurals>
<string name="should_allow_skipping_unsaved_presets">Leisti praleisti neišsaugotas parinktis</string>
<string name="should_share_usage_data_summary">Automatinis naudojimo ir elgsenos duomenų bendrinimas su kūrėjais</string>
<string name="should_share_usage_data">Dalytis naudojimo ir elgsenos duomenimis</string>
<string name="others">Kita</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,6 @@
<string name="payment_pending">Notificaremos você assim que terminarmos de processar seu pagamento.</string>
<string name="failed_to_purchase">Falha ao iniciar o fluxo de pagamento. Por favor, tente novamente mais tarde!</string>
<string name="failed_to_load_inapp_purchases">Falha ao carregar os detalhes de compra no aplicativo. Por favor, tente novamente mais tarde!</string>
<string name="should_allow_skipping_unsaved_presets_summary">Ao reproduzir predefinições não salvas, habilite os botões de pular na notificação do reprodutor de som para gerar predefinições aleatórias</string>
<string name="should_allow_skipping_unsaved_presets">Permitir pular predefinições não salvas</string>
<string name="should_share_usage_data_summary">Compartilhar automaticamente dados de uso e comportamento com os desenvolvedores</string>
<string name="should_share_usage_data">Compartilhar dados de uso e comportamento</string>
<string name="others">Outros</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@
<string name="payment_pending">Vamos notificá-lo assim que terminarmos o processamento do seu pagamento.</string>
<string name="failed_to_purchase">Não foi possível iniciar o processo de pagamento. Por favor,tente novamente mais tarde!</string>
<string name="failed_to_load_inapp_purchases">Não foi possível carregar os detalhes da compra na aplicação. Por favor tente de novo mais tarde!</string>
<string name="should_allow_skipping_unsaved_presets_summary">Ao reproduzir misturas de sons não guardadas, ativa os botões de ignorar na notificação do reprodutor de som para gerar misturas de sons aleatórias</string>
<string name="should_allow_skipping_unsaved_presets">Permitir ignorar misturas de sons não guardadas</string>
<string name="should_share_usage_data_summary">Partilhar automaticamente dados de utilização e comportamento com os programadores</string>
<string name="should_share_usage_data">Partilhar dados de utilização e comportamento</string>
<string name="others">Outros</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,6 @@
<string name="payment_pending">Мы сообщим вам, как только закончим обработку вашего платежа.</string>
<string name="failed_to_purchase">Не удалось запустить поток платежей. Повторите попытку позже!</string>
<string name="failed_to_load_inapp_purchases">Не удалось загрузить сведения о покупке в приложении. Пожалуйста, повторите попытку позже!</string>
<string name="should_allow_skipping_unsaved_presets_summary">При воспроизведении несохраненных предустановок включите кнопки пропуска в уведомлении плеера, чтобы генерировать случайные предустановки</string>
<string name="should_allow_skipping_unsaved_presets">Разрешить пропуск несохраненных предустановок</string>
<string name="should_share_usage_data_summary">Автоматически отправлять разработчикам данные об использовании и поведении</string>
<string name="should_share_usage_data">Передача данных об использовании и поведении</string>
<string name="share_usage_data_consent_message">Мы собираем данные об использовании приложения для улучшения пользовательского опыта. Мы также собираем данные о поведении приложения для анализа и диагностики ошибок, возникающих во время использования приложения. Для получения дополнительной информации ознакомьтесь с нашей [политикой конфиденциальности] (https://ashutoshgngwr.github.io/noice/privacy-policy).
Expand Down
Loading

0 comments on commit 51abc13

Please sign in to comment.