From 0f88e9d58bfbf4878e6f6cd1e9f86ede57d3dbe2 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Mon, 8 Jul 2024 16:31:41 +0200
Subject: [PATCH] feat(Profile): move QR-Code button next to follow

---
 .../fragments/ProfileQrCodeFragment.java      | 16 +-------
 .../src/main/res/layout/fragment_profile.xml  | 37 +++++++++++--------
 2 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileQrCodeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileQrCodeFragment.java
index acb79b7af..a27fe3eea 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileQrCodeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileQrCodeFragment.java
@@ -9,7 +9,6 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.DownloadManager;
-import android.app.ProgressDialog;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -33,13 +32,11 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.RemoteException;
 import android.os.SystemClock;
 import android.provider.MediaStore;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.ContextThemeWrapper;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -55,18 +52,7 @@ import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
-import com.google.android.gms.common.Feature;
-import com.google.android.gms.common.api.Status;
-import com.google.android.gms.common.moduleinstall.ModuleAvailabilityResponse;
-import com.google.android.gms.common.moduleinstall.ModuleInstallIntentResponse;
-import com.google.android.gms.common.moduleinstall.ModuleInstallResponse;
-import com.google.android.gms.common.moduleinstall.ModuleInstallStatusUpdate;
-import com.google.android.gms.common.moduleinstall.internal.ApiFeatureRequest;
-import com.google.android.gms.common.moduleinstall.internal.IModuleInstallCallbacks;
-import com.google.android.gms.common.moduleinstall.internal.IModuleInstallService;
-import com.google.android.gms.common.moduleinstall.internal.IModuleInstallStatusListener;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
 import com.google.zxing.WriterException;
@@ -218,7 +204,7 @@ public class ProfileQrCodeFragment extends AppKitFragment{
 		username.setText(account.username);
 		String accDomain=account.getDomain();
 		domain.setText(accountDomain=TextUtils.isEmpty(accDomain) ? AccountSessionManager.get(accountID).domain : accDomain);
-		//TODO: replace the app logo with the instance avatar
+		//TODO: replace the app logo with the instance avatar (https://github.com/mastodon/mastodon/pull/30205)
 		Drawable logo=getResources().getDrawable(R.drawable.ic_ntf_logo, themeWrapper.getTheme()).mutate();
 		logo.setTint(UiUtils.getThemeColor(themeWrapper, R.attr.colorM3OnPrimary));
 		codeView.setBackground(new FancyQrCodeDrawable(code, UiUtils.getThemeColor(themeWrapper, R.attr.colorM3OnPrimary), logo));
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index ab137e548..782aa7c08 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -92,20 +92,6 @@
 							android:layout_marginEnd="4dp"
 							android:layout_weight="1">
 
-							<ImageButton
-								android:id="@+id/qr_code"
-								android:layout_width="40dp"
-								android:layout_height="40dp"
-								android:layout_gravity="center_vertical"
-								style="@style/Widget.Mastodon.M3.Button.Outlined"
-								android:tint="?colorM3OnSurfaceVariant"
-								android:layout_marginStart="8dp"
-								android:layout_marginEnd="1.67dp"
-								android:contentDescription="@string/qr_code"
-								android:scaleType="centerCrop"
-								android:padding="9dp"
-								android:src="@drawable/ic_fluent_qr_code_24_filled"/>
-
 							<org.joinmastodon.android.ui.views.ProgressBarButton
 								android:id="@+id/notify_btn"
 								android:layout_width="48dp"
@@ -134,7 +120,7 @@
 							android:minHeight="48dp"
 							android:layout_marginTop="16dp"
 							android:layout_marginStart="4dp"
-							android:layout_marginEnd="16dp">
+							android:layout_marginEnd="4dp">
 
 							<org.joinmastodon.android.ui.views.ProgressBarButton
 								android:id="@+id/profile_action_btn"
@@ -156,6 +142,27 @@
 								android:outlineProvider="none"
 								android:visibility="gone" />
 						</FrameLayout>
+
+						<FrameLayout
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:minHeight="48dp"
+							android:layout_marginTop="16dp"
+							android:layout_marginEnd="16dp">
+
+							<ImageButton
+								android:id="@+id/qr_code"
+								android:layout_width="40dp"
+								android:layout_height="40dp"
+								android:layout_gravity="center_vertical"
+								style="@style/Widget.Mastodon.M3.Button.Outlined"
+								android:tint="?colorM3OnSurfaceVariant"
+								android:layout_marginStart="8dp"
+								android:padding="8dp"
+								android:contentDescription="@string/qr_code"
+								android:scaleType="centerCrop"
+								android:src="@drawable/ic_fluent_qr_code_24_filled"/>
+						</FrameLayout>
 					</LinearLayout>
 
 				</RelativeLayout>