Merge branch 'release/0.3.5'

PnX-SI · Jul 19, 2020 · cddaba3 · cddaba3
2 parents 5e0005a + 31e6bec
commit cddaba3
Show file tree

Hide file tree

Showing 14 changed files with 319 additions and 40 deletions.
diff --git a/gn_mobile_core b/gn_mobile_core
diff --git a/occtax/build.gradle b/occtax/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-version = "0.3.4"
+version = "0.3.5"
 
 android {
     compileSdkVersion 29

diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/Filter.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/Filter.kt
@@ -58,6 +58,7 @@ open class Filter<T : Parcelable>(
      * @author [S. Grimault](mailto:[email protected])
      */
     enum class FilterType {
+        NAME,
         AREA_OBSERVATION,
         TAXONOMY
     }

diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterName.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterName.kt
@@ -0,0 +1,52 @@
+package fr.geonature.occtax.ui.input.taxa
+
+import android.os.Parcel
+import android.os.Parcelable
+
+/**
+ * Name filter.
+ *
+ * @author [S. Grimault](mailto:[email protected])
+ */
+class FilterName(value: Name) : Filter<FilterName.Name>(
+    FilterType.NAME,
+    value
+) {
+    class Name(val type: NameType) :
+        Parcelable {
+
+        private constructor(source: Parcel) : this(
+            NameType.valueOf(source.readString() ?: NameType.SCIENTIFIC.name)
+        )
+
+        override fun describeContents(): Int {
+            return 0
+        }
+
+        override fun writeToParcel(dest: Parcel?, flags: Int) {
+            dest?.also {
+                it.writeString(type.name)
+            }
+        }
+
+        companion object CREATOR : Parcelable.Creator<Name> {
+            override fun createFromParcel(parcel: Parcel): Name {
+                return Name(parcel)
+            }
+
+            override fun newArray(size: Int): Array<Name?> {
+                return arrayOfNulls(size)
+            }
+        }
+    }
+
+    /**
+     * Taxon name types.
+     *
+     * @author [S. Grimault](mailto:[email protected])
+     */
+    enum class NameType {
+        SCIENTIFIC,
+        COMMON
+    }
+}
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterNameRecyclerViewAdapter.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterNameRecyclerViewAdapter.kt
@@ -0,0 +1,65 @@
+package fr.geonature.occtax.ui.input.taxa
+
+import android.view.View
+import android.widget.Switch
+import fr.geonature.commons.ui.adapter.AbstractListItemRecyclerViewAdapter
+import fr.geonature.occtax.R
+
+/**
+ * Default RecyclerView Adapter for [FilterName].
+ *
+ * @author [S. Grimault](mailto:[email protected])
+ */
+class FilterNameRecyclerViewAdapter(val listener: FilterRecyclerViewAdapterListener<FilterName>) :
+    AbstractListItemRecyclerViewAdapter<FilterName>() {
+
+    init {
+        setItems(listOf(FilterName(FilterName.Name(FilterName.NameType.SCIENTIFIC))))
+    }
+
+    override fun getViewHolder(view: View, viewType: Int): AbstractViewHolder {
+        return ViewHolder(view)
+    }
+
+    override fun getLayoutResourceId(position: Int, item: FilterName): Int {
+        return R.layout.list_item_filter_name
+    }
+
+    override fun areItemsTheSame(
+        oldItems: List<FilterName>,
+        newItems: List<FilterName>,
+        oldItemPosition: Int,
+        newItemPosition: Int
+    ): Boolean {
+        return oldItems[oldItemPosition] == newItems[newItemPosition]
+    }
+
+    override fun areContentsTheSame(
+        oldItems: List<FilterName>,
+        newItems: List<FilterName>,
+        oldItemPosition: Int,
+        newItemPosition: Int
+    ): Boolean {
+        return oldItems[oldItemPosition] == newItems[newItemPosition]
+    }
+
+    fun setSelectedFilter(filter: FilterName) {
+        this.setItems(listOf(filter))
+
+        notifyDataSetChanged()
+    }
+
+    inner class ViewHolder(itemView: View) :
+        AbstractListItemRecyclerViewAdapter<FilterName>.AbstractViewHolder(itemView) {
+
+        private val switch: Switch = itemView.findViewById(R.id.switch_name)
+
+        override fun onBind(item: FilterName) {
+            switch.setOnClickListener {
+                listener.onSelectedFilters(if (switch.isChecked) FilterName(FilterName.Name(FilterName.NameType.COMMON)) else FilterName(FilterName.Name(FilterName.NameType.SCIENTIFIC)))
+            }
+
+            switch.isChecked = item.value.type == FilterName.NameType.COMMON
+        }
+    }
+}
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterRecyclerViewAdapter.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterRecyclerViewAdapter.kt
@@ -13,17 +13,29 @@ import fr.geonature.commons.ui.adapter.StickyHeaderItemDecorator
 import fr.geonature.occtax.R
 
 /**
- * Default RecyclerView Adapter used by [TaxaFilterFragment], combining [FilterAreaObservationRecyclerViewAdapter] and [FilterTaxonomyRecyclerViewAdapter]
+ * Default RecyclerView Adapter used by [TaxaFilterFragment], combining [FilterNameRecyclerViewAdapter],
+ * [FilterAreaObservationRecyclerViewAdapter] and [FilterTaxonomyRecyclerViewAdapter].
  *
  * @author [S. Grimault](mailto:[email protected])
  *
+ * @see FilterNameRecyclerViewAdapter
  * @see FilterAreaObservationRecyclerViewAdapter
  * @see FilterTaxonomyRecyclerViewAdapter
  */
 class FilterRecyclerViewAdapter(val listener: FilterRecyclerViewAdapterListener<Filter<*>>) :
     RecyclerView.Adapter<RecyclerView.ViewHolder>(),
     IStickyRecyclerViewAdapter<FilterRecyclerViewAdapter.HeaderViewHolder> {
 
+    private val filterNameRecyclerViewAdapter: FilterNameRecyclerViewAdapter =
+        FilterNameRecyclerViewAdapter(object : FilterRecyclerViewAdapterListener<FilterName> {
+            override fun onSelectedFilters(vararg filter: FilterName) {
+                val existingFilters =
+                    selectedFilters.filter { it.type != Filter.FilterType.NAME }
+                selectedFilters.clear()
+                selectedFilters.addAll(existingFilters + filter)
+                listener.onSelectedFilters(*selectedFilters.toTypedArray())
+            }
+        })
     private val filterTitleAreaObservationRecyclerViewAdapter = FilterTitleRecyclerViewAdapter()
     private val filterAreaObservationRecyclerViewAdapter: FilterAreaObservationRecyclerViewAdapter =
         FilterAreaObservationRecyclerViewAdapter(object :
@@ -49,6 +61,7 @@ class FilterRecyclerViewAdapter(val listener: FilterRecyclerViewAdapterListener<
             }
         })
     private val mergeAdapter = MergeAdapter(
+        filterNameRecyclerViewAdapter,
         filterTitleAreaObservationRecyclerViewAdapter,
         filterAreaObservationRecyclerViewAdapter,
         filterTitleTaxonomyRecyclerViewAdapter,
@@ -167,28 +180,30 @@ class FilterRecyclerViewAdapter(val listener: FilterRecyclerViewAdapterListener<
     }
 
     override fun getHeaderPositionForItem(itemPosition: Int): Int {
-        if (itemPosition == 0) {
-            return 0
+        // the first adapter has no header
+        if (itemPosition < filterNameRecyclerViewAdapter.itemCount) {
+
+            return -1
         }
 
-        // if first adapter have some items
-        if (filterAreaObservationRecyclerViewAdapter.itemCount > 0 && itemPosition < (filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount)) {
-            return 0
+        // if filter area observation have some items
+        if (filterAreaObservationRecyclerViewAdapter.itemCount > 0 && itemPosition < (filterNameRecyclerViewAdapter.itemCount + filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount)) {
+            return filterNameRecyclerViewAdapter.itemCount
         }
 
-        if (itemPosition == filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount - 1) {
+        if (itemPosition == filterNameRecyclerViewAdapter.itemCount + filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount - 1) {
             return itemPosition
         }
 
         val currentFilterTaxonomy =
-            filterTaxonomyRecyclerViewAdapter.items.getOrNull(itemPosition - (filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount))
-                ?: return filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount
+            filterTaxonomyRecyclerViewAdapter.items.getOrNull(itemPosition - (filterNameRecyclerViewAdapter.itemCount + filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount))
+                ?: return filterNameRecyclerViewAdapter.itemCount + filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount
 
         return filterTaxonomyRecyclerViewAdapter.items.indexOfFirst {
             it.value.kingdom == currentFilterTaxonomy.value.kingdom && it.value.group == Taxonomy.ANY
         }.takeIf { it >= 0 }
-            ?.plus(filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount)
-            ?: filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount - 1
+            ?.plus(filterNameRecyclerViewAdapter.itemCount + filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount)
+            ?: filterNameRecyclerViewAdapter.itemCount + filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount - 1
     }
 
     override fun onBindHeaderViewHolder(holder: HeaderViewHolder, headerPosition: Int) {
@@ -216,6 +231,10 @@ class FilterRecyclerViewAdapter(val listener: FilterRecyclerViewAdapterListener<
         this.selectedFilters.clear()
         this.selectedFilters.addAll(filter)
 
+        (filter.find { it.type == Filter.FilterType.NAME } as FilterName?)?.also {
+            this.filterNameRecyclerViewAdapter.setSelectedFilter(it)
+        }
+
         this.filterAreaObservationRecyclerViewAdapter.setSelectedFilters(*filter.filter { it.type == Filter.FilterType.AREA_OBSERVATION }
             .map { FilterAreaObservation(it.value as FilterAreaObservation.AreaObservation) }
             .toTypedArray())
@@ -247,24 +266,18 @@ class FilterRecyclerViewAdapter(val listener: FilterRecyclerViewAdapterListener<
                 Typeface.BOLD
             )
 
-            if (position == 0) {
-                label.text = filterTitleAreaObservationRecyclerViewAdapter.items.getOrNull(0)
-                    ?: filterTitleTaxonomyRecyclerViewAdapter.items.getOrNull(0)
-                return
-            }
-
-            if (filterAreaObservationRecyclerViewAdapter.itemCount > 0 && position < (filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount)) {
+            if (filterAreaObservationRecyclerViewAdapter.itemCount > 0 && position < (filterNameRecyclerViewAdapter.itemCount + filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount)) {
                 label.text = filterTitleAreaObservationRecyclerViewAdapter.items.getOrNull(0)
                 return
             }
 
-            if (position == filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount - 1) {
+            if (position == filterNameRecyclerViewAdapter.itemCount + filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount - 1) {
                 label.text = filterTitleTaxonomyRecyclerViewAdapter.items.getOrNull(0)
                 return
             }
 
             val taxonomyAsHeader =
-                filterTaxonomyRecyclerViewAdapter.items.getOrNull(position - (filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount))
+                filterTaxonomyRecyclerViewAdapter.items.getOrNull(position - (filterNameRecyclerViewAdapter.itemCount + filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount))
 
             if (taxonomyAsHeader == null) {
                 label.text = filterTitleTaxonomyRecyclerViewAdapter.items.getOrNull(0)
+1 −1		commons/build.gradle
+106 −13		commons/src/main/java/fr/geonature/commons/data/AbstractTaxon.kt
+19 −9		commons/src/main/java/fr/geonature/commons/data/Taxon.kt
+11 −3		commons/src/main/java/fr/geonature/commons/data/TaxonWithArea.kt
+9 −1		commons/src/main/java/fr/geonature/commons/data/dao/BaseDao.kt
+25 −22		commons/src/main/java/fr/geonature/commons/data/helper/SQLiteSelectQueryBuilder.kt
+35 −20		commons/src/test/java/fr/geonature/commons/data/TaxonTest.kt
+43 −24		commons/src/test/java/fr/geonature/commons/data/TaxonWithAreaTest.kt
+16 −8		commons/src/test/java/fr/geonature/commons/data/dao/BaseDaoTest.kt
+54 −36		commons/src/test/java/fr/geonature/commons/data/helper/SQLiteSelectQueryBuilderTest.kt
+66 −68		commons/src/test/java/fr/geonature/commons/input/InputTest.kt
+2 −2		commons/version.properties
+9 −1		docs/settings.adoc
+4 −1		sync/README.md
+6 −0		sync/src/main/java/fr/geonature/sync/api/model/Taxref.kt
+1 −1		sync/src/main/java/fr/geonature/sync/data/LocalDatabase.kt
+23 −4		sync/src/main/java/fr/geonature/sync/data/MainContentProvider.kt
+6 −8		sync/src/main/java/fr/geonature/sync/data/dao/TaxonDao.kt
+39 −31		sync/src/main/java/fr/geonature/sync/sync/PackageInfoManager.kt
+20 −6		sync/src/main/java/fr/geonature/sync/sync/worker/DataSyncWorker.kt