Allow adding and removing tags

teambtcmap · Oct 25, 2022 · 7e67a29 · 7e67a29
1 parent 3ea990a
commit 7e67a29
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 5 deletions.
diff --git a/app/src/main/kotlin/tags/TagView.kt b/app/src/main/kotlin/tags/TagView.kt
@@ -20,9 +20,10 @@ class TagView : LinearLayout {
         WidgetTagBinding.inflate(LayoutInflater.from(context), this, true)
     }
 
+    var onDeleteListener: OnDeleteListener? = null
+
     init {
-        binding.name.text = null
-        binding.value.text = null
+        binding.delete.setOnClickListener { onDeleteListener?.onDelete(this) }
     }
 
     fun getValue(): Pair<String, String> {
@@ -33,4 +34,9 @@ class TagView : LinearLayout {
         binding.name.setText(name)
         binding.value.setText(value)
     }
+
+    fun interface OnDeleteListener {
+
+        fun onDelete(sender: TagView)
+    }
 }
diff --git a/app/src/main/kotlin/tags/TagsFragment.kt b/app/src/main/kotlin/tags/TagsFragment.kt
@@ -59,6 +59,16 @@ class TagsFragment : Fragment() {
 
         binding.toolbar.setNavigationOnClickListener { findNavController().popBackStack() }
 
+        binding.toolbar.setOnMenuItemClickListener { item ->
+            if (item.itemId == R.id.action_add_tag) {
+                val tagView = TagView(requireContext())
+                tagView.onDeleteListener = TagView.OnDeleteListener { binding.tagsContainer -= it }
+                binding.tagsContainer += tagView
+            }
+
+            true
+        }
+
         val elementId = TagsFragmentArgs.fromBundle(requireArguments()).elementId
 
         if (elementId.split(":").first() != "node") {
@@ -80,6 +90,7 @@ class TagsFragment : Fragment() {
         for (entry in tags) {
             val tagView = TagView(requireContext())
             tagView.setValue(entry.key, entry.value.jsonPrimitive.content)
+            tagView.onDeleteListener = TagView.OnDeleteListener { binding.tagsContainer -= it }
             binding.tagsContainer += tagView
         }
 
@@ -142,8 +153,13 @@ class TagsFragment : Fragment() {
                         val nodeVer = element.osm_json["version"]!!.jsonPrimitive.long
 
                         val tagsString =
-                            binding.tagsContainer.children.filterIsInstance<TagView>().map {
+                            binding.tagsContainer.children.filterIsInstance<TagView>().mapNotNull {
                                 val value = it.getValue()
+
+                                if (value.first.isBlank() || value.second.isBlank()) {
+                                    return@mapNotNull null
+                                }
+
                                 """<tag k="${value.first}" v="${value.second}" />"""
                             }.toList().joinToString("\n")
 

diff --git a/app/src/main/res/layout/fragment_tags.xml b/app/src/main/res/layout/fragment_tags.xml
@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
+        app:menu="@menu/tags"
         app:navigationIcon="?attr/homeAsUpIndicator"
         tools:title="Satoshi Bar" />
 
@@ -25,8 +26,7 @@
             android:id="@+id/tagsContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingHorizontal="16dp" />
+            android:orientation="vertical" />
 
     </ScrollView>
 
@@ -35,6 +35,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
+        android:paddingTop="8dp"
         android:layout_marginBottom="8dp"
         app:layout_constraintBottom_toTopOf="@id/upload">
 
@@ -52,6 +53,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
+        android:layout_marginBottom="8dp"
         android:text="@string/upload"
         app:layout_constraintBottom_toBottomOf="parent" />
 

diff --git a/app/src/main/res/layout/widget_tag.xml b/app/src/main/res/layout/widget_tag.xml
@@ -8,6 +8,7 @@
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
         android:layout_weight="1">
 
         <com.google.android.material.textfield.TextInputEditText
@@ -35,5 +36,19 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
+    <ImageView
+        android:id="@+id/delete"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:background="?selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:contentDescription="@string/delete_tag"
+        android:focusable="true"
+        android:padding="4dp"
+        android:src="@drawable/baseline_remove_24" />
+
 </LinearLayout>
 
diff --git a/app/src/main/res/menu/tags.xml b/app/src/main/res/menu/tags.xml
@@ -0,0 +1,10 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_add_tag"
+        android:icon="@drawable/baseline_add_24"
+        android:title="@string/add_tag"
+        app:showAsAction="ifRoom" />
+
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -64,6 +64,8 @@
     <string name="failed_to_create_a_changeset">Failed to create a changeset</string>
     <string name="failed_to_update_tags">Failed to update tags</string>
     <string name="ways_and_relations_are_not_supported">Ways and relations aren\'t supported</string>
+    <string name="add_tag">Add tag</string>
+    <string name="delete_tag">Delete tag</string>
     <plurals name="d_changes">
         <item quantity="zero">%d changes</item>
         <item quantity="one">%d change</item>