|
|
@@ -123,14 +123,14 @@
|
|
|
|
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="24dp"
|
|
|
- android:layout_weight="1"
|
|
|
+ android:layout_height="70dp"
|
|
|
android:gravity="center"
|
|
|
android:orientation="vertical">
|
|
|
|
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="101dp"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_weight="1"
|
|
|
android:background="#fff"
|
|
|
android:orientation="horizontal">
|
|
|
|
|
|
@@ -159,8 +159,8 @@
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:gravity="center"
|
|
|
- android:textColor="#000"
|
|
|
- android:text="身高cm" />
|
|
|
+ android:text="身高cm"
|
|
|
+ android:textColor="#000" />
|
|
|
</LinearLayout>
|
|
|
</LinearLayout>
|
|
|
|
|
|
@@ -190,8 +190,8 @@
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:gravity="center"
|
|
|
- android:textColor="#000"
|
|
|
- android:text="年龄" />
|
|
|
+ android:text="年龄"
|
|
|
+ android:textColor="#000" />
|
|
|
</LinearLayout>
|
|
|
</LinearLayout>
|
|
|
|
|
|
@@ -220,8 +220,8 @@
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:gravity="center"
|
|
|
- android:textColor="#000"
|
|
|
- android:text="体重kg" />
|
|
|
+ android:text="体重kg"
|
|
|
+ android:textColor="#000" />
|
|
|
</LinearLayout>
|
|
|
</LinearLayout>
|
|
|
|
|
|
@@ -250,8 +250,8 @@
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:gravity="center"
|
|
|
- android:textColor="#000"
|
|
|
- android:text="静息心率" />
|
|
|
+ android:text="静息心率"
|
|
|
+ android:textColor="#000" />
|
|
|
</LinearLayout>
|
|
|
</LinearLayout>
|
|
|
</LinearLayout>
|
|
|
@@ -270,6 +270,13 @@
|
|
|
android:layout_weight="10"
|
|
|
android:orientation="vertical"></LinearLayout>
|
|
|
</LinearLayout>
|
|
|
+
|
|
|
+ <LinearLayout
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="match_parent"
|
|
|
+ android:layout_weight="1"
|
|
|
+ android:orientation="horizontal"></LinearLayout>
|
|
|
+
|
|
|
<com.google.android.material.bottomnavigation.BottomNavigationView
|
|
|
android:id="@+id/nav_view"
|
|
|
android:layout_width="match_parent"
|