Merge branch 'release/0.2.7'

README.md

@@ -1,6 +1,7 @@
 # Occtax-mobile
 
-![Occtax-mobile launcher](https://raw.githubusercontent.com/PnX-SI/gn_mobile_occtax/develop/occtax/src/main/res/mipmap-xxxhdpi/ic_launcher.png)
+![PNV](https://raw.githubusercontent.com/PnX-SI/gn_mobile_occtax/develop/occtax/src/pnv/res/mipmap-xxxhdpi/ic_launcher.png)
+![PNE](https://raw.githubusercontent.com/PnX-SI/gn_mobile_occtax/develop/occtax/src/pne/res/mipmap-xxxhdpi/ic_launcher.png)
 
 GeoNature Android mobile application for Occtax module.
 
@@ -22,3 +23,11 @@ Any changes should be made from each underlying git repository:
 * Kotlin error, Redeclaration from class within imported module:
 
   clean project from menu *Build -> Clean Project*, then rebuild project.
+
+## Full Build
+
+A full build can be executed with the following command:
+
+```
+./gradlew clean assembleDebug
+```

occtax/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-version = "0.2.6"
+version = "0.2.7"
 
 android {
     compileSdkVersion 28
@@ -36,6 +36,14 @@ android {
         }
     }
 
+    flavorDimensions "version"
+    productFlavors {
+        pne {
+        }
+        pnv {
+        }
+    }
+
     testOptions {
         unitTests {
             includeAndroidResources = true

occtax/src/debug/res/drawable/ic_launcher_background.xml

@@ -1,4 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="161.19403"
@@ -7,14 +8,15 @@
         android:translateX="26.597015"
         android:translateY="26.597015">
         <path
-            android:fillColor="#008577"
+            android:fillColor="@color/primary"
             android:pathData="M0,0h108v108h-108z" />
         <path
             android:fillAlpha="0.20"
             android:fillColor="#000000"
-            android:pathData="M55,26V1h53v25z" />
+            android:pathData="M55,26V25h53v1z" />
         <path
-            android:fillColor="#545473"
+            android:fillAlpha="0.4"
+            android:fillColor="@color/accent"
             android:pathData="M54,25V0h54v25z" />
         <path
             android:fillColor="#ffffff"

occtax/src/main/java/fr/geonature/occtax/ui/dataset/DatasetListFragment.kt

@@ -10,6 +10,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
+import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.loader.app.LoaderManager
 import androidx.loader.content.CursorLoader
@@ -43,6 +44,7 @@ class DatasetListFragment : Fragment() {
                     requireContext(),
                     buildUri(
                         Dataset.TABLE_NAME,
+                        args?.getString(Dataset.COLUMN_MODULE) ?: "",
                         "active"
                     ),
                     null,
@@ -142,7 +144,12 @@ class DatasetListFragment : Fragment() {
             LoaderManager.getInstance(this)
                 .initLoader(
                     LOADER_DATASET,
-                    null,
+                    bundleOf(
+                        Pair(
+                            Dataset.COLUMN_MODULE,
+                            context?.packageName
+                        )
+                    ),
                     loaderCallbacks
                 )
         }

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

@@ -49,6 +49,7 @@ class InputRecyclerViewAdapter(listener: OnListItemRecyclerViewAdapterListener<I
     inner class ViewHolder(itemView: View) :
         AbstractListItemRecyclerViewAdapter<Input>.AbstractViewHolder(itemView) {
         private val text1: TextView = itemView.findViewById(android.R.id.text1)
+        private val text2: TextView = itemView.findViewById(android.R.id.text2)
 
         override fun onBind(item: Input) {
             text1.text = itemView.context.getString(
@@ -58,6 +59,14 @@ class InputRecyclerViewAdapter(listener: OnListItemRecyclerViewAdapterListener<I
                     item.date
                 )
             )
+
+            if (item.getInputTaxa().isNotEmpty()) {
+                text2.text = itemView.resources.getQuantityString(
+                    R.plurals.home_input_taxa_count,
+                    item.getInputTaxa().size,
+                    item.getInputTaxa().size
+                )
+            }
         }
     }
 }

occtax/src/main/java/fr/geonature/occtax/ui/input/counting/CountingFragment.kt

@@ -191,6 +191,10 @@ class CountingFragment : Fragment(),
         return R.string.pager_fragment_counting_title
     }
 
+    override fun getSubtitle(): CharSequence? {
+        return input?.getCurrentSelectedInputTaxon()?.taxon?.name
+    }
+
     override fun pagingEnabled(): Boolean {
         return true
     }
@@ -205,6 +209,21 @@ class CountingFragment : Fragment(),
             (input?.getCurrentSelectedInputTaxon() as InputTaxon?)?.getCounting()
                 ?: emptyList()
         )
+
+        if ((input?.getCurrentSelectedInputTaxon() as InputTaxon?)?.getCounting()?.isEmpty() == true) {
+            val context = context ?: return
+            startActivityForResult(
+                EditCountingMetadataActivity.newIntent(
+                    context,
+                    input?.getCurrentSelectedInputTaxon()?.taxon?.taxonomy
+                        ?: Taxonomy(
+                            Taxonomy.ANY,
+                            Taxonomy.ANY
+                        )
+                ),
+                0
+            )
+        }
     }
 
     override fun setInput(input: AbstractInput) {

occtax/src/main/java/fr/geonature/occtax/ui/input/counting/CountingRecyclerViewAdapter.kt

@@ -26,7 +26,7 @@ class CountingRecyclerViewAdapter(listener: OnListItemRecyclerViewAdapterListene
         position: Int,
         item: CountingMetadata
     ): Int {
-        return R.layout.list_item_2
+        return R.layout.list_item_3
     }
 
     override fun areItemsTheSame(
@@ -49,43 +49,50 @@ class CountingRecyclerViewAdapter(listener: OnListItemRecyclerViewAdapterListene
 
     inner class ViewHolder(itemView: View) :
         AbstractListItemRecyclerViewAdapter<CountingMetadata>.AbstractViewHolder(itemView) {
+        private val title: TextView = itemView.findViewById(android.R.id.title)
         private val text1: TextView = itemView.findViewById(android.R.id.text1)
         private val text2: TextView = itemView.findViewById(android.R.id.text2)
 
         override fun onBind(item: CountingMetadata) {
-            text1.text = itemView.context.getString(
+            title.text = itemView.context.getString(
                 R.string.counting_main_label,
                 item.index
             )
+            text1.text = buildCountingDescription(item)
             text2.text = buildDescription(item)
         }
 
-        private fun buildDescription(countingMetadata: CountingMetadata): String {
-            return (countingMetadata.properties.values.asSequence()
-                .filterNot { it.isEmpty() }
-                .map {
-                    itemView.context.getString(
-                        R.string.counting_description_separator,
-                        getNomenclatureTypeLabel(it.code),
-                        it.label
-                    )
-                } + arrayOf(
+        private fun buildCountingDescription(countingMetadata: CountingMetadata): String {
+            return arrayOf(
                 Pair(
-                    R.string.counting_min_label,
-                    countingMetadata.min
+                    itemView.context.getString(R.string.counting_min_label),
+                    countingMetadata.min.toString()
                 ),
                 Pair(
-                    R.string.counting_max_label,
-                    countingMetadata.max
+                    itemView.context.getString(R.string.counting_max_label),
+                    countingMetadata.max.toString()
                 )
             ).asSequence()
                 .map {
                     itemView.context.getString(
                         R.string.counting_description_separator,
-                        itemView.context.getString(it.first),
-                        it.second.toString()
+                        it.first,
+                        it.second
+                    )
+                }
+                .joinToString(", ")
+        }
+
+        private fun buildDescription(countingMetadata: CountingMetadata): String {
+            return countingMetadata.properties.values.asSequence()
+                .filterNot { it.isEmpty() }
+                .map {
+                    itemView.context.getString(
+                        R.string.counting_description_separator,
+                        getNomenclatureTypeLabel(it.code),
+                        it.label
                     )
-                })
+                }
                 .joinToString(", ")
         }
 

occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataActivity.kt

@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import fr.geonature.commons.data.Taxonomy
+import fr.geonature.occtax.R
 import fr.geonature.occtax.input.CountingMetadata
 
 /**
@@ -28,6 +29,8 @@ class EditCountingMetadataActivity : AppCompatActivity(),
 
         countingMetadata = intent.getParcelableExtra(EXTRA_COUNTING_METADATA) ?: CountingMetadata()
 
+        setTitle(if (countingMetadata.isEmpty()) R.string.activity_counting_add_title else R.string.activity_counting_edit_title)
+
         if (savedInstanceState == null) {
             supportFragmentManager.beginTransaction()
                 .replace(

occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataFragment.kt

@@ -7,12 +7,15 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.loader.app.LoaderManager
 import androidx.loader.content.CursorLoader
 import androidx.loader.content.Loader
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import fr.geonature.commons.data.Dataset
+import fr.geonature.commons.data.DefaultNomenclature
 import fr.geonature.commons.data.DefaultNomenclatureWithType
 import fr.geonature.commons.data.Nomenclature
 import fr.geonature.commons.data.NomenclatureType
@@ -56,7 +59,7 @@ class EditCountingMetadataFragment : Fragment(),
                     requireContext(),
                     buildUri(
                         NomenclatureType.TABLE_NAME,
-                        "occtax",
+                        args?.getString(Dataset.COLUMN_MODULE) ?: "",
                         "default"
                     ),
                     null,
@@ -231,7 +234,12 @@ class EditCountingMetadataFragment : Fragment(),
         LoaderManager.getInstance(this)
             .initLoader(
                 LOADER_DEFAULT_NOMENCLATURE_VALUES,
-                null,
+                bundleOf(
+                    Pair(
+                        DefaultNomenclature.COLUMN_MODULE,
+                        context?.packageName
+                    )
+                ),
                 loaderCallbacks
             )
     }

occtax/src/main/java/fr/geonature/occtax/ui/input/informations/InformationFragment.kt

@@ -38,6 +38,7 @@ class InformationFragment : Fragment(),
 
     private var input: Input? = null
     private var adapter: NomenclatureTypesRecyclerViewAdapter? = null
+    private lateinit var savedState: Bundle
 
     private val loaderCallbacks = object : LoaderManager.LoaderCallbacks<Cursor> {
         override fun onCreateLoader(
@@ -117,6 +118,12 @@ class InformationFragment : Fragment(),
         }
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        savedState = savedInstanceState ?: Bundle()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -131,6 +138,7 @@ class InformationFragment : Fragment(),
         adapter = NomenclatureTypesRecyclerViewAdapter(object :
             NomenclatureTypesRecyclerViewAdapter.OnNomenclatureTypesRecyclerViewAdapterListener {
             override fun showMore() {
+                savedState.putBoolean(KEY_SHOW_ALL_NOMENCLATURE_TYPES, true)
                 setPropertyValues()
             }
 
@@ -165,6 +173,12 @@ class InformationFragment : Fragment(),
                 )
             }
         })
+        adapter?.showAllNomenclatureTypes(
+            savedState.getBoolean(
+                KEY_SHOW_ALL_NOMENCLATURE_TYPES,
+                false
+            )
+        )
 
         with(recyclerView as RecyclerView) {
             layoutManager = LinearLayoutManager(context)
@@ -174,10 +188,18 @@ class InformationFragment : Fragment(),
         return recyclerView
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(savedState.apply { putAll(outState) })
+    }
+
     override fun getResourceTitle(): Int {
         return R.string.pager_fragment_information_title
     }
 
+    override fun getSubtitle(): CharSequence? {
+        return input?.getCurrentSelectedInputTaxon()?.taxon?.name
+    }
+
     override fun pagingEnabled(): Boolean {
         return true
     }
@@ -257,6 +279,8 @@ class InformationFragment : Fragment(),
         private const val CHOOSE_NOMENCLATURE_DIALOG_FRAGMENT =
             "choose_nomenclature_dialog_fragment"
 
+        private const val KEY_SHOW_ALL_NOMENCLATURE_TYPES = "show_all_nomenclature_types"
+
         /**
          * Use this factory method to create a new instance of [InformationFragment].
          *