From 1f3ab39f4855a7b4f6001bfe67c4cc2524926526 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 2 Jun 2025 23:20:32 +0200 Subject: [PATCH 1/2] Add license --- LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..7a4a3ea24 --- /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 7dec9208bc7a4df8defc23474ec90e1578d3f1f6 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Tue, 22 Oct 2024 13:26:14 +0530 Subject: [PATCH 2/2] Theme app according to our palette --- Android.bp | 1 + res/drawable/cancel.xml | 2 +- res/drawable/color.xml | 2 +- res/drawable/color_select.xml | 2 +- res/drawable/crop.xml | 2 +- res/drawable/crop_1_1.xml | 2 +- res/drawable/crop_1_1_select.xml | 2 +- res/drawable/crop_crop.xml | 2 +- res/drawable/crop_free.xml | 2 +- res/drawable/crop_free_select.xml | 2 +- res/drawable/crop_original.xml | 2 +- res/drawable/crop_original_select.xml | 2 +- res/drawable/crop_rotate.xml | 2 +- res/drawable/crop_select.xml | 2 +- res/drawable/crop_straighten.xml | 2 +- res/drawable/done.xml | 2 +- res/drawable/exposure.xml | 2 +- res/drawable/exposure_select.xml | 2 +- res/drawable/frames.xml | 6 ++-- res/drawable/frames_select.xml | 6 ++-- res/drawable/ic_watermark.xml | 4 +-- res/drawable/ic_watermark_emotion.xml | 8 ++--- res/drawable/ic_watermark_food.xml | 4 +-- res/drawable/ic_watermark_location.xml | 4 +-- res/drawable/ic_watermark_selected.xml | 4 +-- res/drawable/ic_watermark_time.xml | 34 +++++++++---------- res/drawable/ic_watermark_weather.xml | 2 +- res/drawable/more.xml | 2 +- res/layout/filtershow_actionbar.xml | 2 +- res/layout/filtershow_actionbar_effects.xml | 2 +- .../filtershow_category_geometry_panel.xml | 8 ++--- res/layout/filtershow_export_dialog.xml | 2 +- res/values/cm_colors.xml | 2 +- res/values/colors.xml | 2 +- res/values/filtershow_color.xml | 30 ++++++++-------- res/values/filtershow_styles.xml | 4 +-- res/values/styles.xml | 6 ++++ .../filtershow/category/EditorCropPanel.java | 4 +-- .../filtershow/category/IconView.java | 2 +- 39 files changed, 90 insertions(+), 83 deletions(-) diff --git a/Android.bp b/Android.bp index 1f2b94bdd..b641aac6d 100644 --- a/Android.bp +++ b/Android.bp @@ -16,6 +16,7 @@ android_app { "com.android.gallery3d.common2", "xmp_toolkit", "mp4parser", + "elib", ], srcs: [ diff --git a/res/drawable/cancel.xml b/res/drawable/cancel.xml index 335e60930..894138962 100644 --- a/res/drawable/cancel.xml +++ b/res/drawable/cancel.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/e_icon_color"/> diff --git a/res/drawable/color.xml b/res/drawable/color.xml index d2dc37e26..c0f8245fa 100644 --- a/res/drawable/color.xml +++ b/res/drawable/color.xml @@ -34,5 +34,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/e_icon_color"/> diff --git a/res/drawable/color_select.xml b/res/drawable/color_select.xml index 79d107021..2bbc0ed01 100644 --- a/res/drawable/color_select.xml +++ b/res/drawable/color_select.xml @@ -35,5 +35,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/e_accent"/> diff --git a/res/drawable/crop.xml b/res/drawable/crop.xml index 25ff64968..82e090630 100644 --- a/res/drawable/crop.xml +++ b/res/drawable/crop.xml @@ -34,5 +34,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/e_icon_color"/> diff --git a/res/drawable/crop_1_1.xml b/res/drawable/crop_1_1.xml index 332eff7e7..b7c3a9295 100644 --- a/res/drawable/crop_1_1.xml +++ b/res/drawable/crop_1_1.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_1_1_select.xml b/res/drawable/crop_1_1_select.xml index 892870714..560bec61a 100644 --- a/res/drawable/crop_1_1_select.xml +++ b/res/drawable/crop_1_1_select.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_crop.xml b/res/drawable/crop_crop.xml index 0272da20d..6e343c20b 100644 --- a/res/drawable/crop_crop.xml +++ b/res/drawable/crop_crop.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_free.xml b/res/drawable/crop_free.xml index eac62fb24..3e2877e55 100644 --- a/res/drawable/crop_free.xml +++ b/res/drawable/crop_free.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_free_select.xml b/res/drawable/crop_free_select.xml index f24699731..3f3dd4106 100644 --- a/res/drawable/crop_free_select.xml +++ b/res/drawable/crop_free_select.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_original.xml b/res/drawable/crop_original.xml index 91eef6c0c..663ef66b7 100644 --- a/res/drawable/crop_original.xml +++ b/res/drawable/crop_original.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_original_select.xml b/res/drawable/crop_original_select.xml index 3bb0f7694..565f670c3 100644 --- a/res/drawable/crop_original_select.xml +++ b/res/drawable/crop_original_select.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_rotate.xml b/res/drawable/crop_rotate.xml index 8caf459e4..2a79128c2 100644 --- a/res/drawable/crop_rotate.xml +++ b/res/drawable/crop_rotate.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_select.xml b/res/drawable/crop_select.xml index f2a8269f9..f6dbbfa23 100644 --- a/res/drawable/crop_select.xml +++ b/res/drawable/crop_select.xml @@ -35,5 +35,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/e_accent"/> diff --git a/res/drawable/crop_straighten.xml b/res/drawable/crop_straighten.xml index 9fda1f484..713467caf 100644 --- a/res/drawable/crop_straighten.xml +++ b/res/drawable/crop_straighten.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/done.xml b/res/drawable/done.xml index 439357c61..e68e42d2b 100644 --- a/res/drawable/done.xml +++ b/res/drawable/done.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/e_icon_color"/> diff --git a/res/drawable/exposure.xml b/res/drawable/exposure.xml index ad0a64f4f..8f61803db 100644 --- a/res/drawable/exposure.xml +++ b/res/drawable/exposure.xml @@ -34,5 +34,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/e_icon_color"/> diff --git a/res/drawable/exposure_select.xml b/res/drawable/exposure_select.xml index 7386e4c01..249f069b9 100644 --- a/res/drawable/exposure_select.xml +++ b/res/drawable/exposure_select.xml @@ -35,5 +35,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/e_accent"/> diff --git a/res/drawable/frames.xml b/res/drawable/frames.xml index f668e4dce..d585af556 100644 --- a/res/drawable/frames.xml +++ b/res/drawable/frames.xml @@ -34,11 +34,11 @@ android:viewportHeight="32.0"> + android:fillColor="@color/e_icon_color"/> + android:fillColor="@color/e_icon_color"/> + android:fillColor="@color/e_icon_color"/> diff --git a/res/drawable/frames_select.xml b/res/drawable/frames_select.xml index 6fa77e7cc..f14e0f290 100644 --- a/res/drawable/frames_select.xml +++ b/res/drawable/frames_select.xml @@ -35,11 +35,11 @@ android:viewportHeight="32.0"> + android:fillColor="@color/e_accent"/> + android:fillColor="@color/e_accent"/> + android:fillColor="@color/e_accent"/> diff --git a/res/drawable/ic_watermark.xml b/res/drawable/ic_watermark.xml index 1c579413f..a08985028 100644 --- a/res/drawable/ic_watermark.xml +++ b/res/drawable/ic_watermark.xml @@ -34,7 +34,7 @@ android:viewportHeight="27"> \ No newline at end of file diff --git a/res/drawable/ic_watermark_emotion.xml b/res/drawable/ic_watermark_emotion.xml index bed9457cd..5a229f5b5 100644 --- a/res/drawable/ic_watermark_emotion.xml +++ b/res/drawable/ic_watermark_emotion.xml @@ -34,26 +34,26 @@ android:viewportHeight="1008"> \ No newline at end of file diff --git a/res/drawable/ic_watermark_location.xml b/res/drawable/ic_watermark_location.xml index d430b6060..3e700f419 100644 --- a/res/drawable/ic_watermark_location.xml +++ b/res/drawable/ic_watermark_location.xml @@ -29,6 +29,6 @@ --> - - + + diff --git a/res/drawable/ic_watermark_selected.xml b/res/drawable/ic_watermark_selected.xml index 736c66bc4..764ba2ae9 100644 --- a/res/drawable/ic_watermark_selected.xml +++ b/res/drawable/ic_watermark_selected.xml @@ -34,7 +34,7 @@ android:viewportHeight="27"> \ No newline at end of file diff --git a/res/drawable/ic_watermark_time.xml b/res/drawable/ic_watermark_time.xml index 9a0b9d8c5..7f6519b13 100644 --- a/res/drawable/ic_watermark_time.xml +++ b/res/drawable/ic_watermark_time.xml @@ -34,13 +34,13 @@ android:viewportHeight="360"> android:strokeMiterLimit="10" android:pathData="M79.3,177.8" /> @@ -67,57 +67,57 @@ L180.2,52.6z" /> android:strokeMiterLimit="10" android:pathData="M279.7,177.8" /> @@ -132,11 +132,11 @@ L180.2,52.6z" /> android:strokeMiterLimit="10" android:pathData="M 179.5 177.8 H 179.5 V 177.8 H 179.5 V 177.8 Z" /> \ No newline at end of file diff --git a/res/drawable/ic_watermark_weather.xml b/res/drawable/ic_watermark_weather.xml index d1477ab88..5047c908c 100644 --- a/res/drawable/ic_watermark_weather.xml +++ b/res/drawable/ic_watermark_weather.xml @@ -34,7 +34,7 @@ android:viewportHeight="1008"> + android:fillColor="@color/e_icon_color"/> diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml index a71e933ab..6a0601197 100644 --- a/res/layout/filtershow_actionbar.xml +++ b/res/layout/filtershow_actionbar.xml @@ -40,6 +40,6 @@ android:text="@string/save" android:textAllCaps="true" android:layout_gravity="center_vertical|right" - android:textColor="@color/white" /> + android:textColor="@color/e_secondary_text_color" /> diff --git a/res/layout/filtershow_actionbar_effects.xml b/res/layout/filtershow_actionbar_effects.xml index 48ed3b397..c558c5549 100644 --- a/res/layout/filtershow_actionbar_effects.xml +++ b/res/layout/filtershow_actionbar_effects.xml @@ -53,7 +53,7 @@ android:drawableEnd="@drawable/spinner_triangle" android:gravity="center" android:text="@string/apply_effect" - android:textColor="@color/white" + android:textColor="@color/e_primary_text_color" android:textSize="16sp" /> diff --git a/res/layout/filtershow_category_geometry_panel.xml b/res/layout/filtershow_category_geometry_panel.xml index 50515d6ac..98130c398 100644 --- a/res/layout/filtershow_category_geometry_panel.xml +++ b/res/layout/filtershow_category_geometry_panel.xml @@ -66,7 +66,7 @@ android:clickable="true" android:background="@android:color/transparent" android:layout_marginTop="@dimen/crop_text_margin_padding" - android:textColor="#ffffff" + android:textColor="@color/e_icon_color" android:textSize="12sp" /> @@ -95,7 +95,7 @@ android:clickable="true" android:background="@android:color/transparent" android:layout_marginTop="@dimen/crop_text_margin_padding" - android:textColor="#ffffff" + android:textColor="@color/e_icon_color" android:textSize="12sp" /> @@ -124,7 +124,7 @@ android:clickable="true" android:background="@android:color/transparent" android:layout_marginTop="@dimen/crop_text_margin_padding" - android:textColor="#ffffff" + android:textColor="@color/e_icon_color" android:textSize="12sp" /> @@ -149,7 +149,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="16sp" - android:textColor="#fff" + android:textColor="@color/e_icon_color" android:layout_gravity="center"/> #333333 #000000 - #33b5e5 + @color/e_accent #fafafa #212121 diff --git a/res/values/colors.xml b/res/values/colors.xml index 35aefa5d3..e7c967d99 100755 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -83,7 +83,7 @@ @color/primary @color/white @color/black - @color/black + @color/e_action_bar #009688 @color/black_transparent_4 @color/black_transparent_3 diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml index f9b05d9f3..1288706ee 100644 --- a/res/values/filtershow_color.xml +++ b/res/values/filtershow_color.xml @@ -20,7 +20,7 @@ #FF0000 #0000FF @color/white - #212121 + @color/e_background #363949 #232323 #333333 @@ -53,21 +53,21 @@ #DE000000 #00FF0000 - #80000000 - #80000000 - #80000000 - #80000000 - #80000000 - #80000000 - #80000000 - #80000000 - #80000000 - #80000000 + @color/e_background + @color/e_background + @color/e_background + @color/e_background + @color/e_background + @color/e_background + @color/e_background + @color/e_background + @color/e_background + @color/e_background - #80000000 - #A5000000 - #A5000000 - #4f92e9 + @color/e_background + @color/e_action_bar + @color/e_action_bar + @color/e_icon_color #80ffffff #4592F9 diff --git a/res/values/filtershow_styles.xml b/res/values/filtershow_styles.xml index 6fa76a2af..be8b14246 100644 --- a/res/values/filtershow_styles.xml +++ b/res/values/filtershow_styles.xml @@ -65,11 +65,11 @@ \ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml index d71483025..de5fdde6c 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -43,6 +43,12 @@ @null @style/FilterShowActionBar @style/FilterShowToolbar + @color/e_floating_background + @color/e_floating_background + @color/e_primary_text_color + @color/e_secondary_text_color + @color/e_action_bar + @bool/isLight