From 5746f4fe0d22d1f54baab284422f35a307809712 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 19 Aug 2023 11:00:31 +0200
Subject: [PATCH] DashPodManagementActivity: toolbar

---
 .../omnipod-dash/src/main/AndroidManifest.xml |  2 +-
 .../dash/ui/DashPodManagementActivity.kt      | 22 +++++++++++++++++++
 .../layout/omnipod_dash_pod_management.xml    | 20 -----------------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/pump/omnipod-dash/src/main/AndroidManifest.xml b/pump/omnipod-dash/src/main/AndroidManifest.xml
index 068d15bb8e..aa052fa6a9 100644
--- a/pump/omnipod-dash/src/main/AndroidManifest.xml
+++ b/pump/omnipod-dash/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
         <activity
             android:name=".ui.DashPodManagementActivity"
             android:exported="false"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".ui.DashPodHistoryActivity"
             android:exported="false"
diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
index 36f4306b0a..a9bc7d7e4d 100644
--- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
+++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
@@ -3,6 +3,10 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import androidx.core.view.MenuProvider
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandPlayTestBeep
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.PodActivationWizardActivity
@@ -48,6 +52,10 @@ class DashPodManagementActivity : TranslatedDaggerAppCompatActivity() {
         binding = OmnipodDashPodManagementBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        title = rh.gs(info.nightscout.androidaps.plugins.pump.omnipod.common.R.string.omnipod_common_pod_management_heading_actions)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
         binding.buttonActivatePod.setOnClickListener {
             val type: PodActivationWizardActivity.Type =
                 if (podStateManager.activationProgress.isAtLeast(ActivationProgress.PRIME_COMPLETED)) {
@@ -102,6 +110,20 @@ class DashPodManagementActivity : TranslatedDaggerAppCompatActivity() {
         binding.buttonPodHistory.setOnClickListener {
             startActivity(Intent(this, DashPodHistoryActivity::class.java))
         }
+        // Add menu items without overriding methods in the Activity
+        addMenuProvider(object : MenuProvider {
+            override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {}
+
+            override fun onMenuItemSelected(menuItem: MenuItem): Boolean =
+                when (menuItem.itemId) {
+                    android.R.id.home -> {
+                        onBackPressedDispatcher.onBackPressed()
+                        true
+                    }
+
+                    else              -> false
+                }
+        })
     }
 
     override fun onResume() {
diff --git a/pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml b/pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml
index 51df9cc890..ec263f2b76 100644
--- a/pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml
+++ b/pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml
@@ -13,26 +13,6 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="10dp"
-            android:gravity="center"
-            android:text="@string/omnipod_common_pod_management_title"
-            android:textAlignment="center"
-            android:textSize="12pt"
-            android:textStyle="bold" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
-            android:text="@string/omnipod_common_pod_management_heading_actions" />
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/Actions_Row_1"
             android:layout_width="match_parent"