From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/res/layout/activity_qr_code_main.xml | 76 +++++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/app/src/main/res/layout/activity_qr_code_main.xml b/app/src/main/res/layout/activity_qr_code_main.xml
index f4db81f..4fc4fce 100644
--- a/app/src/main/res/layout/activity_qr_code_main.xml
+++ b/app/src/main/res/layout/activity_qr_code_main.xml
@@ -4,43 +4,67 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_FFECECEC"
+ android:background="@color/text_FF000000"
tools:context=".ui.me.QrCodeMainActivity">
+<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
+<!-- android:layout_width="0dp"-->
+<!-- android:layout_height="0dp"-->
+<!-- android:background="@drawable/bj"-->
+<!-- app:layout_constraintBottom_toBottomOf="parent"-->
+<!-- app:layout_constraintEnd_toEndOf="parent"-->
+<!-- app:layout_constraintStart_toStartOf="parent"-->
+<!-- app:layout_constraintTop_toTopOf="parent" />-->
+
<include
- android:id="@+id/toolbar_top_qr_code_rl"
- layout="@layout/toolbar_top_view_44" />
-
-
- <ImageView
- android:id="@+id/qr_code_iv"
- android:layout_width="229dp"
- android:layout_height="229dp"
- android:layout_marginStart="38.5dp"
- android:layout_marginTop="65.5dp"
- android:layout_marginEnd="38.5dp"
+ android:id="@+id/toolbar_top_rl"
+ layout="@layout/toolbar_top_view_44"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_44"
+ android:layout_marginTop="@dimen/dp_38"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_qr_code_rl" />
+ app:layout_constraintTop_toTopOf="parent" />
+
+
+ <RelativeLayout
+ android:id="@+id/qr_code_box"
+ android:layout_width="180dp"
+ android:layout_height="180dp"
+ android:layout_marginStart="38.5dp"
+ android:layout_marginTop="35.5dp"
+ android:layout_marginEnd="38.5dp"
+ android:background="@drawable/code_box"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
+
+ <ImageView
+ android:id="@+id/qr_code_iv"
+ android:layout_width="168dp"
+ android:layout_height="168dp"
+ android:layout_centerInParent="true" />
+ </RelativeLayout>
+
<TextView
android:id="@+id/user_name_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
+ android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_14"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_18"
android:visibility="gone"
- app:layout_constraintEnd_toEndOf="@+id/qr_code_iv"
- app:layout_constraintStart_toStartOf="@+id/qr_code_iv"
- app:layout_constraintTop_toBottomOf="@+id/qr_code_iv" />
+ app:layout_constraintEnd_toEndOf="@+id/qr_code_box"
+ app:layout_constraintStart_toStartOf="@+id/qr_code_box"
+ app:layout_constraintTop_toBottomOf="@+id/qr_code_box" />
<TextView
android:id="@+id/user_account_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_16"
- android:textColor="@color/text_030D1C"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_8"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@+id/user_name_tv"
@@ -51,12 +75,12 @@
android:id="@+id/save_tv"
android:layout_width="158dp"
android:layout_height="@dimen/dp_52"
- android:layout_marginTop="@dimen/dp_16"
- android:background="@drawable/selected_8_38c494"
+ android:layout_marginTop="@dimen/dp_50"
+ android:background="@drawable/selected_8_ff39383d"
android:gravity="center"
android:text="@string/save_to_album"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_18"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="@+id/user_name_tv"
app:layout_constraintStart_toStartOf="@+id/user_name_tv"
app:layout_constraintTop_toBottomOf="@+id/user_account_tv" />
--
Gitblit v1.8.0