Skip to content

Commit

Permalink
2.β1
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarioSwitch
MarioSwitch committed Aug 6, 2022
1 parent ddd3130 commit bc58ff1
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 42 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions app/debug/output-metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 4,
"versionName": "2.α4",
"versionCode": 5,
"versionName": "2.β1",
"outputFile": "app-debug.apk"
}
],
Expand Down
55 changes: 22 additions & 33 deletions app/src/main/java/fr/marioswitch/time/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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){
Expand Down Expand Up @@ -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){
Expand All @@ -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(" %") }
Expand Down
35 changes: 35 additions & 0 deletions app/src/main/res/values-fr/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<resources>
<!-- Texte de démo -->
<string name="none">-</string>
<string name="example_time">0j 00h 00m 00s</string>
<string name="example_seconds">soit 000000 secondes</string>
<string name="example_level">0/10</string>
<string name="example_nextlevel">1 minute</string>
<string name="example_completion">00 %</string>

<!-- Texte utilisé -->
<string name="app_name">Temps Perdu</string>
<string name="day">j\u0020</string>
<string name="hour">h\u0020</string>
<string name="minute">m\u0020</string>
<string name="second">s</string>
<string name="time_seconds">soit %1$d secondes</string>
<string name="level_title">Palier actuel</string>
<string name="level">%1$d/10</string>
<string name="nextlevel_title">Palier suivant</string>
<string name="nextlevel0">1 minute</string>
<string name="nextlevel1">5 minutes</string>
<string name="nextlevel2">10 minutes</string>
<string name="nextlevel3">30 minutes</string>
<string name="nextlevel4">1 heure</string>
<string name="nextlevel5">2 heures</string>
<string name="nextlevel6">4 heures</string>
<string name="nextlevel7">7 heures</string>
<string name="nextlevel8">12 heures</string>
<string name="nextlevel9">1 jour</string>
<string name="nextlevel10">3 jours</string>
<string name="nextlevel11">7 jours</string>
<string name="nextlevel12">14 jours</string>
<string name="nextlevel13">30 jours</string>
<string name="nextlevel14">Aucun</string>
</resources>
34 changes: 29 additions & 5 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,35 @@
<resources>
<string name="app_name">Temps Perdu</string>
<!-- Texte de démo -->
<string name="none">-</string>
<string name="example_time">0j 00h 00m 00s</string>
<string name="example_seconds">soit 000000 secondes</string>
<string name="level_title">Palier actuel</string>
<string name="example_time">0d 00h 00m 00s</string>
<string name="example_seconds">i.e. 000000 seconds</string>
<string name="example_level">0/10</string>
<string name="nextlevel_title">Palier suivant</string>
<string name="example_nextlevel">1 minute</string>
<string name="example_completion">00 %</string>

<!-- Texte utilisé -->
<string name="app_name">Wasted Time</string>
<string name="day">d\u0020</string>
<string name="hour">h\u0020</string>
<string name="minute">m\u0020</string>
<string name="second">s</string>
<string name="time_seconds">i.e. %1$d seconds</string>
<string name="level_title">Current level</string>
<string name="level">%1$d/10</string>
<string name="nextlevel_title">Next level</string>
<string name="nextlevel0">1 minute</string>
<string name="nextlevel1">5 minutes</string>
<string name="nextlevel2">10 minutes</string>
<string name="nextlevel3">30 minutes</string>
<string name="nextlevel4">1 hour</string>
<string name="nextlevel5">2 hours</string>
<string name="nextlevel6">4 hours</string>
<string name="nextlevel7">7 hours</string>
<string name="nextlevel8">12 hours</string>
<string name="nextlevel9">1 day</string>
<string name="nextlevel10">3 days</string>
<string name="nextlevel11">7 days</string>
<string name="nextlevel12">14 days</string>
<string name="nextlevel13">30 days</string>
<string name="nextlevel14">None</string>
</resources>

0 comments on commit bc58ff1

Please sign in to comment.