Merge branch 'release/0.1.4'

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.50'
 
     repositories {
         google()
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Apr 18 21:20:10 CEST 2019
+#Wed Aug 21 20:56:36 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

occtax/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-version = "0.1.2"
+version = "0.1.4"
 
 android {
     compileSdkVersion 28
@@ -51,20 +51,21 @@ dependencies {
     implementation project(':maps')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
 
-    implementation 'androidx.core:core-ktx:1.2.0-alpha02'
+    implementation 'androidx.core:core-ktx:1.2.0-alpha04'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-alpha04"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta01'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.preference:preference:1.1.0'
     implementation 'com.l4digital.fastscroll:fastscroll:2.0.1'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'org.robolectric:robolectric:4.2'
+    testImplementation 'org.robolectric:robolectric:4.3'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }

occtax/src/main/AndroidManifest.xml

@@ -25,17 +25,14 @@
         </activity>
         <activity
             android:name=".ui.settings.PreferencesActivity"
-            android:label="@string/activity_preferences_title">
-        </activity>
+            android:label="@string/activity_preferences_title" />
         <activity
             android:name=".ui.observers.InputObserverListActivity"
             android:label="@string/activity_observers_title"
-            android:theme="@style/AppTheme.NoActionBar">
-        </activity>
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ui.input.InputPagerFragmentActivity"
-            android:screenOrientation="portrait">
-        </activity>
+            android:screenOrientation="portrait" />
 
     </application>
 

occtax/src/main/java/fr/geonature/occtax/input/Input.kt

@@ -14,6 +14,7 @@ import org.locationtech.jts.geom.Geometry
 class Input : AbstractInput {
 
     var geometry: Geometry? = null
+    var selectedFeatureId: String? = null
 
     constructor() : super("occtax")
     constructor(source: Parcel) : super(source) {
@@ -30,7 +31,23 @@ class Input : AbstractInput {
 
     override fun getTaxaFromParcel(source: Parcel): List<AbstractInputTaxon> {
         val inputTaxa = source.createTypedArrayList(InputTaxon.CREATOR)
-        return inputTaxa?: emptyList()
+        return inputTaxa ?: emptyList()
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is Input) return false
+        if (!super.equals(other)) return false
+
+        if (geometry != other.geometry) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = super.hashCode()
+        result = 31 * result + (geometry?.hashCode() ?: 0)
+        return result
     }
 
     companion object CREATOR : Parcelable.Creator<Input> {

occtax/src/main/java/fr/geonature/occtax/input/InputViewModel.kt

@@ -0,0 +1,15 @@
+package fr.geonature.occtax.input
+
+import android.app.Application
+import fr.geonature.occtax.input.io.OnInputJsonReaderListenerImpl
+import fr.geonature.occtax.input.io.OnInputJsonWriterListenerImpl
+import fr.geonature.commons.input.InputViewModel as BaseInputModel
+
+/**
+ * [Input] view model.
+ *
+ * @author [S. Grimault](mailto:sebastien.grimault@gmail.com)
+ */
+class InputViewModel(application: Application) : BaseInputModel<Input>(application,
+                                                                       OnInputJsonReaderListenerImpl(),
+                                                                       OnInputJsonWriterListenerImpl())

occtax/src/main/java/fr/geonature/occtax/settings/AppSettingsViewModel.kt

@@ -0,0 +1,13 @@
+package fr.geonature.occtax.settings
+
+import android.app.Application
+import fr.geonature.occtax.settings.io.OnAppSettingsJsonReaderListenerImpl
+import fr.geonature.commons.settings.AppSettingsViewModel as BaseAppSettingsViewModel
+
+/**
+ * [AppSettings] view model.
+ *
+ * @author [S. Grimault](mailto:sebastien.grimault@gmail.com)
+ */
+class AppSettingsViewModel(application: Application) : BaseAppSettingsViewModel<AppSettings>(application,
+                                                                                             OnAppSettingsJsonReaderListenerImpl())

occtax/src/main/java/fr/geonature/occtax/ui/home/HomeActivity.kt

@@ -2,13 +2,8 @@ package fr.geonature.occtax.ui.home
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import fr.geonature.commons.input.InputManager
-import fr.geonature.commons.settings.AppSettingsManager
 import fr.geonature.occtax.input.Input
-import fr.geonature.occtax.input.io.OnInputJsonReaderListenerImpl
-import fr.geonature.occtax.input.io.OnInputJsonWriterListenerImpl
 import fr.geonature.occtax.settings.AppSettings
-import fr.geonature.occtax.settings.io.OnAppSettingsJsonReaderListenerImpl
 import fr.geonature.occtax.ui.input.InputPagerFragmentActivity
 import fr.geonature.occtax.ui.settings.PreferencesActivity
 import fr.geonature.occtax.util.IntentUtils
@@ -23,18 +18,9 @@ import fr.geonature.occtax.util.IntentUtils
 class HomeActivity : AppCompatActivity(),
                      HomeFragment.OnHomeFragmentListener {
 
-    private lateinit var inputManager: InputManager<Input>
-    private lateinit var appSettingsManager: AppSettingsManager<AppSettings>
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        inputManager = InputManager(application,
-                                    OnInputJsonReaderListenerImpl(),
-                                    OnInputJsonWriterListenerImpl())
-        appSettingsManager = AppSettingsManager(application,
-                                                OnAppSettingsJsonReaderListenerImpl())
-
         if (savedInstanceState == null) {
             supportFragmentManager.beginTransaction()
                 .replace(android.R.id.content,
@@ -43,14 +29,6 @@ class HomeActivity : AppCompatActivity(),
         }
     }
 
-    override fun getInputManager(): InputManager<Input> {
-        return inputManager
-    }
-
-    override fun getAppSettingsManager(): AppSettingsManager<AppSettings> {
-        return appSettingsManager
-    }
-
     override fun onShowSettings() {
         startActivity(PreferencesActivity.newIntent(this))
     }