feat: (OONI Run V2) Add Cancel button on link install flow and Upda…

…te Add link button text to Install Link ooni/run#152 , ooni/run#149

app/src/main/java/org/openobservatory/ooniprobe/activity/adddescriptor/AddDescriptorActivity.kt

@@ -12,7 +12,6 @@ import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.viewModels
-import androidx.appcompat.widget.Toolbar
 import androidx.databinding.BindingAdapter
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
@@ -114,7 +113,7 @@ class AddDescriptorActivity : AbstractActivity() {
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(false)
         supportActionBar?.setDisplayShowHomeEnabled(false)
-        supportActionBar?.title = "Add New Link"
+        supportActionBar?.title = "Install New Link"
         val descriptorExtra = if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
             intent.getParcelableExtra(DESCRIPTOR, TestDescriptor::class.java)
         } else {
@@ -145,21 +144,17 @@ class AddDescriptorActivity : AbstractActivity() {
             for (i in 0 until adapter.groupCount) {
                 binding.expandableListView.expandGroup(i)
             }
-            val bottomBarOnMenuItemClickListener: Toolbar.OnMenuItemClickListener =
-                Toolbar.OnMenuItemClickListener { item ->
-                    when (item.itemId) {
-                        R.id.add_descriptor -> {
-                            viewModel.onAddButtonClicked(
-                                disabledAutorunNettests = adapter.nettests.filter { it.selected },
-                                automatedUpdates = binding.automaticUpdatesSwitch.isChecked
-                            )
-                            true
-                        }
-
-                        else -> false
-                    }
-                }
-            binding.bottomBar.setOnMenuItemClickListener(bottomBarOnMenuItemClickListener)
+
+            binding.btnInstallLink.setOnClickListener {
+                viewModel.onAddButtonClicked(
+                    disabledAutorunNettests = adapter.nettests.filter { it.selected },
+                    automatedUpdates = binding.automaticUpdatesSwitch.isChecked
+                )
+            }
+
+            binding.btnCancel.setOnClickListener {
+                finish()
+            }
 
             viewModel.selectedAllBtnStatus.observe(this) { state ->
                 binding.testsCheckbox.checkedState = state;

app/src/main/res/layout/activity_add_descriptor.xml

@@ -162,13 +162,37 @@
             android:layout_gravity="bottom"
             android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar.App.NoActionBar">
 
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/bottomBar"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="?attr/actionBarSize"
                 android:background="@color/color_gray0"
-                app:menu="@menu/add_descriptor"
-                app:titleTextAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title.App" />
+                android:gravity="center">
+
+                <Button
+                    android:id="@+id/btn_cancel"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/Modal_Cancel"
+                    android:textColor="@color/color_base" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2" />
+
+                <Button
+                    android:id="@+id/btn_install_link"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.5"
+                    android:elevation="0dp"
+                    android:text="Install Link"
+                    android:textColor="@color/color_base" />
+
+            </LinearLayout>
         </com.google.android.material.appbar.AppBarLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>