From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 1 Jun 2021 11:41:34 +0000 (+0800)
Subject: update ui.
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=05809c62c3b63cceb3e1211cd54165a44e588070;p=ichardware.git

update ui.
---

diff --git a/app/src/main/java/com/ic/sport/fragment/pedometer/PedRecordFragment.java b/app/src/main/java/com/ic/sport/fragment/pedometer/PedRecordFragment.java
index 2d7d383..347f93e 100644
--- a/app/src/main/java/com/ic/sport/fragment/pedometer/PedRecordFragment.java
+++ b/app/src/main/java/com/ic/sport/fragment/pedometer/PedRecordFragment.java
@@ -1,8 +1,10 @@
 package com.ic.sport.fragment.pedometer;
 
 import android.content.Context;
+import android.graphics.Rect;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -58,6 +60,12 @@ public class PedRecordFragment extends Fragment {
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_ped_record, container, false);
         mSetupRv = view.findViewById(R.id.ped_record_rv);
+        mSetupRv.addItemDecoration(new RecyclerView.ItemDecoration() {
+            @Override
+            public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
+                outRect.bottom = 10;
+            }
+        });
         initRecyclerView();
         queryListener.onQueryRecord();
         return view;
diff --git a/app/src/main/java/com/ic/sport/widget/WidgetImageTextLayout.java b/app/src/main/java/com/ic/sport/widget/WidgetImageTextLayout.java
index d233f25..fbb9709 100644
--- a/app/src/main/java/com/ic/sport/widget/WidgetImageTextLayout.java
+++ b/app/src/main/java/com/ic/sport/widget/WidgetImageTextLayout.java
@@ -40,7 +40,7 @@ public class WidgetImageTextLayout extends LinearLayout {
         mValueTv.setText(value);
         mUnitTv.setText(unit);
         mIconIv.setImageResource(iconResId);
-        mValueTv.setTextColor(color);
+        //mValueTv.setTextColor(color);
     }
 
     @BindingAdapter(value = {"widgetImageValue", "widgetImageUnit", "widgetImageIcon","widgetImageColor"}, requireAll = false)
diff --git a/app/src/main/res/drawable/shape_bg.xml b/app/src/main/res/drawable/shape_bg.xml
new file mode 100644
index 0000000..fa5cc21
--- /dev/null
+++ b/app/src/main/res/drawable/shape_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+
+    <solid android:color="#303233" />
+    <corners android:radius="10dp" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_ped_record.xml b/app/src/main/res/layout/fragment_ped_record.xml
index 0dd1d25..f4677c6 100644
--- a/app/src/main/res/layout/fragment_ped_record.xml
+++ b/app/src/main/res/layout/fragment_ped_record.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/bg"
     android:gravity="center_horizontal"
     android:orientation="vertical"
     tools:context=".fragment.pedometer.PedRecordFragment">
@@ -19,7 +18,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/ped_record_rv"
         android:layout_width="match_parent"
-        android:overScrollMode="never"
         android:layout_height="match_parent"
-        android:layout_marginTop="10dp" />
+        android:layout_marginBottom="20dp"
+        android:overScrollMode="never" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_ped_record.xml b/app/src/main/res/layout/item_ped_record.xml
index 5994ba5..a693a73 100644
--- a/app/src/main/res/layout/item_ped_record.xml
+++ b/app/src/main/res/layout/item_ped_record.xml
@@ -59,20 +59,22 @@
 
     </data>
 
-    <com.google.android.material.card.MaterialCardView
+    <LinearLayout
         style="@style/Widget.MaterialComponents.CardView"
         android:layout_width="match_parent"
-        android:layout_height="140dp"
-        android:layout_marginStart="5dp"
-        android:layout_marginEnd="5dp"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_bg"
+        android:orientation="vertical"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
         app:cardBackgroundColor="#303233"
         app:cardCornerRadius="5dp">
 
         <TextView
             android:id="@+id/item_record_date"
             style="@style/RecordTextStyle"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="20dp"
+            android:layout_width="match_parent"
+            android:gravity="center_horizontal"
             android:text="@{recordDate}"
             android:textColor="@color/white" />
 
@@ -80,9 +82,7 @@
             android:id="@+id/item_record_taking"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginStart="5dp"
-            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="30dp"
             icApp:widgetImageColor="@{takingColor}"
             icApp:widgetImageIcon="@{takingIcon}"
             icApp:widgetImageUnit="@{takingUnit}"
@@ -92,10 +92,7 @@
             android:id="@+id/item_record_calories"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginStart="5dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginEnd="5dp"
+            android:layout_marginLeft="30dp"
             icApp:widgetImageColor="@{caloriesColor}"
             icApp:widgetImageIcon="@{caloriesIcon}"
             icApp:widgetImageUnit="@{caloriesUnit}"
@@ -106,13 +103,11 @@
             android:id="@+id/item_record_distance"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
-            android:layout_marginEnd="5dp"
-            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="30dp"
             icApp:widgetImageColor="@{distanceColor}"
             icApp:widgetImageIcon="@{distanceIcon}"
             icApp:widgetImageUnit="@{distanceUnit}"
             icApp:widgetImageValue="@{recordDistance}" />
 
-    </com.google.android.material.card.MaterialCardView>
+    </LinearLayout>
 </layout>
diff --git a/app/src/main/res/layout/widget_image_text_layout.xml b/app/src/main/res/layout/widget_image_text_layout.xml
index 8347291..fb5d733 100644
--- a/app/src/main/res/layout/widget_image_text_layout.xml
+++ b/app/src/main/res/layout/widget_image_text_layout.xml
@@ -13,7 +13,7 @@
     <TextView
         android:id="@+id/widget_image_value"
         style="@style/RecordTextStyle"
-        android:layout_marginStart="2dp"
+        android:layout_marginStart="5dp"
         android:textColor="@color/white" />
 
     <TextView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 38d6df1..fea0f48 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,7 +14,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textColor">#FFFFFF</item>
-        <item name="android:textSize">24sp</item>
+        <item name="android:textSize">30sp</item>
         <item name="android:includeFontPadding">false</item>
     </style>