From 86fa1d04bb96e337d106d77f604b2d4eeac78efe Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Wed, 11 Oct 2023 23:44:42 +0200 Subject: [PATCH 01/10] Localize slow zone image in confirm dialog Regression in #5298 --- .../streetcomplete/quests/max_speed/AddMaxSpeedForm.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt index 1a0982cfd5d..cc18d675107 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt @@ -228,6 +228,12 @@ class AddMaxSpeedForm : AbstractOsmQuestForm() { activity?.let { val dialogBinding = QuestMaxspeedNoSignNoSlowZoneConfirmationBinding.inflate(layoutInflater) enableAppropriateLabelsForSlowZone(dialogBinding.slowZoneImage) + dialogBinding.slowZoneImage.removeAllViews() + layoutInflater.inflate( + getMaxSpeedZoneSignLayoutResId(countryInfo.countryCode), + dialogBinding.slowZoneImage, + true, + ) val dialogSpeedInput: EditText = dialogBinding.slowZoneImage.findViewById(R.id.maxSpeedInput) dialogSpeedInput.setText("××") dialogSpeedInput.inputType = EditorInfo.TYPE_NULL From 345f85d0edbb6d7d4fd73b12f56d77e299c59583 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Wed, 11 Oct 2023 23:51:36 +0200 Subject: [PATCH 02/10] Use non-MCC localization for max speed zone sign --- .../quests/max_speed/AddMaxSpeedForm.kt | 5 +- ...ackground_maxspeed_sign_no_frame_small.xml | 2 +- ...nd_maxspeed_sign_no_frame_small_yellow.xml | 13 ++++ .../layout/quest_maxspeed_zone_sign_fi.xml | 75 +++++++++++++++++++ 4 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/drawable/background_maxspeed_sign_no_frame_small_yellow.xml create mode 100644 app/src/main/res/layout/quest_maxspeed_zone_sign_fi.xml diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt index cc18d675107..70c314535e3 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt @@ -338,6 +338,7 @@ private fun getMaxSpeedSignLayoutResId(countryCode: String): Int = when (country } private fun getMaxSpeedZoneSignLayoutResId(countryCode: String): Int = when (countryCode) { - "IL" -> R.layout.quest_maxspeed_zone_sign_il - else -> R.layout.quest_maxspeed_zone_sign + "FI", "IS", "SE" -> R.layout.quest_maxspeed_zone_sign_fi + "IL" -> R.layout.quest_maxspeed_zone_sign_il + else -> R.layout.quest_maxspeed_zone_sign } diff --git a/app/src/main/res/drawable/background_maxspeed_sign_no_frame_small.xml b/app/src/main/res/drawable/background_maxspeed_sign_no_frame_small.xml index edad953557c..6d02bb49490 100644 --- a/app/src/main/res/drawable/background_maxspeed_sign_no_frame_small.xml +++ b/app/src/main/res/drawable/background_maxspeed_sign_no_frame_small.xml @@ -7,7 +7,7 @@ - + diff --git a/app/src/main/res/drawable/background_maxspeed_sign_no_frame_small_yellow.xml b/app/src/main/res/drawable/background_maxspeed_sign_no_frame_small_yellow.xml new file mode 100644 index 00000000000..31de30b8a89 --- /dev/null +++ b/app/src/main/res/drawable/background_maxspeed_sign_no_frame_small_yellow.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/quest_maxspeed_zone_sign_fi.xml b/app/src/main/res/layout/quest_maxspeed_zone_sign_fi.xml new file mode 100644 index 00000000000..6933e339fc5 --- /dev/null +++ b/app/src/main/res/layout/quest_maxspeed_zone_sign_fi.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + From 697826ec12032bf41eaff50c7753a3ce054334da Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Thu, 12 Oct 2023 00:09:24 +0200 Subject: [PATCH 03/10] Use non-MCC localization for max height sign --- .../quests/max_height/AddMaxHeightForm.kt | 1 + .../drawable/background_maxheight_sign.xml | 2 +- .../background_maxheight_sign_yellow.xml | 15 ++ .../main/res/layout/quest_maxheight_fi.xml | 144 ++++++++++++++++++ 4 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/background_maxheight_sign_yellow.xml create mode 100644 app/src/main/res/layout/quest_maxheight_fi.xml diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightForm.kt index d36ca821f0a..31b07775552 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightForm.kt @@ -17,6 +17,7 @@ class AddMaxHeightForm : AbstractOsmQuestForm() { override val contentLayoutResId get() = when (countryInfo.countryCode) { "AU", "NZ", "US", "CA" -> R.layout.quest_maxheight_mutcd + "FI", "IS", "SE" -> R.layout.quest_maxheight_fi else -> R.layout.quest_maxheight } diff --git a/app/src/main/res/drawable/background_maxheight_sign.xml b/app/src/main/res/drawable/background_maxheight_sign.xml index dd094596d5e..26731307b65 100644 --- a/app/src/main/res/drawable/background_maxheight_sign.xml +++ b/app/src/main/res/drawable/background_maxheight_sign.xml @@ -5,7 +5,7 @@ android:viewportHeight="112"> + android:fillColor="@color/traffic_white"/> diff --git a/app/src/main/res/drawable/background_maxheight_sign_yellow.xml b/app/src/main/res/drawable/background_maxheight_sign_yellow.xml new file mode 100644 index 00000000000..06d391706f8 --- /dev/null +++ b/app/src/main/res/drawable/background_maxheight_sign_yellow.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/layout/quest_maxheight_fi.xml b/app/src/main/res/layout/quest_maxheight_fi.xml new file mode 100644 index 00000000000..bfdca608759 --- /dev/null +++ b/app/src/main/res/layout/quest_maxheight_fi.xml @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6608cc83ef5e1ad4d54b1c18c1dc18e14a894525 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Thu, 12 Oct 2023 00:12:02 +0200 Subject: [PATCH 04/10] Use non-MCC localization for generic prohibition sign --- .../quests/max_speed/AddMaxSpeedForm.kt | 7 +- .../quests/max_weight/MaxWeightSignItem.kt | 16 +++-- .../background_generic_prohibition_sign.xml | 4 +- ...ground_generic_prohibition_sign_yellow.xml | 18 +++++ .../res/layout/quest_maxspeed_sign_fi.xml | 37 +++++++++++ .../quest_maxweight_axleload_fi_sign.xml | 66 +++++++++++++++++++ .../res/layout/quest_maxweight_fi_sign.xml | 48 ++++++++++++++ .../layout/quest_maxweight_mgv_fi_sign.xml | 66 +++++++++++++++++++ ...uest_maxweight_tandem_axleload_fi_sign.xml | 64 ++++++++++++++++++ 9 files changed, 315 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/drawable/background_generic_prohibition_sign_yellow.xml create mode 100644 app/src/main/res/layout/quest_maxspeed_sign_fi.xml create mode 100644 app/src/main/res/layout/quest_maxweight_axleload_fi_sign.xml create mode 100644 app/src/main/res/layout/quest_maxweight_fi_sign.xml create mode 100644 app/src/main/res/layout/quest_maxweight_mgv_fi_sign.xml create mode 100644 app/src/main/res/layout/quest_maxweight_tandem_axleload_fi_sign.xml diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt index 70c314535e3..9d68be858f2 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt @@ -332,9 +332,10 @@ private enum class SpeedType { } private fun getMaxSpeedSignLayoutResId(countryCode: String): Int = when (countryCode) { - "CA" -> R.layout.quest_maxspeed_sign_ca - "US" -> R.layout.quest_maxspeed_sign_us - else -> R.layout.quest_maxspeed_sign + "FI", "IS", "SE" -> R.layout.quest_maxspeed_sign_fi + "CA" -> R.layout.quest_maxspeed_sign_ca + "US" -> R.layout.quest_maxspeed_sign_us + else -> R.layout.quest_maxspeed_sign } private fun getMaxSpeedZoneSignLayoutResId(countryCode: String): Int = when (countryCode) { diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/MaxWeightSignItem.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/MaxWeightSignItem.kt index 371fa07ed39..7b7ca5caec5 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/MaxWeightSignItem.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/MaxWeightSignItem.kt @@ -53,22 +53,26 @@ fun MaxWeightSign.getLayoutResourceId(countryCode: String) = when (this) { private fun getMaxWeightSignLayoutResId(countryCode: String): Int = when (countryCode) { "AU", "CA", "US" -> R.layout.quest_maxweight_us_sign - else -> R.layout.quest_maxweight_sign + "FI", "IS", "SE" -> R.layout.quest_maxweight_fi_sign + else -> R.layout.quest_maxweight_sign } private fun getMaxWeightMgvSignLayoutResId(countryCode: String): Int = when (countryCode) { "AU", "CA", "US" -> R.layout.quest_maxweight_mgv_us_sign - "DE" -> R.layout.quest_maxweight_mgv_de_sign - "GB" -> R.layout.quest_maxweight_mgv_gb_sign - else -> R.layout.quest_maxweight_mgv_sign + "FI", "IS", "SE" -> R.layout.quest_maxweight_mgv_fi_sign + "DE" -> R.layout.quest_maxweight_mgv_de_sign + "GB" -> R.layout.quest_maxweight_mgv_gb_sign + else -> R.layout.quest_maxweight_mgv_sign } private fun getMaxWeightAxleLoadSignLayoutResId(countryCode: String): Int = when (countryCode) { "AU", "CA", "US" -> R.layout.quest_maxweight_axleload_us_sign - else -> R.layout.quest_maxweight_axleload_sign + "FI", "IS", "SE" -> R.layout.quest_maxweight_axleload_fi_sign + else -> R.layout.quest_maxweight_axleload_sign } private fun getMaxWeightTandemAxleLoadSignLayoutResId(countryCode: String): Int = when (countryCode) { "AU", "CA", "US" -> R.layout.quest_maxweight_tandem_axleload_us_sign - else -> R.layout.quest_maxweight_tandem_axleload_sign + "FI", "IS", "SE" -> R.layout.quest_maxweight_tandem_axleload_fi_sign + else -> R.layout.quest_maxweight_tandem_axleload_sign } diff --git a/app/src/main/res/drawable/background_generic_prohibition_sign.xml b/app/src/main/res/drawable/background_generic_prohibition_sign.xml index 37f97a585b6..2322d1d3ff8 100644 --- a/app/src/main/res/drawable/background_generic_prohibition_sign.xml +++ b/app/src/main/res/drawable/background_generic_prohibition_sign.xml @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/app/src/main/res/drawable/background_generic_prohibition_sign_yellow.xml b/app/src/main/res/drawable/background_generic_prohibition_sign_yellow.xml new file mode 100644 index 00000000000..8fe93125b24 --- /dev/null +++ b/app/src/main/res/drawable/background_generic_prohibition_sign_yellow.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/quest_maxspeed_sign_fi.xml b/app/src/main/res/layout/quest_maxspeed_sign_fi.xml new file mode 100644 index 00000000000..180d7675008 --- /dev/null +++ b/app/src/main/res/layout/quest_maxspeed_sign_fi.xml @@ -0,0 +1,37 @@ + + + + + + + + diff --git a/app/src/main/res/layout/quest_maxweight_axleload_fi_sign.xml b/app/src/main/res/layout/quest_maxweight_axleload_fi_sign.xml new file mode 100644 index 00000000000..1fa969f83ed --- /dev/null +++ b/app/src/main/res/layout/quest_maxweight_axleload_fi_sign.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/quest_maxweight_fi_sign.xml b/app/src/main/res/layout/quest_maxweight_fi_sign.xml new file mode 100644 index 00000000000..a424e729709 --- /dev/null +++ b/app/src/main/res/layout/quest_maxweight_fi_sign.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/layout/quest_maxweight_mgv_fi_sign.xml b/app/src/main/res/layout/quest_maxweight_mgv_fi_sign.xml new file mode 100644 index 00000000000..785b1bad4a4 --- /dev/null +++ b/app/src/main/res/layout/quest_maxweight_mgv_fi_sign.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/quest_maxweight_tandem_axleload_fi_sign.xml b/app/src/main/res/layout/quest_maxweight_tandem_axleload_fi_sign.xml new file mode 100644 index 00000000000..f1b7d9a7fb2 --- /dev/null +++ b/app/src/main/res/layout/quest_maxweight_tandem_axleload_fi_sign.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + From b7c11ba627ffbd3315f4ce5c9bdea5fedf11aa74 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Thu, 12 Oct 2023 00:12:31 +0200 Subject: [PATCH 05/10] Drop no longer needed `traffic_sign_background` color --- app/src/main/res/values-mcc240/colors.xml | 4 ---- app/src/main/res/values-mcc244/colors.xml | 4 ---- app/src/main/res/values-mcc274/colors.xml | 4 ---- app/src/main/res/values/colors.xml | 2 -- 4 files changed, 14 deletions(-) delete mode 100644 app/src/main/res/values-mcc240/colors.xml delete mode 100644 app/src/main/res/values-mcc244/colors.xml delete mode 100644 app/src/main/res/values-mcc274/colors.xml diff --git a/app/src/main/res/values-mcc240/colors.xml b/app/src/main/res/values-mcc240/colors.xml deleted file mode 100644 index b2d10b77e62..00000000000 --- a/app/src/main/res/values-mcc240/colors.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - @color/traffic_yellow - diff --git a/app/src/main/res/values-mcc244/colors.xml b/app/src/main/res/values-mcc244/colors.xml deleted file mode 100644 index b2d10b77e62..00000000000 --- a/app/src/main/res/values-mcc244/colors.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - @color/traffic_yellow - diff --git a/app/src/main/res/values-mcc274/colors.xml b/app/src/main/res/values-mcc274/colors.xml deleted file mode 100644 index b2d10b77e62..00000000000 --- a/app/src/main/res/values-mcc274/colors.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - @color/traffic_yellow - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 69ae2dc7706..07b1c2d3204 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -58,8 +58,6 @@ #292f33 - @color/traffic_white - #ddd #66999999 From 57e77915495125443c63670709aa9cc6dd91f148 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Thu, 12 Oct 2023 00:28:59 +0200 Subject: [PATCH 06/10] Use non-MCC localization for vibrating button illustration --- .../AddTrafficSignalsVibrationForm.kt | 16 ++++++++++++++++ .../vibrating_button_illustration_au.jpg} | Bin .../vibrating_button_illustration_gb.jpg} | Bin .../vibrating_button_illustration_au.jpg} | Bin .../vibrating_button_illustration_gb.jpg} | Bin .../vibrating_button_illustration_au.jpg} | Bin .../vibrating_button_illustration_gb.jpg} | Bin .../vibrating_button_illustration_au.jpg} | Bin .../vibrating_button_illustration_gb.jpg} | Bin 9 files changed, 16 insertions(+) rename app/src/main/res/{drawable-mcc505-hdpi/vibrating_button_illustration.jpg => drawable-hdpi/vibrating_button_illustration_au.jpg} (100%) rename app/src/main/res/{drawable-mcc234-hdpi/vibrating_button_illustration.jpg => drawable-hdpi/vibrating_button_illustration_gb.jpg} (100%) rename app/src/main/res/{drawable-mcc505-mdpi/vibrating_button_illustration.jpg => drawable-mdpi/vibrating_button_illustration_au.jpg} (100%) rename app/src/main/res/{drawable-mcc234-mdpi/vibrating_button_illustration.jpg => drawable-mdpi/vibrating_button_illustration_gb.jpg} (100%) rename app/src/main/res/{drawable-mcc505-xhdpi/vibrating_button_illustration.jpg => drawable-xhdpi/vibrating_button_illustration_au.jpg} (100%) rename app/src/main/res/{drawable-mcc234-xhdpi/vibrating_button_illustration.jpg => drawable-xhdpi/vibrating_button_illustration_gb.jpg} (100%) rename app/src/main/res/{drawable-mcc505-xxhdpi/vibrating_button_illustration.jpg => drawable-xxhdpi/vibrating_button_illustration_au.jpg} (100%) rename app/src/main/res/{drawable-mcc234-xxhdpi/vibrating_button_illustration.jpg => drawable-xxhdpi/vibrating_button_illustration_gb.jpg} (100%) diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_vibrate/AddTrafficSignalsVibrationForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_vibrate/AddTrafficSignalsVibrationForm.kt index 2be55a40e49..0dc1a8a10e0 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_vibrate/AddTrafficSignalsVibrationForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_vibrate/AddTrafficSignalsVibrationForm.kt @@ -1,5 +1,8 @@ package de.westnordost.streetcomplete.quests.traffic_signals_vibrate +import android.os.Bundle +import android.view.View +import android.widget.ImageView import de.westnordost.streetcomplete.R import de.westnordost.streetcomplete.quests.AbstractOsmQuestForm import de.westnordost.streetcomplete.quests.AnswerItem @@ -8,8 +11,21 @@ class AddTrafficSignalsVibrationForm : AbstractOsmQuestForm() { override val contentLayoutResId = R.layout.quest_traffic_lights_vibration + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + view.findViewById(R.id.buttonIllustrationImageView) + .setImageResource(getVibratingButtonIllustrationResId(countryInfo.countryCode)) + } + override val buttonPanelAnswers = listOf( AnswerItem(R.string.quest_generic_hasFeature_no) { applyAnswer(false) }, AnswerItem(R.string.quest_generic_hasFeature_yes) { applyAnswer(true) } ) } + +private fun getVibratingButtonIllustrationResId(countryCode: String): Int = when (countryCode) { + "AU" -> R.drawable.vibrating_button_illustration_au + "GB" -> R.drawable.vibrating_button_illustration_gb + else -> R.drawable.vibrating_button_illustration +} diff --git a/app/src/main/res/drawable-mcc505-hdpi/vibrating_button_illustration.jpg b/app/src/main/res/drawable-hdpi/vibrating_button_illustration_au.jpg similarity index 100% rename from app/src/main/res/drawable-mcc505-hdpi/vibrating_button_illustration.jpg rename to app/src/main/res/drawable-hdpi/vibrating_button_illustration_au.jpg diff --git a/app/src/main/res/drawable-mcc234-hdpi/vibrating_button_illustration.jpg b/app/src/main/res/drawable-hdpi/vibrating_button_illustration_gb.jpg similarity index 100% rename from app/src/main/res/drawable-mcc234-hdpi/vibrating_button_illustration.jpg rename to app/src/main/res/drawable-hdpi/vibrating_button_illustration_gb.jpg diff --git a/app/src/main/res/drawable-mcc505-mdpi/vibrating_button_illustration.jpg b/app/src/main/res/drawable-mdpi/vibrating_button_illustration_au.jpg similarity index 100% rename from app/src/main/res/drawable-mcc505-mdpi/vibrating_button_illustration.jpg rename to app/src/main/res/drawable-mdpi/vibrating_button_illustration_au.jpg diff --git a/app/src/main/res/drawable-mcc234-mdpi/vibrating_button_illustration.jpg b/app/src/main/res/drawable-mdpi/vibrating_button_illustration_gb.jpg similarity index 100% rename from app/src/main/res/drawable-mcc234-mdpi/vibrating_button_illustration.jpg rename to app/src/main/res/drawable-mdpi/vibrating_button_illustration_gb.jpg diff --git a/app/src/main/res/drawable-mcc505-xhdpi/vibrating_button_illustration.jpg b/app/src/main/res/drawable-xhdpi/vibrating_button_illustration_au.jpg similarity index 100% rename from app/src/main/res/drawable-mcc505-xhdpi/vibrating_button_illustration.jpg rename to app/src/main/res/drawable-xhdpi/vibrating_button_illustration_au.jpg diff --git a/app/src/main/res/drawable-mcc234-xhdpi/vibrating_button_illustration.jpg b/app/src/main/res/drawable-xhdpi/vibrating_button_illustration_gb.jpg similarity index 100% rename from app/src/main/res/drawable-mcc234-xhdpi/vibrating_button_illustration.jpg rename to app/src/main/res/drawable-xhdpi/vibrating_button_illustration_gb.jpg diff --git a/app/src/main/res/drawable-mcc505-xxhdpi/vibrating_button_illustration.jpg b/app/src/main/res/drawable-xxhdpi/vibrating_button_illustration_au.jpg similarity index 100% rename from app/src/main/res/drawable-mcc505-xxhdpi/vibrating_button_illustration.jpg rename to app/src/main/res/drawable-xxhdpi/vibrating_button_illustration_au.jpg diff --git a/app/src/main/res/drawable-mcc234-xxhdpi/vibrating_button_illustration.jpg b/app/src/main/res/drawable-xxhdpi/vibrating_button_illustration_gb.jpg similarity index 100% rename from app/src/main/res/drawable-mcc234-xxhdpi/vibrating_button_illustration.jpg rename to app/src/main/res/drawable-xxhdpi/vibrating_button_illustration_gb.jpg From 5abf7a87b609ad0b7fd29486fdd44a7b2ad65d6e Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Thu, 12 Oct 2023 00:29:17 +0200 Subject: [PATCH 07/10] Drop MCC hack completely --- .../streetcomplete/quests/AbstractQuestForm.kt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt index 3169ba1424d..42632e070c5 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt @@ -106,17 +106,6 @@ abstract class AbstractQuestForm : initialMapRotation = args.getFloat(ARG_MAP_ROTATION) initialMapTilt = args.getFloat(ARG_MAP_TILT) _countryInfo = null // reset lazy field - - /* The Android resource system is not designed to offer different resources depending on the - * country (code). But what it can do is to offer different resources for different - * "mobile country codes" - i.e. in which country your mobile phone network provider - * operates. - * - * A few quest forms want to display different resources depending on the country. - * - * So what we do here is to override the parent activity's "mobile country code" resource - * configuration and use this mechanism to access our country-dependent resources */ - countryInfo.mobileCountryCode?.let { activity?.resources?.updateConfiguration { mcc = it } } } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { From 6b554bc6299c0b00debbae230b00265d307bfb13 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Thu, 12 Oct 2023 00:37:47 +0200 Subject: [PATCH 08/10] Rename max weight layouts to have country code at the end to be consistent with other localized resources --- .../quests/max_weight/MaxWeightSignItem.kt | 20 +++++++++---------- ...l => quest_maxweight_axleload_sign_fi.xml} | 0 ...l => quest_maxweight_axleload_sign_us.xml} | 0 ...gn.xml => quest_maxweight_mgv_sign_de.xml} | 0 ...gn.xml => quest_maxweight_mgv_sign_fi.xml} | 0 ...gn.xml => quest_maxweight_mgv_sign_gb.xml} | 0 ...gn.xml => quest_maxweight_mgv_sign_us.xml} | 0 ...i_sign.xml => quest_maxweight_sign_fi.xml} | 0 ...s_sign.xml => quest_maxweight_sign_us.xml} | 0 ...est_maxweight_tandem_axleload_sign_fi.xml} | 0 ...est_maxweight_tandem_axleload_sign_us.xml} | 0 11 files changed, 10 insertions(+), 10 deletions(-) rename app/src/main/res/layout/{quest_maxweight_axleload_fi_sign.xml => quest_maxweight_axleload_sign_fi.xml} (100%) rename app/src/main/res/layout/{quest_maxweight_axleload_us_sign.xml => quest_maxweight_axleload_sign_us.xml} (100%) rename app/src/main/res/layout/{quest_maxweight_mgv_de_sign.xml => quest_maxweight_mgv_sign_de.xml} (100%) rename app/src/main/res/layout/{quest_maxweight_mgv_fi_sign.xml => quest_maxweight_mgv_sign_fi.xml} (100%) rename app/src/main/res/layout/{quest_maxweight_mgv_gb_sign.xml => quest_maxweight_mgv_sign_gb.xml} (100%) rename app/src/main/res/layout/{quest_maxweight_mgv_us_sign.xml => quest_maxweight_mgv_sign_us.xml} (100%) rename app/src/main/res/layout/{quest_maxweight_fi_sign.xml => quest_maxweight_sign_fi.xml} (100%) rename app/src/main/res/layout/{quest_maxweight_us_sign.xml => quest_maxweight_sign_us.xml} (100%) rename app/src/main/res/layout/{quest_maxweight_tandem_axleload_fi_sign.xml => quest_maxweight_tandem_axleload_sign_fi.xml} (100%) rename app/src/main/res/layout/{quest_maxweight_tandem_axleload_us_sign.xml => quest_maxweight_tandem_axleload_sign_us.xml} (100%) diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/MaxWeightSignItem.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/MaxWeightSignItem.kt index 7b7ca5caec5..d78e5b3454f 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/MaxWeightSignItem.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/MaxWeightSignItem.kt @@ -52,27 +52,27 @@ fun MaxWeightSign.getLayoutResourceId(countryCode: String) = when (this) { } private fun getMaxWeightSignLayoutResId(countryCode: String): Int = when (countryCode) { - "AU", "CA", "US" -> R.layout.quest_maxweight_us_sign - "FI", "IS", "SE" -> R.layout.quest_maxweight_fi_sign + "AU", "CA", "US" -> R.layout.quest_maxweight_sign_us + "FI", "IS", "SE" -> R.layout.quest_maxweight_sign_fi else -> R.layout.quest_maxweight_sign } private fun getMaxWeightMgvSignLayoutResId(countryCode: String): Int = when (countryCode) { - "AU", "CA", "US" -> R.layout.quest_maxweight_mgv_us_sign - "FI", "IS", "SE" -> R.layout.quest_maxweight_mgv_fi_sign - "DE" -> R.layout.quest_maxweight_mgv_de_sign - "GB" -> R.layout.quest_maxweight_mgv_gb_sign + "AU", "CA", "US" -> R.layout.quest_maxweight_mgv_sign_us + "FI", "IS", "SE" -> R.layout.quest_maxweight_mgv_sign_fi + "DE" -> R.layout.quest_maxweight_mgv_sign_de + "GB" -> R.layout.quest_maxweight_mgv_sign_gb else -> R.layout.quest_maxweight_mgv_sign } private fun getMaxWeightAxleLoadSignLayoutResId(countryCode: String): Int = when (countryCode) { - "AU", "CA", "US" -> R.layout.quest_maxweight_axleload_us_sign - "FI", "IS", "SE" -> R.layout.quest_maxweight_axleload_fi_sign + "AU", "CA", "US" -> R.layout.quest_maxweight_axleload_sign_us + "FI", "IS", "SE" -> R.layout.quest_maxweight_axleload_sign_fi else -> R.layout.quest_maxweight_axleload_sign } private fun getMaxWeightTandemAxleLoadSignLayoutResId(countryCode: String): Int = when (countryCode) { - "AU", "CA", "US" -> R.layout.quest_maxweight_tandem_axleload_us_sign - "FI", "IS", "SE" -> R.layout.quest_maxweight_tandem_axleload_fi_sign + "AU", "CA", "US" -> R.layout.quest_maxweight_tandem_axleload_sign_us + "FI", "IS", "SE" -> R.layout.quest_maxweight_tandem_axleload_sign_fi else -> R.layout.quest_maxweight_tandem_axleload_sign } diff --git a/app/src/main/res/layout/quest_maxweight_axleload_fi_sign.xml b/app/src/main/res/layout/quest_maxweight_axleload_sign_fi.xml similarity index 100% rename from app/src/main/res/layout/quest_maxweight_axleload_fi_sign.xml rename to app/src/main/res/layout/quest_maxweight_axleload_sign_fi.xml diff --git a/app/src/main/res/layout/quest_maxweight_axleload_us_sign.xml b/app/src/main/res/layout/quest_maxweight_axleload_sign_us.xml similarity index 100% rename from app/src/main/res/layout/quest_maxweight_axleload_us_sign.xml rename to app/src/main/res/layout/quest_maxweight_axleload_sign_us.xml diff --git a/app/src/main/res/layout/quest_maxweight_mgv_de_sign.xml b/app/src/main/res/layout/quest_maxweight_mgv_sign_de.xml similarity index 100% rename from app/src/main/res/layout/quest_maxweight_mgv_de_sign.xml rename to app/src/main/res/layout/quest_maxweight_mgv_sign_de.xml diff --git a/app/src/main/res/layout/quest_maxweight_mgv_fi_sign.xml b/app/src/main/res/layout/quest_maxweight_mgv_sign_fi.xml similarity index 100% rename from app/src/main/res/layout/quest_maxweight_mgv_fi_sign.xml rename to app/src/main/res/layout/quest_maxweight_mgv_sign_fi.xml diff --git a/app/src/main/res/layout/quest_maxweight_mgv_gb_sign.xml b/app/src/main/res/layout/quest_maxweight_mgv_sign_gb.xml similarity index 100% rename from app/src/main/res/layout/quest_maxweight_mgv_gb_sign.xml rename to app/src/main/res/layout/quest_maxweight_mgv_sign_gb.xml diff --git a/app/src/main/res/layout/quest_maxweight_mgv_us_sign.xml b/app/src/main/res/layout/quest_maxweight_mgv_sign_us.xml similarity index 100% rename from app/src/main/res/layout/quest_maxweight_mgv_us_sign.xml rename to app/src/main/res/layout/quest_maxweight_mgv_sign_us.xml diff --git a/app/src/main/res/layout/quest_maxweight_fi_sign.xml b/app/src/main/res/layout/quest_maxweight_sign_fi.xml similarity index 100% rename from app/src/main/res/layout/quest_maxweight_fi_sign.xml rename to app/src/main/res/layout/quest_maxweight_sign_fi.xml diff --git a/app/src/main/res/layout/quest_maxweight_us_sign.xml b/app/src/main/res/layout/quest_maxweight_sign_us.xml similarity index 100% rename from app/src/main/res/layout/quest_maxweight_us_sign.xml rename to app/src/main/res/layout/quest_maxweight_sign_us.xml diff --git a/app/src/main/res/layout/quest_maxweight_tandem_axleload_fi_sign.xml b/app/src/main/res/layout/quest_maxweight_tandem_axleload_sign_fi.xml similarity index 100% rename from app/src/main/res/layout/quest_maxweight_tandem_axleload_fi_sign.xml rename to app/src/main/res/layout/quest_maxweight_tandem_axleload_sign_fi.xml diff --git a/app/src/main/res/layout/quest_maxweight_tandem_axleload_us_sign.xml b/app/src/main/res/layout/quest_maxweight_tandem_axleload_sign_us.xml similarity index 100% rename from app/src/main/res/layout/quest_maxweight_tandem_axleload_us_sign.xml rename to app/src/main/res/layout/quest_maxweight_tandem_axleload_sign_us.xml From d94b433a6a4f7940233608e6d269e926f6f1a3e7 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Sun, 15 Oct 2023 21:17:18 +0200 Subject: [PATCH 09/10] Change background programmatically instead of duplicating layouts --- .../quests/max_height/AddMaxHeightForm.kt | 11 +- .../quests/max_speed/AddMaxSpeedForm.kt | 26 +++- .../quests/max_weight/MaxWeightSignItem.kt | 12 +- .../main/res/layout/quest_maxheight_fi.xml | 144 ------------------ .../main/res/layout/quest_maxspeed_sign.xml | 1 + .../res/layout/quest_maxspeed_sign_fi.xml | 37 ----- .../res/layout/quest_maxspeed_zone_sign.xml | 1 + .../layout/quest_maxspeed_zone_sign_fi.xml | 75 --------- .../layout/quest_maxweight_axleload_sign.xml | 1 + .../quest_maxweight_axleload_sign_fi.xml | 66 -------- .../res/layout/quest_maxweight_mgv_sign.xml | 1 + .../layout/quest_maxweight_mgv_sign_fi.xml | 66 -------- .../main/res/layout/quest_maxweight_sign.xml | 1 + .../res/layout/quest_maxweight_sign_fi.xml | 48 ------ .../quest_maxweight_tandem_axleload_sign.xml | 1 + ...uest_maxweight_tandem_axleload_sign_fi.xml | 64 -------- 16 files changed, 47 insertions(+), 508 deletions(-) delete mode 100644 app/src/main/res/layout/quest_maxheight_fi.xml delete mode 100644 app/src/main/res/layout/quest_maxspeed_sign_fi.xml delete mode 100644 app/src/main/res/layout/quest_maxspeed_zone_sign_fi.xml delete mode 100644 app/src/main/res/layout/quest_maxweight_axleload_sign_fi.xml delete mode 100644 app/src/main/res/layout/quest_maxweight_mgv_sign_fi.xml delete mode 100644 app/src/main/res/layout/quest_maxweight_sign_fi.xml delete mode 100644 app/src/main/res/layout/quest_maxweight_tandem_axleload_sign_fi.xml diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightForm.kt index 31b07775552..542d85745e5 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightForm.kt @@ -17,7 +17,6 @@ class AddMaxHeightForm : AbstractOsmQuestForm() { override val contentLayoutResId get() = when (countryInfo.countryCode) { "AU", "NZ", "US", "CA" -> R.layout.quest_maxheight_mutcd - "FI", "IS", "SE" -> R.layout.quest_maxheight_fi else -> R.layout.quest_maxheight } @@ -28,6 +27,11 @@ class AddMaxHeightForm : AbstractOsmQuestForm() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + view.findViewById(R.id.meterInputSign) + ?.setBackgroundResource(getSignBackgroundDrawableResId(countryInfo.countryCode)) + view.findViewById(R.id.feetInputSign) + ?.setBackgroundResource(getSignBackgroundDrawableResId(countryInfo.countryCode)) + val splitWayHint = view.findViewById(R.id.splitWayHint) splitWayHint?.text = getString(R.string.quest_maxheight_split_way_hint, getString(R.string.quest_generic_answer_differs_along_the_way)) splitWayHint?.isGone = element.type == ElementType.NODE @@ -84,3 +88,8 @@ class AddMaxHeightForm : AbstractOsmQuestForm() { } } } + +private fun getSignBackgroundDrawableResId(countryCode: String): Int = when (countryCode) { + "FI", "IS", "SE" -> R.drawable.background_maxheight_sign_yellow + else -> R.drawable.background_maxheight_sign +} diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt index 9d68be858f2..c488aab292d 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt @@ -101,7 +101,10 @@ class AddMaxSpeedForm : AbstractOsmQuestForm() { this.speedType = speedType binding.rightSideContainer.removeAllViews() - speedType?.layoutResId?.let { layoutInflater.inflate(it, binding.rightSideContainer, true) } + speedType?.layoutResId?.let { + layoutInflater.inflate(it, binding.rightSideContainer, true) + binding.rightSideContainer.adjustProhibitionSignBackground(countryInfo.countryCode) + } speedInput = binding.rightSideContainer.findViewById(R.id.maxSpeedInput) speedInput?.doAfterTextChanged { checkIsFormComplete() } @@ -234,6 +237,7 @@ class AddMaxSpeedForm : AbstractOsmQuestForm() { dialogBinding.slowZoneImage, true, ) + dialogBinding.slowZoneImage.adjustProhibitionSignBackground(countryInfo.countryCode) val dialogSpeedInput: EditText = dialogBinding.slowZoneImage.findViewById(R.id.maxSpeedInput) dialogSpeedInput.setText("××") dialogSpeedInput.inputType = EditorInfo.TYPE_NULL @@ -332,14 +336,30 @@ private enum class SpeedType { } private fun getMaxSpeedSignLayoutResId(countryCode: String): Int = when (countryCode) { - "FI", "IS", "SE" -> R.layout.quest_maxspeed_sign_fi "CA" -> R.layout.quest_maxspeed_sign_ca "US" -> R.layout.quest_maxspeed_sign_us else -> R.layout.quest_maxspeed_sign } private fun getMaxSpeedZoneSignLayoutResId(countryCode: String): Int = when (countryCode) { - "FI", "IS", "SE" -> R.layout.quest_maxspeed_zone_sign_fi "IL" -> R.layout.quest_maxspeed_zone_sign_il else -> R.layout.quest_maxspeed_zone_sign } + +private fun View.adjustProhibitionSignBackground(countryCode: String) { + this.findViewById(R.id.genericProhibitionSign) + ?.setBackgroundResource(getSignBackgroundDrawableResId(countryCode)) + + this.findViewById(R.id.maxSpeedSignNoFrame) + ?.setBackgroundResource(getSignNoFrameBackgroundDrawableResId(countryCode)) +} + +private fun getSignBackgroundDrawableResId(countryCode: String): Int = when (countryCode) { + "FI", "IS", "SE" -> R.drawable.background_generic_prohibition_sign_yellow + else -> R.drawable.background_generic_prohibition_sign +} + +private fun getSignNoFrameBackgroundDrawableResId(countryCode: String): Int = when (countryCode) { + "FI", "IS", "SE" -> R.drawable.background_maxspeed_sign_no_frame_small_yellow + else -> R.drawable.background_maxspeed_sign_no_frame_small +} diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/MaxWeightSignItem.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/MaxWeightSignItem.kt index d78e5b3454f..e78a90e02ae 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/MaxWeightSignItem.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/MaxWeightSignItem.kt @@ -32,6 +32,9 @@ private fun MaxWeightSign.createBitmap(inflater: LayoutInflater, countryCode: St ) inflater.inflate(getLayoutResourceId(countryCode), container) + container.findViewById(R.id.genericProhibitionSign) + ?.setBackgroundResource(getSignBackgroundDrawableResId(countryCode)) + container.measure( View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) @@ -53,13 +56,11 @@ fun MaxWeightSign.getLayoutResourceId(countryCode: String) = when (this) { private fun getMaxWeightSignLayoutResId(countryCode: String): Int = when (countryCode) { "AU", "CA", "US" -> R.layout.quest_maxweight_sign_us - "FI", "IS", "SE" -> R.layout.quest_maxweight_sign_fi else -> R.layout.quest_maxweight_sign } private fun getMaxWeightMgvSignLayoutResId(countryCode: String): Int = when (countryCode) { "AU", "CA", "US" -> R.layout.quest_maxweight_mgv_sign_us - "FI", "IS", "SE" -> R.layout.quest_maxweight_mgv_sign_fi "DE" -> R.layout.quest_maxweight_mgv_sign_de "GB" -> R.layout.quest_maxweight_mgv_sign_gb else -> R.layout.quest_maxweight_mgv_sign @@ -67,12 +68,15 @@ private fun getMaxWeightMgvSignLayoutResId(countryCode: String): Int = when (cou private fun getMaxWeightAxleLoadSignLayoutResId(countryCode: String): Int = when (countryCode) { "AU", "CA", "US" -> R.layout.quest_maxweight_axleload_sign_us - "FI", "IS", "SE" -> R.layout.quest_maxweight_axleload_sign_fi else -> R.layout.quest_maxweight_axleload_sign } private fun getMaxWeightTandemAxleLoadSignLayoutResId(countryCode: String): Int = when (countryCode) { "AU", "CA", "US" -> R.layout.quest_maxweight_tandem_axleload_sign_us - "FI", "IS", "SE" -> R.layout.quest_maxweight_tandem_axleload_sign_fi else -> R.layout.quest_maxweight_tandem_axleload_sign } + +private fun getSignBackgroundDrawableResId(countryCode: String): Int = when (countryCode) { + "FI", "IS", "SE" -> R.drawable.background_generic_prohibition_sign_yellow + else -> R.drawable.background_generic_prohibition_sign +} diff --git a/app/src/main/res/layout/quest_maxheight_fi.xml b/app/src/main/res/layout/quest_maxheight_fi.xml deleted file mode 100644 index bfdca608759..00000000000 --- a/app/src/main/res/layout/quest_maxheight_fi.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/quest_maxspeed_sign.xml b/app/src/main/res/layout/quest_maxspeed_sign.xml index 89bda74d6b7..10b380e9b2f 100644 --- a/app/src/main/res/layout/quest_maxspeed_sign.xml +++ b/app/src/main/res/layout/quest_maxspeed_sign.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="112dp" android:layout_height="112dp" + android:id="@+id/genericProhibitionSign" android:background="@drawable/background_generic_prohibition_sign" android:paddingStart="16dp" android:paddingEnd="16dp" diff --git a/app/src/main/res/layout/quest_maxspeed_sign_fi.xml b/app/src/main/res/layout/quest_maxspeed_sign_fi.xml deleted file mode 100644 index 180d7675008..00000000000 --- a/app/src/main/res/layout/quest_maxspeed_sign_fi.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/layout/quest_maxspeed_zone_sign.xml b/app/src/main/res/layout/quest_maxspeed_zone_sign.xml index 56cdf089c76..20065911eda 100644 --- a/app/src/main/res/layout/quest_maxspeed_zone_sign.xml +++ b/app/src/main/res/layout/quest_maxspeed_zone_sign.xml @@ -25,6 +25,7 @@ - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/quest_maxweight_axleload_sign.xml b/app/src/main/res/layout/quest_maxweight_axleload_sign.xml index bc5a9875f62..65c45e7360b 100644 --- a/app/src/main/res/layout/quest_maxweight_axleload_sign.xml +++ b/app/src/main/res/layout/quest_maxweight_axleload_sign.xml @@ -5,6 +5,7 @@ android:layout_width="112dp" android:layout_height="112dp" android:gravity="center" + android:id="@+id/genericProhibitionSign" android:background="@drawable/background_generic_prohibition_sign" android:layout_centerInParent="true" android:padding="18dp" diff --git a/app/src/main/res/layout/quest_maxweight_axleload_sign_fi.xml b/app/src/main/res/layout/quest_maxweight_axleload_sign_fi.xml deleted file mode 100644 index 1fa969f83ed..00000000000 --- a/app/src/main/res/layout/quest_maxweight_axleload_sign_fi.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/quest_maxweight_mgv_sign.xml b/app/src/main/res/layout/quest_maxweight_mgv_sign.xml index 9163b217bd6..b37975c5e5f 100644 --- a/app/src/main/res/layout/quest_maxweight_mgv_sign.xml +++ b/app/src/main/res/layout/quest_maxweight_mgv_sign.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="112dp" android:layout_height="112dp" + android:id="@+id/genericProhibitionSign" android:background="@drawable/background_generic_prohibition_sign" android:padding="22dp" android:gravity="center" diff --git a/app/src/main/res/layout/quest_maxweight_mgv_sign_fi.xml b/app/src/main/res/layout/quest_maxweight_mgv_sign_fi.xml deleted file mode 100644 index 785b1bad4a4..00000000000 --- a/app/src/main/res/layout/quest_maxweight_mgv_sign_fi.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/quest_maxweight_sign.xml b/app/src/main/res/layout/quest_maxweight_sign.xml index b1df5bd8dbe..db67682b107 100644 --- a/app/src/main/res/layout/quest_maxweight_sign.xml +++ b/app/src/main/res/layout/quest_maxweight_sign.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="112dp" android:layout_height="112dp" + android:id="@+id/genericProhibitionSign" android:background="@drawable/background_generic_prohibition_sign" android:padding="22dp" android:orientation="horizontal" diff --git a/app/src/main/res/layout/quest_maxweight_sign_fi.xml b/app/src/main/res/layout/quest_maxweight_sign_fi.xml deleted file mode 100644 index a424e729709..00000000000 --- a/app/src/main/res/layout/quest_maxweight_sign_fi.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/layout/quest_maxweight_tandem_axleload_sign.xml b/app/src/main/res/layout/quest_maxweight_tandem_axleload_sign.xml index d4e7f290da6..76804ac176a 100644 --- a/app/src/main/res/layout/quest_maxweight_tandem_axleload_sign.xml +++ b/app/src/main/res/layout/quest_maxweight_tandem_axleload_sign.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="112dp" android:layout_height="112dp" + android:id="@+id/genericProhibitionSign" android:background="@drawable/background_generic_prohibition_sign" android:padding="22dp" android:gravity="center" diff --git a/app/src/main/res/layout/quest_maxweight_tandem_axleload_sign_fi.xml b/app/src/main/res/layout/quest_maxweight_tandem_axleload_sign_fi.xml deleted file mode 100644 index f1b7d9a7fb2..00000000000 --- a/app/src/main/res/layout/quest_maxweight_tandem_axleload_sign_fi.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - From a41126f566e1d848c5a0ade0710f9333b777151a Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Sun, 15 Oct 2023 21:20:50 +0200 Subject: [PATCH 10/10] Revert formatting changes that are now unnecessary --- .../streetcomplete/quests/max_speed/AddMaxSpeedForm.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt index c488aab292d..1a6785418e9 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.kt @@ -336,14 +336,14 @@ private enum class SpeedType { } private fun getMaxSpeedSignLayoutResId(countryCode: String): Int = when (countryCode) { - "CA" -> R.layout.quest_maxspeed_sign_ca - "US" -> R.layout.quest_maxspeed_sign_us - else -> R.layout.quest_maxspeed_sign + "CA" -> R.layout.quest_maxspeed_sign_ca + "US" -> R.layout.quest_maxspeed_sign_us + else -> R.layout.quest_maxspeed_sign } private fun getMaxSpeedZoneSignLayoutResId(countryCode: String): Int = when (countryCode) { - "IL" -> R.layout.quest_maxspeed_zone_sign_il - else -> R.layout.quest_maxspeed_zone_sign + "IL" -> R.layout.quest_maxspeed_zone_sign_il + else -> R.layout.quest_maxspeed_zone_sign } private fun View.adjustProhibitionSignBackground(countryCode: String) {