Use auto mirrored image vectors

ngageoint · Feb 2, 2024 · a42124f · a42124f
1 parent 7b10f06
commit a42124f
Show file tree

Hide file tree

Showing 33 changed files with 54 additions and 62 deletions.
diff --git a/app/src/androidTest/java/mil/nga/msi/repository/asam/AsamRepositoryTest.kt b/app/src/androidTest/java/mil/nga/msi/repository/asam/AsamRepositoryTest.kt
@@ -3,7 +3,6 @@ package mil.nga.msi.repository.asam
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.asLiveData
 import androidx.paging.testing.asPagingSourceFactory
-import androidx.work.Data
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import io.mockk.clearAllMocks

diff --git a/app/src/androidTest/java/mil/nga/msi/repository/dgpsstation/DgpsStationRepositoryTest.kt b/app/src/androidTest/java/mil/nga/msi/repository/dgpsstation/DgpsStationRepositoryTest.kt
@@ -3,7 +3,6 @@ package mil.nga.msi.repository.dgpsstation
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.asLiveData
 import androidx.paging.testing.asPagingSourceFactory
-import androidx.work.Data
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import io.mockk.clearAllMocks

diff --git a/app/src/androidTest/java/mil/nga/msi/repository/light/LightRepositoryTest.kt b/app/src/androidTest/java/mil/nga/msi/repository/light/LightRepositoryTest.kt
@@ -3,7 +3,6 @@ package mil.nga.msi.repository.light
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.asLiveData
 import androidx.paging.testing.asPagingSourceFactory
-import androidx.work.Data
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import io.mockk.clearAllMocks

diff --git a/app/src/androidTest/java/mil/nga/msi/repository/modu/ModuRepositoryTest.kt b/app/src/androidTest/java/mil/nga/msi/repository/modu/ModuRepositoryTest.kt
@@ -2,7 +2,6 @@ package mil.nga.msi.repository.modu
 
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.asLiveData
-import androidx.work.Data
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import io.mockk.coEvery

diff --git a/...Test/java/mil/nga/msi/repository/navigationalwarning/NavigationalWarningRepositoryTest.kt b/...Test/java/mil/nga/msi/repository/navigationalwarning/NavigationalWarningRepositoryTest.kt
@@ -2,7 +2,6 @@ package mil.nga.msi.repository.navigationalwarning
 
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.asLiveData
-import androidx.work.Data
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import io.mockk.clearAllMocks

diff --git a/app/src/androidTest/java/mil/nga/msi/repository/port/PortRepositoryTest.kt b/app/src/androidTest/java/mil/nga/msi/repository/port/PortRepositoryTest.kt
@@ -3,7 +3,6 @@ package mil.nga.msi.repository.port
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.asLiveData
 import androidx.paging.testing.asPagingSourceFactory
-import androidx.work.Data
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import io.mockk.clearAllMocks

diff --git a/app/src/androidTest/java/mil/nga/msi/repository/radiobeacon/RadioBeaconRepositoryTest.kt b/app/src/androidTest/java/mil/nga/msi/repository/radiobeacon/RadioBeaconRepositoryTest.kt
@@ -3,7 +3,6 @@ package mil.nga.msi.repository.radiobeacon
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.asLiveData
 import androidx.paging.testing.asPagingSourceFactory
-import androidx.work.Data
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import io.mockk.clearAllMocks

diff --git a/app/src/main/java/mil/nga/msi/repository/route/RouteLocalDataSource.kt b/app/src/main/java/mil/nga/msi/repository/route/RouteLocalDataSource.kt
@@ -9,7 +9,6 @@ class RouteLocalDataSource @Inject constructor(
     private val dao: RouteDao
 ) {
     fun observeRoutesWithWaypoints() = dao.observeRoutesWithWaypoints()
-    fun observeRoutes() = dao.observeRoutes()
     fun observeRouteMapItems() = dao.observeRouteMapItems()
 
     fun getRoutes(
@@ -19,7 +18,6 @@ class RouteLocalDataSource @Inject constructor(
         maxLongitude: Double
     ) = dao.getRoutes(minLatitude, minLongitude, maxLatitude, maxLongitude)
 
-    suspend fun getRoute(id: Long) = dao.getRoute(id)
     suspend fun getRouteWithWaypoints(id: Long) = dao.getRouteWithWaypoints(id)
     fun observeRouteWithWaypoints(id: Long) = dao.observeRouteWithWaypoints(id)
 

diff --git a/app/src/main/java/mil/nga/msi/ui/about/DisclaimerScreen.kt b/app/src/main/java/mil/nga/msi/ui/about/DisclaimerScreen.kt
@@ -6,7 +6,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -23,7 +23,7 @@ fun DisclaimerScreen(
    Column(modifier = Modifier.fillMaxSize()) {
       TopBar(
          title = AboutRoute.Disclaimer.title,
-         navigationIcon = Icons.Default.ArrowBack,
+         navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
          onNavigationClicked = { close() }
       )
 

diff --git a/app/src/main/java/mil/nga/msi/ui/about/PrivacyPolicyScreen.kt b/app/src/main/java/mil/nga/msi/ui/about/PrivacyPolicyScreen.kt
@@ -6,7 +6,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -23,7 +23,7 @@ fun PrivacyPolicyScreen(
    Column(modifier = Modifier.fillMaxSize()) {
       TopBar(
          title = AboutRoute.Privacy.title,
-         navigationIcon = Icons.Default.ArrowBack,
+         navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
          onNavigationClicked = { close() }
       )
 

diff --git a/app/src/main/java/mil/nga/msi/ui/asam/detail/AsamDetailScreen.kt b/app/src/main/java/mil/nga/msi/ui/asam/detail/AsamDetailScreen.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Card
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
@@ -55,7 +55,7 @@ fun AsamDetailScreen(
    Column {
       TopBar(
          title = "ASAM",
-         navigationIcon = Icons.Default.ArrowBack,
+         navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
          onNavigationClicked = { onBack() }
       )
 

diff --git a/app/src/main/java/mil/nga/msi/ui/dgpsstation/detail/DgpsStationDetailScreen.kt b/app/src/main/java/mil/nga/msi/ui/dgpsstation/detail/DgpsStationDetailScreen.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Card
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
@@ -55,7 +55,7 @@ fun DgpsStationDetailScreen(
    Column {
       TopBar(
          title = dgpsStationWithBookmark?.dgpsStation?.name ?: "",
-         navigationIcon = Icons.Default.ArrowBack,
+         navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
          onNavigationClicked = { close() }
       )
 

diff --git a/app/src/main/java/mil/nga/msi/ui/electronicpublication/ElectronicPublicationDetailScreen.kt b/app/src/main/java/mil/nga/msi/ui/electronicpublication/ElectronicPublicationDetailScreen.kt
@@ -4,7 +4,7 @@ import android.content.Intent
 import android.text.format.Formatter
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -35,7 +35,7 @@ fun ElectronicPublicationDetailScreen(
     Column {
         TopBar(
             title = publicationWithBookmark?.electronicPublication?.sectionDisplayName.orEmpty(),
-            navigationIcon = Icons.Default.ArrowBack,
+            navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
             onNavigationClicked = onBack,
         )
 

diff --git a/...c/main/java/mil/nga/msi/ui/electronicpublication/ElectronicPublicationTypeBrowseScreen.kt b/...c/main/java/mil/nga/msi/ui/electronicpublication/ElectronicPublicationTypeBrowseScreen.kt
@@ -10,7 +10,7 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.ListItem
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.ChevronRight
 import androidx.compose.material.icons.filled.Folder
 import androidx.compose.material3.*
@@ -94,7 +94,7 @@ fun ElectronicPublicationTypeBrowseScreen(
     Column(modifier = Modifier.fillMaxSize()) {
         TopBar(
             title = currentNode.title,
-            navigationIcon = Icons.Default.ArrowBack,
+            navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
             onNavigationClicked = onBackClick,
         )
         Surface {

diff --git a/app/src/main/java/mil/nga/msi/ui/export/GeoPackageExportScreen.kt b/app/src/main/java/mil/nga/msi/ui/export/GeoPackageExportScreen.kt
@@ -26,7 +26,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.material.icons.filled.LocationOn
 import androidx.compose.material.icons.filled.SentimentVeryDissatisfied
@@ -110,7 +110,7 @@ fun GeoPackageExportScreen(
    Column {
       TopBar(
          title = "GeoPackage Export",
-         navigationIcon = Icons.Default.ArrowBack,
+         navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
          onNavigationClicked = { close() }
       )
 

diff --git a/app/src/main/java/mil/nga/msi/ui/geopackage/detail/GeoPackageFeatureDetailScreen.kt b/app/src/main/java/mil/nga/msi/ui/geopackage/detail/GeoPackageFeatureDetailScreen.kt
@@ -17,10 +17,10 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.VolumeUp
 import androidx.compose.material.icons.filled.AttachFile
 import androidx.compose.material.icons.filled.PlayArrow
-import androidx.compose.material.icons.filled.VolumeUp
 import androidx.compose.material3.Card
 import androidx.compose.material3.Divider
 import androidx.compose.material3.Icon
@@ -79,7 +79,7 @@ fun GeoPackageFeatureDetailScreen(
    Column {
       TopBar(
          title = "GeoPackage",
-         navigationIcon = Icons.Default.ArrowBack,
+         navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
          onNavigationClicked = { close() }
       )
 
@@ -303,7 +303,7 @@ private fun GeoPackageMedia(
          GeoPackageMediaIcon(Icons.Default.PlayArrow, onClick)
       }
       property.contentType.contains("audio/") -> {
-         GeoPackageMediaIcon(Icons.Default.VolumeUp, onClick)
+         GeoPackageMediaIcon(Icons.AutoMirrored.Default.VolumeUp, onClick)
       }
       else -> {
          GeoPackageMediaIcon(Icons.Default.AttachFile, onClick)

diff --git a/app/src/main/java/mil/nga/msi/ui/geopackage/media/GeoPackageMediaScreen.kt b/app/src/main/java/mil/nga/msi/ui/geopackage/media/GeoPackageMediaScreen.kt
@@ -11,10 +11,10 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.VolumeUp
 import androidx.compose.material.icons.filled.AttachFile
 import androidx.compose.material.icons.filled.PlayArrow
-import androidx.compose.material.icons.filled.VolumeUp
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -47,7 +47,7 @@ fun GeoPackageMediaScreen(
    Column {
       TopBar(
          title = "GeoPackage Media",
-         navigationIcon = Icons.Default.ArrowBack,
+         navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
          onNavigationClicked = { close() }
       )
 
@@ -72,7 +72,7 @@ private fun GeoPackageMedia(
          GeoPackageMediaIcon(Icons.Default.PlayArrow)
       }
       media.contentType.contains("audio/") -> {
-         GeoPackageMediaIcon(Icons.Default.VolumeUp)
+         GeoPackageMediaIcon(Icons.AutoMirrored.Default.VolumeUp)
       }
       else -> {
          GeoPackageMediaIcon(Icons.Default.AttachFile)

diff --git a/app/src/main/java/mil/nga/msi/ui/light/detail/LightDetailScreen.kt b/app/src/main/java/mil/nga/msi/ui/light/detail/LightDetailScreen.kt
@@ -17,7 +17,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Card
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
@@ -79,7 +79,7 @@ fun LightDetailScreen(
    Column {
       TopBar(
          title = LightRoute.Detail.title,
-         navigationIcon = Icons.Default.ArrowBack,
+         navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
          onNavigationClicked = { close() }
       )
 

diff --git a/app/src/main/java/mil/nga/msi/ui/map/settings/MapLightSettingsScreen.kt b/app/src/main/java/mil/nga/msi/ui/map/settings/MapLightSettingsScreen.kt
@@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.ModeStandby
 import androidx.compose.material.icons.outlined.Stream
 import androidx.compose.material3.Divider
@@ -57,7 +57,7 @@ fun MapLightSettingsScreen(
    Column {
       TopBar(
          title = "Light Settings",
-         navigationIcon = Icons.Default.ArrowBack,
+         navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
          onNavigationClicked = { onClose() }
       )
 

diff --git a/app/src/main/java/mil/nga/msi/ui/map/settings/layers/MapLayersScreen.kt b/app/src/main/java/mil/nga/msi/ui/map/settings/layers/MapLayersScreen.kt
@@ -20,7 +20,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Layers
 import androidx.compose.material.icons.filled.Menu
@@ -79,7 +79,7 @@ fun MapLayersScreen(
    Column {
       TopBar(
          title = MapLayerRoute.Layers.title,
-         navigationIcon = Icons.Default.ArrowBack,
+         navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
          onNavigationClicked = { onClose() }
       )
 

diff --git a/app/src/main/java/mil/nga/msi/ui/modu/detail/ModuDetailScreen.kt b/app/src/main/java/mil/nga/msi/ui/modu/detail/ModuDetailScreen.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Card
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
@@ -56,7 +56,7 @@ fun ModuDetailScreen(
    Column {
       TopBar(
          title = "MODU",
-         navigationIcon = Icons.Default.ArrowBack,
+         navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
          onNavigationClicked = { close() }
       )
 

diff --git a/app/src/main/java/mil/nga/msi/ui/navigation/NavigationDrawer.kt b/app/src/main/java/mil/nga/msi/ui/navigation/NavigationDrawer.kt
@@ -10,8 +10,8 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.NoteAdd
 import androidx.compose.material.icons.filled.Info
-import androidx.compose.material.icons.filled.NoteAdd
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.livedata.observeAsState
@@ -189,7 +189,7 @@ fun NavigationDrawer(
 
                         CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onSurfaceVariant) {
                            Icon(
-                              Icons.Filled.NoteAdd,
+                              Icons.AutoMirrored.Filled.NoteAdd,
                               modifier = Modifier.padding(start = 8.dp),
                               contentDescription = "Submit Report to NGA"
                            )

diff --git a/...rc/main/java/mil/nga/msi/ui/navigationalwarning/detail/NavigationalWarningDetailScreen.kt b/...rc/main/java/mil/nga/msi/ui/navigationalwarning/detail/NavigationalWarningDetailScreen.kt
@@ -5,7 +5,7 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -51,7 +51,7 @@ fun NavigationalWarningDetailScreen(
    Column {
       TopBar(
          title = "Navigational Warning",
-         navigationIcon = Icons.Default.ArrowBack,
+         navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
          onNavigationClicked = { close() }
       )
 

diff --git a/app/src/main/java/mil/nga/msi/ui/navigationalwarning/list/NavigationalWarningsScreen.kt b/app/src/main/java/mil/nga/msi/ui/navigationalwarning/list/NavigationalWarningsScreen.kt
@@ -18,7 +18,7 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.ArrowUpward
 import androidx.compose.material.icons.outlined.Download
 import androidx.compose.material3.Card
@@ -76,7 +76,7 @@ fun NavigationalWarningsScreen(
    Column(modifier = Modifier.fillMaxSize()) {
       TopBar(
          title = NavigationWarningRoute.List.title,
-         navigationIcon = Icons.Default.ArrowBack,
+         navigationIcon = Icons.AutoMirrored.Default.ArrowBack,
          onNavigationClicked = { close() }
       )