From a5b95bc8e094f7f00d4eafec0537f671203e0374 Mon Sep 17 00:00:00 2001
From: TrillGates <williamtrillgates@gmail.com>
Date: Wed, 30 Jun 2021 10:22:44 +0800
Subject: [PATCH] adjust sport record UI

---
 .../ic/sport/adapter/PedRecordAdapter.java    |  18 +++---
 .../fragment/pedometer/PedRecordFragment.java |   3 +-
 .../ic/sport/widget/ring/RingProgress.java    |  41 +++++++------
 .../main/res/layout/activity_pedometer.xml    |  26 ++++++++-
 app/src/main/res/layout/fragment_ped_main.xml |  54 ++++++++----------
 .../main/res/layout/fragment_ped_record.xml   |  23 ++------
 app/src/main/res/layout/item_ped_record.xml   |  30 +++++-----
 app/src/main/res/mipmap-mdpi/icon_arrow.png   | Bin 0 -> 2655 bytes
 .../main/res/mipmap-mdpi/icon_calorie_big.png | Bin 0 -> 1492 bytes
 .../res/mipmap-mdpi/icon_calorie_small.png    | Bin 0 -> 1566 bytes
 app/src/main/res/mipmap-mdpi/icon_height.png  | Bin 0 -> 3233 bytes
 app/src/main/res/mipmap-mdpi/icon_line.png    | Bin 0 -> 1640 bytes
 .../main/res/mipmap-mdpi/icon_step_green.png  | Bin 0 -> 1370 bytes
 .../main/res/mipmap-mdpi/icon_step_white.png  | Bin 0 -> 1423 bytes
 app/src/main/res/mipmap-mdpi/icon_target.png  | Bin 0 -> 4750 bytes
 app/src/main/res/mipmap-mdpi/icon_weight.png  | Bin 0 -> 3167 bytes
 app/src/main/res/values/colors.xml            |   4 +-
 app/src/main/res/values/styles.xml            |   6 +-
 18 files changed, 106 insertions(+), 99 deletions(-)
 create mode 100644 app/src/main/res/mipmap-mdpi/icon_arrow.png
 create mode 100644 app/src/main/res/mipmap-mdpi/icon_calorie_big.png
 create mode 100644 app/src/main/res/mipmap-mdpi/icon_calorie_small.png
 create mode 100644 app/src/main/res/mipmap-mdpi/icon_height.png
 create mode 100644 app/src/main/res/mipmap-mdpi/icon_line.png
 create mode 100644 app/src/main/res/mipmap-mdpi/icon_step_green.png
 create mode 100644 app/src/main/res/mipmap-mdpi/icon_step_white.png
 create mode 100644 app/src/main/res/mipmap-mdpi/icon_target.png
 create mode 100644 app/src/main/res/mipmap-mdpi/icon_weight.png

diff --git a/app/src/main/java/com/ic/sport/adapter/PedRecordAdapter.java b/app/src/main/java/com/ic/sport/adapter/PedRecordAdapter.java
index c48ce5b..a5d7df7 100644
--- a/app/src/main/java/com/ic/sport/adapter/PedRecordAdapter.java
+++ b/app/src/main/java/com/ic/sport/adapter/PedRecordAdapter.java
@@ -20,12 +20,12 @@ public class PedRecordAdapter extends RecyclerView.Adapter<PedRecordAdapter.Reco
     private Context mContext;
     private List<RecordParcelable> mPedRecord;
 
-    public PedRecordAdapter(Context context){
+    public PedRecordAdapter(Context context) {
         this.mContext = context;
         this.mPedRecord = new ArrayList<>();
     }
 
-    public void updatePedRecordList(List<RecordParcelable> records){
+    public void updatePedRecordList(List<RecordParcelable> records) {
         mPedRecord.clear();
         mPedRecord.addAll(records);
         notifyDataSetChanged();
@@ -34,12 +34,14 @@ public class PedRecordAdapter extends RecyclerView.Adapter<PedRecordAdapter.Reco
     @NonNull
     @Override
     public RecordHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new RecordHolder(ItemPedRecordBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
+        return new RecordHolder(ItemPedRecordBinding.
+                inflate(LayoutInflater.from(parent.getContext()),
+                        parent, false));
     }
 
     @Override
     public void onBindViewHolder(@NonNull RecordHolder holder, int position) {
-        holder.bindPedRecord(mContext,mPedRecord.get(position));
+        holder.bindPedRecord(mContext, mPedRecord.get(position));
     }
 
     @Override
@@ -55,20 +57,20 @@ public class PedRecordAdapter extends RecyclerView.Adapter<PedRecordAdapter.Reco
             binding = itemView;
         }
 
-        public void bindPedRecord(Context context,RecordParcelable entity) {
+        public void bindPedRecord(Context context, RecordParcelable entity) {
             if (binding == null || entity == null) {
                 return;
             }
 
-            binding.setTakingIcon(R.mipmap.step);
+            binding.setTakingIcon(R.mipmap.icon_step_green);
             binding.setTakingColor(Color.parseColor("#FFA500"));
             binding.setTakingUnit(context.getString(R.string.tips_target_unit));
 
-            binding.setCaloriesIcon(R.mipmap.calorie);
+            binding.setCaloriesIcon(R.mipmap.icon_calorie_small);
             binding.setCaloriesColor(Color.WHITE);
             binding.setCaloriesUnit(context.getString(R.string.tips_calories_unit));
 
-            binding.setDistanceIcon(R.mipmap.map);
+            binding.setDistanceIcon(R.mipmap.icon_line);
             binding.setDistanceColor(Color.WHITE);
             binding.setDistanceUnit(context.getString(R.string.tips_distance_unit));
 
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 b7b0df8..e8a6746 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
@@ -65,7 +65,8 @@ public class PedRecordFragment extends Fragment {
             public void getItemOffsets(@NonNull Rect outRect, @NonNull View view,
                                        @NonNull RecyclerView parent,
                                        @NonNull RecyclerView.State state) {
-                outRect.bottom = 10;
+                outRect.bottom = 2;
+                outRect.top = 2;
             }
         });
         initRecyclerView();
diff --git a/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java b/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java
index bef0aec..cf7b472 100644
--- a/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java
+++ b/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java
@@ -7,6 +7,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.LinearGradient;
@@ -34,6 +35,7 @@ import com.ic.sport.util.AndroidUtils;
 public class RingProgress extends View {
     public boolean isDebug = true;
     private OnRingProgressInter onRingProgressInter;
+    private Bitmap topIcon;
 
     public interface OnRingProgressInter {
         void progress(float scaleProgress, float progress, float max);
@@ -59,7 +61,7 @@ public class RingProgress extends View {
     //圆环进度过度颜色
 //    private int ringProgressSecondColor;
     //开始角度
-    private int startAngle = -45;
+    private int startAngle = 0;
     //是否顺时针
     private boolean isClockwise = true;
     //当前进度
@@ -120,14 +122,14 @@ public class RingProgress extends View {
         TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.CircleProgress);
         neiYuanColor = typedArray.getColor(R.styleable.CircleProgress_neiYuanColor, getTransparentColor());
         ringRadius = (int) typedArray.getDimension(R.styleable.CircleProgress_ringRadius, -1);
-        ringWidth = (int) typedArray.getDimension(R.styleable.CircleProgress_ringWidth, 30);
+        ringWidth = (int) typedArray.getDimension(R.styleable.CircleProgress_ringWidth, 22);
         ringColor = typedArray.getColor(R.styleable.CircleProgress_ringColor,
                 ContextCompat.getColor(getContext(), R.color.top_color2));
         ringProgressColor = typedArray.getColor(R.styleable.CircleProgress_ringProgressColor,
                 ContextCompat.getColor(getContext(), R.color.green1));
-        startAngle = typedArray.getInteger(R.styleable.CircleProgress_startAngle, 135);
-        isClockwise = typedArray.getBoolean(R.styleable.CircleProgress_isClockwise, false);
-        progress = typedArray.getFloat(R.styleable.CircleProgress_progress, 10);
+        startAngle = typedArray.getInteger(R.styleable.CircleProgress_startAngle, -90);
+        isClockwise = typedArray.getBoolean(R.styleable.CircleProgress_isClockwise, true);
+        progress = typedArray.getFloat(R.styleable.CircleProgress_progress, 100);
         maxProgress = typedArray.getFloat(R.styleable.CircleProgress_maxProgress, 100);
 
         if (maxProgress <= 0) {
@@ -142,7 +144,7 @@ public class RingProgress extends View {
         scaleProgress = progress;
         viewProgress = progress * viewMax / maxProgress;
 
-        disableAngle = typedArray.getInteger(R.styleable.CircleProgress_disableAngle, 90);
+        disableAngle = typedArray.getInteger(R.styleable.CircleProgress_disableAngle, 0);
         isRound = typedArray.getBoolean(R.styleable.CircleProgress_isRound, true);
         useAnimation = typedArray.getBoolean(R.styleable.CircleProgress_useAnimation, true);
         duration = typedArray.getInteger(R.styleable.CircleProgress_duration, 1000);
@@ -152,7 +154,6 @@ public class RingProgress extends View {
         textColor = typedArray.getColor(R.styleable.CircleProgress_textColor, ContextCompat.getColor(getContext(), R.color.green1));
         textSize = (int) typedArray.getDimension(R.styleable.CircleProgress_textSize, getDef_TextSize());
         typedArray.recycle();
-//        initData();
     }
 
     private int getTransparentColor() {
@@ -180,6 +181,9 @@ public class RingProgress extends View {
         ringProgressColor = ContextCompat.getColor(getContext(), R.color.green1);
         textSize = dip2px(getContext(), 17);
         textColor = ContextCompat.getColor(getContext(), R.color.green1);
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inScaled = false;
+        topIcon = BitmapFactory.decodeResource(getResources(), R.mipmap.icon_arrow, options);
     }
 
     @Override
@@ -227,6 +231,14 @@ public class RingProgress extends View {
         if (isShowPercentText) {
             drawProgressText(canvas);
         }
+        //绘制顶部图标
+        drawTopIcon(canvas);
+    }
+
+    private void drawTopIcon(Canvas canvas) {
+        int left = centerX - topIcon.getWidth() / 2;
+        int top = centerY - topIcon.getHeight() / 2 - ringRadius;
+        canvas.drawBitmap(topIcon, left, top, mPaint);
     }
 
     private void drawProgressText(Canvas canvas) {
@@ -265,19 +277,6 @@ public class RingProgress extends View {
 
         RectF progressRectF = new RectF(centerX - ringRadius, centerY - ringRadius,
                 centerX + ringRadius, centerY + ringRadius);
-        LinearGradient linearGradient = new LinearGradient(progressRectF.left, progressRectF.top,
-                progressRectF.left, progressRectF.bottom,
-                new int[]{
-                        Color.parseColor("#33D9FF"),
-                        Color.parseColor("#1657D9")
-                }, new float[]{0f, 1f},
-                Shader.TileMode.CLAMP);
-        if (linearGradient != null) {
-            mPaint.setShader(linearGradient);
-        } else {
-            mPaint.setShader(null);
-        }
-
         if (isRound) {
             mPaint.setStrokeCap(Paint.Cap.ROUND);
         }
@@ -328,7 +327,7 @@ public class RingProgress extends View {
     }
 
     public void setProgress(float progress) {
-        setProgress(progress, useAnimation);
+        //setProgress(progress, useAnimation);
     }
 
     public int getDisableAngle() {
diff --git a/app/src/main/res/layout/activity_pedometer.xml b/app/src/main/res/layout/activity_pedometer.xml
index f3c0bbf..005980c 100644
--- a/app/src/main/res/layout/activity_pedometer.xml
+++ b/app/src/main/res/layout/activity_pedometer.xml
@@ -1,22 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ped_root_id"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".PedometerActivity">
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="5dp"
+        android:text="@string/app_name"
+        android:textColor="@color/green1"
+        android:textSize="30sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right|top"
+        android:padding="5dp"
+        android:text="12:12"
+        android:textColor="@color/white"
+        android:textSize="30sp"
+        android:textStyle="bold" />
+
+
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/ped_main_view_page"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_marginTop="40dp"
+        android:layout_marginBottom="20dp" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/ped_indicator_rv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center_horizontal"
-        android:layout_marginBottom="5dp"
         android:overScrollMode="never" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_ped_main.xml b/app/src/main/res/layout/fragment_ped_main.xml
index bd91734..5e86a64 100644
--- a/app/src/main/res/layout/fragment_ped_main.xml
+++ b/app/src/main/res/layout/fragment_ped_main.xml
@@ -14,11 +14,9 @@
             type="String" />
     </data>
 
-    <FrameLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@mipmap/bg"
-        tools:context=".fragment.pedometer.PedMainFragment">
+        android:layout_height="match_parent">
 
         <com.ic.sport.widget.ring.RingProgress
             android:id="@+id/ring_progress"
@@ -30,55 +28,51 @@
             app:isShowPercentText="false"
             app:maxProgress="10000"
             app:neiYuanColor="@color/transparent"
-            app:progress="1000"
-            app:ringColor="@color/top_color2"
-            app:ringProgressColor="@color/blue_00"
-            app:ringWidth="30dp"
+            app:progress="6000"
             app:useAnimation="true" />
 
         <TextView
             android:id="@+id/ped_number_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="130dp"
+            android:layout_centerInParent="true"
             android:includeFontPadding="false"
-            android:text="@{pedNumber}"
+            android:paddingBottom="20dp"
+            android:text="540"
             android:textColor="@color/white"
-            android:textSize="72sp" />
+            android:textSize="42sp" />
 
-        <TextView
-            android:id="@+id/ped_date_tv"
+        <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="80dp"
-            android:text="@string/ped_main_today"
-            android:textColor="#FFFFFF"
-            android:textSize="36sp"
-            android:textStyle="bold" />
+            android:layout_above="@id/ped_number_tv"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="-10dp"
+            android:src="@mipmap/icon_step_white" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|bottom"
-            android:layout_marginBottom="90dp"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@id/ped_number_tv"
             android:includeFontPadding="false"
+            android:paddingBottom="10dp"
             android:text="@string/ped_main_step"
             android:textColor="@color/white"
-            android:textSize="36sp"
+            android:textSize="22sp"
             android:textStyle="bold" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|bottom"
-            android:layout_marginBottom="32dp"
-            android:drawablePadding="1dp"
-            android:text="@{pedTarget}"
-
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="60dp"
+            android:drawableTop="@mipmap/icon_calorie_small"
+            android:text="300.5 kcal"
             android:textColor="@color/white"
-            android:textSize="28sp"
+            android:textSize="20sp"
             android:textStyle="bold" />
-    </FrameLayout>
+        
+    </RelativeLayout>
 </layout>
\ 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 34df0d6..7a29d49 100644
--- a/app/src/main/res/layout/fragment_ped_record.xml
+++ b/app/src/main/res/layout/fragment_ped_record.xml
@@ -1,25 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    tools:context=".fragment.pedometer.PedRecordFragment">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="@string/ped_record_name"
-        android:textColor="@color/main_text_color"
-        android:textSize="42sp" />
+    android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/ped_record_rv"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="20dp"
-        android:overScrollMode="never" />
-</LinearLayout>
\ No newline at end of file
+        android:layout_height="match_parent" />
+
+</FrameLayout>
\ 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 a693a73..9cdbe62 100644
--- a/app/src/main/res/layout/item_ped_record.xml
+++ b/app/src/main/res/layout/item_ped_record.xml
@@ -59,22 +59,19 @@
 
     </data>
 
-    <LinearLayout
+    <RelativeLayout
         style="@style/Widget.MaterialComponents.CardView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="80dp"
         android:background="@drawable/shape_bg"
-        android:orientation="vertical"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
-        app:cardBackgroundColor="#303233"
-        app:cardCornerRadius="5dp">
+        app:cardBackgroundColor="#1D1D1D"
+        app:cardCornerRadius="50dp">
 
         <TextView
             android:id="@+id/item_record_date"
             style="@style/RecordTextStyle"
-            android:layout_width="match_parent"
-            android:gravity="center_horizontal"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="10dp"
             android:text="@{recordDate}"
             android:textColor="@color/white" />
 
@@ -82,7 +79,9 @@
             android:id="@+id/item_record_taking"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="10dp"
+            android:layout_marginBottom="5dp"
             icApp:widgetImageColor="@{takingColor}"
             icApp:widgetImageIcon="@{takingIcon}"
             icApp:widgetImageUnit="@{takingUnit}"
@@ -92,7 +91,9 @@
             android:id="@+id/item_record_calories"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="10dp"
             icApp:widgetImageColor="@{caloriesColor}"
             icApp:widgetImageIcon="@{caloriesIcon}"
             icApp:widgetImageUnit="@{caloriesUnit}"
@@ -103,11 +104,14 @@
             android:id="@+id/item_record_distance"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="5dp"
             icApp:widgetImageColor="@{distanceColor}"
             icApp:widgetImageIcon="@{distanceIcon}"
             icApp:widgetImageUnit="@{distanceUnit}"
             icApp:widgetImageValue="@{recordDistance}" />
 
-    </LinearLayout>
+    </RelativeLayout>
 </layout>
diff --git a/app/src/main/res/mipmap-mdpi/icon_arrow.png b/app/src/main/res/mipmap-mdpi/icon_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..e345e97b84b1cc09777bc8bdb303ff399e0c7beb
GIT binary patch
literal 2655
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
Y`i+~BITgGZWcURP5(W#7@Z+=o0N#8EmjD0&

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/icon_calorie_big.png b/app/src/main/res/mipmap-mdpi/icon_calorie_big.png
new file mode 100644
index 0000000000000000000000000000000000000000..487561e1f24f71547c69d4c514a5c3433a4bd32d
GIT binary patch
literal 1492
zcmV;_1uOcAP)<h;3K|Lk000e1NJLTq001Tc001Be1^@s6eq;)>000G>Nkl<ZSVy&&
zUr<za6vsd3?y@Y<ia@CtMkE?ynad`+B5Io2UzHrS>3`ZZP0jS$^x9ib^<vXwlRfn3
zrLsxK)K-^lz+o{bS41R5M3Vo8xUlR!&2Pg5-S~H>-^`uax%d9g`Rw<c-#O<B4wixt
z2)M~16Lot@3@5mH<C;XHLk`R)w~7-33KkU=S-7sx0q!9oL!?<3BvjYw#IAF&(ozq(
zSp_g$fk-(JLpe-5?YPv`Typ~FOtD}vgS2=Fn%Ih1o3Yi65JF@h77-`PIRmSx@ZlQp
zW6N_0Re%X;8|Wc~eOT^V37u%4j&jbx)|cloIJ_FsEg&0#{1J#|ghQz8ClNm`$4_0I
zDx5R0Rm&d0va3+t3<Q9z5r716890KiUt@b~<kw%jrvf)^uw<#Id~_LN??%}K6acQ<
zoSz5w{S($$t%RcelZBf;*vcidaJx64`UXf4NKfH(7&r&~0P-c_x_SYf4BWK9)SO1o
z&<fPvii!#2{o^>Zff|s#B<vp<wA!SuE<O?5^uQ|prNB;*X94p&m0F{Hn}T}?^gFPQ
zGC=1<a8m-)?b}^+oXy8}Z9?S*VEL$oA5R3+qW(ZRfXL^#63r4i**o5bse!FsQh=Sd
z9#x}MB`|BEkc@gh2vmc93PdGbA9W0tRI0rx7a@qsju9wx3au%CnY3>}*bDY)37`DV
z5m>TOuMOmqFk#at0CN?kC=HWg>_GJ=#5ybCx(}Rz1%tVy#S1}q0-I1R0lbr;Nb$~f
z;CEEdOLhH=&cN0zT}DC{fxLz!lRfi44SK!cn*ky)FaYr(7&NK%@3IlDpj?!2q{124
zYX5H3Dh1sJ6ppLZJ+ph6U)+Jmlc4RgkG|eKI<A^hGWw7i)mkMSG0Okvn($QW>asm3
z3jtHzZ}!4F4bI3OWYxN}JoU^CGBPb9web6?c^o~Q3wTCtFqQvL2}f=={FHDLgH@It
z9;xj20q&Gmd^2v~545o3rCv%OD!{TlG&i+SSDVA0kMe-*vHP@J!u9691H~%KP6Gz&
zu9Q~1UYjLL&$IKDF8qP}aJ$V+X4Bi-NW*D2@4cIaa_|2EW+sGrK-wK(>FF^Rlw4)=
zbM35Imq$kC{E>I!#A26dZL!()f(>d?;pQ?UkqPB(uw$)HCX}fa^LSuR{uQcrw6bnv
z7Bh3^BXX-}CK7+r*>QvIPyYoxe9NtNgItnuWT~@It|~i%BnzrJk+=Rx-rY7OiyL|K
zoqh_77GPOp^T@V)=<T^q)uv8VZ$czM8W3%kV-YizILR^pCn&`uUqQE=FDx0Nto$@D
zzwX61W6>QRY`dGDZUbf}*GER4ccB~wZItTz_nm>Q^6x_AL6EIua%Fi%KjkaWu(>LS
z^z`D}oG3#>?R0hw^8A*eQTw7GU!k0l>bh^7fmJ-R7;%~8eF<S5Ff(cJvB!HT4>q#l
zsabeDCe)+SNMl^@Z{b3-#oN0~-kHPm7w7@R^%<7kD4|G`Gq6A)6Q9l{k!;@P@&j`z
z4-T?y#TmA2n~67L>;!AueKa>+;8cAsAAe}dMI4de5WdHD?Z=(fCZSNw5t!MmPZp=s
zmtBBMP4zdQX=^E7IGd$qjlB9s8reAyj&Tx;UF6`8T|`dI<H%3_ptYzT#4X3jxOPeQ
zH;rkasQ@P|7h@un92DIvQQg4o{3R?}+|TZ}Jj}a)F_z^^7FOHtrS(!1Uw<(`L-a1r
zHAGQ<#${Ja=;Vd*R2uzkYG9^ZtY1Eh*zf}KauzXvK|Wiz7ve7~Cd-$PZO7^BY2`#s
z3qO3@#^sCcbah3sIma*c?P9<uxuyh`3~L~ehR@0)JExGMq6c_vV=2pnMdaQ+2h}*O
uEo~eNT_$v>iO!BDuJ!#fnU9a#dH)6_{}Dg@Wo%3U0000<MNUMnLSTX(9nR4J

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/icon_calorie_small.png b/app/src/main/res/mipmap-mdpi/icon_calorie_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7dc16cafabe838eace69de761dbd51c7b225d17
GIT binary patch
literal 1566
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
Q#{d8T07*qoM6N<$f*0!UwEzGB

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/icon_height.png b/app/src/main/res/mipmap-mdpi/icon_height.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1314626f2bc9dc463e190135f90ff093f0717c3
GIT binary patch
literal 3233
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
TV35`N00000NkvXXu0mjf$pc3(

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/icon_line.png b/app/src/main/res/mipmap-mdpi/icon_line.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1e01e8162f5ab4bac1c5a957cd9e593a8ffa849
GIT binary patch
literal 1640
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/icon_step_green.png b/app/src/main/res/mipmap-mdpi/icon_step_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..48f7883430e86336bf1088f60389e3261983283e
GIT binary patch
literal 1370
zcmV-g1*Q6lP)<h;3K|Lk000e1NJLTq000yK001Be1^@s65@J}k000FcNkl<ZNK2KL
z?{8M+8OJ~0`#eu+R}@fzNq;;Qs)9cVOv%&@QASi^6vtw-O{5Z&?ai{k!8d!gH}1tk
z$P(L%F37gD%!Md(qEpmRn8YzrMqB%Xj*t?;N|5$B_jkFUJ|%_Ww%%_}&dGf~=f1A%
z`@OCs{>SQY%Y0xy#G8e0FkHxB#KeJf)P4DLowzs?q5lK8T;z*HSm_uS6Zp!|7b$#L
zU}CIYC(q0Z*y-k<5NSbtN3htCWB%cwo<M%0T_Xo)2h5vyAm0MI52&fWJZx(xA^v@v
zhIh>h*p)ZEZ0TlT&5RdMV|F=kbeo2LGb><6UiyV_EAl;{#X#BUC~{9gpSEkTdse_s
zmmW1<Dzgq)23(Li6hqvbkqvIu;IUZ&JKVAgVpE8$wcLtzp5VWkY=1^Jx>bFrzZSUP
z6ozP+7b!M@ZwoOlH!2~n2W8k}4mu7TF2IL#7(Cr3@~Z+9Y=Cbr$SB+t3AZY;0%(<J
za7EYz;B!pB0=+qUXOgUM0sUXjgjR$-b+V;PAiv8oeoxYB!$M#lP+yfx+M8VQ1@MW*
zzJT8TitOW`s{h>dDfOHQH_@;F!gq;0Zm|K>T-}hu$*$t2F9e68=m`||w5xyU67VIr
zUYj$y%+XtsH_w2jWKROu0d-e_p0(LS@UORNxc3sU!;N=}Y$c9A1Kk5mfIflPCp5=!
zC(!gYp5HI&mvs#8o6e&;-2515mF#DLrGigw-gaOhM3zjYpi-c;QVP<kYo~7YkrlTG
z{OSNB|9VbDb-8Ji;SQ`#l>(SU1P%x;I<gA!2(Y{g90QGluLT-_Gd8b>;O?Bs_vUil
zIlbW0w}h7|Iyu1vl4u74u@oZ@N`7!gUXNfOfbb3E`+-!vQ!+gY@nx7Zpe{FDA1N+`
ze0e}+;m>livdHhnq;#YYrNX53C*<Ekm>~N5h{u6zfL=?_8y`{9;Bl7J)KNFLz=c>K
zoG%mWC&=zoWRs;7@{$V9{Eom56NeyME4v-|HgFtyyYS(wcI@45tQ)6zOCUZZ`$=FG
zPy`MjcBiXx5V}{9yCWJ8A?`Ce@gKkrx70$p2|_BwGDTLWZVj{~>j^%xv={tVgwHeL
z4H4Por$o*8Wk4Hs(lSrP+m$Mh>x~LTtwz4P+P;!>-b8v)lwbR=Gi5r|jQnAn^+`HN
ze-$n`(u#PvD)JGmR~@u_oWlDvC*Nf!Od~T8H`qK4tP`BI^%8*r;4INkARYh~0LLu;
zP$2&PX^ot?WWAY|deNm7F~%PwZK>vL7`uxQj!Y8XEmB^O^%SrcbP;<`2;Q+(!-p;d
zCh7Fkv?xOxuzv`8sM=+EEx!=Z(RK~J+v(=p6=_Gb85RL=Ab$0XhW>I1xWji93!Gk<
z!8%86l1L7?5g5blRZwR}`JY>Ka-_?R4Uw=}Qz=;~I2^_E<JA0dI*+P^2}_A?t0p~7
zwzE^3Q@6<eTu1GxHhny?)1@18SdZBP6{`*+woj71GLM0=)N$15<~G3!n;$UMs*)w%
zvUnvUyk1NF$plMJr~Y%|8X`|gJPM3sc7~u`wbb{eed=`SSx0V@yb;nc;xj6pSUp#c
z$Rw-t&>9GvZJtP9w$z;wyKA}Tcm>$y(#D8e6;tKXDAGZrH^wO(yYkN}jf+Ma=VxRO
zD0-uz7y|oq%5TnPbhHw3hnv=j(5#r8;K>9O#e-MQ+vzG!Su<ZFxSyyR1$|ItviC=f
co{{js0mS7_f3u#_!~g&Q07*qoM6N<$f{!nV;Q#;t

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/icon_step_white.png b/app/src/main/res/mipmap-mdpi/icon_step_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..c966aae342a63bacb6ed0bece77db651905b3546
GIT binary patch
literal 1423
zcmV;A1#tR_P)<h;3K|Lk000e1NJLTq000;O001fo1^@s6sl}UK000G6Nkl<ZSVx_g
z=a1!c6vjVC@4fd<^xmTPE_%Emyzl~vAi_I;fJB0bY>0@EC3?3?^s<&!cUaciW$hr#
zj=E+Ij(qN%JASis_s-;glgZ57dw=Kop65L0Ip+owIGMQ&um-Rtumi9$@DK0}@F_45
z5eqwoit*xC@Rck0uE5T~`oO=y*T4tB4-qk=R{(==3Y-ia4QvniS{fL57nmCnH}(p!
zUfud~;6z~cMxeieS-|XwIJH-REr30MYk@;L1X)xW?9wZMh20al4mhYokiRT;L`dD3
zGm#>109f2Bf#ZP{mWZN~=0wC1y#lNPNYh!sF~C-UuUX_Df%l7|>w5)Qwp6ntun(|%
z^??PRT`KC2h<ADd@S)5UMC}W*8?YHL1bhj62rP(*{s{qO=8C{-z$U;pz)tnsTC7?f
zJW#j)s2XivL|E+ZMb6BXfQ>4+T>G<Kb@95zy&e2>b@3;F)MyuWv$TymBPz;FyHg4d
zEv~l()+rCNxddOXitBBE1HP*wzXZJ8iKfU*K}_A^9R?g(0N!{aM?ZQVm<+rJEQ$!T
zY#jmCE(*>qoo@~J+C-1Rl<IxJ3l=^i{%iu+rMCGcm4O+xd0q@GU))QPw%zG`4@?1`
z0A7y>`(q@7i^|N-siOLZ4}1*#QckLxq)f0*XRxw(9C$b)?2i$E+iHmH3#<v4-dn(P
zfEieHO|Bb&!)HDq!0pZ1U=3a@DQXAG>?`0Q;7MRD;9@{4Zc=2Ec@gRKbu;ra&j7bX
z#4F7Vl$c}Cp&})(0(VyyPOqzL*fgn;<GCeU>2sWVEcU&?)4)7n&<v!=ZuLi9d-DgY
z4m#u&Rs1G^<I#(m!BHg=-?ss6JOM0vzW~Z}^UA`Ty#Y)sTRsK26xgc~T^gm;EPn@1
zFA6uT&-_~8cL6g6&~vn33#=NPvwDqP?8BEW0U-B}0k@XfDS-2V!^;rGQGo)?Sn9yZ
zOnG&{NKtcC3SjzDYrVY4Ni{F_E?4**xF6{22B7a8SPdvpn*u4)qU~H8%VIiKwHU2N
zMijtPE(BdiW@h@J!ChGn2HY?_)@o|W(t0eYA*3tl#{NIO<*=RFGBcgQa;n45DQ>OD
z{zZw6^;6065$!?6R4uKiJ)xoo#{ksylA6;>-){onmct$k*zs+r6~y3n@RW$qVn&@#
z0FFi}xd3n`xEk6U`itYz_q>2z?vW1pz9S;u?g~)1H^|u~J-bxNJ^<WV!^Yi6)$G^E
z#J-tSKno*63Wv?EiI|z*UK-A<J+ysGGjR9(qIf<Iut8Og7H*wXmHqKqMA(3%0Wwp=
zQU&J$25?i;$ke?Q-0bX)h=I)Xa~D>os>apbVI#n65g~2=17xO}cfh+?*_G{vv9n!G
z1aKs}!Tph$_JlU#3{hEbdydPN3rB=wbQqw9y{fQLETHoARvyjo*($OHl;5Gu)K(4v
z&ZuYnLLyCe@8pP>*#xktszquH?*8MV<>uhvxu??CqlO~9Q+i{^ti55z+P%D6he;8k
zZI5JdRjn&0RLlE@)btfKk7`~9Za-9N(}4wWmbX`T`{AalLu<3}Iu^$aoM_(MqZ=C7
z3Dqa>O||)VX1Xgm>D;=NtVi=xZ8n`#uLU5_ZO%n?WExoQPmc(*8FT8pn`*nJB<*LU
z<_0g<UL^&vAZDPFRE$=v?x#kC!(*u@GqnvVve*j6VI@T>skKH5U_h5GmEo?b1xwqk
zW=Ae13u$#^+He9mN_~D>yJq8l!x<+7-PZ1xVw+M2ogWdJ;IN9i1sLzWs)G*T%CA7A
dWpQ(r{}1kE)FQi`26F%a002ovPDHLkV1i*)tWf{}

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/icon_target.png b/app/src/main/res/mipmap-mdpi/icon_target.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff599f0a7b55f7d10b0babb5f3df3b42e33e4a5b
GIT binary patch
literal 4750
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/icon_weight.png b/app/src/main/res/mipmap-mdpi/icon_weight.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f8ea8d99e3dba3570b8a2321cbdf9e5c54ee6d2
GIT binary patch
literal 3167
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
FV1fjhAwvKF

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7ddcf69..535a4e2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,7 +8,7 @@
 
     <!-- 主题颜色-->
     <color name="top_color1">#20000000</color>
-    <color name="top_color2">#FFCECBCB</color>
+    <color name="top_color2">#111B01</color>
 
 
     <color name="gray_f6">#f6f6f6</color>
@@ -27,7 +27,7 @@
     <color name="gray_dd">#DDDDDD</color>
     <color name="green">#2DDB97</color>
     <color name="green_press">#FF20D18C</color>
-    <color name="green1">#34e8a6</color>
+    <color name="green1">#A0FE1E</color>
     <color name="green2">#22ddb0</color>
     <color name="green_qian">#E6F9F7</color>
     <color name="gray_ban">#50000000</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fea0f48..8a45a43 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,15 +6,15 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowBackground">@android:color/black</item>
     </style>
 
     <style name="RecordTextStyle">
         <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">30sp</item>
+        <item name="android:textSize">24sp</item>
+        <item name="android:textStyle">bold</item>
         <item name="android:includeFontPadding">false</item>
     </style>
 
-- 
2.17.1