Add a reset button to the port configuration UI

Author: pimterry

app/src/main/java/tech/httptoolkit/android/PortListActivity.kt

@@ -2,15 +2,11 @@ package tech.httptoolkit.android
 
 import android.content.Intent
 import android.os.Bundle
-import android.view.KeyEvent
-import android.widget.TextView
+import android.widget.PopupMenu
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.widget.doAfterTextChanged
-import kotlinx.android.synthetic.main.item_port_row.view.*
 import kotlinx.android.synthetic.main.ports_list.*
 import kotlinx.coroutines.*
-import java.util.HashSet
-import kotlin.collections.ArrayList
 
 val DEFAULT_PORTS = setOf(
     80, // HTTP
@@ -42,16 +38,40 @@ class PortListActivity : AppCompatActivity(), CoroutineScope by MainScope() {
 
         ports_list_input.filters = arrayOf(MinMaxInputFilter(MIN_PORT, MAX_PORT))
 
+        // Match the UI enabled state to the input field contents:
         ports_list_add_button.isEnabled = false
         ports_list_input.doAfterTextChanged {
             ports_list_add_button.isEnabled = isValidInput(it.toString())
         }
 
+        // Add ports when enter/+ is pressed/clicked:
         ports_list_add_button.setOnClickListener { addEnteredPort() }
         ports_list_input.setOnEditorActionListener { _, _, _ ->
             addEnteredPort()
             return@setOnEditorActionListener true
         }
+
+        // Show the menu, and listen for clicks:
+        ports_list_more_menu.setOnClickListener {
+            PopupMenu(this, ports_list_more_menu).apply {
+                this.inflate(R.menu.menu_ports_list)
+
+                this.menu.findItem(R.id.action_reset_ports).isEnabled =
+                    ports != DEFAULT_PORTS
+
+                this.setOnMenuItemClickListener {
+                    when (it.itemId) {
+                        R.id.action_reset_ports -> {
+                            ports.clear()
+                            ports.addAll(DEFAULT_PORTS)
+                            updateList()
+                            true
+                        }
+                        else -> false
+                    }
+                }
+            }.show()
+        }
     }
 
     private fun isValidInput(input: String): Boolean =

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

@@ -31,15 +31,27 @@
                     android:textSize="18sp"
                     android:importantForAutofill="no"
                     android:inputType="number" />
+
             <ImageView
                     android:id="@+id/ports_list_add_button"
                     style="@style/Widget.AppCompat.ActionButton"
                     android:padding="16dp"
+                    android:paddingEnd="8dp"
                     android:src="@drawable/ic_add"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:minWidth="0dp"
-                    android:minHeight="0dp" />
+                    android:minHeight="0dp"
+                    tools:ignore="ContentDescription,RtlSymmetry" />
+
+            <ImageView
+                    android:id="@+id/ports_list_more_menu"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp"
+                    android:paddingStart="8dp"
+                    app:srcCompat="@drawable/ic_baseline_more_vert_24"
+                    tools:ignore="ContentDescription,RtlSymmetry" />
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 

app/src/main/res/menu/menu_ports_list.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+            android:id="@+id/action_reset_ports"
+            android:title="@string/reset_to_default_ports" />
+</menu>

app/src/main/res/values/strings.xml

@@ -51,4 +51,5 @@
     <string name="selected_ports">Custom ports</string>
     <string name="few_ports">%s port%s</string>
     <string name="add_port_prompt">Add another port</string>
+    <string name="reset_to_default_ports">Reset to default ports</string>
 </resources>