From 102efa67ddb739653ed0ade3e8df239b383ce47b Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Fri, 9 Sep 2022 14:16:01 +0530 Subject: [PATCH 1/5] Change app icon to our custom icon --- res/drawable/ic_launcher_background.xml | 135 +++++++++++++++++------- res/drawable/ic_launcher_foreground.xml | 75 +++++-------- res/drawable/ic_launcher_monochrome.xml | 15 --- res/mipmap-anydpi/ic_launcher.xml | 22 ++-- 4 files changed, 138 insertions(+), 109 deletions(-) delete mode 100644 res/drawable/ic_launcher_monochrome.xml diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml index 4b7005db..001de406 100644 --- a/res/drawable/ic_launcher_background.xml +++ b/res/drawable/ic_launcher_background.xml @@ -1,47 +1,104 @@ + ~ Copyright Murena SAS 2024 + ~ 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_foreground.xml b/res/drawable/ic_launcher_foreground.xml index e2f10e21..3b3724fa 100644 --- a/res/drawable/ic_launcher_foreground.xml +++ b/res/drawable/ic_launcher_foreground.xml @@ -1,57 +1,34 @@ + ~ Copyright Murena SAS 2024 + ~ 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 e8f78b92..00000000 --- a/res/drawable/ic_launcher_monochrome.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml index b58c81ff..4b6f4091 100644 --- a/res/mipmap-anydpi/ic_launcher.xml +++ b/res/mipmap-anydpi/ic_launcher.xml @@ -1,10 +1,20 @@ + ~ Copyright Murena SAS 2024 + ~ 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 bb16806122c400acd961b695ea527f2e2da67430 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Tue, 20 Aug 2024 17:11:05 +0530 Subject: [PATCH 2/5] Theme app according to our palette --- Android.bp | 1 + res/layout/advanced_pad.xml | 2 +- res/layout/fragment_history.xml | 1 + res/layout/input_pad.xml | 8 ++++---- res/values-night/color.xml | 12 ++---------- res/values/color.xml | 15 ++++++++++----- res/values/themes.xml | 33 +++++++++++++++++++++++---------- 7 files changed, 42 insertions(+), 30 deletions(-) diff --git a/Android.bp b/Android.bp index e2c2a1cb..ef62148f 100644 --- a/Android.bp +++ b/Android.bp @@ -31,5 +31,6 @@ android_app { "com.google.android.material_material", "ExactCalculator_com.hp_crcalc", "kotlin-stdlib", + "elib", ], } diff --git a/res/layout/advanced_pad.xml b/res/layout/advanced_pad.xml index 4fe91d5e..e3474a45 100644 --- a/res/layout/advanced_pad.xml +++ b/res/layout/advanced_pad.xml @@ -10,7 +10,7 @@ style="@style/PadLayoutStyle.Advanced" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?colorSurface"> + android:background="@color/num_background"> + android:background="@color/num_background"> - - - @color/material_dynamic_neutral30 - @color/material_dynamic_neutral20 - - - @color/material_dynamic_neutral90 - @color/material_dynamic_neutral70 - @color/material_dynamic_secondary60 - + #343434 + #405262 diff --git a/res/values/color.xml b/res/values/color.xml index d49facdd..d58dbc67 100644 --- a/res/values/color.xml +++ b/res/values/color.xml @@ -6,12 +6,17 @@ - @color/material_dynamic_neutral95 - @color/material_dynamic_neutral90 + @color/e_background + @color/e_background_variant - @color/material_dynamic_neutral20 - @color/material_dynamic_neutral40 - @color/material_dynamic_neutral40 + @color/e_primary_text_color + @color/e_primary_text_color + @color/e_primary_text_color + #FAFAFA + #C9E5FF + @color/e_action_bar + @color/e_accent + @color/e_background diff --git a/res/values/themes.xml b/res/values/themes.xml index a19a1c7d..6aa902c1 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -6,10 +6,23 @@ + + + + -- GitLab From 97d1bd5650d1f25ef1cc21b646c41e07a7e80127 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 2 Jun 2025 23:20:31 +0200 Subject: [PATCH 3/5] Add license --- LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..7a4a3ea2 --- /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 -- GitLab From 8d3c4966352a5872dcf08c83d961232c56cdd053 Mon Sep 17 00:00:00 2001 From: Ivan Baheux Date: Wed, 16 Jul 2025 06:54:19 +0000 Subject: [PATCH 4/5] fix: let calculator overlap toolbar when horizontal --- res/layout/toolbar.xml | 2 +- res/values-land/dimens.xml | 7 +++++-- res/values-land/ratios.xml | 4 ++-- res/values/dimens.xml | 2 ++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml index afc6770e..0c8cd225 100644 --- a/res/layout/toolbar.xml +++ b/res/layout/toolbar.xml @@ -7,7 +7,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" + android:layout_height="@dimen/toolbar_height" android:layout_gravity="top"> + + 40dip + 8dip - 28dip + 10dip 16dip 16dip 42dip @@ -15,7 +18,7 @@ 8dip - 28dip + 10dip 16dip 16dip 42dip diff --git a/res/values-land/ratios.xml b/res/values-land/ratios.xml index 582d191a..d69e9fc2 100644 --- a/res/values-land/ratios.xml +++ b/res/values-land/ratios.xml @@ -5,8 +5,8 @@ --> - 0.4 - 0.6 + 0.45 + 0.55 0.33 diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 257776c3..fe11ecf6 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -4,6 +4,8 @@ SPDX-License-Identifier: Apache-2.0 --> + + 56dip 14dip -- GitLab From 64408bc21a5212a4ee0d76d71aa509a151abfdaa Mon Sep 17 00:00:00 2001 From: Ivan Baheux Date: Wed, 24 Sep 2025 09:48:26 +0200 Subject: [PATCH 5/5] ui: limit text size on large displays --- res/values/styles.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/res/values/styles.xml b/res/values/styles.xml index 3131ad1b..fe29c920 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -53,6 +53,10 @@ false 0dp @dimen/button_textsize + uniform + 10sp + @dimen/button_textsize + 0sp onButtonClick tnum, cv03, cv04 @dimen/button_horizontal_margin @@ -71,11 +75,13 @@ -- GitLab