diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/IntroActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/IntroActivity.java index 85a085bb..b540c3cf 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/IntroActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/IntroActivity.java @@ -4,7 +4,9 @@ import android.Manifest; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; +import android.os.Handler; import android.support.v4.content.ContextCompat; +import android.widget.Toast; import com.github.paolorotolo.appintro.AppIntro; import com.github.paolorotolo.appintro.AppIntroFragment; @@ -20,13 +22,13 @@ public class IntroActivity extends AppIntro { int color = ContextCompat.getColor(this, R.color.blue_grey_700); setStatusBarColor(ColorUtil.shiftColorDown(color)); - addSlide(AppIntroFragment.newInstance(getString(R.string.app_name), "Welcome to Phonograph, a beautiful and lightweight music player for Android. ", R.drawable.icon_web, color)); + addSlide(AppIntroFragment.newInstance(getString(R.string.app_name), getString(R.string.welcome_to_phonograph), R.drawable.icon_web, color)); if (!hasExternalStoragePermission()) { - addSlide(AppIntroFragment.newInstance("Storage", "The storage permission is required for Phonograph to read your music library.", R.drawable.ic_folder_web, color)); + addSlide(AppIntroFragment.newInstance(getString(R.string.label_storage), getString(R.string.storage_permission_explaination), R.drawable.ic_folder_web, color)); askForPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1); } - addSlide(AppIntroFragment.newInstance(getString(R.string.label_current_playing_queue), "You can swipe the card in the now playing screen up to reveal to full playing queue.", R.drawable.tutorial_queue_swipe_up, color)); - addSlide(AppIntroFragment.newInstance(getString(R.string.label_current_playing_queue), "You can rearrange the playing queue by dragging a song from its track number.", R.drawable.tutorial_rearrange_queue, color)); + addSlide(AppIntroFragment.newInstance(getString(R.string.label_playing_queue), getString(R.string.open_playing_queue_instruction), R.drawable.tutorial_queue_swipe_up, color)); + addSlide(AppIntroFragment.newInstance(getString(R.string.label_playing_queue), getString(R.string.rearrange_playing_queue_instruction), R.drawable.tutorial_rearrange_queue, color)); } private boolean hasExternalStoragePermission() { @@ -36,8 +38,23 @@ public class IntroActivity extends AppIntro { return true; } + boolean doubleBackToExitPressedOnce = false; + @Override public void onBackPressed() { - previous(); + if (doubleBackToExitPressedOnce) { + onSkipPressed(); + return; + } + + doubleBackToExitPressedOnce = true; + Toast.makeText(this, R.string.press_back_again_to_exit_intro, Toast.LENGTH_SHORT).show(); + + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + doubleBackToExitPressedOnce = false; + } + }, 2000); } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 6b9eff2e..37ca797a 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -51,7 +51,7 @@ معدل أخذ العينات إذهب إلى الفنان إذهب إلى الألبوم - قائمة الإنتظار + قائمة الإنتظار حفظ كقائمة تشغيل لا توجد نتائج تحديث صورة الفنان diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 5874fa65..c19b3c84 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -50,7 +50,7 @@ Vzorkovací frekvence Přejít na interpreta Přejít do alba - Fronta + Fronta Uložit jako playlist... Žádné výsledky Změnit obrázek umělce diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 626170c6..f9548182 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -50,7 +50,7 @@ Samplingrate Gehe zu Interpret Gehe zum Album - Warteschlange + Warteschlange Als Wiedergabeliste speichern Keine Ergebnisse Interpretenbild aktualisieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 12c87ac9..fc1e8d90 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -38,7 +38,7 @@ Ρυθμός δειγματοληψίας Πήγαινε στον καλλιτέχνη Πήγαινε στο δίσκο - Σειρά αναπαραγωγής + Σειρά αναπαραγωγής Αποθήκευση ως λίστα Κανένα αποτέλεσμα Ανανέωση εικόνας καλλιτέχνη diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index d2343bcf..8255f700 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -50,7 +50,7 @@ Frecuencia de la muestra Ir al artista Ir al álbum - Cola de reproducción + Cola de reproducción Guardar como lista de reproducción Sin resultados Actualizar imagen del artista diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml index fe3ae768..10739102 100644 --- a/app/src/main/res/values-es-rUS/strings.xml +++ b/app/src/main/res/values-es-rUS/strings.xml @@ -50,7 +50,7 @@ Frecuencia de la muestra Ir al artista Ir al álbum - Cola de reproducción + Cola de reproducción Guardar como lista de reproducción Sin resultados Actualizar la imagen del artista diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 4155f0f9..3ac1bdd1 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -38,7 +38,7 @@ Näytteenottotaajuus Näytä artisti Näytä albumi - Toistojono + Toistojono Tallenna soittolistana Ei hakutulosta Päivitä artistin kuva diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 865d5abf..49889a19 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -50,7 +50,7 @@ Taux d\'échantillonnage Voir l\'artiste Voir l\'album - File de lecture + File de lecture Sauvegarder Aucun résultat Actualiser l\'image de l\'artiste diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index aea492d7..c8966952 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -50,7 +50,7 @@ Sampling rate Idi na izvođača Idi na album - Red čekanja + Red čekanja Spremi kao popis pjesama Nema rezultata Ažuriraj sliku izvođača diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index a2554b34..e9de8d60 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -50,7 +50,7 @@ Laju-sampel Ke artis Ke album - Daftar antrian + Daftar antrian Simpan sebagai daftar putar Tidak ada hasil Memperbarui gambar artis diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index a2554b34..e9de8d60 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -50,7 +50,7 @@ Laju-sampel Ke artis Ke album - Daftar antrian + Daftar antrian Simpan sebagai daftar putar Tidak ada hasil Memperbarui gambar artis diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 54f356c6..80472ee9 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -50,7 +50,7 @@ Frequenza di campionamento Vai all\'artista Vai all\'album - Coda di riproduzione + Coda di riproduzione Salva come playlist Nessun risultato Aggiorna immagine artista diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e069ee42..a567688c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -50,7 +50,7 @@ サンプリングレート アーティストを表示 アルバムを表示 - キュー + キュー プレイリストとして保存 該当なし アーティスト画像を更新 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index adf27b72..7ecedf18 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -50,7 +50,7 @@ 샘플링 빈도 아티스트로 가기 앨범으로 가기 - 현재재생목록 + 현재재생목록 재생목록으로 저장 결과 없음 아티스트 이미지 변경 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 09637d3f..f43731a7 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -50,7 +50,7 @@ Sampling rate Ga naar artiest Ga naar album - Afspeelwachtrij + Afspeelwachtrij Opslaan als afspeellijst Geen resultaten Artiest afbeelding bijwerken diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml index 16f0f478..c4d729e8 100644 --- a/app/src/main/res/values-nn/strings.xml +++ b/app/src/main/res/values-nn/strings.xml @@ -38,7 +38,7 @@ Samplingsfrekvens Gå til artist Gå til album - Songkø + Songkø Lagre som speleliste Ingen resultat Oppdater artistbilete diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 58523a17..3c64ebeb 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -50,7 +50,7 @@ Częstotliwość próbkowania Przejdź do wykonawcy Przejdź do albumu - Kolejka odtwarzania + Kolejka odtwarzania Zapisz jako listę odtwarzania Brak wyników Zaktualizuj zdjęcie wykonawcy diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 0d0281cb..2fe335fa 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -50,7 +50,7 @@ Taxa de amostragem Ir para o artista Ir para o álbum - Fila de execução + Fila de execução Salvar como playlist Sem resultados Atualizar imagem do artista diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 0233dc3f..fba97c87 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -50,7 +50,7 @@ Taxa de amostragem Ir para o artista Ir para o álbum - Fila de reprodução + Fila de reprodução Gravar como lista de reprodução Sem resultados Actualizar imagem do artista diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 1fecbd12..c1270796 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -50,7 +50,7 @@ Rată de sampling Du-te la artist Du-te la album - Lista de redare + Lista de redare Salvează ca și lista de redare Niciun rezultat Actualizează imagine artist diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7eb75388..cc33a060 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -50,7 +50,7 @@ Частота выборки Перейти к исполнителю Перейти к альбому - Очередь воспроизведения + Очередь воспроизведения Сохранить как плейлист Нет результатов Обновить изображение исполнителя diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 6d090363..97c893d5 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -38,7 +38,7 @@ Samplingsfrekvens Gå till artist Gå till album - Spelar kö + Spelar kö Spara som spellista Inga resultat Uppdatera artistbild diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index d4d04c29..455e3a87 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -50,7 +50,7 @@ Örnekleme oranı Sanatçıya git Albüme git - Çalma sırası + Çalma sırası Çalma listesi olarak kaydet Sonuç bulunamadı Sanatçı resmini güncelle diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 6dbfc8a2..85ed39bc 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -50,7 +50,7 @@ Частота дискретизації Перейти до виконавця Перейти до альбому - Черга відтворення + Черга відтворення Зберегти як список відтворення Немає результатів Оновити зображення виконавця diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d6cf8a3f..292a17f1 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -50,7 +50,7 @@ 采样率 艺术家详情 专辑详情 - 正在播放队列 + 正在播放队列 保存为播放列表 没有找到结果 更新艺术家图片 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 051c1846..138f8d4a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -50,7 +50,7 @@ 取樣率 前往該歌手頁面 前往該專輯頁面 - 播放佇列 + 播放佇列 儲存為播放清單 無搜尋結果 更新歌手圖片 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 39a71015..e66fe4e2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -51,7 +51,7 @@ Sampling rate Go to artist Go to album - Playing queue + Playing queue Save as playlist No results Update artist image @@ -215,4 +215,10 @@ Up next Now playing layout Intro + Press back again to skip the intro. + "Welcome to Phonograph, a beautiful and lightweight music player for Android. " + Storage + You can swipe the card in the now playing screen up to reveal to full playing queue. + You can rearrange the playing queue by dragging a song from its track number. + The storage permission is required for Phonograph to read your music library.