move some more files to common

Author: westnordost

app/src/androidMain/kotlin/de/westnordost/streetcomplete/quests/building_levels/BuildingLevelsButton.kt

@@ -8,9 +8,10 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
-import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.resources.Res
+import de.westnordost.streetcomplete.resources.ic_building_levels_illustration
+import org.jetbrains.compose.resources.painterResource
 
 /** A button that shows (previous) building levels and roof levels */
 @Composable
@@ -28,7 +29,7 @@ fun BuildingLevelsButton(
                 modifier = Modifier.align(Alignment.Bottom)
             )
             Image(
-                painter = painterResource(R.drawable.ic_building_levels_illustration),
+                painter = painterResource(Res.drawable.ic_building_levels_illustration),
                 contentDescription = "Building Illustration"
             )
             Text(

app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/main/controls/Crosshair.kt

@@ -10,18 +10,19 @@ import androidx.compose.material.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.PreviewLightDark
-import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.resources.Res
+import de.westnordost.streetcomplete.resources.crosshair
 import de.westnordost.streetcomplete.ui.theme.AppTheme
 import de.westnordost.streetcomplete.ui.theme.getOpenQuestFormMapPadding
+import org.jetbrains.compose.resources.painterResource
 
 /** A crosshair at the position at which a new POI should be created */
 @Composable
 fun Crosshair(modifier: Modifier = Modifier) {
     BoxWithConstraints(modifier.fillMaxSize()) {
         Icon(
-            painter = painterResource(R.drawable.crosshair),
+            painter = painterResource(Res.drawable.crosshair),
             contentDescription = null,
             modifier = Modifier
                 .align(Alignment.Center)

app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/main/edithistory/Edit.kt

@@ -16,6 +16,12 @@ import de.westnordost.streetcomplete.data.osmnotes.edits.NoteEditAction.CREATE
 import de.westnordost.streetcomplete.data.osmnotes.notequests.OsmNoteQuestHidden
 import de.westnordost.streetcomplete.data.quest.QuestType
 import de.westnordost.streetcomplete.quests.getTitle
+import de.westnordost.streetcomplete.resources.Res
+import de.westnordost.streetcomplete.resources.undo_delete
+import de.westnordost.streetcomplete.resources.undo_move_node
+import de.westnordost.streetcomplete.resources.undo_split
+import de.westnordost.streetcomplete.resources.undo_visibility
+import org.jetbrains.compose.resources.DrawableResource
 
 val Edit.icon: Int get() = when (this) {
     is ElementEdit -> type.icon
@@ -30,18 +36,18 @@ val Edit.icon: Int get() = when (this) {
     else -> 0
 }
 
-val Edit.overlayIcon: Int get() = when (this) {
+val Edit.overlayIcon: DrawableResource? get() = when (this) {
     is ElementEdit -> {
         when (action) {
-            is DeletePoiNodeAction -> R.drawable.ic_undo_delete
-            is SplitWayAction -> R.drawable.ic_undo_split
-            is MoveNodeAction -> R.drawable.ic_undo_move_node
-            else -> 0
+            is DeletePoiNodeAction -> Res.drawable.undo_delete
+            is SplitWayAction -> Res.drawable.undo_split
+            is MoveNodeAction -> Res.drawable.undo_move_node
+            else -> null
         }
     }
-    is OsmNoteQuestHidden -> R.drawable.ic_undo_visibility
-    is OsmQuestHidden -> R.drawable.ic_undo_visibility
-    else -> 0
+    is OsmNoteQuestHidden -> Res.drawable.undo_visibility
+    is OsmQuestHidden -> Res.drawable.undo_visibility
+    else -> null
 }
 
 @Composable

app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/main/edithistory/EditImage.kt

@@ -8,6 +8,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import de.westnordost.streetcomplete.data.edithistory.Edit
+import org.jetbrains.compose.resources.painterResource
 
 /** Icon representing an edit (main icon + overlay icon) */
 @Composable
@@ -21,7 +22,7 @@ fun EditImage(
             Image(painterResource(edit.icon), null)
         }
         val overlayIcon = edit.overlayIcon
-        if (overlayIcon != 0) {
+        if (overlayIcon != null) {
             Image(
                 painter = painterResource(overlayIcon),
                 contentDescription = null,