Merge branch 'release/0.1.5'

PnX-SI · Nov 7, 2019 · da6f24a · da6f24a
2 parents 40517d0 + b059c4c
commit da6f24a
Show file tree

Hide file tree

Showing 51 changed files with 1,144 additions and 1,693 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/commons/build.gradle b/commons/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-version = "0.3.8"
+version = "0.4.2"
 
 android {
     compileSdkVersion 28
@@ -46,10 +46,10 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0"
 
     implementation 'com.google.android.material:material:1.0.0'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-beta01"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-rc01"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.preference:preference:1.1.0'
-    api 'androidx.room:room-runtime:2.2.0'
+    api 'androidx.room:room-runtime:2.2.1'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'androidx.test:core:1.2.0'

diff --git a/commons/src/main/java/fr/geonature/commons/input/AbstractInput.kt b/commons/src/main/java/fr/geonature/commons/input/AbstractInput.kt
@@ -174,10 +174,14 @@ abstract class AbstractInput(
         return this.inputTaxa[this.currentSelectedInputTaxonId]
     }
 
-    fun setCurrentSelectedInputTaxonId(inputTaxonId: Long) {
+    fun setCurrentSelectedInputTaxonId(inputTaxonId: Long?) {
         this.currentSelectedInputTaxonId = inputTaxonId
     }
 
+    fun clearCurrentSelectedInputTaxon() {
+        this.currentSelectedInputTaxonId = null
+    }
+
     fun getLastAddedInputTaxon(): AbstractInputTaxon? {
         if (this.inputTaxa.isEmpty()) {
             return null

diff --git a/commons/src/main/java/fr/geonature/commons/input/InputManager.kt b/commons/src/main/java/fr/geonature/commons/input/InputManager.kt
@@ -7,7 +7,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.preference.PreferenceManager
 import fr.geonature.commons.input.io.InputJsonReader
 import fr.geonature.commons.input.io.InputJsonWriter
-import fr.geonature.commons.util.FileUtils
+import fr.geonature.commons.util.FileUtils.getInputsFolder
 import fr.geonature.commons.util.StringUtils.isEmpty
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.withContext
@@ -155,7 +155,7 @@ class InputManager<I : AbstractInput> private constructor(internal val applicati
 
     @Throws(IOException::class)
     private fun getInputExportFile(input: AbstractInput): File {
-        val inputDir = FileUtils.getInputsFolder(application)
+        val inputDir = getInputsFolder(application)
         inputDir.mkdirs()
 
         return File(inputDir,