diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63c1d63..012b806 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,37 +2,41 @@ name: build on: push: - branches: - - main + branches: + - main workflow_dispatch: + defaults: run: working-directory: packages/stream_chat_v1 +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: - cleanup-runs: - runs-on: ubuntu-latest - steps: - - uses: rokroskar/workflow-run-cleanup-action@master - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" build_and_deploy_ios: - runs-on: [macos-11] + runs-on: macos-latest + timeout-minutes: 40 steps: - - uses: actions/checkout@v2 - - run: sudo xcode-select --switch /Applications/Xcode_13.0.app/Contents/Developer - - name: Install RubyGems - run: | - cd ios - bundle install - - uses: subosito/flutter-action@v1.5.3 + - name: Checkout code + uses: actions/checkout@v3 + + - name: Setup Flutter + uses: subosito/flutter-action@v2 with: - channel: 'stable' - - name: Flutter setup - run: | - flutter pub get + channel: stable + cache: true + + - name: Setup Ruby and Gems + uses: ruby/setup-ruby@v1 + with: + working-directory: packages/stream_chat_v1/ios + bundler-cache: true + - name: Copy production config run: echo "${{ secrets.PRODUCTION_CONFIG }}" > lib/app_config.dart + - name: Build and release env: MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} @@ -42,38 +46,48 @@ jobs: FASTLANE_SESSION: ${{ secrets.FASTLANE_SESSION }} FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} run: | - flutter build ios --release --no-codesign + flutter build ios --no-codesign cd ios bundle exec fastlane deploy_to_testflight + build_and_deploy_android: runs-on: ubuntu-latest + timeout-minutes: 15 steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - name: Checkout code + uses: actions/checkout@v3 + + - name: Setup Flutter + uses: subosito/flutter-action@v2 + with: + channel: stable + cache: true + + - name: Setup Java + uses: actions/setup-java@v1 with: java-version: '12.x' - - uses: subosito/flutter-action@v1.5.3 - with: - channel: 'stable' - - run: | - flutter pub get + - name: Copy production config run: echo "${{ secrets.PRODUCTION_CONFIG }}" > lib/app_config.dart + - name: Build - run: | - flutter build apk - - name: upload apk - uses: actions/upload-artifact@v2 + run: flutter build apk + + - name: Upload Artifact + uses: actions/upload-artifact@v3 with: name: android-stream-chat-v1 path: packages/stream_chat_v1/build/app/outputs/apk/release/app-release.apk + - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v2 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-1 - - name: Upload APK + + - name: Upload to S3 run: | cp build/app/outputs/apk/release/app-release.apk flutter-sample-app.apk aws s3 cp flutter-sample-app.apk s3://${{ secrets.AWS_S3_BUCKET }} --sse AES256 diff --git a/.github/workflows/build_nightly.yml b/.github/workflows/build_nightly.yml index a0e8bee..8126e0a 100644 --- a/.github/workflows/build_nightly.yml +++ b/.github/workflows/build_nightly.yml @@ -5,89 +5,110 @@ on: branches: - develop workflow_dispatch: + defaults: run: working-directory: packages/stream_chat_v1 +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: - cleanup-runs: - runs-on: ubuntu-latest - steps: - - uses: rokroskar/workflow-run-cleanup-action@master - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" build_and_deploy_ios: - runs-on: [macos-11] + runs-on: macos-latest + timeout-minutes: 40 steps: - - uses: actions/checkout@v2 - - run: sudo xcode-select --switch /Applications/Xcode_13.0.app/Contents/Developer - - name: Install RubyGems - run: | - cd ios - bundle install - - uses: subosito/flutter-action@v1.5.3 + - name: Checkout code + uses: actions/checkout@v3 + + - name: Setup Flutter + uses: subosito/flutter-action@v2 with: - channel: 'stable' + channel: stable + cache: true + + - name: Setup Ruby and Gems + uses: ruby/setup-ruby@v1 + with: + working-directory: packages/stream_chat_v1/ios + bundler-cache: true + - name: Install firebase-tools run: npm install -g firebase-tools - - name: Flutter setup - run: | - flutter pub get + - name: Build and release env: MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }} FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }} run: | - flutter build ios --release --no-codesign + flutter build ios --no-codesign cd ios bundle exec fastlane deploy_to_firebase + build_and_deploy_android: runs-on: ubuntu-latest + timeout-minutes: 15 steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - name: Checkout code + uses: actions/checkout@v3 + + - name: Setup Java + uses: actions/setup-java@v1 with: java-version: '12.x' - - uses: subosito/flutter-action@v1.5.3 + + - name: Setup Flutter + uses: subosito/flutter-action@v2 with: - channel: 'stable' - - run: | - flutter pub get + channel: stable + cache: true + - name: Build - run: | - flutter build apk + run: flutter build apk + - name: Deploy - uses: wzieba/Firebase-Distribution-Github-Action@v1.3.2 + uses: wzieba/Firebase-Distribution-Github-Action@v1 with: appId: ${{secrets.FIREBASE_ANDROID_APPID}} token: ${{secrets.FIREBASE_TOKEN}} groups: stream-testers debug: true file: packages/stream_chat_v1/build/app/outputs/apk/release/app-release.apk - - name: upload apk - uses: actions/upload-artifact@v2 + + - name: Upload APK + uses: actions/upload-artifact@v3 with: name: android-stream-chat-v1 path: packages/stream_chat_v1/build/app/outputs/apk/release/app-release.apk + build_and_deploy_web: runs-on: ubuntu-latest + timeout-minutes: 10 steps: - - uses: actions/checkout@v2 + - name: Checkout code + uses: actions/checkout@v3 + - name: config git run: | git config --global user.email "$(git log --format='%ae' HEAD^!)" git config --global user.name "$(git log --format='%an' HEAD^!)" git fetch origin gh-pages:gh-pages - - uses: subosito/flutter-action@v1.5.3 + + - name: Setup Flutter + uses: subosito/flutter-action@v2 with: - channel: 'stable' - - run: flutter pub get + channel: stable + cache: true + - name: Copy production config run: echo "${{ secrets.PRODUCTION_CONFIG }}" > lib/app_config.dart - - uses: erickzanardo/flutter-gh-pages@v3 + + - name: Build and Deploy + uses: bluefireteam/flutter-gh-pages@v7 with: - webRenderer: canvaskit + baseHref: /flutter-samples/ workingDir: packages/stream_chat_v1 diff --git a/packages/stream_chat_v1/.metadata b/packages/stream_chat_v1/.metadata index ce13b42..c3217d6 100644 --- a/packages/stream_chat_v1/.metadata +++ b/packages/stream_chat_v1/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled. version: - revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 + revision: b06b8b2710955028a6b562f5aa6fe62941d6febf channel: stable project_type: app @@ -13,26 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 + create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf + base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - platform: android - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - - platform: ios - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - - platform: linux - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - - platform: macos - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - - platform: web - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - - platform: windows - create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 - base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 + create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf + base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf # User provided section diff --git a/packages/stream_chat_v1/android/app/src/main/AndroidManifest.xml b/packages/stream_chat_v1/android/app/src/main/AndroidManifest.xml index 3ea0f99..fa7cbe4 100644 --- a/packages/stream_chat_v1/android/app/src/main/AndroidManifest.xml +++ b/packages/stream_chat_v1/android/app/src/main/AndroidManifest.xml @@ -9,10 +9,9 @@ + + @@ -38,4 +45,4 @@ android:name="flutterEmbedding" android:value="2" /> - + \ No newline at end of file diff --git a/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/Application.kt b/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/Application.kt deleted file mode 100644 index 938a498..0000000 --- a/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/Application.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.example - -import com.dexterous.flutterlocalnotifications.FlutterLocalNotificationsPlugin -import io.flutter.app.FlutterApplication -import io.flutter.plugin.common.PluginRegistry -import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback -import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin -import io.flutter.plugins.pathprovider.PathProviderPlugin - -class Application : FlutterApplication(), PluginRegistrantCallback { - override fun onCreate() { - super.onCreate() - } - - override fun registerWith(registry: PluginRegistry) { - PathProviderPlugin.registerWith(registry.registrarFor( - "io.flutter.plugins.pathprovider.PathProviderPlugin")) - SharedPreferencesPlugin.registerWith(registry.registrarFor( - "io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin")) - FlutterLocalNotificationsPlugin.registerWith(registry.registrarFor( - "com.dexterous.flutterlocalnotifications.FlutterLocalNotificationsPlugin")) - } -} \ No newline at end of file diff --git a/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/MainActivity.kt index 1656503..e793a00 100644 --- a/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/MainActivity.kt +++ b/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/MainActivity.kt @@ -1,12 +1,6 @@ package com.example.example -import androidx.annotation.NonNull; import io.flutter.embedding.android.FlutterActivity -import io.flutter.embedding.engine.FlutterEngine -import io.flutter.plugins.GeneratedPluginRegistrant class MainActivity: FlutterActivity() { - override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); - } } diff --git a/packages/stream_chat_v1/android/app/src/main/kotlin/io/getstream/stream_chat_v1/MainActivity.kt b/packages/stream_chat_v1/android/app/src/main/kotlin/io/getstream/stream_chat_v1/MainActivity.kt deleted file mode 100644 index 3b9195b..0000000 --- a/packages/stream_chat_v1/android/app/src/main/kotlin/io/getstream/stream_chat_v1/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.getstream.stream_chat_v1 - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-hdpi/ic_launcher_background.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-hdpi/ic_launcher_background.png new file mode 100644 index 0000000..83e8029 Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-hdpi/ic_launcher_background.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..8c255db Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-mdpi/ic_launcher_background.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-mdpi/ic_launcher_background.png new file mode 100644 index 0000000..6a78a31 Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-mdpi/ic_launcher_background.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..0145cae Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png new file mode 100644 index 0000000..58bbfe9 Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..f7bf254 Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..b1b4cac Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..837416c Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..8b20fd6 Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..5f89936 Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/packages/stream_chat_v1/android/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2ef2ab2..0000000 --- a/packages/stream_chat_v1/android/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable/launch_background.xml b/packages/stream_chat_v1/android/app/src/main/res/drawable/launch_background.xml index 3618fa7..304732f 100644 --- a/packages/stream_chat_v1/android/app/src/main/res/drawable/launch_background.xml +++ b/packages/stream_chat_v1/android/app/src/main/res/drawable/launch_background.xml @@ -1,5 +1,12 @@ - + + + + diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 7353dbd..7e91a57 100644 --- a/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + + + diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 7353dbd..0000000 --- a/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 818a3c8..8ec56ee 100644 Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 818a3c8..0000000 Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 38bf9b8..2f7fdaa 100644 Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 38bf9b8..0000000 Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 1367146..2c20055 100644 Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 1367146..0000000 Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index bd5086f..89492aa 100644 Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index bd5086f..0000000 Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 6a602c3..dd30e06 100644 Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 6a602c3..0000000 Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/packages/stream_chat_v1/android/app/src/main/res/values-night/styles.xml b/packages/stream_chat_v1/android/app/src/main/res/values-night/styles.xml index 449a9f9..06952be 100644 --- a/packages/stream_chat_v1/android/app/src/main/res/values-night/styles.xml +++ b/packages/stream_chat_v1/android/app/src/main/res/values-night/styles.xml @@ -3,14 +3,14 @@ + + diff --git a/packages/stream_chat_v1/assets/android_icon.png b/packages/stream_chat_v1/assets/android_icon.png deleted file mode 100644 index 3b85d6c..0000000 Binary files a/packages/stream_chat_v1/assets/android_icon.png and /dev/null differ diff --git a/packages/stream_chat_v1/assets/ios_icon.png b/packages/stream_chat_v1/assets/ic_launcher.png similarity index 100% rename from packages/stream_chat_v1/assets/ios_icon.png rename to packages/stream_chat_v1/assets/ic_launcher.png diff --git a/packages/stream_chat_v1/assets/ic_launcher_background.png b/packages/stream_chat_v1/assets/ic_launcher_background.png new file mode 100644 index 0000000..651c64f Binary files /dev/null and b/packages/stream_chat_v1/assets/ic_launcher_background.png differ diff --git a/packages/stream_chat_v1/assets/ic_launcher_foreground.png b/packages/stream_chat_v1/assets/ic_launcher_foreground.png new file mode 100644 index 0000000..fc3d22e Binary files /dev/null and b/packages/stream_chat_v1/assets/ic_launcher_foreground.png differ diff --git a/packages/stream_chat_v1/ios/.ruby-version b/packages/stream_chat_v1/ios/.ruby-version new file mode 100644 index 0000000..a0cd9f0 --- /dev/null +++ b/packages/stream_chat_v1/ios/.ruby-version @@ -0,0 +1 @@ +3.1.0 \ No newline at end of file diff --git a/packages/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj b/packages/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj index b6f9d7c..8a0506c 100644 --- a/packages/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -223,6 +223,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -259,11 +260,11 @@ "${BUILT_PRODUCTS_DIR}/image_picker_ios/image_picker_ios.framework", "${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework", "${BUILT_PRODUCTS_DIR}/package_info_plus/package_info_plus.framework", - "${BUILT_PRODUCTS_DIR}/path_provider_ios/path_provider_ios.framework", + "${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework", "${BUILT_PRODUCTS_DIR}/photo_manager/photo_manager.framework", "${BUILT_PRODUCTS_DIR}/sentry_flutter/sentry_flutter.framework", "${BUILT_PRODUCTS_DIR}/share_plus/share_plus.framework", - "${BUILT_PRODUCTS_DIR}/shared_preferences_ios/shared_preferences_ios.framework", + "${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework", "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", "${BUILT_PRODUCTS_DIR}/sqlite3/sqlite3.framework", "${BUILT_PRODUCTS_DIR}/sqlite3_flutter_libs/sqlite3_flutter_libs.framework", @@ -291,11 +292,11 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_ios.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/photo_manager.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sentry_flutter.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share_plus.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_ios.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3_flutter_libs.framework", @@ -311,6 +312,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png new file mode 100644 index 0000000..5fa6152 Binary files /dev/null and b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png new file mode 100644 index 0000000..8874ac7 Binary files /dev/null and b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png new file mode 100644 index 0000000..bc00e9c Binary files /dev/null and b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png new file mode 100644 index 0000000..527ae4c Binary files /dev/null and b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png new file mode 100644 index 0000000..8ec56ee Binary files /dev/null and b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png new file mode 100644 index 0000000..89492aa Binary files /dev/null and b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/packages/stream_chat_v1/ios/Runner/Info.plist b/packages/stream_chat_v1/ios/Runner/Info.plist index 31b04f7..17d3006 100644 --- a/packages/stream_chat_v1/ios/Runner/Info.plist +++ b/packages/stream_chat_v1/ios/Runner/Info.plist @@ -69,5 +69,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/packages/stream_chat_v1/lib/app.dart b/packages/stream_chat_v1/lib/app.dart index f58f7a2..953c758 100644 --- a/packages/stream_chat_v1/lib/app.dart +++ b/packages/stream_chat_v1/lib/app.dart @@ -133,8 +133,8 @@ class _StreamChatSampleAppState extends State redirect: (context, state) { final loggedIn = _initNotifier.initData?.client.state.currentUser != null; - final loggingIn = state.subloc == Routes.CHOOSE_USER.path || - state.subloc == Routes.ADVANCED_OPTIONS.path; + final loggingIn = state.matchedLocation == Routes.CHOOSE_USER.path || + state.matchedLocation == Routes.ADVANCED_OPTIONS.path; if (!loggedIn) { return loggingIn ? null : Routes.CHOOSE_USER.path; @@ -142,7 +142,7 @@ class _StreamChatSampleAppState extends State // if the user is logged in but still on the login page, send them to // the home page - if (loggedIn && state.subloc == Routes.CHOOSE_USER.path) { + if (loggedIn && state.matchedLocation == Routes.CHOOSE_USER.path) { return Routes.CHANNEL_LIST_PAGE.path; } diff --git a/packages/stream_chat_v1/lib/pages/channel_media_display_screen.dart b/packages/stream_chat_v1/lib/pages/channel_media_display_screen.dart index 18bd7a5..4e6c4ab 100644 --- a/packages/stream_chat_v1/lib/pages/channel_media_display_screen.dart +++ b/packages/stream_chat_v1/lib/pages/channel_media_display_screen.dart @@ -162,9 +162,9 @@ class _ChannelMediaDisplayScreenState extends State { } router.pushNamed( Routes.CHANNEL_PAGE.name, - params: + pathParameters: Routes.CHANNEL_PAGE.params(channel), - queryParams: + queryParameters: Routes.CHANNEL_PAGE.queryParams(m), ); }, diff --git a/packages/stream_chat_v1/lib/pages/channel_page.dart b/packages/stream_chat_v1/lib/pages/channel_page.dart index e2714ee..0121d79 100644 --- a/packages/stream_chat_v1/lib/pages/channel_page.dart +++ b/packages/stream_chat_v1/lib/pages/channel_page.dart @@ -1,6 +1,6 @@ import 'package:collection/collection.dart'; -import 'package:example/routes/routes.dart'; import 'package:example/pages/thread_page.dart'; +import 'package:example/routes/routes.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; @@ -64,14 +64,14 @@ class _ChannelPageState extends State { if (otherUser != null) { router.pushNamed( Routes.CHAT_INFO_SCREEN.name, - params: Routes.CHAT_INFO_SCREEN.params(channel), + pathParameters: Routes.CHAT_INFO_SCREEN.params(channel), extra: otherUser.user, ); } } else { GoRouter.of(context).pushNamed( Routes.GROUP_INFO_SCREEN.name, - params: Routes.GROUP_INFO_SCREEN.params(channel), + pathParameters: Routes.GROUP_INFO_SCREEN.params(channel), ); } }, @@ -103,11 +103,12 @@ class _ChannelPageState extends State { } router.goNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), - queryParams: Routes.CHANNEL_PAGE.queryParams(message), + pathParameters: Routes.CHANNEL_PAGE.params(channel), + queryParameters: + Routes.CHANNEL_PAGE.queryParams(message), ); }, - deletedBottomRowBuilder: (context, message) { + bottomRowBuilderWithDefaultWidget: (context, message, _) { return const StreamVisibleFootnote(); }, ); diff --git a/packages/stream_chat_v1/lib/pages/choose_user_page.dart b/packages/stream_chat_v1/lib/pages/choose_user_page.dart index d5be33a..79b0cb7 100644 --- a/packages/stream_chat_v1/lib/pages/choose_user_page.dart +++ b/packages/stream_chat_v1/lib/pages/choose_user_page.dart @@ -38,7 +38,10 @@ class ChooseUserPage extends StatelessWidget { child: SvgPicture.asset( 'assets/logo.svg', height: 40, - color: StreamChatTheme.of(context).colorTheme.accentPrimary, + colorFilter: ColorFilter.mode( + StreamChatTheme.of(context).colorTheme.accentPrimary, + BlendMode.srcIn, + ), ), ), ), @@ -120,6 +123,9 @@ class ChooseUserPage extends StatelessWidget { value: token, ); } + + // Pop the progress dialog. + router.pop(); router.replaceNamed(Routes.CHANNEL_LIST_PAGE.name); }, leading: StreamUserAvatar( diff --git a/packages/stream_chat_v1/lib/pages/group_chat_details_screen.dart b/packages/stream_chat_v1/lib/pages/group_chat_details_screen.dart index 488b3d5..1c27665 100644 --- a/packages/stream_chat_v1/lib/pages/group_chat_details_screen.dart +++ b/packages/stream_chat_v1/lib/pages/group_chat_details_screen.dart @@ -136,7 +136,7 @@ class _GroupChatDetailsScreenState extends State { await channel.watch(); router.goNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), + pathParameters: Routes.CHANNEL_PAGE.params(channel), ); } catch (err) { _showErrorAlert(); diff --git a/packages/stream_chat_v1/lib/pages/group_info_screen.dart b/packages/stream_chat_v1/lib/pages/group_info_screen.dart index 303858e..84c2abd 100644 --- a/packages/stream_chat_v1/lib/pages/group_info_screen.dart +++ b/packages/stream_chat_v1/lib/pages/group_info_screen.dart @@ -459,14 +459,16 @@ class _GroupInfoScreenState extends State { size: 24.0, ), onTap: () { - channel.update({ - 'name': _nameController.text.trim(), - }).catchError((err) { + try { + channel.update({ + 'name': _nameController.text.trim(), + }); + } catch (_) { setState(() { _nameController.text = channelName; _focusNode.unfocus(); }); - }); + } }, ), ), @@ -878,7 +880,7 @@ class _GroupInfoScreenState extends State { router.pushNamed( Routes.CHAT_INFO_SCREEN.name, - params: Routes.CHAT_INFO_SCREEN.params(c), + pathParameters: Routes.CHAT_INFO_SCREEN.params(c), extra: user, ); }, @@ -908,7 +910,7 @@ class _GroupInfoScreenState extends State { router.pushNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(c), + pathParameters: Routes.CHANNEL_PAGE.params(c), ); }, ), diff --git a/packages/stream_chat_v1/lib/pages/new_chat_screen.dart b/packages/stream_chat_v1/lib/pages/new_chat_screen.dart index 45c3528..9611aa9 100644 --- a/packages/stream_chat_v1/lib/pages/new_chat_screen.dart +++ b/packages/stream_chat_v1/lib/pages/new_chat_screen.dart @@ -409,7 +409,7 @@ class _NewChatScreenState extends State { onMessageSent: (m) { GoRouter.of(context).goNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel!), + pathParameters: Routes.CHANNEL_PAGE.params(channel!), ); }, ), diff --git a/packages/stream_chat_v1/lib/pages/pinned_messages_screen.dart b/packages/stream_chat_v1/lib/pages/pinned_messages_screen.dart index a38aa55..11a5705 100644 --- a/packages/stream_chat_v1/lib/pages/pinned_messages_screen.dart +++ b/packages/stream_chat_v1/lib/pages/pinned_messages_screen.dart @@ -113,8 +113,8 @@ class _PinnedMessagesScreenState extends State { } router.pushNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), - queryParams: Routes.CHANNEL_PAGE.queryParams(message), + pathParameters: Routes.CHANNEL_PAGE.params(channel), + queryParameters: Routes.CHANNEL_PAGE.queryParams(message), ); }, ), diff --git a/packages/stream_chat_v1/lib/pages/thread_page.dart b/packages/stream_chat_v1/lib/pages/thread_page.dart index 4e57c35..15e6a39 100644 --- a/packages/stream_chat_v1/lib/pages/thread_page.dart +++ b/packages/stream_chat_v1/lib/pages/thread_page.dart @@ -64,7 +64,7 @@ class _ThreadPageState extends State { messageBuilder: (context, details, messages, defaultMessage) { return defaultMessage.copyWith( onReplyTap: _reply, - deletedBottomRowBuilder: (context, message) { + bottomRowBuilderWithDefaultWidget: (context, message, _) { return const StreamVisibleFootnote(); }, ); diff --git a/packages/stream_chat_v1/lib/pages/user_mentions_page.dart b/packages/stream_chat_v1/lib/pages/user_mentions_page.dart index c95329c..4ec3b6d 100644 --- a/packages/stream_chat_v1/lib/pages/user_mentions_page.dart +++ b/packages/stream_chat_v1/lib/pages/user_mentions_page.dart @@ -82,8 +82,8 @@ class _UserMentionsPageState extends State { } router.pushNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), - queryParams: Routes.CHANNEL_PAGE.queryParams(message), + pathParameters: Routes.CHANNEL_PAGE.params(channel), + queryParameters: Routes.CHANNEL_PAGE.queryParams(message), ); }, ); diff --git a/packages/stream_chat_v1/lib/routes/app_routes.dart b/packages/stream_chat_v1/lib/routes/app_routes.dart index 9842d0c..f8489b0 100644 --- a/packages/stream_chat_v1/lib/routes/app_routes.dart +++ b/packages/stream_chat_v1/lib/routes/app_routes.dart @@ -27,10 +27,12 @@ final appRoutes = [ name: Routes.CHANNEL_PAGE.name, path: Routes.CHANNEL_PAGE.path, builder: (context, state) { - final channel = - StreamChat.of(context).client.state.channels[state.params['cid']]; - final messageId = state.queryParams['mid']; - final parentId = state.queryParams['pid']; + final channel = StreamChat.of(context) + .client + .state + .channels[state.pathParameters['cid']]; + final messageId = state.queryParameters['mid']; + final parentId = state.queryParameters['pid']; Message? parentMessage; if (parentId != null) { @@ -60,7 +62,7 @@ final appRoutes = [ final channel = StreamChat.of(context) .client .state - .channels[state.params['cid']]; + .channels[state.pathParameters['cid']]; return StreamChannel( channel: channel!, child: ChatInfoScreen( @@ -77,7 +79,7 @@ final appRoutes = [ final channel = StreamChat.of(context) .client .state - .channels[state.params['cid']]; + .channels[state.pathParameters['cid']]; return StreamChannel( channel: channel!, child: GroupInfoScreen( diff --git a/packages/stream_chat_v1/lib/utils/notifications_service.dart b/packages/stream_chat_v1/lib/utils/notifications_service.dart index a02d2ee..ccca39c 100644 --- a/packages/stream_chat_v1/lib/utils/notifications_service.dart +++ b/packages/stream_chat_v1/lib/utils/notifications_service.dart @@ -52,7 +52,7 @@ void showLocalNotification( router.pushNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), + pathParameters: Routes.CHANNEL_PAGE.params(channel), ); } }, diff --git a/packages/stream_chat_v1/lib/widgets/channel_list.dart b/packages/stream_chat_v1/lib/widgets/channel_list.dart index f63edbe..e283d2a 100644 --- a/packages/stream_chat_v1/lib/widgets/channel_list.dart +++ b/packages/stream_chat_v1/lib/widgets/channel_list.dart @@ -161,8 +161,9 @@ class _ChannelList extends State { } router.pushNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), - queryParams: Routes.CHANNEL_PAGE.queryParams(message), + pathParameters: Routes.CHANNEL_PAGE.params(channel), + queryParameters: + Routes.CHANNEL_PAGE.queryParams(message), ); }, ); @@ -265,7 +266,7 @@ class _ChannelList extends State { onChannelTap: (channel) { GoRouter.of(context).pushNamed( Routes.CHANNEL_PAGE.name, - params: Routes.CHANNEL_PAGE.params(channel), + pathParameters: Routes.CHANNEL_PAGE.params(channel), ); }, emptyBuilder: (_) { diff --git a/packages/stream_chat_v1/macos/Runner.xcodeproj/project.pbxproj b/packages/stream_chat_v1/macos/Runner.xcodeproj/project.pbxproj index 8972854..237a137 100644 --- a/packages/stream_chat_v1/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/stream_chat_v1/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -204,7 +204,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 33CC10EC2044A3C60003C045 = { @@ -278,6 +278,7 @@ }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -404,7 +405,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -484,7 +485,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -531,7 +532,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/packages/stream_chat_v1/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/stream_chat_v1/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 1961c76..55dda25 100644 --- a/packages/stream_chat_v1/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/stream_chat_v1/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ - - + + - - =2.17.0 <3.0.0" + sdk: ">=2.17.0 <4.0.0" + flutter: ">=1.17.0" dependencies: - flutter_app_badger: ^1.3.0 + flutter_app_badger: ^1.5.0 flutter: sdk: flutter stream_chat_flutter: @@ -26,22 +27,22 @@ dependencies: ref: develop path: packages/stream_chat_localizations flutter_local_notifications: ^9.0.0 - flutter_svg: ^1.0.3 - flutter_secure_storage: ^6.0.0 - yaml: ^3.1.0 - uuid: ^3.0.5 + flutter_svg: ^2.0.7 + flutter_secure_storage: ^8.0.0 + yaml: ^3.1.2 + uuid: ^3.0.7 streaming_shared_preferences: ^2.0.0 - lottie: ^2.2.0 - collection: ^1.15.0 - sentry_flutter: ^6.5.0 - flutter_slidable: ^2.0.0 - go_router: ^5.0.5 - provider: ^6.0.3 + lottie: ^2.4.0 + collection: ^1.17.1 + sentry_flutter: ^7.8.0 + flutter_slidable: ^3.0.0 + go_router: ^8.0.5 + provider: ^6.0.5 + video_player: ^2.6.1 dev_dependencies: - flutter_launcher_icons: ^0.9.2 - test: any - flutter_lints: ^2.0.0 + flutter_launcher_icons: ^0.13.1 + flutter_lints: ^2.0.1 dependency_overrides: stream_chat: @@ -61,13 +62,20 @@ dependency_overrides: path: packages/stream_chat_flutter flutter: + uses-material-design: true assets: - assets/ - - pubspec.lock - uses-material-design: true flutter_icons: + image_path: "assets/ic_launcher.png" + android: true + adaptive_icon_background: "assets/ic_launcher_background.png" + adaptive_icon_foreground: "assets/ic_launcher_foreground.png" ios: true - image_path_android: "assets/android_icon.png" - image_path_ios: "assets/ios_icon.png" + web: + generate: true + windows: + generate: true + macos: + generate: true diff --git a/packages/stream_chat_v1/web/favicon.png b/packages/stream_chat_v1/web/favicon.png index 8aaa46a..bc3b6c5 100644 Binary files a/packages/stream_chat_v1/web/favicon.png and b/packages/stream_chat_v1/web/favicon.png differ diff --git a/packages/stream_chat_v1/web/icons/Icon-192.png b/packages/stream_chat_v1/web/icons/Icon-192.png index b749bfe..dd30e06 100644 Binary files a/packages/stream_chat_v1/web/icons/Icon-192.png and b/packages/stream_chat_v1/web/icons/Icon-192.png differ diff --git a/packages/stream_chat_v1/web/icons/Icon-512.png b/packages/stream_chat_v1/web/icons/Icon-512.png index 88cfd48..e362036 100644 Binary files a/packages/stream_chat_v1/web/icons/Icon-512.png and b/packages/stream_chat_v1/web/icons/Icon-512.png differ diff --git a/packages/stream_chat_v1/web/icons/Icon-maskable-192.png b/packages/stream_chat_v1/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000..dd30e06 Binary files /dev/null and b/packages/stream_chat_v1/web/icons/Icon-maskable-192.png differ diff --git a/packages/stream_chat_v1/web/icons/Icon-maskable-512.png b/packages/stream_chat_v1/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000..e362036 Binary files /dev/null and b/packages/stream_chat_v1/web/icons/Icon-maskable-512.png differ diff --git a/packages/stream_chat_v1/web/index.html b/packages/stream_chat_v1/web/index.html index c9fb727..9697ba7 100644 --- a/packages/stream_chat_v1/web/index.html +++ b/packages/stream_chat_v1/web/index.html @@ -1,34 +1,60 @@ + + + - + - + - example + Stream Chat V1 + + + + + - - - - + diff --git a/packages/stream_chat_v1/web/manifest.json b/packages/stream_chat_v1/web/manifest.json index 97eb9af..0657cf7 100644 --- a/packages/stream_chat_v1/web/manifest.json +++ b/packages/stream_chat_v1/web/manifest.json @@ -18,6 +18,18 @@ "src": "icons/Icon-512.png", "sizes": "512x512", "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" } ] -} +} \ No newline at end of file