From 815b2dbfe95d2e478683de2c05674d3aa715ed65 Mon Sep 17 00:00:00 2001 From: "S. Grimault" Date: Sun, 1 Mar 2020 17:14:29 +0100 Subject: [PATCH 1/4] fix: set default nav buttons state --- viewpager/build.gradle | 2 +- viewpager/src/main/res/layout/activity_pager.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/viewpager/build.gradle b/viewpager/build.gradle index 550a5f69..599fdd2b 100644 --- a/viewpager/build.gradle +++ b/viewpager/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -version = "0.1.1" +version = "0.1.2" android { compileSdkVersion 28 diff --git a/viewpager/src/main/res/layout/activity_pager.xml b/viewpager/src/main/res/layout/activity_pager.xml index 3659c0c2..7a95a2fe 100644 --- a/viewpager/src/main/res/layout/activity_pager.xml +++ b/viewpager/src/main/res/layout/activity_pager.xml @@ -11,6 +11,7 @@ android:layout_height="wrap_content" android:backgroundTint="?attr/colorBackgroundFloating" android:text="@string/button_pager_previous" + android:visibility="invisible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/nextButton" app:layout_constraintHorizontal_bias="0.5" @@ -21,6 +22,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:backgroundTint="?attr/colorBackgroundFloating" + android:enabled="false" android:text="@string/button_pager_next" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" From 6f27633f45fd35dc3e22061a150a28b66877cc33 Mon Sep 17 00:00:00 2001 From: "S. Grimault" Date: Sun, 1 Mar 2020 17:39:00 +0100 Subject: [PATCH 2/4] https://github.com/PnX-SI/gn_mobile_occtax/issues/25 --- commons/build.gradle | 2 +- .../geonature/commons/data/AbstractTaxon.kt | 18 +++++-- .../fr/geonature/commons/data/TaxonTest.kt | 52 +++++++++++++------ .../fr/geonature/sync/api/model/Taxref.kt | 3 ++ .../fr/geonature/sync/sync/DataSyncWorker.kt | 2 +- 5 files changed, 55 insertions(+), 22 deletions(-) diff --git a/commons/build.gradle b/commons/build.gradle index 8a6e73d5..297de215 100644 --- 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.6.1" +version = "0.6.2" android { compileSdkVersion 28 diff --git a/commons/src/main/java/fr/geonature/commons/data/AbstractTaxon.kt b/commons/src/main/java/fr/geonature/commons/data/AbstractTaxon.kt index 2f7698ca..dc3adcfb 100644 --- a/commons/src/main/java/fr/geonature/commons/data/AbstractTaxon.kt +++ b/commons/src/main/java/fr/geonature/commons/data/AbstractTaxon.kt @@ -167,7 +167,7 @@ abstract class AbstractTaxon : Parcelable { * * @return this */ - fun byName(queryString: String?): Filter { + fun byNameOrDescription(queryString: String?): Filter { if (queryString.isNullOrBlank()) { return this } @@ -175,9 +175,16 @@ abstract class AbstractTaxon : Parcelable { this.wheres.add( Pair( "(${getColumnAlias( - COLUMN_NAME, tableAlias + COLUMN_NAME, + tableAlias + )} LIKE ? OR ${getColumnAlias( + COLUMN_DESCRIPTION, + tableAlias )} LIKE ?)", - arrayOf("%$queryString%") + arrayOf( + "%$queryString%", + "%$queryString%" + ) ) ) @@ -196,7 +203,10 @@ abstract class AbstractTaxon : Parcelable { pair.first } - return Pair(whereClauses, bindArgs.toTypedArray()) + return Pair( + whereClauses, + bindArgs.toTypedArray() + ) } } } diff --git a/commons/src/test/java/fr/geonature/commons/data/TaxonTest.kt b/commons/src/test/java/fr/geonature/commons/data/TaxonTest.kt index cdf08684..c54ede89 100644 --- a/commons/src/test/java/fr/geonature/commons/data/TaxonTest.kt +++ b/commons/src/test/java/fr/geonature/commons/data/TaxonTest.kt @@ -290,38 +290,53 @@ class TaxonTest { @Test fun testFilter() { - val taxonFilterByNameAndTaxonomy = (Taxon.Filter().byName("as") as Taxon.Filter).byTaxonomy( - Taxonomy( - "Animalia", - "Ascidies" + val taxonFilterByNameAndTaxonomy = + (Taxon.Filter().byNameOrDescription("as") as Taxon.Filter).byTaxonomy( + Taxonomy( + "Animalia", + "Ascidies" + ) ) - ).build() + .build() assertEquals( - "(${Taxon.TABLE_NAME}_${AbstractTaxon.COLUMN_NAME} LIKE ?) AND ((${Taxon.TABLE_NAME}_${Taxonomy.COLUMN_KINGDOM} = ?) AND (${Taxon.TABLE_NAME}_${Taxonomy.COLUMN_GROUP} = ?))", + "(${Taxon.TABLE_NAME}_${AbstractTaxon.COLUMN_NAME} LIKE ? OR ${Taxon.TABLE_NAME}_${AbstractTaxon.COLUMN_DESCRIPTION} LIKE ?) AND ((${Taxon.TABLE_NAME}_${Taxonomy.COLUMN_KINGDOM} = ?) AND (${Taxon.TABLE_NAME}_${Taxonomy.COLUMN_GROUP} = ?))", taxonFilterByNameAndTaxonomy.first ) assertArrayEquals( - arrayOf("%as%", "Animalia", "Ascidies"), + arrayOf( + "%as%", + "%as%", + "Animalia", + "Ascidies" + ), taxonFilterByNameAndTaxonomy.second ) - val taxonFilterByNameAndKingdom = (Taxon.Filter().byName("as") as Taxon.Filter).byTaxonomy( - Taxonomy( - "Animalia" + val taxonFilterByNameAndKingdom = + (Taxon.Filter().byNameOrDescription("as") as Taxon.Filter).byTaxonomy( + Taxonomy( + "Animalia" + ) ) - ).build() + .build() assertEquals( - "(${Taxon.TABLE_NAME}_${AbstractTaxon.COLUMN_NAME} LIKE ?) AND (${Taxon.TABLE_NAME}_${Taxonomy.COLUMN_KINGDOM} = ?)", + "(${Taxon.TABLE_NAME}_${AbstractTaxon.COLUMN_NAME} LIKE ? OR ${Taxon.TABLE_NAME}_${AbstractTaxon.COLUMN_DESCRIPTION} LIKE ?) AND (${Taxon.TABLE_NAME}_${Taxonomy.COLUMN_KINGDOM} = ?)", taxonFilterByNameAndKingdom.first ) assertArrayEquals( - arrayOf("%as%", "Animalia"), + arrayOf( + "%as%", + "%as%", + "Animalia" + ), taxonFilterByNameAndKingdom.second ) - val taxonFilterByKingdom = Taxon.Filter().byKingdom("Animalia").build() + val taxonFilterByKingdom = Taxon.Filter() + .byKingdom("Animalia") + .build() assertEquals( "(${Taxon.TABLE_NAME}_${Taxonomy.COLUMN_KINGDOM} = ?)", @@ -332,9 +347,14 @@ class TaxonTest { taxonFilterByKingdom.second ) - val taxonFilterByAnyTaxonomy = Taxon.Filter().byTaxonomy(Taxonomy("")).build() + val taxonFilterByAnyTaxonomy = Taxon.Filter() + .byTaxonomy(Taxonomy("")) + .build() - assertEquals("", taxonFilterByAnyTaxonomy.first) + assertEquals( + "", + taxonFilterByAnyTaxonomy.first + ) assertTrue(taxonFilterByAnyTaxonomy.second.isEmpty()) } } diff --git a/sync/src/main/java/fr/geonature/sync/api/model/Taxref.kt b/sync/src/main/java/fr/geonature/sync/api/model/Taxref.kt index ff73bdc4..19b29c1c 100644 --- a/sync/src/main/java/fr/geonature/sync/api/model/Taxref.kt +++ b/sync/src/main/java/fr/geonature/sync/api/model/Taxref.kt @@ -17,6 +17,9 @@ data class Taxref( @SerializedName("lb_nom") val name: String, + @SerializedName("search_name") + val description: String, + @SerializedName("regne") val kingdom: String, diff --git a/sync/src/main/java/fr/geonature/sync/sync/DataSyncWorker.kt b/sync/src/main/java/fr/geonature/sync/sync/DataSyncWorker.kt index a5ebfb27..21fc9387 100644 --- a/sync/src/main/java/fr/geonature/sync/sync/DataSyncWorker.kt +++ b/sync/src/main/java/fr/geonature/sync/sync/DataSyncWorker.kt @@ -273,7 +273,7 @@ class DataSyncWorker( it.kingdom, it.group ), - null + it.description ) } .toTypedArray() From a9ffab6ffac5e2977aaf878edc3549ba1a0dbd46 Mon Sep 17 00:00:00 2001 From: "S. Grimault" Date: Sun, 1 Mar 2020 17:39:57 +0100 Subject: [PATCH 3/4] chore: gradle upgrade --- build.gradle | 2 +- gradle.properties | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8711c23a..9ae64a6a 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.0' + 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 your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index 5465fec0..96c7b8db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,4 @@ android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true +kotlin.code.style=official +android.enableUnitTestBinaryResources=true \ No newline at end of file From 1bb509ba3aa7e5fb04701ef8ea768f52073513bb Mon Sep 17 00:00:00 2001 From: "S. Grimault" Date: Sun, 1 Mar 2020 18:03:16 +0100 Subject: [PATCH 4/4] chore: 0.2.5 release --- sync/build.gradle | 2 +- sync/version.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sync/build.gradle b/sync/build.gradle index a8fda1ba..8e84656e 100644 --- a/sync/build.gradle +++ b/sync/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: "kotlin-kapt" -version = "0.2.4" +version = "0.2.5" android { compileSdkVersion 28 diff --git a/sync/version.properties b/sync/version.properties index c4d2f376..6d2cac01 100644 --- a/sync/version.properties +++ b/sync/version.properties @@ -1,2 +1,2 @@ -#Tue Feb 25 21:34:41 CET 2020 -VERSION_CODE=2080 +#Sun Mar 01 17:59:25 CET 2020 +VERSION_CODE=2100