Merge branch 'release/1.2.1'

occtax/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
-version = "1.2.0"
+version = "1.2.1"
 
 android {
     compileSdkVersion 29
@@ -66,21 +66,21 @@ dependencies {
     implementation project(':maps')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
 
-    implementation 'androidx.core:core-ktx:1.4.0-alpha01'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha03'
+    implementation 'androidx.core:core-ktx:1.5.0-beta03'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0"
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-beta02'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'com.l4digital.fastscroll:fastscroll:2.0.1'
 
-    testImplementation 'junit:junit:4.13'
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'androidx.test:core:1.3.0'
     testImplementation 'org.robolectric:robolectric:4.3.1'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

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

@@ -19,7 +19,7 @@ class Input : AbstractInput {
     var selectedFeatureId: String? = null
     var comment: String? = null
     val properties: SortedMap<String, PropertyValue> =
-        TreeMap<String, PropertyValue>(Comparator { o1, o2 ->
+        TreeMap { o1, o2 ->
             val i1 = defaultPropertiesMnemonic.indexOfFirst { it.first == o1 }
             val i2 = defaultPropertiesMnemonic.indexOfFirst { it.first == o2 }
 
@@ -28,7 +28,7 @@ class Input : AbstractInput {
                 i2 == -1 -> -1
                 else -> i1 - i2
             }
-        })
+        }
 
     constructor() : super("occtax")
     constructor(source: Parcel) : super(source) {

occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterRecyclerViewAdapter.kt

@@ -5,7 +5,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.MergeAdapter
+import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.RecyclerView
 import fr.geonature.commons.data.Taxonomy
 import fr.geonature.commons.ui.adapter.IStickyRecyclerViewAdapter
@@ -49,7 +49,7 @@ class FilterRecyclerViewAdapter(val listener: FilterRecyclerViewAdapterListener<
                 listener.onSelectedFilters(*selectedFilters.toTypedArray())
             }
         })
-    private val mergeAdapter = MergeAdapter(
+    private val concatAdapter = ConcatAdapter(
         filterTitleAreaObservationRecyclerViewAdapter,
         filterAreaObservationRecyclerViewAdapter,
         filterTitleTaxonomyRecyclerViewAdapter,
@@ -58,8 +58,8 @@ class FilterRecyclerViewAdapter(val listener: FilterRecyclerViewAdapterListener<
     private val selectedFilters: MutableList<Filter<*>> = mutableListOf()
 
     init {
-        setHasStableIds(mergeAdapter.hasStableIds())
-        mergeAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+        setHasStableIds(concatAdapter.hasStableIds())
+        concatAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
             override fun onChanged() {
                 this@FilterRecyclerViewAdapter.notifyDataSetChanged()
             }
@@ -103,23 +103,23 @@ class FilterRecyclerViewAdapter(val listener: FilterRecyclerViewAdapterListener<
     }
 
     override fun onFailedToRecycleView(holder: RecyclerView.ViewHolder): Boolean {
-        return mergeAdapter.onFailedToRecycleView(holder)
+        return concatAdapter.onFailedToRecycleView(holder)
     }
 
     override fun onViewAttachedToWindow(holder: RecyclerView.ViewHolder) {
-        mergeAdapter.onViewAttachedToWindow(holder)
+        concatAdapter.onViewAttachedToWindow(holder)
     }
 
     override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
-        mergeAdapter.onViewDetachedFromWindow(holder)
+        concatAdapter.onViewDetachedFromWindow(holder)
     }
 
     override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
-        mergeAdapter.onViewRecycled(holder)
+        concatAdapter.onViewRecycled(holder)
     }
 
     override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
-        mergeAdapter.onAttachedToRecyclerView(recyclerView)
+        concatAdapter.onAttachedToRecyclerView(recyclerView)
 
         recyclerView.addItemDecoration(
             StickyHeaderItemDecorator(
@@ -130,7 +130,7 @@ class FilterRecyclerViewAdapter(val listener: FilterRecyclerViewAdapterListener<
     }
 
     override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
-        mergeAdapter.onDetachedFromRecyclerView(recyclerView)
+        concatAdapter.onDetachedFromRecyclerView(recyclerView)
 
         for (i in 0 until recyclerView.itemDecorationCount) {
             val decorator = recyclerView.getItemDecorationAt(i)
@@ -142,26 +142,26 @@ class FilterRecyclerViewAdapter(val listener: FilterRecyclerViewAdapterListener<
     }
 
     override fun getItemViewType(position: Int): Int {
-        return mergeAdapter.getItemViewType(position)
+        return concatAdapter.getItemViewType(position)
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return mergeAdapter.onCreateViewHolder(
+        return concatAdapter.onCreateViewHolder(
             parent,
             viewType
         )
     }
 
     override fun getItemId(position: Int): Long {
-        return mergeAdapter.getItemId(position)
+        return concatAdapter.getItemId(position)
     }
 
     override fun getItemCount(): Int {
-        return mergeAdapter.itemCount
+        return concatAdapter.itemCount
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        mergeAdapter.onBindViewHolder(
+        concatAdapter.onBindViewHolder(
             holder,
             position
         )

occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFragment.kt

@@ -363,7 +363,7 @@ class TaxaFragment : Fragment(),
                         *getSelectedFilters().toTypedArray()
                     )
                 )
-                
+
                 true
             }
             else -> super.onOptionsItemSelected(item)

occtax/version.properties

@@ -1,2 +1,2 @@
-#Sun Feb 07 16:17:34 CET 2021
-VERSION_CODE=2070
+#Sat Mar 13 16:12:19 CET 2021
+VERSION_CODE=2090