Skip to content

Commit

Permalink
2.α3
Browse files Browse the repository at this point in the history
  • Loading branch information
MarioSwitch committed Jul 31, 2022
1 parent 1035134 commit 04a963c
Show file tree
Hide file tree
Showing 6 changed files with 87 additions and 7 deletions.
6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/build.gradle
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 2
versionName "2.α2"
versionCode 3
versionName "2.α3"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
4 changes: 2 additions & 2 deletions app/debug/output-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 2,
"versionName": "2.α2",
"versionCode": 3,
"versionName": "2.α3",
"outputFile": "app-debug.apk"
}
],
Expand Down
Binary file removed app/debug/time.apk
Binary file not shown.
79 changes: 77 additions & 2 deletions app/src/main/java/fr/marioswitch/time/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,83 @@ class MainActivity : AppCompatActivity() {
}else{
time_seconds.text = buildString { append("soit "); append(totalSeconds); append(" secondes") }
}
var nowLevel:Int
when(totalSeconds){
in 0..59 -> nowLevel = 0
in 60..299 -> nowLevel = 1
in 300..599 -> nowLevel = 2
in 600..1799 -> nowLevel = 3
in 1800..3599 -> nowLevel = 4
in 3600..7199 -> nowLevel = 5
in 7200..14399 -> nowLevel = 6
in 14400..25199 -> nowLevel = 7
in 25200..43199 -> nowLevel = 8
in 43200..86399 -> nowLevel = 9
in 86400..259199 -> nowLevel = 10
in 259200..604799 -> nowLevel = 11
in 604800..1209599 -> nowLevel = 12
in 1209600..2591999 -> nowLevel = 13
else -> nowLevel = 14
}
var nextGoal:Int
when(nowLevel){
0 -> nextGoal = 60
1 -> nextGoal = 300
2 -> nextGoal = 600
3 -> nextGoal = 1800
4 -> nextGoal = 3600
5 -> nextGoal = 7200
6 -> nextGoal = 14400
7 -> nextGoal = 25200
8 -> nextGoal = 43200
9 -> nextGoal = 86400
10 -> nextGoal = 259200
11 -> nextGoal = 604800
12 -> nextGoal = 1209600
13 -> nextGoal = 2592000
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 11..14 -> level.text = ""
}
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"
}
when(nowLevel){
in 5..9 -> completion.text = buildString { append(totalSeconds*100/nextGoal); append(" %") }
in 10..13 -> completion.text = buildString { append(totalSeconds*1000/nextGoal); append("") }
else -> completion.text = ""
}
when(nowLevel){
in 11..14 -> level_title.text = ""
}
mainHandler.postDelayed(this, 1000)
}
})
}
})
}
}
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@
<string name="nextlevel_title">Palier suivant</string>
<string name="example_nextlevel">1 minute</string>
<string name="example_completion">00 %</string>
<string name="text_seconds">"$seconds s"</string>
</resources>

0 comments on commit 04a963c

Please sign in to comment.