Merge branch 'develop' into main

Author: sds100

.gitignore

@@ -49,6 +49,10 @@ captures/
 .idea/modules.xml
 # Comment next line if keeping position of elements in Navigation Editor is relevant for you
 .idea/navEditor.xml
+.idea/androidTestResultsUserPreferences.xml
+.idea/misc.xml
+.idea/inspectionProfiles
+.idea/deploymentTargetDropDown.xml
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.

.idea/misc.xml

@@ -0,0 +1,5 @@
+## [1.0.0](https://github.com/mapcode-foundation/mapcode-android-app/releases/tag/v1.0.0)
+
+#### 21 July 2022
+
+Initial release! 🎉

CHANGELOG.md

@@ -1,6 +1,9 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+    id 'dagger.hilt.android.plugin'
+    id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
 }
 
 android {
@@ -10,9 +13,10 @@ android {
     defaultConfig {
         applicationId "com.mapcode"
         minSdk 21
+        //noinspection OldTargetApi wait for sources to be released before upgrading
         targetSdk 32
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -22,16 +26,26 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        benchmark {
+            initWith buildTypes.release
+            signingConfig signingConfigs.debug
+            matchingFallbacks = ['release']
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-benchmark-rules.pro'
+            debuggable false
+        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
+        freeCompilerArgs += [
+                "-Xopt-in=kotlin.RequiresOptIn"
+        ]
     }
     buildFeatures {
         compose true
@@ -47,17 +61,56 @@ android {
 }
 
 dependencies {
-    implementation 'com.mapcode:mapcode:2.4.14'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
-    implementation 'androidx.activity:activity-compose:1.4.0'
+    //google
+    implementation 'com.google.maps.android:maps-compose:2.2.0'
+    implementation 'com.google.android.gms:play-services-maps:18.0.2'
+    implementation "com.google.dagger:hilt-android:2.42"
+    implementation 'androidx.hilt:hilt-navigation-compose:1.0.0'
+    implementation 'com.google.android.gms:play-services-location:20.0.0'
+    kapt "com.google.dagger:hilt-compiler:2.42"
+    implementation "com.google.android.material:material:1.6.1"
+
+    //android
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.0'
+    implementation 'androidx.activity:activity-compose:1.5.0'
+    //noinspection GradleDependency
     implementation "androidx.compose.ui:ui:$compose_ui_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
     implementation 'androidx.compose.material:material:1.1.1'
+    implementation "androidx.navigation:navigation-compose:2.5.0"
+    implementation "androidx.compose.foundation:foundation:1.3.0-alpha01"
+    implementation 'com.google.accompanist:accompanist-permissions:0.24.10-beta'
+    implementation "com.google.accompanist:accompanist-systemuicontroller:0.17.0"
+    implementation "com.google.accompanist:accompanist-insets:0.23.1"
+    implementation "androidx.datastore:datastore-preferences:1.0.0"
+    implementation "androidx.core:core-splashscreen:1.0.0-rc01"
+    implementation "androidx.compose.material3:material3-window-size-class:1.0.0-alpha14"
+
+    //other
+    implementation 'com.jakewharton.timber:timber:5.0.1'
+    //noinspection GradleDependency. Issue with R8 on Android 8.0 or lower
+    implementation 'com.mapcode:mapcode:2.4.14'
+
+    //debug
+    debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
+
+    //testing
     testImplementation 'junit:junit:4.13.2'
+    testImplementation 'com.willowtreeapps.assertk:assertk-jvm:0.25'
+    testImplementation 'org.mockito.kotlin:mockito-kotlin:4.0.0'
+    testImplementation 'org.mockito:mockito-core:4.6.1'
+    testImplementation 'org.mockito:mockito-inline:4.6.1'
+    testImplementation "androidx.arch.core:core-testing:2.1.0"
+    testImplementation "androidx.test:core-ktx:1.4.0"
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.2'
+    testImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version"
+
+    androidTestImplementation 'com.willowtreeapps.assertk:assertk-jvm:0.25'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version"
+    androidTestImplementation 'org.mockito.kotlin:mockito-kotlin:4.0.0'
+    androidTestImplementation 'org.mockito:mockito-android:4.6.1'
 }

app/build.gradle

@@ -0,0 +1,11 @@
+package com.mapcode
+
+/**
+ * Created by sds100 on 02/06/2022.
+ */
+data class FakeLocation(
+    val latitude: Double,
+    val longitude: Double,
+    val addresses: List<String>,
+    val mapcodes: List<Mapcode>
+)

app/src/androidTest/java/com/mapcode/ExampleInstrumentedTest.kt

@@ -0,0 +1,25 @@
+package com.mapcode
+
+import androidx.datastore.preferences.core.Preferences
+import com.mapcode.data.PreferenceRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.map
+
+/**
+ * Created by sds100 on 26/04/2021.
+ */
+class FakePreferenceRepository : PreferenceRepository {
+    private val preferences: MutableStateFlow<Map<Preferences.Key<*>, Any?>> = MutableStateFlow(emptyMap())
+
+    @Suppress("UNCHECKED_CAST")
+    override fun <T> get(key: Preferences.Key<T>): Flow<T?> {
+        return preferences.map { it[key] as T? }
+    }
+
+    override fun <T> set(key: Preferences.Key<T>, value: T?) {
+        preferences.value = preferences.value.toMutableMap().apply {
+            this[key] = value
+        }
+    }
+}

app/src/androidTest/java/com/mapcode/FakeLocation.kt

@@ -0,0 +1,86 @@
+package com.mapcode
+
+import com.mapcode.map.ShowMapcodeUseCase
+import com.mapcode.util.Location
+import com.mapcode.util.NoAddressException
+import com.mapcode.util.UnknownAddressException
+import java.io.IOException
+import kotlin.Result.Companion.failure
+import kotlin.Result.Companion.success
+
+/**
+ * Created by sds100 on 02/06/2022.
+ */
+class FakeShowMapcodeUseCase : ShowMapcodeUseCase {
+    var clipboard: String? = null
+    var hasInternetConnection: Boolean = true
+    var currentLocation: Location? = null
+    var isMapsAppInstalled: Boolean = true
+
+    var sharedText: String? = null
+        private set
+
+    val knownLocations: MutableList<FakeLocation> = mutableListOf()
+
+    override fun getMapcodes(lat: Double, long: Double): List<Mapcode> {
+        return knownLocations
+            .find { it.latitude == lat && it.longitude == long }
+            ?.mapcodes ?: emptyList()
+    }
+
+    override fun decodeMapcode(mapcode: String): Result<Location> {
+        val matchingLocation = knownLocations.find { location ->
+            location.mapcodes.any { it.codeWithTerritory == mapcode }
+        }
+
+        if (matchingLocation == null) {
+            return failure(UnknownMapcodeException(""))
+        } else {
+            return success(Location(matchingLocation.latitude, matchingLocation.longitude))
+        }
+    }
+
+    override fun copyToClipboard(text: String) {
+        clipboard = text
+    }
+
+    override suspend fun geocode(address: String): Result<Location> {
+        if (!hasInternetConnection) {
+            return failure(IOException())
+        }
+
+        val fakeLocation = knownLocations.find { it.addresses.contains(address) }
+
+        if (fakeLocation == null) {
+            return failure(UnknownAddressException())
+        } else {
+            return success(Location(fakeLocation.latitude, fakeLocation.longitude))
+        }
+    }
+
+    override suspend fun reverseGeocode(lat: Double, long: Double): Result<String> {
+        if (!hasInternetConnection) {
+            return failure(IOException())
+        }
+
+        val fakeLocation = knownLocations.find { it.latitude == lat && it.longitude == long }
+
+        if (fakeLocation == null || fakeLocation.addresses.isEmpty()) {
+            return failure(NoAddressException())
+        } else {
+            return success(fakeLocation.addresses.first())
+        }
+    }
+
+    override suspend fun getLastLocation(): Location? {
+        return currentLocation
+    }
+
+    override fun launchDirectionsToLocation(location: Location, zoom: Float): Boolean {
+        return isMapsAppInstalled
+    }
+
+    override fun shareText(text: String, description: String) {
+        sharedText = text
+    }
+}