update iu.

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 208123b..3c7772a 100644 (file)
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,9 +3,18 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" withSubpackages="false" static="false" />
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
-          <package name="io.ktor" withSubpackages="true" static="false" />
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />

diff --git a/app/src/main/res/drawable/ic_item_bg.xml b/app/src/main/res/drawable/ic_item_bg.xml
new file mode 100644 (file)
index 0000000..9623216
--- /dev/null
+++ b/app/src/main/res/drawable/ic_item_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#1D1D1D" />
+    <corners android:radius="100dp" />
+
+</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/ic_item_icon_body_temp_bg.xml b/app/src/main/res/drawable/ic_item_icon_body_temp_bg.xml
new file mode 100644 (file)
index 0000000..facd8db
--- /dev/null
+++ b/app/src/main/res/drawable/ic_item_icon_body_temp_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#117CFD" />
+    <corners android:radius="100dp" />
+
+</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/ic_item_icon_env_temp_bg.xml b/app/src/main/res/drawable/ic_item_icon_env_temp_bg.xml
new file mode 100644 (file)
index 0000000..17db37d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_item_icon_env_temp_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#13AE8B" />
+    <corners android:radius="100dp" />
+
+</shape>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/ic_item_icon_wrist_temp_bg.xml b/app/src/main/res/drawable/ic_item_icon_wrist_temp_bg.xml
new file mode 100644 (file)
index 0000000..cd704ce
--- /dev/null
+++ b/app/src/main/res/drawable/ic_item_icon_wrist_temp_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#FDB417" />
+    <corners android:radius="100dp" />
+
+</shape>
\ No newline at end of file

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 938d7dc..a56a3cf 100644 (file)
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -40,7 +40,6 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@mipmap/qs_background"
         tools:context=".AnimalHeatActivity">
 
         <!--只有体温的时候显示，也就是只支持体温，不支持腕温和环境温度-->
@@ -78,7 +77,8 @@
             android:background="@android:color/transparent"
             android:text="@{checkTips}"
             android:textColor="#FFFFFF"
-            android:textSize="28sp"
+            android:textSize="26sp"
+            android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/dot_progress_bar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -87,17 +87,17 @@
         <com.github.silvestrpredko.dotprogressbar.DotProgressBar
             android:id="@+id/dot_progress_bar"
             android:layout_width="match_parent"
-            android:layout_height="30dp"
+            android:layout_height="20dp"
             android:background="@android:color/transparent"
             android:visibility="@{showLoading ? View.VISIBLE : View.GONE}"
             app:amount="5"
             app:animationDirection="left"
             app:duration="@android:integer/config_mediumAnimTime"
-            app:endColor="@color/teal_A200"
+            app:endColor="#A0FE1E"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:startColor="@color/lime_A400" />
+            app:startColor="@color/white" />
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline10"

diff --git a/app/src/main/res/layout/stub_view_normal_temp.xml b/app/src/main/res/layout/stub_view_normal_temp.xml
index b798807..5311d28 100644 (file)
--- a/app/src/main/res/layout/stub_view_normal_temp.xml
+++ b/app/src/main/res/layout/stub_view_normal_temp.xml
@@ -36,206 +36,112 @@
             type="boolean" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@mipmap/qs_background"
+        android:orientation="vertical"
         tools:context=".AnimalHeatActivity">
 
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.25" />
-
-        <ImageView
-            android:id="@+id/imageView2"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="20dp"
-            android:background="@android:color/transparent"
-            android:src="@drawable/ic_temp_human"
-            app:layout_constraintEnd_toStartOf="@+id/guideline7"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:text="@string/activity_temp_unit"
-            android:textColor="#FFFFFF"
-            android:textSize="38sp"
-            android:visibility="@{disableEnvTemp ? View.GONE : View.VISIBLE}"
-            app:layout_constraintBottom_toTopOf="@+id/guideline6"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/guideline8"
-            app:layout_constraintTop_toTopOf="@+id/guideline5" />
-
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:text="@string/activity_temp_str"
-            android:textColor="#FFFFFF"
-            android:textSize="26sp"
-            app:layout_constraintBottom_toTopOf="@+id/guideline"
-            app:layout_constraintEnd_toStartOf="@+id/imageView2"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:text="@string/activity_temp_wrist_str"
-            android:textColor="#FFFFFF"
-            android:textSize="26sp"
-            android:visibility="@{disableWristTemp ? View.GONE : View.VISIBLE}"
-            app:layout_constraintBottom_toTopOf="@+id/guideline5"
-            app:layout_constraintEnd_toStartOf="@+id/imageView"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:text="@string/activity_temp_unit"
-            android:textColor="#FFFFFF"
-            android:textSize="38sp"
-            android:visibility="@{disableWristTemp ? View.GONE : View.VISIBLE}"
-            app:layout_constraintBottom_toTopOf="@+id/guideline5"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/guideline8"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:text="@string/activity_temp_unit"
-            android:textColor="#FFFFFF"
-            android:textSize="38sp"
-            app:layout_constraintBottom_toTopOf="@+id/guideline"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/guideline8"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline5"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.5" />
-
-        <ImageView
-            android:id="@+id/imageView"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="20dp"
-            android:background="@android:color/transparent"
-            android:src="@drawable/ic_temp_wrist"
-            android:visibility="@{disableWristTemp ? View.GONE : View.VISIBLE}"
-            app:layout_constraintEnd_toStartOf="@+id/guideline7"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-        <ImageView
-            android:id="@+id/imageView3"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_marginEnd="20dp"
-            android:background="@android:color/transparent"
-            android:src="@mipmap/outtemp"
-            android:visibility="@{disableEnvTemp ? View.GONE : View.VISIBLE}"
-            app:layout_constraintBottom_toTopOf="@+id/guideline6"
-            app:layout_constraintEnd_toStartOf="@+id/guideline7"
-            app:layout_constraintTop_toTopOf="@+id/guideline5" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline6"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.75" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline9"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.90" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline7"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_percent="0.49" />
-
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline8"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_percent="0.8" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:text="@string/activity_temp_outside"
-            android:textColor="#FFFFFF"
-            android:textSize="26sp"
-            android:visibility="@{disableEnvTemp ? View.GONE : View.VISIBLE}"
-            app:layout_constraintBottom_toTopOf="@+id/guideline6"
-            app:layout_constraintEnd_toStartOf="@+id/imageView3"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/guideline5" />
-
-
-        <TextView
-            android:id="@+id/textView2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:text="@{envTemp}"
-            android:textColor="#FFFFFF"
-            android:textSize="50sp"
-            android:visibility="@{disableEnvTemp ? View.GONE : View.VISIBLE}"
-            app:layout_constraintBottom_toTopOf="@+id/guideline6"
-            app:layout_constraintEnd_toStartOf="@+id/guideline8"
-            app:layout_constraintTop_toTopOf="@+id/guideline5" />
-
-        <TextView
-            android:id="@+id/textView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:text="@{bodyTemp}"
-            android:textColor="#FFFFFF"
-            android:textSize="50sp"
-            app:layout_constraintBottom_toTopOf="@+id/guideline"
-            app:layout_constraintEnd_toStartOf="@+id/guideline8"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:text="@{wristTemp}"
-            android:textColor="#FFFFFF"
-            android:textSize="50sp"
-            android:visibility="@{disableWristTemp ? View.GONE : View.VISIBLE}"
-            app:layout_constraintBottom_toTopOf="@+id/guideline5"
-            app:layout_constraintEnd_toStartOf="@+id/guideline8"
-            app:layout_constraintTop_toTopOf="@+id/guideline" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <RelativeLayout style="@style/ItemStyle">
+
+            <LinearLayout
+                android:layout_width="160dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ic_item_icon_body_temp_bg"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:padding="3dp">
+
+                <ImageView
+                    android:id="@+id/imageView2"
+                    style="@style/IconStyle"
+                    android:src="@mipmap/icon_body_temperature" />
+
+                <TextView
+                    style="@style/TextStyle"
+                    android:text="@string/activity_temp_str" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/textView"
+                style="@style/TemperatureTextStyle"
+                android:layout_toLeftOf="@id/body_unit"
+                android:text="@{bodyTemp}" />
+
+
+            <TextView
+                android:id="@+id/body_unit"
+                style="@style/UnitTextStyle" />
+        </RelativeLayout>
+
+
+        <RelativeLayout style="@style/ItemStyle">
+
+            <LinearLayout
+                android:layout_width="160dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ic_item_icon_wrist_temp_bg"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:padding="3dp">
+
+                <ImageView
+                    android:id="@+id/imageView"
+                    style="@style/IconStyle"
+                    android:src="@mipmap/icon_wrist_temperature" />
+
+                <TextView
+                    style="@style/TextStyle"
+                    android:text="@string/activity_temp_wrist_str" />
+
+            </LinearLayout>
+
+            <TextView
+                style="@style/TemperatureTextStyle"
+                android:layout_toLeftOf="@id/wrist_unit"
+                android:text="@{wristTemp}" />
+
+            <TextView
+                android:id="@+id/wrist_unit"
+                style="@style/UnitTextStyle" />
+
+
+        </RelativeLayout>
+
+        <RelativeLayout style="@style/ItemStyle">
+
+            <LinearLayout
+                android:layout_width="160dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ic_item_icon_env_temp_bg"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:padding="3dp">
+
+                <ImageView
+                    android:id="@+id/imageView3"
+                    style="@style/IconStyle"
+                    android:src="@mipmap/icon_env_temperature" />
+
+                <TextView
+                    style="@style/TextStyle"
+                    android:text="@string/activity_temp_outside" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/textView2"
+                style="@style/TemperatureTextStyle"
+                android:layout_toRightOf="@id/env_unit"
+                android:text="@{envTemp}" />
+
+
+            <TextView
+                android:id="@+id/env_unit"
+                style="@style/UnitTextStyle" />
+
+        </RelativeLayout>
+
+    </LinearLayout>
 </layout>

diff --git a/app/src/main/res/mipmap-mdpi/icon_body_temperature.png b/app/src/main/res/mipmap-mdpi/icon_body_temperature.png
new file mode 100644 (file)
index 0000000..30c825c
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/icon_body_temperature.png differ

diff --git a/app/src/main/res/mipmap-mdpi/icon_env_temperature.png b/app/src/main/res/mipmap-mdpi/icon_env_temperature.png
new file mode 100644 (file)
index 0000000..6b49602
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/icon_env_temperature.png differ

diff --git a/app/src/main/res/mipmap-mdpi/icon_wrist_temperature.png b/app/src/main/res/mipmap-mdpi/icon_wrist_temperature.png
new file mode 100644 (file)
index 0000000..8b97091
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/icon_wrist_temperature.png differ

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7553077..228432a 100644 (file)
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -5,6 +5,53 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:background">@color/colorMainBg</item>
+        <item name="android:windowBackground">@color/colorMainBg</item>
+    </style>
+
+    <style name="IconStyle">
+        <item name="android:layout_width">40dp</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+
+    <style name="TextStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:textColor">#FFFFFF</item>
+        <item name="android:textSize">24sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TemperatureTextStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:layout_marginRight">5dp</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textColor">#FFFFFF</item>
+        <item name="android:textSize">36sp</item>
+    </style>
+
+    <style name="UnitTextStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textColor">#FFFFFF</item>
+        <item name="android:text">@string/activity_temp_unit</item>
+        <item name="android:textSize">34sp</item>
+        <item name="android:layout_marginRight">20sp</item>
+    </style>
+
+    <style name="ItemStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">5dp</item>
+        <item name="android:background">@drawable/ic_item_bg</item>
+        <item name="android:layout_marginLeft">5dp</item>
+        <item name="android:layout_marginRight">5dp</item>
     </style>
 </resources>
\ No newline at end of file