From 25a46d03151a6bb883a037b10cb5e8bf58a585ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 13:29:33 +0000
Subject: [PATCH 01/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 2a2c6bc..e8cd21b 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -43,10 +43,10 @@ jobs:
             
       - name: Set android sign key for app building
         run: |
-          ls -la
           cd android 
           touch key.pem && echo $ANDROID_KEY > key.pem
           touch key.properties && echo $KEY_PROPERTIES > key.properties
+          pwd && ls -la && cat key.pem && cat key.properties
       - run: flutter pub get
 #       - run: flutter test
       - run: flutter build apk

From c3e717c423e2f774729d0ade155c08edddf97014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 13:37:24 +0000
Subject: [PATCH 02/40] Add files via upload

---
 android/upload-keystore.jks | Bin 0 -> 2599 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 android/upload-keystore.jks

diff --git a/android/upload-keystore.jks b/android/upload-keystore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..5f2ab56c87eb0eaa06ff39d84c1e1bfc7831e159
GIT binary patch
literal 2599
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

literal 0
HcmV?d00001


From a39cdd02f58ef492a46799575d2951beef75de84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 13:38:44 +0000
Subject: [PATCH 03/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index e8cd21b..90df468 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -14,7 +14,6 @@ on:
   workflow_dispatch:
 
 env:
-  ANDROID_KEY: ${{ secrets.ANDROID_KEY }}
   KEY_PROPERTIES: ${{ secrets.KEY_PROPERTIES }}
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
@@ -44,9 +43,7 @@ jobs:
       - name: Set android sign key for app building
         run: |
           cd android 
-          touch key.pem && echo $ANDROID_KEY > key.pem
           touch key.properties && echo $KEY_PROPERTIES > key.properties
-          pwd && ls -la && cat key.pem && cat key.properties
       - run: flutter pub get
 #       - run: flutter test
       - run: flutter build apk

From 105c4ece62de54a0e5ef087288be8e08a7d12272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 13:42:17 +0000
Subject: [PATCH 04/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 90df468..4c03423 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -46,6 +46,6 @@ jobs:
           touch key.properties && echo $KEY_PROPERTIES > key.properties
       - run: flutter pub get
 #       - run: flutter test
-      - run: flutter build apk
+      - run: flutter build apk --debug
       - run: ls -la
       - run: tree .

From f27a8b7dd8e4280665f9a22a0153640da18e445d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 15:26:41 +0000
Subject: [PATCH 05/40] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d95cac8..77834a9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# eoe_fans
+# EOEFANS
 
 A new Flutter project.
 

From fc48f007785aea4883f407c6e728b7a80664ea4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 15:28:54 +0000
Subject: [PATCH 06/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 4c03423..a4bc6b1 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -22,6 +22,9 @@ jobs:
   build:
     # The type of runner that the job will run on
     runs-on: [ self-hosted, Linux ]
+    environment:
+      name: "Development"
+    #       url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

From 5073c52aebe47e3348deaf5fb26d3c03d25b3397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 15:44:34 +0000
Subject: [PATCH 07/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index a4bc6b1..2f3730a 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -24,7 +24,6 @@ jobs:
     runs-on: [ self-hosted, Linux ]
     environment:
       name: "Development"
-    #       url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

From 33c4b98d64b581e617fbb4d27ce367e25d05a793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 16:37:39 +0000
Subject: [PATCH 08/40] Update build.gradle

---
 android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/build.gradle b/android/build.gradle
index 83ae220..7f2922a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

From 2398ba27528a60bfbb247ad9abc4e5606c0bc7fb Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 16:40:56 +0000
Subject: [PATCH 09/40] Revert "Update build.gradle"

This reverts commit 33c4b98d64b581e617fbb4d27ce367e25d05a793.
---
 android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/build.gradle b/android/build.gradle
index 7f2922a..83ae220 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

From 9ef34eaff96acfe5fb846b7a4796a2414314772b Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 16:41:40 +0000
Subject: [PATCH 10/40] test

---
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index cb24abd..84ddf08 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.2-all.zip

From 5faf12f91eb0408ca296130f4923c8598dc4b44d Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 16:43:22 +0000
Subject: [PATCH 11/40] Revert "test"

This reverts commit 9ef34eaff96acfe5fb846b7a4796a2414314772b.
---
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 84ddf08..cb24abd 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

From 53f76eb587fc8f66ea146338504281eefea8709e Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 16:44:23 +0000
Subject: [PATCH 12/40] chore

---
 .github/workflows/app-prebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 2f3730a..5351c41 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: EOEFANS PRE-BUIILD App CI
+name: EOEFANS PRE-BUILD App CI
 
 # Controls when the workflow will run
 on:

From 0ceba4363b37a7ba7071dc541e4c65526b307d0c Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 16:55:46 +0000
Subject: [PATCH 13/40] test

---
 .github/workflows/app-prebuild.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 5351c41..1fc2159 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -32,16 +32,14 @@ jobs:
       
       - uses: actions/setup-java@v3
         with:
-          java-version: '11'
           distribution: 'zulu'
+          java-version: "12.x"
+          cache: 'gradle'
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-        
       - uses: subosito/flutter-action@v2
         with:
           channel: 'stable' # or: 'beta', 'dev' or 'master'
-            
+          cache: true
       - name: Set android sign key for app building
         run: |
           cd android 

From 93425f1e4c5bc44621129c004c08bbe9c01069f6 Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 16:59:12 +0000
Subject: [PATCH 14/40] test

---
 .github/workflows/app-prebuild.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 1fc2159..63c6f9c 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -32,8 +32,7 @@ jobs:
       
       - uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
-          java-version: "12.x"
+          java-version: "8.x"
           cache: 'gradle'
 
       - uses: subosito/flutter-action@v2

From 94ab9a332754f1b212cfcc7a4f78c4aa3bbff71a Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 17:01:23 +0000
Subject: [PATCH 15/40] test

---
 .github/workflows/app-prebuild.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 63c6f9c..9badf7f 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -32,7 +32,8 @@ jobs:
       
       - uses: actions/setup-java@v3
         with:
-          java-version: "8.x"
+          distribution: "zulu"
+          java-version: "8"
           cache: 'gradle'
 
       - uses: subosito/flutter-action@v2

From f5acb7b0644b5f7a98e85d5a3bf5104dcb4a3fae Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 17:06:17 +0000
Subject: [PATCH 16/40] chore: add android sdk

---
 .github/workflows/app-prebuild.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 9badf7f..358de64 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -36,6 +36,9 @@ jobs:
           java-version: "8"
           cache: 'gradle'
 
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
+
       - uses: subosito/flutter-action@v2
         with:
           channel: 'stable' # or: 'beta', 'dev' or 'master'

From 3cd912e2e2f7a98e9a410e71cc74d64381d230d3 Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 17:10:11 +0000
Subject: [PATCH 17/40] fix java version

---
 .github/workflows/app-prebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 358de64..497396d 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -33,7 +33,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: "zulu"
-          java-version: "8"
+          java-version: "11"
           cache: 'gradle'
 
       - name: Setup Android SDK

From 68f49073989cb954af684b24be2034669a3f630f Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 17:26:48 +0000
Subject: [PATCH 18/40] add key

---
 .github/workflows/app-prebuild.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 497396d..8c0c43a 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -43,12 +43,12 @@ jobs:
         with:
           channel: 'stable' # or: 'beta', 'dev' or 'master'
           cache: true
-      - name: Set android sign key for app building
-        run: |
-          cd android 
-          touch key.properties && echo $KEY_PROPERTIES > key.properties
+      # - name: Set android sign key for app building
+      #   run: |
+      #     cd android 
+      #     touch key.properties && echo $KEY_PROPERTIES > key.properties
       - run: flutter pub get
 #       - run: flutter test
-      - run: flutter build apk --debug
+      - run: flutter build apk
       - run: ls -la
       - run: tree .

From 7aedac82d703889e2c420be5bec4408ce19a1f04 Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 17:32:23 +0000
Subject: [PATCH 19/40] test again

---
 .github/workflows/app-prebuild.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 8c0c43a..8ad6c61 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -43,10 +43,10 @@ jobs:
         with:
           channel: 'stable' # or: 'beta', 'dev' or 'master'
           cache: true
-      # - name: Set android sign key for app building
-      #   run: |
-      #     cd android 
-      #     touch key.properties && echo $KEY_PROPERTIES > key.properties
+      - name: Set android sign key for app building
+        run: |
+          cd android 
+          touch key.properties && echo $KEY_PROPERTIES >> key.properties
       - run: flutter pub get
 #       - run: flutter test
       - run: flutter build apk

From bbc1bf4236740fc2d1814c04c89484953586ff29 Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 17:36:19 +0000
Subject: [PATCH 20/40] checkout again after add key

---
 .github/workflows/app-prebuild.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 8ad6c61..5abcc54 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -47,6 +47,9 @@ jobs:
         run: |
           cd android 
           touch key.properties && echo $KEY_PROPERTIES >> key.properties
+
+      - uses: actions/checkout@v3
+
       - run: flutter pub get
 #       - run: flutter test
       - run: flutter build apk

From 6cb6af77ce064d33718fc74e603e619f26b0432a Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 17:40:48 +0000
Subject: [PATCH 21/40] cd back to work folder

---
 .github/workflows/app-prebuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 5abcc54..83d62c2 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -46,9 +46,9 @@ jobs:
       - name: Set android sign key for app building
         run: |
           cd android 
-          touch key.properties && echo $KEY_PROPERTIES >> key.properties
+          touch key.properties && echo $KEY_PROPERTIES >> key.properties 
+          ls -la && cd ../
 
-      - uses: actions/checkout@v3
 
       - run: flutter pub get
 #       - run: flutter test

From 7f0ef760ae7078b84eb56cda0ea355f3f58bc1f7 Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Wed, 15 Feb 2023 17:45:33 +0000
Subject: [PATCH 22/40] test

---
 .github/workflows/app-prebuild.yml    | 11 ++++++-----
 android/.gitignore                    |  1 -
 android/gradle/wrapper/key.properties |  4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 android/gradle/wrapper/key.properties

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 83d62c2..d881ea4 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -43,11 +43,12 @@ jobs:
         with:
           channel: 'stable' # or: 'beta', 'dev' or 'master'
           cache: true
-      - name: Set android sign key for app building
-        run: |
-          cd android 
-          touch key.properties && echo $KEY_PROPERTIES >> key.properties 
-          ls -la && cd ../
+      - run: pwd && ls -la
+      # - name: Set android sign key for app building
+      #   run: |
+      #     cd android 
+      #     touch key.properties && echo $KEY_PROPERTIES >> key.properties 
+      #     ls -la && cd ../
 
 
       - run: flutter pub get
diff --git a/android/.gitignore b/android/.gitignore
index 6f56801..d5f967a 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -8,6 +8,5 @@ GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
-key.properties
 **/*.keystore
 **/*.jks
diff --git a/android/gradle/wrapper/key.properties b/android/gradle/wrapper/key.properties
new file mode 100644
index 0000000..afb79bc
--- /dev/null
+++ b/android/gradle/wrapper/key.properties
@@ -0,0 +1,4 @@
+storePassword=123abc456d
+keyPassword=123abc456d
+keyAlias=upload
+storeFile=/runner/_work/eoefans-mobile-flutter/eoefans-mobile-flutter/android/upload-keystore.jks
\ No newline at end of file

From 5396bb8910ee3a51f8a49a65fed55251f3967af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 02:14:38 +0000
Subject: [PATCH 23/40] Add files via upload

---
 android/key.properties | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 android/key.properties

diff --git a/android/key.properties b/android/key.properties
new file mode 100644
index 0000000..cdab3e0
--- /dev/null
+++ b/android/key.properties
@@ -0,0 +1,4 @@
+storePassword=123abc456d
+keyPassword=123abc456d
+keyAlias=upload
+storeFile=D:/Android/upload-keystore.jks

From 09bc4e7fdcbe5319678a9c16b16d6fe338945841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 02:16:40 +0000
Subject: [PATCH 24/40] Update key.properties

---
 android/key.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/key.properties b/android/key.properties
index cdab3e0..caedede 100644
--- a/android/key.properties
+++ b/android/key.properties
@@ -1,4 +1,4 @@
 storePassword=123abc456d
 keyPassword=123abc456d
 keyAlias=upload
-storeFile=D:/Android/upload-keystore.jks
+storeFile=/runner/_work/eoefans-mobile-flutter/eoefans-mobile-flutter/android/upload-keystore.jks

From 6502a34d15b046d02000f2acc5406c944b2a1f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 02:23:18 +0000
Subject: [PATCH 25/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index d881ea4..c7b85df 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -54,5 +54,4 @@ jobs:
       - run: flutter pub get
 #       - run: flutter test
       - run: flutter build apk
-      - run: ls -la
-      - run: tree .
+      - run: ls -la ./build/app/output/apk/release

From 8064b98b7654833b1a54e39a8bcad9a0bc41203a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 02:29:04 +0000
Subject: [PATCH 26/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index c7b85df..5e7a41b 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -54,4 +54,4 @@ jobs:
       - run: flutter pub get
 #       - run: flutter test
       - run: flutter build apk
-      - run: ls -la ./build/app/output/apk/release
+      - run: apt install tree -y && tree .

From 8ee25fdf7c8d140b202e28c7a1025f34d7366d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 02:35:44 +0000
Subject: [PATCH 27/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 5e7a41b..c21f5f3 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -54,4 +54,4 @@ jobs:
       - run: flutter pub get
 #       - run: flutter test
       - run: flutter build apk
-      - run: apt install tree -y && tree .
+      - run: ls build/app/output/apk

From 061e0648af206b0b53ee35a8d21a4691eb168583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 02:41:58 +0000
Subject: [PATCH 28/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index c21f5f3..eecb8be 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -39,19 +39,20 @@ jobs:
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
 
+      - name: Set android sign key for app building
+        run: |
+          cd android 
+          touch key.properties && echo $KEY_PROPERTIES > key.properties
+          ls -la && cd ../
+
       - uses: subosito/flutter-action@v2
         with:
           channel: 'stable' # or: 'beta', 'dev' or 'master'
           cache: true
-      - run: pwd && ls -la
-      # - name: Set android sign key for app building
-      #   run: |
-      #     cd android 
-      #     touch key.properties && echo $KEY_PROPERTIES >> key.properties 
-      #     ls -la && cd ../
 
 
       - run: flutter pub get
 #       - run: flutter test
       - run: flutter build apk
-      - run: ls build/app/output/apk
+      - run: ls -la
+      - run: ls -la build

From cacbd1c3b7347090b82b6e5d1eee7d12051f0af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 02:47:21 +0000
Subject: [PATCH 29/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index eecb8be..2bfd27e 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -41,9 +41,8 @@ jobs:
 
       - name: Set android sign key for app building
         run: |
-          cd android 
-          touch key.properties && echo $KEY_PROPERTIES > key.properties
-          ls -la && cd ../
+          echo "$KEY_PROPERTIES" > android/key.properties
+          ls -la && cd ../ && ls -la
 
       - uses: subosito/flutter-action@v2
         with:

From 6fc08642351ff6143b86e2433768c527282591fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 02:48:09 +0000
Subject: [PATCH 30/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 2bfd27e..26394d7 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -42,8 +42,7 @@ jobs:
       - name: Set android sign key for app building
         run: |
           echo "$KEY_PROPERTIES" > android/key.properties
-          ls -la && cd ../ && ls -la
-
+          pwd $$ ls -la
       - uses: subosito/flutter-action@v2
         with:
           channel: 'stable' # or: 'beta', 'dev' or 'master'

From d9702690d3a7215aa0aebd56122dbfb97cfbf28e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 03:15:46 +0000
Subject: [PATCH 31/40] Delete key.properties

---
 android/key.properties | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 android/key.properties

diff --git a/android/key.properties b/android/key.properties
deleted file mode 100644
index caedede..0000000
--- a/android/key.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-storePassword=123abc456d
-keyPassword=123abc456d
-keyAlias=upload
-storeFile=/runner/_work/eoefans-mobile-flutter/eoefans-mobile-flutter/android/upload-keystore.jks

From 23d80ef963c45a1f643032cd307ebba533236a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 03:45:03 +0000
Subject: [PATCH 32/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 26394d7..81fc0b7 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -7,6 +7,7 @@ on:
   # Triggers the workflow on push or pull request events but only for the "main" branch
   push:
     branches: [ "main" ]
+    tags: [ "v*" ]
 #  pull_request:
 #    branches: [ "main" ]
 
@@ -48,9 +49,28 @@ jobs:
           channel: 'stable' # or: 'beta', 'dev' or 'master'
           cache: true
 
-
       - run: flutter pub get
 #       - run: flutter test
       - run: flutter build apk
-      - run: ls -la
-      - run: ls -la build
+      - name: list artifacts
+        run: |
+          ls -la
+          ls -la build/app/outputs/apk/release
+          
+      - name: upload apk
+        uses: actions/upload-artifact@v3
+        with:
+          name: app-release.apk
+          path: build/app/outputs/apk/release/app-release.apk
+          
+      - name: upload all artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: all.zip
+          path: build/app/outputs/apk/release/
+          
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: build/app/outputs/apk/release/app-release.apk

From 1ac478366635646a1bac7d954d86b64eb400b604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 03:48:41 +0000
Subject: [PATCH 33/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 81fc0b7..894e03c 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -24,7 +24,7 @@ jobs:
     # The type of runner that the job will run on
     runs-on: [ self-hosted, Linux ]
     environment:
-      name: "Development"
+      name: "Pre-build"
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

From 54437e871466bf4a170097432ac4ba8b389e3e7e Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 04:02:40 +0000
Subject: [PATCH 34/40] chore: rename apk

---
 .github/workflows/app-prebuild.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index 894e03c..deae42a 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -16,6 +16,7 @@ on:
 
 env:
   KEY_PROPERTIES: ${{ secrets.KEY_PROPERTIES }}
+#  IMAGE_TAG: "" #we get tag using the action down below
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -57,6 +58,11 @@ jobs:
           ls -la
           ls -la build/app/outputs/apk/release
           
+      - run: |
+          echo "IMAGE_TAG=${{steps.tag.outputs.tag}}" >> $GITHUB_ENV
+          echo $GITHUB_ENV
+          
+      
       - name: upload apk
         uses: actions/upload-artifact@v3
         with:
@@ -69,8 +75,12 @@ jobs:
           name: all.zip
           path: build/app/outputs/apk/release/
           
-      - name: Release
+      - name: rename apk
+        if: startsWith(github.ref, 'refs/tags/')
+        run: mv build/app/outputs/apk/release/app-release.apk build/app/outputs/apk/release/EOEFANS-${{ env.IMAGE_TAG }}.apk
+
+      - name: Publish release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: build/app/outputs/apk/release/app-release.apk
+          files: build/app/outputs/apk/release/EOEFANS-${{ env.IMAGE_TAG }}.apk

From d7e7ed4783c84fc63433735ab00d9bfa1af81f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 04:15:05 +0000
Subject: [PATCH 35/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index deae42a..fa93a99 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -58,6 +58,10 @@ jobs:
           ls -la
           ls -la build/app/outputs/apk/release
           
+      - name: Get tag
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+        
       - run: |
           echo "IMAGE_TAG=${{steps.tag.outputs.tag}}" >> $GITHUB_ENV
           echo $GITHUB_ENV

From bda052d6f3e363f7d5dc9ad15bda95eb31bae066 Mon Sep 17 00:00:00 2001
From: misakajimmy <misakajimmy@gmai.com>
Date: Thu, 16 Feb 2023 12:42:24 +0800
Subject: [PATCH 36/40] DEV UPDATE:1.6.2

---
 lib/routes/picture/pictureList.dart         | 126 +++++++++++-----
 lib/routes/picture/pictureMemberFilter.dart |  20 ++-
 lib/routes/picture/picturePage.dart         |   2 +-
 lib/routes/picture/pictureSwiper.dart       | 159 +++++++++++---------
 lib/routes/video/videoSwiper.dart           |   4 +-
 pubspec.yaml                                |   3 +-
 6 files changed, 190 insertions(+), 124 deletions(-)

diff --git a/lib/routes/picture/pictureList.dart b/lib/routes/picture/pictureList.dart
index 19f3ea9..8b54231 100644
--- a/lib/routes/picture/pictureList.dart
+++ b/lib/routes/picture/pictureList.dart
@@ -8,6 +8,7 @@ import 'package:eoe_fans/routes/picture/pictureMemberFilter.dart';
 import 'package:eoe_fans/routes/picture/pictureSwiper.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class PictureList extends StatefulWidget {
@@ -27,13 +28,35 @@ class _PictureListState extends State<PictureList> {
   bool _loading = false;
   MemberEnum? _memberFilter;
   List<Dynamic> dynamicList = [];
+  List<Widget> listWidgets = [];
 
   @override
   void initState() {
     _getPictures();
+    _initListWidgets();
     super.initState();
   }
 
+  _initListWidgets() {
+    listWidgets = [
+      StaggeredGridTile.count(
+        crossAxisCellCount: 4,
+        mainAxisCellCount: 1,
+        child: Center(
+          child: Container(
+            child: PictureMemberFilter(
+              filter: _memberFilter,
+              updateFilterMember: (MemberEnum? value) {
+                _memberFilter = value;
+                _reloadPictures();
+              },
+            ),
+          ),
+        ),
+      )
+    ];
+  }
+
   _getPictures() async {
     setState(() {
       _loading = true;
@@ -68,6 +91,24 @@ class _PictureListState extends State<PictureList> {
     if (pictures.result.length != 0) {
       setState(() {
         dynamicList = [...dynamicList, ...pictures.result];
+        listWidgets = [
+          ...listWidgets,
+          ...pictures.result.map(
+            (e) {
+              return StaggeredGridTile.count(
+                crossAxisCellCount: 2,
+                mainAxisCellCount: 3,
+                child: Card(
+                  clipBehavior: Clip.antiAliasWithSaveLayer,
+                  child: PictureSwiper(
+                    dynamicId: e.dynamic_id.toString(),
+                    images: e.pictures.map((e) => e.img_src).toList(),
+                  ),
+                ),
+              );
+            },
+          ).toList()
+        ];
         _loading = false;
       });
     } else {
@@ -79,6 +120,9 @@ class _PictureListState extends State<PictureList> {
 
   _reloadPictures({int? page}) async {
     dynamicList = [];
+    setState(() {
+      _initListWidgets();
+    });
     _page = page ?? 0;
     await _getPictures();
   }
@@ -121,45 +165,51 @@ class _PictureListState extends State<PictureList> {
       controller: _refreshController,
       onRefresh: _onRefresh,
       onLoading: _onLoading,
-      child: ListView.builder(
-        itemBuilder: (c, i) => Container(
-          child: i == 0
-              ? SizedBox(
-                  width: double.infinity,
-                  height: 84,
-                  child: PictureMemberFilter(
-                    filter: _memberFilter,
-                    updateFilterMember: (MemberEnum? value) {
-                      _memberFilter = value;
-                      _reloadPictures();
-                    },
-                  ),
-                )
-              : SizedBox(
-                  width: double.infinity,
-                  height: 480,
-                  child: Card(
-                    clipBehavior: Clip.antiAliasWithSaveLayer,
-                    child: PictureSwiper(
-                      dynamicId: dynamicList[i].dynamic_id.toString(),
-                      images: dynamicList[i]
-                          .pictures
-                          .map((e) => e.img_src)
-                          .toList(),
-                    ),
-                  ),
-                ),
-
-          // child: Center(
-          //   child: Image(
-          //     image: CachedNetworkImageProvider(dynamicList[i].pictures[0].img_src),
-          //     fit: BoxFit.fitWidth,
-          //     width: double.infinity,
-          //   ),
-          // ),
-        ),
-        itemCount: dynamicList.length,
+      child: StaggeredGrid.count(
+        crossAxisCount: 4,
+        mainAxisSpacing: 4,
+        crossAxisSpacing: 4,
+        children: listWidgets,
       ),
+      // child: ListView.builder(
+      //   itemBuilder: (c, i) => Container(
+      //     child: i == 0
+      //         ? SizedBox(
+      //             width: double.infinity,
+      //             height: 84,
+      //             child: PictureMemberFilter(
+      //               filter: _memberFilter,
+      //               updateFilterMember: (MemberEnum? value) {
+      //                 _memberFilter = value;
+      //                 _reloadPictures();
+      //               },
+      //             ),
+      //           )
+      //         : SizedBox(
+      //             width: double.infinity,
+      //             height: 480,
+      //             child: Card(
+      //               clipBehavior: Clip.antiAliasWithSaveLayer,
+      //               child: PictureSwiper(
+      //                 dynamicId: dynamicList[i].dynamic_id.toString(),
+      //                 images: dynamicList[i]
+      //                     .pictures
+      //                     .map((e) => e.img_src)
+      //                     .toList(),
+      //               ),
+      //             ),
+      //           ),
+      //
+      //     // child: Center(
+      //     //   child: Image(
+      //     //     image: CachedNetworkImageProvider(dynamicList[i].pictures[0].img_src),
+      //     //     fit: BoxFit.fitWidth,
+      //     //     width: double.infinity,
+      //     //   ),
+      //     // ),
+      //   ),
+      //   itemCount: dynamicList.length,
+      // ),
     );
   }
 }
diff --git a/lib/routes/picture/pictureMemberFilter.dart b/lib/routes/picture/pictureMemberFilter.dart
index 58c2295..7479fc5 100644
--- a/lib/routes/picture/pictureMemberFilter.dart
+++ b/lib/routes/picture/pictureMemberFilter.dart
@@ -26,12 +26,14 @@ class _PictureMemberFilterState extends State<PictureMemberFilter> {
   @override
   Widget build(BuildContext context) {
     return Container(
-        child: GridView.count(
-      crossAxisCount: 5,
-      childAspectRatio: 1.0,
-      children: MemberEnum.values
-          .map(
-            (m) => GestureDetector(
+      child: Center(
+        child:  GridView.count(
+          shrinkWrap: true,
+          crossAxisCount: 5,
+          childAspectRatio: 1.0,
+          children: MemberEnum.values
+              .map(
+                (m) => GestureDetector(
               onTap: () {
                 setState(() {
                   if (widget.filter == m) {
@@ -79,7 +81,9 @@ class _PictureMemberFilterState extends State<PictureMemberFilter> {
               ),
             ),
           )
-          .toList(),
-    ));
+              .toList(),
+        ),
+      ),
+    );
   }
 }
diff --git a/lib/routes/picture/picturePage.dart b/lib/routes/picture/picturePage.dart
index 54aee89..4360eb9 100644
--- a/lib/routes/picture/picturePage.dart
+++ b/lib/routes/picture/picturePage.dart
@@ -67,7 +67,7 @@ class _PicturePageState extends State<PicturePage> {
           ),
         ),
         body: Container(
-          padding: const EdgeInsets.only(left: 4, right: 4, top: 8, bottom: 40),
+          padding: const EdgeInsets.only(left: 4, right: 4, bottom: 40),
           child: const TabBarView(
             children: [
               PictureList(pageType: PicturePageType.recommend),
diff --git a/lib/routes/picture/pictureSwiper.dart b/lib/routes/picture/pictureSwiper.dart
index 76be036..98f2e2a 100644
--- a/lib/routes/picture/pictureSwiper.dart
+++ b/lib/routes/picture/pictureSwiper.dart
@@ -2,6 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:eoe_fans/routes/picture/pictureDetail.dart';
 import 'package:extended_image/extended_image.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_swiper_null_safety/flutter_swiper_null_safety.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -13,89 +14,99 @@ class PictureSwiper extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Stack(
-      children: [
-        Swiper(
-          itemBuilder: (BuildContext context, int index) {
-            var image = CachedNetworkImageProvider(images[index]);
-            return Stack(
-              children: [
-                Positioned(
-                  top: 0,
-                  bottom: 0,
-                  left: 0,
-                  right: 0,
-                  child: GestureDetector(
-                    onTap: () {
-                      Navigator.push(
-                        context,
-                        MaterialPageRoute(
-                          builder: (context) {
-                            return PictureDetail(index: index, images: images);
-                          },
+    return GestureDetector(
+      onLongPress: () {
+        HapticFeedback.heavyImpact();
+        // showMaterialModalBottomSheet(
+        //   context: context,
+        //   builder: (context) => Container(),
+        // );
+        print('long press');
+      },
+      child: Stack(
+        children: [
+          Swiper(
+            itemBuilder: (BuildContext context, int index) {
+              var image = CachedNetworkImageProvider(images[index]);
+              return Stack(
+                children: [
+                  Positioned(
+                    top: 0,
+                    bottom: 0,
+                    left: 0,
+                    right: 0,
+                    child: GestureDetector(
+                      onTap: () {
+                        Navigator.push(
+                          context,
+                          MaterialPageRoute(
+                            builder: (context) {
+                              return PictureDetail(index: index, images: images);
+                            },
+                          ),
+                        );
+                      },
+                      child: Container(
+                        child: ExtendedImage(
+                          image: image,
+                          fit: BoxFit.cover,
                         ),
-                      );
-                    },
-                    child: Container(
-                      child: ExtendedImage(
-                        image: image,
-                        fit: BoxFit.cover,
                       ),
                     ),
                   ),
-                ),
-                Positioned(
-                  bottom: 0,
-                  left: 0,
-                  right: 0,
-                  child: Container(
-                    height: 40,
-                    decoration: new BoxDecoration(
-                      color: Color.fromRGBO(0, 0, 0, .3),
-                      gradient: LinearGradient(
-                        colors: [Colors.transparent, Colors.black],
-                        begin: Alignment.topCenter,
-                        end: Alignment.bottomCenter,
+                  Positioned(
+                    bottom: 0,
+                    left: 0,
+                    right: 0,
+                    child: Container(
+                      height: 40,
+                      decoration: new BoxDecoration(
+                        color: Color.fromRGBO(0, 0, 0, .3),
+                        gradient: LinearGradient(
+                          colors: [Colors.transparent, Colors.black],
+                          begin: Alignment.topCenter,
+                          end: Alignment.bottomCenter,
+                        ),
                       ),
                     ),
-                  ),
-                )
-              ],
-            );
-          },
-          itemCount: images.length,
-          onTap: (int index) async {},
-          pagination: const SwiperPagination(
-            alignment: Alignment.bottomLeft,
-            builder: DotSwiperPaginationBuilder(
-              color: Colors.white30, // 其他点的颜色
-              activeColor: Colors.white,
-              space: 2, // 点与点之间的距离
-              activeSize: 15, // 当前点的大小
+                  )
+                ],
+              );
+            },
+            itemCount: images.length,
+            onTap: (int index) async {},
+            pagination: const SwiperPagination(
+              alignment: Alignment.bottomLeft,
+              builder: DotSwiperPaginationBuilder(
+                color: Colors.white30, // 其他点的颜色
+                activeColor: Colors.white,
+                space: 2, // 点与点之间的距离
+                activeSize: 15, // 当前点的大小
+              ),
             ),
+            autoplay: false,
           ),
-          autoplay: false,
-        ),
-        Positioned(
-          bottom: -4,
-          right: 8,
-          child: IconButton(
-            icon: Icon(
-              Icons.arrow_forward_ios,
-              size: 16,
-              color: Colors.white,
-            ),
-            onPressed: () async {
-              if (dynamicId != null) {
-                var _url = 'bilibili://following/detail/' + dynamicId!;
-                if (!await launchUrl(Uri.parse(_url))) {
-                  throw 'Could not launch $_url';
+          Positioned(
+            bottom: -4,
+            right: 8,
+            child: IconButton(
+              icon: Icon(
+                Icons.arrow_forward_ios,
+                size: 16,
+                color: Colors.white,
+              ),
+              onPressed: () async {
+                if (dynamicId != null) {
+                  var _url = 'bilibili://following/detail/' + dynamicId!;
+                  if (!await launchUrl(Uri.parse(_url))) {
+                    throw 'Could not launch $_url';
+                  }
                 }
-              }
-            },
-          ),
-        )
-      ],
+              },
+            ),
+          )
+        ],
+      ),
     );
   }
 }
diff --git a/lib/routes/video/videoSwiper.dart b/lib/routes/video/videoSwiper.dart
index 66a92d2..659909d 100644
--- a/lib/routes/video/videoSwiper.dart
+++ b/lib/routes/video/videoSwiper.dart
@@ -3,13 +3,13 @@ import 'package:flutter_swiper_null_safety/flutter_swiper_null_safety.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 const images = [
-  'assets/banner1.jpg',
+  'assets/banner1.png',
   'assets/banner2.png',
   'assets/banner3.png',
 ];
 
 const urls = [
-  'https://b23.tv/GI9EDCl',
+  'https://b23.tv/KjrFIG1',
   'bilibili://video/BV1Pv4y1C7TE',
   'https://b23.tv/kI0MBkx'
 ];
diff --git a/pubspec.yaml b/pubspec.yaml
index 26a5068..ae81660 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.6.0+1
+version: 1.6.2+1
 
 environment:
     sdk: '>=2.18.6 <3.0.0'
@@ -52,6 +52,7 @@ dependencies:
     extended_image: ^6.3.4
     image_gallery_saver: ^1.7.1
     fluttertoast: ^8.1.2
+    modal_bottom_sheet: ^2.1.2
 
 dev_dependencies:
     flutter_test:

From fd66cbefed56933e59c3bec6b26b248a2b13a1a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?=
 =?UTF-8?q?=E8=A6=8B=5D?= <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 05:54:33 +0000
Subject: [PATCH 37/40] Update app-prebuild.yml

---
 .github/workflows/app-prebuild.yml | 74 ++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/app-prebuild.yml
index fa93a99..3205ef8 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/app-prebuild.yml
@@ -6,16 +6,22 @@ name: EOEFANS PRE-BUILD App CI
 on:
   # Triggers the workflow on push or pull request events but only for the "main" branch
   push:
-    branches: [ "main" ]
+    branches: [ "main","ci" ]
     tags: [ "v*" ]
 #  pull_request:
-#    branches: [ "main" ]
+#    branches: [ "main","ci" ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 env:
   KEY_PROPERTIES: ${{ secrets.KEY_PROPERTIES }}
+  ACCOUNT_NAME: eoefans01
+  ACCOUNT_KEY: ${{ secrets.STORAGE_ACCOUNT_KEY }}
+  SHARE_NAME: eoefans-client-dev # change for dev and prod
+  SHARE_NAME_PROD: eoefans-client # change for dev and prod
+  SOURCE_DIR: upload-ready
+  SOURCE_DIR_PROD: upload-ready-prod
 #  IMAGE_TAG: "" #we get tag using the action down below
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
@@ -30,8 +36,18 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3      
       
+      - name: Get tag
+        if: startsWith(github.ref, 'refs/tags/')
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+      - name: set tag to env
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          echo "IMAGE_TAG=${{steps.tag.outputs.tag}}" >> $GITHUB_ENV
+          echo $GITHUB_ENV
+                
       - uses: actions/setup-java@v3
         with:
           distribution: "zulu"
@@ -57,34 +73,42 @@ jobs:
         run: |
           ls -la
           ls -la build/app/outputs/apk/release
-          
-      - name: Get tag
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-        
-      - run: |
-          echo "IMAGE_TAG=${{steps.tag.outputs.tag}}" >> $GITHUB_ENV
-          echo $GITHUB_ENV
-          
-      
-      - name: upload apk
-        uses: actions/upload-artifact@v3
-        with:
-          name: app-release.apk
-          path: build/app/outputs/apk/release/app-release.apk
-          
-      - name: upload all artifacts
-        uses: actions/upload-artifact@v3
+
+
+
+      - name: move and rename artifacts
+        run: |
+          mkdir upload-ready
+          cp build/app/outputs/apk/release/* upload-ready
+          cd upload-ready && for file in *; do mv "$file" "${{  github.run_number }}-$file"; done && cd ..
+          ls -la upload-ready
+      - name: upload to azure file for dev environment
+        uses: cahaseler/azure-fileshare-upload@v1.0.0
         with:
-          name: all.zip
-          path: build/app/outputs/apk/release/
+          account_name: ${{ env.ACCOUNT_NAME }}
+          account_key: ${{ env.ACCOUNT_KEY }}
+          share_name: ${{ env.SHARE_NAME }}
+          source_dir: ${{ env.SOURCE_DIR }}
           
+
+
       - name: rename apk
         if: startsWith(github.ref, 'refs/tags/')
-        run: mv build/app/outputs/apk/release/app-release.apk build/app/outputs/apk/release/EOEFANS-${{ env.IMAGE_TAG }}.apk
+        run: |
+          mkdir upload-ready-prod
+          mv build/app/outputs/apk/release/app-release.apk upload-ready-prod/EOEFANS-${{ env.IMAGE_TAG }}.apk
 
       - name: Publish release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: build/app/outputs/apk/release/EOEFANS-${{ env.IMAGE_TAG }}.apk
+          files: upload-ready-prod/EOEFANS-${{ env.IMAGE_TAG }}.apk
+          
+      - name: upload to azure file for prod environment
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: cahaseler/azure-fileshare-upload@v1.0.0
+        with:
+          account_name: ${{ env.ACCOUNT_NAME }}
+          account_key: ${{ env.ACCOUNT_KEY }}
+          share_name: ${{ env.SHARE_NAME_PROD }}
+          source_dir: ${{ env.SOURCE_DIR_PROD }}

From 7a9243589fd9d4fbc7a5c78e8effd5a44d98629e Mon Sep 17 00:00:00 2001
From: kazami139 <kazami@kazami.tech>
Date: Thu, 16 Feb 2023 06:28:49 +0000
Subject: [PATCH 38/40] chore: rename cicd cofig name and adjust the trigger

---
 .github/workflows/pre-build.yml               | 114 ++++++++++++++++++
 .../{app-prebuild.yml => prod-build.yml}      |   8 +-
 2 files changed, 118 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/pre-build.yml
 rename .github/workflows/{app-prebuild.yml => prod-build.yml} (97%)

diff --git a/.github/workflows/pre-build.yml b/.github/workflows/pre-build.yml
new file mode 100644
index 0000000..fd1ed78
--- /dev/null
+++ b/.github/workflows/pre-build.yml
@@ -0,0 +1,114 @@
+# This is a basic workflow to help you get started with Actions
+
+name: EOEFANS PRE-BUILD App CI
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the "main" branch
+  push:
+    branches: [ "main","ci" ]
+    # tags: [ "v*" ]
+#  pull_request:
+#    branches: [ "main","ci" ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+env:
+  KEY_PROPERTIES: ${{ secrets.KEY_PROPERTIES }}
+  ACCOUNT_NAME: eoefans01
+  ACCOUNT_KEY: ${{ secrets.STORAGE_ACCOUNT_KEY }}
+  SHARE_NAME: eoefans-client-dev # change for dev and prod
+  SHARE_NAME_PROD: eoefans-client # change for dev and prod
+  SOURCE_DIR: upload-ready
+  SOURCE_DIR_PROD: upload-ready-prod
+#  IMAGE_TAG: "" #we get tag using the action down below
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build-and-publish:
+    # The type of runner that the job will run on
+    runs-on: [ self-hosted, Linux ]
+    environment:
+      name: "Pre-build"
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v3      
+      
+      - name: Get tag
+        if: startsWith(github.ref, 'refs/tags/')
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+      - name: set tag to env
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          echo "IMAGE_TAG=${{steps.tag.outputs.tag}}" >> $GITHUB_ENV
+          echo $GITHUB_ENV
+                
+      - uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: "11"
+          cache: 'gradle'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
+
+      - name: Set android sign key for app building
+        run: |
+          echo "$KEY_PROPERTIES" > android/key.properties
+          pwd $$ ls -la
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable' # or: 'beta', 'dev' or 'master'
+          cache: true
+
+      - run: flutter pub get
+#       - run: flutter test
+      - run: flutter build apk
+      - name: list artifacts
+        run: |
+          ls -la
+          ls -la build/app/outputs/apk/release
+
+
+
+      - name: move and rename artifacts
+        run: |
+          mkdir upload-ready
+          cp build/app/outputs/apk/release/* upload-ready
+          cd upload-ready && for file in *; do mv "$file" "${{  github.run_number }}-$file"; done && cd ..
+          ls -la upload-ready
+      - name: upload to azure file for dev environment
+        uses: cahaseler/azure-fileshare-upload@v1.0.0
+        with:
+          account_name: ${{ env.ACCOUNT_NAME }}
+          account_key: ${{ env.ACCOUNT_KEY }}
+          share_name: ${{ env.SHARE_NAME }}
+          source_dir: ${{ env.SOURCE_DIR }}
+          
+
+
+      # - name: rename apk
+      #   if: startsWith(github.ref, 'refs/tags/')
+      #   run: |
+      #     mkdir upload-ready-prod
+      #     mv build/app/outputs/apk/release/app-release.apk upload-ready-prod/EOEFANS-${{ env.IMAGE_TAG }}.apk
+
+      # - name: Publish release
+      #   uses: softprops/action-gh-release@v1
+      #   if: startsWith(github.ref, 'refs/tags/')
+      #   with:
+      #     files: upload-ready-prod/EOEFANS-${{ env.IMAGE_TAG }}.apk
+          
+      # - name: upload to azure file for prod environment
+      #   if: startsWith(github.ref, 'refs/tags/')
+      #   uses: cahaseler/azure-fileshare-upload@v1.0.0
+      #   with:
+      #     account_name: ${{ env.ACCOUNT_NAME }}
+      #     account_key: ${{ env.ACCOUNT_KEY }}
+      #     share_name: ${{ env.SHARE_NAME_PROD }}
+      #     source_dir: ${{ env.SOURCE_DIR_PROD }}
diff --git a/.github/workflows/app-prebuild.yml b/.github/workflows/prod-build.yml
similarity index 97%
rename from .github/workflows/app-prebuild.yml
rename to .github/workflows/prod-build.yml
index 3205ef8..6dfead3 100644
--- a/.github/workflows/app-prebuild.yml
+++ b/.github/workflows/prod-build.yml
@@ -1,12 +1,12 @@
 # This is a basic workflow to help you get started with Actions
 
-name: EOEFANS PRE-BUILD App CI
+name: EOEFANS PROD-BUILD App CI
 
 # Controls when the workflow will run
 on:
   # Triggers the workflow on push or pull request events but only for the "main" branch
   push:
-    branches: [ "main","ci" ]
+    # branches: [ "main","ci" ]
     tags: [ "v*" ]
 #  pull_request:
 #    branches: [ "main","ci" ]
@@ -27,11 +27,11 @@ env:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
-  build:
+  build-and-publish:
     # The type of runner that the job will run on
     runs-on: [ self-hosted, Linux ]
     environment:
-      name: "Pre-build"
+      name: "Prod-build"
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

From ef5438bf5d471edc53191e53c7a3d9e0fd0da285 Mon Sep 17 00:00:00 2001
From: misakajimmy <misakajimmy@gmail.com>
Date: Thu, 16 Feb 2023 19:27:19 +0800
Subject: [PATCH 39/40] DEV UPDATE:Remove jks

---
 .github/workflows/pre-build.yml |   1 +
 android/upload-keystore.jks     | Bin 2599 -> 0 bytes
 2 files changed, 1 insertion(+)
 delete mode 100644 android/upload-keystore.jks

diff --git a/.github/workflows/pre-build.yml b/.github/workflows/pre-build.yml
index fd1ed78..7dfd33f 100644
--- a/.github/workflows/pre-build.yml
+++ b/.github/workflows/pre-build.yml
@@ -60,6 +60,7 @@ jobs:
       - name: Set android sign key for app building
         run: |
           echo "$KEY_PROPERTIES" > android/key.properties
+          echo "$MY_JKS_FILE" | base64 --decode > android/upload-keystore.jks
           pwd $$ ls -la
       - uses: subosito/flutter-action@v2
         with:
diff --git a/android/upload-keystore.jks b/android/upload-keystore.jks
deleted file mode 100644
index 5f2ab56c87eb0eaa06ff39d84c1e1bfc7831e159..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2599
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


From 8073b3bc164a9edef696d030c735c65a8a9fc825 Mon Sep 17 00:00:00 2001
From: misakajimmy <misakajimmy@gmail.com>
Date: Thu, 16 Feb 2023 19:35:03 +0800
Subject: [PATCH 40/40] DEV UPDATE:Remove jks

---
 .github/workflows/pre-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pre-build.yml b/.github/workflows/pre-build.yml
index 7dfd33f..fed2d04 100644
--- a/.github/workflows/pre-build.yml
+++ b/.github/workflows/pre-build.yml
@@ -16,6 +16,7 @@ on:
 
 env:
   KEY_PROPERTIES: ${{ secrets.KEY_PROPERTIES }}
+  MY_JKS_FILE: ${{ secrets.MY_JKS_FILE }}
   ACCOUNT_NAME: eoefans01
   ACCOUNT_KEY: ${{ secrets.STORAGE_ACCOUNT_KEY }}
   SHARE_NAME: eoefans-client-dev # change for dev and prod