notfire/moshidon
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

feat(Profile): move QR-Code button next to follow

Browse source
This commit is contained in:
FineFindus 2024-07-08 16:31:41 +02:00
parent 46772bd1c4
commit 0f88e9d58b
No known key found for this signature in database
GPG key ID: 64873EE210FF8E6B
2 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileQrCodeFragment.java
View file

@ -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));

37
mastodon/src/main/res/layout/fragment_profile.xml
View file

@ -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>