From 3902641775cb128265f6273819cf9c76dcb2c419 Mon Sep 17 00:00:00 2001
From: Norbel Ambanumben <aanorbel@gmail.com>
Date: Fri, 3 Nov 2023 15:07:06 +0100
Subject: [PATCH] Modified Menu and toolbar views for `RunTestsActivity` with
 proper styling

---
 app/src/main/AndroidManifest.xml              |  3 ++-
 .../activity/runtests/RunTestsActivity.kt     | 23 +++++++++++++++++--
 .../main/res/layout/activity_run_tests.xml    | 19 +++++++++++----
 app/src/main/res/menu/close.xml               | 10 ++++++++
 4 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/menu/close.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7f53c91ba..0b4b5e9f5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,7 +42,8 @@
 			android:label="Run tests"
 			android:name=".activity.runtests.RunTestsActivity"
 			android:parentActivityName=".activity.MainActivity"
-			android:exported="false"/>
+			android:exported="false"
+			android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar.App.NoActionBar"/>
 		<activity
 			android:name=".activity.PreferenceActivity"
 			android:launchMode="singleTop"
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/runtests/RunTestsActivity.kt b/app/src/main/java/org/openobservatory/ooniprobe/activity/runtests/RunTestsActivity.kt
index 3efd42d6e..463923148 100644
--- a/app/src/main/java/org/openobservatory/ooniprobe/activity/runtests/RunTestsActivity.kt
+++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/runtests/RunTestsActivity.kt
@@ -4,12 +4,12 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
-import android.view.MenuItem
+import android.view.*
 import org.openobservatory.ooniprobe.R
 import org.openobservatory.ooniprobe.activity.AbstractActivity
 import org.openobservatory.ooniprobe.activity.RunningActivity
-import org.openobservatory.ooniprobe.activity.runtests.RunTestsViewModel.Companion.SELECT_NONE
 import org.openobservatory.ooniprobe.activity.runtests.RunTestsViewModel.Companion.SELECT_ALL
+import org.openobservatory.ooniprobe.activity.runtests.RunTestsViewModel.Companion.SELECT_NONE
 import org.openobservatory.ooniprobe.activity.runtests.RunTestsViewModel.Companion.SELECT_SOME
 import org.openobservatory.ooniprobe.activity.runtests.adapter.RunTestsExpandableListViewAdapter
 import org.openobservatory.ooniprobe.activity.runtests.models.ChildItem
@@ -46,6 +46,8 @@ class RunTestsActivity : AbstractActivity() {
 		super.onCreate(savedInstanceState)
 		binding = ActivityRunTestsBinding.inflate(layoutInflater)
 		setContentView(binding.getRoot())
+
+		setSupportActionBar(binding.toolbar)
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
 		activityComponent?.inject(this)
@@ -77,6 +79,23 @@ class RunTestsActivity : AbstractActivity() {
 
 	}
 
+	override fun onCreateOptionsMenu(menu: Menu): Boolean {
+		val inflater: MenuInflater = menuInflater
+		inflater.inflate(R.menu.close, menu)
+		return true
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
+		return when (item.itemId) {
+			R.id.close_button -> {
+				finish()
+				true
+			}
+
+			else -> super.onOptionsItemSelected(item)
+		}
+	}
+
 	private fun onMenuItemClickListener(menuItem: MenuItem): Boolean {
 		return when (menuItem.itemId) {
 			R.id.runButton -> {
diff --git a/app/src/main/res/layout/activity_run_tests.xml b/app/src/main/res/layout/activity_run_tests.xml
index 309bf0041..10dcc4d38 100644
--- a/app/src/main/res/layout/activity_run_tests.xml
+++ b/app/src/main/res/layout/activity_run_tests.xml
@@ -6,14 +6,25 @@
 	android:layout_height="match_parent"
 	tools:context=".activity.runtests.RunTestsActivity">
 
+	<androidx.appcompat.widget.Toolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@color/color_white"
+		app:menu="@menu/close"
+		app:layout_constraintTop_toTopOf="parent"
+		app:contentInsetEnd="0dp"
+		app:contentInsetStart="0dp" />
+
 	<LinearLayout
 		android:id="@+id/control_layout"
-		android:layout_width="wrap_content"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
 		android:layout_marginStart="16dp"
+		app:layout_constraintTop_toBottomOf="@id/toolbar"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent">
+		app:layout_constraintEnd_toEndOf="parent">
 
 		<Button
 			android:id="@+id/select_all"
@@ -60,13 +71,13 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
-		android:theme="@style/Theme.MaterialComponents.NoActionBar.App">
+		android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar.App.NoActionBar">
 
 		<androidx.appcompat.widget.Toolbar
 			android:id="@+id/bottomBar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:background="@color/color_base"
+			android:background="@color/color_white"
 			app:menu="@menu/run"
 			app:title="@string/OONIRun_URLs"
 			app:titleTextAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title.App" />
diff --git a/app/src/main/res/menu/close.xml b/app/src/main/res/menu/close.xml
new file mode 100644
index 000000000..1daa03f3c
--- /dev/null
+++ b/app/src/main/res/menu/close.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/close_button"
+		android:title="@string/OONIRun_Close"
+		android:icon="@drawable/close"
+		app:iconTint="@color/color_black"
+		app:showAsAction="ifRoom|withText" />
+</menu>