From eda7c1e5525001c2514100eac707281c06096a54 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 19 Aug 2023 10:34:11 +0200
Subject: [PATCH] TDDStatsActivity: toolbar

---
 ui/src/main/AndroidManifest.xml               |  2 +-
 .../ui/activities/TDDStatsActivity.kt         | 22 +++++++++++++++++++
 ui/src/main/res/layout/activity_tdd_stats.xml |  8 -------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index b853a7cb94..76fe1b6ba9 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -27,7 +27,7 @@
         <activity
             android:name=".activities.TDDStatsActivity"
             android:exported="false"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme" />
         <activity
             android:name="info.nightscout.ui.activities.BolusProgressHelperActivity"
             android:exported="false"
diff --git a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt
index be1b982d94..f890ce09aa 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt
@@ -5,6 +5,9 @@ import android.graphics.Rect
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.KeyEvent
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
@@ -14,6 +17,7 @@ import android.widget.EditText
 import android.widget.TableLayout
 import android.widget.TableRow
 import android.widget.TextView
+import androidx.core.view.MenuProvider
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.TotalDailyDose
@@ -70,6 +74,10 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() {
         binding = ActivityTddStatsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        title = rh.gs(info.nightscout.core.ui.R.string.tdd)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
         window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN)
         binding.connectionStatus.visibility = View.GONE
         binding.message.visibility = View.GONE
@@ -192,6 +200,20 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() {
             }
         }
         loadDataFromDB()
+        // 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/ui/src/main/res/layout/activity_tdd_stats.xml b/ui/src/main/res/layout/activity_tdd_stats.xml
index 21ea646795..b207f560dd 100644
--- a/ui/src/main/res/layout/activity_tdd_stats.xml
+++ b/ui/src/main/res/layout/activity_tdd_stats.xml
@@ -18,14 +18,6 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/pillborder"
-                android:gravity="center_horizontal"
-                android:text="@string/tdd" />
-
             <TableLayout
                 android:id="@+id/main_table"
                 android:layout_width="match_parent"