修改了UI

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 52ca2f5..bd07fe2 100644 (file)
--- a/app/src/main/res/layout/stub_view_normal_temp.xml
+++ b/app/src/main/res/layout/stub_view_normal_temp.xml
@@ -38,7 +38,7 @@
         <RelativeLayout style="@style/ItemStyle">
 
             <LinearLayout
-                android:layout_width="160dp"
+                android:layout_width="100dp"
                 android:layout_height="wrap_content"
                 android:background="@drawable/ic_item_icon_body_temp_bg"
                 android:gravity="center_horizontal"
@@ -72,7 +72,7 @@
         <RelativeLayout style="@style/ItemStyle">
 
             <LinearLayout
-                android:layout_width="160dp"
+                android:layout_width="100dp"
                 android:layout_height="wrap_content"
                 android:background="@drawable/ic_item_icon_wrist_temp_bg"
                 android:gravity="center_horizontal"
@@ -105,7 +105,7 @@
         <RelativeLayout style="@style/ItemStyle">
 
             <LinearLayout
-                android:layout_width="160dp"
+                android:layout_width="100dp"
                 android:layout_height="wrap_content"
                 android:background="@drawable/ic_item_icon_env_temp_bg"
                 android:gravity="center_horizontal"

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 531d3d2..4273a1c 100644 (file)
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -6,7 +6,7 @@
     <string name="activity_temp_unit">℃</string>
     <string name="activity_temp_tips_check">MEASURING</string>
     <string name="activity_temp_tips_end">COMPLETE</string>
-    <string name="activity_temp_outside">TEMPOut</string>
+    <string name="activity_temp_outside">ENV</string>
     <string name="no_wearing_device_tips_text">Not wearing a device</string>
     <string name="activity_temp_tips_wear_too_short">Wear to short\nMay be not right</string>
     <string name="temperature_default_text">"--.- "</string>
@@ -16,5 +16,5 @@
     <string name="background_wait">Have other tests in background,Please try again later!</string>
     <string name="dialog_warn">Warn</string>
     <string name="dialog_confirm">Yes</string>
-    <string name="confirm_text">确定</string>
+    <string name="confirm_text">Confirm</string>
 </resources>

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2144a82..86976ae 100644 (file)
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -21,8 +21,7 @@
         <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>
+        <item name="android:textSize">20sp</item>
     </style>
 
     <style name="TemperatureTextStyle">
@@ -32,7 +31,7 @@
         <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>
+        <item name="android:textSize">30sp</item>
     </style>
 
     <style name="UnitTextStyle">
@@ -43,7 +42,7 @@
         <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:textSize">30sp</item>
         <item name="android:layout_marginRight">20sp</item>
     </style>