Merge branch 'release/0.3.0'

build.gradle

@@ -12,7 +12,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:9.1.1"
         // NOTE: Do not place application dependencies here; they belong

gradle.properties

@@ -0,0 +1,4 @@
+android.enableJetifier=true
+android.useAndroidX=true
+kotlin.code.style=official
+android.enableUnitTestBinaryResources=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Aug 21 20:56:36 CEST 2019
+#Wed Feb 26 21:54:13 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-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.2.9"
+version = "0.3.0"
 
 android {
     compileSdkVersion 28

occtax/src/main/AndroidManifest.xml

@@ -35,7 +35,8 @@
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ui.input.InputPagerFragmentActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".ui.input.taxa.TaxonomyFilterActivity"
             android:label="@string/activity_taxonomy_title" />

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

@@ -64,15 +64,16 @@ class TaxaFragment : Fragment(),
                     )
 
                     val taxonFilter =
-                        Taxon.Filter().byName(args?.getString(KEY_FILTER_BY_NAME)).also {
-                            val filterByTaxonomy = args?.getParcelable<Taxonomy>(
-                                KEY_FILTER_BY_TAXONOMY
-                            )
+                        Taxon.Filter().byNameOrDescription(args?.getString(KEY_FILTER_BY_NAME))
+                            .also {
+                                val filterByTaxonomy = args?.getParcelable<Taxonomy>(
+                                    KEY_FILTER_BY_TAXONOMY
+                                )
 
-                            if (filterByTaxonomy != null) {
-                                (it as Taxon.Filter).byTaxonomy(filterByTaxonomy)
-                            }
-                        }.build()
+                                if (filterByTaxonomy != null) {
+                                    (it as Taxon.Filter).byTaxonomy(filterByTaxonomy)
+                                }
+                            }.build()
 
                     CursorLoader(
                         requireContext(),
@@ -190,7 +191,7 @@ class TaxaFragment : Fragment(),
             }
 
             override fun scrollToFirstSelectedItemPosition(position: Int) {
-                recyclerView.smoothScrollToPosition(position)
+                recyclerView.scrollToPosition(position)
             }
 
             override fun showEmptyTextView(show: Boolean) {
@@ -303,7 +304,10 @@ class TaxaFragment : Fragment(),
             }
 
             override fun onQueryTextChange(newText: String): Boolean {
-                savedState.putString(KEY_FILTER_BY_NAME, newText)
+                savedState.putString(
+                    KEY_FILTER_BY_NAME,
+                    newText
+                )
                 loadTaxa()
 
                 return true
@@ -317,10 +321,12 @@ class TaxaFragment : Fragment(),
                 val context = context ?: return true
                 startActivityForResult(
                     TaxonomyFilterActivity.newIntent(
-                        context, savedState.getParcelable(
+                        context,
+                        savedState.getParcelable(
                             KEY_FILTER_BY_TAXONOMY
                         )
-                    ), RESULT_FILTER
+                    ),
+                    RESULT_FILTER
                 )
                 true
             }
@@ -372,7 +378,10 @@ class TaxaFragment : Fragment(),
 
     override fun setInput(input: AbstractInput) {
         this.input = input as Input
-        savedState.putString(KEY_SELECTED_FEATURE_ID, input.selectedFeatureId)
+        savedState.putString(
+            KEY_SELECTED_FEATURE_ID,
+            input.selectedFeatureId
+        )
     }
 
     private fun loadTaxa() {
@@ -413,7 +422,8 @@ class TaxaFragment : Fragment(),
             if (filterChipGroup.childCount > 0) View.VISIBLE else View.GONE
 
         if (selectedTaxonomy == null) savedState.remove(KEY_FILTER_BY_TAXONOMY) else savedState.putParcelable(
-            KEY_FILTER_BY_TAXONOMY, selectedTaxonomy
+            KEY_FILTER_BY_TAXONOMY,
+            selectedTaxonomy
         )
 
         if (selectedTaxonomy != null) {
@@ -436,7 +446,10 @@ class TaxaFragment : Fragment(),
                     filterByTaxonomy(null)
                 }
 
-                filterChipGroup.addView(this, taxonomyChipIndex)
+                filterChipGroup.addView(
+                    this,
+                    taxonomyChipIndex
+                )
             }
 
             // build group taxonomy filter chip
@@ -457,7 +470,10 @@ class TaxaFragment : Fragment(),
                         filterByTaxonomy(Taxonomy((it.tag as Taxonomy).kingdom))
                     }
 
-                    filterChipGroup.addView(this, taxonomyChipIndex + 1)
+                    filterChipGroup.addView(
+                        this,
+                        taxonomyChipIndex + 1
+                    )
                 }
             }
         }

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

@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.CheckBox
 import android.widget.TextView
+import androidx.core.text.HtmlCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.l4digital.fastscroll.FastScroller
 import fr.geonature.commons.data.AbstractTaxon
@@ -207,7 +208,10 @@ class TaxaRecyclerViewAdapter(private val listener: OnTaxaRecyclerViewAdapterLis
                     .toString()
                 title.text = if (previousTitle == currentTitle) "" else currentTitle
                 text1.text = taxon.name
-                text2.text = taxon.description
+                text2.text = HtmlCompat.fromHtml(
+                    taxon.description ?: "",
+                    HtmlCompat.FROM_HTML_MODE_COMPACT
+                )
                 checkbox.isChecked = selectedTaxon?.id == taxon.id
 
                 taxon.taxonArea?.run {

occtax/src/main/res/layout/chip.xml

@@ -4,8 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:textAppearance="@style/TextAppearance.MaterialComponents.Chip"
     android:textColor="?android:attr/textColorPrimaryInverse"
+    android:theme="@style/Theme.MaterialComponents.Light"
     app:chipBackgroundColor="@color/accent"
     app:closeIconEnabled="true"
     app:closeIconTint="?android:attr/textColorPrimaryInverse"

occtax/src/main/res/layout/fragment_home.xml

@@ -76,11 +76,12 @@
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="@dimen/padding_default"
         android:layout_marginBottom="@dimen/padding_default"
+        android:backgroundTint="@color/accent"
         android:clickable="true"
         android:focusable="true"
-        android:tint="@android:color/white"
-        android:visibility="invisible"
+        android:visibility="visible"
         app:elevation="@dimen/fab_elevation"
-        app:srcCompat="@drawable/ic_add" />
+        app:srcCompat="@drawable/ic_add"
+        app:tint="@android:color/white" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

occtax/src/main/res/layout/fragment_observers_and_date_input.xml

@@ -14,9 +14,9 @@
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/padding_default"
             android:layout_marginStart="@dimen/padding_default"
             android:layout_marginTop="@dimen/padding_default"
+            android:layout_marginEnd="@dimen/padding_default"
             app:cardCornerRadius="@dimen/cardview_radius"
             app:cardElevation="@dimen/cardview_elevation"
             app:contentPadding="@dimen/padding_default">
@@ -36,9 +36,9 @@
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/padding_default"
             android:layout_marginStart="@dimen/padding_default"
             android:layout_marginTop="@dimen/padding_default"
+            android:layout_marginEnd="@dimen/padding_default"
             app:cardCornerRadius="@dimen/cardview_radius"
             app:cardElevation="@dimen/cardview_elevation"
             app:contentPadding="@dimen/padding_default">
@@ -56,9 +56,7 @@
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/padding_default"
-            android:layout_marginStart="@dimen/padding_default"
-            android:layout_marginTop="@dimen/padding_default"
+            android:layout_margin="@dimen/padding_default"
             app:cardCornerRadius="@dimen/cardview_radius"
             app:cardElevation="@dimen/cardview_elevation"
             app:contentPadding="@dimen/padding_default">

occtax/src/main/res/layout/list_item_taxon.xml

@@ -38,8 +38,8 @@
         android:id="@android:id/text1"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="?attr/listPreferredItemPaddingEnd"
         android:layout_marginStart="?attr/listPreferredItemHeight"
+        android:layout_marginEnd="?attr/listPreferredItemPaddingEnd"
         android:ellipsize="end"
         android:maxLines="1"
         android:textAppearance="?attr/textAppearanceListItem"
@@ -53,8 +53,10 @@
         android:id="@android:id/text2"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="?attr/listPreferredItemPaddingEnd"
         android:layout_marginStart="?attr/listPreferredItemHeight"
+        android:layout_marginEnd="?attr/listPreferredItemPaddingEnd"
+        android:ellipsize="end"
+        android:maxLines="1"
         android:textAppearance="?attr/textAppearanceListItemSecondary"
         app:layout_constraintEnd_toStartOf="@+id/taxon_last_updated_at_view"
         app:layout_constraintStart_toStartOf="parent"

occtax/version.properties

@@ -1,2 +1,2 @@
-#Tue Feb 11 20:38:22 CET 2020
-VERSION_CODE=1620
+#Sun Mar 01 18:10:33 CET 2020
+VERSION_CODE=1660