feat: (OONI Run v2) fix Run button is hard to see (#696)

- Fixes ooni/run#140 ## Proposed Changes - Update layouts and actions to match design. |.|.| |-|-| | ![Screenshot_20240316_212740](https://github.com/ooni/probe-android/assets/17911892/504eed38-b3ec-4f4e-869e-9ec975a11d68) | ![Screenshot_20240316_213633](https://github.com/ooni/probe-android/assets/17911892/d4ab7781-5118-43e8-ad95-2d3b526a3c73) | | ![Screenshot_20240316_212826](https://github.com/ooni/probe-android/assets/17911892/50c094f9-9128-4e89-ac32-89bc70486609) | ![Screenshot_20240316_212911](https://github.com/ooni/probe-android/assets/17911892/5778ed2c-1695-4c4d-ad92-b8b28b596e90) |
ooni · Mar 21, 2024 · 6a00d6a · 6a00d6a
1 parent f3a9a6c
commit 6a00d6a
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 123 deletions.
diff --git a/.../main/java/org/openobservatory/ooniprobe/activity/customwebsites/CustomWebsiteActivity.kt b/.../main/java/org/openobservatory/ooniprobe/activity/customwebsites/CustomWebsiteActivity.kt
@@ -4,10 +4,9 @@ import android.content.DialogInterface
 import android.os.Bundle
 import android.os.Parcelable
 import android.util.Patterns
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
 import androidx.activity.viewModels
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import org.openobservatory.ooniprobe.R
 import org.openobservatory.ooniprobe.activity.AbstractActivity
@@ -50,15 +49,23 @@ class CustomWebsiteActivity : AbstractActivity(), ConfirmDialogFragment.OnClickL
         )
         setContentView(binding.root)
         setSupportActionBar(binding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.apply {
+            setDisplayHomeAsUpEnabled(true)
+            setHomeAsUpIndicator(
+                ContextCompat.getDrawable(this@CustomWebsiteActivity, R.drawable.close)
+                    ?.apply { DrawableCompat.setTint(this, ContextCompat.getColor(this@CustomWebsiteActivity, R.color.color_black)) }
+            )
+            title = getString(R.string.Settings_Websites_CustomURL_Title).uppercase()
+        }
+
         val layoutManager = LinearLayoutManager(this)
+        binding.urlContainer.isNestedScrollingEnabled = false
         binding.urlContainer.layoutManager = layoutManager
+        val fatTextTemplate = "Test %s URLs"
         adapter = CustomWebsiteRecyclerViewAdapter(
             onItemChangedListener = object : ItemChangedListener {
                 override fun onItemRemoved(position: Int) {
-                    binding.bottomBar.title = getString(
-                        R.string.OONIRun_URLs, adapter.itemCount.toString()
-                    )
+                    binding.fabTestUrls.text = fatTextTemplate.format(adapter.itemCount)
                     viewModel.onItemRemoved(position)
                 }
 
@@ -68,12 +75,10 @@ class CustomWebsiteActivity : AbstractActivity(), ConfirmDialogFragment.OnClickL
             },
         )
         viewModel.urls.observe(this) { urls ->
-            binding.bottomBar.title = getString(
-                R.string.OONIRun_URLs, urls.size.toString()
-            )
+            binding.fabTestUrls.text = fatTextTemplate.format(urls.size)
         }
 
-        binding.bottomBar.setOnMenuItemClickListener { item: MenuItem? -> runTests() }
+        binding.fabTestUrls.setOnClickListener { runTests() }
         binding.add.setOnClickListener { add() }
 
         binding.urlContainer.adapter = adapter
@@ -147,23 +152,6 @@ class CustomWebsiteActivity : AbstractActivity(), ConfirmDialogFragment.OnClickL
         return true
     }
 
-    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 -> {
-                onSupportNavigateUp()
-                true
-            }
-
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
     /**
      * This function will add a new url to the list of urls.
      * It will also scroll to the bottom of the list.

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
@@ -4,9 +4,9 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
+import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
 import org.openobservatory.engine.BaseNettest
 import org.openobservatory.ooniprobe.R
 import org.openobservatory.ooniprobe.activity.AbstractActivity
@@ -54,7 +54,14 @@ class RunTestsActivity : AbstractActivity() {
 		setContentView(binding.getRoot())
 
 		setSupportActionBar(binding.toolbar)
-		supportActionBar?.setDisplayHomeAsUpEnabled(true)
+		supportActionBar?.apply {
+			setDisplayHomeAsUpEnabled(true)
+			setHomeAsUpIndicator(
+				ContextCompat.getDrawable(this@RunTestsActivity, R.drawable.close)
+					?.apply { DrawableCompat.setTint(this, ContextCompat.getColor(this@RunTestsActivity, R.color.color_black)) }
+			)
+			title = "Run tests".uppercase()
+		}
 
 		activityComponent?.inject(this)
 
@@ -78,55 +85,29 @@ class RunTestsActivity : AbstractActivity() {
 
 			viewModel.selectedAllBtnStatus.observe(this, this::selectAllBtnStatusObserver)
 
-			binding.bottomBar.setOnMenuItemClickListener { menuItem ->
-				onMenuItemClickListener(menuItem)
-			}
+			binding.fabRunTests.setOnClickListener { onRunTestsClickListener() }
 		} ?: run {
 			finish()
 		}
 
 	}
-
-	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 -> {
-				updatePreferences()
-				val selectedChildItems: List<String> = getChildItemsSelectedIdList()
-				if (selectedChildItems.isNotEmpty()) {
-					val testSuitesToRun = getGroupItemsAtLeastOneChildEnabled().map { groupItem ->
-						return@map groupItem.getTest(this)
-					}
-					RunningActivity.runAsForegroundService(
-						this@RunTestsActivity,
-						java.util.ArrayList(testSuitesToRun),
-						{ finish() },
-						preferenceManager
-					)
-
-				}
-				true
-			}
-
-			else -> false
-		}
-	}
+    private fun onRunTestsClickListener() {
+        updatePreferences()
+        val selectedChildItems: List<String> = getChildItemsSelectedIdList()
+        if (selectedChildItems.isNotEmpty()) {
+            val testSuitesToRun = getGroupItemsAtLeastOneChildEnabled().map { groupItem ->
+                return@map groupItem.getTest(this)
+            }
+            RunningActivity.runAsForegroundService(
+                this@RunTestsActivity,
+                java.util.ArrayList(testSuitesToRun),
+                { finish() },
+                preferenceManager
+            )
+        } else {
+			Toast.makeText(this@RunTestsActivity, "Please select test to run", Toast.LENGTH_LONG).show()
+        }
+    }
 
     /**
      * Update the preferences based on the selected tests.
@@ -189,10 +170,10 @@ class RunTestsActivity : AbstractActivity() {
 	}
 
 
-	private fun updateStatusIndicator() {
-		//TODO(aanorbel): translate status indicator
-		binding.bottomBar.setTitle("${getChildItemsSelectedIdList().size} Tests")
-	}
+    private fun updateStatusIndicator() {
+        //TODO(aanorbel): translate status indicator
+        binding.fabRunTests.text = "Run ${getChildItemsSelectedIdList().size} test"
+    }
 
 	private fun getChildItemsSelectedIdList(): List<String> {
 		val childItemSelectedIdList: MutableList<String> = ArrayList()

diff --git a/app/src/main/res/layout/activity_customwebsite.xml b/app/src/main/res/layout/activity_customwebsite.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical"
 	tools:context=".activity.customwebsites.CustomWebsiteActivity">
+
 	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appbar_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
 		app:elevation="0dp">
 
 		<androidx.appcompat.widget.Toolbar
@@ -23,7 +28,9 @@
 		android:id="@+id/urlsList"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1">
+		app:layout_constraintTop_toBottomOf="@id/appbar_layout"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintEnd_toEndOf="parent">
 
 		<LinearLayout
 			android:layout_width="match_parent"
@@ -46,22 +53,24 @@
 				android:textAllCaps="false"
 				android:textColor="@color/color_black"
 				app:icon="@drawable/ic_baseline_add_36"
-				app:iconTint="@color/color_black" />
+				app:iconTint="@color/color_black"
+				android:layout_marginBottom="150dp"/>
 		</LinearLayout>
 	</ScrollView>
 
-	<com.google.android.material.appbar.AppBarLayout
-		android:layout_width="match_parent"
+	<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+		android:id="@+id/fab_test_urls"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar.App.NoActionBar">
+		android:text="Test Urls"
+		android:layout_marginBottom="@dimen/item_padding_large"
+		android:backgroundTint="@color/color_base"
+		android:textColor="@android:color/white"
+		android:textAllCaps="false"
+		app:icon="@drawable/outline_timer"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:iconTint="@android:color/white"/>
 
-		<androidx.appcompat.widget.Toolbar
-			android:id="@+id/bottomBar"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:background="@color/color_gray0"
-			app:menu="@menu/run"
-			app:title="@string/OONIRun_URLs"
-			app:titleTextAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title.App" />
-	</com.google.android.material.appbar.AppBarLayout>
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_run_tests.xml b/app/src/main/res/layout/activity_run_tests.xml
@@ -11,7 +11,6 @@
 		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" />
@@ -21,17 +20,26 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
-		android:layout_marginStart="16dp"
+		android:layout_marginStart="@dimen/item_padding_large"
+		android:paddingTop="@dimen/item_padding_small"
+		android:paddingBottom="@dimen/item_padding_large"
 		app:layout_constraintTop_toBottomOf="@id/toolbar"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintEnd_toEndOf="parent">
 
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Select the tests to run"
+			android:paddingBottom="@dimen/item_padding_small"
+			style="?attr/textAppearanceHeadline6"/>
+
 		<Button
 			android:id="@+id/select_all"
 			style="@style/Widget.MaterialComponents.Button.OutlinedButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="@string/Settings_Websites_Categories_Selection_All"
+			android:text="Select all tests"
 			android:textAllCaps="false"
 			app:cornerRadius="24dp"
 			app:rippleColor="@color/ripple_material_dark"
@@ -42,7 +50,7 @@
 			style="@style/Widget.MaterialComponents.Button.OutlinedButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="@string/Settings_Websites_Categories_Selection_None"
+			android:text="Deselect all tests"
 			android:textAllCaps="false"
 			app:cornerRadius="24dp"
 			app:rippleColor="@color/ripple_material_dark"
@@ -61,25 +69,22 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toBottomOf="@id/control_layout"
-		app:layout_constraintBottom_toTopOf="@+id/bottom_appbar_layout"
+		app:layout_constraintBottom_toBottomOf="parent"
 		tools:listitem="@layout/run_tests_group_list_item" />
 
-	<com.google.android.material.appbar.AppBarLayout
-		android:id="@+id/bottom_appbar_layout"
-		android:layout_width="match_parent"
+	<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+		android:id="@+id/fab_run_tests"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:text="Run Tests"
+		android:layout_marginBottom="@dimen/item_padding_large"
+		android:backgroundTint="@color/color_base"
+		android:textColor="@android:color/white"
+		android:textAllCaps="false"
+		app:icon="@drawable/outline_timer"
 		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
-		android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar.App.NoActionBar">
+		app:layout_constraintStart_toStartOf="parent"
+		app:iconTint="@android:color/white"/>
 
-		<androidx.appcompat.widget.Toolbar
-			android:id="@+id/bottomBar"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:background="@color/color_white"
-			app:menu="@menu/run"
-			app:title="@string/OONIRun_URLs"
-			app:titleTextAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title.App" />
-	</com.google.android.material.appbar.AppBarLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/run.xml b/app/src/main/res/menu/run.xml