From 54d4414aaae8357d743e7d55c4219f151f9c2cbc Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Thu, 18 Jul 2024 20:43:41 +0200
Subject: [PATCH 1/2] add "copy invite link" button to QrShowFragment

---
 .../securesms/qr/QrShowFragment.java          |  2 ++
 src/main/res/layout/qr_show_fragment.xml      | 32 +++++++++++++++----
 src/main/res/values/strings.xml               |  1 +
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java b/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java
index 5c6c009dc..a168bd7a0 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java
@@ -86,6 +86,8 @@ public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDel
             e.printStackTrace();
         }
 
+        view.findViewById(R.id.copy_link_button).setOnClickListener((v) -> copyQrData());
+
         return view;
     }
 
diff --git a/src/main/res/layout/qr_show_fragment.xml b/src/main/res/layout/qr_show_fragment.xml
index e74cf1483..86f0723d7 100644
--- a/src/main/res/layout/qr_show_fragment.xml
+++ b/src/main/res/layout/qr_show_fragment.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
@@ -8,14 +10,32 @@
         android:id="@+id/background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:ignore="ContentDescription"
-        android:scaleType="centerCrop" />
+        android:scaleType="centerCrop"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription" />
 
 	<com.caverock.androidsvg.SVGImageView
 		android:id="@+id/qrImage"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
+        android:layout_height="0dp"
 		android:layout_gravity="center"
-		android:contentDescription="@string/qrscan_title" />
+        android:contentDescription="@string/qrscan_title"
+        app:layout_constraintBottom_toTopOf="@id/copy_link_button"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-</RelativeLayout>
+    <Button
+        android:id="@+id/copy_link_button"
+        style="@style/ButtonPrimary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:paddingLeft="24dp"
+        android:paddingRight="24dp"
+        android:text="@string/copy_invite_link"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5c297b4f7..3bca60f5a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -231,6 +231,7 @@
     <string name="menu_delete_location">Delete this Location?</string>
     <string name="menu_message_details">Message Info</string>
     <string name="menu_copy_to_clipboard">Copy to Clipboard</string>
+    <string name="copy_invite_link">Copy Invite Link</string>
     <string name="menu_copy_selection_to_clipboard">Copy Selection</string>
     <string name="menu_copy_link_to_clipboard">Copy Link</string>
     <string name="menu_copy_text_to_clipboard">Copy Text</string>

From bcce0184fd0cbe953ed1785cb85fd4dccbe4d8ae Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Tue, 30 Jul 2024 14:35:04 +0200
Subject: [PATCH 2/2] share instead of copy

---
 .../java/org/thoughtcrime/securesms/qr/QrShowFragment.java  | 2 +-
 src/main/res/layout/qr_show_fragment.xml                    | 6 +++---
 src/main/res/values/strings.xml                             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java b/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java
index a168bd7a0..3395db306 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java
@@ -86,7 +86,7 @@ public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDel
             e.printStackTrace();
         }
 
-        view.findViewById(R.id.copy_link_button).setOnClickListener((v) -> copyQrData());
+        view.findViewById(R.id.share_link_button).setOnClickListener((v) -> shareInviteURL());
 
         return view;
     }
diff --git a/src/main/res/layout/qr_show_fragment.xml b/src/main/res/layout/qr_show_fragment.xml
index 86f0723d7..99b06d5ae 100644
--- a/src/main/res/layout/qr_show_fragment.xml
+++ b/src/main/res/layout/qr_show_fragment.xml
@@ -21,19 +21,19 @@
         android:layout_height="0dp"
 		android:layout_gravity="center"
         android:contentDescription="@string/qrscan_title"
-        app:layout_constraintBottom_toTopOf="@id/copy_link_button"
+        app:layout_constraintBottom_toTopOf="@id/share_link_button"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
-        android:id="@+id/copy_link_button"
+        android:id="@+id/share_link_button"
         style="@style/ButtonPrimary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:paddingLeft="24dp"
         android:paddingRight="24dp"
-        android:text="@string/copy_invite_link"
+        android:text="@string/share_invite_link"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3bca60f5a..fd88b55b8 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -231,7 +231,7 @@
     <string name="menu_delete_location">Delete this Location?</string>
     <string name="menu_message_details">Message Info</string>
     <string name="menu_copy_to_clipboard">Copy to Clipboard</string>
-    <string name="copy_invite_link">Copy Invite Link</string>
+    <string name="share_invite_link">Share Invite Link</string>
     <string name="menu_copy_selection_to_clipboard">Copy Selection</string>
     <string name="menu_copy_link_to_clipboard">Copy Link</string>
     <string name="menu_copy_text_to_clipboard">Copy Text</string>