diff --git a/README.md b/README.md index 6a2840a0b..2ad67003f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Translate - with Weblate](https://img.shields.io/badge/translate%20with-Weblate-green.svg?style=flat)](https://weblate.tusky.app/) [![OpenCollective](https://opencollective.com/tusky/backers/badge.svg)](https://opencollective.com/tusky/) [![Build Status](https://app.bitrise.io/app/a3e773c3c57a894c/status.svg?token=qLu_Ti4Gp2LWcYT4eo2INQ&branch=develop)](https://app.bitrise.io/app/a3e773c3c57a894c) # Tusky -![](/fastlane/metadata/android/en-US/images/icon.png) + Tusky is a beautiful Android client for [Mastodon](https://github.com/mastodon/mastodon). Mastodon is an ActivityPub federated social network. That means no single entity controls the whole network, rather, like e-mail, volunteers and organisations operate their own independent servers, users from which can all interact with each other seamlessly. diff --git a/app/src/blue/res/drawable/ic_launcher_background.xml b/app/src/blue/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 29d74ed8f..000000000 --- a/app/src/blue/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/blue/res/mipmap-hdpi/ic_launcher.png b/app/src/blue/res/mipmap-hdpi/ic_launcher.png index 2a27b8c08..023b25f7a 100644 Binary files a/app/src/blue/res/mipmap-hdpi/ic_launcher.png and b/app/src/blue/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/blue/res/mipmap-mdpi/ic_launcher.png b/app/src/blue/res/mipmap-mdpi/ic_launcher.png index cfd10bbdf..3463d7bb4 100644 Binary files a/app/src/blue/res/mipmap-mdpi/ic_launcher.png and b/app/src/blue/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/blue/res/mipmap-xhdpi/ic_launcher.png b/app/src/blue/res/mipmap-xhdpi/ic_launcher.png index 513aaf8b7..3694d986d 100644 Binary files a/app/src/blue/res/mipmap-xhdpi/ic_launcher.png and b/app/src/blue/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/blue/res/mipmap-xxhdpi/ic_launcher.png b/app/src/blue/res/mipmap-xxhdpi/ic_launcher.png index cc536fe61..2ef6e08ad 100644 Binary files a/app/src/blue/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/blue/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/blue/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/blue/res/mipmap-xxxhdpi/ic_launcher.png index c11643c51..88795199d 100644 Binary files a/app/src/blue/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/blue/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/green/res/drawable/ic_launcher_background.xml b/app/src/green/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 7fef14448..000000000 --- a/app/src/green/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/green/res/mipmap-hdpi/ic_launcher.png b/app/src/green/res/mipmap-hdpi/ic_launcher.png index eddd426d3..08960b923 100644 Binary files a/app/src/green/res/mipmap-hdpi/ic_launcher.png and b/app/src/green/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/green/res/mipmap-mdpi/ic_launcher.png b/app/src/green/res/mipmap-mdpi/ic_launcher.png index d56d05c13..1a769a71c 100644 Binary files a/app/src/green/res/mipmap-mdpi/ic_launcher.png and b/app/src/green/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/green/res/mipmap-xhdpi/ic_launcher.png b/app/src/green/res/mipmap-xhdpi/ic_launcher.png index b1a89a86c..33714c716 100644 Binary files a/app/src/green/res/mipmap-xhdpi/ic_launcher.png and b/app/src/green/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/green/res/mipmap-xxhdpi/ic_launcher.png b/app/src/green/res/mipmap-xxhdpi/ic_launcher.png index 73a09c230..5de70d9fd 100644 Binary files a/app/src/green/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/green/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/green/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/green/res/mipmap-xxxhdpi/ic_launcher.png index a043331fd..0297f2e19 100644 Binary files a/app/src/green/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/green/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/green/res/values/flavor-colors.xml b/app/src/green/res/values/flavor-colors.xml index e1f58f2ea..a5120eade 100644 --- a/app/src/green/res/values/flavor-colors.xml +++ b/app/src/green/res/values/flavor-colors.xml @@ -3,4 +3,6 @@ #19A341 + #097b44 + #39ff9e \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 349686902..5600bbe2d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,7 +170,7 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable-hdpi/ic_notify.png b/app/src/main/res/drawable-hdpi/ic_notify.png deleted file mode 100644 index 610161ea6..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_notify.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_notify.png b/app/src/main/res/drawable-mdpi/ic_notify.png deleted file mode 100644 index b61143b07..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_notify.png and /dev/null differ diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 0a1e7d8e8..000000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable-xhdpi/ic_notify.png b/app/src/main/res/drawable-xhdpi/ic_notify.png deleted file mode 100644 index 37f60b5f1..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_notify.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_notify.png b/app/src/main/res/drawable-xxhdpi/ic_notify.png deleted file mode 100644 index cf90f6887..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_notify.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index bf1bcaa21..283975f4c 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,13 +1,30 @@ - - - - - + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml index 53614b80d..fe445e76b 100644 --- a/app/src/main/res/drawable/ic_launcher_monochrome.xml +++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml @@ -1,12 +1,9 @@ + android:viewportHeight="1500" + android:viewportWidth="1500" + android:width="108dp"> - + android:pathData="m857.9,551.2c-16.8,0.1 -32.2,9.3 -40.5,23.9 -0.5,0.8 -0.9,1.7 -1.3,2.5 -4.7,10.1 -11.1,26.1 -15.8,48.7 -8.3,-5.4 -17.4,-10.3 -27.5,-14.5 -47.2,-19.6 -97.3,-23.3 -144.5,-13.8 -2.6,-3.6 -5.6,-6.9 -9,-9.7 -10.5,-8.8 -24.7,-14.8 -43.6,-12 -8.9,-7 -18.9,-10.5 -29.3,-10.8 -9.8,-0.4 -20.9,2.2 -31.8,9.7 -10.3,7.1 -22.3,21 -29.7,42.9 -23.7,8.5 -43.8,33.1 -35.5,73.8 1.4,6.9 4.9,16.4 9.3,26.4 -30.4,53.3 -38.4,113.9 -41.4,167.8 -1.8,32.9 4,87.1 7.7,120.3 4.1,35.7 27,62.6 62.6,66.4 6,0.6 11.6,0.5 16.8,-0.4 9.8,9.7 22.6,16.1 38.5,17.8 14.7,1.6 26.5,-1 36.3,-5.5 8.2,4.4 17.7,6.9 28.7,7.1 2.5,0 4.9,-0 7.2,-0.2 1.6,0.2 3.3,0.2 5,0 8.6,-1 23.3,-3.3 33.7,-12 22,8.9 52.6,18.8 92.9,26.6 31.3,6 57.6,6.9 78.2,5.8 32.8,-1.8 59.7,-26.6 64.2,-59.1 0,-0.1 0,-0.2 0,-0.2 2.1,-15.9 8.3,-29.3 14.1,-38.6 1.5,-2.3 4.4,-3.7 7.4,-5.8 7.6,-5.3 16.9,-10.6 26.9,-16.7 24.7,-15.1 53.2,-34.4 78.3,-64.8 76,-91.7 28.1,-185.4 -14.2,-235 -12.7,-15 -25.3,-24.7 -36.8,-32.4 -4.4,-2.9 -8.5,-5.5 -12.4,-8 -2,-1.3 -4.9,-3.5 -6.4,-4.6l-0,-0.4 -0.1,-0.8c0.6,-1.7 2.1,-5.5 3.1,-7.5 0,-0 0,-0.1 0,-0.1 8.1,-16.5 5.8,-36.2 -5.9,-50.4 -11.2,-13.7 -29.1,-19.8 -46.3,-16 -8.7,-12.9 -23.4,-20.7 -39.2,-20.6zM858.2,591.2c2.5,-0 4.8,1.3 6,3.4 3.7,6.3 8.3,14 11.1,18.9 1.6,2.8 5,4.2 8.1,3.3 5.5,-1.5 14.2,-3.8 21.9,-5.9 2.6,-0.7 5.4,0.2 7.2,2.3 1.7,2.1 2.1,5 0.9,7.5 -3.7,7.5 -7.3,16.6 -7.3,23.4 0.1,41.7 32.3,35.1 65.3,73.9 33,38.8 73.2,111.9 13.8,183.6 -10.8,13.1 -22.4,23.7 -33.9,32.7 2,-4.5 3.5,-8.7 4.6,-12.6 8,-28.8 -5.3,-60.8 -5.3,-60.8 0,0 -28.3,50.7 -67.2,66.7 -30.6,12.6 -60.3,4 -71.5,-0.2 -3.6,-1.4 -7.5,-1.3 -11,0.3 -14.3,6.5 -26.9,22.6 -21.3,45.4 6.3,25.8 31.6,42.4 81,36.6 -4.9,10.8 -9.1,23.7 -11,38 -1.9,13.6 -13.1,23.9 -26.8,24.7 -18,1 -41,0.1 -68.5,-5.1 -36.1,-6.9 -63.4,-15.6 -83,-23.4 0.7,-4.1 1.1,-8.4 1.3,-12.8 0.9,-20.9 -3.5,-44.7 -7.9,-62.5 -2.7,-10.7 -13.5,-17.2 -24.3,-14.5 -10.7,2.7 -17.2,13.5 -14.5,24.3 3.6,14.6 7.5,34 6.8,51.1 -0.1,1.4 -0.1,2.8 -0.2,4.2 -1.5,8.1 -6.7,18.8 -23.8,18.5 -25.4,-0.4 -28.4,-37.6 -28.7,-43.5 0.2,6.1 0.2,45.7 -32.6,42.2 -28.6,-3.1 -29,-46.9 -28.5,-59.7 -0.8,11 -5,44.6 -26.8,42.2 -16.2,-1.7 -25.3,-15.1 -27.2,-31.2 -3.6,-31.3 -9.3,-82.5 -7.6,-113.6 3,-54.1 10.5,-116.2 47.2,-167.4 -6.9,-13.1 -13.9,-27.8 -15.8,-37.1 -3.4,-16.6 3.2,-27.4 13.1,-29 6,-1 11.6,2.6 16.7,10 0.1,-9.8 0.8,-20.9 3.1,-29.5 5.3,-19.8 15.7,-30.2 23.5,-29.9 8.4,0.3 14.9,11.8 16.5,27 4.2,-7.1 10.4,-14.7 18.2,-16.3 15.3,-3.1 21,10 21,20.5 -0,3.3 -0.6,7.3 -1.5,11.5 49.6,-19.6 106,-21.2 158.2,0.5 65.9,27.4 78.4,94.6 86.8,109.2 9,15.8 20.2,25.7 35.1,19.5 17.5,-7.2 12.6,-29.8 1.5,-49.3 -15.2,-26.7 -49.6,-54.7 -41.5,-93.5 3.9,-18.6 9,-31.8 12.9,-40 1.2,-2.1 3.5,-3.5 5.9,-3.5zM754.5,820.1c-4.6,-2.4 -9.4,-8.1 -12.5,-14.6 -3.9,-7.9 -5,-17.9 4.9,-24.5 6.9,-4.5 14.6,-1.9 21.2,2.1 8.8,5.4 16.2,14 18.9,21.8 3.2,9.1 13.2,13.9 22.3,10.8 9.1,-3.2 13.9,-13.2 10.8,-22.3 -5.9,-17 -23.5,-36.9 -43.9,-45.3 -15.8,-6.5 -33,-6.6 -48.6,3.7 -28.3,18.7 -28.1,46.6 -17.1,69.1 6.7,13.8 17.9,25 27.6,30.1 8.5,4.5 19.1,1.3 23.7,-7.3 4.5,-8.5 1.3,-19.1 -7.3,-23.7zM969.9,551.6c-4,-6.6 -2.3,-15.2 3.8,-19.9 16.2,-12.3 45.2,-34.3 61.8,-46.8 3.3,-2.5 7.6,-3.6 11.7,-2.9 4.1,0.7 7.8,3.1 10.1,6.6 10.7,16.1 19.2,33.9 25,53.1 1.2,4.1 0.7,8.5 -1.5,12.2 -2.2,3.7 -5.8,6.3 -10,7.1 -20.6,4.3 -56.7,11.7 -76.2,15.8 -7.3,1.5 -14.6,-2.5 -17.3,-9.5 -2.1,-5.5 -4.6,-10.7 -7.6,-15.6zM838.8,515.8c-6.6,3.6 -14.8,1.8 -19.3,-4.2 -12.1,-15.9 -34.3,-45.2 -47,-62 -2.6,-3.4 -3.6,-7.7 -2.8,-11.9 0.8,-4.2 3.3,-7.9 6.9,-10.1 16.6,-10.4 34.8,-18.5 54.4,-23.9 4,-1.1 8.4,-0.5 11.9,1.7 3.6,2.2 6.1,5.8 6.9,9.9 4.2,20.3 11.6,56.1 15.7,76 1.6,7.6 -2.8,15.1 -10.2,17.5 -5.8,1.9 -11.3,4.2 -16.5,7.1zM912,507.4c-7.3,-2 -12,-9.2 -10.9,-16.7 3.1,-22.6 9.2,-66.8 12.4,-90.3 0.6,-4.2 2.9,-7.9 6.3,-10.4 3.5,-2.4 7.8,-3.3 11.9,-2.4 21.4,4.6 41.7,12.3 60.5,22.8 3.7,2.1 6.3,5.5 7.4,9.6 1,4.1 0.3,8.4 -2.1,11.9 -13,19.8 -37.5,57.1 -50,76.2 -4.2,6.4 -12.4,8.6 -19.3,5.3 -5.2,-2.5 -10.6,-4.5 -16.1,-6.1z" /> diff --git a/app/src/main/res/drawable/ic_notify.xml b/app/src/main/res/drawable/ic_notify.xml new file mode 100644 index 000000000..8baeb6311 --- /dev/null +++ b/app/src/main/res/drawable/ic_notify.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_quicksettings.xml b/app/src/main/res/drawable/ic_quicksettings.xml new file mode 100644 index 000000000..d3a4807df --- /dev/null +++ b/app/src/main/res/drawable/ic_quicksettings.xml @@ -0,0 +1,6 @@ + + + diff --git a/app/src/main/res/drawable/ic_splash.xml b/app/src/main/res/drawable/ic_splash.xml index 9405fce2a..90d7ab930 100644 --- a/app/src/main/res/drawable/ic_splash.xml +++ b/app/src/main/res/drawable/ic_splash.xml @@ -3,13 +3,9 @@ android:layout_height="240dp" android:layout_width="240dp"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_tusky.xml b/app/src/main/res/drawable/ic_tusky.xml deleted file mode 100644 index 0dc845c25..000000000 --- a/app/src/main/res/drawable/ic_tusky.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - 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 72f76c742..dd9dd02ba 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,10 +1,6 @@ - - - - + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 50a7cdb42..79a16f803 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -41,4 +41,7 @@ #CAD4E0 #d9e1e8 + + #09497b + #39acff diff --git a/assets/splash.xcf b/assets/splash.xcf deleted file mode 100644 index 1a7961419..000000000 Binary files a/assets/splash.xcf and /dev/null differ diff --git a/assets/tusky_banner.xcf b/assets/tusky_banner.xcf index d03726955..5ab43ef3a 100644 Binary files a/assets/tusky_banner.xcf and b/assets/tusky_banner.xcf differ diff --git a/assets/tusky_logo_borderless.png b/assets/tusky_logo_borderless.png deleted file mode 100644 index f921034d1..000000000 Binary files a/assets/tusky_logo_borderless.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png index 7cbef77df..a8256b186 100644 Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png index b9224c0d7..88795199d 100644 Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ