Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ branch names, credentials, signing material, or other secrets.
- After creating and verifying a release, update the corresponding F-Droid submission/build recipe
when required. The repository's F-Droid-related files are for reproducible verification, not an
excuse to maintain a duplicate unused build path.
- MegaProxyIdentity SVGs are the sole source for owned artwork; screenshots and the local GitHub
download badge are exceptions. Regenerate committed PNG/XML with
`bundle exec fastlane android update_graphics [ref:FULL_SHA]`; keep source/output hashes in
`assets/branding/identity-lock.json`. Normal builds must remain offline with respect to artwork.
- Store F-Droid listing metadata and current store artwork under `fastlane/metadata/android`.
Obsolete artwork does not need an archive copy in the working tree because Git preserves history.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[![Android 8+](https://img.shields.io/badge/Android-8.0%2B-3DDC84?logo=android&logoColor=white)](https://developer.android.com/about/versions/oreo)

<p align="center">
<img src="assets/branding/megaproxy-launcher-master.png" width="160" alt="MegaProxy app icon">
<img src="fastlane/metadata/android/en-US/images/icon.png" width="160" alt="MegaProxy app icon">
</p>

MegaProxy is an open-source Android VPN client for HTTPS, SOCKS5, MASQUE α (HTTP/3)
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 0 additions & 10 deletions app/src/main/res/drawable/ic_vpn_notification.xml

This file was deleted.

3 changes: 2 additions & 1 deletion app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generated by scripts/update_graphics.py; edit MegaProxyIdentity SVG sources. -->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" />
<background android:drawable="@mipmap/ic_launcher_background" />
<foreground android:drawable="@mipmap/ic_launcher_foreground" />
</adaptive-icon>
3 changes: 2 additions & 1 deletion app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generated by scripts/update_graphics.py; edit MegaProxyIdentity SVG sources. -->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" />
<background android:drawable="@mipmap/ic_launcher_background" />
<foreground android:drawable="@mipmap/ic_launcher_foreground" />
</adaptive-icon>
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions app/src/main/res/values/ic_launcher_colors.xml

This file was deleted.

121 changes: 121 additions & 0 deletions assets/branding/IDENTITY-LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
Creative Commons Legal Code

CC0 1.0 Universal

CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
HEREUNDER.

Statement of Purpose

The laws of most jurisdictions throughout the world automatically confer
exclusive Copyright and Related Rights (defined below) upon the creator
and subsequent owner(s) (each and all, an "owner") of an original work of
authorship and/or a database (each, a "Work").

Certain owners wish to permanently relinquish those rights to a Work for
the purpose of contributing to a commons of creative, cultural and
scientific works ("Commons") that the public can reliably and without fear
of later claims of infringement build upon, modify, incorporate in other
works, reuse and redistribute as freely as possible in any form whatsoever
and for any purposes, including without limitation commercial purposes.
These owners may contribute to the Commons to promote the ideal of a free
culture and the further production of creative, cultural and scientific
works, or to gain reputation or greater distribution for their Work in
part through the use and efforts of others.

For these and/or other purposes and motivations, and without any
expectation of additional consideration or compensation, the person
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
is an owner of Copyright and Related Rights in the Work, voluntarily
elects to apply CC0 to the Work and publicly distribute the Work under its
terms, with knowledge of his or her Copyright and Related Rights in the
Work and the meaning and intended legal effect of CC0 on those rights.

1. Copyright and Related Rights. A Work made available under CC0 may be
protected by copyright and related or neighboring rights ("Copyright and
Related Rights"). Copyright and Related Rights include, but are not
limited to, the following:

i. the right to reproduce, adapt, distribute, perform, display,
communicate, and translate a Work;
ii. moral rights retained by the original author(s) and/or performer(s);
iii. publicity and privacy rights pertaining to a person's image or
likeness depicted in a Work;
iv. rights protecting against unfair competition in regards to a Work,
subject to the limitations in paragraph 4(a), below;
v. rights protecting the extraction, dissemination, use and reuse of data
in a Work;
vi. database rights (such as those arising under Directive 96/9/EC of the
European Parliament and of the Council of 11 March 1996 on the legal
protection of databases, and under any national implementation
thereof, including any amended or successor version of such
directive); and
vii. other similar, equivalent or corresponding rights throughout the
world based on applicable law or treaty, and any national
implementations thereof.

2. Waiver. To the greatest extent permitted by, but not in contravention
of, applicable law, Affirmer hereby overtly, fully, permanently,
irrevocably and unconditionally waives, abandons, and surrenders all of
Affirmer's Copyright and Related Rights and associated claims and causes
of action, whether now known or unknown (including existing as well as
future claims and causes of action), in the Work (i) in all territories
worldwide, (ii) for the maximum duration provided by applicable law or
treaty (including future time extensions), (iii) in any current or future
medium and for any number of copies, and (iv) for any purpose whatsoever,
including without limitation commercial, advertising or promotional
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
member of the public at large and to the detriment of Affirmer's heirs and
successors, fully intending that such Waiver shall not be subject to
revocation, rescission, cancellation, termination, or any other legal or
equitable action to disrupt the quiet enjoyment of the Work by the public
as contemplated by Affirmer's express Statement of Purpose.

3. Public License Fallback. Should any part of the Waiver for any reason
be judged legally invalid or ineffective under applicable law, then the
Waiver shall be preserved to the maximum extent permitted taking into
account Affirmer's express Statement of Purpose. In addition, to the
extent the Waiver is so judged Affirmer hereby grants to each affected
person a royalty-free, non transferable, non sublicensable, non exclusive,
irrevocable and unconditional license to exercise Affirmer's Copyright and
Related Rights in the Work (i) in all territories worldwide, (ii) for the
maximum duration provided by applicable law or treaty (including future
time extensions), (iii) in any current or future medium and for any number
of copies, and (iv) for any purpose whatsoever, including without
limitation commercial, advertising or promotional purposes (the
"License"). The License shall be deemed effective as of the date CC0 was
applied by Affirmer to the Work. Should any part of the License for any
reason be judged legally invalid or ineffective under applicable law, such
partial invalidity or ineffectiveness shall not invalidate the remainder
of the License, and in such case Affirmer hereby affirms that he or she
will not (i) exercise any of his or her remaining Copyright and Related
Rights in the Work or (ii) assert any associated claims and causes of
action with respect to the Work, in either case contrary to Affirmer's
express Statement of Purpose.

4. Limitations and Disclaimers.

a. No trademark or patent rights held by Affirmer are waived, abandoned,
surrendered, licensed or otherwise affected by this document.
b. Affirmer offers the Work as-is and makes no representations or
warranties of any kind concerning the Work, express, implied,
statutory or otherwise, including without limitation warranties of
title, merchantability, fitness for a particular purpose, non
infringement, or the absence of latent or other defects, accuracy, or
the present or absence of errors, whether or not discoverable, all to
the greatest extent permissible under applicable law.
c. Affirmer disclaims responsibility for clearing rights of other persons
that may apply to the Work or any use thereof, including without
limitation any person's Copyright and Related Rights in the Work.
Further, Affirmer disclaims responsibility for obtaining any necessary
consents, permissions or other rights required for any use of the
Work.
d. Affirmer understands and acknowledges that Creative Commons is not a
party to this document and has no duty or obligation with respect to
this CC0 or use of the Work.
23 changes: 10 additions & 13 deletions assets/branding/README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
# MegaProxy branding assets
# Generated MegaProxy artwork

`megaproxy-launcher-master.png` is the current canonical raster artwork for the MegaProxy logo.
Use it as the visual source when regenerating derived application, store, or documentation assets.
[MegaProxyIdentity](https://github.com/andre487/MegaProxyIdentity) SVGs are the source of truth.
The retired raster masters are archived there under `Generative/AndroidMegaProxy`.

Derived assets live with the component that consumes them:
Run `bundle exec fastlane android update_graphics` to regenerate committed Android, store
and documentation artwork. `identity-lock.json` records the Identity revision, source/output
SHA-256 hashes and renderer version. `IDENTITY-LICENSE` applies to Identity-derived artwork.
Normal app builds use committed outputs and never download artwork.

- Android launcher resources: `app/src/main/res/mipmap-*`
- Store listing icon and graphics: `fastlane/metadata/android/*/images/`
- Repository and documentation graphics: `docs/assets/`
The GitHub badge remains a local exception: `docs/assets/get-it-on-github.svg` and its
notices stay here; its PNG is generated by the same command. Screenshots are maintained separately.

## GitHub download badge

`docs/assets/get-it-on-github.svg`, its PNG and notices are copied from AndroidMessage487.
The SVG contains outlined text; third-party attribution is in
[get-it-on-github-NOTICES.txt](../../docs/assets/get-it-on-github-NOTICES.txt).
README and installation guides use the PNG at a display height of 75 pixels.
Instructions: [English](../../docs/en/graphics.md) · [Русский](../../docs/ru/graphics.md).
52 changes: 52 additions & 0 deletions assets/branding/identity-lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"repository": "https://github.com/andre487/MegaProxyIdentity",
"commit": "fc236e43659602c3093726521d7c25bdd3536fe7",
"renderer": "rsvg-convert version 2.62.3\n\nlibraries used:\n cairo 1.18.6\n pango 1.58.2\n harfbuzz 14.6.0\n fontconfig 2.18.3",
"sources": {
"SVG/icon.svg": "193fe4e0848f934a17d095d2adc874430bb5a3b1311b25b4e614ff4918742299",
"SVG/icon-radius.svg": "7c276c805dbd641569d838831fcc355e671f9d17e577bcba1be22120978414e4",
"SVG/icon-round.svg": "21709d03ca94deb643f27c28765419a88fde0ff93564b347b61879e306e50d81",
"SVG/feature-graphic.svg": "cb76a52ba46da5e0ee63821325d5481731f17436059c9c026111d41c37a412a0",
"SVG/icon-taskbar.svg": "7ef9047c29cbdd67bf4553f2896f766b18e0c6a4d8b6bcc5c4f6fbbc32f27411",
"LICENSE": "a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499"
},
"local_sources": {
"docs/assets/get-it-on-github.svg": "a3463008b42db57aede368deb5cfb5d4b137c318f04d8fead00118bc64263693"
},
"outputs": {
"app/src/main/res/drawable-hdpi/ic_vpn_notification.png": "7b09c81a50e04a8b69bc67640f1362124b41bc0d7d887d06f46a7d15558e9969",
"app/src/main/res/drawable-mdpi/ic_vpn_notification.png": "45e99b714a2e87796fd6e6d791fa78a517587db31cd3439d68ae3716b595e2af",
"app/src/main/res/drawable-xhdpi/ic_vpn_notification.png": "c3cd48a947e5a8413ac2bc110a1096e7f8543b616e82525bd2e8e99c5d6d52d0",
"app/src/main/res/drawable-xxhdpi/ic_vpn_notification.png": "76e6a1583c280687a738910bea575ff2b32da5ceeb161ba33fd667b1ba9df2b5",
"app/src/main/res/drawable-xxxhdpi/ic_vpn_notification.png": "07f566dd7c14ea91b8850663ab625c73f442ab8dc28e5870664ba20dfb147583",
"app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml": "c4fe288de664c1d03457499c5e5c060695265f705ee0ab3222668efd7044bbc1",
"app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml": "c4fe288de664c1d03457499c5e5c060695265f705ee0ab3222668efd7044bbc1",
"app/src/main/res/mipmap-hdpi/ic_launcher.png": "07c3d4c38716577c9f42886e1d85fcc0af921cf56ee674fe4e44f15fa097fd86",
"app/src/main/res/mipmap-hdpi/ic_launcher_background.png": "b7bc17dbd5345a7b87c45ea6f1caae55a4dd7b5c283b420361b28b3ce604d2f9",
"app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png": "397b4ada2959790f22525dc2d3096e7981dcae39e3a9dfa0def9012cf8b3f74b",
"app/src/main/res/mipmap-hdpi/ic_launcher_round.png": "248599c82f2035734a16418794f73bc7399839cf2f5b9a1ffce7fa166128d416",
"app/src/main/res/mipmap-mdpi/ic_launcher.png": "a47be352b759e1251049b7cf947ac608c892a2606de5196ceabdbeca622679f4",
"app/src/main/res/mipmap-mdpi/ic_launcher_background.png": "06beddd6cb61455d1f8e3003a018141c83683266e9a189900c81ceae3d43784f",
"app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png": "d533928a889c31741a2688819c3644658bd953e31af09c7d19bb0dbaa90478c3",
"app/src/main/res/mipmap-mdpi/ic_launcher_round.png": "f7636b8f2be5dc929d3ad8f5cc7b347757dc0054612aea9ae5f391cf69f40d54",
"app/src/main/res/mipmap-xhdpi/ic_launcher.png": "e3f75e60d2fc048b252fea353468d3b6f9e609a8f68b17100728426619cff52b",
"app/src/main/res/mipmap-xhdpi/ic_launcher_background.png": "33e9efa0c5ec99b33e1ed09cfb352f0f88d4a744556176fd60d3dcd8203de2d5",
"app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png": "6c65f3a6c30062a33506f25fef78af602c34ac73979d5b803ecb58ccaefe8b1f",
"app/src/main/res/mipmap-xhdpi/ic_launcher_round.png": "c35ce610605451931a91f8daed0f29ea0717a1dd3c6516e4093362512c8e5601",
"app/src/main/res/mipmap-xxhdpi/ic_launcher.png": "ae5b1f6eb4155b6c0a57cf8d4ff5c1373d6c6cf7b2679ca188343b910136d052",
"app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png": "2087baf37a52a2bcb9eb7871f8e8cdd3f6c7ea5d0c6d960bdb177184628c4ebd",
"app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png": "a9d96a7e692414a55a954eb684d669eb927711189622f9faf7ee5eba6912cc22",
"app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png": "985db1ecd8cd245b3225b7eeda465ecc4dce2c2d736e3f2e11699f780c29574f",
"app/src/main/res/mipmap-xxxhdpi/ic_launcher.png": "34d31c5c2a82c08432fba53cd06b9acae09eb704db9759cca102664a56ca45df",
"app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png": "63885f095aa8a529a1d03e7219bcf5af6ff8b662e9ebf2bf8a8efdc03ff4eb54",
"app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png": "fb47c5ce427b8c8cc0c8435a2f3f5ab6ba6864404986416280f554ad7f225242",
"app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png": "ddfdbdd28730b37e127f6f20b46a505f8e63fc490298e1b5e8d2b592541c181a",
"assets/branding/IDENTITY-LICENSE": "a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499",
"docs/assets/get-it-on-github.png": "6f5cca8d2a224beff6ef2310c406dbda776f6f02ce6deb8791b30675df9e1da6",
"docs/assets/social-preview.png": "f435ead9047b3fbe29f856f10db3b1ba7a8cf8801242ba331534008c6aa36527",
"fastlane/metadata/android/en-US/images/featureGraphic.png": "6651973cc2b3432d319c131742645d427874944e2b72b5aa9db9c939426fe9b6",
"fastlane/metadata/android/en-US/images/icon.png": "0c4b997f0ee660e9ba677df0c30d89647afce787996ba42f156674adf25534bd",
"fastlane/metadata/android/ru-RU/images/featureGraphic.png": "6651973cc2b3432d319c131742645d427874944e2b72b5aa9db9c939426fe9b6",
"fastlane/metadata/android/ru-RU/images/icon.png": "0c4b997f0ee660e9ba677df0c30d89647afce787996ba42f156674adf25534bd"
}
}
Binary file removed assets/branding/megaproxy-launcher-master.png
Diff not rendered.
Binary file modified docs/assets/social-preview.png
1 change: 1 addition & 0 deletions docs/en/fastlane.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ explicit `JAVA_HOME` fails early. `bundle exec fastlane lanes` lists the checked
| Command | Result |
| --- | --- |
| `bundle exec fastlane android renew_config_schema` | Downloads and pins the current MegaProxyConfig schemas and examples; use `ref:FULL_SHA` for a reviewed revision. |
| `bundle exec fastlane android update_graphics` | Generates Android/store/docs artwork from MegaProxyIdentity SVGs; use `ref:FULL_SHA` to reproduce a pinned revision. |
| `bundle exec fastlane android python_format` | Formats Python scripts with pinned Black and isort. |
| `bundle exec fastlane android python_tests` | Runs Python unit tests. |
| `bundle exec fastlane android python_checks` | Checks Python formatting/import order and runs unit tests. |
Expand Down
Loading
Loading