From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/res/layout/fragment_house_list.xml | 388 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 211 insertions(+), 177 deletions(-)
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 9ecfa9c..46fc52c 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -4,14 +4,15 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/house_list_parent"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="@color/text_FF000000">
<!--澶撮儴鏍囩-->
<RelativeLayout
android:id="@+id/title_cl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_31"
+ android:layout_height="@dimen/dp_44"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_44"
+ android:layout_marginTop="@dimen/dp_38"
android:layout_marginEnd="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -22,25 +23,22 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerVertical="true"
- android:gravity="center_vertical"
- android:text="Power Station"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_20"
- android:textStyle="bold" />
+ android:gravity="center"
+ android:text="@string/power_station"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_18" />
<TextView
android:id="@+id/device_label"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerVertical="true"
- android:layout_marginStart="@dimen/dp_21"
- android:layout_marginEnd="@dimen/dp_4"
- android:layout_toStartOf="@+id/edit_iv"
+ android:layout_marginStart="17dp"
android:layout_toEndOf="@+id/power_station_label"
- android:gravity="start|center_vertical"
- android:text="Equipment"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_16"
+ android:gravity="center"
+ android:text="@string/device"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14"
/>
@@ -51,20 +49,20 @@
android:layout_marginEnd="@dimen/dp_13"
android:layout_toStartOf="@+id/add_iv"
android:src="@drawable/edit"
-
- />
+ android:visibility="gone" />
<ImageView
android:id="@+id/add_iv"
android:layout_width="@dimen/dp_31"
android:layout_height="@dimen/dp_31"
android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
android:src="@drawable/add" />
</RelativeLayout>
<!--鐢电珯鏍囩-->
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/power_station_label_parent"
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -77,12 +75,15 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/power_station_label_top_cl"
android:layout_width="match_parent"
- android:layout_height="174dp"
- android:layout_marginTop="@dimen/dp_21">
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_13"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
<!--鎼滅储-->
<RelativeLayout
android:id="@+id/power_station_search_cl"
- android:layout_width="match_parent"
+ android:layout_width="0dp"
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
@@ -91,13 +92,15 @@
app:layout_constraintTop_toTopOf="parent">
<RelativeLayout
+ android:id="@+id/power_station_search_click_cl"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dp_17"
android:layout_toStartOf="@+id/power_station_default_condition_iv"
- android:background="@drawable/search_bj_edeff2">
+ android:background="@drawable/search_bj_ff1c1c1e">
<ImageView
+
android:id="@+id/power_station_search_iv"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
@@ -109,12 +112,12 @@
<TextView
android:id="@+id/power_station_search_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/power_station_search_iv"
- android:text="Search the power station"
- android:textColor="@color/text_40000000"
+ android:text="@string/search_station"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -124,168 +127,176 @@
android:layout_height="@dimen/dp_31"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
- android:src="@drawable/default_condition" />
+ android:src="@drawable/condition_screening" />
</RelativeLayout>
- <!--鏉′欢绛涢��-->
+
+ <!--鏉′欢绛涢�� 鍏ㄩ儴锛屾晠闅滐紝绂荤嚎锛屽緟鎺ュ叆-->
<LinearLayout
android:id="@+id/screening_condition_ll"
- android:layout_width="match_parent"
+ android:layout_width="0dp"
android:layout_height="@dimen/dp_56"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_21"
+ android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl">
-
+ <!--鍏ㄩ儴-->
<LinearLayout
- android:id="@+id/screening_condition_1"
+ android:id="@+id/all_ll"
android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
+ android:layout_height="match_parent"
android:background="@drawable/station_status_no_ffffff"
android:orientation="vertical">
<TextView
- android:id="@+id/screening_condition_number1_tv"
+ android:id="@+id/all_total_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8.5dp"
android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="0"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
<TextView
- android:id="@+id/screening_condition_text1_tv"
+ android:id="@+id/all_des_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
+ android:layout_height="wrap_content"
android:gravity="center"
- android:text="state"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
-
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="@string/message_all"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
</LinearLayout>
<View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
+ android:id="@+id/v1"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+ <!--鏁呴殰-->
<LinearLayout
- android:id="@+id/screening_condition_2"
+ android:id="@+id/faults_ll"
android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
+ android:layout_height="match_parent"
android:background="@drawable/station_status_no_ffffff"
android:orientation="vertical">
<TextView
- android:id="@+id/screening_condition_number2_tv"
+ android:id="@+id/faults_total_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8.5dp"
android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="0"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
<TextView
- android:id="@+id/screening_condition_text2_tv"
+ android:id="@+id/faults_des_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
+ android:layout_height="wrap_content"
android:gravity="center"
- android:text="state"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
-
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="@string/my_power_station_malfunction"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
</LinearLayout>
<View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
+ android:id="@+id/v2"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+ <!--绂荤嚎-->
<LinearLayout
- android:id="@+id/screening_condition_3"
+ android:id="@+id/offline_ll"
android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
+ android:layout_height="match_parent"
android:background="@drawable/station_status_no_ffffff"
android:orientation="vertical">
<TextView
- android:id="@+id/screening_condition_number3_tv"
+ android:id="@+id/offline_total_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8.5dp"
android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="0"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
<TextView
- android:id="@+id/screening_condition_text3_tv"
+ android:id="@+id/offline_des_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
+ android:layout_height="wrap_content"
android:gravity="center"
- android:text="state"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
-
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="@string/my_power_station_off_line"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
</LinearLayout>
<View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
+ android:id="@+id/v3"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+ <!--寰呮帴鍏�-->
<LinearLayout
- android:id="@+id/screening_condition_4"
+ android:id="@+id/connected_ll"
android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
+ android:layout_height="match_parent"
android:background="@drawable/station_status_no_ffffff"
android:orientation="vertical">
<TextView
- android:id="@+id/screening_condition_number4_tv"
+ android:id="@+id/connected_total_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8.5dp"
android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="0"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
<TextView
- android:id="@+id/screening_condition_text4_tv"
+ android:id="@+id/connected_des_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
+ android:layout_height="wrap_content"
android:gravity="center"
- android:text="state"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
-
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="@string/to_be_added"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
+
<!--鍗囧簭闄嶅簭鍔熻兘-->
<LinearLayout
android:id="@+id/ascending_order_descending_order_parent_ll"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_21"
- android:layout_marginEnd="@dimen/dp_12"
+ android:layout_marginTop="@dimen/dp_19"
+ android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -293,46 +304,51 @@
<RelativeLayout
android:id="@+id/station_name_rl"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center"
+ android:gravity="start"
android:orientation="horizontal">
<TextView
android:id="@+id/station_name_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="match_parent"
android:text="@string/station_name"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14"
+
+ />
<ImageView
android:id="@+id/station_name_iv"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
+ android:layout_centerVertical="true"
android:layout_toEndOf="@+id/station_name_tv"
android:background="@drawable/ascending_descending_order_select" />
+
+
</RelativeLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
<RelativeLayout
android:id="@+id/station_power_rl"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center"
+ android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<TextView
android:id="@+id/station_power_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="match_parent"
android:text="@string/generated_power"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/station_power_iv"
@@ -340,25 +356,28 @@
android:layout_height="@dimen/dp_18"
android:layout_toEndOf="@+id/station_power_tv"
android:background="@drawable/ascending_descending_order_select" />
+
</RelativeLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
<RelativeLayout
android:id="@+id/station_day_rl"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center"
+ android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<TextView
android:id="@+id/station_day_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="match_parent"
android:text="@string/day_power_generation"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/station_day_iv"
@@ -366,25 +385,29 @@
android:layout_height="@dimen/dp_18"
android:layout_toEndOf="@+id/station_day_tv"
android:background="@drawable/ascending_descending_order_select" />
+
+
</RelativeLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
<RelativeLayout
android:id="@+id/station_month_rl"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center"
+ android:gravity="end"
android:orientation="horizontal">
<TextView
android:id="@+id/station_month_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
- android:text="@string/month_power_generation"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
+ android:layout_height="match_parent"
+ android:text="@string/battery_capacity_indicator"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/station_month_iv"
@@ -394,15 +417,15 @@
android:background="@drawable/ascending_descending_order_select" />
</RelativeLayout>
-
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
android:id="@+id/fragment_house_srl"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="0dp"
+ android:layout_marginTop="10dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -413,14 +436,25 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:paddingBottom="@dimen/dp_16" />
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ android:paddingBottom="@dimen/dp_10" />
+ </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
+ <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+ <include
+ android:id="@+id/home_null_data_ic"
+ layout="@layout/null_data_view"
+ android:layout_width="match_parent"
+ android:layout_height="224dp"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/power_station_label_top_cl" />
- </LinearLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
<!--璁惧鏍囩-->
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/device_label_parent"
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -435,7 +469,10 @@
android:id="@+id/device_label_top_cl"
android:layout_width="match_parent"
android:layout_height="40dp"
- android:layout_marginTop="@dimen/dp_21">
+ android:layout_marginTop="@dimen/dp_13"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
<!--鎼滅储-->
<RelativeLayout
android:id="@+id/device_search_cl"
@@ -443,7 +480,7 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/search_bj_edeff2"
+ android:background="@drawable/search_bj_ff1c1c1e"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -460,53 +497,50 @@
<TextView
android:id="@+id/device_search_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/device_search_iv"
- android:text="Search the power station"
- android:textColor="@color/text_40000000"
+ android:text="@string/enter_the_device_sn_and_device_name"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_14" />
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
android:id="@+id/fragment_device_srl"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/power_station_label_top_cl">
+ app:layout_constraintTop_toBottomOf="@+id/device_label_top_cl">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fragment_device_srl_list_rc"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:paddingBottom="@dimen/dp_16" />
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ android:paddingBottom="@dimen/dp_10" />
+ </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
+
+ <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+ <include
+ android:id="@+id/device_null_data_ic"
+ layout="@layout/null_data_view"
+ android:layout_width="match_parent"
+ android:layout_height="224dp"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/device_label_top_cl"
+
+ />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
- </LinearLayout>
-
- <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
- <include
- android:id="@+id/null_data_ic"
- layout="@layout/null_data_view"
- android:layout_width="match_parent"
- android:layout_height="224dp"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0