From e12bbe943b0d93d8d96f57ae07a91e4e23759de1 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 27 Jan 2023 17:28:05 -0500
Subject: [PATCH] Restore the 3-dot menu when creating a PIN.

---
 .../securesms/lock/v2/BaseKbsPinFragment.java | 23 +++++++++++--------
 .../main/res/layout/base_kbs_pin_fragment.xml | 11 +++++++--
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinFragment.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinFragment.java
index 8655a2ab9c..41a410c12b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinFragment.java
@@ -17,6 +17,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 import org.thoughtcrime.securesms.LoggingFragment;
 import org.thoughtcrime.securesms.R;
@@ -73,6 +75,10 @@ public abstract class BaseKbsPinFragment<ViewModel extends BaseKbsPinViewModel>
       CommunicationActions.openBrowserLink(requireContext(), getString(R.string.BaseKbsPinFragment__learn_more_url));
     });
 
+    Toolbar toolbar = view.findViewById(R.id.kbs_pin_toolbar);
+    ((AppCompatActivity) requireActivity()).setSupportActionBar(toolbar);
+    ((AppCompatActivity) requireActivity()).getSupportActionBar().setTitle(null);
+
     initializeListeners();
   }
 
@@ -100,16 +106,15 @@ public abstract class BaseKbsPinFragment<ViewModel extends BaseKbsPinViewModel>
 
   @Override
   public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-    switch (item.getItemId()) {
-      case R.id.menu_pin_learn_more:
-        onLearnMore();
-        return true;
-      case R.id.menu_pin_skip:
-        onPinSkipped();
-        return true;
+    if (item.getItemId() == R.id.menu_pin_learn_more) {
+      onLearnMore();
+      return true;
+    } else if (item.getItemId() == R.id.menu_pin_skip) {
+      onPinSkipped();
+      return true;
+    } else {
+      return false;
     }
-
-    return false;
   }
 
   protected abstract ViewModel initializeViewModel();
diff --git a/app/src/main/res/layout/base_kbs_pin_fragment.xml b/app/src/main/res/layout/base_kbs_pin_fragment.xml
index da0a522584..0896a17311 100644
--- a/app/src/main/res/layout/base_kbs_pin_fragment.xml
+++ b/app/src/main/res/layout/base_kbs_pin_fragment.xml
@@ -12,17 +12,24 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/kbs_pin_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toStartOf="parent" />
+
         <TextView
             android:id="@+id/edit_kbs_pin_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
-            android:layout_marginTop="32dp"
+            android:layout_marginTop="0dp"
             android:layout_marginEnd="24dp"
             android:textAppearance="@style/Signal.Text.HeadlineMedium"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/kbs_pin_toolbar"
             tools:text="@string/CreateKbsPinFragment__create_your_pin" />
 
         <org.thoughtcrime.securesms.util.views.LearnMoreTextView