Skip to content

Commit 76ce268

Browse files
westnordostwestnordost
committed
use * imports for resources. Since resources are all prepended by Res. in the code, it should always pretty clear any one constant comes from.
(I wish one could just import the Res object, but unfortunately, all those resources are implemented as extension functions on a "main" Res object..., see https://youtrack.jetbrains.com/issue/CMP-8911/Generate-accessors-for-resources-in-Res-object-as-members )
1 parent c2a85a7 commit 76ce268

File tree

185 files changed

+183
-1897
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+183
-1897
lines changed

‎app/src/androidInstrumentedTest/kotlin/de/westnordost/streetcomplete/data/osm/osmquests/DisabledTestQuestType.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package de.westnordost.streetcomplete.data.osm.osmquests
22

3-
import de.westnordost.streetcomplete.resources.Res
4-
import de.westnordost.streetcomplete.resources.default_disabled_msg_go_inside
3+
import de.westnordost.streetcomplete.resources.*
54

65
class DisabledTestQuestType : TestQuestType() {
76
override val defaultDisabledMessage = Res.string.default_disabled_msg_go_inside

‎app/src/androidMain/kotlin/de/westnordost/streetcomplete/overlays/places/PlacesOverlayForm.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ import de.westnordost.streetcomplete.osm.toElement
5252
import de.westnordost.streetcomplete.osm.toPrefixedFeature
5353
import de.westnordost.streetcomplete.overlays.AbstractOverlayForm
5454
import de.westnordost.streetcomplete.overlays.AnswerItem
55-
import de.westnordost.streetcomplete.resources.Res
56-
import de.westnordost.streetcomplete.resources.name_label
57-
import de.westnordost.streetcomplete.resources.quest_placeName_no_name_answer
55+
import de.westnordost.streetcomplete.resources.*
5856
import de.westnordost.streetcomplete.ui.common.feature.FeatureIcon
5957
import de.westnordost.streetcomplete.ui.common.feature.FeatureSelect
6058
import de.westnordost.streetcomplete.ui.common.last_picked.LastPickedChipsRow

‎app/src/androidMain/kotlin/de/westnordost/streetcomplete/quests/LeaveNoteInsteadFragment.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ import de.westnordost.streetcomplete.data.osmnotes.edits.NoteEditAction
1717
import de.westnordost.streetcomplete.data.osmnotes.edits.NoteEditsController
1818
import de.westnordost.streetcomplete.databinding.FormLeaveNoteBinding
1919
import de.westnordost.streetcomplete.databinding.FragmentQuestAnswerBinding
20-
import de.westnordost.streetcomplete.resources.Res
21-
import de.westnordost.streetcomplete.resources.map_btn_create_note
20+
import de.westnordost.streetcomplete.resources.*
2221
import de.westnordost.streetcomplete.screens.main.bottom_sheet.AbstractCreateNoteFragment
2322
import de.westnordost.streetcomplete.ui.theme.titleLarge
2423
import de.westnordost.streetcomplete.ui.util.content

‎app/src/androidMain/kotlin/de/westnordost/streetcomplete/quests/max_height/AddMaxHeightForm.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ import de.westnordost.streetcomplete.databinding.ComposeViewBinding
1515
import de.westnordost.streetcomplete.osm.Length
1616
import de.westnordost.streetcomplete.quests.AbstractOsmQuestForm
1717
import de.westnordost.streetcomplete.quests.AnswerItem
18-
import de.westnordost.streetcomplete.resources.Res
19-
import de.westnordost.streetcomplete.resources.quest_generic_answer_differs_along_the_way
20-
import de.westnordost.streetcomplete.resources.quest_maxheight_split_way_hint
18+
import de.westnordost.streetcomplete.resources.*
2119
import de.westnordost.streetcomplete.ui.util.content
2220
import de.westnordost.streetcomplete.ui.util.rememberSerializable
2321
import org.jetbrains.compose.resources.StringResource

‎app/src/androidMain/kotlin/de/westnordost/streetcomplete/quests/traffic_signals_vibrate/AddTrafficSignalsVibrationForm.kt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ package de.westnordost.streetcomplete.quests.traffic_signals_vibrate
33
import de.westnordost.streetcomplete.R
44
import de.westnordost.streetcomplete.quests.AbstractOsmQuestForm
55
import de.westnordost.streetcomplete.quests.AnswerItem
6-
import de.westnordost.streetcomplete.resources.Res
7-
import de.westnordost.streetcomplete.resources.vibrating_button_illustration
8-
import de.westnordost.streetcomplete.resources.vibrating_button_illustration_au
9-
import de.westnordost.streetcomplete.resources.vibrating_button_illustration_gb
6+
import de.westnordost.streetcomplete.resources.*
107
import org.jetbrains.compose.resources.DrawableResource
118

129
class AddTrafficSignalsVibrationForm : AbstractOsmQuestForm<Boolean>() {

‎app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/about/AboutScreen.kt‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,7 @@ import androidx.compose.ui.platform.LocalContext
2424
import androidx.compose.ui.platform.LocalUriHandler
2525
import androidx.compose.ui.text.intl.Locale
2626
import de.westnordost.streetcomplete.BuildConfig
27-
import de.westnordost.streetcomplete.resources.Res
28-
import de.westnordost.streetcomplete.resources.about_category_contribute
29-
import de.westnordost.streetcomplete.resources.about_category_feedback
30-
import de.westnordost.streetcomplete.resources.about_category_help
31-
import de.westnordost.streetcomplete.resources.about_description_translate
32-
import de.westnordost.streetcomplete.resources.about_summary_donate
33-
import de.westnordost.streetcomplete.resources.about_summary_logs
34-
import de.westnordost.streetcomplete.resources.about_title_authors
35-
import de.westnordost.streetcomplete.resources.about_title_changelog
36-
import de.westnordost.streetcomplete.resources.about_title_donate
37-
import de.westnordost.streetcomplete.resources.about_title_faq
38-
import de.westnordost.streetcomplete.resources.about_title_feedback
39-
import de.westnordost.streetcomplete.resources.about_title_intro
40-
import de.westnordost.streetcomplete.resources.about_title_license
41-
import de.westnordost.streetcomplete.resources.about_title_privacy_statement
42-
import de.westnordost.streetcomplete.resources.about_title_rate
43-
import de.westnordost.streetcomplete.resources.about_title_report_error
44-
import de.westnordost.streetcomplete.resources.about_title_repository
45-
import de.westnordost.streetcomplete.resources.about_title_show_logs
46-
import de.westnordost.streetcomplete.resources.about_title_translate
47-
import de.westnordost.streetcomplete.resources.action_about2
48-
import de.westnordost.streetcomplete.resources.translation_completeness
27+
import de.westnordost.streetcomplete.resources.*
4928
import de.westnordost.streetcomplete.screens.tutorial.IntroTutorialScreen
5029
import de.westnordost.streetcomplete.ui.common.AnimatedScreenVisibility
5130
import de.westnordost.streetcomplete.ui.common.BackIcon

‎app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/about/logs/DateTimeSelectField.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import androidx.compose.runtime.rememberCoroutineScope
1111
import androidx.compose.ui.Modifier
1212
import androidx.compose.ui.platform.LocalContext
1313
import de.westnordost.streetcomplete.R
14-
import de.westnordost.streetcomplete.resources.Res
15-
import de.westnordost.streetcomplete.resources.ic_calendar_month_24
14+
import de.westnordost.streetcomplete.resources.*
1615
import de.westnordost.streetcomplete.ui.common.ClearIcon
1716
import de.westnordost.streetcomplete.util.ktx.now
1817
import de.westnordost.streetcomplete.util.locale.DateTimeFormatStyle

‎app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/about/logs/LogsFiltersDialog.kt‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,7 @@ import androidx.compose.ui.Modifier
1616
import androidx.compose.ui.text.input.TextFieldValue
1717
import androidx.compose.ui.unit.dp
1818
import de.westnordost.streetcomplete.data.logs.LogsFilters
19-
import de.westnordost.streetcomplete.resources.Res
20-
import de.westnordost.streetcomplete.resources.cancel
21-
import de.westnordost.streetcomplete.resources.label_log_message_contains
22-
import de.westnordost.streetcomplete.resources.label_log_newer_than
23-
import de.westnordost.streetcomplete.resources.label_log_older_than
24-
import de.westnordost.streetcomplete.resources.ok
25-
import de.westnordost.streetcomplete.resources.title_logs_filters
19+
import de.westnordost.streetcomplete.resources.*
2620
import de.westnordost.streetcomplete.ui.common.ClearIcon
2721
import org.jetbrains.compose.resources.stringResource
2822
import androidx.compose.ui.tooling.preview.Preview

‎app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/about/logs/LogsScreen.kt‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,7 @@ import androidx.compose.ui.unit.dp
4040
import de.westnordost.streetcomplete.ApplicationConstants
4141
import de.westnordost.streetcomplete.BuildConfig
4242
import de.westnordost.streetcomplete.data.logs.format
43-
import de.westnordost.streetcomplete.resources.Res
44-
import de.westnordost.streetcomplete.resources.about_title_logs
45-
import de.westnordost.streetcomplete.resources.action_filter
46-
import de.westnordost.streetcomplete.resources.action_share
47-
import de.westnordost.streetcomplete.resources.ic_filter_list_24
48-
import de.westnordost.streetcomplete.resources.ic_share_24
49-
import de.westnordost.streetcomplete.resources.no_search_results
43+
import de.westnordost.streetcomplete.resources.*
5044
import de.westnordost.streetcomplete.ui.common.BackIcon
5145
import de.westnordost.streetcomplete.ui.common.CenteredLargeTitleHint
5246
import de.westnordost.streetcomplete.ui.ktx.isScrolledToEnd

‎app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/main/MainScreen.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ import androidx.compose.ui.platform.LocalLayoutDirection
4343
import androidx.compose.ui.unit.dp
4444
import de.westnordost.streetcomplete.R
4545
import de.westnordost.streetcomplete.data.messages.Message
46-
import de.westnordost.streetcomplete.resources.Res
47-
import de.westnordost.streetcomplete.resources.location_dot_small
48-
import de.westnordost.streetcomplete.resources.map_attribution_osm
46+
import de.westnordost.streetcomplete.resources.*
4947
import de.westnordost.streetcomplete.screens.about.AboutActivity
5048
import de.westnordost.streetcomplete.screens.main.controls.AttributionButton
5149
import de.westnordost.streetcomplete.screens.main.controls.AttributionLink

0 commit comments

Comments
 (0)