Merge branch 'release/0.2.8'

occtax/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-version = "0.2.7"
+version = "0.2.8"
 
 android {
     compileSdkVersion 28
@@ -38,6 +38,8 @@ android {
 
     flavorDimensions "version"
     productFlavors {
+        pnx {
+        }
         pne {
         }
         pnv {
@@ -62,8 +64,8 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
 
-    implementation 'androidx.core:core-ktx:1.2.0-rc01'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-rc03"
+    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 'androidx.recyclerview:recyclerview:1.1.0'

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

@@ -6,7 +6,7 @@ import fr.geonature.occtax.input.Input
 import fr.geonature.occtax.settings.AppSettings
 import fr.geonature.occtax.ui.input.InputPagerFragmentActivity
 import fr.geonature.occtax.ui.settings.PreferencesActivity
-import fr.geonature.occtax.util.IntentUtils
+import fr.geonature.occtax.util.IntentUtils.syncActivity
 
 /**
  * Home screen Activity.
@@ -36,7 +36,9 @@ class HomeActivity : AppCompatActivity(),
     }
 
     override fun onStartSync() {
-        startActivity(IntentUtils.syncActivity(this))
+        syncActivity(this)?.also {
+            startActivity(it)
+        }
     }
 
     override fun onStartInput(

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

@@ -12,6 +12,8 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AnimationUtils
+import android.widget.TextView
+import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
@@ -21,6 +23,8 @@ import androidx.loader.content.CursorLoader
 import androidx.loader.content.Loader
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import fr.geonature.commons.data.AppSync
 import fr.geonature.commons.data.helper.Provider.buildUri
@@ -35,7 +39,7 @@ import fr.geonature.occtax.input.InputViewModel
 import fr.geonature.occtax.settings.AppSettings
 import fr.geonature.occtax.settings.AppSettingsViewModel
 import fr.geonature.occtax.ui.shared.view.ListItemActionView
-import kotlinx.android.synthetic.main.fragment_home.*
+import fr.geonature.occtax.util.IntentUtils.syncActivity
 
 /**
  * Home screen [Fragment].
@@ -50,6 +54,12 @@ class HomeFragment : Fragment() {
     private var appSettingsViewModel: AppSettingsViewModel? = null
     private var inputViewModel: InputViewModel? = null
 
+    private var homeContent: CoordinatorLayout? = null
+    private var appSyncView: AppSyncView? = null
+    private var inputRecyclerView: RecyclerView? = null
+    private var inputEmptyTextView: TextView? = null
+    private var fab: FloatingActionButton? = null
+
     private val loaderCallbacks = object : LoaderManager.LoaderCallbacks<Cursor> {
         override fun onCreateLoader(
             id: Int,
@@ -89,7 +99,7 @@ class HomeFragment : Fragment() {
             when (loader.id) {
                 LOADER_APP_SYNC -> {
                     if (data.moveToFirst()) {
-                        appSyncView.setAppSync(AppSync.fromCursor(data))
+                        appSyncView?.setAppSync(AppSync.fromCursor(data))
                     }
                 }
             }
@@ -125,11 +135,19 @@ class HomeFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        return inflater.inflate(
+        val view = inflater.inflate(
             R.layout.fragment_home,
             container,
             false
         )
+
+        homeContent = view.findViewById(R.id.homeContent)
+        appSyncView = view.findViewById(R.id.appSyncView)
+        inputRecyclerView = view.findViewById(R.id.inputRecyclerView)
+        inputEmptyTextView = view.findViewById(R.id.inputEmptyTextView)
+        fab = view.findViewById(R.id.fab)
+
+        return view
     }
 
     override fun onViewCreated(
@@ -143,13 +161,13 @@ class HomeFragment : Fragment() {
 
         setHasOptionsMenu(true)
 
-        appSyncView.setListener(object : ListItemActionView.OnListItemActionViewListener {
+        appSyncView?.setListener(object : ListItemActionView.OnListItemActionViewListener {
             override fun onAction() {
                 listener?.onStartSync()
             }
         })
 
-        fab.setOnClickListener {
+        fab?.setOnClickListener {
             val appSettings = appSettings ?: return@setOnClickListener
             listener?.onStartInput(appSettings)
         }
@@ -176,56 +194,52 @@ class HomeFragment : Fragment() {
             ) {
                 inputViewModel?.deleteInput(item)
 
-                Snackbar.make(
-                    homeContent,
-                    R.string.home_snackbar_input_deleted,
-                    Snackbar.LENGTH_SHORT
-                )
-                    .setAction(
-                        R.string.home_snackbar_input_undo
-                    ) {
+                makeSnackbar(getString(R.string.home_snackbar_input_deleted))
+                    ?.setAction(R.string.home_snackbar_input_undo) {
                         inputViewModel?.restoreDeletedInput()
                     }
-                    .show()
+                    ?.show()
             }
 
             override fun showEmptyTextView(show: Boolean) {
-                if (inputEmptyTextView.visibility == View.VISIBLE == show) {
+                if (inputEmptyTextView?.visibility == View.VISIBLE == show) {
                     return
                 }
 
                 if (show) {
-                    inputEmptyTextView.startAnimation(
+                    inputEmptyTextView?.startAnimation(
                         AnimationUtils.loadAnimation(
                             context,
                             android.R.anim.fade_in
                         )
                     )
-                    inputEmptyTextView.visibility = View.VISIBLE
+                    inputEmptyTextView?.visibility = View.VISIBLE
                 } else {
-                    inputEmptyTextView.startAnimation(
+                    inputEmptyTextView?.startAnimation(
                         AnimationUtils.loadAnimation(
                             context,
                             android.R.anim.fade_out
                         )
                     )
-                    inputEmptyTextView.visibility = View.GONE
+                    inputEmptyTextView?.visibility = View.GONE
                 }
             }
         })
 
-        with(inputRecyclerView) {
+        inputRecyclerView?.apply {
             layoutManager = LinearLayoutManager(context)
             adapter = this@HomeFragment.adapter
         }
 
         val dividerItemDecoration = DividerItemDecoration(
-            inputRecyclerView.context,
-            (inputRecyclerView.layoutManager as LinearLayoutManager).orientation
+            inputRecyclerView?.context,
+            (inputRecyclerView?.layoutManager as LinearLayoutManager).orientation
         )
-        inputRecyclerView.addItemDecoration(dividerItemDecoration)
+        inputRecyclerView?.addItemDecoration(dividerItemDecoration)
 
-        checkSelfPermissions()
+        if (checkAppSync()) {
+            checkSelfPermissions()
+        }
     }
 
     override fun onResume() {
@@ -297,20 +311,10 @@ class HomeFragment : Fragment() {
                 val requestPermissionsResult = checkPermissions(grantResults)
 
                 if (requestPermissionsResult) {
-                    Snackbar.make(
-                        homeContent,
-                        R.string.snackbar_permission_external_storage_available,
-                        Snackbar.LENGTH_LONG
-                    )
-                        .show()
+                    makeSnackbar(getString(R.string.snackbar_permission_external_storage_available))?.show()
                     loadAppSettings()
                 } else {
-                    Snackbar.make(
-                        homeContent,
-                        R.string.snackbar_permissions_not_granted,
-                        Snackbar.LENGTH_LONG
-                    )
-                        .show()
+                    makeSnackbar(getString(R.string.snackbar_permissions_not_granted))?.show()
                 }
             }
             else -> super.onRequestPermissionsResult(
@@ -332,40 +336,55 @@ class HomeFragment : Fragment() {
                 }
 
                 override fun onRequestPermissions(vararg permissions: String) {
-                    requestPermissions(
-                        this@HomeFragment,
-                        homeContent,
-                        R.string.snackbar_permission_external_storage_rationale,
-                        REQUEST_STORAGE_PERMISSIONS,
-                        *permissions
-                    )
+                    homeContent?.also {
+                        requestPermissions(
+                            this@HomeFragment,
+                            it,
+                            R.string.snackbar_permission_external_storage_rationale,
+                            REQUEST_STORAGE_PERMISSIONS,
+                            *permissions
+                        )
+                    }
                 }
             },
             Manifest.permission.WRITE_EXTERNAL_STORAGE
         )
     }
 
+    private fun checkAppSync(): Boolean {
+        val context = context ?: return true
+
+        if (syncActivity(context) == null) {
+            fab?.hide()
+            appSyncView?.enableActionButton(false)
+            makeSnackbar(getString(R.string.snackbar_app_sync_not_found))?.show()
+
+            return false
+        }
+
+        appSyncView?.enableActionButton()
+
+        return true
+    }
+
     private fun loadAppSettings() {
         appSettingsViewModel?.getAppSettings<AppSettings>()
             ?.observe(this,
                 Observer {
                     if (it?.mapSettings == null) {
-                        fab.hide()
+                        fab?.hide()
                         adapter.clear()
                         activity?.invalidateOptionsMenu()
 
-                        Snackbar.make(
-                            homeContent,
+                        makeSnackbar(
                             getString(
                                 if (it == null) R.string.snackbar_settings_not_found else R.string.snackbar_settings_map_invalid,
                                 appSettingsViewModel?.getAppSettingsFilename()
-                            ),
-                            Snackbar.LENGTH_LONG
-                        )
-                            .show()
+                            )
+                        )?.show()
                     } else {
                         appSettings = it
-                        fab.show()
+                        fab?.show()
                         activity?.invalidateOptionsMenu()
 
                         loadInputs()
@@ -381,6 +400,16 @@ class HomeFragment : Fragment() {
                 })
     }
 
+    private fun makeSnackbar(text: CharSequence): Snackbar? {
+        val view = homeContent ?: return null
+
+        return Snackbar.make(
+            view,
+            text,
+            Snackbar.LENGTH_LONG
+        )
+    }
+
     /**
      * Callback used by [HomeFragment].
      */

occtax/src/main/java/fr/geonature/occtax/ui/input/InputPagerFragmentActivity.kt

@@ -7,6 +7,9 @@ import android.util.Log
 import androidx.lifecycle.ViewModelProvider
 import androidx.viewpager.widget.ViewPager
 import fr.geonature.maps.settings.MapSettings
+import fr.geonature.maps.util.SettingsUtils.showCompass
+import fr.geonature.maps.util.SettingsUtils.showScale
+import fr.geonature.maps.util.SettingsUtils.showZoom
 import fr.geonature.occtax.R
 import fr.geonature.occtax.input.Input
 import fr.geonature.occtax.input.InputViewModel
@@ -17,8 +20,6 @@ import fr.geonature.occtax.ui.input.map.InputMapFragment
 import fr.geonature.occtax.ui.input.observers.ObserversAndDateInputFragment
 import fr.geonature.occtax.ui.input.summary.InputTaxaSummaryFragment
 import fr.geonature.occtax.ui.input.taxa.TaxaFragment
-import fr.geonature.occtax.util.SettingsUtils.getMapShowCompass
-import fr.geonature.occtax.util.SettingsUtils.getMapShowScale
 import fr.geonature.viewpager.ui.AbstractNavigationHistoryPagerFragmentActivity
 import fr.geonature.viewpager.ui.AbstractPagerFragmentActivity
 import fr.geonature.viewpager.ui.IValidateFragment
@@ -119,8 +120,9 @@ class InputPagerFragmentActivity : AbstractNavigationHistoryPagerFragmentActivit
     private fun getMapSettings(): MapSettings {
         return MapSettings.Builder.newInstance()
             .from(appSettings.mapSettings!!)
-            .showScale(getMapShowScale(this))
-            .showCompass(getMapShowCompass(this))
+            .showCompass(showCompass(this))
+            .showScale(showScale(this))
+            .showZoom(showZoom(this))
             .build()
     }
 

occtax/src/main/java/fr/geonature/occtax/ui/shared/view/ListItemActionView.kt

@@ -92,6 +92,10 @@ open class ListItemActionView : ConstraintLayout {
         emptyTextView.setText(if (emptyTextResourceId == 0) R.string.no_data else emptyTextResourceId)
     }
 
+    fun enableActionButton(enabled: Boolean = true) {
+        actionButton.isEnabled = enabled
+    }
+
     fun setActionText(@StringRes actionResourceId: Int) {
         if (actionResourceId == 0) {
             return
@@ -199,6 +203,12 @@ open class ListItemActionView : ConstraintLayout {
                 R.string.no_data
             )
         )
+        enableActionButton(
+            ta.getBoolean(
+                R.styleable.ListItemActionView_action_enabled,
+                true
+            )
+        )
         setActionText(
             ta.getResourceId(
                 R.styleable.ListItemActionView_action,