fengjingqi/Android-WaterProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新版本

Browse Source
This commit is contained in:
fengjignqi
2026-07-03 11:08:07 +08:00
parent d2610d5b61
commit 21d834d805
6 changed files with 146 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/layout/login_layout.xml
View File

@@ -19,12 +19,14 @@
android:id="@+id/btn_133"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="133"/>
android:text="133"
android:visibility="gone"/>
<Button
android:id="@+id/btn_151"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="151"/>
android:text="151"
android:visibility="gone"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

42
app/src/main/res/layout/water_count_fragment_layout.xml
View File

@@ -38,7 +38,7 @@
android:textSize="24sp"
android:textStyle="bold"
android:textColor="@color/color_222222"
android:text="190"/>
android:text=""/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -89,7 +89,7 @@
android:textSize="24sp"
android:textStyle="bold"
android:textColor="@color/color_222222"
android:text="190"/>
android:text=""/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -101,7 +101,7 @@
android:text="@string/unit_times"/>
</LinearLayout>
<TextView
android:id="@+id/tv_date"
android:id="@+id/tv_week_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
@@ -141,7 +141,7 @@
android:textSize="24sp"
android:textStyle="bold"
android:textColor="@color/color_222222"
android:text="190"/>
android:text=""/>
<TextView
android:id="@+id/tv_total_unit"
android:layout_width="wrap_content"
@@ -203,7 +203,7 @@
android:textSize="24sp"
android:textStyle="bold"
android:textColor="@color/color_222222"
android:text="190"/>
android:text=""/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -254,7 +254,7 @@
android:textSize="24sp"
android:textStyle="bold"
android:textColor="@color/color_222222"
android:text="190"/>
android:text=""/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -305,16 +305,32 @@
android:textSize="24sp"
android:textStyle="bold"
android:textColor="@color/color_222222"
android:text="190"/>
android:text=""/>
<TextView
android:id="@+id/tv_total_duration_hour_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/tv_total_duration_value"
android:layout_alignBottom="@+id/tv_total_duration_value"
android:textSize="12sp"
android:textStyle="bold"
android:textColor="@color/color_222222"
android:text="@string/unit_times"/>
android:text="h"/>
<TextView
android:id="@+id/tv_total_duration_min_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_14"
android:textSize="24sp"
android:textStyle="bold"
android:textColor="@color/color_222222"
android:text=""/>
<TextView
android:id="@+id/tv_total_duration_min_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
android:textStyle="bold"
android:textColor="@color/color_222222"
android:text="min"/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
@@ -365,8 +381,9 @@
android:textSize="24sp"
android:textStyle="bold"
android:textColor="@color/color_222222"
android:text="2"/>
android:text=""/>
<TextView
android:id="@+id/tv_average_hour_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
@@ -381,8 +398,9 @@
android:textSize="24sp"
android:textStyle="bold"
android:textColor="@color/color_222222"
android:text="30"/>
android:text=""/>
<TextView
android:id="@+id/tv_average_min_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"