From 4d19608106d91f06ccaaf4f9dec8687dac1d0740 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 19 Aug 2023 10:05:02 +0200
Subject: [PATCH] ProfileHelperActivity: toolbar

---
 ui/src/main/AndroidManifest.xml               |  2 +-
 .../ui/activities/ProfileHelperActivity.kt    | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index 6901e9d025..b853a7cb94 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -51,7 +51,7 @@
         <activity
             android:name=".activities.ProfileHelperActivity"
             android:exported="false"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme" />
         <activity
             android:name="info.nightscout.ui.activities.QuickWizardListActivity"
             android:exported="false"
diff --git a/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt
index e62d55bcc0..841e48ff5c 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt
@@ -4,8 +4,12 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import android.widget.ArrayAdapter
 import android.widget.TextView
+import androidx.core.view.MenuProvider
 import com.google.android.material.tabs.TabLayout
 import com.google.common.collect.Lists
 import info.nightscout.core.profile.ProfileSealed
@@ -83,6 +87,10 @@ class ProfileHelperActivity : TranslatedDaggerAppCompatActivity() {
         binding = ActivityProfilehelperBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        title = rh.gs(R.string.nav_profile_helper)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
         binding.tabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
             override fun onTabSelected(tab: TabLayout.Tab) {
                 switchTab(tab.position, typeSelected[tab.position])
@@ -246,6 +254,21 @@ class ProfileHelperActivity : TranslatedDaggerAppCompatActivity() {
         binding.basalPctFromTddLabel.labelFor = binding.basalPctFromTdd.editTextId
 
         switchTab(0, typeSelected[0], false)
+
+        // 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
+                }
+        })
     }
 
     private fun getProfile(age: Int, tdd: Double, weight: Double, basalPct: Double, tab: Int): PureProfile? =