diff --git a/Android.bp b/Android.bp index ffafc993a7a8d3ee74e1dd3fcede0ab6f19ad82a..08035049b3f66010e9fc4fe75048fad6c948fb07 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/AndroidManifest.xml b/AndroidManifest.xml index b3717f7b5fb249a0576140681c4a84f7de52a440..4cdeeb8e276a9edbda0e7b9e0f55d4b53bb6ebd4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -51,7 +51,7 @@ android:supportsRtl="true" android:theme="@style/Theme.DeskClock"> - + diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..7a4a3ea2424c09fbe48d455aed1eaa94d9124835 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/res/color/checkbox_color.xml b/res/color/checkbox_color.xml new file mode 100644 index 0000000000000000000000000000000000000000..852841877b6eed37552ff677488b301a74272689 --- /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 95d91de47c67a925f13af222634a1b1cc22051e0..f276dad829c51f50bfc137d376e1f19d7024b51e 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/e_backgroundclock.xml b/res/drawable/e_backgroundclock.xml new file mode 100644 index 0000000000000000000000000000000000000000..c321776e4a1e8a50018db411c1c33e0ee28499a7 --- /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 0000000000000000000000000000000000000000..a0f809ce0b67cce8c28a2e04e5f81c7134815258 --- /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 0000000000000000000000000000000000000000..41af1dbc9d1ea37ca5b6e13cb37a445d7c90050b --- /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 0000000000000000000000000000000000000000..3cb024c736b18f2ded3980f39eda4290c13e0025 --- /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 0000000000000000000000000000000000000000..934f23be154770d83baeaf740315de10a9791438 --- /dev/null +++ b/res/drawable/e_secondclock.xml @@ -0,0 +1,32 @@ + + + + + + + + diff --git a/res/drawable/ic_caret_down.xml b/res/drawable/ic_caret_down.xml index a5c8e69adb81af3c7cd1e08e7ad5ddd796c75ef7..fa6581c45bf41ffecc53e5dbd720cede6f058229 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 93a947407626158aea2423f093cc1f14d7bd668a..f7285890f581f71d9b1bec66e53120f6c6fe2620 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/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml index 8bb038e444cfbb1f6bb339d10b4c695668b4115a..46be0492a5e10bb6147d22566c86ec96dc754fa0 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 5f494b6ee5f7f7326d97b984283991ce5bf79b18..bcb86117237e26958539d8b0276f116c45988699 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 3ac6a73c030ef02a68991e838ba2ac903dcca33a..0000000000000000000000000000000000000000 --- a/res/drawable/ic_launcher_monochrome.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/res/drawable/popup_background.xml b/res/drawable/popup_background.xml index 66ef3597c8c8fe6a6b676ed3c9f29ded8e54973f..9582aacd32031f4dd3e144c97cccf38bf67795b2 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 b8a121f3d5710b733ae9b2ed3c79d3470ee50feb..b77baf84563db041ba100208d516b097cdea3854 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 490811144667417f4a268d743f0c882aa3c4b274..ae7ada0faccd5b09f53d0fff3c595d9e7e598e2a 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" /> - - + ~ 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/values-sw320dp/dimens.xml b/res/values-sw320dp/dimens.xml index 724353acc23f85ea16b7199a134869acd5b59eb4..22bd64a8a5ea18db88db532ae14dbb6b9d5327ea 100644 --- a/res/values-sw320dp/dimens.xml +++ b/res/values-sw320dp/dimens.xml @@ -16,4 +16,5 @@ 60sp + 60sp diff --git a/res/values/colors.xml b/res/values/colors.xml index a35a9e41e3d983fd75d42911d4b234335963d5aa..ad8155f8a6c498402b80ec6bc5d71751b64ef30c 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 bf5128d1afe69f43f4d5b6bcd16e6718025ecc13..2e7c64982755297d8cdef49bfbd8339fdbff6c32 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 3cb625ba6e3b84f4d2b72b1896d44df8fbaad038..15aaf36c15fbdf426307808fd02ae4e00ad86fb7 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 b9ed4ad9e958ac8f048b93fb422a7e34dafe875d..3418875865a9816f3e093310054cf88148bd86fa 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -19,7 +19,7 @@