From 2f9d6a46dd8837371cae281dfd26b9aff33f3a78 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Wed, 14 May 2025 13:36:34 +0000 Subject: [PATCH 1/7] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 33e7cf8d..99e98c34 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -110,12 +110,12 @@ jobs: storePassword=${{ secrets.SIGNING_STORE_PASSWORD }} keyPassword=${{ secrets.SIGNING_KEY_PASSWORD }} keyAlias=${{ secrets.SIGNING_KEY_ALIAS }} - storeFile=my-release-key.jks + storeFile=upload-keystore.jks EOF - name: Decode keystore from secret run: | - printf "%s" "${{ secrets.SIGNING_KEY_JKS }}" | base64 -d > android/app/my-release-key.jks + printf "%s" "${{ secrets.SIGNING_KEY_JKS }}" | base64 -d > android/app/upload-keystore.jks - name: Build apk run: flutter build apk --release From 6e8701e629e61d812033ee70e23a6fbaa4c0789f Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Wed, 14 May 2025 13:43:35 +0000 Subject: [PATCH 2/7] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 99e98c34..b36344b8 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -107,15 +107,15 @@ jobs: - name: Create key.properties file run: | cat > android/key.properties < android/app/upload-keystore.jks + printf "%s" "${{ vars.SIGNING_KEY_JKS }}" | base64 -d > android/app/upload-keystore.jks - name: Build apk run: flutter build apk --release From 41d1c17426126efbc57cced7dab953ef3b369738 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Wed, 14 May 2025 14:11:46 +0000 Subject: [PATCH 3/7] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index b36344b8..ac5c51eb 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -16,6 +16,19 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Create key.properties file + run: | + cat > android/key.properties < android/app/upload-keystore.jks + - name: Cache Android SDK id: cache-sdk uses: "https://gitea.com/actions/cache@v4" @@ -104,19 +117,6 @@ jobs: - name: Test run: flutter test - - name: Create key.properties file - run: | - cat > android/key.properties < android/app/upload-keystore.jks - - name: Build apk run: flutter build apk --release From feec4813d8fee2dafbc243b6167e5e6dc382a9ec Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Wed, 14 May 2025 14:14:00 +0000 Subject: [PATCH 4/7] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index ac5c51eb..80825645 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -27,7 +27,8 @@ jobs: - name: Decode keystore from secret run: | - echo "%s" "${{ vars.SIGNING_KEY_JKS }}" | base64 -d > android/app/upload-keystore.jks + echo "${{ vars.SIGNING_KEY_JKS }}" + printf "%s" "${{ vars.SIGNING_KEY_JKS }}" | base64 -d > android/app/upload-keystore.jks - name: Cache Android SDK id: cache-sdk From 0c61d1679d59c0cac285a5811f6d0316ee290dc0 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Wed, 14 May 2025 14:18:08 +0000 Subject: [PATCH 5/7] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20.gitea/workflows/test.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 80825645..2969f792 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -4,7 +4,7 @@ on: [ pull_request ] env: flutter_version: "3.29.3" - java_version: "21.x" + java_version: "17" flutter_channel: "stable" my_local_cache_dir: "/opt/hostedtoolcache/" ANDROID_SDK_ROOT: "/opt/hostedtoolcache/Android/Sdk" From 82c8ee492a8fe15fe4de2cfd0992427477256fff Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Wed, 14 May 2025 17:23:53 +0300 Subject: [PATCH 6/7] fix(ci/cd): java version 17 >> 21.x --- .gitea/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 2969f792..80825645 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -4,7 +4,7 @@ on: [ pull_request ] env: flutter_version: "3.29.3" - java_version: "17" + java_version: "21.x" flutter_channel: "stable" my_local_cache_dir: "/opt/hostedtoolcache/" ANDROID_SDK_ROOT: "/opt/hostedtoolcache/Android/Sdk" From e18ec6036d8f2f560d80908e5aa658be1bb8e23c Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Wed, 14 May 2025 17:37:38 +0300 Subject: [PATCH 7/7] fix(screens): welcome and update screen issue --- lib/features/update_screen/presentation/update_screen.dart | 4 ++-- lib/features/welcome/presentation/pages/welcome_screen.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/features/update_screen/presentation/update_screen.dart b/lib/features/update_screen/presentation/update_screen.dart index d516d863..99e9e880 100644 --- a/lib/features/update_screen/presentation/update_screen.dart +++ b/lib/features/update_screen/presentation/update_screen.dart @@ -25,8 +25,8 @@ class UpdateScreen extends StatelessWidget { fit: BoxFit.cover, ), ), - SafeArea( - child: Positioned.fill( + Positioned.fill( + child: SafeArea( child: Padding( padding: const EdgeInsets.only(bottom: 16), child: Column( diff --git a/lib/features/welcome/presentation/pages/welcome_screen.dart b/lib/features/welcome/presentation/pages/welcome_screen.dart index 0ae017a1..b36e9233 100644 --- a/lib/features/welcome/presentation/pages/welcome_screen.dart +++ b/lib/features/welcome/presentation/pages/welcome_screen.dart @@ -37,8 +37,8 @@ class _WelcomeScreenState extends State { fit: BoxFit.cover, ), ), - SafeArea( - child: Positioned.fill( + Positioned.fill( + child: SafeArea( child: Padding( padding: const EdgeInsets.only(bottom: 16), child: Column(