From 4d6f9d2232b56a1511da652146e1279305e098c6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 29 Mar 2018 19:42:53 +0200 Subject: [PATCH] reuse some alarm strings from Commons --- app/build.gradle | 2 +- .../com/simplemobiletools/clock/activities/MainActivity.kt | 3 +++ .../clock/dialogs/SelectAlarmSoundDialog.kt | 3 +++ app/src/main/res/values-de/strings.xml | 5 ----- app/src/main/res/values-fr/strings.xml | 5 ----- app/src/main/res/values-hr/strings.xml | 5 ----- app/src/main/res/values-lt/strings.xml | 5 ----- app/src/main/res/values-pt/strings.xml | 5 ----- app/src/main/res/values-sk/strings.xml | 5 ----- app/src/main/res/values-zh-rTW/strings.xml | 5 ----- app/src/main/res/values/strings.xml | 5 ----- 11 files changed, 7 insertions(+), 41 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a2b42682..3d033ee1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,7 +41,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:3.17.8' + implementation 'com.simplemobiletools:commons:3.17.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.android.support.constraint:constraint-layout:1.0.2' implementation 'com.shawnlin:number-picker:2.4.6' diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt index b515f1df..5ef06858 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt @@ -1,8 +1,10 @@ package com.simplemobiletools.clock.activities +import android.annotation.TargetApi import android.content.Intent import android.graphics.drawable.ColorDrawable import android.net.Uri +import android.os.Build import android.os.Bundle import android.view.Menu import android.view.MenuItem @@ -129,6 +131,7 @@ class MainActivity : SimpleActivity() { } } + @TargetApi(Build.VERSION_CODES.KITKAT) private fun storeNewAlarmSound(uri: Uri) { var filename = getFilenameFromUri(uri) if (filename.isEmpty()) { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/SelectAlarmSoundDialog.kt b/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/SelectAlarmSoundDialog.kt index acb2c1bb..9498c1b4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/SelectAlarmSoundDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/SelectAlarmSoundDialog.kt @@ -1,8 +1,10 @@ package com.simplemobiletools.clock.dialogs +import android.annotation.TargetApi import android.content.Intent import android.media.MediaPlayer import android.net.Uri +import android.os.Build import android.support.v7.app.AlertDialog import android.view.ViewGroup import android.widget.RadioGroup @@ -82,6 +84,7 @@ class SelectAlarmSoundDialog(val activity: SimpleActivity, val currentUri: Strin holder.addView(radioButton, RadioGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)) } + @TargetApi(Build.VERSION_CODES.KITKAT) private fun alarmClicked(alarmSound: AlarmSound) { if (alarmSound.id == ADD_NEW_SOUND_ID) { val action = if (isKitkatPlus()) Intent.ACTION_OPEN_DOCUMENT else Intent.ACTION_GET_CONTENT diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index fef5b98f..d69eb828 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -22,11 +22,6 @@ Timer Sekunden anzeigen - - System sounds - Your sounds - Add a new sound - How can I change lap sorting at the stopwatch tab? Just click on any of the columns, that will make the laps be sorted by the given column. With additional clicks you can toggle between ascending and descending sorting. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 13a152c2..56f8772e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -22,11 +22,6 @@ Minuteur Montrer les secondes - - System sounds - Your sounds - Add a new sound - Comment changer l\'ordre de tri des tours dans l\'onglet chronomètre ? Il suffit d\'appuyer sur les colonnes, les tours seront alors triés selon la colonne sur laquelle vous avez appuyer. Appuyer de nouveau permet d\'inverser l\'ordre (croissant/décroissant). diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index a97afc52..3589bd3f 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -22,11 +22,6 @@ Kartica brojača Prikaži sekunde - - System sounds - Your sounds - Add a new sound - Kako mogu promijeniti sortiranje krugova na kartici štoperice? Jednostavno kliknite bilo koji od stupaca, time će krugovi biti razvrstani po danom stupcu. Uz dodatne klikove možete prebacivati između uzlaznog i silaznog sortiranja. diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index df3be088..83c73083 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -22,11 +22,6 @@ Laikmačio skirtukas Rodyti sekundes - - System sounds - Your sounds - Add a new sound - Kaip aš galiu pakeisti etapų rikiavimą chronometro auselėje? Spustelėkite ant bet kurio stulpelio, tai surikiuos etapus pagal tą stulpelį. Su papildomais paspaudimais Jūs galite pasirinkti tarp rikiavimo mažėjančia arba didėjančia tvarka. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index fbc2e76c..a76106bb 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -22,11 +22,6 @@ Temporizador Mostrar segundos - - System sounds - Your sounds - Add a new sound - How can I change lap sorting at the stopwatch tab? Just click on any of the columns, that will make the laps be sorted by the given column. With additional clicks you can toggle between ascending and descending sorting. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index f4fb33c5..c74c3ccd 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -22,11 +22,6 @@ Okno s časovačom Zobraziť sekundy - - Systémové zvuky - Vaše zvuky - Pridať nový zvuk - Ako viem zmeniť poradie kôl na okne so stopkami? Stačí, ak kliknete na niektorý stĺpec, to aktivuje triedenie podľa daného stĺpca. Ďalším kliknutím na daný stĺpec viete prepínať zostupné a vzostupné triedenie. diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 464bdbb8..983977e3 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -22,11 +22,6 @@ 計時器頁面 顯示秒數 - - System sounds - Your sounds - Add a new sound - 碼錶頁面分段的排序如何變更? 只要點擊任一欄位，就會依選定的欄位做排序。再多點一下，還能切換遞增或遞減的排序。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index eaebccdd..3a1d651b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -22,11 +22,6 @@ Timer tab Show seconds - - System sounds - Your sounds - Add a new sound - How can I change lap sorting at the stopwatch tab? Just click on any of the columns, that will make the laps be sorted by the given column. With additional clicks you can toggle between ascending and descending sorting.