Merge branch 'develop' into main

Author: sds100

.gitignore

@@ -153,4 +153,6 @@ fabric.properties
 
 !/gradle/wrapper/gradle-wrapper.jar
 
-# End of https://www.toptal.com/developers/gitignore/api/androidstudio,java
+# End of https://www.toptal.com/developers/gitignore/api/androidstudio,java
+.idea/deploymentTargetDropDown.xml
+/.idea/androidTestResultsUserPreferences.xml

.idea/codeStyles/Project.xml

@@ -1,12 +1,24 @@
+## [1.2.0](https://github.com/mapcode-foundation/mapcode-android-app/releases/tag/v1.2.0)
+
+#### 2022-10-21
+
+- [#23](https://github.com/mapcode-foundation/mapcode-android-app/issues/23) Save locations as
+  favourites and view them on the map.
+- [#35](https://github.com/mapcode-foundation/mapcode-android-app/issues/35) Show a brief tutorial
+  when the app is opened for the first time that explains what mapcodes are.
+
 ## [1.1.1](https://github.com/mapcode-foundation/mapcode-android-app/releases/tag/v1.1.1)
 
 #### 2022-08-21
 
-- [#47](https://github.com/mapcode-foundation/mapcode-android-app/issues/47) Improve address autocompletion results by
+- [#47](https://github.com/mapcode-foundation/mapcode-android-app/issues/47) Improve address
+  autocompletion results by
   using Google Places API.
-- [#48](https://github.com/mapcode-foundation/mapcode-android-app/issues/48) Allow comma decimal in latitude and
+- [#48](https://github.com/mapcode-foundation/mapcode-android-app/issues/48) Allow comma decimal in
+  latitude and
   longitude.
-- [#46](https://github.com/mapcode-foundation/mapcode-android-app/issues/46) Latitude and longitude text are invisible
+- [#46](https://github.com/mapcode-foundation/mapcode-android-app/issues/46) Latitude and longitude
+  text are invisible
   in dark mode.
 - Button to clear latitude and longitude text is now a copy button.
 

.idea/codeStyles/codeStyleConfig.xml

@@ -4,6 +4,9 @@ plugins {
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
     id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
+    id 'com.google.devtools.ksp'
+    id 'org.jetbrains.kotlin.plugin.serialization'
+    id 'kotlin-parcelize'
 }
 
 android {
@@ -16,7 +19,7 @@ android {
         //noinspection OldTargetApi wait for sources to be released before upgrading
         targetSdk 33
         versionCode 4
-        versionName "1.1.1"
+        versionName "1.2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -58,6 +61,14 @@ android {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+
+    applicationVariants.all { variant ->
+        kotlin.sourceSets {
+            getByName(variant.name) {
+                kotlin.srcDir("build/generated/ksp/${variant.name}/kotlin")
+            }
+        }
+    }
 }
 
 dependencies {
@@ -68,29 +79,36 @@ dependencies {
     implementation 'com.google.maps.android:places-ktx:2.0.0'
     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'
+    implementation 'com.google.android.gms:play-services-location:21.0.0'
     kapt "com.google.dagger:hilt-compiler:2.42"
-    implementation "com.google.android.material:material:1.6.1"
+    implementation "com.google.android.material:material:1.7.0"
 
     //android
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation 'androidx.activity:activity-compose:1.5.1'
+    implementation 'androidx.activity:activity-compose:1.6.0'
     //noinspection GradleDependency
     implementation "androidx.compose.ui:ui:1.2.0"
     implementation "androidx.compose.ui:ui-tooling-preview:1.2.1"
     implementation 'androidx.compose.material:material:1.2.1'
-    implementation "androidx.navigation:navigation-compose:2.5.1"
-    implementation "androidx.compose.foundation:foundation:1.3.0-alpha03"
+    implementation "androidx.navigation:navigation-compose:2.5.2"
+    implementation "androidx.compose.foundation:foundation:1.3.0-rc01"
     implementation 'com.google.accompanist:accompanist-permissions:0.24.10-beta'
     implementation "com.google.accompanist:accompanist-systemuicontroller:0.17.0"
+    implementation "com.google.accompanist:accompanist-pager:0.25.1"
+    implementation "com.google.accompanist:accompanist-pager-indicators:0.25.1"
     implementation "androidx.datastore:datastore-preferences:1.0.0"
     implementation "androidx.core:core-splashscreen:1.0.0"
-    implementation "androidx.compose.material3:material3-window-size-class:1.0.0-alpha16"
+    implementation "androidx.compose.material3:material3-window-size-class:1.0.0-rc01"
+    implementation "androidx.compose.material:material-icons-extended:1.2.1"
 
     //other
     implementation 'com.jakewharton.timber:timber:5.0.1'
+    implementation 'io.github.raamcosta.compose-destinations:core:1.7.22-beta'
+    ksp 'io.github.raamcosta.compose-destinations:ksp:1.7.16-beta'
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0"
+
     //noinspection GradleDependency. Issue with R8 on Android 8.0 or lower
     implementation 'com.mapcode:mapcode:2.4.14'
     implementation "com.squareup.okhttp3:okhttp:4.10.0"
@@ -103,12 +121,13 @@ dependencies {
     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 'org.mockito:mockito-core:4.8.0'
+    testImplementation 'org.mockito:mockito-inline:4.7.0'
     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.3'
+    testImplementation "androidx.test:core-ktx:1.5.0-beta01"
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
 
+    androidTestImplementation "androidx.test:core-ktx:1.5.0-beta01"
     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'

.idea/misc.xml

@@ -18,4 +18,43 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+# Keep `Companion` object fields of serializable classes.
+# This avoids serializer lookup through `getDeclaredClasses` as done for named companion objects.
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
+}
+
+# Keep `serializer()` on companion objects (both default and named) of serializable classes.
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <2>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# Keep `INSTANCE.serializer()` of serializable objects.
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
+
+# Serializer for classes with named companion objects are retrieved using `getDeclaredClasses`.
+# If you have any, uncomment and replace classes with those containing named companion objects.
+#-keepattributes InnerClasses # Needed for `getDeclaredClasses`.
+#-if @kotlinx.serialization.Serializable class
+#com.example.myapplication.HasNamedCompanion, # <-- List serializable classes with named companions.
+#com.example.myapplication.HasNamedCompanion2
+#{
+#    static **$* *;
+#}
+#-keepnames class <1>$$serializer { # -keepnames suffices; class is kept when serializer() is kept.
+#    static <1>$$serializer INSTANCE;
+#}

CHANGELOG.md

@@ -23,7 +23,8 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 
 class FakePreferenceRepository : PreferenceRepository {
-    private val preferences: MutableStateFlow<Map<Preferences.Key<*>, Any?>> = MutableStateFlow(emptyMap())
+    private val preferences: MutableStateFlow<Map<Preferences.Key<*>, Any?>> =
+        MutableStateFlow(emptyMap())
 
     @Suppress("UNCHECKED_CAST")
     override fun <T> get(key: Preferences.Key<T>): Flow<T?> {

app/build.gradle

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2022, Stichting Mapcode Foundation (http://www.mapcode.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mapcode
+
+import com.mapcode.util.DispatcherProvider
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestDispatcher
+
+/**
+ * Created by sds100 on 01/05/2021.
+ */
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class TestDispatcherProvider(
+    testDispatcher: TestDispatcher
+) : DispatcherProvider {
+    override val main = testDispatcher
+    override val default = testDispatcher
+    override val io = testDispatcher
+    override val unconfined = testDispatcher
+}