Merge branch 'release/0.2.9'

PnX-SI · Feb 11, 2020 · 48ade07 · 48ade07
2 parents ae34d11 + e448f8f
commit 48ade07
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 11 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/README.md b/README.md
@@ -7,10 +7,11 @@ GeoNature Android mobile application for Occtax module.
 
 ## Upgrade git sub modules
 
-Do **NOT** modify directly any git sub modules (e.g. `commons`, `viewpager` and `maps`).
+Do **NOT** modify directly any git sub modules (e.g. `commons`, `mountpoint`, `viewpager` and `maps`).
 Any changes should be made from each underlying git repository:
 
 * `commons`: [gn_mobile_core](https://github.com/PnX-SI/gn_mobile_core) git repository
+* `mountpoint`: [gn_mobile_core](https://github.com/PnX-SI/gn_mobile_core) git repository
 * `viewpager`: [gn_mobile_core](https://github.com/PnX-SI/gn_mobile_core) git repository
 * `maps`: [gn_mobile_maps](https://github.com/PnX-SI/gn_mobile_maps) git repository
 

diff --git a/gn_mobile_core b/gn_mobile_core
diff --git a/gn_mobile_maps b/gn_mobile_maps
diff --git a/mountpoint b/mountpoint
@@ -0,0 +1 @@
+gn_mobile_core/mountpoint
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.2.8"
+version = "0.2.9"
 
 android {
     compileSdkVersion 28
@@ -67,7 +67,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.3.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.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference:1.1.0'

diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesFragment.kt
@@ -42,6 +42,7 @@ class PreferencesFragment : PreferenceFragmentCompat() {
                     requireContext(),
                     buildUri(
                         Dataset.TABLE_NAME,
+                        "occtax",
                         args!!.getLong(KEY_SELECTED_DATASET).toString()
                     ),
                     null,

diff --git a/occtax/version.properties b/occtax/version.properties
@@ -1,2 +1,2 @@
-#Sun Feb 02 18:55:04 CET 2020
-VERSION_CODE=1580
+#Tue Feb 11 20:38:22 CET 2020
+VERSION_CODE=1620
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':commons', ':viewpager', ':maps', ':occtax'
+include ':commons', ':mountpoint', ':viewpager', ':maps', ':occtax'
diff --git a/upgrade_submodules.sh b/upgrade_submodules.sh
@@ -5,6 +5,9 @@ APP_HOME="`pwd -P`"
 cd $APP_HOME/commons
 git checkout -- .
 
+cd $APP_HOME/mountpoint
+git checkout -- .
+
 cd $APP_HOME/viewpager
 git checkout -- .
+2 −0		.idea/gradle.xml
+8 −7		commons/build.gradle
+5 −4		commons/src/main/java/fr/geonature/commons/input/InputManager.kt
+8 −7		commons/src/main/java/fr/geonature/commons/settings/AppSettingsManager.kt
+43 −141		commons/src/main/java/fr/geonature/commons/util/FileUtils.kt
+3 −18		commons/src/test/java/fr/geonature/commons/util/FileUtilsTest.kt
+0 −56		commons/src/test/java/fr/geonature/commons/util/MountPointUtilsTest.kt
+2 −2		commons/version.properties
+2 −0		gradle.properties
+1 −0		mountpoint/.gitignore
+54 −0		mountpoint/build.gradle
+0 −0		mountpoint/consumer-rules.pro
+21 −0		mountpoint/proguard-rules.pro
+3 −0		mountpoint/src/main/AndroidManifest.xml
+11 −5		mountpoint/src/main/java/fr/geonature/mountpoint/model/MountPoint.kt
+18 −0		mountpoint/src/main/java/fr/geonature/mountpoint/util/DeviceUtils.kt
+111 −0		mountpoint/src/main/java/fr/geonature/mountpoint/util/FileUtils.kt
+4 −4		mountpoint/src/main/java/fr/geonature/mountpoint/util/MountPointUtils.kt
+12 −0		mountpoint/src/main/res/values-fr/strings.xml
+12 −0		mountpoint/src/main/res/values/strings.xml
+38 −11		mountpoint/src/test/java/fr/geonature/mountpoint/model/MountPointTest.kt
+52 −0		mountpoint/src/test/java/fr/geonature/mountpoint/util/FileUtilsTest.kt
+83 −0		mountpoint/src/test/java/fr/geonature/mountpoint/util/MountPointUtilsTest.kt
+2 −0		mountpoint/version.properties
+1 −1		settings.gradle
+1 −1		sync/build.gradle
+4 −3		sync/src/main/java/fr/geonature/sync/MainApplication.kt
+6 −5		sync/src/main/java/fr/geonature/sync/data/LocalDatabase.kt
+9 −4		sync/src/main/java/fr/geonature/sync/data/dao/AppSyncDao.kt
+5 −3		sync/src/main/java/fr/geonature/sync/sync/InputsSyncWorker.kt
+6 −4		sync/src/main/java/fr/geonature/sync/util/SettingsUtils.kt
+1 −1		viewpager/build.gradle
+4 −0		.gitmodules
+1 −0		.idea/codeStyles/Project.xml
+2 −0		.idea/gradle.xml
+1 −0		.idea/vcs.xml
+13 −1		README.md
+1 −0		gn_mobile_core
+9 −7		maps/build.gradle
+175 −0		maps/src/main/java/fr/geonature/maps/settings/LayerSettingsViewModel.kt
+85 −93		maps/src/main/java/fr/geonature/maps/ui/MapFragment.kt
+0 −94		maps/src/main/java/fr/geonature/maps/ui/overlay/feature/FeatureOverlayProvider.kt
+1 −0		mountpoint
+1 −1		settings.gradle
+14 −0		upgrade_submodules.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':commons', ':viewpager', ':maps', ':occtax'
		include ':commons', ':mountpoint', ':viewpager', ':maps', ':occtax'