Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

 app/src/main/res/layout/fragment_house_list.xml

@@ -51,6 +51,7 @@
            android:layout_marginEnd="@dimen/dp_13"
            android:layout_toStartOf="@+id/add_iv"
            android:src="@drawable/edit"
            android:visibility="gone"

            />

@@ -170,7 +171,6 @@
                android:layout_height="@dimen/dp_17"
                android:layout_marginStart="@dimen/dp_16"
                android:layout_marginTop="@dimen/dp_21"
                android:layout_marginEnd="@dimen/dp_12"
                android:orientation="horizontal"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
@@ -178,10 +178,8 @@

                <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:orientation="horizontal">

                    <TextView
@@ -191,7 +189,9 @@
                        android:text="@string/station_name"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold" />
                        android:textStyle="bold"

                        />

                    <ImageView
                        android:id="@+id/station_name_iv"
@@ -199,15 +199,18 @@
                        android:layout_height="@dimen/dp_18"
                        android:layout_toEndOf="@+id/station_name_tv"
                        android:background="@drawable/ascending_descending_order_select" />

                    <View
                        android:layout_width="@dimen/dp_16"
                        android:layout_height="match_parent"
                        android:layout_toEndOf="@+id/station_name_iv" />
                </RelativeLayout>


                <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:orientation="horizontal">

                    <TextView
@@ -225,15 +228,18 @@
                        android:layout_height="@dimen/dp_18"
                        android:layout_toEndOf="@+id/station_power_tv"
                        android:background="@drawable/ascending_descending_order_select" />

                    <View
                        android:layout_width="@dimen/dp_16"
                        android:layout_height="match_parent"
                        android:layout_toEndOf="@+id/station_power_iv" />
                </RelativeLayout>


                <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:orientation="horizontal">

                    <TextView
@@ -251,15 +257,18 @@
                        android:layout_height="@dimen/dp_18"
                        android:layout_toEndOf="@+id/station_day_tv"
                        android:background="@drawable/ascending_descending_order_select" />

                    <View
                        android:layout_width="@dimen/dp_16"
                        android:layout_height="match_parent"
                        android:layout_toEndOf="@+id/station_day_iv" />
                </RelativeLayout>


                <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:orientation="horizontal">

                    <TextView