diff --git a/README.md b/README.md index 1fd51a3..a74de54 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ [![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://stand-with-ukraine.pp.ua) - +[![Codemagic build status](https://api.codemagic.io/apps/659998e6caf611b8969ad389/659998e6caf611b8969ad388/status_badge.svg)](https://codemagic.io/apps/659998e6caf611b8969ad389/659998e6caf611b8969ad388/latest_build) # Ethical Scanner - Ethical Scanner is a Flutter project for Android and iOS mobile application that scans the barcode of a product and tells you if the product meets your ethical standards. @@ -393,3 +392,5 @@ name and ethical status. screenshot screenshot + +screenshot diff --git a/android/app/build.gradle b/android/app/build.gradle index 4ffb3be..24ac89d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -27,8 +27,7 @@ if (flutterVersionName == null) { def keyProperties = new Properties() def keyPropertiesFile = rootProject.file('key.properties') if (keyPropertiesFile.exists()) { - keyPropertiesFile.withReader('UTF-8') { reader -> - keyProperties.load(reader) + keyPropertiesFile.withReader('UTF-8') { reader -> keyProperties.load(reader) } } @@ -70,10 +69,18 @@ android { } signingConfigs { production { - storeFile file(SIGNING_KEY_RELEASE_PATH) - storePassword SIGNING_KEY_RELEASE_PASSWORD - keyAlias SIGNING_KEY_RELEASE_KEY - keyPassword SIGNING_KEY_RELEASE_KEY_PASSWORD + // CI=true is exported by Codemagic + if (System.getenv()["CI"]) { + storeFile file(System.getenv()["CM_KEYSTORE_PATH"]) + storePassword System.getenv()["CM_KEYSTORE_PASSWORD"] + keyAlias System.getenv()["CM_KEY_ALIAS"] + keyPassword System.getenv()["CM_KEY_PASSWORD"] + } else { + storeFile file(SIGNING_KEY_RELEASE_PATH) + storePassword SIGNING_KEY_RELEASE_PASSWORD + keyAlias SIGNING_KEY_RELEASE_KEY + keyPassword SIGNING_KEY_RELEASE_KEY_PASSWORD + } } dev { storeFile file(SIGNING_KEY_DEBUG_PATH) diff --git a/screenshots/home_android__tablet_portrait_20240106.png b/screenshots/home_android__tablet_portrait_20240106.png new file mode 100644 index 0000000..bf7f7db Binary files /dev/null and b/screenshots/home_android__tablet_portrait_20240106.png differ diff --git a/screenshots/home_android_phone_nexus_portrait_20240106.png b/screenshots/home_android_phone_nexus_portrait_20240106.png new file mode 100644 index 0000000..d5423a5 Binary files /dev/null and b/screenshots/home_android_phone_nexus_portrait_20240106.png differ diff --git a/screenshots/home_android_phone_pixel_portrait_20240106.png b/screenshots/home_android_phone_pixel_portrait_20240106.png new file mode 100644 index 0000000..5c1933f Binary files /dev/null and b/screenshots/home_android_phone_pixel_portrait_20240106.png differ diff --git a/screenshots/home_android_tablet_pixel_portrait_20240106.png b/screenshots/home_android_tablet_pixel_portrait_20240106.png new file mode 100644 index 0000000..9e0d9d5 Binary files /dev/null and b/screenshots/home_android_tablet_pixel_portrait_20240106.png differ diff --git a/screenshots/scan_android_phone_portrait_20240106.png b/screenshots/scan_android_phone_portrait_20240106.png new file mode 100644 index 0000000..e30cdc0 Binary files /dev/null and b/screenshots/scan_android_phone_portrait_20240106.png differ diff --git a/screenshots/scan_android_tablet_portrait_20240106.png b/screenshots/scan_android_tablet_portrait_20240106.png new file mode 100644 index 0000000..ccdd1df Binary files /dev/null and b/screenshots/scan_android_tablet_portrait_20240106.png differ