From e58e66125acccbd9b79573a520f9a6140bc47506 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 05 十一月 2024 13:23:22 +0800
Subject: [PATCH] 2024年11月05日13:23:06
---
app/src/main/res/layout/fragment_message.xml | 208 +++++++++++++++++++++++----------------------------
1 files changed, 93 insertions(+), 115 deletions(-)
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 20feb3f..beb5589 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -54,11 +54,12 @@
</RelativeLayout>
- <androidx.constraintlayout.widget.ConstraintLayout
+ <LinearLayout
android:id="@+id/message_cl"
android:layout_width="match_parent"
android:layout_height="98dp"
android:layout_marginTop="@dimen/dp_13"
+ android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/message_rl">
@@ -105,130 +106,107 @@
</RelativeLayout>
<!--鏉′欢绛涢��-->
- <RelativeLayout
- android:id="@+id/message_condition_screening_rl"
- android:layout_width="0dp"
+ <LinearLayout
+ android:id="@+id/message_tab_ll"
+ android:layout_width="match_parent"
android:layout_height="@dimen/dp_62"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/message_search_cl">
-
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:orientation="horizontal">
+ <!--鍏ㄩ儴璁惧-->
<LinearLayout
- android:id="@+id/message_tab_ll"
- android:layout_width="match_parent"
+ android:id="@+id/message_tab_all_device_cl"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginEnd="@dimen/dp_16"
+ android:gravity="center_vertical"
android:orientation="horizontal">
- <!--鍏ㄩ儴璁惧-->
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_all_device_cl"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:orientation="horizontal">
+ <TextView
+ android:id="@+id/all_device_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="@string/alarm_all_device"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_14" />
- <TextView
- android:id="@+id/all_device_title_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="@string/alarm_all_device"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_14" />
+ <View
+ android:layout_width="@dimen/dp_5"
+ android:layout_height="match_parent" />
- <View
- android:layout_width="@dimen/dp_5"
- android:layout_height="match_parent" />
+ <ImageView
+ android:id="@+id/all_device_title_iv"
+ android:layout_width="@dimen/dp_10"
+ android:layout_height="@dimen/dp_10"
+ android:layout_marginStart="@dimen/dp_0"
+ android:background="@drawable/down" />
- <ImageView
- android:id="@+id/all_device_title_iv"
- android:layout_width="@dimen/dp_10"
- android:layout_height="@dimen/dp_10"
- android:layout_marginStart="@dimen/dp_0"
- android:background="@drawable/down" />
-
- </LinearLayout>
-
-
- </androidx.constraintlayout.widget.ConstraintLayout>
- <!--鍏ㄩ儴绛夌骇-->
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_all_grade_cl"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/all_grade_title_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="@string/alarm_all_grade"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_14" />
-
- <View
- android:layout_width="5dp"
- android:layout_height="match_parent" />
-
- <ImageView
- android:id="@+id/all_grade_title_iv"
- android:layout_width="@dimen/dp_10"
- android:layout_height="@dimen/dp_10"
- android:layout_marginStart="@dimen/dp_0"
- android:background="@drawable/down" />
- </LinearLayout>
-
-
- </androidx.constraintlayout.widget.ConstraintLayout>
- <!--鍏ㄩ儴鏃堕棿-->
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_all_time_cl"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center_vertical|end"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/all_time_title_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="@string/alarm_all_time"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_14" />
-
- <View
- android:layout_width="@dimen/dp_5"
- android:layout_height="match_parent" />
-
- <ImageView
- android:id="@+id/all_time_title_iv"
- android:layout_width="@dimen/dp_10"
- android:layout_height="@dimen/dp_10"
- android:background="@drawable/down" />
- </LinearLayout>
-
-
- </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
- </RelativeLayout>
- </androidx.constraintlayout.widget.ConstraintLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+ <!--鍏ㄩ儴绛夌骇-->
+ <LinearLayout
+ android:id="@+id/message_tab_all_grade_cl"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/all_grade_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="@string/alarm_all_grade"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_14" />
+
+ <View
+ android:layout_width="5dp"
+ android:layout_height="match_parent" />
+
+ <ImageView
+ android:id="@+id/all_grade_title_iv"
+ android:layout_width="@dimen/dp_10"
+ android:layout_height="@dimen/dp_10"
+ android:layout_marginStart="@dimen/dp_0"
+ android:background="@drawable/down" />
+ </LinearLayout>
+
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+ <!--鍏ㄩ儴鏃堕棿-->
+ <LinearLayout
+ android:id="@+id/message_tab_all_time_cl"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical|end"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/all_time_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="@string/alarm_all_time"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_14" />
+
+ <View
+ android:layout_width="@dimen/dp_5"
+ android:layout_height="match_parent" />
+
+ <ImageView
+ android:id="@+id/all_time_title_iv"
+ android:layout_width="@dimen/dp_10"
+ android:layout_height="@dimen/dp_10"
+ android:background="@drawable/down" />
+ </LinearLayout>
+ </LinearLayout>
+
+ </LinearLayout>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
--
Gitblit v1.8.0