From 162b597d4d66ecc0de0551a2de72e31588071ae7 Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <ryanzhaors@qq.com>
Date: Thu, 22 Apr 2021 15:52:01 +1000
Subject: [PATCH] enable cancelling editing nickname with simple UI

---
 .../conversation/ConversationActivity.java    |  8 ++++++++
 .../main/res/layout/conversation_activity.xml | 20 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index fa6f9869ba..bdd718f088 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -274,6 +274,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private   ImageView                   muteIndicatorImageView;
   private   TextView                    subtitleTextView;
   private   View                        homeButtonContainer;
+  private   View                        cancelButtonContainer;
 
   private   AttachmentTypeSelector attachmentTypeSelector;
   private   AttachmentManager      attachmentManager;
@@ -398,10 +399,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
             textView.setText(getRecipient().getName());
           }
           imm.hideSoftInputFromWindow(v.getWindowToken(),0);
+          cancelButtonContainer.setVisibility(View.GONE);
         } else {
           String nickname = DatabaseFactory.getStorage(this).getDisplayName(getRecipient().getAddress().serialize());
           titleTextView.setText(nickname);
           imm.showSoftInput(v, 0);
+          cancelButtonContainer.setVisibility(View.VISIBLE);
         }
       });
     }
@@ -1293,6 +1296,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     muteIndicatorImageView                 = ViewUtil.findById(this, R.id.muteIndicatorImageView);
     subtitleTextView                       = ViewUtil.findById(this, R.id.subtitleTextView);
     homeButtonContainer                    = ViewUtil.findById(this, R.id.homeButtonContainer);
+    cancelButtonContainer                  = ViewUtil.findById(this, R.id.cancelButtonContainer);
 
     ImageButton quickCameraToggle      = ViewUtil.findById(this, R.id.quick_camera_toggle);
     ImageButton inlineAttachmentButton = ViewUtil.findById(this, R.id.inline_attachment_button);
@@ -1338,6 +1342,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     inlineAttachmentButton.setOnClickListener(v -> handleAddAttachment());
 
     homeButtonContainer.setOnClickListener(v -> onSupportNavigateUp());
+
+    cancelButtonContainer.setOnClickListener(v -> {
+      titleTextView.clearFocus();
+    });
   }
 
   protected void initializeActionBar() {
diff --git a/app/src/main/res/layout/conversation_activity.xml b/app/src/main/res/layout/conversation_activity.xml
index 4b441491ff..d7389e7c34 100644
--- a/app/src/main/res/layout/conversation_activity.xml
+++ b/app/src/main/res/layout/conversation_activity.xml
@@ -99,6 +99,26 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1" />
 
+            <LinearLayout
+                android:id="@+id/cancelButtonContainer"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:clickable="true"
+                android:focusable="true"
+                android:visibility="gone">
+
+                <ImageView
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:src="@drawable/ic_baseline_clear_24"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginLeft="8dp" />
+
+            </LinearLayout>
+
+
+
         </LinearLayout>
 
     </androidx.appcompat.widget.Toolbar>