From 934c1f7533506e4dfcd6cc4b22136eeffc154417 Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 6 Aug 2019 00:19:24 -0700 Subject: [PATCH] remove ringtone feature --- .../helper/menu/SongMenuHelper.java | 9 --- .../gramophone/model/CategoryInfo.java | 1 - .../gramophone/util/RingtoneManager.java | 77 ------------------- ...nnot_delete_single_songs_playlist_song.xml | 4 - .../res/menu/menu_item_playing_queue_song.xml | 4 - .../main/res/menu/menu_item_playlist_song.xml | 4 - app/src/main/res/menu/menu_item_song.xml | 4 - app/src/main/res/values-ar/strings.xml | 2 - app/src/main/res/values-bg/strings.xml | 2 - app/src/main/res/values-cs/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 2 - app/src/main/res/values-el/strings.xml | 2 - app/src/main/res/values-en-rCA/strings.xml | 2 - app/src/main/res/values-en-rGB/strings.xml | 2 - app/src/main/res/values-es-rES/strings.xml | 2 - app/src/main/res/values-es-rUS/strings.xml | 2 - app/src/main/res/values-fi/strings.xml | 2 - app/src/main/res/values-fr/strings.xml | 2 - app/src/main/res/values-he/strings.xml | 2 - app/src/main/res/values-hr/strings.xml | 2 - app/src/main/res/values-hu/strings.xml | 2 - app/src/main/res/values-id/strings.xml | 2 - app/src/main/res/values-in/strings.xml | 2 - app/src/main/res/values-it/strings.xml | 2 - app/src/main/res/values-iw/strings.xml | 2 - app/src/main/res/values-ja/strings.xml | 2 - app/src/main/res/values-ko/strings.xml | 2 - app/src/main/res/values-nl/strings.xml | 2 - app/src/main/res/values-pl/strings.xml | 2 - app/src/main/res/values-pt-rBR/strings.xml | 2 - app/src/main/res/values-pt-rPT/strings.xml | 2 - app/src/main/res/values-ro/strings.xml | 2 - app/src/main/res/values-ru/strings.xml | 2 - app/src/main/res/values-sv/strings.xml | 2 - app/src/main/res/values-tr/strings.xml | 2 - app/src/main/res/values-uk/strings.xml | 2 - app/src/main/res/values-vi/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 2 - app/src/main/res/values-zh-rTW/strings.xml | 2 - app/src/main/res/values/strings.xml | 4 - 40 files changed, 171 deletions(-) delete mode 100644 app/src/main/java/com/kabouzeid/gramophone/util/RingtoneManager.java diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/menu/SongMenuHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/menu/SongMenuHelper.java index 8f14482d..d933ea4e 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/helper/menu/SongMenuHelper.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/menu/SongMenuHelper.java @@ -16,7 +16,6 @@ import com.kabouzeid.gramophone.helper.MusicPlayerRemote; import com.kabouzeid.gramophone.model.Song; import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.NavigationUtil; -import com.kabouzeid.gramophone.util.RingtoneManager; /** * @author Karim Abou Zeid (kabouzeid) @@ -26,14 +25,6 @@ public class SongMenuHelper { public static boolean handleMenuClick(@NonNull FragmentActivity activity, @NonNull Song song, int menuItemId) { switch (menuItemId) { - case R.id.action_set_as_ringtone: - if (RingtoneManager.requiresDialog(activity)) { - RingtoneManager.showDialog(activity); - } else { - RingtoneManager ringtoneManager = new RingtoneManager(); - ringtoneManager.setRingtone(activity, song.id); - } - return true; case R.id.action_share: activity.startActivity(Intent.createChooser(MusicUtil.createShareSongFileIntent(song, activity), null)); return true; diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/CategoryInfo.java b/app/src/main/java/com/kabouzeid/gramophone/model/CategoryInfo.java index eebdb0dc..e79f982e 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/model/CategoryInfo.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/CategoryInfo.java @@ -19,7 +19,6 @@ public class CategoryInfo implements Parcelable { visible = source.readInt() == 1; } - @Override public int describeContents() { return 0; diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/RingtoneManager.java b/app/src/main/java/com/kabouzeid/gramophone/util/RingtoneManager.java deleted file mode 100644 index 5e2a9ae2..00000000 --- a/app/src/main/java/com/kabouzeid/gramophone/util/RingtoneManager.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.kabouzeid.gramophone.util; - -import android.content.ContentResolver; -import android.content.ContentValues; -import android.content.Context; -import android.content.Intent; -import android.database.Cursor; -import android.net.Uri; -import android.os.Build; -import android.provider.BaseColumns; -import android.provider.MediaStore; -import android.provider.Settings; -import android.widget.Toast; - -import androidx.annotation.NonNull; - -import com.afollestad.materialdialogs.MaterialDialog; -import com.kabouzeid.gramophone.R; - -public class RingtoneManager { - - - public static boolean requiresDialog(@NonNull Context context) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - return !Settings.System.canWrite(context); - } - return false; - } - - public static MaterialDialog showDialog(Context context) { - return new MaterialDialog.Builder(context) - .title(R.string.dialog_ringtone_title) - .content(R.string.dialog_ringtone_message) - .positiveText(android.R.string.ok) - .negativeText(android.R.string.cancel) - .onPositive((dialog, which) -> { - Intent intent = new Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS); - intent.setData(Uri.parse("package:" + context.getPackageName())); - context.startActivity(intent); - }) - .show(); - } - - public void setRingtone(@NonNull final Context context, final int id) { - final ContentResolver resolver = context.getContentResolver(); - final Uri uri = MusicUtil.getSongFileUri(id); - try { - final ContentValues values = new ContentValues(2); - values.put(MediaStore.Audio.AudioColumns.IS_RINGTONE, "1"); - values.put(MediaStore.Audio.AudioColumns.IS_ALARM, "1"); - resolver.update(uri, values, null, null); - } catch (@NonNull final UnsupportedOperationException ignored) { - return; - } - - try { - Cursor cursor = resolver.query(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, - new String[]{MediaStore.MediaColumns.TITLE}, - BaseColumns._ID + "=?", - new String[]{String.valueOf(id)}, - null); - try { - if (cursor != null && cursor.getCount() == 1) { - cursor.moveToFirst(); - Settings.System.putString(resolver, Settings.System.RINGTONE, uri.toString()); - final String message = context.getString(R.string.x_has_been_set_as_ringtone, cursor.getString(0)); - Toast.makeText(context, message, Toast.LENGTH_SHORT).show(); - } - } finally { - if (cursor != null) { - cursor.close(); - } - } - } catch (SecurityException ignored) { - } - } -} diff --git a/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml b/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml index f19ba0f6..5eb95b02 100644 --- a/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml +++ b/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml @@ -29,10 +29,6 @@ android:id="@+id/action_details" android:title="@string/action_details" app:showAsAction="never" /> - - - - ماذا تريد أن تشارك؟ تستمع حالياً إلى %1$s من %2$s. ملف الصوت - تعيين %1$s كنغمة الرنين. - تعيين كنغمة الرنين مشاركة "الإعدادات" منح diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 6fc82e30..87d8679e 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3,8 +3,6 @@ Какво бихте искали да споделите? В момента слушате %1$s от %2$s. Аудио файлът - Задай %1$s като рингтон - Задай като той на звънене Сподели "Настройки" Разреши diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index de0cca1f..19cec7e4 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3,8 +3,6 @@ Co chcete sdílet? Nyní hraje %1$s od %2$s. Zvukový soubor - Nastavit %1$s jako vyzváněcí tón. - Nastavit jako Vyzváněcí tón Sdílet "Nastavení" "Příspěvek " diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5d611ff7..38fabaa5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3,8 +3,6 @@ Was möchtest du teilen? Ich höre gerade %1$s von %2$s. Die Audiodatei - %1$s wird jetzt als dein Klingelton verwendet. - Als Klingelton verwenden Teilen "Einstellungen" Gewähren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c680e257..694a8a84 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3,8 +3,6 @@ Τι θα θέλατε να μοιραστείτε; Ακούτε το %1$s από %2$s Το αρχείο ήχου - Ορίστε το %1$s ως ήχο κλήσης. - Ορισμός ως ήχος κλήσης Μοιραστείτε "Ρυθμίσεις " Χορήγησε diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml index c62c6b8e..4b316dd3 100644 --- a/app/src/main/res/values-en-rCA/strings.xml +++ b/app/src/main/res/values-en-rCA/strings.xml @@ -3,8 +3,6 @@ What do you want to share? Currently listening to {%1$s} by {%2$s}. The audio file - Set {%1$s} as your ringtone. - Set as ringtone Share "Settings" Grant diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index 3e929c36..4a1faf29 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -3,8 +3,6 @@ What do you want to share? Currently listening to %1$s by %2$s. The audio file - Set %1$s as your ringtone. - Set as ringtone Share "Settings" Grant diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 6b35b007..48b8337c 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -3,8 +3,6 @@ ¿Qué quieres compartir? Estás escuchando %1$s por %2$s. El archivo de audio. - Establecer %1$s como tono de llamada. - Establecer como tono de llamada Compartir "Ajustes" Otorgar diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml index c504cdc9..ccaf9185 100644 --- a/app/src/main/res/values-es-rUS/strings.xml +++ b/app/src/main/res/values-es-rUS/strings.xml @@ -3,8 +3,6 @@ ¿Qué quieres compartir? Reproduciendo %1$s de %2$s El archivo de audio - %1$s ha sido establecido como tono de llamada. - Establecer como tono de llamada Compartir "Ajustes" Aceptar diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 96dee331..757c35f6 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3,8 +3,6 @@ Mitä haluat jakaa? Kuunnellaan parhaillaan kappaletta %1$s artistilta %2$s. Äänitiedosto - Asetettiin %1$s soittoääneksesi. - Aseta soittoääneksi Jaa "Asetukset" Myönnä diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c2a51d55..a5847089 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3,8 +3,6 @@ Que voulez-vous partager ? Vous écoutez %1$s de %2$s Le fichier audio - %1$s a été définie comme sonnerie. - Définir comme sonnerie Partager "Paramètres" Accorder diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index deaa91b0..fe92dad9 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -3,8 +3,6 @@ מה תרצה/י לשתף? כרגע מאזין ל%1$s מאת %2$s. קובץ האודיו - הגדר/י את %1$s בתור הצלצול שלך. - הגדרה כצלצול שיתוף "הגדרות" הענק diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index fc832f3c..dd0bb802 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -3,8 +3,6 @@ Što želite podijeliti? Trenutno slušam %1$s od %2$s. Zvučna datoteka - Postavili ste %1$s kao zvuk zvona. - Postavi kao zvuk zvona Podijeli "Postavke" Dopusti diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f8ec8afc..f0474de3 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3,8 +3,6 @@ Mit szeretne megosztani? Jelenleg a(z) %1$s-t hallgatja %2$s-tól. A hangfájlt - A(z) %1$s be lett állítva csengőhangnak. - Beállítás csengőhangként Megosztás "Beállítások" Engedélyezés diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index c7f04cdf..b3513f6c 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -3,8 +3,6 @@ "Apa yang ingin Anda bagikan? " Sedang mendengarkan %1$s oleh %2$s. Berkas audio - Jadikan %1$s sebagai nada dering Anda. - Setel sebagai nada dering Bagikan "Pengaturan" Izinkan diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index c7f04cdf..b3513f6c 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3,8 +3,6 @@ "Apa yang ingin Anda bagikan? " Sedang mendengarkan %1$s oleh %2$s. Berkas audio - Jadikan %1$s sebagai nada dering Anda. - Setel sebagai nada dering Bagikan "Pengaturan" Izinkan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a520af5e..d6c2b64b 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3,8 +3,6 @@ Cosa vuoi condividere? Stai ascoltando %1$s di %2$s. Il file audio - Imposta %1$s come suoneria. - Imposta come suoneria Condividi "Impostazioni" Permetti diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index deaa91b0..fe92dad9 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -3,8 +3,6 @@ מה תרצה/י לשתף? כרגע מאזין ל%1$s מאת %2$s. קובץ האודיו - הגדר/י את %1$s בתור הצלצול שלך. - הגדרה כצלצול שיתוף "הגדרות" הענק diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 06e28551..d35ded54 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3,8 +3,6 @@ どれを共有しますか？ 現在%2$sの%1$sを再生しています 音声ファイル - %1$sを着信音に設定しました - 着信音に設定 共有 "設定" 認める diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 5d4192ed..bb73a24f 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3,8 +3,6 @@ 공유할 내용을 선택하세요. %2$s 의 %1$s 듣는 중 음원 파일 - %1$s 로 전화 벨소리를 설정하였습니다. - 전화 벨소리로 설정 공유 "설정" 허가 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index dbf64a19..04c42d68 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3,8 +3,6 @@ Wat wil je delen? Je luistert naar %1$s door %2$s. Het audiobestand - %1$s is ingesteld als beltoon. - Instellen als beltoon Delen "Instellingen" Toestaan diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8a3ce866..21c07ea7 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3,8 +3,6 @@ Co chcesz udostępnić? Obecnie słuchasz %1$s od %2$s Plik audio - Ustawiono %1$s jako dzwonek - Ustaw jako dzwonek Udostępnij "Ustawienia" Przyznaj diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 8631e251..0fcd4d89 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -3,8 +3,6 @@ O que você quer compartilhar? Atualmente ouvindo {% 1 $ s} em {% 2 $ s}. O arquivo de áudio - %1$s foi definido como seu toque de chamada. - Definir como toque de chamada Compartilhar "Configurações" Confirmar diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 31e61d0f..975a9874 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3,8 +3,6 @@ O que deseja partilhar? A ouvir %1$s por %2$s. O ficheiro áudio - Definir %1$s como o seu toque de telemóvel. - Definir como toque de telemóvel Partilhar "Definições" Permitir diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 3e822cc1..45e114f3 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3,8 +3,6 @@ Ce doriți să distribuiți? Momentan ascultând %1$s de %2$s Fișierul audio - Setează %1$s ca sonerie. - Setați ca sonerie Distribuiți "Setări" Permiteți diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 84f5019d..c7f6d0ba 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3,8 +3,6 @@ Чем вы хотите поделиться? Сейчас воспроизводится « %1$s » исполнителя %2$s Аудиофайл - %1$s был установлен на звонок. - Установить как мелодию звонка Поделиться "Настройки" Разрешить diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a1d75e92..f0d5eef3 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3,8 +3,6 @@ Vad vill du dela? Nu spelas %1$s av %2$s Ljudfilen - Använd %1$s som ringsignal. - Använd som ringsignal. Dela "Inställningar" Tillåt diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f30e9a3a..317c2035 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3,8 +3,6 @@ Ne paylaşmak istersin? Şu anda %2$s - %1$s parçası çalınıyor. Ses dosyası - %1$s zil sesi olarak ayarla. - Zil sesi olarak ayarla Paylaş "Ayarlar" İzin diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a01f8d55..1b354513 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3,8 +3,6 @@ Чим хочете поділитися? Зараз грає %1$s у виконанні %2$s. Аудіофайл - Встановити %1$s як рінгтон. - Встановити як рінгтон Поділитися "Налаштування" Надати diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 71b588d5..2413b46b 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3,8 +3,6 @@ Bạn muốn chia sẻ điều gì? Đang nghe ca khúc %1$s bởi %2$s. Tập tin âm thanh - Cài %1$s làm nhạc chuông. - Cài làm nhạc chuông Chia sẻ "Cài đặt" Cho phép diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0f0ca95e..ffea1001 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3,8 +3,6 @@ 您想分享哪些内容？ 当前正在播放 %2$s 的 %1$s 。 音频文件 - %1$s 已设为您的铃声。 - 设为铃声 分享 "设置" 授予 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 3352b92f..9deec8ff 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3,8 +3,6 @@ 您想分享哪些內容？ 我正在聽 %2$s 的 %1$s ！ 音訊檔案 - 已將 %1$s 設為鈴聲。 - 設為鈴聲 分享 "設定" 取得 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f809e43f..4ca99040 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,8 +3,6 @@ What do you want to share? Currently listening to %1$s by %2$s. The audio file - Set %1$s as your ringtone. - Set as ringtone Share "Settings" Grant @@ -240,6 +238,4 @@ Album Year Finish last song - Set ringtone - Allow phonograph to modify audio settings