From ba73cf43b5d48afa64e3011a40bab2f3aff16358 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Fri, 17 Mar 2023 20:46:27 +0530 Subject: [PATCH 1/3] Change app icon to our custom icon --- AndroidManifest.xml | 2 +- res/drawable/e_backgroundclock.xml | 86 +++++++++++++++++ res/drawable/e_clock.xml | 33 +++++++ res/drawable/e_hourclock.xml | 32 +++++++ res/drawable/e_minuteclock.xml | 32 +++++++ res/drawable/e_secondclock.xml | 32 +++++++ res/drawable/ic_launcher_background.xml | 28 +++--- res/drawable/ic_launcher_foreground.xml | 118 ++++++++++++++++++------ res/drawable/ic_launcher_monochrome.xml | 26 ------ res/mipmap-anydpi/ic_launcher.xml | 24 +++-- 10 files changed, 337 insertions(+), 76 deletions(-) create mode 100644 res/drawable/e_backgroundclock.xml create mode 100644 res/drawable/e_clock.xml create mode 100644 res/drawable/e_hourclock.xml create mode 100644 res/drawable/e_minuteclock.xml create mode 100644 res/drawable/e_secondclock.xml delete mode 100644 res/drawable/ic_launcher_monochrome.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b3717f7b5..4cdeeb8e2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -51,7 +51,7 @@ android:supportsRtl="true" android:theme="@style/Theme.DeskClock"> - + diff --git a/res/drawable/e_backgroundclock.xml b/res/drawable/e_backgroundclock.xml new file mode 100644 index 000000000..c321776e4 --- /dev/null +++ b/res/drawable/e_backgroundclock.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/e_clock.xml b/res/drawable/e_clock.xml new file mode 100644 index 000000000..a0f809ce0 --- /dev/null +++ b/res/drawable/e_clock.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + diff --git a/res/drawable/e_hourclock.xml b/res/drawable/e_hourclock.xml new file mode 100644 index 000000000..41af1dbc9 --- /dev/null +++ b/res/drawable/e_hourclock.xml @@ -0,0 +1,32 @@ + + + + + + + + diff --git a/res/drawable/e_minuteclock.xml b/res/drawable/e_minuteclock.xml new file mode 100644 index 000000000..3cb024c73 --- /dev/null +++ b/res/drawable/e_minuteclock.xml @@ -0,0 +1,32 @@ + + + + + + + + diff --git a/res/drawable/e_secondclock.xml b/res/drawable/e_secondclock.xml new file mode 100644 index 000000000..934f23be1 --- /dev/null +++ b/res/drawable/e_secondclock.xml @@ -0,0 +1,32 @@ + + + + + + + + diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml index 8bb038e44..46be0492a 100644 --- a/res/drawable/ic_launcher_background.xml +++ b/res/drawable/ic_launcher_background.xml @@ -1,8 +1,19 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - + android:fillColor="#225180"/> diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml index 5f494b6ee..bcb861172 100644 --- a/res/drawable/ic_launcher_foreground.xml +++ b/res/drawable/ic_launcher_foreground.xml @@ -1,39 +1,97 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/ic_launcher_monochrome.xml b/res/drawable/ic_launcher_monochrome.xml deleted file mode 100644 index 3ac6a73c0..000000000 --- a/res/drawable/ic_launcher_monochrome.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml index b58c81ff9..463b2ba98 100644 --- a/res/mipmap-anydpi/ic_launcher.xml +++ b/res/mipmap-anydpi/ic_launcher.xml @@ -1,10 +1,22 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - + + + + -- GitLab From 8745c4e44a3a1342cdbba54cbb8bf8a83043d540 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Tue, 23 Jul 2024 20:20:15 +0530 Subject: [PATCH 2/3] Theme app according to our palette --- Android.bp | 4 ++-- res/color/checkbox_color.xml | 21 +++++++++++++++++++ res/drawable/digit_background.xml | 2 +- res/drawable/ic_caret_down.xml | 2 +- res/drawable/ic_caret_up.xml | 2 +- res/drawable/popup_background.xml | 2 +- res/layout-land/desk_clock.xml | 4 ++-- res/layout/alarm_time_collapsed.xml | 2 +- res/layout/alarm_time_expanded.xml | 2 +- res/layout/city_list_item.xml | 3 ++- res/layout/collapsing_toolbar_base_layout.xml | 2 +- res/layout/desk_clock.xml | 4 ++-- .../preference_widget_switch_compat.xml | 2 +- res/layout/timer_setup_digits.xml | 2 -- res/layout/widget_switch_compat.xml | 2 +- res/values-sw320dp/dimens.xml | 1 + res/values/colors.xml | 18 ++++++++-------- res/values/dimens.xml | 3 ++- res/values/styles.xml | 7 ++++--- res/values/themes.xml | 5 ++++- 20 files changed, 58 insertions(+), 32 deletions(-) create mode 100644 res/color/checkbox_color.xml diff --git a/Android.bp b/Android.bp index ffafc993a..08035049b 100644 --- a/Android.bp +++ b/Android.bp @@ -21,7 +21,6 @@ android_app { "androidx.collection_collection", "androidx.arch.core_core-common", "androidx.lifecycle_lifecycle-common", - "com.google.android.material_material", "androidx.lifecycle_lifecycle-runtime", "androidx.transition_transition", "androidx.core_core", @@ -30,7 +29,8 @@ android_app { "androidx.appcompat_appcompat", "androidx.gridlayout_gridlayout", "androidx.recyclerview_recyclerview", - "androidx-constraintlayout_constraintlayout" + "androidx-constraintlayout_constraintlayout", + "elib", ], required: [ "com.android.deskclock_allowlist", diff --git a/res/color/checkbox_color.xml b/res/color/checkbox_color.xml new file mode 100644 index 000000000..852841877 --- /dev/null +++ b/res/color/checkbox_color.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/res/drawable/digit_background.xml b/res/drawable/digit_background.xml index 95d91de47..f276dad82 100644 --- a/res/drawable/digit_background.xml +++ b/res/drawable/digit_background.xml @@ -3,5 +3,5 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"> - + diff --git a/res/drawable/ic_caret_down.xml b/res/drawable/ic_caret_down.xml index a5c8e69ad..fa6581c45 100644 --- a/res/drawable/ic_caret_down.xml +++ b/res/drawable/ic_caret_down.xml @@ -22,7 +22,7 @@ android:bottom="8dp"> - + diff --git a/res/drawable/ic_caret_up.xml b/res/drawable/ic_caret_up.xml index 93a947407..f7285890f 100644 --- a/res/drawable/ic_caret_up.xml +++ b/res/drawable/ic_caret_up.xml @@ -22,7 +22,7 @@ android:bottom="8dp"> - + diff --git a/res/drawable/popup_background.xml b/res/drawable/popup_background.xml index 66ef3597c..9582aacd3 100644 --- a/res/drawable/popup_background.xml +++ b/res/drawable/popup_background.xml @@ -3,5 +3,5 @@ android:shape="rectangle"> - + diff --git a/res/layout-land/desk_clock.xml b/res/layout-land/desk_clock.xml index b8a121f3d..b77baf845 100644 --- a/res/layout-land/desk_clock.xml +++ b/res/layout-land/desk_clock.xml @@ -98,7 +98,7 @@ android:layout_margin="@dimen/fab_margin" android:contentDescription="@null" app:borderWidth="0dp" - app:fabCustomSize="@dimen/fab_height" + app:fabCustomSize="@dimen/fab_size" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -127,7 +127,7 @@ android:id="@+id/bottom_view" android:layout_width="match_parent" android:layout_height="72dp" - android:background="@color/secondary_color" + android:background="@color/e_action_bar_dark" app:menu="@menu/bottom_navigation_menu" app:itemIconTint="@color/tab_tint_color" app:itemTextColor="@color/tab_tint_color" diff --git a/res/layout/alarm_time_collapsed.xml b/res/layout/alarm_time_collapsed.xml index 490811144..ae7ada0fa 100644 --- a/res/layout/alarm_time_collapsed.xml +++ b/res/layout/alarm_time_collapsed.xml @@ -67,7 +67,7 @@ app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_caret_down" /> - - + android:clickable="false" + android:buttonTint="@color/checkbox_color" /> - - 60sp + 60sp diff --git a/res/values/colors.xml b/res/values/colors.xml index a35a9e41e..ad8155f8a 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -28,27 +28,27 @@ #00000000 - @android:color/system_neutral1_900 + @color/e_background_dark - @android:color/system_accent1_200 - @android:color/system_accent2_200 - @android:color/system_neutral1_800 - @android:color/system_neutral2_800 + @color/e_accent_dark + @color/e_accent_dark + @color/e_floating_background_dark + @color/e_floating_background_dark - @color/accent_100 + @color/e_switch_thumb_on @color/black - @color/default_background + @color/e_switch_thumb_off - @color/accent_color + @color/e_switch_track_on - @color/system_neutral2_500 + @color/e_switch_track_off @android:color/system_neutral2_300 @android:color/system_neutral2_500 diff --git a/res/values/dimens.xml b/res/values/dimens.xml index bf5128d1a..2e7c64982 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -51,7 +51,7 @@ 16sp 36sp 16sp - 72sp + 66sp 120dip 30dp @@ -129,4 +129,5 @@ 80dp 12dp 16dp + 72dp diff --git a/res/values/styles.xml b/res/values/styles.xml index 3cb625ba6..15aaf36c1 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -84,7 +84,8 @@ showTitle|homeAsUp - @@ -110,8 +111,8 @@ diff --git a/res/values/themes.xml b/res/values/themes.xml index b9ed4ad9e..341887586 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -19,7 +19,7 @@