#40 fix: never show, copy or share AAA for international mapcodes

Signed-off-by: sds100 <developer.sds100@gmail.com>

Author: sds100

app/src/main/java/com/mapcode/map/InfoScreenPart.kt

@@ -421,7 +421,7 @@ private fun HeaderWithIcon(modifier: Modifier = Modifier, text: String, @Drawabl
 private fun MapcodeBox(
     modifier: Modifier = Modifier,
     code: String,
-    territory: String
+    territory: String?
 ) {
     Card(
         modifier = modifier,
@@ -438,10 +438,12 @@ private fun MapcodeBox(
                 MaterialTheme.typography.body1.copy(fontWeight = FontWeight.Bold).toSpanStyle()
 
             val styledString = buildAnnotatedString {
-                pushStyle(MaterialTheme.typography.body2.toSpanStyle())
-                append(territory)
-                pop()
-                append(" ")
+                if (territory != null) {
+                    pushStyle(MaterialTheme.typography.body2.toSpanStyle())
+                    append(territory)
+                    pop()
+                    append(" ")
+                }
                 pushStyle(codeSpanStyle)
                 append(code)
                 pop()

app/src/main/java/com/mapcode/map/MapViewModel.kt

@@ -13,6 +13,7 @@ import com.google.maps.android.compose.CameraPositionState
 import com.google.maps.android.compose.MapProperties
 import com.google.maps.android.compose.MapType
 import com.mapcode.Mapcode
+import com.mapcode.Territory
 import com.mapcode.data.Keys
 import com.mapcode.data.PreferenceRepository
 import com.mapcode.util.*
@@ -51,9 +52,15 @@ class MapViewModel @Inject constructor(
         if (mapcode == null) {
             MapcodeUi("", "", "", 0, 0)
         } else {
+            val territoryName = if (mapcode.territory == Territory.AAA) {
+                null
+            } else {
+                mapcode.territory.name
+            }
+
             MapcodeUi(
                 mapcode.code,
-                mapcode.territory.name,
+                territoryName,
                 mapcode.territory.fullName,
                 mapcodeIndex + 1,
                 mapcodes.size
@@ -178,7 +185,14 @@ class MapViewModel @Inject constructor(
         }
 
         val mapcode = mapcodes.value[mapcodeIndex.value]
-        useCase.copyToClipboard("${mapcode.territory.name} ${mapcode.code}")
+
+        val text = if (mapcode.territory == Territory.AAA) {
+            mapcode.code
+        } else {
+            "${mapcode.territory.name} ${mapcode.code}"
+        }
+
+        useCase.copyToClipboard(text)
         return true
     }
 
@@ -415,7 +429,13 @@ class MapViewModel @Inject constructor(
 
     fun shareMapcode() {
         val mapcode = mapcodes.value.getOrNull(mapcodeIndex.value) ?: return
-        useCase.shareText(text = "$mapcode", description = "Mapcode: $mapcode")
+        val text = if (mapcode.territory == Territory.AAA) {
+            mapcode.code
+        } else {
+            mapcode.codeWithTerritory
+        }
+
+        useCase.shareText(text = text, description = "Mapcode: $text")
     }
 }
 

app/src/main/java/com/mapcode/map/MapcodeUi.kt

@@ -8,7 +8,7 @@ data class MapcodeUi(
     /**
      * The short name of the territory. E.g NLD.
      */
-    val territoryShortName: String,
+    val territoryShortName: String?,
 
     /**
      * The full name of the territory. E.g Netherlands.

app/src/test/java/com/mapcode/map/FakeShowMapcodeUseCase.kt

@@ -17,6 +17,9 @@ class FakeShowMapcodeUseCase : ShowMapcodeUseCase {
     var clipboard: String? = null
         private set
 
+    var sharedText: String? = null
+        private set
+
     var hasInternetConnection: Boolean = true
     var currentLocation: Location? = null
 
@@ -81,7 +84,10 @@ class FakeShowMapcodeUseCase : ShowMapcodeUseCase {
         return true
     }
 
-    override fun shareText(text: String, description: String) {}
+    override fun shareText(text: String, description: String) {
+        sharedText = text
+    }
+    
     override suspend fun getMatchingAddresses(query: String): Result<List<String>> {
         return success(matchingAddresses[query] ?: emptyList())
     }

app/src/test/java/com/mapcode/map/MapViewModelTest.kt

@@ -69,14 +69,14 @@ internal class MapViewModelTest {
                 1.0,
                 1.0,
                 addresses = emptyList(),
-                mapcodes = listOf(Mapcode("1AB.XY", Territory.AAA))
+                mapcodes = listOf(Mapcode("1AB.XY", Territory.NLD))
             )
         )
 
         viewModel.onCameraMoved(1.0, 1.0, 0f)
         viewModel.copyMapcode()
 
-        assertThat(useCase.clipboard).isEqualTo("AAA 1AB.XY")
+        assertThat(useCase.clipboard).isEqualTo("NLD 1AB.XY")
     }
 
     @Test
@@ -443,7 +443,7 @@ internal class MapViewModelTest {
         runCurrent()
 
         val uiState2 = viewModel.uiState.value
-        assertThat(uiState2.mapcodeUi).isEqualTo(MapcodeUi("HHH.HHH", "AAA", "International", 2, 3))
+        assertThat(uiState2.mapcodeUi).isEqualTo(MapcodeUi("HHH.HHH", null, "International", 2, 3))
 
         viewModel.onTerritoryClick()
         runCurrent()
@@ -890,4 +890,42 @@ internal class MapViewModelTest {
 
         assertThat(viewModel.uiState.value.addressUi.matchingAddresses).containsExactly("Street 1", "Street 2")
     }
+
+    @Test
+    fun `do not show AAA for international mapcode`() = runTest {
+        useCase.knownLocations.add(
+            FakeLocation(1.0, 1.0, addresses = emptyList(), mapcodes = listOf(Mapcode("AB.CD", Territory.AAA)))
+        )
+
+        viewModel.onCameraMoved(1.0, 1.0, zoom = 1f)
+        runCurrent()
+
+        assertThat(viewModel.uiState.value.mapcodeUi.territoryShortName).isNull()
+    }
+
+    @Test
+    fun `do not copy AAA when copying international mapcodes`() = runTest {
+        useCase.knownLocations.add(
+            FakeLocation(1.0, 1.0, addresses = emptyList(), mapcodes = listOf(Mapcode("AB.CD", Territory.AAA)))
+        )
+
+        viewModel.onCameraMoved(1.0, 1.0, zoom = 1f)
+        runCurrent()
+        viewModel.copyMapcode()
+
+        assertThat(useCase.clipboard).isEqualTo("AB.CD")
+    }
+
+    @Test
+    fun `do not copy AAA when sharing international mapcodes`() = runTest {
+        useCase.knownLocations.add(
+            FakeLocation(1.0, 1.0, addresses = emptyList(), mapcodes = listOf(Mapcode("AB.CD", Territory.AAA)))
+        )
+
+        viewModel.onCameraMoved(1.0, 1.0, zoom = 1f)
+        runCurrent()
+        viewModel.shareMapcode()
+
+        assertThat(useCase.sharedText).isEqualTo("AB.CD")
+    }
 }