Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge

omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/activation/fragment/AttachPodInfoFragment.kt

@@ -1,9 +1,14 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.activation.fragment
 
+import android.app.AlertDialog
+import android.os.Bundle
+import android.view.View
 import androidx.annotation.IdRes
 import androidx.annotation.StringRes
+import androidx.navigation.fragment.findNavController
 import info.nightscout.androidaps.plugins.pump.omnipod.R
 import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard.common.fragment.InfoFragmentBase
+import kotlinx.android.synthetic.main.omnipod_wizard_nav_buttons.*
 
 class AttachPodInfoFragment : InfoFragmentBase() {
     @StringRes
@@ -16,4 +21,18 @@ class AttachPodInfoFragment : InfoFragmentBase() {
     override fun getNextPageActionId(): Int = R.id.action_attachPodInfoFragment_to_insertCannulaActionFragment
 
     override fun getIndex(): Int = 3
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        omnipod_wizard_button_next.setOnClickListener {
+            AlertDialog.Builder(context)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setTitle(getString(getTitleId()))
+                .setMessage(getString(R.string.omnipod_pod_activation_wizard_attach_pod_confirm_insert_cannula_text))
+                .setPositiveButton(getString(R.string.omnipod_ok)) { _, _ -> findNavController().navigate(getNextPageActionId()) }
+                .setNegativeButton(getString(R.string.omnipod_cancel), null)
+                .show()
+        }
+    }
 }

omnipod/src/main/res/values/strings.xml

@@ -183,6 +183,7 @@
     <string name="omnipod_pod_activation_wizard_initialize_pod_text">Trying to pair with the new Pod and prime it.\n\nWhen the initialization process has successfully been completed, you can press <b>Next</b>.\n\n<b>Note:</b> please place the RileyLink in an upright position and place the Pod a few inches away from it.</string>
     <string name="omnipod_pod_activation_wizard_attach_pod_title">Attach Pod</string>
     <string name="omnipod_pod_activation_wizard_attach_pod_text">Prepare the infusion site. Remove the Pod\'s needle cap and adhesive backing and attach the Pod to the infusion site.\n\nIf the cannula sticks out, please press <b>Cancel</b> and discard your Pod.\n\nPress <b>Next</b> to insert the cannula and begin basal delivery.</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_confirm_insert_cannula_text">When you press <b>OK</b>, the cannula will be inserted. Make sure that you have attached the Pod to the infusion site.</string>
     <string name="omnipod_pod_activation_wizard_insert_cannula_title">Insert cannula</string>
     <string name="omnipod_pod_activation_wizard_insert_cannula_text">Trying to set initial basal schedule and insert the cannula.\n\nWhen the cannula has successfully been inserted, you can press <b>Next</b>.</string>
     <string name="omnipod_pod_activation_wizard_pod_activated_title">Pod activated</string>
@@ -235,6 +236,8 @@
     <string name="omnipod_pulse_log_value">Pulse Log (copied to clipboard)</string>
     <string name="omnipod_yes">Yes</string>
     <string name="omnipod_no">No</string>
+    <string name="omnipod_ok">OK</string>
+    <string name="omnipod_cancel">Cancel</string>
 
     <!-- Omnipod - Times -->
     <string name="omnipod_moments_ago">Moments ago</string>