diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 251a446f..6a3868ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,7 @@ fdroid build: - .android script: # Put the correct versionName and versionCode in the .fdroid.yml - - sed -e "s/\${versionName}/$(grep "versionName " app/build.gradle | awk '{print $2}')/" -e "s/\${versionCode}/$(grep "versionCode" app/build.gradle | awk '{print $2}')/" .fdroid.yml.template > .fdroid.yml + - sed -e "s/\${versionName}/$(grep "versionName " app/build.gradle | awk '{print $2}' | tr -d \")$(grep "versionCode" app/build.gradle -m 1 | awk '{print $2}')/" -e "s/\${versionCode}/$(grep "versionCode" app/build.gradle -m 1 | awk '{print $2}')/" .fdroid.yml.template > .fdroid.yml - rm .fdroid.yml.template - test -d build || mkdir build - test -d fdroidserver || mkdir fdroidserver diff --git a/Screenshots/camera.xcf b/Screenshots/camera.xcf index b2ae41fe..f4dddde8 100644 Binary files a/Screenshots/camera.xcf and b/Screenshots/camera.xcf differ diff --git a/Screenshots/comment.xcf b/Screenshots/comment.xcf index b49c04aa..bea884cd 100644 Binary files a/Screenshots/comment.xcf and b/Screenshots/comment.xcf differ diff --git a/Screenshots/dark-theme.xcf b/Screenshots/dark-theme.xcf index c07e8b52..5d52c83c 100644 Binary files a/Screenshots/dark-theme.xcf and b/Screenshots/dark-theme.xcf differ diff --git a/Screenshots/edit.xcf b/Screenshots/edit.xcf index 004bf42e..b068193e 100644 Binary files a/Screenshots/edit.xcf and b/Screenshots/edit.xcf differ diff --git a/Screenshots/featureGraphic.xcf b/Screenshots/featureGraphic.xcf index 38a68a75..5e8a1989 100644 Binary files a/Screenshots/featureGraphic.xcf and b/Screenshots/featureGraphic.xcf differ diff --git a/Screenshots/feed.xcf b/Screenshots/feed.xcf index 5d2ef72a..882fb4b9 100644 Binary files a/Screenshots/feed.xcf and b/Screenshots/feed.xcf differ diff --git a/Screenshots/multiAccount.xcf b/Screenshots/multiAccount.xcf index acbd5db0..40ea2e94 100644 Binary files a/Screenshots/multiAccount.xcf and b/Screenshots/multiAccount.xcf differ diff --git a/Screenshots/postCreation.xcf b/Screenshots/postCreation.xcf index 0a788aaf..23091033 100644 Binary files a/Screenshots/postCreation.xcf and b/Screenshots/postCreation.xcf differ diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png index b25ca7bc..bac04aca 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 6181fe3b..bd80c1f7 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/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot01.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot01.png index 6d1170ea..11ae4420 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot01.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot01.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot02.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot02.png index d4caae05..fd636f0a 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot02.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot02.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot03.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot03.png index 8934aeb8..45ad83e8 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot03.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot03.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot04.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot04.png index 9c8a84ba..6cdc2af7 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot04.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot04.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot05.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot05.png index 4b3eb5f6..59ce1362 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot05.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot05.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot06.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot06.png index 8f62800c..1820fe63 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot06.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot06.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot07.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot07.png index d6201973..a3c82696 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot07.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot07.png differ