From 572e05ea7dc60efc7721809b5155c1e01a78913a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 22 十月 2024 18:07:24 +0800
Subject: [PATCH] 三星折叠屏显示界面不全修复
---
app/src/main/res/layout/activity_as_regards.xml | 394 +++++++++++++++++++++++++++++---------------------------
1 files changed, 205 insertions(+), 189 deletions(-)
diff --git a/app/src/main/res/layout/activity_as_regards.xml b/app/src/main/res/layout/activity_as_regards.xml
index a334785..ca00d89 100644
--- a/app/src/main/res/layout/activity_as_regards.xml
+++ b/app/src/main/res/layout/activity_as_regards.xml
@@ -11,215 +11,231 @@
android:id="@+id/toolbar_top_rl"
layout="@layout/toolbar_top_view_44" />
- <ImageView
- android:id="@+id/as_regards_icon_iv"
- android:layout_width="53.5dp"
- android:layout_height="53.5dp"
- android:layout_marginTop="@dimen/dp_29"
- android:src="@drawable/logo"
+ <androidx.core.widget.NestedScrollView
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:fillViewport="true"
+ android:overScrollMode="never"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl" />
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
- <TextView
- android:id="@+id/as_regards_icon_versions_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_12"
- android:text="@string/app_version_number"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_14"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_iv" />
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <ImageView
- android:id="@+id/as_regards_qr_code_iv"
- android:layout_width="168dp"
- android:layout_height="168dp"
- android:layout_marginTop="@dimen/dp_34"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_versions_tv" />
-
- <TextView
- android:id="@+id/as_regards_download_app_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_12"
- android:text="@string/app_scan_code_download"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_14"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/as_regards_qr_code_iv" />
- <!--鐗堟湰鏇存柊-->
- <RelativeLayout
- android:id="@+id/as_regards_version_updating_rl"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_57"
- android:layout_marginTop="@dimen/dp_29"
- android:background="@color/text_FFFFFFFF"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/as_regards_download_app_tv">
-
- <TextView
- android:id="@+id/as_regards_version_updating_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_21"
- android:layout_centerVertical="true"
- android:layout_marginStart="@dimen/dp_16"
- android:text="@string/app_version_upgrade"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_15"
-
- />
-
- <LinearLayout
- android:id="@+id/as_regards_version_updating_ll"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/dp_13">
- <!--鏍囧噯鍥炬爣-->
<ImageView
- android:id="@+id/as_regards_rl_ll_right_next_iv"
- android:layout_width="@dimen/dp_16"
- android:layout_height="@dimen/dp_16"
- android:src="@drawable/next" />
- </LinearLayout>
+ android:id="@+id/as_regards_icon_iv"
+ android:layout_width="53.5dp"
+ android:layout_height="53.5dp"
+ android:layout_marginTop="@dimen/dp_29"
+ android:src="@drawable/logo"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
- <TextView
- android:id="@+id/as_regards_rl_right_content_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_21"
- android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/dp_9"
- android:layout_toStartOf="@+id/as_regards_version_updating_ll"
- android:text="@string/app_new_version"
- android:textColor="@color/text_7C8590"
- android:textSize="@dimen/text_15" />
+ <TextView
+ android:id="@+id/as_regards_icon_versions_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_12"
+ android:text="@string/app_version_number"
+ android:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_14"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_iv" />
- </RelativeLayout>
- <!--鏈嶅姟鍗忚-->
- <RelativeLayout
- android:id="@+id/service_agreement_rl"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_57"
- android:background="@color/text_FFFFFFFF"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/as_regards_version_updating_rl">
-
- <TextView
- android:id="@+id/service_agreement_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_21"
- android:layout_centerVertical="true"
- android:layout_marginStart="@dimen/dp_16"
- android:text="@string/app_service_agreement"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_15"
-
- />
-
- <LinearLayout
- android:id="@+id/service_agreement_ll"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/dp_13">
- <!--鏍囧噯鍥炬爣-->
<ImageView
- android:id="@+id/service_agreement_ll_right_next_iv"
- android:layout_width="@dimen/dp_16"
- android:layout_height="@dimen/dp_16"
- android:src="@drawable/next" />
- </LinearLayout>
+ android:id="@+id/as_regards_qr_code_iv"
+ android:layout_width="168dp"
+ android:layout_height="168dp"
+ android:layout_marginTop="@dimen/dp_34"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_versions_tv" />
+
+ <TextView
+ android:id="@+id/as_regards_download_app_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_12"
+ android:text="@string/app_scan_code_download"
+ android:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_14"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/as_regards_qr_code_iv" />
+ <!--鐗堟湰鏇存柊-->
+ <RelativeLayout
+ android:id="@+id/as_regards_version_updating_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_57"
+ android:layout_marginTop="@dimen/dp_29"
+ android:background="@color/text_FFFFFFFF"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/as_regards_download_app_tv">
+
+ <TextView
+ android:id="@+id/as_regards_version_updating_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_21"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_16"
+ android:text="@string/app_version_upgrade"
+ android:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_15"
+
+ />
+
+ <LinearLayout
+ android:id="@+id/as_regards_version_updating_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_13">
+ <!--鏍囧噯鍥炬爣-->
+ <ImageView
+ android:id="@+id/as_regards_rl_ll_right_next_iv"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:src="@drawable/next" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/as_regards_rl_right_content_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_21"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_9"
+ android:layout_toStartOf="@+id/as_regards_version_updating_ll"
+ android:text="@string/app_new_version"
+ android:textColor="@color/text_7C8590"
+ android:textSize="@dimen/text_15" />
+
+ </RelativeLayout>
+ <!--鏈嶅姟鍗忚-->
+ <RelativeLayout
+ android:id="@+id/service_agreement_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_57"
+ android:background="@color/text_FFFFFFFF"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/as_regards_version_updating_rl">
+
+ <TextView
+ android:id="@+id/service_agreement_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_21"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_16"
+ android:text="@string/app_service_agreement"
+ android:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_15"
+
+ />
+
+ <LinearLayout
+ android:id="@+id/service_agreement_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_13">
+ <!--鏍囧噯鍥炬爣-->
+ <ImageView
+ android:id="@+id/service_agreement_ll_right_next_iv"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:src="@drawable/next" />
+ </LinearLayout>
- </RelativeLayout>
- <!--闅愮鏀跨瓥-->
- <RelativeLayout
- android:id="@+id/privacy_policy_rl"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_57"
- android:background="@color/text_FFFFFFFF"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/service_agreement_rl">
+ </RelativeLayout>
+ <!--闅愮鏀跨瓥-->
+ <RelativeLayout
+ android:id="@+id/privacy_policy_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_57"
+ android:background="@color/text_FFFFFFFF"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/service_agreement_rl">
- <TextView
- android:id="@+id/privacy_policy_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_21"
- android:layout_centerVertical="true"
- android:layout_marginStart="@dimen/dp_16"
- android:text="@string/app_privacy_policy"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_15"
+ <TextView
+ android:id="@+id/privacy_policy_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_21"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_16"
+ android:text="@string/app_privacy_policy"
+ android:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_15"
- />
+ />
- <LinearLayout
- android:id="@+id/privacy_policy_ll"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/dp_13">
- <!--鏍囧噯鍥炬爣-->
- <ImageView
- android:id="@+id/privacy_policy_ll_right_next_iv"
- android:layout_width="@dimen/dp_16"
- android:layout_height="@dimen/dp_16"
- android:src="@drawable/next" />
- </LinearLayout>
+ <LinearLayout
+ android:id="@+id/privacy_policy_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_13">
+ <!--鏍囧噯鍥炬爣-->
+ <ImageView
+ android:id="@+id/privacy_policy_ll_right_next_iv"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:src="@drawable/next" />
+ </LinearLayout>
- </RelativeLayout>
- <!--鑱旂郴鎴戜滑-->
- <RelativeLayout
- android:id="@+id/contact_us_rl"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_57"
- android:background="@color/text_FFFFFFFF"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/privacy_policy_rl">
+ </RelativeLayout>
+ <!--鑱旂郴鎴戜滑-->
+ <RelativeLayout
+ android:id="@+id/contact_us_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_57"
+ android:background="@color/text_FFFFFFFF"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/privacy_policy_rl">
- <TextView
- android:id="@+id/contact_us_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_21"
- android:layout_centerVertical="true"
- android:layout_marginStart="@dimen/dp_16"
- android:text="@string/contact_us"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_15"
+ <TextView
+ android:id="@+id/contact_us_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_21"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_16"
+ android:text="@string/contact_us"
+ android:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_15"
- />
+ />
- <LinearLayout
- android:id="@+id/contact_us_ll"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/dp_13">
- <!--鏍囧噯鍥炬爣-->
- <ImageView
- android:id="@+id/contact_us_ll_right_next_iv"
- android:layout_width="@dimen/dp_16"
- android:layout_height="@dimen/dp_16"
- android:src="@drawable/next" />
- </LinearLayout>
+ <LinearLayout
+ android:id="@+id/contact_us_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_13">
+ <!--鏍囧噯鍥炬爣-->
+ <ImageView
+ android:id="@+id/contact_us_ll_right_next_iv"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:src="@drawable/next" />
+ </LinearLayout>
- </RelativeLayout>
+ </RelativeLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.core.widget.NestedScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0