reuse some alarm strings from Commons

This commit is contained in:
tibbi 2018-03-29 19:42:53 +02:00
parent 376cf36b8c
commit 4d6f9d2232
11 changed files with 7 additions and 41 deletions

View File

@ -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'

View File

@ -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()) {

View File

@ -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

View File

@ -22,11 +22,6 @@
<string name="timer_tab">Timer</string>
<string name="show_seconds">Sekunden anzeigen</string>
<!-- Alarms -->
<string name="system_sounds">System sounds</string>
<string name="your_sounds">Your sounds</string>
<string name="add_new_sound">Add a new sound</string>
<!-- FAQ -->
<string name="faq_1_title">How can I change lap sorting at the stopwatch tab?</string>
<string name="faq_1_text">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.</string>

View File

@ -22,11 +22,6 @@
<string name="timer_tab">Minuteur</string>
<string name="show_seconds">Montrer les secondes</string>
<!-- Alarms -->
<string name="system_sounds">System sounds</string>
<string name="your_sounds">Your sounds</string>
<string name="add_new_sound">Add a new sound</string>
<!-- FAQ -->
<string name="faq_1_title">Comment changer l\'ordre de tri des tours dans l\'onglet chronomètre ?</string>
<string name="faq_1_text">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).</string>

View File

@ -22,11 +22,6 @@
<string name="timer_tab">Kartica brojača</string>
<string name="show_seconds">Prikaži sekunde</string>
<!-- Alarms -->
<string name="system_sounds">System sounds</string>
<string name="your_sounds">Your sounds</string>
<string name="add_new_sound">Add a new sound</string>
<!-- FAQ -->
<string name="faq_1_title">Kako mogu promijeniti sortiranje krugova na kartici štoperice?</string>
<string name="faq_1_text">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.</string>

View File

@ -22,11 +22,6 @@
<string name="timer_tab">Laikmačio skirtukas</string>
<string name="show_seconds">Rodyti sekundes</string>
<!-- Alarms -->
<string name="system_sounds">System sounds</string>
<string name="your_sounds">Your sounds</string>
<string name="add_new_sound">Add a new sound</string>
<!-- FAQ -->
<string name="faq_1_title">Kaip aš galiu pakeisti etapų rikiavimą chronometro auselėje?</string>
<string name="faq_1_text">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.</string>

View File

@ -22,11 +22,6 @@
<string name="timer_tab">Temporizador</string>
<string name="show_seconds">Mostrar segundos</string>
<!-- Alarms -->
<string name="system_sounds">System sounds</string>
<string name="your_sounds">Your sounds</string>
<string name="add_new_sound">Add a new sound</string>
<!-- FAQ -->
<string name="faq_1_title">How can I change lap sorting at the stopwatch tab?</string>
<string name="faq_1_text">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.</string>

View File

@ -22,11 +22,6 @@
<string name="timer_tab">Okno s časovačom</string>
<string name="show_seconds">Zobraziť sekundy</string>
<!-- Alarms -->
<string name="system_sounds">Systémové zvuky</string>
<string name="your_sounds">Vaše zvuky</string>
<string name="add_new_sound">Pridať nový zvuk</string>
<!-- FAQ -->
<string name="faq_1_title">Ako viem zmeniť poradie kôl na okne so stopkami?</string>
<string name="faq_1_text">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.</string>

View File

@ -22,11 +22,6 @@
<string name="timer_tab">計時器頁面</string>
<string name="show_seconds">顯示秒數</string>
<!-- Alarms -->
<string name="system_sounds">System sounds</string>
<string name="your_sounds">Your sounds</string>
<string name="add_new_sound">Add a new sound</string>
<!-- FAQ -->
<string name="faq_1_title">碼錶頁面分段的排序如何變更?</string>
<string name="faq_1_text">只要點擊任一欄位,就會依選定的欄位做排序。再多點一下,還能切換遞增或遞減的排序。</string>

View File

@ -22,11 +22,6 @@
<string name="timer_tab">Timer tab</string>
<string name="show_seconds">Show seconds</string>
<!-- Alarms -->
<string name="system_sounds">System sounds</string>
<string name="your_sounds">Your sounds</string>
<string name="add_new_sound">Add a new sound</string>
<!-- FAQ -->
<string name="faq_1_title">How can I change lap sorting at the stopwatch tab?</string>
<string name="faq_1_text">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.</string>