Merge branch 'master' of github.com:X-Wei/flutter_catalog

fix iOS build

.fvm/fvm_config.json

@@ -1,3 +1,3 @@
 {
-  "flutterSdkVersion": "stable"
+  "flutterSdkVersion": "3.19.6"
 }

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.19.6"
+}

.github/workflows/build-android.yml

@@ -0,0 +1,42 @@
+name: Build for Android
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build-android-apk:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+
+      - name: Cache Flutter
+        uses: actions/cache@v3
+        id: flutter-cache
+        with:
+          key: $GITHUB_SHA-flutter
+          path: ~/.flutter
+
+      - name: Cache Gradle
+        uses: actions/cache@v3
+        id: gradle-cache
+        with:
+          key: $GITHUB_SHA-gradle
+          path: ~/.gradle
+
+      - name: Set up JDK 19
+        uses: actions/setup-java@v4
+        with:
+          java-version: "19"
+          distribution: 'temurin'
+          cache: "gradle"
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          cache: true
+
+      - run: flutter pub get
+
+      - run: flutter build apk

.github/workflows/flutter-actions.yml → .github/workflows/build-ios.yml

@@ -1,68 +1,31 @@
-name: build-app
+name: Build for iOS
 
 on:
   workflow_dispatch:
 
 jobs:
-  build-android:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v4
-
-      - name: Cache Flutter
-        uses: actions/cache@v2
-        id: flutter-cache
-        with:
-          key: $GITHUB_SHA-flutter
-          path: ~/.flutter
-
-      - name: Cache Gradle
-        uses: actions/cache@v2
-        id: gradle-cache
-        with:
-          key: $GITHUB_SHA-gradle
-          path: ~/.gradle
-
-      - name: Set up JDK 19
-        uses: actions/setup-java@v4
-        with:
-          java-version: "19"
-          distribution: 'temurin'
-          cache: "gradle"
-
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-          cache: true
-
-      - run: flutter pub get
-
-      - run: flutter build apk
-
   build-ios:
     runs-on: macos-latest
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
 
       - name: Cache CocoaPods
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: cocoa-pods-cache
         with:
           key: $GITHUB_SHA-cocoa-pods
           path: ~/Library/Caches/CocoaPods
 
       - name: Cache Xcode Derived Data
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: xcode-derived-data-cache
         with:
           key: $GITHUB_SHA-xcode-derived-data
           path: ~/Library/Developer/Xcode/DerivedData
 
       - name: Cache Flutter
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: flutter-cache
         with:
           key: $GITHUB_SHA-flutter

.github/workflows/build-web.yml

@@ -0,0 +1,30 @@
+name: Build web & publish to Github Pages
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build-and-deploy-web:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+      - name: Cache Flutter
+        uses: actions/cache@v3
+        id: flutter-cache
+        with:
+          key: $GITHUB_SHA-flutter
+          path: ~/.flutter
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          cache: true
+      - name: Build and deploy to GH pages
+        uses: bluefireteam/flutter-gh-pages@v7
+        with:
+          baseHref: /flutter_catalog/
+      # - run: flutter pub get
+      # - run: flutter build web --release
+      # - name: Deploy to GH pages
+      #   uses: peaceiris/actions-gh-pages@v4

.gitignore

@@ -220,4 +220,7 @@ app.*.symbols
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
-!.vscode/settings.json
+!.vscode/settings.json
+
+# FVM Version Cache
+.fvm/

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "300451adae589accbece3490f4396f10bdf15e6e"
+  revision: "761747bfc538b5af34aa0d3fac380f1bc331ec49"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 300451adae589accbece3490f4396f10bdf15e6e
-      base_revision: 300451adae589accbece3490f4396f10bdf15e6e
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: android
-      create_revision: 300451adae589accbece3490f4396f10bdf15e6e
-      base_revision: 300451adae589accbece3490f4396f10bdf15e6e
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+    - platform: ios
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+    - platform: linux
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+    - platform: macos
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+    - platform: web
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+    - platform: windows
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
 
   # User provided section
 

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## v3.8.1
+[2024-06-09]
+- add new examples: AI chat w/ Groq, download file via dio, show timeline UI
+- fix bug in firebase chatroom and IAP example 
+- add reusable class/functions across examples
+- add widget_with_codeview as git subtree
+- build with latest flutter 3.22.2
+- upgrade packages & other fixes
+
+
 ## v3.7.0
 [2023-09-18]
 - update app icon to resolve trademark issue(#144)

android/app/google-services.json

@@ -72,7 +72,8 @@
             }
           ]
         }
-      }
+      },
+      "admob_app_id": "ca-app-pub-7906158617398863~7176992997"
     }
   ],
   "configuration_version": "1"