From: TrillGates Date: Tue, 6 Jul 2021 04:01:26 +0000 (+0800) Subject: adjust ui text size in english. X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=048df84fc3d87f174af9fc44adfb6261e62280f2;p=IcTemperature.git adjust ui text size in english. --- diff --git a/app/src/main/res/layout/stub_view_body_and_wrist_temp.xml b/app/src/main/res/layout/stub_view_body_and_wrist_temp.xml index f85a93b..bae3ea2 100644 --- a/app/src/main/res/layout/stub_view_body_and_wrist_temp.xml +++ b/app/src/main/res/layout/stub_view_body_and_wrist_temp.xml @@ -35,7 +35,7 @@ android:background="@android:color/transparent" android:text="@string/activity_temp_wrist_str" android:textColor="#FFFFFF" - android:textSize="36sp" + android:textSize="@dimen/temperature_left_text_size" app:layout_constraintBottom_toTopOf="@+id/guideline15" app:layout_constraintEnd_toStartOf="@+id/guideline14" app:layout_constraintStart_toStartOf="parent" /> @@ -70,7 +70,7 @@ android:background="@android:color/transparent" android:text="@string/activity_temp_str" android:textColor="#FFFFFF" - android:textSize="36sp" + android:textSize="@dimen/temperature_left_text_size" app:layout_constraintBottom_toTopOf="@+id/guideline12" app:layout_constraintEnd_toStartOf="@+id/guideline14" app:layout_constraintStart_toStartOf="parent" /> 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 0e63aa2..d230cfa 100644 --- a/app/src/main/res/layout/stub_view_normal_temp.xml +++ b/app/src/main/res/layout/stub_view_normal_temp.xml @@ -38,8 +38,8 @@ + android:layout_height="match_parent" + android:background="@mipmap/temperature_bg"> @@ -80,7 +81,7 @@ android:background="@android:color/transparent" android:text="@string/activity_temp_str" android:textColor="#FFFFFF" - android:textSize="26sp" + android:textSize="@dimen/temperature_left_text_size" app:layout_constraintBottom_toTopOf="@+id/guideline" app:layout_constraintEnd_toStartOf="@+id/imageView2" app:layout_constraintStart_toStartOf="parent" @@ -92,7 +93,7 @@ android:background="@android:color/transparent" android:text="@string/activity_temp_wrist_str" android:textColor="#FFFFFF" - android:textSize="26sp" + android:textSize="@dimen/temperature_left_text_size" android:visibility="@{disableWristTemp ? View.GONE : View.VISIBLE}" app:layout_constraintBottom_toTopOf="@+id/guideline5" app:layout_constraintEnd_toStartOf="@+id/imageView" @@ -141,6 +142,7 @@ android:background="@android:color/transparent" android:src="@mipmap/writst_temp_icon" android:visibility="@{disableWristTemp ? View.GONE : View.VISIBLE}" + app:layout_constraintBottom_toTopOf="@+id/guideline5" app:layout_constraintEnd_toStartOf="@+id/guideline7" app:layout_constraintTop_toTopOf="@+id/guideline" /> @@ -191,7 +193,7 @@ android:background="@android:color/transparent" android:text="@string/activity_temp_outside" android:textColor="#FFFFFF" - android:textSize="26sp" + android:textSize="@dimen/temperature_left_text_size" android:visibility="@{disableEnvTemp ? View.GONE : View.VISIBLE}" app:layout_constraintBottom_toTopOf="@+id/guideline6" app:layout_constraintEnd_toStartOf="@+id/imageView3" diff --git a/app/src/main/res/values-en/dimens.xml b/app/src/main/res/values-en/dimens.xml index b2198e8..fee2a5e 100644 --- a/app/src/main/res/values-en/dimens.xml +++ b/app/src/main/res/values-en/dimens.xml @@ -1,6 +1,6 @@ - + 48dp 26dp @@ -10,4 +10,5 @@ 42dp 62sp + 22sp \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index b2198e8..2afd261 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -10,4 +10,5 @@ 42dp 62sp + 26sp \ No newline at end of file