From 29b4c8b6acce8da465ce73024370e086612e6d02 Mon Sep 17 00:00:00 2001 From: DrDisagree Date: Fri, 25 Oct 2024 14:34:45 +0600 Subject: [PATCH] Fix lockscreen clock previews Signed-off-by: DrDisagree --- .../res/drawable/lockscreen_clock_24_bg.xml | 2 +- .../res/drawable/lockscreen_clock_50_dot.xml | 8 +-- .../res/drawable/lockscreen_clock_50_dot2.xml | 8 +-- app/src/main/res/font/japanese.ttf | Bin 10488 -> 0 bytes app/src/main/res/font/montserrat_bold.ttf | Bin 0 -> 29560 bytes .../res/font/{ios.ttf => sf_pro_stencil.ttf} | Bin .../layout/preview_lockscreen_clock_19.xml | 2 +- .../res/layout/preview_lockscreen_clock_2.xml | 62 ++++++++---------- .../layout/preview_lockscreen_clock_28.xml | 10 +-- .../layout/preview_lockscreen_clock_29.xml | 4 +- .../res/layout/preview_lockscreen_clock_3.xml | 2 +- .../layout/preview_lockscreen_clock_33.xml | 7 +- .../layout/preview_lockscreen_clock_37.xml | 1 + .../layout/preview_lockscreen_clock_40.xml | 2 +- .../layout/preview_lockscreen_clock_42.xml | 5 +- .../layout/preview_lockscreen_clock_45.xml | 4 +- .../layout/preview_lockscreen_clock_46.xml | 2 +- .../layout/preview_lockscreen_clock_48.xml | 3 +- .../layout/preview_lockscreen_clock_50.xml | 6 +- .../layout/preview_lockscreen_clock_51.xml | 6 +- .../layout/preview_lockscreen_clock_54.xml | 32 +++------ .../layout/preview_lockscreen_clock_55.xml | 10 +-- 22 files changed, 80 insertions(+), 96 deletions(-) delete mode 100644 app/src/main/res/font/japanese.ttf create mode 100644 app/src/main/res/font/montserrat_bold.ttf rename app/src/main/res/font/{ios.ttf => sf_pro_stencil.ttf} (100%) diff --git a/app/src/main/res/drawable/lockscreen_clock_24_bg.xml b/app/src/main/res/drawable/lockscreen_clock_24_bg.xml index e2539f361..4214472f2 100644 --- a/app/src/main/res/drawable/lockscreen_clock_24_bg.xml +++ b/app/src/main/res/drawable/lockscreen_clock_24_bg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/lockscreen_clock_50_dot.xml b/app/src/main/res/drawable/lockscreen_clock_50_dot.xml index f076a7a00..deb2c9eef 100644 --- a/app/src/main/res/drawable/lockscreen_clock_50_dot.xml +++ b/app/src/main/res/drawable/lockscreen_clock_50_dot.xml @@ -1,6 +1,6 @@ - - - - + + + diff --git a/app/src/main/res/drawable/lockscreen_clock_50_dot2.xml b/app/src/main/res/drawable/lockscreen_clock_50_dot2.xml index 1b442a055..7b25b1dfc 100644 --- a/app/src/main/res/drawable/lockscreen_clock_50_dot2.xml +++ b/app/src/main/res/drawable/lockscreen_clock_50_dot2.xml @@ -1,6 +1,6 @@ - - - - + + + diff --git a/app/src/main/res/font/japanese.ttf b/app/src/main/res/font/japanese.ttf deleted file mode 100644 index 671cd7103c61f6f3aaee6d3d6a92b903dda57ec1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10488 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 diff --git a/app/src/main/res/font/montserrat_bold.ttf b/app/src/main/res/font/montserrat_bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..ae33a4538132c8fc174dd53b3ce771009405d7a4 GIT binary patch literal 29560 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/font/ios.ttf b/app/src/main/res/font/sf_pro_stencil.ttf similarity index 100% rename from app/src/main/res/font/ios.ttf rename to app/src/main/res/font/sf_pro_stencil.ttf diff --git a/app/src/main/res/layout/preview_lockscreen_clock_19.xml b/app/src/main/res/layout/preview_lockscreen_clock_19.xml index 96e647254..be3b41314 100644 --- a/app/src/main/res/layout/preview_lockscreen_clock_19.xml +++ b/app/src/main/res/layout/preview_lockscreen_clock_19.xml @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:alpha="0.9" - android:fontFamily="@font/ios" + android:fontFamily="@font/sf_pro_stencil" android:format12Hour="hh:mm" android:format24Hour="HH:mm" android:gravity="center" diff --git a/app/src/main/res/layout/preview_lockscreen_clock_2.xml b/app/src/main/res/layout/preview_lockscreen_clock_2.xml index 67cfb2f7f..d490c80c7 100644 --- a/app/src/main/res/layout/preview_lockscreen_clock_2.xml +++ b/app/src/main/res/layout/preview_lockscreen_clock_2.xml @@ -14,19 +14,19 @@ android:orientation="vertical"> - + android:layout_gravity="start" + android:layoutDirection="ltr"> - + android:format12Hour="hh:mm" + android:format24Hour="HH:mm" + android:includeFontPadding="false" + android:singleLine="true" + android:tag="text1" + android:textColor="@android:color/white" + android:textSize="40dp" /> - + - - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/preview_lockscreen_clock_28.xml b/app/src/main/res/layout/preview_lockscreen_clock_28.xml index 44e3ed69e..9d762667e 100644 --- a/app/src/main/res/layout/preview_lockscreen_clock_28.xml +++ b/app/src/main/res/layout/preview_lockscreen_clock_28.xml @@ -19,10 +19,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|center" - app:cardBackgroundColor="@android:color/system_accent1_300" + app:cardBackgroundColor="@android:color/system_accent1_200" app:cardCornerRadius="18dp" - app:strokeColor="@android:color/system_accent3_900" - app:strokeWidth="6dp"> + app:strokeColor="@android:color/system_accent1_900" + app:strokeWidth="4dp"> diff --git a/app/src/main/res/layout/preview_lockscreen_clock_29.xml b/app/src/main/res/layout/preview_lockscreen_clock_29.xml index cec564422..890c1c5e9 100644 --- a/app/src/main/res/layout/preview_lockscreen_clock_29.xml +++ b/app/src/main/res/layout/preview_lockscreen_clock_29.xml @@ -38,8 +38,8 @@ android:layout_height="wrap_content" android:layout_marginBottom="-2dp" android:includeFontPadding="false" - android:tag="accent1|nolineheight" - android:text="Oni Chan!!" + android:tag="accent1|nolineheight|username" + android:text="Onii-Chan!!" android:textColor="@android:color/system_accent1_300" android:textSize="22sp" /> diff --git a/app/src/main/res/layout/preview_lockscreen_clock_3.xml b/app/src/main/res/layout/preview_lockscreen_clock_3.xml index 5c3dc0f96..ac532dccf 100644 --- a/app/src/main/res/layout/preview_lockscreen_clock_3.xml +++ b/app/src/main/res/layout/preview_lockscreen_clock_3.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:alpha="0.9" - android:fontFamily="@font/ios" + android:fontFamily="@font/sf_pro_stencil" android:format12Hour="hh:mm" android:format24Hour="HH:mm" android:gravity="center" diff --git a/app/src/main/res/layout/preview_lockscreen_clock_33.xml b/app/src/main/res/layout/preview_lockscreen_clock_33.xml index fa4edc0dc..d6213434e 100644 --- a/app/src/main/res/layout/preview_lockscreen_clock_33.xml +++ b/app/src/main/res/layout/preview_lockscreen_clock_33.xml @@ -32,6 +32,7 @@ android:format12Hour="EEEE" android:format24Hour="EEEE" android:includeFontPadding="false" + android:letterSpacing="0.1" android:tag="text2|nolineheight" android:textColor="#000000" android:textSize="20sp" @@ -68,7 +69,7 @@ android:layout_height="wrap_content" android:layout_gravity="end|center" android:background="@drawable/lockscreen_clock_33_bg" - android:paddingHorizontal="20dp" + android:paddingHorizontal="30dp" android:paddingVertical="10dp" android:tag="accent1"> @@ -76,8 +77,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:format12Hour="hh • mm" - android:format24Hour="kk • mm" + android:format12Hour="hh:mm" + android:format24Hour="HH:mm" android:includeFontPadding="false" android:tag="text2|nolineheight" android:textColor="#000000" diff --git a/app/src/main/res/layout/preview_lockscreen_clock_37.xml b/app/src/main/res/layout/preview_lockscreen_clock_37.xml index 77c03bd41..de4e78218 100644 --- a/app/src/main/res/layout/preview_lockscreen_clock_37.xml +++ b/app/src/main/res/layout/preview_lockscreen_clock_37.xml @@ -90,6 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" + android:layout_marginTop="4dp" android:gravity="center" android:orientation="vertical"> diff --git a/app/src/main/res/layout/preview_lockscreen_clock_40.xml b/app/src/main/res/layout/preview_lockscreen_clock_40.xml index f85e7dd23..2202f6d0f 100644 --- a/app/src/main/res/layout/preview_lockscreen_clock_40.xml +++ b/app/src/main/res/layout/preview_lockscreen_clock_40.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:layout_gravity="start|center" android:layout_marginStart="12dp" - android:fontFamily="@font/japanese" + android:fontFamily="@font/japanese3017" android:format12Hour="hh : mm" android:format24Hour="HH : mm" android:includeFontPadding="false" diff --git a/app/src/main/res/layout/preview_lockscreen_clock_42.xml b/app/src/main/res/layout/preview_lockscreen_clock_42.xml index 5c9350af2..c8c79b017 100644 --- a/app/src/main/res/layout/preview_lockscreen_clock_42.xml +++ b/app/src/main/res/layout/preview_lockscreen_clock_42.xml @@ -54,9 +54,8 @@ + android:layout_marginHorizontal="10dp" + android:layout_marginTop="10dp"> - - - - - - - - - - - - + android:includeFontPadding="false" + android:tag="accent1" + android:text=" // " + android:textColor="@android:color/system_accent1_400" + android:textSize="22sp" + android:textStyle="bold" /> - - -