diff --git a/.design/README.txt b/.design/README.txt new file mode 100644 index 000000000..50f868e1b --- /dev/null +++ b/.design/README.txt @@ -0,0 +1,4 @@ +VectorDrawable does not support all SVG features, such as shadows and masks. +Therefore the ic_launcher files are slightly different from the master files: no shadows, minor color tweaks, path optimisation. +Use ic_launcher_*.svg files to generate assets for the app icon +Use master_*.svg files to generate other assets (e.g. feature graphic, playstore icon) or to rework the icon design diff --git a/.design/ic_launcher_background.svg b/.design/ic_launcher_background.svg new file mode 100644 index 000000000..ceadd0702 --- /dev/null +++ b/.design/ic_launcher_background.svg @@ -0,0 +1,3 @@ + + + diff --git a/.design/ic_launcher_foreground.svg b/.design/ic_launcher_foreground.svg new file mode 100644 index 000000000..db8935ce8 --- /dev/null +++ b/.design/ic_launcher_foreground.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/.design/ic_launcher_monochrome.svg b/.design/ic_launcher_monochrome.svg new file mode 100644 index 000000000..49fec0194 --- /dev/null +++ b/.design/ic_launcher_monochrome.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/.design/master_color.svg b/.design/master_color.svg new file mode 100644 index 000000000..1c8696efe --- /dev/null +++ b/.design/master_color.svg @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.design/master_monochrome.svg b/.design/master_monochrome.svg new file mode 100644 index 000000000..14f87e5ed --- /dev/null +++ b/.design/master_monochrome.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/.scripts/generate_feature_graphic/featureGraphic.svg b/.scripts/generate_feature_graphic/featureGraphic.svg index f00a97f2c..85a1aed35 100644 --- a/.scripts/generate_feature_graphic/featureGraphic.svg +++ b/.scripts/generate_feature_graphic/featureGraphic.svg @@ -1,15 +1,76 @@ - -Catima - - - - - - - - - - -Loyalty Card Wallet + + +Loyalty Card Wallet +Catima + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.scripts/generate_feature_graphic/fonts/Lexend/Lexend-Regular.ttf b/.scripts/generate_feature_graphic/fonts/Lexend/Lexend-Regular.ttf new file mode 100644 index 000000000..eb69863c0 Binary files /dev/null and b/.scripts/generate_feature_graphic/fonts/Lexend/Lexend-Regular.ttf differ diff --git a/.scripts/generate_feature_graphic/fonts/Lexend_Deca/OFL.txt b/.scripts/generate_feature_graphic/fonts/Lexend/OFL.txt similarity index 97% rename from .scripts/generate_feature_graphic/fonts/Lexend_Deca/OFL.txt rename to .scripts/generate_feature_graphic/fonts/Lexend/OFL.txt index 6b6792485..e9296e88a 100644 --- a/.scripts/generate_feature_graphic/fonts/Lexend_Deca/OFL.txt +++ b/.scripts/generate_feature_graphic/fonts/Lexend/OFL.txt @@ -2,7 +2,7 @@ Copyright 2018 The Lexend Project Authors (https://github.com/googlefonts/lexend This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL +https://openfontlicense.org ----------------------------------------------------------- diff --git a/.scripts/generate_feature_graphic/fonts/Lexend_Deca/LexendDeca-ExtraLight.ttf b/.scripts/generate_feature_graphic/fonts/Lexend_Deca/LexendDeca-ExtraLight.ttf deleted file mode 100644 index 6e60a5e4b..000000000 Binary files a/.scripts/generate_feature_graphic/fonts/Lexend_Deca/LexendDeca-ExtraLight.ttf and /dev/null differ diff --git a/.scripts/generate_feature_graphic/fonts/Lobster/Lobster-Regular.ttf b/.scripts/generate_feature_graphic/fonts/Lobster/Lobster-Regular.ttf new file mode 100644 index 000000000..21c0073fd Binary files /dev/null and b/.scripts/generate_feature_graphic/fonts/Lobster/Lobster-Regular.ttf differ diff --git a/.scripts/generate_feature_graphic/fonts/Yesteryear/OFL.txt b/.scripts/generate_feature_graphic/fonts/Lobster/OFL.txt similarity index 94% rename from .scripts/generate_feature_graphic/fonts/Yesteryear/OFL.txt rename to .scripts/generate_feature_graphic/fonts/Lobster/OFL.txt index 794698638..56f179712 100644 --- a/.scripts/generate_feature_graphic/fonts/Yesteryear/OFL.txt +++ b/.scripts/generate_feature_graphic/fonts/Lobster/OFL.txt @@ -1,9 +1,8 @@ -Copyright (c) 2011 by Brian J. Bonislawsky DBA Astigmatic (AOETI) -(astigma@astigmatic.com), with Reserved Font Names "Yesteryear" +Copyright 2010 The Lobster Project Authors (https://github.com/impallari/The-Lobster-Font), with Reserved Font Name "Lobster". This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL +https://openfontlicense.org ----------------------------------------------------------- diff --git a/.scripts/generate_feature_graphic/fonts/Yesteryear/Yesteryear-Regular.ttf b/.scripts/generate_feature_graphic/fonts/Yesteryear/Yesteryear-Regular.ttf deleted file mode 100644 index b2b915520..000000000 Binary files a/.scripts/generate_feature_graphic/fonts/Yesteryear/Yesteryear-Regular.ttf and /dev/null differ diff --git a/.scripts/generate_feature_graphic/generate_feature_graphic.sh b/.scripts/generate_feature_graphic/generate_feature_graphic.sh index 838e92102..b9f4773bd 100755 --- a/.scripts/generate_feature_graphic/generate_feature_graphic.sh +++ b/.scripts/generate_feature_graphic/generate_feature_graphic.sh @@ -33,17 +33,16 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do perl -pi -e 's/Catima/$ENV{appname}/' featureGraphic.svg perl -pi -e 's/Loyalty Card Wallet/$ENV{subtext}/' featureGraphic.svg # Set correct font or font size for language if needed - # (Lexend Deca has limited support and some characters are big) - # We specifically need the Serif version because of the 200 weight + # (Lobster and Lexend have limited language support) case "$(basename "$lang")" in - bg|el-GR|ru-RU|uk) sed -i "s/Lexend Deca/Noto Serif/" featureGraphic.svg ;; - fa-IR) sed -i -e 's/svg direction="ltr"/svg direction="rtl"/' -e "s/Yesteryear/Noto Sans Arabic/" -e "s/Lexend Deca/Noto Sans Arabic/" featureGraphic.svg ;; - hi-IN) sed -i -e "s/Yesteryear/Noto Sans Devanagari/" -e "s/Lexend Deca/Noto Serif Devanagari/" featureGraphic.svg ;; - ja-JP) sed -i "s/Lexend Deca/Noto Serif CJK JP/" featureGraphic.svg ;; - kn-IN) sed -i -e 's/font-size="150"/font-size="100"/' -e "s/Yesteryear/Noto Serif Kannada/" featureGraphic.svg ;; - ko) sed -i "s/Lexend Deca/Noto Serif CJK KR/" featureGraphic.svg ;; - zh-CN) sed -i "s/Lexend Deca/Noto Serif CJK SC/" featureGraphic.svg ;; - zh-TW) sed -i -e "s/Yesteryear/Noto Sans CJK TC/" -e "s/Lexend Deca/Noto Serif CJK TC/" featureGraphic.svg ;; + bg|el-GR|ru-RU|uk) sed -i "s/Lexend/Noto Sans/" featureGraphic.svg ;; + fa-IR) sed -i -e 's/svg direction="ltr"/svg direction="rtl"/' -e "s/Lobster/Noto Sans Arabic/" -e "s/Lexend/Noto Sans Arabic/" featureGraphic.svg ;; + hi-IN) sed -i -e "s/Lobster/Noto Sans Devanagari/" -e "s/Lexend/Noto Sans Devanagari/" featureGraphic.svg ;; + ja-JP) sed -i "s/Lexend/Noto Sans CJK JP/" featureGraphic.svg ;; + kn-IN) sed -i -e 's/font-size="150"/font-size="125"/' -e "s/Lobster/Noto Sans Kannada/" featureGraphic.svg ;; + ko) sed -i "s/Lexend/Noto Sans CJK KR/" featureGraphic.svg ;; + zh-CN) sed -i "s/Lexend/Noto Sans CJK SC/" featureGraphic.svg ;; + zh-TW) sed -i -e "s/Lobster/Noto Sans CJK TC/" -e "s/Lexend/Noto Sans CJK TC/" featureGraphic.svg ;; *) ;; esac fi diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index 92d1a05ea..7fe86be4e 100644 Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 000000000..1123a86f4 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 74ada9a7c..f4b23782b 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -3,69 +3,57 @@ android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"> - + + android:pathData="M45.5,30.58L68.05,22.37C70.13,21.61 72.42,22.68 73.18,24.76L75.92,32.28L49.6,41.85L45.5,30.58Z" + android:fillColor="#F5A3A3"/> + android:pathData="M70.36,25.78C70.17,25.27 69.6,25 69.08,25.19L49.35,32.37L51.4,38.01L72.07,30.48L70.36,25.78ZM75.92,32.28L49.6,41.85L45.5,30.58L68.05,22.37C70.13,21.61 72.42,22.68 73.18,24.76L75.92,32.28Z" + android:fillColor="#CF1717"/> + android:pathData="M58.42,30.58L35.86,22.37C33.79,21.61 31.49,22.68 30.74,24.76L28,32.28L54.31,41.85L58.42,30.58Z" + android:fillColor="#F5A3A3"/> + android:pathData="M33.56,25.78C33.74,25.27 34.32,25 34.84,25.19L54.57,32.37L52.52,38.01L31.84,30.48L33.56,25.78ZM28,32.28L54.31,41.85L58.42,30.58L35.86,22.37C33.79,21.61 31.49,22.68 30.74,24.76L28,32.28Z" + android:fillColor="#DD1818"/> + android:pathData="M28.7,37.6C29.08,35.42 31.15,33.97 33.33,34.35L80.6,42.69C82.78,43.07 84.23,45.15 83.85,47.32L81.82,58.83C82.3,59.1 84.67,60.16 87.42,57.23V57.23C87.92,56.69 88.45,56.23 89.01,55.86C91.76,54.02 94,55.22 94,58.53C94,61.34 92.39,64.78 90.21,66.88C86.63,70.54 80.69,70.56 79.75,70.53L77.59,82.78C77.21,84.95 75.14,86.4 72.96,86.02L25.69,77.69C25.67,77.68 25.66,77.68 25.64,77.68C23.45,77.32 22,76.7 22,76C22,75.72 22.23,75.45 22.66,75.2C22.4,74.54 22.31,73.8 22.44,73.05L28.7,37.6Z" + android:fillColor="#B81414"/> + android:pathData="M90.67,60.75C90.67,61.85 89.93,63.24 89.01,63.86C88.09,64.47 87.34,64.07 87.34,62.97C87.34,61.86 88.09,60.47 89.01,59.86C89.93,59.24 90.67,59.64 90.67,60.75Z" + android:fillColor="#E82E2E"/> + android:pathData="M78,30C80.21,30 82,31.79 82,34V70C82,72.21 80.21,74 78,74H30C25.58,74 22,74.9 22,76V32C22,30.9 25.58,30 30,30H78Z" + android:fillColor="#E82E2E"/> + android:pathData="M51.2,54.25C51.62,53.53 52.53,53.29 53.25,53.7C53.94,54.1 54.2,54.98 53.84,55.68L53.76,55.82C53.4,56.52 53.65,57.4 54.35,57.8C55.04,58.2 55.93,57.98 56.36,57.32L56.44,57.18C56.87,56.52 57.75,56.3 58.45,56.7C59.16,57.12 59.41,58.03 58.99,58.75C57.75,60.9 55,61.64 52.85,60.4C50.7,59.15 49.96,56.4 51.2,54.25Z" + android:fillColor="#8A0F0F"/> + android:pathData="M52.79,54.25C52.38,53.53 51.46,53.29 50.75,53.7C50.05,54.1 49.8,54.98 50.16,55.68L50.23,55.82C50.6,56.52 50.34,57.4 49.65,57.8C48.95,58.2 48.07,57.98 47.64,57.32L47.56,57.18C47.13,56.52 46.24,56.3 45.55,56.7C44.83,57.12 44.59,58.03 45,58.75C46.24,60.9 49,61.64 51.15,60.4C53.3,59.15 54.04,56.4 52.79,54.25Z" + android:fillColor="#8A0F0F"/> + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml index c9df68105..012629149 100644 --- a/app/src/main/res/drawable/ic_launcher_monochrome.xml +++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml @@ -3,25 +3,34 @@ android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"> - - - - - + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 1084c2408..80faec845 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 1084c2408..80faec845 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100755 index bfc8b093d..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 000000000..b4d93ae73 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index e6cc13c81..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 000000000..e2014b7df Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100755 index cdd517e45..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 000000000..9f226661f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index be7dadace..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 000000000..e9552b3d8 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100755 index 51d2359b4..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 000000000..84793f3d1 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index dbb79a248..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..7e5d36646 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100755 index b8246bb90..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 000000000..05864604c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 0f206fc7d..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..877e714e6 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index dc17fc40c..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 000000000..bf64bcd77 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index fa4ebc885..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..fac2ea6d5 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml index 26cd1678c..d273596cf 100644 --- a/app/src/main/res/values/ic_launcher_background.xml +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #223355 - \ No newline at end of file + #1F4262 + diff --git a/docs/README.md b/docs/README.md index 76a5bf396..c7eb02b18 100644 --- a/docs/README.md +++ b/docs/README.md @@ -23,8 +23,6 @@ Copylefted libre software (GPLv3+) card management app. [![Feature graphic](https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/featureGraphic.png)](https://catima.app/) -*Logo by [Rose (TangentFoxy)](https://github.com/TangentFoxy), feature graphic by [Ziad OUALHADJ](https://github.com/ziadOUA)* - Stores your store loyalty and membership cards on your device, instead of having to carry them around. Supported barcodes: @@ -79,6 +77,8 @@ KEYSTORE=/path/to/keystore KEYSTORE_ALIAS=catima ./build.sh Help translate the app to your language from [our Hosted Weblate page](https://hosted.weblate.org/projects/catima/). -# Developer Note +# Special thanks This app is based on the great (but no longer developed) [Loyalty Card Keychain](https://github.com/brarcher/loyalty-card-locker) by [Branden Archer](https://github.com/brarcher). + +Logo and feature graphic contributed by [il-Luca](https://github.com/il-Luca), based on the original logo by [Rose (TangentFoxy)](https://github.com/TangentFoxy) and original feature graphic by [Ziad OUALHADJ](https://github.com/ziadOUA). diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png index 0f615edd0..a6b3b1331 100644 Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ diff --git a/logo.svg b/logo.svg deleted file mode 100644 index 26ab5100d..000000000 --- a/logo.svg +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - -