Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add smoothness quest #3257

Closed
wants to merge 66 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
dd1c4a0
add first version of smoothness quest
Helium314 Sep 4, 2021
7586221
update surface quest
Helium314 Sep 6, 2021
abe0146
fix wrong surface form and add smoothness.kt
Helium314 Sep 7, 2021
f65259f
add images
Helium314 Sep 7, 2021
fce2eb9
update strings and adjust layouts a bit
Helium314 Sep 10, 2021
2372f92
remove some unused things, update forms
Helium314 Sep 11, 2021
190ccd4
let the app crash on unknown surface where the quest can't be asked
Helium314 Sep 12, 2021
fec7dfb
small changes as suggested by @westnordost
Helium314 Sep 12, 2021
e7ee462
move some code to newly added SmoothnessItem
Helium314 Sep 12, 2021
675fa23
split smoothness quest into path and road quests
Helium314 Sep 12, 2021
7a71040
add achievements
Helium314 Sep 12, 2021
8d65c2c
fix typo
Helium314 Sep 13, 2021
7ceee01
fix typo, part2
Helium314 Sep 13, 2021
281ad0d
surface quest: remove smoothness if surface value changed on resurvey
Helium314 Sep 13, 2021
2a7ab9b
Merge branch 'smoothness' of https://github.com/Helium314/StreetCompl…
Helium314 Sep 13, 2021
d4c7c40
update images (and strings a little bit)
Helium314 Sep 13, 2021
c47ccd1
update photos and strings
Helium314 Sep 14, 2021
d434da9
remove path tags from road element filter
Helium314 Sep 15, 2021
cec1bf7
update images and strings
Helium314 Sep 16, 2021
766c8ac
Merge branch 'smoothness' of https://github.com/Helium314/StreetCompl…
Helium314 Sep 16, 2021
0bad5ea
update strings and authors
Helium314 Sep 19, 2021
93dc875
update images
Helium314 Sep 22, 2021
e5af15d
update descriptions
Helium314 Oct 2, 2021
594c644
update strings
Helium314 Oct 9, 2021
656aa32
try adding surface to question (not working properly)
Helium314 Oct 9, 2021
469fdd4
Merge branch 'master' into smoothness
westnordost Dec 16, 2021
e65e4ba
remove strings added by botched merge
westnordost Dec 18, 2021
f4e1bc3
Merge branch 'master' into smoothness
westnordost Dec 21, 2021
a8529a0
fix another merge issue
westnordost Dec 21, 2021
8d63996
formatting + only show smoothness quest for the same roads the surfac…
westnordost Dec 21, 2021
2ef1825
use computed properties instead of functions where possible
westnordost Dec 21, 2021
44e0102
(provisionally) change title wording so that it does not contradict t…
westnordost Dec 21, 2021
de00a4f
remove unfinished feature that doesn't work
westnordost Dec 21, 2021
2f09e33
add vehicle-type emojis
westnordost Dec 21, 2021
9dc3d80
fix another problem after merge
westnordost Dec 21, 2021
92fe735
refine wordings
westnordost Dec 22, 2021
640367a
select new image for bad asphalt, 3:2 for intermediate and bad asphalt
westnordost Dec 22, 2021
c368c72
better picture for excellent paving stones
westnordost Dec 23, 2021
4f98420
further refine wording for sett after conferring in #language channel…
westnordost Dec 23, 2021
66aff91
intermediate paving stones 3:2
westnordost Dec 23, 2021
6c05903
add hint that it is about the big picture, not some details
westnordost Dec 29, 2021
f078974
refine descriptions a bit more (include mention of "rough asphalt")
westnordost Dec 29, 2021
58815c3
very bad sett 3:2
westnordost Dec 29, 2021
012bd4d
replace image for intermediate sett
westnordost Dec 29, 2021
9bd7e8a
replace image for good sett
westnordost Dec 29, 2021
6b52ad9
replace image for bad sett
westnordost Dec 29, 2021
f802eef
bad sett 3:2
westnordost Dec 30, 2021
39ca513
larger cutout of original photo for context
westnordost Dec 30, 2021
4e8f759
better image for very bad asphalt
westnordost Dec 30, 2021
6ab0c7b
add picture for very bad paving stones
westnordost Dec 30, 2021
36e6445
excellent asphalt 3:2
westnordost Dec 30, 2021
191163a
good asphalt 3:2
westnordost Dec 30, 2021
83feb06
compacted 3:2
westnordost Jan 1, 2022
b92754e
paving stones intermediate 3:2
westnordost Jan 1, 2022
4cc7ab2
intermediate compacted 3:2
westnordost Jan 1, 2022
3aea27f
very bad compacted 3:2
westnordost Jan 1, 2022
0a67489
intermediate and bad gravel 3:2
westnordost Jan 1, 2022
22344e6
add changelog entry to credit the main contributors
westnordost Jan 1, 2022
472a899
replace very bad gravel photo
westnordost Jan 1, 2022
2438369
use same picture for horrible gravel and horrible compacted
westnordost Jan 1, 2022
bbf8303
very horrible unpaved 3:2
westnordost Jan 1, 2022
588d652
also remove smoothness if surface is wrong
westnordost Jan 1, 2022
b3f14d0
descriptions for compacted etc
westnordost Jan 2, 2022
13cef40
3:2 impassable with less weird image
westnordost Jan 2, 2022
73cb663
update licenses
westnordost Jan 3, 2022
7437c79
Merge branch 'master' into smoothness
westnordost Jan 3, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix typo
Co-authored-by: Flo Edelmann <florian-edelmann@online.de>
  • Loading branch information
Helium314 and FloEdelmann authored Sep 13, 2021
commit 8d65c2c0a2877a00aea7b7fdac6efed6c2f4e4c9
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ fun Smoothness.asItem(surface: String, highway: String): Item<Smoothness>? {
return Item(this, imageResId, getTitleRedId(), descriptionResId)
}

fun Smoothness.getTitleRedId() = when (this) {
fun Smoothness.getTitleResId() = when (this) {
EXCELLENT -> R.string.quest_smoothness_title_excellent
GOOD -> R.string.quest_smoothness_title_good
INTERMEDIATE -> R.string.quest_smoothness_title_intermediate