mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-29 03:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(R): Move R file imports to core UI module (#3159)

Browse Source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich
2025-09-22 20:59:39 -05:00
committed by GitHub
parent e8e7608e52
commit d2db37e0d4
176 changed files with 579 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/google/java/com/geeksville/mesh/ui/map/MapView.kt
View File

@@ -68,7 +68,6 @@ import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig.DisplayUnits
import com.geeksville.mesh.MeshProtos
import com.geeksville.mesh.MeshProtos.Position
import com.geeksville.mesh.MeshProtos.Waypoint
import com.geeksville.mesh.R
import com.geeksville.mesh.android.BuildUtils.debug
import com.geeksville.mesh.android.BuildUtils.warn
import com.geeksville.mesh.copy
@@ -121,6 +120,7 @@ import com.google.maps.android.compose.rememberUpdatedMarkerState
import com.google.maps.android.compose.widgets.ScaleBar
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch
import org.meshtastic.core.strings.R
import timber.log.Timber
import java.text.DateFormat

2
app/src/google/java/com/geeksville/mesh/ui/map/components/ClusterItemsListDialog.kt
View File

@@ -31,9 +31,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.geeksville.mesh.R
import com.geeksville.mesh.ui.map.NodeClusterItem
import com.geeksville.mesh.ui.node.components.NodeChip
import org.meshtastic.core.strings.R
@Composable
fun ClusterItemsListDialog(

2
app/src/google/java/com/geeksville/mesh/ui/map/components/CustomMapLayersSheet.kt
View File

@@ -39,8 +39,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.geeksville.mesh.R
import com.geeksville.mesh.ui.map.MapLayerItem
import org.meshtastic.core.strings.R
@Suppress("LongMethod")
@Composable

2
app/src/google/java/com/geeksville/mesh/ui/map/components/CustomTileProviderManagerSheet.kt
View File

@@ -51,10 +51,10 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.geeksville.mesh.R
import com.geeksville.mesh.ui.map.CustomTileProviderConfig
import com.geeksville.mesh.ui.map.MapViewModel
import kotlinx.coroutines.flow.collectLatest
import org.meshtastic.core.strings.R
@Suppress("LongMethod")
@Composable

2
app/src/google/java/com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt
View File

@@ -63,9 +63,9 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.geeksville.mesh.MeshProtos.Waypoint
import com.geeksville.mesh.R
import com.geeksville.mesh.copy
import com.geeksville.mesh.ui.common.components.EmojiPickerDialog
import org.meshtastic.core.strings.R
import java.text.SimpleDateFormat
import java.util.Calendar
import java.util.Locale

2
app/src/google/java/com/geeksville/mesh/ui/map/components/MapControlsOverlay.kt
View File

@@ -33,9 +33,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.rotate
import androidx.compose.ui.res.stringResource
import com.geeksville.mesh.R
import com.geeksville.mesh.ui.common.theme.StatusColors.StatusRed
import com.geeksville.mesh.ui.map.MapViewModel
import org.meshtastic.core.strings.R
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable

2
app/src/google/java/com/geeksville/mesh/ui/map/components/MapFilterDropdown.kt
View File

@@ -30,8 +30,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.geeksville.mesh.R
import com.geeksville.mesh.ui.map.MapViewModel
import org.meshtastic.core.strings.R
@Composable
internal fun MapFilterDropdown(expanded: Boolean, onDismissRequest: () -> Unit, mapViewModel: MapViewModel) {

2
app/src/google/java/com/geeksville/mesh/ui/map/components/MapTypeDropdown.kt
View File

@@ -28,9 +28,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.geeksville.mesh.R
import com.geeksville.mesh.ui.map.MapViewModel
import com.google.maps.android.compose.MapType
import org.meshtastic.core.strings.R
@Suppress("LongMethod")
@Composable

2
app/src/google/java/com/geeksville/mesh/ui/map/components/WaypointMarkers.kt
View File

@@ -21,13 +21,13 @@ import android.widget.Toast
import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext
import com.geeksville.mesh.MeshProtos
import com.geeksville.mesh.R
import com.geeksville.mesh.ui.map.BaseMapViewModel
import com.geeksville.mesh.ui.node.DEG_D
import com.google.android.gms.maps.model.BitmapDescriptor
import com.google.android.gms.maps.model.LatLng
import com.google.maps.android.compose.Marker
import com.google.maps.android.compose.rememberUpdatedMarkerState
import org.meshtastic.core.strings.R
@Composable
fun WaypointMarkers(