diff --git a/app/build.gradle b/app/build.gradle index 4b1da64..d459805 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "fr.marioswitch.time" minSdk 21 targetSdk 32 - versionCode 4 - versionName "2.α4" + versionCode 5 + versionName "2.β1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/debug/output-metadata.json b/app/debug/output-metadata.json index ae13538..ddf4469 100644 --- a/app/debug/output-metadata.json +++ b/app/debug/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 4, - "versionName": "2.α4", + "versionCode": 5, + "versionName": "2.β1", "outputFile": "app-debug.apk" } ], diff --git a/app/src/main/java/fr/marioswitch/time/MainActivity.kt b/app/src/main/java/fr/marioswitch/time/MainActivity.kt index 1786d66..866c64f 100644 --- a/app/src/main/java/fr/marioswitch/time/MainActivity.kt +++ b/app/src/main/java/fr/marioswitch/time/MainActivity.kt @@ -6,7 +6,6 @@ import android.os.Bundle import android.os.Handler import android.os.Looper import android.view.View -import android.view.View.VISIBLE import kotlinx.android.synthetic.main.activity_main.* class MainActivity : AppCompatActivity() { @@ -24,21 +23,21 @@ class MainActivity : AppCompatActivity() { mainHandler.post(object : Runnable { override fun run() { totalSeconds++ - save.edit().putInt("total",totalSeconds) + save.edit().putInt("total",totalSeconds).apply() var seconds:Int = totalSeconds.rem(60) var minutes:Int = (totalSeconds/60).rem(60) var hours:Int = (totalSeconds/3600).rem(24) var days:Int = totalSeconds/86400 when(totalSeconds){ - in 0..59 -> time.text = buildString { append(seconds); append("s") }; - in 60..3599 -> time.text = buildString { append(minutes); append("m "); append(seconds); append("s") } - in 3600..86399 -> time.text = buildString { append(hours); append("h "); append(minutes); append("m "); append(seconds); append("s") } - else -> time.text = buildString { append(days); append("j "); append(hours); append("h "); append(minutes); append("m "); append(seconds); append("s") } + in 0..59 -> time.text = buildString { append(seconds); append(getString(R.string.second)) }; + in 60..3599 -> time.text = buildString { append(minutes); append(getString(R.string.minute)); append(seconds); append(getString(R.string.second)) } + in 3600..86399 -> time.text = buildString { append(hours); append(getString(R.string.hour)); append(minutes); append(getString(R.string.minute)); append(seconds); append(getString(R.string.second)) } + else -> time.text = buildString { append(days); append(getString(R.string.day)); append(hours); append(getString(R.string.hour)); append(minutes); append(getString(R.string.minute)); append(seconds); append(getString(R.string.second)) } } if(totalSeconds<60){ time_seconds.text = "" }else{ - time_seconds.text = buildString { append("soit "); append(totalSeconds); append(" secondes") } + time_seconds.text = String.format(getString(R.string.time_seconds),totalSeconds) } var nowLevel:Int when(totalSeconds){ @@ -77,17 +76,7 @@ class MainActivity : AppCompatActivity() { else -> nextGoal = 0 } when(nowLevel){ - 0 -> level.text = "0/10" - 1 -> level.text = "1/10" - 2 -> level.text = "2/10" - 3 -> level.text = "3/10" - 4 -> level.text = "4/10" - 5 -> level.text = "5/10" - 6 -> level.text = "6/10" - 7 -> level.text = "7/10" - 8 -> level.text = "8/10" - 9 -> level.text = "9/10" - 10 -> level.text = "10/10" + in 0..10 -> level.text = String.format(getString(R.string.level),nowLevel) in 11..14 -> level.text = "" } when(nowLevel){ @@ -107,21 +96,21 @@ class MainActivity : AppCompatActivity() { else -> diamond_icon.visibility = View.INVISIBLE } when(nowLevel){ - 0 -> nextlevel.text = "1 minute" - 1 -> nextlevel.text = "5 minutes" - 2 -> nextlevel.text = "10 minutes" - 3 -> nextlevel.text = "30 minutes" - 4 -> nextlevel.text = "1 heure" - 5 -> nextlevel.text = "2 heures" - 6 -> nextlevel.text = "4 heures" - 7 -> nextlevel.text = "7 heures" - 8 -> nextlevel.text = "12 heures" - 9 -> nextlevel.text = "1 jour" - 10 -> nextlevel.text = "3 jours" - 11 -> nextlevel.text = "7 jours" - 12 -> nextlevel.text = "14 jours" - 13 -> nextlevel.text = "30 jours" - 14 -> nextlevel.text = "Aucun" + 0 -> nextlevel.text = getString(R.string.nextlevel0) + 1 -> nextlevel.text = getString(R.string.nextlevel1) + 2 -> nextlevel.text = getString(R.string.nextlevel2) + 3 -> nextlevel.text = getString(R.string.nextlevel3) + 4 -> nextlevel.text = getString(R.string.nextlevel4) + 5 -> nextlevel.text = getString(R.string.nextlevel5) + 6 -> nextlevel.text = getString(R.string.nextlevel6) + 7 -> nextlevel.text = getString(R.string.nextlevel7) + 8 -> nextlevel.text = getString(R.string.nextlevel8) + 9 -> nextlevel.text = getString(R.string.nextlevel9) + 10 -> nextlevel.text = getString(R.string.nextlevel10) + 11 -> nextlevel.text = getString(R.string.nextlevel11) + 12 -> nextlevel.text = getString(R.string.nextlevel12) + 13 -> nextlevel.text = getString(R.string.nextlevel13) + 14 -> nextlevel.text = getString(R.string.nextlevel14) } when(nowLevel){ in 5..9 -> completion.text = buildString { append(totalSeconds*100/nextGoal); append(" %") } diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml new file mode 100644 index 0000000..5b622ff --- /dev/null +++ b/app/src/main/res/values-fr/strings.xml @@ -0,0 +1,35 @@ + + +- +0j 00h 00m 00s +soit 000000 secondes +0/10 +1 minute +00 % + + +Temps Perdu +j\u0020 +h\u0020 +m\u0020 +s +soit %1$d secondes +Palier actuel +%1$d/10 +Palier suivant +1 minute +5 minutes +10 minutes +30 minutes +1 heure +2 heures +4 heures +7 heures +12 heures +1 jour +3 jours +7 jours +14 jours +30 jours +Aucun + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9b12510..afd981c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,11 +1,35 @@ - Temps Perdu + - - 0j 00h 00m 00s - soit 000000 secondes - Palier actuel + 0d 00h 00m 00s + i.e. 000000 seconds 0/10 - Palier suivant 1 minute 00 % + + + Wasted Time + d\u0020 + h\u0020 + m\u0020 + s + i.e. %1$d seconds + Current level + %1$d/10 + Next level + 1 minute + 5 minutes + 10 minutes + 30 minutes + 1 hour + 2 hours + 4 hours + 7 hours + 12 hours + 1 day + 3 days + 7 days + 14 days + 30 days + None \ No newline at end of file