diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b9c9fe..bfb5d62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,12 +2,12 @@ name: build on: push: - branches: - - main + branches: + - main workflow_dispatch: defaults: run: - working-directory: stream_chat_v1 + working-directory: packages/stream_chat_v1 jobs: cleanup-runs: @@ -16,6 +16,32 @@ jobs: - uses: rokroskar/workflow-run-cleanup-action@master env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + build_and_deploy_ios: + runs-on: [macos-latest] + steps: + - uses: actions/checkout@v2 + - name: Install RubyGems + run: | + cd ios + bundle install + - uses: subosito/flutter-action@v1.4.0 + with: + channel: 'stable' + - 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 }} + FASTLANE_USER: ${{ secrets.FASTLANE_USER }} + FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} + FASTLANE_SESSION: ${{ secrets.FASTLANE_SESSION }} + FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} + run: | + flutter build ios --release --no-codesign + cd ios + bundle exec fastlane deploy_to_testflight build_and_deploy_android: runs-on: ubuntu-latest steps: @@ -35,4 +61,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: android-stream-chat-v1 - path: stream_chat_v1/build/app/outputs/apk/release/app-release.apk \ No newline at end of file + path: packages/stream_chat_v1/build/app/outputs/apk/release/app-release.apk diff --git a/.github/workflows/build_nightly.yml b/.github/workflows/build_nightly.yml index 59bde38..44716c9 100644 --- a/.github/workflows/build_nightly.yml +++ b/.github/workflows/build_nightly.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: defaults: run: - working-directory: stream_chat_v1 + working-directory: packages/stream_chat_v1 jobs: cleanup-runs: @@ -63,9 +63,9 @@ jobs: token: ${{secrets.FIREBASE_TOKEN}} groups: stream-testers debug: true - file: stream_chat_v1/build/app/outputs/apk/release/app-release.apk + file: packages/stream_chat_v1/build/app/outputs/apk/release/app-release.apk - name: upload apk uses: actions/upload-artifact@v2 with: name: android-stream-chat-v1 - path: stream_chat_v1/build/app/outputs/apk/release/app-release.apk \ No newline at end of file + path: packages/stream_chat_v1/build/app/outputs/apk/release/app-release.apk diff --git a/README.md b/README.md index 4618624..4fe4a1e 100644 --- a/README.md +++ b/README.md @@ -24,13 +24,16 @@ With Stream's chat components, developers quickly add chat to their app for a va ## Repo Overview 😎 -This repo contains projects and samples developed by the team and Stream community. Projects are broke up into directories containing the source code for each project. +This repo contains projects and samples developed by the team and Stream community. Projects are broke up into directories under the `packages` folder. +Each project contains a README with build and execution instructions. ## **Projects 🚀** -- [Stream Chat v1](https://github.com/GetStream/flutter-samples/tree/main/stream_chat_v1): a sample app implemented using Stream Chat and Flutter. It is a fully fledged messaging app built using a combination of our pre-made widgets and custom Flutter widgets. +- [Stream Chat v1](https://github.com/GetStream/flutter-samples/tree/main/packages/stream_chat_v1): a sample app implemented using Stream Chat and Flutter. It is a fully fledged messaging app built using a combination of our pre-made widgets and custom Flutter widgets. -- [iMessage clone](https://github.com/GetStream/flutter-samples/tree/main/imessage): an iMessage clone implemented using Flutter and the `stream_chat_flutter_core` package. +- [Stream Chatty](https://github.com/GetStream/flutter-samples/tree/main/packages/chatty) Stream Chatty is a sample chat app made in Flutter using Stream Chat, Firebase, and flutter_bloc. It has full light and dark mode support, real-time chat, and full authentication using Firebase auth. + +- [iMessage clone](https://github.com/GetStream/flutter-samples/tree/main/packages/imessage): an iMessage clone implemented using Flutter and the `stream_chat_flutter_core` package. ## Requirements 🛠 diff --git a/packages/chatty/.gitignore b/packages/chatty/.gitignore new file mode 100644 index 0000000..80fbb56 --- /dev/null +++ b/packages/chatty/.gitignore @@ -0,0 +1,43 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Web related +lib/generated_plugin_registrant.dart + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json +ios/Runner/GoogleService-Info.plist +android/app/google-services.json diff --git a/packages/chatty/.metadata b/packages/chatty/.metadata new file mode 100644 index 0000000..cd984dd --- /dev/null +++ b/packages/chatty/.metadata @@ -0,0 +1,10 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: 9b2d32b605630f28625709ebd9d78ab3016b2bf6 + channel: stable + +project_type: app diff --git a/packages/chatty/LICENSE b/packages/chatty/LICENSE new file mode 100644 index 0000000..61b67e2 --- /dev/null +++ b/packages/chatty/LICENSE @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright (c) 2021, Diego Velásquez López +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/chatty/README.md b/packages/chatty/README.md new file mode 100644 index 0000000..0c17de7 --- /dev/null +++ b/packages/chatty/README.md @@ -0,0 +1,41 @@ +# Stream Chatty + +Stream Chatty is a sample chat app made in Flutter using [Stream Chat](https://getstream.io/chat/sdk/flutter/), [Firebase](https://firebase.google.com/), and [flutter_bloc](https://bloclibrary.dev/#/). It has full light and dark mode support, real-time chat, and full authentication using Firebase auth. + +Stream Chatty was created by [Diego Velasquez](http://www.twitter.com/diegoveloper) as part of a Youtube series. A step by step guide to building Stream Chatty from scratch can be found here: + +- Part 1 - https://www.youtube.com/watch?v=H7FjCWHmP9Y => Project Structure, StreamChat, flutter_bloc +- Part 2 - https://www.youtube.com/watch?v=xGXvgrA_vNY => Clean Architecture, dependency injection, auth, storage, chat +- Part 3 - https://www.youtube.com/watch?v=EVvGdFc4SvQ => UI/UX, customizing StreamChat and demo + +> Activate English subtitles + +# Image + +![design](art/fluchat.png?raw=true "Stream Chatty") + + +# Design + +- https://dribbble.com/shots/15263978-Fluchat +- https://projects.invisionapp.com/prototype/Chat-App-cklk8tiia002tqz01u0q1u3cl/play/9ef3ca44 + +# Diego's Networks + +- www.twitter.com/diegoveloper +- www.youtube.com/diegoveloper + +## Features + +- Login using Firebase Auth and Google Sign In +- Upload pictures using Firebase Storage +- Realtime chat using StreamChat package +- Dark mode/Light mode +- State Management using flutter_bloc and cubits + +## Installation + +- Clone project +- Configure Firebase (google-services.json and Google-Service.info.plist files) +- Configure Google Sign In +- Configure your Stream project diff --git a/imessage/android/.gitignore b/packages/chatty/android/.gitignore similarity index 100% rename from imessage/android/.gitignore rename to packages/chatty/android/.gitignore diff --git a/packages/chatty/android/app/build.gradle b/packages/chatty/android/app/build.gradle new file mode 100644 index 0000000..d2aab44 --- /dev/null +++ b/packages/chatty/android/app/build.gradle @@ -0,0 +1,69 @@ +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterRoot = localProperties.getProperty('flutter.sdk') +if (flutterRoot == null) { + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + compileSdkVersion 29 + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + lintOptions { + disable 'InvalidPackage' + checkReleaseBuilds false + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.diegoveloper.fluchat" + minSdkVersion 26 + targetSdkVersion 29 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig signingConfigs.debug + minifyEnabled false + useProguard false + shrinkResources false + } + } +} + +flutter { + source '../..' +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} + +apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/packages/chatty/android/app/src/debug/AndroidManifest.xml b/packages/chatty/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..bda6c33 --- /dev/null +++ b/packages/chatty/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/packages/chatty/android/app/src/main/AndroidManifest.xml b/packages/chatty/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..a8a09e4 --- /dev/null +++ b/packages/chatty/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + diff --git a/packages/chatty/android/app/src/main/kotlin/com/diegoveloper/fluchat/MainActivity.kt b/packages/chatty/android/app/src/main/kotlin/com/diegoveloper/fluchat/MainActivity.kt new file mode 100644 index 0000000..51930b7 --- /dev/null +++ b/packages/chatty/android/app/src/main/kotlin/com/diegoveloper/fluchat/MainActivity.kt @@ -0,0 +1,6 @@ +package com.diegoveloper.fluchat + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/imessage/android/app/src/main/res/drawable/launch_background.xml b/packages/chatty/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from imessage/android/app/src/main/res/drawable/launch_background.xml rename to packages/chatty/android/app/src/main/res/drawable/launch_background.xml diff --git a/imessage/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/chatty/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from imessage/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to packages/chatty/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/imessage/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/chatty/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from imessage/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to packages/chatty/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/imessage/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/chatty/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from imessage/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to packages/chatty/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/imessage/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/chatty/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from imessage/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to packages/chatty/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/imessage/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/chatty/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from imessage/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to packages/chatty/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/packages/chatty/android/app/src/main/res/values/styles.xml b/packages/chatty/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..1f83a33 --- /dev/null +++ b/packages/chatty/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/packages/chatty/android/app/src/profile/AndroidManifest.xml b/packages/chatty/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..bda6c33 --- /dev/null +++ b/packages/chatty/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/packages/chatty/android/build.gradle b/packages/chatty/android/build.gradle new file mode 100644 index 0000000..7372192 --- /dev/null +++ b/packages/chatty/android/build.gradle @@ -0,0 +1,32 @@ +buildscript { + ext.kotlin_version = '1.3.50' + repositories { + google() + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:4.0.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.google.gms:google-services:4.3.3' + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/imessage/android/gradle.properties b/packages/chatty/android/gradle.properties similarity index 100% rename from imessage/android/gradle.properties rename to packages/chatty/android/gradle.properties diff --git a/packages/chatty/android/gradle/wrapper/gradle-wrapper.properties b/packages/chatty/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..493072b --- /dev/null +++ b/packages/chatty/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jun 23 08:50:38 CEST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/imessage/android/settings.gradle b/packages/chatty/android/settings.gradle similarity index 100% rename from imessage/android/settings.gradle rename to packages/chatty/android/settings.gradle diff --git a/stream_chat_v1/android/settings_aar.gradle b/packages/chatty/android/settings_aar.gradle similarity index 100% rename from stream_chat_v1/android/settings_aar.gradle rename to packages/chatty/android/settings_aar.gradle diff --git a/packages/chatty/art/fluchat.png b/packages/chatty/art/fluchat.png new file mode 100644 index 0000000..0a7b2e2 Binary files /dev/null and b/packages/chatty/art/fluchat.png differ diff --git a/packages/chatty/assets/icon-bottom-right.png b/packages/chatty/assets/icon-bottom-right.png new file mode 100644 index 0000000..8ec9282 Binary files /dev/null and b/packages/chatty/assets/icon-bottom-right.png differ diff --git a/packages/chatty/assets/icon-google.png b/packages/chatty/assets/icon-google.png new file mode 100644 index 0000000..f9d47fc Binary files /dev/null and b/packages/chatty/assets/icon-google.png differ diff --git a/packages/chatty/assets/icon-top-right.png b/packages/chatty/assets/icon-top-right.png new file mode 100644 index 0000000..0034db3 Binary files /dev/null and b/packages/chatty/assets/icon-top-right.png differ diff --git a/packages/chatty/assets/logo.png b/packages/chatty/assets/logo.png new file mode 100644 index 0000000..296f9b5 Binary files /dev/null and b/packages/chatty/assets/logo.png differ diff --git a/imessage/ios/.gitignore b/packages/chatty/ios/.gitignore similarity index 100% rename from imessage/ios/.gitignore rename to packages/chatty/ios/.gitignore diff --git a/packages/chatty/ios/Flutter/AppFrameworkInfo.plist b/packages/chatty/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000..4f8d4d2 --- /dev/null +++ b/packages/chatty/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 11.0 + + diff --git a/imessage/ios/Flutter/Debug.xcconfig b/packages/chatty/ios/Flutter/Debug.xcconfig similarity index 100% rename from imessage/ios/Flutter/Debug.xcconfig rename to packages/chatty/ios/Flutter/Debug.xcconfig diff --git a/imessage/ios/Flutter/Release.xcconfig b/packages/chatty/ios/Flutter/Release.xcconfig similarity index 100% rename from imessage/ios/Flutter/Release.xcconfig rename to packages/chatty/ios/Flutter/Release.xcconfig diff --git a/packages/chatty/ios/Runner.xcodeproj/project.pbxproj b/packages/chatty/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..3e47d59 --- /dev/null +++ b/packages/chatty/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,609 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 51; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + F5CFF8E625F08BBE00C304A9 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = F5CFF8E525F08BBE00C304A9 /* GoogleService-Info.plist */; }; + FB7765FF5CC347F9C712FA62 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40B0FCA72C62C135629B3D83 /* Pods_Runner.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 40B0FCA72C62C135629B3D83 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7430D861790AE1F50B4E922F /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 7D7209A1F031C39E3DC3421F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + A8573CD2B6898A29F5C8B294 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + F5CFF8E525F08BBE00C304A9 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + FB7765FF5CC347F9C712FA62 /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + DF144A162B77171986C53884 /* Pods */, + E16EDD54509B5CAB32FBDFC1 /* Frameworks */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + F5CFF8E525F08BBE00C304A9 /* GoogleService-Info.plist */, + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; + DF144A162B77171986C53884 /* Pods */ = { + isa = PBXGroup; + children = ( + 7D7209A1F031C39E3DC3421F /* Pods-Runner.debug.xcconfig */, + 7430D861790AE1F50B4E922F /* Pods-Runner.release.xcconfig */, + A8573CD2B6898A29F5C8B294 /* Pods-Runner.profile.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; + E16EDD54509B5CAB32FBDFC1 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 40B0FCA72C62C135629B3D83 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 794C749773D7932A43B8BD34 /* [CP] Check Pods Manifest.lock */, + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + C3991DF06AD2C2FF0E1CACF7 /* [CP] Embed Pods Frameworks */, + 50CF9F5875290FEF1EABAC13 /* [CP] Copy Pods Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1020; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + F5CFF8E625F08BBE00C304A9 /* GoogleService-Info.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 50CF9F5875290FEF1EABAC13 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + 794C749773D7932A43B8BD34 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; + C3991DF06AD2C2FF0E1CACF7 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = YPGH95V8AL; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.teamgo.fluchat; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = YPGH95V8AL; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.teamgo.fluchat; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = YPGH95V8AL; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.teamgo.fluchat; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/packages/chatty/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/chatty/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/packages/chatty/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/imessage/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/chatty/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from imessage/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/chatty/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/imessage/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/chatty/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from imessage/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to packages/chatty/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/imessage/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/chatty/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from imessage/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to packages/chatty/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/imessage/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/chatty/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from imessage/ios/Runner.xcworkspace/contents.xcworkspacedata rename to packages/chatty/ios/Runner.xcworkspace/contents.xcworkspacedata diff --git a/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/chatty/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/chatty/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/chatty/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to packages/chatty/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/imessage/ios/Runner/AppDelegate.swift b/packages/chatty/ios/Runner/AppDelegate.swift similarity index 100% rename from imessage/ios/Runner/AppDelegate.swift rename to packages/chatty/ios/Runner/AppDelegate.swift diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to packages/chatty/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/packages/chatty/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to packages/chatty/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/packages/chatty/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to packages/chatty/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/packages/chatty/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to packages/chatty/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/packages/chatty/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to packages/chatty/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/packages/chatty/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to packages/chatty/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/imessage/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/chatty/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from imessage/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to packages/chatty/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/imessage/ios/Runner/Base.lproj/Main.storyboard b/packages/chatty/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from imessage/ios/Runner/Base.lproj/Main.storyboard rename to packages/chatty/ios/Runner/Base.lproj/Main.storyboard diff --git a/packages/chatty/ios/Runner/Info.plist b/packages/chatty/ios/Runner/Info.plist new file mode 100644 index 0000000..aff3c30 --- /dev/null +++ b/packages/chatty/ios/Runner/Info.plist @@ -0,0 +1,62 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Chatty + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLSchemes + + com.googleusercontent.apps.880353337418-6ogtdb83ub9sjfovcv2k98dte87fmpnv + + + + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + NSCameraUsageDescription + Used to demonstrate image picker plugin + NSMicrophoneUsageDescription + Used to capture audio for image picker plugin + NSPhotoLibraryUsageDescription + Used to demonstrate image picker plugin + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + + diff --git a/imessage/ios/Runner/Runner-Bridging-Header.h b/packages/chatty/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from imessage/ios/Runner/Runner-Bridging-Header.h rename to packages/chatty/ios/Runner/Runner-Bridging-Header.h diff --git a/packages/chatty/lib/data/auth_repository.dart b/packages/chatty/lib/data/auth_repository.dart new file mode 100644 index 0000000..2ac77e8 --- /dev/null +++ b/packages/chatty/lib/data/auth_repository.dart @@ -0,0 +1,7 @@ +import 'package:stream_chatter/domain/models/auth_user.dart'; + +abstract class AuthRepository { + Future getAuthUser(); + Future signIn(); + Future logout(); +} diff --git a/packages/chatty/lib/data/image_picker_repository.dart b/packages/chatty/lib/data/image_picker_repository.dart new file mode 100644 index 0000000..f5632f0 --- /dev/null +++ b/packages/chatty/lib/data/image_picker_repository.dart @@ -0,0 +1,5 @@ +import 'dart:io'; + +abstract class ImagePickerRepository { + Future pickImage(); +} diff --git a/packages/chatty/lib/data/local/auth_local_impl.dart b/packages/chatty/lib/data/local/auth_local_impl.dart new file mode 100644 index 0000000..c3d4d72 --- /dev/null +++ b/packages/chatty/lib/data/local/auth_local_impl.dart @@ -0,0 +1,21 @@ +import 'package:stream_chatter/data/auth_repository.dart'; +import 'package:stream_chatter/domain/models/auth_user.dart'; + +class AuthLocalImpl extends AuthRepository { + @override + Future getAuthUser() async { + await Future.delayed(const Duration(seconds: 2)); + return AuthUser('diego'); + } + + @override + Future signIn() async { + await Future.delayed(const Duration(seconds: 2)); + return AuthUser('diego'); + } + + @override + Future logout() async { + return; + } +} diff --git a/packages/chatty/lib/data/local/image_picker_impl.dart b/packages/chatty/lib/data/local/image_picker_impl.dart new file mode 100644 index 0000000..21a1b15 --- /dev/null +++ b/packages/chatty/lib/data/local/image_picker_impl.dart @@ -0,0 +1,12 @@ +import 'dart:io'; +import 'package:image_picker/image_picker.dart'; +import 'package:stream_chatter/data/image_picker_repository.dart'; + +class ImagePickerImpl extends ImagePickerRepository { + @override + Future pickImage() async { + final picker = ImagePicker(); + final pickedFile = await picker.getImage(source: ImageSource.gallery, maxWidth: 400); + return File(pickedFile.path); + } +} diff --git a/packages/chatty/lib/data/local/persistent_storage_local_impl.dart b/packages/chatty/lib/data/local/persistent_storage_local_impl.dart new file mode 100644 index 0000000..85d1e4d --- /dev/null +++ b/packages/chatty/lib/data/local/persistent_storage_local_impl.dart @@ -0,0 +1,15 @@ +import 'package:stream_chatter/data/persistent_storage_repository.dart'; + +class PersistentStorageLocalImpl extends PersistentStorageRepository { + @override + Future isDarkMode() async { + await Future.delayed(const Duration(milliseconds: 50)); + return false; + } + + @override + Future updateDarkMode(bool isDarkMode) async { + await Future.delayed(const Duration(milliseconds: 50)); + return; + } +} diff --git a/packages/chatty/lib/data/local/stream_api_local_impl.dart b/packages/chatty/lib/data/local/stream_api_local_impl.dart new file mode 100644 index 0000000..f772a26 --- /dev/null +++ b/packages/chatty/lib/data/local/stream_api_local_impl.dart @@ -0,0 +1,86 @@ +import 'package:stream_chatter/data/stream_api_repository.dart'; +import 'package:stream_chatter/domain/models/chat_user.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; + +class StreamApiLocalImpl extends StreamApiRepository { + StreamApiLocalImpl(this._client); + + final StreamChatClient _client; + + @override + Future connectUser(ChatUser user, String token) async { + Map extraData = {}; + if (user.image != null) { + extraData['image'] = user.image; + } + if (user.name != null) { + extraData['name'] = user.name; + } + await _client.disconnect(); + await _client.connectUser( + User(id: user.id, extraData: extraData), + token, + ); + return user; + } + + @override + Future> getChatUsers() async { + final result = await _client.queryUsers(); + final chatUsers = result.users + .where((element) => element.id != _client.state.user.id) + .map( + (e) => ChatUser( + id: e.id, + name: e.name, + image: e.extraData['image'], + ), + ) + .toList(); + return chatUsers; + } + + @override + Future getToken(String userId) async { + return _client.devToken(userId); + } + + @override + Future createGroupChat(String channelId, String name, List members, {String image}) async { + final channel = _client.channel('messaging', id: channelId, extraData: { + 'name': name, + 'image': image, + 'members': [_client.state.user.id, ...members], + }); + await channel.watch(); + return channel; + } + + @override + Future createSimpleChat(String friendId) async { + final channel = + _client.channel('messaging', id: '${_client.state.user.id.hashCode}${friendId.hashCode}', extraData: { + 'members': [ + friendId, + _client.state.user.id, + ], + }); + await channel.watch(); + return channel; + } + + @override + Future logout() { + return _client.disconnect(); + } + + @override + Future connectIfExist(String userId) async { + final token = await getToken(userId); + await _client.connectUser( + User(id: userId), + token, + ); + return _client.state.user.name != null && _client.state.user.name != userId; + } +} diff --git a/packages/chatty/lib/data/local/upload_storage_local_impl.dart b/packages/chatty/lib/data/local/upload_storage_local_impl.dart new file mode 100644 index 0000000..8a3b804 --- /dev/null +++ b/packages/chatty/lib/data/local/upload_storage_local_impl.dart @@ -0,0 +1,10 @@ +import 'dart:io'; + +import 'package:stream_chatter/data/upload_storage_repository.dart'; + +class UploadStorageLocalImpl extends UploadStorageRepository { + @override + Future uploadPhoto(File file, String path) async { + return 'https://lh3.googleusercontent.com/a-/AOh14GjhqGZ-V7tNXS1pOIp9vbBij4OS9JbzxXgxgy1t=s600-k-no-rp-mo'; + } +} diff --git a/packages/chatty/lib/data/persistent_storage_repository.dart b/packages/chatty/lib/data/persistent_storage_repository.dart new file mode 100644 index 0000000..c061619 --- /dev/null +++ b/packages/chatty/lib/data/persistent_storage_repository.dart @@ -0,0 +1,4 @@ +abstract class PersistentStorageRepository { + Future isDarkMode(); + Future updateDarkMode(bool isDarkMode); +} diff --git a/packages/chatty/lib/data/prod/auth_impl.dart b/packages/chatty/lib/data/prod/auth_impl.dart new file mode 100644 index 0000000..90547bb --- /dev/null +++ b/packages/chatty/lib/data/prod/auth_impl.dart @@ -0,0 +1,41 @@ +import 'package:firebase_auth/firebase_auth.dart'; +import 'package:stream_chatter/data/auth_repository.dart'; +import 'package:stream_chatter/domain/models/auth_user.dart'; +import 'package:google_sign_in/google_sign_in.dart'; + +class AuthImpl extends AuthRepository { + FirebaseAuth _auth = FirebaseAuth.instance; + + @override + Future getAuthUser() async { + final user = _auth.currentUser; + if (user != null) { + return AuthUser(user.uid); + } + return null; + } + + @override + Future signIn() async { + try { + UserCredential userCredential; + final GoogleSignInAccount googleUser = await GoogleSignIn().signIn(); + final GoogleSignInAuthentication googleAuth = await googleUser.authentication; + final GoogleAuthCredential googleAuthCredential = GoogleAuthProvider.credential( + accessToken: googleAuth.accessToken, + idToken: googleAuth.idToken, + ); + userCredential = await _auth.signInWithCredential(googleAuthCredential); + final user = userCredential.user; + return AuthUser(user.uid); + } catch (e) { + print(e); + throw Exception('login error'); + } + } + + @override + Future logout() async { + return _auth.signOut(); + } +} diff --git a/packages/chatty/lib/data/prod/persistent_storage_impl.dart b/packages/chatty/lib/data/prod/persistent_storage_impl.dart new file mode 100644 index 0000000..5d247d5 --- /dev/null +++ b/packages/chatty/lib/data/prod/persistent_storage_impl.dart @@ -0,0 +1,18 @@ +import 'package:stream_chatter/data/persistent_storage_repository.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +const _isDarkMode = 'isDarkMode'; + +class PersistentStorageImpl extends PersistentStorageRepository { + @override + Future isDarkMode() async { + final preference = await SharedPreferences.getInstance(); + return preference.getBool(_isDarkMode) ?? false; + } + + @override + Future updateDarkMode(bool isDarkMode) async { + final preference = await SharedPreferences.getInstance(); + return await preference.setBool(_isDarkMode, isDarkMode); + } +} diff --git a/packages/chatty/lib/data/prod/stream_api_impl.dart b/packages/chatty/lib/data/prod/stream_api_impl.dart new file mode 100644 index 0000000..1bcab14 --- /dev/null +++ b/packages/chatty/lib/data/prod/stream_api_impl.dart @@ -0,0 +1,102 @@ +import 'dart:convert'; + +import 'package:stream_chatter/data/stream_api_repository.dart'; +import 'package:stream_chatter/domain/models/chat_user.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; +import 'package:http/http.dart' as http; + +class StreamApiImpl extends StreamApiRepository { + StreamApiImpl(this._client); + + final StreamChatClient _client; + + @override + Future connectUser(ChatUser user, String token) async { + Map extraData = {}; + if (user.image != null) { + extraData['image'] = user.image; + } + if (user.name != null) { + extraData['name'] = user.name; + } + await _client.disconnect(); + await _client.connectUser( + User(id: user.id, extraData: extraData), + token, + ); + return user; + } + + @override + Future> getChatUsers() async { + final result = await _client.queryUsers(); + final chatUsers = result.users + .where((element) => element.id != _client.state.user.id) + .map( + (e) => ChatUser( + id: e.id, + name: e.name, + image: e.extraData['image'], + ), + ) + .toList(); + return chatUsers; + } + + @override + Future getToken(String userId) async { + //TODO: use your own implementation in Production + final response = await http.post( + 'your_backend_url', + body: jsonEncode({'id': userId}), + headers: { + 'Content-Type': 'application/json; charset=UTF-8', + }, + ); + final token = jsonDecode(response.body)['token']; + + //In Development mode you can just use : + // _client.devToken(userId); + + return token; + } + + @override + Future createGroupChat(String id, String name, List members, {String image}) async { + final channel = _client.channel('messaging', id: id, extraData: { + 'name': name, + 'image': image, + 'members': [_client.state.user.id, ...members], + }); + await channel.watch(); + return channel; + } + + @override + Future createSimpleChat(String friendId) async { + final channel = + _client.channel('messaging', id: '${_client.state.user.id.hashCode}${friendId.hashCode}', extraData: { + 'members': [ + friendId, + _client.state.user.id, + ], + }); + await channel.watch(); + return channel; + } + + @override + Future logout() async { + return _client.disconnect(); + } + + @override + Future connectIfExist(String userId) async { + final token = await getToken(userId); + await _client.connectUser( + User(id: userId), + token, + ); + return _client.state.user.name != null && _client.state.user.name != userId; + } +} diff --git a/packages/chatty/lib/data/prod/upload_storage_impl.dart b/packages/chatty/lib/data/prod/upload_storage_impl.dart new file mode 100644 index 0000000..37f6830 --- /dev/null +++ b/packages/chatty/lib/data/prod/upload_storage_impl.dart @@ -0,0 +1,13 @@ +import 'dart:io'; +import 'package:firebase_storage/firebase_storage.dart' as firebase_storage; +import 'package:stream_chatter/data/upload_storage_repository.dart'; + +class UploadStorageImpl extends UploadStorageRepository { + @override + Future uploadPhoto(File file, String path) async { + final ref = firebase_storage.FirebaseStorage.instance.ref(path); + final uploadTask = ref.putFile(file); + await uploadTask; + return await ref.getDownloadURL(); + } +} diff --git a/packages/chatty/lib/data/stream_api_repository.dart b/packages/chatty/lib/data/stream_api_repository.dart new file mode 100644 index 0000000..4ae31cb --- /dev/null +++ b/packages/chatty/lib/data/stream_api_repository.dart @@ -0,0 +1,12 @@ +import 'package:stream_chatter/domain/models/chat_user.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; + +abstract class StreamApiRepository { + Future> getChatUsers(); + Future getToken(String userId); + Future connectIfExist(String userId); + Future connectUser(ChatUser user, String token); + Future createGroupChat(String channelId, String name, List members, {String image}); + Future createSimpleChat(String friendId); + Future logout(); +} diff --git a/packages/chatty/lib/data/upload_storage_repository.dart b/packages/chatty/lib/data/upload_storage_repository.dart new file mode 100644 index 0000000..6876138 --- /dev/null +++ b/packages/chatty/lib/data/upload_storage_repository.dart @@ -0,0 +1,5 @@ +import 'dart:io'; + +abstract class UploadStorageRepository { + Future uploadPhoto(File file, String path); +} diff --git a/packages/chatty/lib/dependencies.dart b/packages/chatty/lib/dependencies.dart new file mode 100644 index 0000000..f6d6414 --- /dev/null +++ b/packages/chatty/lib/dependencies.dart @@ -0,0 +1,52 @@ +import 'package:stream_chatter/data/auth_repository.dart'; +import 'package:stream_chatter/data/image_picker_repository.dart'; +import 'package:stream_chatter/data/local/image_picker_impl.dart'; +import 'package:stream_chatter/data/persistent_storage_repository.dart'; +import 'package:stream_chatter/data/prod/auth_impl.dart'; +import 'package:stream_chatter/data/prod/persistent_storage_impl.dart'; +import 'package:stream_chatter/data/prod/stream_api_impl.dart'; +import 'package:stream_chatter/data/prod/upload_storage_impl.dart'; +import 'package:stream_chatter/data/stream_api_repository.dart'; +import 'package:stream_chatter/data/upload_storage_repository.dart'; +import 'package:stream_chatter/domain/usecases/create_group_usecase.dart'; +import 'package:stream_chatter/domain/usecases/login_usecase.dart'; +import 'package:stream_chatter/domain/usecases/logout_usecase.dart'; +import 'package:stream_chatter/domain/usecases/profile_sign_in_usecase.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; + +List buildRepositories(StreamChatClient client) { + //TODO: Here you can use your local implementations of your repositories + return [ + RepositoryProvider(create: (_) => StreamApiImpl(client)), + RepositoryProvider(create: (_) => PersistentStorageImpl()), + RepositoryProvider(create: (_) => AuthImpl()), + RepositoryProvider(create: (_) => UploadStorageImpl()), + RepositoryProvider(create: (_) => ImagePickerImpl()), + RepositoryProvider( + create: (context) => ProfileSignInUseCase( + context.read(), + context.read(), + context.read(), + ), + ), + RepositoryProvider( + create: (context) => CreateGroupUseCase( + context.read(), + context.read(), + ), + ), + RepositoryProvider( + create: (context) => LogoutUseCase( + context.read(), + context.read(), + ), + ), + RepositoryProvider( + create: (context) => LoginUseCase( + context.read(), + context.read(), + ), + ), + ]; +} diff --git a/packages/chatty/lib/domain/exceptions/auth_exception.dart b/packages/chatty/lib/domain/exceptions/auth_exception.dart new file mode 100644 index 0000000..22cbf09 --- /dev/null +++ b/packages/chatty/lib/domain/exceptions/auth_exception.dart @@ -0,0 +1,10 @@ +enum AuthErrorCode { + not_auth, + not_chat_user, +} + +class AuthException implements Exception { + AuthException(this.error); + + final AuthErrorCode error; +} diff --git a/packages/chatty/lib/domain/models/auth_user.dart b/packages/chatty/lib/domain/models/auth_user.dart new file mode 100644 index 0000000..7ffcd9d --- /dev/null +++ b/packages/chatty/lib/domain/models/auth_user.dart @@ -0,0 +1,4 @@ +class AuthUser { + AuthUser(this.id); + final String id; +} diff --git a/packages/chatty/lib/domain/models/chat_user.dart b/packages/chatty/lib/domain/models/chat_user.dart new file mode 100644 index 0000000..05a0a61 --- /dev/null +++ b/packages/chatty/lib/domain/models/chat_user.dart @@ -0,0 +1,6 @@ +class ChatUser { + const ChatUser({this.name, this.image, this.id}); + final String name; + final String image; + final String id; +} diff --git a/packages/chatty/lib/domain/usecases/create_group_usecase.dart b/packages/chatty/lib/domain/usecases/create_group_usecase.dart new file mode 100644 index 0000000..82122a2 --- /dev/null +++ b/packages/chatty/lib/domain/usecases/create_group_usecase.dart @@ -0,0 +1,38 @@ +import 'dart:io'; + +import 'package:stream_chatter/data/stream_api_repository.dart'; +import 'package:stream_chatter/data/upload_storage_repository.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; +import 'package:uuid/uuid.dart'; + +class CreateGroupInput { + CreateGroupInput({this.imageFile, this.name, this.members}); + final File imageFile; + final String name; + final List members; +} + +class CreateGroupUseCase { + CreateGroupUseCase( + this._streamApiRepository, + this._uploadStorageRepository, + ); + + final UploadStorageRepository _uploadStorageRepository; + final StreamApiRepository _streamApiRepository; + + Future createGroup(CreateGroupInput input) async { + final channelId = Uuid().v4(); + String image; + if (input.imageFile != null) { + image = await _uploadStorageRepository.uploadPhoto(input.imageFile, 'channels/$channelId'); + } + final channel = await _streamApiRepository.createGroupChat( + channelId, + input.name, + input.members, + image: image, + ); + return channel; + } +} diff --git a/packages/chatty/lib/domain/usecases/login_usecase.dart b/packages/chatty/lib/domain/usecases/login_usecase.dart new file mode 100644 index 0000000..5b0d04d --- /dev/null +++ b/packages/chatty/lib/domain/usecases/login_usecase.dart @@ -0,0 +1,30 @@ +import 'package:stream_chatter/data/auth_repository.dart'; +import 'package:stream_chatter/data/stream_api_repository.dart'; +import 'package:stream_chatter/domain/exceptions/auth_exception.dart'; +import 'package:stream_chatter/domain/models/auth_user.dart'; + +class LoginUseCase { + LoginUseCase(this.authRepository, this.streamApiRepository); + + final AuthRepository authRepository; + final StreamApiRepository streamApiRepository; + + Future validateLogin() async { + print('validateLogin'); + final user = await authRepository.getAuthUser(); + print('user: ${user?.id}'); + if (user != null) { + final result = await streamApiRepository.connectIfExist(user.id); + if (result) { + return true; + } else { + throw AuthException(AuthErrorCode.not_chat_user); + } + } + throw AuthException(AuthErrorCode.not_auth); + } + + Future signIn() async { + return await authRepository.signIn(); + } +} diff --git a/packages/chatty/lib/domain/usecases/logout_usecase.dart b/packages/chatty/lib/domain/usecases/logout_usecase.dart new file mode 100644 index 0000000..96b419e --- /dev/null +++ b/packages/chatty/lib/domain/usecases/logout_usecase.dart @@ -0,0 +1,13 @@ +import 'package:stream_chatter/data/auth_repository.dart'; +import 'package:stream_chatter/data/stream_api_repository.dart'; + +class LogoutUseCase { + LogoutUseCase(this.streamApiRepository, this.authRepository); + final StreamApiRepository streamApiRepository; + final AuthRepository authRepository; + + Future logout() async { + await streamApiRepository.logout(); + await authRepository.logout(); + } +} diff --git a/packages/chatty/lib/domain/usecases/profile_sign_in_usecase.dart b/packages/chatty/lib/domain/usecases/profile_sign_in_usecase.dart new file mode 100644 index 0000000..8450581 --- /dev/null +++ b/packages/chatty/lib/domain/usecases/profile_sign_in_usecase.dart @@ -0,0 +1,34 @@ +import 'dart:io'; + +import 'package:stream_chatter/data/auth_repository.dart'; +import 'package:stream_chatter/data/stream_api_repository.dart'; +import 'package:stream_chatter/data/upload_storage_repository.dart'; +import 'package:stream_chatter/domain/models/chat_user.dart'; + +class ProfileInput { + ProfileInput({this.imageFile, this.name}); + final File imageFile; + final String name; +} + +class ProfileSignInUseCase { + ProfileSignInUseCase( + this._authRepository, + this._streamApiRepository, + this._uploadStorageRepository, + ); + + final AuthRepository _authRepository; + final UploadStorageRepository _uploadStorageRepository; + final StreamApiRepository _streamApiRepository; + + Future verify(ProfileInput input) async { + final auth = await _authRepository.getAuthUser(); + final token = await _streamApiRepository.getToken(auth.id); + String image; + if (input.imageFile != null) { + image = await _uploadStorageRepository.uploadPhoto(input.imageFile, 'users/${auth.id}'); + } + await _streamApiRepository.connectUser(ChatUser(name: input.name, id: auth.id, image: image), token); + } +} diff --git a/packages/chatty/lib/main.dart b/packages/chatty/lib/main.dart new file mode 100644 index 0000000..479c1c8 --- /dev/null +++ b/packages/chatty/lib/main.dart @@ -0,0 +1,50 @@ +import 'package:firebase_core/firebase_core.dart'; +import 'package:stream_chatter/dependencies.dart'; +import 'package:stream_chatter/ui/app_theme_cubit.dart'; +import 'package:stream_chatter/ui/splash/splash_view.dart'; +import 'package:stream_chatter/ui/themes.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +Future main() async { + WidgetsFlutterBinding.ensureInitialized(); + await Firebase.initializeApp(); + runApp(MyApp()); +} + +class MyApp extends StatelessWidget { + final _streamChatClient = StreamChatClient('c2rynysx9x6b'); + + @override + Widget build(BuildContext context) { + SystemChrome.setEnabledSystemUIOverlays([SystemUiOverlay.bottom]); + + return MultiRepositoryProvider( + providers: buildRepositories(_streamChatClient), + child: BlocProvider( + create: (context) => AppThemeCubit(context.read())..init(), + child: BlocBuilder(builder: (context, snapshot) { + return MaterialApp( + title: 'Stream Chatty', + home: SplashView(), + theme: snapshot ? Themes.themeDark : Themes.themeLight, + builder: (context, child) { + return StreamChat( + child: child, + client: _streamChatClient, + streamChatThemeData: StreamChatThemeData.fromTheme(Theme.of(context)).copyWith( + ownMessageTheme: MessageTheme( + messageBackgroundColor: Theme.of(context).accentColor, + messageText: TextStyle(color: Colors.white), + ), + ), + ); + }, + ); + }), + ), + ); + } +} diff --git a/packages/chatty/lib/navigator_utils.dart b/packages/chatty/lib/navigator_utils.dart new file mode 100644 index 0000000..2d5c27f --- /dev/null +++ b/packages/chatty/lib/navigator_utils.dart @@ -0,0 +1,22 @@ +import 'package:flutter/material.dart'; + +Future pushToPage(BuildContext context, Widget widget) async { + await Navigator.of(context).push( + MaterialPageRoute( + builder: (_) => widget, + ), + ); +} + +Future pushAndReplaceToPage(BuildContext context, Widget widget) async { + await Navigator.of(context).pushReplacement( + MaterialPageRoute( + builder: (_) => widget, + ), + ); +} + +Future popAllAndPush(BuildContext context, Widget widget) async { + await Navigator.pushAndRemoveUntil( + context, MaterialPageRoute(builder: (BuildContext context) => widget), ModalRoute.withName('/')); +} diff --git a/packages/chatty/lib/ui/app_theme_cubit.dart b/packages/chatty/lib/ui/app_theme_cubit.dart new file mode 100644 index 0000000..8633aec --- /dev/null +++ b/packages/chatty/lib/ui/app_theme_cubit.dart @@ -0,0 +1,21 @@ +import 'package:stream_chatter/data/persistent_storage_repository.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class AppThemeCubit extends Cubit { + AppThemeCubit(this._persistentStorageRepository) : super(false); + final PersistentStorageRepository _persistentStorageRepository; + + bool _isDark = false; + bool get isDark => _isDark; + + Future init() async { + _isDark = await _persistentStorageRepository.isDarkMode(); + emit(_isDark); + } + + Future updateTheme(bool isDarkMode) async { + _isDark = isDarkMode; + await _persistentStorageRepository.updateDarkMode(isDarkMode); + emit(_isDark); + } +} diff --git a/packages/chatty/lib/ui/common/avatar_image_view.dart b/packages/chatty/lib/ui/common/avatar_image_view.dart new file mode 100644 index 0000000..76ee22a --- /dev/null +++ b/packages/chatty/lib/ui/common/avatar_image_view.dart @@ -0,0 +1,45 @@ +import 'package:flutter/material.dart'; + +class AvatarImageView extends StatelessWidget { + const AvatarImageView({Key key, this.onTap, this.child}) : super(key: key); + final Widget child; + final VoidCallback onTap; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.all(20.0), + child: Stack( + clipBehavior: Clip.none, + children: [ + ClipOval( + child: Container( + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.grey[100], + ), + height: 180, + width: 180, + child: child, + ), + ), + Positioned( + bottom: -15, + right: 0, + child: GestureDetector( + onTap: onTap, + child: CircleAvatar( + backgroundColor: Colors.white, + radius: 30, + child: Icon( + Icons.camera_alt_outlined, + color: Colors.black, + ), + ), + ), + ), + ], + ), + ); + } +} diff --git a/packages/chatty/lib/ui/common/initial_background_view.dart b/packages/chatty/lib/ui/common/initial_background_view.dart new file mode 100644 index 0000000..4e26bba --- /dev/null +++ b/packages/chatty/lib/ui/common/initial_background_view.dart @@ -0,0 +1,27 @@ +import 'package:flutter/material.dart'; + +class InitialBackgroundView extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Stack( + children: [ + Positioned( + top: 20, + right: -75, + child: Image.asset( + 'assets/icon-top-right.png', + height: 150, + ), + ), + Positioned( + bottom: -50, + right: -50, + child: Image.asset( + 'assets/icon-bottom-right.png', + height: 200, + ), + ), + ], + ); + } +} diff --git a/packages/chatty/lib/ui/common/loading_view.dart b/packages/chatty/lib/ui/common/loading_view.dart new file mode 100644 index 0000000..9e1cded --- /dev/null +++ b/packages/chatty/lib/ui/common/loading_view.dart @@ -0,0 +1,30 @@ +import 'package:flutter/material.dart'; + +class LoadingView extends StatelessWidget { + final bool isLoading; + final Widget child; + + const LoadingView({ + Key key, + @required this.child, + this.isLoading = false, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Stack( + children: [ + child, + if (isLoading) + Container( + color: Colors.black26, + child: Center( + child: CircularProgressIndicator(), + ), + ), + ], + ), + ); + } +} diff --git a/packages/chatty/lib/ui/common/my_channel_preview.dart b/packages/chatty/lib/ui/common/my_channel_preview.dart new file mode 100644 index 0000000..b561e45 --- /dev/null +++ b/packages/chatty/lib/ui/common/my_channel_preview.dart @@ -0,0 +1,326 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; +import 'package:jiffy/jiffy.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; +import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; + +/*Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return StreamChannel( + child: widget.channelWidget, + channel: client, + ); + }, + ), + ); + */ + +/// ![screenshot](https://raw.githubusercontent.com/GetStream/stream-chat-flutter/master/screenshots/channel_preview.png) +/// ![screenshot](https://raw.githubusercontent.com/GetStream/stream-chat-flutter/master/screenshots/channel_preview_paint.png) +/// +/// It shows the current [Channel] preview. +/// +/// The widget uses a [StreamBuilder] to render the channel information image as soon as it updates. +/// +/// Usually you don't use this widget as it's the default channel preview used by [ChannelListView]. +/// +/// The widget renders the ui based on the first ancestor of type [StreamChatTheme]. +/// Modify it to change the widget appearance. +class MyChannelPreview extends StatelessWidget { + /// Function called when tapping this widget + final void Function(Channel) onTap; + + /// Function called when long pressing this widget + final void Function(Channel) onLongPress; + + /// Channel displayed + final Channel channel; + + /// The function called when the image is tapped + final VoidCallback onImageTap; + + final String heroTag; + + MyChannelPreview({ + @required this.channel, + Key key, + this.onTap, + this.onLongPress, + this.onImageTap, + this.heroTag, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + return StreamBuilder( + stream: channel.isMutedStream, + initialData: channel.isMuted, + builder: (context, snapshot) { + return Opacity( + opacity: snapshot.data ? 0.5 : 1, + child: ListTile( + contentPadding: const EdgeInsets.symmetric( + horizontal: 8, + ), + onTap: () { + if (onTap != null) { + onTap(channel); + } + }, + onLongPress: () { + if (onLongPress != null) { + onLongPress(channel); + } + }, + leading: Material( + child: Hero( + tag: heroTag, + child: StreamChannel( + channel: channel, + child: ChannelImage( + onTap: onImageTap, + ), + ), + ), + ), + title: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Flexible( + child: ChannelName( + textStyle: StreamChatTheme.of(context).channelPreviewTheme.title, + ), + ), + StreamBuilder>( + stream: channel.state.membersStream, + initialData: channel.state.members, + builder: (context, snapshot) { + if (!snapshot.hasData || + snapshot.data.isEmpty || + !snapshot.data.any((Member e) => e.user.id == channel.client.state.user.id)) { + return SizedBox(); + } + return ChannelUnreadIndicator( + channel: channel, + ); + }), + ], + ), + subtitle: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Flexible(child: _buildSubtitle(context)), + Builder( + builder: (context) { + final lastMessage = channel.state.messages.lastWhere( + (m) => !m.isDeleted && m.shadowed != true, + orElse: () => null, + ); + if (lastMessage?.user?.id == StreamChat.of(context).user.id) { + return Padding( + padding: const EdgeInsets.only(right: 4.0), + child: SendingIndicator( + message: lastMessage, + size: StreamChatTheme.of(context).channelPreviewTheme.indicatorIconSize, + isMessageRead: channel.state.read + ?.where((element) => element.user.id != channel.client.state.user.id) + ?.where((element) => element.lastRead.isAfter(lastMessage.createdAt)) + ?.isNotEmpty == + true, + ), + ); + } + return SizedBox(); + }, + ), + _buildDate(context), + ], + ), + ), + ); + }); + } + + Widget _buildDate(BuildContext context) { + return StreamBuilder( + stream: channel.lastMessageAtStream, + initialData: channel.lastMessageAt, + builder: (context, snapshot) { + if (!snapshot.hasData) { + return SizedBox(); + } + final lastMessageAt = snapshot.data.toLocal(); + + String stringDate; + final now = DateTime.now(); + + var startOfDay = DateTime(now.year, now.month, now.day); + + if (lastMessageAt.millisecondsSinceEpoch >= startOfDay.millisecondsSinceEpoch) { + stringDate = Jiffy(lastMessageAt.toLocal()).format('HH:mm'); + } else if (lastMessageAt.millisecondsSinceEpoch >= + startOfDay.subtract(Duration(days: 1)).millisecondsSinceEpoch) { + stringDate = 'Yesterday'; + } else if (startOfDay.difference(lastMessageAt).inDays < 7) { + stringDate = Jiffy(lastMessageAt.toLocal()).EEEE; + } else { + stringDate = Jiffy(lastMessageAt.toLocal()).format('dd/MM/yyyy'); + } + + return Text( + stringDate, + style: StreamChatTheme.of(context).channelPreviewTheme.lastMessageAt, + ); + }, + ); + } + + Widget _buildSubtitle(BuildContext context) { + if (channel.isMuted) { + return Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + StreamSvgIcon.mute( + size: 16, + ), + Text( + ' Channel is muted', + style: StreamChatTheme.of(context).channelPreviewTheme.subtitle.copyWith( + color: StreamChatTheme.of(context).channelPreviewTheme.subtitle.color, + ), + ), + ], + ); + } + return TypingIndicator( + channel: channel, + alternativeWidget: _buildLastMessage(context), + style: StreamChatTheme.of(context).channelPreviewTheme.subtitle.copyWith( + color: StreamChatTheme.of(context).channelPreviewTheme.subtitle.color, + ), + ); + } + + Widget _buildLastMessage(BuildContext context) { + return StreamBuilder>( + stream: channel.state.messagesStream, + initialData: channel.state.messages, + builder: (context, snapshot) { + final lastMessage = snapshot.data?.lastWhere((m) => m.shadowed != true && !m.isDeleted, orElse: () => null); + if (lastMessage == null) { + return SizedBox(); + } + + var text = lastMessage.text; + if (lastMessage.attachments != null) { + final parts = [ + ...lastMessage.attachments.map((e) { + if (e.type == 'image') { + return '📷'; + } else if (e.type == 'video') { + return '🎬'; + } else if (e.type == 'giphy') { + return '[GIF]'; + } + return e == lastMessage.attachments.last ? (e.title ?? 'File') : '${e.title ?? 'File'} , '; + }).where((e) => e != null), + lastMessage.text ?? '', + ]; + + text = parts.join(' '); + } + + return Text.rich( + _getDisplayText( + text, + lastMessage.mentionedUsers, + lastMessage.attachments, + StreamChatTheme.of(context).channelPreviewTheme.subtitle.copyWith( + color: StreamChatTheme.of(context).channelPreviewTheme.subtitle.color, + fontStyle: (lastMessage.isSystem || lastMessage.isDeleted) ? FontStyle.italic : FontStyle.normal), + StreamChatTheme.of(context).channelPreviewTheme.subtitle.copyWith( + color: StreamChatTheme.of(context).channelPreviewTheme.subtitle.color, + fontStyle: (lastMessage.isSystem || lastMessage.isDeleted) ? FontStyle.italic : FontStyle.normal, + fontWeight: FontWeight.bold), + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ); + }, + ); + } + + TextSpan _getDisplayText(String text, List mentions, List attachments, TextStyle normalTextStyle, + TextStyle mentionsTextStyle) { + var textList = text.split(' '); + var resList = []; + for (var e in textList) { + if (mentions != null && mentions.isNotEmpty && mentions.any((element) => '@${element.name}' == e)) { + resList.add(TextSpan( + text: '$e ', + style: mentionsTextStyle, + )); + } else if (attachments != null && + attachments.isNotEmpty && + attachments.where((e) => e.title != null).any((element) => element.title == e)) { + resList.add(TextSpan( + text: '$e ', + style: normalTextStyle.copyWith(fontStyle: FontStyle.italic), + )); + } else { + resList.add(TextSpan( + text: e == textList.last ? '$e' : '$e ', + style: normalTextStyle, + )); + } + } + + return TextSpan(children: resList); + } +} + +class ChannelUnreadIndicator extends StatelessWidget { + const ChannelUnreadIndicator({ + Key key, + @required this.channel, + }) : super(key: key); + + final Channel channel; + + @override + Widget build(BuildContext context) { + return StreamBuilder( + stream: channel.state.unreadCountStream, + initialData: channel.state.unreadCount, + builder: (context, snapshot) { + if (!snapshot.hasData || snapshot.data == 0) { + return SizedBox(); + } + + return Material( + borderRadius: BorderRadius.circular(8), + color: StreamChatTheme.of(context).channelPreviewTheme.unreadCounterColor, + child: Padding( + padding: const EdgeInsets.only( + left: 5.0, + right: 5.0, + top: 2, + bottom: 1, + ), + child: Center( + child: Text( + '${snapshot.data > 99 ? '99+' : snapshot.data}', + style: TextStyle( + fontSize: 11, + color: Colors.white, + ), + ), + ), + ), + ); + }, + ); + } +} diff --git a/packages/chatty/lib/ui/home/chat/chat_view.dart b/packages/chatty/lib/ui/home/chat/chat_view.dart new file mode 100644 index 0000000..b9f4ea7 --- /dev/null +++ b/packages/chatty/lib/ui/home/chat/chat_view.dart @@ -0,0 +1,160 @@ +import 'package:stream_chatter/ui/common/my_channel_preview.dart'; +import 'package:flutter/material.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; + +class ChatView extends StatelessWidget { + @override + Widget build(BuildContext context) { + final textColor = Theme.of(context).appBarTheme.color; + return Scaffold( + backgroundColor: Theme.of(context).canvasColor, + appBar: AppBar( + title: Text( + 'Chats', + style: TextStyle( + fontSize: 24, + color: textColor, + fontWeight: FontWeight.w800, + ), + ), + centerTitle: false, + elevation: 0, + backgroundColor: Theme.of(context).canvasColor, + ), + body: ChannelsBloc( + child: ChannelListView( + filter: { + 'members': { + '\$in': [StreamChat.of(context).user?.id], + } + }, + sort: [SortOption('last_message_at')], + channelPreviewBuilder: (context, channel) { + return Container( + color: Theme.of(context).canvasColor, + child: MyChannelPreview( + channel: channel, + heroTag: channel.id, + onImageTap: () { + String name; + String image; + final currentUser = StreamChat.of(context).client.state.user; + if (channel.isGroup) { + name = channel.extraData['name']; + image = channel.extraData['image']; + } else { + final friend = + channel.state.members.where((element) => element.userId != currentUser.id).first.user; + name = friend.name; + image = friend.extraData['image']; + } + + return Navigator.of(context).push( + PageRouteBuilder( + barrierColor: Colors.black45, + barrierDismissible: true, + opaque: false, + pageBuilder: (context, animation1, _) { + return FadeTransition( + opacity: animation1, + child: ChatDetailView( + channelId: channel.id, + image: image, + name: name, + ), + ); + }), + ); + }, + onTap: (channel) => { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return StreamChannel( + child: ChannelPage(), + channel: channel, + ); + }, + ), + ) + }, + ), + ); + }, + channelWidget: ChannelPage(), + ), + ), + ); + } +} + +class ChannelPage extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: ChannelHeader(), + body: Column( + children: [ + Expanded( + child: MessageListView(), + ), + MessageInput(), + ], + ), + ); + } +} + +class ChatDetailView extends StatelessWidget { + const ChatDetailView({ + Key key, + this.image, + this.name, + this.channelId, + }) : super(key: key); + + final String image; + final String name; + final String channelId; + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: Navigator.of(context).pop, + child: Material( + color: Colors.transparent, + child: Dialog( + backgroundColor: Colors.transparent, + elevation: 0, + child: Padding( + padding: const EdgeInsets.all(20.0), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Hero( + tag: channelId, + child: ClipOval( + child: Image.network( + image, + height: 180, + width: 180, + fit: BoxFit.cover, + ), + ), + ), + Text( + name, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 22, + ), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/packages/chatty/lib/ui/home/chat/selection/friends_selection_cubit.dart b/packages/chatty/lib/ui/home/chat/selection/friends_selection_cubit.dart new file mode 100644 index 0000000..3f35080 --- /dev/null +++ b/packages/chatty/lib/ui/home/chat/selection/friends_selection_cubit.dart @@ -0,0 +1,38 @@ +import 'package:stream_chatter/data/stream_api_repository.dart'; +import 'package:stream_chatter/domain/models/chat_user.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; + +class ChatUserState { + const ChatUserState(this.chatUser, {this.selected = false}); + final ChatUser chatUser; + final bool selected; +} + +class FriendsSelectionCubit extends Cubit> { + FriendsSelectionCubit(this._streamApiRepository) : super([]); + final StreamApiRepository _streamApiRepository; + + List get selectedUsers => state.where((element) => element.selected).toList(); + + Future init() async { + final chatUsers = (await _streamApiRepository.getChatUsers()).map((e) => ChatUserState(e)).toList(); + emit(chatUsers); + } + + void selectUser(ChatUserState chatUser) { + final index = state.indexWhere((element) => element.chatUser.id == chatUser.chatUser.id); + state[index] = ChatUserState(state[index].chatUser, selected: !chatUser.selected); + emit(List.from(state)); + } + + Future createFriendChannel(ChatUserState chatUserState) async { + return await _streamApiRepository.createSimpleChat(chatUserState.chatUser.id); + } +} + +class FriendsGroupCubit extends Cubit { + FriendsGroupCubit() : super(false); + + void changeToGroup() => emit(!state); +} diff --git a/packages/chatty/lib/ui/home/chat/selection/friends_selection_view.dart b/packages/chatty/lib/ui/home/chat/selection/friends_selection_view.dart new file mode 100644 index 0000000..4cafcef --- /dev/null +++ b/packages/chatty/lib/ui/home/chat/selection/friends_selection_view.dart @@ -0,0 +1,190 @@ +import 'package:stream_chatter/navigator_utils.dart'; +import 'package:stream_chatter/ui/home/chat/chat_view.dart'; +import 'package:stream_chatter/ui/home/chat/selection/friends_selection_cubit.dart'; +import 'package:stream_chatter/ui/home/chat/selection/group_selection_view.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; + +class FriendsSelectionView extends StatelessWidget { + void _createFriendChannel(BuildContext context, ChatUserState chatUserState) async { + final channel = await context.read().createFriendChannel(chatUserState); + pushAndReplaceToPage( + context, + Scaffold( + body: StreamChannel( + channel: channel, + child: ChannelPage(), + ), + ), + ); + } + + @override + Widget build(BuildContext context) { + final textColor = Theme.of(context).appBarTheme.color; + final accentColor = Theme.of(context).accentColor; + return MultiBlocProvider( + providers: [ + BlocProvider(create: (context) => FriendsSelectionCubit(context.read())..init()), + BlocProvider(create: (_) => FriendsGroupCubit()), + ], + child: BlocBuilder(builder: (context, isGroup) { + return BlocBuilder>(builder: (context, snapshot) { + final selectedUsers = context.read().selectedUsers; + + return Scaffold( + floatingActionButton: isGroup && selectedUsers.isNotEmpty + ? FloatingActionButton( + child: Icon(Icons.arrow_right_alt_rounded), + onPressed: () { + pushAndReplaceToPage(context, GroupSelectionView(selectedUsers)); + }) + : null, + backgroundColor: Theme.of(context).canvasColor, + body: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 10.0, + vertical: 20, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (isGroup) + Row( + children: [ + BackButton( + onPressed: () { + context.read().changeToGroup(); + }, + ), + Text( + 'New Group', + style: TextStyle( + fontSize: 24, + color: textColor, + fontWeight: FontWeight.w800, + ), + ), + ], + ) + else + Row( + children: [ + BackButton( + onPressed: Navigator.of(context).pop, + ), + Text( + 'People', + style: TextStyle( + fontSize: 24, + color: textColor, + fontWeight: FontWeight.w800, + ), + ), + ], + ), + if (!isGroup) + ListTile( + onTap: context.read().changeToGroup, + leading: CircleAvatar( + backgroundColor: accentColor, + child: Icon(Icons.group_outlined), + ), + title: Text('Create group', style: TextStyle(fontWeight: FontWeight.w700)), + subtitle: Text('Talk with 2 or more contacts'), + ) + else if (isGroup && selectedUsers.isEmpty) + Padding( + padding: const EdgeInsets.only(top: 15.0, left: 20.0, bottom: 20), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + CircleAvatar( + backgroundColor: Colors.grey[200], + ), + Text( + 'Add a friend', + style: TextStyle( + fontSize: 12, + color: Colors.grey[500], + ), + ), + ], + ), + ) + else + SizedBox( + height: 100, + child: ListView.builder( + scrollDirection: Axis.horizontal, + itemCount: selectedUsers.length, + itemBuilder: (context, index) { + final chatUserState = selectedUsers[index]; + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 13.0), + child: Stack( + clipBehavior: Clip.none, + children: [ + Column( + mainAxisSize: MainAxisSize.min, + children: [ + CircleAvatar( + radius: 30, + backgroundImage: NetworkImage(chatUserState.chatUser.image), + ), + Text(chatUserState.chatUser.name), + ], + ), + Positioned( + bottom: 40, + right: -4, + child: InkWell( + onTap: () => context.read().selectUser(chatUserState), + child: CircleAvatar( + radius: 9, + backgroundColor: accentColor, + child: Icon(Icons.close_rounded, size: 12), + ), + ), + ), + ], + ), + ); + })), + Expanded( + child: ListView.builder( + itemCount: snapshot.length, + itemBuilder: (context, index) { + final chatUserState = snapshot[index]; + return ListTile( + onTap: () { + _createFriendChannel(context, chatUserState); + }, + leading: CircleAvatar( + backgroundImage: NetworkImage(chatUserState.chatUser.image), + ), + title: Text(chatUserState.chatUser.name), + trailing: isGroup + ? Checkbox( + value: chatUserState.selected, + onChanged: (val) { + print('select user for group'); + context.read().selectUser(chatUserState); + }, + ) + : null, + ); + }, + ), + ), + ], + ), + ), + ); + }); + }), + ); + } +} diff --git a/packages/chatty/lib/ui/home/chat/selection/group_selection_cubit.dart b/packages/chatty/lib/ui/home/chat/selection/group_selection_cubit.dart new file mode 100644 index 0000000..79ac5eb --- /dev/null +++ b/packages/chatty/lib/ui/home/chat/selection/group_selection_cubit.dart @@ -0,0 +1,47 @@ +import 'dart:io'; + +import 'package:stream_chatter/data/image_picker_repository.dart'; +import 'package:stream_chatter/domain/usecases/create_group_usecase.dart'; +import 'package:stream_chatter/ui/home/chat/selection/friends_selection_cubit.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; + +class GroupSelectionState { + const GroupSelectionState( + this.file, { + this.channel, + this.isLoading = false, + }); + final File file; + final Channel channel; + final bool isLoading; +} + +class GroupSelectionCubit extends Cubit { + GroupSelectionCubit( + this.members, + this._createGroupUseCase, + this._imagePickerRepository, + ) : super(GroupSelectionState(null)); + + final nameTextController = TextEditingController(); + final List members; + final CreateGroupUseCase _createGroupUseCase; + final ImagePickerRepository _imagePickerRepository; + + void createGroup() async { + emit(GroupSelectionState(state.file, isLoading: true)); + final channel = await _createGroupUseCase.createGroup(CreateGroupInput( + imageFile: state.file, + members: members.map((e) => e.chatUser.id).toList(), + name: nameTextController.text, + )); + emit(GroupSelectionState(state.file, channel: channel, isLoading: false)); + } + + void pickImage() async { + final image = await _imagePickerRepository.pickImage(); + emit(GroupSelectionState(image)); + } +} diff --git a/packages/chatty/lib/ui/home/chat/selection/group_selection_view.dart b/packages/chatty/lib/ui/home/chat/selection/group_selection_view.dart new file mode 100644 index 0000000..7f336f9 --- /dev/null +++ b/packages/chatty/lib/ui/home/chat/selection/group_selection_view.dart @@ -0,0 +1,117 @@ +import 'package:stream_chatter/navigator_utils.dart'; +import 'package:stream_chatter/ui/common/avatar_image_view.dart'; +import 'package:stream_chatter/ui/common/loading_view.dart'; +import 'package:stream_chatter/ui/home/chat/chat_view.dart'; +import 'package:stream_chatter/ui/home/chat/selection/friends_selection_cubit.dart'; +import 'package:stream_chatter/ui/home/chat/selection/group_selection_cubit.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; + +class GroupSelectionView extends StatelessWidget { + GroupSelectionView(this.selectedUsers); + + final List selectedUsers; + + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (context) => GroupSelectionCubit( + selectedUsers, + context.read(), + context.read(), + ), + child: BlocConsumer(listener: (context, snapshot) { + if (snapshot.channel != null) { + pushAndReplaceToPage( + context, + Scaffold( + body: StreamChannel( + channel: snapshot.channel, + child: ChannelPage(), + ), + ), + ); + } + }, builder: (context, snapshot) { + return LoadingView( + isLoading: snapshot.isLoading, + child: Scaffold( + floatingActionButton: FloatingActionButton( + child: Icon(Icons.arrow_right_alt_rounded), + onPressed: context.read().createGroup, + ), + backgroundColor: Theme.of(context).canvasColor, + appBar: AppBar( + title: Text( + 'New Group', + style: TextStyle( + fontSize: 24, + color: Theme.of(context).appBarTheme.color, + fontWeight: FontWeight.w800, + ), + ), + centerTitle: false, + elevation: 0, + backgroundColor: Theme.of(context).canvasColor, + ), + body: Column( + children: [ + AvatarImageView( + onTap: context.read().pickImage, + child: snapshot?.file != null + ? Image.file( + snapshot?.file, + fit: BoxFit.cover, + ) + : Icon( + Icons.person_outline, + size: 100, + color: Colors.grey[400], + ), + ), + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 50.0, + vertical: 20, + ), + child: TextField( + controller: context.read().nameTextController, + decoration: InputDecoration( + fillColor: Theme.of(context).bottomNavigationBarTheme.backgroundColor, + hintText: 'Name of the group', + hintStyle: TextStyle( + fontSize: 13, + color: Colors.grey[400], + ), + border: InputBorder.none, + enabledBorder: InputBorder.none, + ), + ), + ), + Wrap( + children: List.generate(selectedUsers.length, (index) { + final chatUserState = selectedUsers[index]; + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 10.0), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + CircleAvatar( + radius: 30, + backgroundImage: NetworkImage(chatUserState.chatUser.image), + ), + Text(chatUserState.chatUser.name), + ], + ), + ); + }), + ), + ], + ), + ), + ); + }), + ); + } +} diff --git a/packages/chatty/lib/ui/home/home_cubit.dart b/packages/chatty/lib/ui/home/home_cubit.dart new file mode 100644 index 0000000..a3af8da --- /dev/null +++ b/packages/chatty/lib/ui/home/home_cubit.dart @@ -0,0 +1,7 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; + +class HomeCubit extends Cubit { + HomeCubit() : super(0); + + void onChangeTab(int index) => emit(index); +} diff --git a/packages/chatty/lib/ui/home/home_view.dart b/packages/chatty/lib/ui/home/home_view.dart new file mode 100644 index 0000000..5199415 --- /dev/null +++ b/packages/chatty/lib/ui/home/home_view.dart @@ -0,0 +1,139 @@ +import 'package:stream_chatter/navigator_utils.dart'; +import 'package:stream_chatter/ui/home/chat/chat_view.dart'; +import 'package:stream_chatter/ui/home/chat/selection/friends_selection_view.dart'; +import 'package:stream_chatter/ui/home/home_cubit.dart'; +import 'package:stream_chatter/ui/home/settings/settings_view.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class HomeView extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: Theme.of(context).canvasColor, + body: BlocProvider( + create: (_) => HomeCubit(), + child: Column( + children: [ + Expanded( + child: BlocBuilder(builder: (context, snapshot) { + return IndexedStack( + index: snapshot, + children: [ + ChatView(), + SettingsView(), + ], + ); + }), + ), + HomeNavigationBar(), + ], + ), + ), + ); + } +} + +class HomeNavigationBar extends StatelessWidget { + const HomeNavigationBar({ + Key key, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + final cubit = BlocProvider.of(context, listen: true); + final navigationBarSize = 80.0; + final buttonSize = 56.0; + final buttonMargin = 4.0; + final topMargin = buttonSize / 2 + buttonMargin / 2; + final canvasColor = Theme.of(context).canvasColor; + return Padding( + padding: const EdgeInsets.only(bottom: 20.0), + child: Material( + child: Container( + height: navigationBarSize + topMargin, + width: MediaQuery.of(context).size.width * 0.7, + color: canvasColor, + child: Stack( + children: [ + Positioned.fill( + top: topMargin, + child: Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(25), + color: Theme.of(context).bottomNavigationBarTheme.backgroundColor, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + _HomeNavItem( + text: 'Chats', + iconData: Icons.chat_bubble, + onTap: () => cubit.onChangeTab(0), + selected: cubit.state == 0, + ), + _HomeNavItem( + text: 'Settings', + iconData: Icons.settings, + onTap: () => cubit.onChangeTab(1), + selected: cubit.state == 1, + ), + ], + ), + ), + ), + Align( + alignment: Alignment.topCenter, + child: Container( + decoration: BoxDecoration( + color: canvasColor, + shape: BoxShape.circle, + ), + padding: EdgeInsets.all(buttonMargin / 2), + child: FloatingActionButton( + onPressed: () { + pushToPage(context, FriendsSelectionView()); + }, + child: Icon(Icons.add), + ), + ), + ), + ], + ), + ), + ), + ); + } +} + +class _HomeNavItem extends StatelessWidget { + const _HomeNavItem({ + Key key, + this.iconData, + this.text, + this.onTap, + this.selected = false, + }) : super(key: key); + + final IconData iconData; + final String text; + final VoidCallback onTap; + final bool selected; + + @override + Widget build(BuildContext context) { + final selectedColor = Theme.of(context).bottomNavigationBarTheme.selectedItemColor; + final unselectedColor = Theme.of(context).bottomNavigationBarTheme.unselectedItemColor; + final color = selected ? selectedColor : unselectedColor; + return GestureDetector( + onTap: onTap, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(iconData, color: color), + Text(text, style: TextStyle(color: color)), + ], + ), + ); + } +} diff --git a/packages/chatty/lib/ui/home/settings/settings_cubit.dart b/packages/chatty/lib/ui/home/settings/settings_cubit.dart new file mode 100644 index 0000000..465f04e --- /dev/null +++ b/packages/chatty/lib/ui/home/settings/settings_cubit.dart @@ -0,0 +1,19 @@ +import 'package:stream_chatter/domain/usecases/logout_usecase.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class SettingsSwitchCubit extends Cubit { + SettingsSwitchCubit(bool state) : super(state); + + void onChangeDarkMode(bool isDark) => emit(isDark); +} + +class SettingsLogoutCubit extends Cubit { + SettingsLogoutCubit(this._logoutUseCase) : super(null); + + final LogoutUseCase _logoutUseCase; + + void logOut() async { + await _logoutUseCase.logout(); + emit(null); + } +} diff --git a/packages/chatty/lib/ui/home/settings/settings_view.dart b/packages/chatty/lib/ui/home/settings/settings_view.dart new file mode 100644 index 0000000..77ce96a --- /dev/null +++ b/packages/chatty/lib/ui/home/settings/settings_view.dart @@ -0,0 +1,119 @@ +import 'package:stream_chatter/navigator_utils.dart'; +import 'package:stream_chatter/ui/app_theme_cubit.dart'; +import 'package:stream_chatter/ui/common/avatar_image_view.dart'; +import 'package:stream_chatter/ui/home/settings/settings_cubit.dart'; +import 'package:stream_chatter/ui/sign_in/sign_in_view.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:stream_chat_flutter/stream_chat_flutter.dart'; + +class SettingsView extends StatelessWidget { + @override + Widget build(BuildContext context) { + final user = StreamChat.of(context).client.state.user; + final image = user?.extraData['image']; + final textColor = Theme.of(context).appBarTheme.color; + return MultiBlocProvider( + providers: [ + BlocProvider( + create: (_) => SettingsSwitchCubit(context.read().isDark), + ), + BlocProvider( + create: (_) => SettingsLogoutCubit(context.read()), + ), + ], + child: Scaffold( + backgroundColor: Theme.of(context).canvasColor, + appBar: AppBar( + title: Text( + 'Settings', + style: TextStyle( + fontSize: 24, + color: textColor, + fontWeight: FontWeight.w800, + ), + ), + centerTitle: false, + elevation: 0, + backgroundColor: Theme.of(context).canvasColor, + ), + body: Center( + child: Padding( + padding: const EdgeInsets.all(15.0), + child: Column( + children: [ + AvatarImageView( + //TODO: implement change avatar + onTap: () => null, + child: image != null + ? Image.network( + image, + fit: BoxFit.cover, + ) + : Icon( + Icons.person_outline, + size: 100, + color: Colors.grey[400], + ), + ), + Text( + user.name, + style: TextStyle( + fontSize: 24, + color: textColor, + fontWeight: FontWeight.w800, + ), + ), + Row( + children: [ + Icon(Icons.nights_stay_outlined), + const SizedBox(width: 10), + Text( + 'Dark Mode', + style: TextStyle( + color: textColor, + ), + ), + Spacer(), + BlocBuilder(builder: (context, snapshot) { + return Switch( + value: snapshot, + onChanged: (val) { + context.read().onChangeDarkMode(val); + context.read().updateTheme(val); + }, + ); + }), + ], + ), + const SizedBox(height: 15), + Builder(builder: (context) { + return GestureDetector( + onTap: context.read().logOut, + child: BlocListener( + listener: (context, snapshot) { + popAllAndPush(context, SignInView()); + }, + child: Row(children: [ + Icon(Icons.logout), + const SizedBox(width: 10), + Text( + 'Logout', + style: TextStyle( + color: textColor, + ), + ), + Spacer(), + Icon(Icons.arrow_right), + ]), + ), + ); + }), + ], + ), + ), + ), + ), + ); + } +} diff --git a/packages/chatty/lib/ui/profile_verify/profile_verify_cubit.dart b/packages/chatty/lib/ui/profile_verify/profile_verify_cubit.dart new file mode 100644 index 0000000..2593f36 --- /dev/null +++ b/packages/chatty/lib/ui/profile_verify/profile_verify_cubit.dart @@ -0,0 +1,44 @@ +import 'dart:io'; + +import 'package:stream_chatter/data/image_picker_repository.dart'; +import 'package:stream_chatter/domain/usecases/profile_sign_in_usecase.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class ProfileState { + const ProfileState( + this.file, { + this.success = false, + this.loading = false, + }); + final File file; + final bool success; + final bool loading; +} + +class ProfileVerifyCubit extends Cubit { + ProfileVerifyCubit( + this._imagePickerRepository, + this._profileSignInUseCase, + ) : super(ProfileState(null)); + + final nameController = TextEditingController(); + final ImagePickerRepository _imagePickerRepository; + final ProfileSignInUseCase _profileSignInUseCase; + + void startChatting() async { + emit(ProfileState(null, loading: true)); + final file = state.file; + final name = nameController.text; + await _profileSignInUseCase.verify(ProfileInput( + imageFile: file, + name: name, + )); + emit(ProfileState(file, success: true, loading: false)); + } + + void pickImage() async { + final file = await _imagePickerRepository.pickImage(); + emit(ProfileState(file)); + } +} diff --git a/packages/chatty/lib/ui/profile_verify/profile_verify_view.dart b/packages/chatty/lib/ui/profile_verify/profile_verify_view.dart new file mode 100644 index 0000000..3a475c3 --- /dev/null +++ b/packages/chatty/lib/ui/profile_verify/profile_verify_view.dart @@ -0,0 +1,108 @@ +import 'package:stream_chatter/navigator_utils.dart'; +import 'package:stream_chatter/ui/common/avatar_image_view.dart'; +import 'package:stream_chatter/ui/common/loading_view.dart'; +import 'package:stream_chatter/ui/home/home_view.dart'; +import 'package:stream_chatter/ui/profile_verify/profile_verify_cubit.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class ProfileVerifyView extends StatelessWidget { + ProfileVerifyView(); + + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (context) => ProfileVerifyCubit(context.read(), context.read()), + child: BlocConsumer(listener: (context, snapshot) { + if (snapshot.success) { + pushAndReplaceToPage(context, HomeView()); + } + }, builder: (context, snapshot) { + //refresh the photo + return LoadingView( + isLoading: snapshot.loading, + child: Scaffold( + backgroundColor: Theme.of(context).canvasColor, + body: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + 'Verify your identity', + style: TextStyle( + fontSize: 24, + fontWeight: FontWeight.w800, + ), + ), + AvatarImageView( + onTap: context.read().pickImage, + child: snapshot.file != null + ? Image.file( + snapshot.file, + fit: BoxFit.cover, + ) + : Icon( + Icons.person_outline, + size: 100, + color: Colors.grey[400], + ), + ), + Text( + 'Your name', + style: TextStyle( + fontWeight: FontWeight.w700, + ), + ), + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 50.0, + vertical: 20, + ), + child: TextField( + controller: context.read().nameController, + decoration: InputDecoration( + fillColor: Theme.of(context).bottomNavigationBarTheme.backgroundColor, + hintText: 'Or just how people now you', + hintStyle: TextStyle( + fontSize: 13, + color: Colors.grey[400], + ), + border: InputBorder.none, + enabledBorder: InputBorder.none, + ), + ), + ), + Hero( + tag: 'home_hero', + child: Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), + color: Theme.of(context).accentColor, + child: InkWell( + onTap: () { + context.read().startChatting(); + }, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 40.0, + vertical: 15, + ), + child: Text( + 'Start chatting now', + style: TextStyle( + color: Colors.white, + ), + ), + )), + ), + ), + ], + ), + ), + ), + ); + }), + ); + } +} diff --git a/packages/chatty/lib/ui/sign_in/sign_in_cubit.dart b/packages/chatty/lib/ui/sign_in/sign_in_cubit.dart new file mode 100644 index 0000000..10d23b2 --- /dev/null +++ b/packages/chatty/lib/ui/sign_in/sign_in_cubit.dart @@ -0,0 +1,29 @@ +import 'package:stream_chatter/domain/usecases/login_usecase.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +enum SignInState { + none, + existing_user, +} + +class SignInCubit extends Cubit { + SignInCubit( + this._loginUseCase, + ) : super(SignInState.none); + + final LoginUseCase _loginUseCase; + + void signIn() async { + try { + final result = await _loginUseCase.validateLogin(); + if (result) { + emit(SignInState.existing_user); + } + } catch (ex) { + final result = await _loginUseCase.signIn(); + if (result != null) { + emit(SignInState.none); + } + } + } +} diff --git a/packages/chatty/lib/ui/sign_in/sign_in_view.dart b/packages/chatty/lib/ui/sign_in/sign_in_view.dart new file mode 100644 index 0000000..41ff317 --- /dev/null +++ b/packages/chatty/lib/ui/sign_in/sign_in_view.dart @@ -0,0 +1,100 @@ +import 'package:stream_chatter/navigator_utils.dart'; +import 'package:stream_chatter/ui/home/home_view.dart'; +import 'package:stream_chatter/ui/profile_verify/profile_verify_view.dart'; +import 'package:stream_chatter/ui/sign_in/sign_in_cubit.dart'; +import 'package:stream_chatter/ui/common/initial_background_view.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class SignInView extends StatelessWidget { + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (context) => SignInCubit(context.read()), + child: BlocConsumer(listener: (context, snapshot) { + if (snapshot == SignInState.none) { + pushAndReplaceToPage(context, ProfileVerifyView()); + } else { + pushAndReplaceToPage(context, HomeView()); + } + }, builder: (context, snapshot) { + return Scaffold( + backgroundColor: Theme.of(context).canvasColor, + body: Stack(children: [ + InitialBackgroundView(), + Padding( + padding: const EdgeInsets.only(left: 25.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 150), + Hero( + tag: 'logo_hero', + child: Image.asset( + 'assets/logo.png', + height: 50, + ), + ), + const SizedBox(height: 30), + Text( + 'Welcome to\nChatty', + style: TextStyle( + fontSize: 30, + fontWeight: FontWeight.w900, + ), + ), + Padding( + padding: const EdgeInsets.only(top: 8.0, bottom: 40), + child: Text( + 'A platform to chat with users very easily and friendly', + style: TextStyle( + fontWeight: FontWeight.w600, + color: Colors.grey, + ), + ), + ), + Material( + elevation: 2, + shadowColor: Colors.black45, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), + color: Theme.of(context).bottomNavigationBarTheme.backgroundColor, + child: InkWell( + onTap: () { + context.read().signIn(); + }, + child: Padding( + padding: const EdgeInsets.all(20.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset('assets/icon-google.png', height: 20), + const SizedBox(width: 15), + Text('Login with Google'), + ], + ), + ), + ), + ), + Spacer(), + Align( + alignment: Alignment.bottomLeft, + child: Text( + '"in the modern world the\nquality of life is the quality\nof communication', + style: TextStyle( + fontWeight: FontWeight.w400, + color: Colors.grey, + ), + ), + ), + const SizedBox(height: 20), + ], + ), + ), + ]), + ); + }), + ); + } +} diff --git a/packages/chatty/lib/ui/splash/splash_cubit.dart b/packages/chatty/lib/ui/splash/splash_cubit.dart new file mode 100644 index 0000000..1b5fbc9 --- /dev/null +++ b/packages/chatty/lib/ui/splash/splash_cubit.dart @@ -0,0 +1,32 @@ +import 'package:stream_chatter/domain/exceptions/auth_exception.dart'; +import 'package:stream_chatter/domain/usecases/login_usecase.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +enum SplashState { + none, + existing_user, + new_user, +} + +class SplashCubit extends Cubit { + SplashCubit( + this._loginUseCase, + ) : super(SplashState.none); + + final LoginUseCase _loginUseCase; + + void init() async { + try { + final result = await _loginUseCase.validateLogin(); + if (result) { + emit(SplashState.existing_user); + } + } on AuthException catch (ex) { + if (ex.error == AuthErrorCode.not_auth) { + emit(SplashState.none); + } else { + emit(SplashState.new_user); + } + } + } +} diff --git a/packages/chatty/lib/ui/splash/splash_view.dart b/packages/chatty/lib/ui/splash/splash_view.dart new file mode 100644 index 0000000..b9d2ad9 --- /dev/null +++ b/packages/chatty/lib/ui/splash/splash_view.dart @@ -0,0 +1,44 @@ +import 'package:stream_chatter/navigator_utils.dart'; +import 'package:stream_chatter/ui/home/home_view.dart'; +import 'package:stream_chatter/ui/profile_verify/profile_verify_view.dart'; +import 'package:stream_chatter/ui/sign_in/sign_in_view.dart'; +import 'package:stream_chatter/ui/common/initial_background_view.dart'; +import 'package:stream_chatter/ui/splash/splash_cubit.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class SplashView extends StatelessWidget { + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (context) => SplashCubit(context.read())..init(), + child: BlocListener( + listener: (context, snapshot) { + if (snapshot == SplashState.none) { + pushAndReplaceToPage(context, SignInView()); + } else if (snapshot == SplashState.existing_user) { + pushAndReplaceToPage(context, HomeView()); + } else { + pushAndReplaceToPage(context, ProfileVerifyView()); + } + }, + child: Scaffold( + body: Stack( + children: [ + InitialBackgroundView(), + Center( + child: Hero( + tag: 'logo_hero', + child: Image.asset( + 'assets/logo.png', + height: 100, + ), + ), + ), + ], + ), + ), + ), + ); + } +} diff --git a/packages/chatty/lib/ui/themes.dart b/packages/chatty/lib/ui/themes.dart new file mode 100644 index 0000000..c99082d --- /dev/null +++ b/packages/chatty/lib/ui/themes.dart @@ -0,0 +1,54 @@ +import 'package:flutter/material.dart'; + +const primaryColor = Color(0xFF3883FB); +const backgroundLightColor = Color(0xFFFCFCFC); +const backgroundDarkColor = Color(0xFF1F2026); +const navigationBarLightColor = Colors.white; +const navigationBarDarkColor = Color(0xFF30313C); + +class Themes { + static final themeLight = ThemeData.light().copyWith( + backgroundColor: backgroundLightColor, + // selected color + accentColor: primaryColor, + // floating action button + floatingActionButtonTheme: FloatingActionButtonThemeData( + backgroundColor: primaryColor, + foregroundColor: Colors.white, + ), + // bottom bar + bottomNavigationBarTheme: BottomNavigationBarThemeData( + backgroundColor: navigationBarLightColor, + selectedItemColor: primaryColor, + unselectedItemColor: Colors.grey[200], + ), + // switch active color + toggleableActiveColor: primaryColor, + canvasColor: backgroundLightColor, + appBarTheme: AppBarTheme( + color: Colors.black, + )); + + static final themeDark = ThemeData.dark().copyWith( + backgroundColor: backgroundDarkColor, + // selected color + accentColor: primaryColor, + // floating action button + floatingActionButtonTheme: FloatingActionButtonThemeData( + backgroundColor: primaryColor, + foregroundColor: Colors.white, + ), + // bottom bar + bottomNavigationBarTheme: BottomNavigationBarThemeData( + backgroundColor: navigationBarDarkColor, + selectedItemColor: primaryColor, + unselectedItemColor: Colors.grey[300], + ), + textSelectionColor: Colors.white, + // switch active color + toggleableActiveColor: primaryColor, + canvasColor: backgroundDarkColor, + appBarTheme: AppBarTheme( + color: Colors.white, + )); +} diff --git a/packages/chatty/pubspec.yaml b/packages/chatty/pubspec.yaml new file mode 100644 index 0000000..6327bfd --- /dev/null +++ b/packages/chatty/pubspec.yaml @@ -0,0 +1,40 @@ +name: stream_chatter +description: Chat App implemented using Clean Architecture. +publish_to: 'none' +version: 1.0.0+1 + +environment: + sdk: ">=2.7.0 <3.0.0" + +dependencies: + flutter: + sdk: flutter + + flutter_bloc: 6.1.2 + stream_chat_flutter: 1.3.0-beta + uuid: 2.2.2 + + firebase_core: 0.7.0 + google_sign_in: 4.5.9 + firebase_auth: 0.20.0+1 + firebase_storage: 7.0.0 + shared_preferences: 0.5.12+4 + http: any + +dev_dependencies: + flutter_test: + sdk: flutter + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + assets: + - assets/ \ No newline at end of file diff --git a/imessage/.gitignore b/packages/imessage/.gitignore similarity index 100% rename from imessage/.gitignore rename to packages/imessage/.gitignore diff --git a/imessage/.metadata b/packages/imessage/.metadata similarity index 100% rename from imessage/.metadata rename to packages/imessage/.metadata diff --git a/imessage/README.md b/packages/imessage/README.md similarity index 100% rename from imessage/README.md rename to packages/imessage/README.md diff --git a/imessage/analysis_options.yaml b/packages/imessage/analysis_options.yaml similarity index 97% rename from imessage/analysis_options.yaml rename to packages/imessage/analysis_options.yaml index 87c1242..6f995b8 100644 --- a/imessage/analysis_options.yaml +++ b/packages/imessage/analysis_options.yaml @@ -40,12 +40,10 @@ linter: # - one_member_abstracts # - only_throw_errors # - overridden_fields - - package_api_docs - package_names - package_prefixed_library_names - prefer_is_not_empty # - prefer_mixin # https://github.com/dart-lang/language/issues/32 - - public_member_api_docs - slash_for_doc_comments # - sort_constructors_first # - sort_unnamed_constructors_first diff --git a/packages/imessage/android/.gitignore b/packages/imessage/android/.gitignore new file mode 100644 index 0000000..0a741cb --- /dev/null +++ b/packages/imessage/android/.gitignore @@ -0,0 +1,11 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties diff --git a/imessage/android/app/build.gradle b/packages/imessage/android/app/build.gradle similarity index 100% rename from imessage/android/app/build.gradle rename to packages/imessage/android/app/build.gradle diff --git a/imessage/android/app/src/debug/AndroidManifest.xml b/packages/imessage/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from imessage/android/app/src/debug/AndroidManifest.xml rename to packages/imessage/android/app/src/debug/AndroidManifest.xml diff --git a/imessage/android/app/src/main/AndroidManifest.xml b/packages/imessage/android/app/src/main/AndroidManifest.xml similarity index 100% rename from imessage/android/app/src/main/AndroidManifest.xml rename to packages/imessage/android/app/src/main/AndroidManifest.xml diff --git a/imessage/android/app/src/main/kotlin/com/example/imessage/MainActivity.kt b/packages/imessage/android/app/src/main/kotlin/com/example/imessage/MainActivity.kt similarity index 100% rename from imessage/android/app/src/main/kotlin/com/example/imessage/MainActivity.kt rename to packages/imessage/android/app/src/main/kotlin/com/example/imessage/MainActivity.kt diff --git a/imessage/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/imessage/android/app/src/main/res/drawable-v21/launch_background.xml similarity index 100% rename from imessage/android/app/src/main/res/drawable-v21/launch_background.xml rename to packages/imessage/android/app/src/main/res/drawable-v21/launch_background.xml diff --git a/packages/imessage/android/app/src/main/res/drawable/launch_background.xml b/packages/imessage/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/packages/imessage/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/packages/imessage/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/imessage/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..db77bb4 Binary files /dev/null and b/packages/imessage/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/packages/imessage/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/imessage/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..17987b7 Binary files /dev/null and b/packages/imessage/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/packages/imessage/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/imessage/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..09d4391 Binary files /dev/null and b/packages/imessage/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/packages/imessage/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/imessage/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..d5f1c8d Binary files /dev/null and b/packages/imessage/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/packages/imessage/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/imessage/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..4d6372e Binary files /dev/null and b/packages/imessage/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/imessage/android/app/src/main/res/values-night/styles.xml b/packages/imessage/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from imessage/android/app/src/main/res/values-night/styles.xml rename to packages/imessage/android/app/src/main/res/values-night/styles.xml diff --git a/imessage/android/app/src/main/res/values/styles.xml b/packages/imessage/android/app/src/main/res/values/styles.xml similarity index 100% rename from imessage/android/app/src/main/res/values/styles.xml rename to packages/imessage/android/app/src/main/res/values/styles.xml diff --git a/imessage/android/app/src/profile/AndroidManifest.xml b/packages/imessage/android/app/src/profile/AndroidManifest.xml similarity index 100% rename from imessage/android/app/src/profile/AndroidManifest.xml rename to packages/imessage/android/app/src/profile/AndroidManifest.xml diff --git a/imessage/android/build.gradle b/packages/imessage/android/build.gradle similarity index 100% rename from imessage/android/build.gradle rename to packages/imessage/android/build.gradle diff --git a/packages/imessage/android/gradle.properties b/packages/imessage/android/gradle.properties new file mode 100644 index 0000000..a673820 --- /dev/null +++ b/packages/imessage/android/gradle.properties @@ -0,0 +1,4 @@ +org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true +android.enableR8=true diff --git a/imessage/android/gradle/wrapper/gradle-wrapper.properties b/packages/imessage/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from imessage/android/gradle/wrapper/gradle-wrapper.properties rename to packages/imessage/android/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/imessage/android/settings.gradle b/packages/imessage/android/settings.gradle new file mode 100644 index 0000000..44e62bc --- /dev/null +++ b/packages/imessage/android/settings.gradle @@ -0,0 +1,11 @@ +include ':app' + +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() + +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/stream_chat_v1/ios/.gitignore b/packages/imessage/ios/.gitignore similarity index 100% rename from stream_chat_v1/ios/.gitignore rename to packages/imessage/ios/.gitignore diff --git a/imessage/ios/Flutter/AppFrameworkInfo.plist b/packages/imessage/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from imessage/ios/Flutter/AppFrameworkInfo.plist rename to packages/imessage/ios/Flutter/AppFrameworkInfo.plist diff --git a/packages/imessage/ios/Flutter/Debug.xcconfig b/packages/imessage/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000..e8efba1 --- /dev/null +++ b/packages/imessage/ios/Flutter/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "Generated.xcconfig" diff --git a/packages/imessage/ios/Flutter/Release.xcconfig b/packages/imessage/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000..399e934 --- /dev/null +++ b/packages/imessage/ios/Flutter/Release.xcconfig @@ -0,0 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "Generated.xcconfig" diff --git a/imessage/ios/Runner.xcodeproj/project.pbxproj b/packages/imessage/ios/Runner.xcodeproj/project.pbxproj similarity index 100% rename from imessage/ios/Runner.xcodeproj/project.pbxproj rename to packages/imessage/ios/Runner.xcodeproj/project.pbxproj diff --git a/packages/imessage/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/imessage/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..a28140c --- /dev/null +++ b/packages/imessage/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/stream_chat_v1/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/imessage/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from stream_chat_v1/ios/Runner.xcworkspace/contents.xcworkspacedata rename to packages/imessage/ios/Runner.xcworkspace/contents.xcworkspacedata diff --git a/stream_chat_v1/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/imessage/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from stream_chat_v1/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/imessage/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/stream_chat_v1/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/imessage/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from stream_chat_v1/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to packages/imessage/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/packages/imessage/ios/Runner/AppDelegate.swift b/packages/imessage/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000..70693e4 --- /dev/null +++ b/packages/imessage/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import UIKit +import Flutter + +@UIApplicationMain +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000..dc9ada4 Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000..28c6bf0 Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000..2ccbfd9 Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000..f091b6b Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000..4cde121 Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000..d0ef06e Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 0000000..dcdc230 Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 0000000..2ccbfd9 Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000..c8f9ed8 Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000..a6d6b86 Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000..a6d6b86 Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000..75b2d16 Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000..c4df70d Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 0000000..6a84f41 Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000..d0e1f58 Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 0000000..0bedcf2 --- /dev/null +++ b/packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to packages/imessage/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/packages/imessage/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/imessage/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..f2e259c --- /dev/null +++ b/packages/imessage/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/stream_chat_v1/ios/Runner/Base.lproj/Main.storyboard b/packages/imessage/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from stream_chat_v1/ios/Runner/Base.lproj/Main.storyboard rename to packages/imessage/ios/Runner/Base.lproj/Main.storyboard diff --git a/imessage/ios/Runner/Info.plist b/packages/imessage/ios/Runner/Info.plist similarity index 100% rename from imessage/ios/Runner/Info.plist rename to packages/imessage/ios/Runner/Info.plist diff --git a/packages/imessage/ios/Runner/Runner-Bridging-Header.h b/packages/imessage/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000..308a2a5 --- /dev/null +++ b/packages/imessage/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/imessage/lib/channel_image.dart b/packages/imessage/lib/channel_image.dart similarity index 100% rename from imessage/lib/channel_image.dart rename to packages/imessage/lib/channel_image.dart diff --git a/imessage/lib/channel_list_view.dart b/packages/imessage/lib/channel_list_view.dart similarity index 100% rename from imessage/lib/channel_list_view.dart rename to packages/imessage/lib/channel_list_view.dart diff --git a/imessage/lib/channel_name_text.dart b/packages/imessage/lib/channel_name_text.dart similarity index 100% rename from imessage/lib/channel_name_text.dart rename to packages/imessage/lib/channel_name_text.dart diff --git a/imessage/lib/channel_page_appbar.dart b/packages/imessage/lib/channel_page_appbar.dart similarity index 100% rename from imessage/lib/channel_page_appbar.dart rename to packages/imessage/lib/channel_page_appbar.dart diff --git a/imessage/lib/channel_preview.dart b/packages/imessage/lib/channel_preview.dart similarity index 100% rename from imessage/lib/channel_preview.dart rename to packages/imessage/lib/channel_preview.dart diff --git a/imessage/lib/cutom_painter.dart b/packages/imessage/lib/cutom_painter.dart similarity index 100% rename from imessage/lib/cutom_painter.dart rename to packages/imessage/lib/cutom_painter.dart diff --git a/imessage/lib/main.dart b/packages/imessage/lib/main.dart similarity index 100% rename from imessage/lib/main.dart rename to packages/imessage/lib/main.dart diff --git a/imessage/lib/message_header.dart b/packages/imessage/lib/message_header.dart similarity index 100% rename from imessage/lib/message_header.dart rename to packages/imessage/lib/message_header.dart diff --git a/imessage/lib/message_input.dart b/packages/imessage/lib/message_input.dart similarity index 100% rename from imessage/lib/message_input.dart rename to packages/imessage/lib/message_input.dart diff --git a/imessage/lib/message_list_view.dart b/packages/imessage/lib/message_list_view.dart similarity index 100% rename from imessage/lib/message_list_view.dart rename to packages/imessage/lib/message_list_view.dart diff --git a/imessage/lib/message_page.dart b/packages/imessage/lib/message_page.dart similarity index 100% rename from imessage/lib/message_page.dart rename to packages/imessage/lib/message_page.dart diff --git a/imessage/lib/message_widget.dart b/packages/imessage/lib/message_widget.dart similarity index 98% rename from imessage/lib/message_widget.dart rename to packages/imessage/lib/message_widget.dart index 12786f6..494e9d2 100644 --- a/imessage/lib/message_widget.dart +++ b/packages/imessage/lib/message_widget.dart @@ -21,7 +21,7 @@ class MessageWidget extends StatelessWidget { @override Widget build(BuildContext context) { if (message.attachments?.isNotEmpty == true && - message.attachments.first.type == "image") { + message.attachments.first.type == 'image') { return MessageImage( color: color, message: message, messageColor: messageColor); } else { diff --git a/imessage/lib/utils.dart b/packages/imessage/lib/utils.dart similarity index 100% rename from imessage/lib/utils.dart rename to packages/imessage/lib/utils.dart diff --git a/imessage/pubspec.yaml b/packages/imessage/pubspec.yaml similarity index 100% rename from imessage/pubspec.yaml rename to packages/imessage/pubspec.yaml diff --git a/imessage/test/widget_test.dart b/packages/imessage/test/widget_test.dart similarity index 100% rename from imessage/test/widget_test.dart rename to packages/imessage/test/widget_test.dart diff --git a/stream_chat_v1/README.md b/packages/stream_chat_v1/README.md similarity index 100% rename from stream_chat_v1/README.md rename to packages/stream_chat_v1/README.md diff --git a/stream_chat_v1/android/.gitignore b/packages/stream_chat_v1/android/.gitignore similarity index 100% rename from stream_chat_v1/android/.gitignore rename to packages/stream_chat_v1/android/.gitignore diff --git a/stream_chat_v1/android/app/build.gradle b/packages/stream_chat_v1/android/app/build.gradle similarity index 100% rename from stream_chat_v1/android/app/build.gradle rename to packages/stream_chat_v1/android/app/build.gradle diff --git a/stream_chat_v1/android/app/debug.keystore b/packages/stream_chat_v1/android/app/debug.keystore similarity index 100% rename from stream_chat_v1/android/app/debug.keystore rename to packages/stream_chat_v1/android/app/debug.keystore diff --git a/stream_chat_v1/android/app/google-services.json b/packages/stream_chat_v1/android/app/google-services.json similarity index 100% rename from stream_chat_v1/android/app/google-services.json rename to packages/stream_chat_v1/android/app/google-services.json diff --git a/stream_chat_v1/android/app/src/debug/AndroidManifest.xml b/packages/stream_chat_v1/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from stream_chat_v1/android/app/src/debug/AndroidManifest.xml rename to packages/stream_chat_v1/android/app/src/debug/AndroidManifest.xml diff --git a/stream_chat_v1/android/app/src/main/AndroidManifest.xml b/packages/stream_chat_v1/android/app/src/main/AndroidManifest.xml similarity index 100% rename from stream_chat_v1/android/app/src/main/AndroidManifest.xml rename to packages/stream_chat_v1/android/app/src/main/AndroidManifest.xml diff --git a/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 similarity index 100% rename from stream_chat_v1/android/app/src/main/kotlin/com/example/example/Application.kt rename to packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/Application.kt diff --git a/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 similarity index 100% rename from stream_chat_v1/android/app/src/main/kotlin/com/example/example/MainActivity.kt rename to packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/MainActivity.kt diff --git a/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 similarity index 100% rename from stream_chat_v1/android/app/src/main/res/drawable/launch_background.xml rename to packages/stream_chat_v1/android/app/src/main/res/drawable/launch_background.xml diff --git a/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 similarity index 100% rename from stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/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 similarity index 100% rename from stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/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 similarity index 100% rename from stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/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 similarity index 100% rename from stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/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 similarity index 100% rename from stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/stream_chat_v1/android/app/src/main/res/values/colors.xml b/packages/stream_chat_v1/android/app/src/main/res/values/colors.xml similarity index 100% rename from stream_chat_v1/android/app/src/main/res/values/colors.xml rename to packages/stream_chat_v1/android/app/src/main/res/values/colors.xml diff --git a/stream_chat_v1/android/app/src/main/res/values/styles.xml b/packages/stream_chat_v1/android/app/src/main/res/values/styles.xml similarity index 100% rename from stream_chat_v1/android/app/src/main/res/values/styles.xml rename to packages/stream_chat_v1/android/app/src/main/res/values/styles.xml diff --git a/stream_chat_v1/android/app/src/profile/AndroidManifest.xml b/packages/stream_chat_v1/android/app/src/profile/AndroidManifest.xml similarity index 100% rename from stream_chat_v1/android/app/src/profile/AndroidManifest.xml rename to packages/stream_chat_v1/android/app/src/profile/AndroidManifest.xml diff --git a/stream_chat_v1/android/build.gradle b/packages/stream_chat_v1/android/build.gradle similarity index 100% rename from stream_chat_v1/android/build.gradle rename to packages/stream_chat_v1/android/build.gradle diff --git a/stream_chat_v1/android/gradle.properties b/packages/stream_chat_v1/android/gradle.properties similarity index 100% rename from stream_chat_v1/android/gradle.properties rename to packages/stream_chat_v1/android/gradle.properties diff --git a/stream_chat_v1/android/gradle/wrapper/gradle-wrapper.properties b/packages/stream_chat_v1/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from stream_chat_v1/android/gradle/wrapper/gradle-wrapper.properties rename to packages/stream_chat_v1/android/gradle/wrapper/gradle-wrapper.properties diff --git a/stream_chat_v1/android/settings.gradle b/packages/stream_chat_v1/android/settings.gradle similarity index 100% rename from stream_chat_v1/android/settings.gradle rename to packages/stream_chat_v1/android/settings.gradle diff --git a/packages/stream_chat_v1/android/settings_aar.gradle b/packages/stream_chat_v1/android/settings_aar.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/packages/stream_chat_v1/android/settings_aar.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/stream_chat_v1/assets/android_icon.png b/packages/stream_chat_v1/assets/android_icon.png similarity index 100% rename from stream_chat_v1/assets/android_icon.png rename to packages/stream_chat_v1/assets/android_icon.png diff --git a/stream_chat_v1/assets/floating_boat.json b/packages/stream_chat_v1/assets/floating_boat.json similarity index 100% rename from stream_chat_v1/assets/floating_boat.json rename to packages/stream_chat_v1/assets/floating_boat.json diff --git a/stream_chat_v1/assets/icon_arrow_right.svg b/packages/stream_chat_v1/assets/icon_arrow_right.svg similarity index 100% rename from stream_chat_v1/assets/icon_arrow_right.svg rename to packages/stream_chat_v1/assets/icon_arrow_right.svg diff --git a/stream_chat_v1/assets/ios_icon.png b/packages/stream_chat_v1/assets/ios_icon.png similarity index 100% rename from stream_chat_v1/assets/ios_icon.png rename to packages/stream_chat_v1/assets/ios_icon.png diff --git a/stream_chat_v1/assets/logo.svg b/packages/stream_chat_v1/assets/logo.svg similarity index 100% rename from stream_chat_v1/assets/logo.svg rename to packages/stream_chat_v1/assets/logo.svg diff --git a/packages/stream_chat_v1/ios/.gitignore b/packages/stream_chat_v1/ios/.gitignore new file mode 100644 index 0000000..e96ef60 --- /dev/null +++ b/packages/stream_chat_v1/ios/.gitignore @@ -0,0 +1,32 @@ +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/stream_chat_v1/ios/Flutter/.last_build_id b/packages/stream_chat_v1/ios/Flutter/.last_build_id similarity index 100% rename from stream_chat_v1/ios/Flutter/.last_build_id rename to packages/stream_chat_v1/ios/Flutter/.last_build_id diff --git a/stream_chat_v1/ios/Flutter/AppFrameworkInfo.plist b/packages/stream_chat_v1/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from stream_chat_v1/ios/Flutter/AppFrameworkInfo.plist rename to packages/stream_chat_v1/ios/Flutter/AppFrameworkInfo.plist diff --git a/stream_chat_v1/ios/Flutter/Debug.xcconfig b/packages/stream_chat_v1/ios/Flutter/Debug.xcconfig similarity index 100% rename from stream_chat_v1/ios/Flutter/Debug.xcconfig rename to packages/stream_chat_v1/ios/Flutter/Debug.xcconfig diff --git a/stream_chat_v1/ios/Flutter/Release.xcconfig b/packages/stream_chat_v1/ios/Flutter/Release.xcconfig similarity index 100% rename from stream_chat_v1/ios/Flutter/Release.xcconfig rename to packages/stream_chat_v1/ios/Flutter/Release.xcconfig diff --git a/stream_chat_v1/ios/Gemfile b/packages/stream_chat_v1/ios/Gemfile similarity index 100% rename from stream_chat_v1/ios/Gemfile rename to packages/stream_chat_v1/ios/Gemfile diff --git a/stream_chat_v1/ios/Gemfile.lock b/packages/stream_chat_v1/ios/Gemfile.lock similarity index 100% rename from stream_chat_v1/ios/Gemfile.lock rename to packages/stream_chat_v1/ios/Gemfile.lock diff --git a/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj b/packages/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj similarity index 75% rename from stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj rename to packages/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj index e3a96e7..6c9b293 100644 --- a/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj @@ -7,27 +7,16 @@ objects = { /* Begin PBXBuildFile section */ - 0BC14C50242B5A7A0028DE94 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BC14C4F242B5A7A0028DE94 /* NotificationService.swift */; }; - 0BC14C54242B5A7A0028DE94 /* Notifications.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 0BC14C4D242B5A7A0028DE94 /* Notifications.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 6322551A583705BBA2F048DD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC299D593714162503D904EB /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 78DFDA8BF7ADD8988BA9B2C9 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4E5F7C8F1FB8AA92A6E2273 /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 0BC14C52242B5A7A0028DE94 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 97C146E61CF9000F007C117D /* Project object */; - proxyType = 1; - remoteGlobalIDString = 0BC14C4C242B5A7A0028DE94; - remoteInfo = Notifications; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ 0BC14C55242B5A7A0028DE94 /* Embed App Extensions */ = { isa = PBXCopyFilesBuildPhase; @@ -35,7 +24,6 @@ dstPath = ""; dstSubfolderSpec = 13; files = ( - 0BC14C54242B5A7A0028DE94 /* Notifications.appex in Embed App Extensions */, ); name = "Embed App Extensions"; runOnlyForDeploymentPostprocessing = 0; @@ -53,20 +41,15 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0BC14C4D242B5A7A0028DE94 /* Notifications.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = Notifications.appex; sourceTree = BUILT_PRODUCTS_DIR; }; - 0BC14C4F242B5A7A0028DE94 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = ""; }; - 0BC14C51242B5A7A0028DE94 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 0BC14C5A242B5ED90028DE94 /* Notifications.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Notifications.entitlements; sourceTree = ""; }; 0BC14C5B242B5FF50028DE94 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 1DFB9D7CB4D2FBB0BD3BD534 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - 34DDA6B7AEE7F881BA31E310 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 7069E97E2E50CF0E633E719F /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 887F9B6BDC8480C6B3628366 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 91C3AAF66766852887B9460F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -74,46 +57,22 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - CC299D593714162503D904EB /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + A4E5F7C8F1FB8AA92A6E2273 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + ED2D4AF300CE6F2241B57624 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 0BC14C4A242B5A7A0028DE94 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6322551A583705BBA2F048DD /* Pods_Runner.framework in Frameworks */, + 78DFDA8BF7ADD8988BA9B2C9 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0BC14C4E242B5A7A0028DE94 /* Notifications */ = { - isa = PBXGroup; - children = ( - 0BC14C5A242B5ED90028DE94 /* Notifications.entitlements */, - 0BC14C4F242B5A7A0028DE94 /* NotificationService.swift */, - 0BC14C51242B5A7A0028DE94 /* Info.plist */, - ); - path = Notifications; - sourceTree = ""; - }; - 7771A729FBB96FF718254442 /* Frameworks */ = { - isa = PBXGroup; - children = ( - CC299D593714162503D904EB /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -130,10 +89,9 @@ children = ( 97C146F01CF9000F007C117D /* Runner */, 9740EEB11CF90186004384FC /* Flutter */, - 0BC14C4E242B5A7A0028DE94 /* Notifications */, 97C146EF1CF9000F007C117D /* Products */, CF168B61BAB91958681C7C21 /* Pods */, - 7771A729FBB96FF718254442 /* Frameworks */, + F93B8F215F5456A6442CFA78 /* Frameworks */, ); sourceTree = ""; }; @@ -141,7 +99,6 @@ isa = PBXGroup; children = ( 97C146EE1CF9000F007C117D /* Runner.app */, - 0BC14C4D242B5A7A0028DE94 /* Notifications.appex */, ); name = Products; sourceTree = ""; @@ -173,38 +130,29 @@ CF168B61BAB91958681C7C21 /* Pods */ = { isa = PBXGroup; children = ( - 1DFB9D7CB4D2FBB0BD3BD534 /* Pods-Runner.debug.xcconfig */, - 7069E97E2E50CF0E633E719F /* Pods-Runner.release.xcconfig */, - 34DDA6B7AEE7F881BA31E310 /* Pods-Runner.profile.xcconfig */, + 91C3AAF66766852887B9460F /* Pods-Runner.debug.xcconfig */, + ED2D4AF300CE6F2241B57624 /* Pods-Runner.release.xcconfig */, + 887F9B6BDC8480C6B3628366 /* Pods-Runner.profile.xcconfig */, ); path = Pods; sourceTree = ""; }; + F93B8F215F5456A6442CFA78 /* Frameworks */ = { + isa = PBXGroup; + children = ( + A4E5F7C8F1FB8AA92A6E2273 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 0BC14C4C242B5A7A0028DE94 /* Notifications */ = { - isa = PBXNativeTarget; - buildConfigurationList = 0BC14C59242B5A7A0028DE94 /* Build configuration list for PBXNativeTarget "Notifications" */; - buildPhases = ( - 0BC14C49242B5A7A0028DE94 /* Sources */, - 0BC14C4A242B5A7A0028DE94 /* Frameworks */, - 0BC14C4B242B5A7A0028DE94 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Notifications; - productName = Notifications; - productReference = 0BC14C4D242B5A7A0028DE94 /* Notifications.appex */; - productType = "com.apple.product-type.app-extension"; - }; 97C146ED1CF9000F007C117D /* Runner */ = { isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 22D055914083BAC1E72E76DD /* [CP] Check Pods Manifest.lock */, + A83A30E8FF0298FDB3189FB1 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -212,12 +160,11 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 0BC14C55242B5A7A0028DE94 /* Embed App Extensions */, - 21997A6DA96DFFF3D7D29CC3 /* [CP] Embed Pods Frameworks */, + 5468FC796DAC9C565B3989B4 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( - 0BC14C53242B5A7A0028DE94 /* PBXTargetDependency */, ); name = Runner; productName = Runner; @@ -234,11 +181,6 @@ LastUpgradeCheck = 1020; ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { - 0BC14C4C242B5A7A0028DE94 = { - CreatedOnToolsVersion = 11.4; - DevelopmentTeam = EHV7XZLAHA; - ProvisioningStyle = Manual; - }; 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; DevelopmentTeam = EHV7XZLAHA; @@ -261,19 +203,11 @@ projectRoot = ""; targets = ( 97C146ED1CF9000F007C117D /* Runner */, - 0BC14C4C242B5A7A0028DE94 /* Notifications */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 0BC14C4B242B5A7A0028DE94 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 97C146EC1CF9000F007C117D /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -288,21 +222,32 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 21997A6DA96DFFF3D7D29CC3 /* [CP] Embed Pods Frameworks */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 5468FC796DAC9C565B3989B4 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/Starscream-framework/Starscream.framework", - "${BUILT_PRODUCTS_DIR}/StreamChatClient-framework/StreamChatClient.framework", "${BUILT_PRODUCTS_DIR}/DKImagePickerController/DKImagePickerController.framework", "${BUILT_PRODUCTS_DIR}/DKPhotoGallery/DKPhotoGallery.framework", "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", "${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework", - "${BUILT_PRODUCTS_DIR}/esys_flutter_share/esys_flutter_share.framework", "${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework", "${BUILT_PRODUCTS_DIR}/flutter_app_badger/flutter_app_badger.framework", "${BUILT_PRODUCTS_DIR}/flutter_keyboard_visibility/flutter_keyboard_visibility.framework", @@ -313,6 +258,7 @@ "${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework", "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework", "${BUILT_PRODUCTS_DIR}/photo_manager/photo_manager.framework", + "${BUILT_PRODUCTS_DIR}/share_plus/share_plus.framework", "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework", "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", "${BUILT_PRODUCTS_DIR}/sqlite3/sqlite3.framework", @@ -325,14 +271,11 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StreamChatClient.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKImagePickerController.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKPhotoGallery.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyGif.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/esys_flutter_share.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_app_badger.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_keyboard_visibility.framework", @@ -343,6 +286,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/photo_manager.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share_plus.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3.framework", @@ -380,7 +324,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + A83A30E8FF0298FDB3189FB1 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -411,14 +355,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 0BC14C49242B5A7A0028DE94 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 0BC14C50242B5A7A0028DE94 /* NotificationService.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 97C146EA1CF9000F007C117D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -430,14 +366,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 0BC14C53242B5A7A0028DE94 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 0BC14C4C242B5A7A0028DE94 /* Notifications */; - targetProxy = 0BC14C52242B5A7A0028DE94 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin PBXVariantGroup section */ 97C146FA1CF9000F007C117D /* Main.storyboard */ = { isa = PBXVariantGroup; @@ -458,90 +386,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 0BC14C56242B5A7A0028DE94 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = Notifications/Notifications.entitlements; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = EHV7XZLAHA; - ENABLE_BITCODE = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - INFOPLIST_FILE = Notifications/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.getstream.flutter.Notifications; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "match AdHoc io.getstream.flutter.Notifications"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 0BC14C57242B5A7A0028DE94 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = Notifications/Notifications.entitlements; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = EHV7XZLAHA; - ENABLE_BITCODE = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - INFOPLIST_FILE = Notifications/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.getstream.flutter.Notifications; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "match AdHoc io.getstream.flutter.Notifications"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - 0BC14C58242B5A7A0028DE94 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = Notifications/Notifications.entitlements; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = EHV7XZLAHA; - ENABLE_BITCODE = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - INFOPLIST_FILE = Notifications/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.getstream.flutter.Notifications; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "match AdHoc io.getstream.flutter.Notifications"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Profile; - }; 249021D3217E4FDB00AE95B9 /* Profile */ = { isa = XCBuildConfiguration; buildSettings = { @@ -801,16 +645,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 0BC14C59242B5A7A0028DE94 /* Build configuration list for PBXNativeTarget "Notifications" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 0BC14C56242B5A7A0028DE94 /* Debug */, - 0BC14C57242B5A7A0028DE94 /* Release */, - 0BC14C58242B5A7A0028DE94 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to packages/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/stream_chat_v1/ios/Notifications/Notifications.entitlements b/packages/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 62% rename from stream_chat_v1/ios/Notifications/Notifications.entitlements rename to packages/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist index e5b7189..18d9810 100644 --- a/stream_chat_v1/ios/Notifications/Notifications.entitlements +++ b/packages/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -2,9 +2,7 @@ - com.apple.security.application-groups - - group.io.getstream.flutter - + IDEDidComputeMac32BitWarning + diff --git a/packages/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/packages/stream_chat_v1/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/stream_chat_v1/ios/Runner.xcodeproj/xcshareddata/xcschemes/Notifications.xcscheme b/packages/stream_chat_v1/ios/Runner.xcodeproj/xcshareddata/xcschemes/Notifications.xcscheme similarity index 100% rename from stream_chat_v1/ios/Runner.xcodeproj/xcshareddata/xcschemes/Notifications.xcscheme rename to packages/stream_chat_v1/ios/Runner.xcodeproj/xcshareddata/xcschemes/Notifications.xcscheme diff --git a/stream_chat_v1/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/stream_chat_v1/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from stream_chat_v1/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to packages/stream_chat_v1/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/packages/stream_chat_v1/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/stream_chat_v1/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..21a3cc1 --- /dev/null +++ b/packages/stream_chat_v1/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/packages/stream_chat_v1/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/stream_chat_v1/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/packages/stream_chat_v1/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/stream_chat_v1/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/stream_chat_v1/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/packages/stream_chat_v1/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/stream_chat_v1/ios/Runner/AppDelegate.swift b/packages/stream_chat_v1/ios/Runner/AppDelegate.swift similarity index 100% rename from stream_chat_v1/ios/Runner/AppDelegate.swift rename to packages/stream_chat_v1/ios/Runner/AppDelegate.swift diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d36b1fa --- /dev/null +++ b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 0000000..89c2725 --- /dev/null +++ b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/stream_chat_v1/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/stream_chat_v1/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from stream_chat_v1/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to packages/stream_chat_v1/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/packages/stream_chat_v1/ios/Runner/Base.lproj/Main.storyboard b/packages/stream_chat_v1/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 0000000..f3c2851 --- /dev/null +++ b/packages/stream_chat_v1/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/stream_chat_v1/ios/Runner/Info.plist b/packages/stream_chat_v1/ios/Runner/Info.plist similarity index 100% rename from stream_chat_v1/ios/Runner/Info.plist rename to packages/stream_chat_v1/ios/Runner/Info.plist diff --git a/stream_chat_v1/ios/Runner/Runner-Bridging-Header.h b/packages/stream_chat_v1/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from stream_chat_v1/ios/Runner/Runner-Bridging-Header.h rename to packages/stream_chat_v1/ios/Runner/Runner-Bridging-Header.h diff --git a/stream_chat_v1/ios/Runner/Runner.entitlements b/packages/stream_chat_v1/ios/Runner/Runner.entitlements similarity index 100% rename from stream_chat_v1/ios/Runner/Runner.entitlements rename to packages/stream_chat_v1/ios/Runner/Runner.entitlements diff --git a/stream_chat_v1/ios/fastlane/Appfile b/packages/stream_chat_v1/ios/fastlane/Appfile similarity index 100% rename from stream_chat_v1/ios/fastlane/Appfile rename to packages/stream_chat_v1/ios/fastlane/Appfile diff --git a/packages/stream_chat_v1/ios/fastlane/Fastfile b/packages/stream_chat_v1/ios/fastlane/Fastfile new file mode 100644 index 0000000..4ddcc99 --- /dev/null +++ b/packages/stream_chat_v1/ios/fastlane/Fastfile @@ -0,0 +1,89 @@ +fastlane_version "2.162.0" +default_platform :ios + +before_all do + if is_ci + setup_ci() + end +end + +desc "Installs all Certs and Profiles necessary for development and ad-hoc" +lane :match_me do + match( + type: "adhoc", + app_identifier: [ + "io.getstream.flutter", + ], + readonly: is_ci, + force_for_new_devices: true + ) +end + +desc "Installs all Certs and Profiles necessary for appstore" +lane :match_appstore do + match( + type: "appstore", + app_identifier: [ + "io.getstream.flutter", + ], + readonly: is_ci + ) +end + +platform :ios do + desc "Deploy build to Firebase" + lane :deploy_to_firebase do + match_me + + gym( + workspace: "./Runner.xcworkspace", + scheme: "Runner", + export_method: "ad-hoc", + export_options: "./fastlane/beta_gym_export_options.plist", + silent: true, + clean: true, + include_symbols: true, + output_directory: "./dist" + ) + + message = changelog_from_git_commits(commits_count: 10) + + firebase_app_distribution( + app: "1:674907137625:ios:cafb9fb076a453c4d7f348", + groups: "ios-stream-testers" + ) + end +end + +platform :ios do + desc "Deploy build to TestFlight" + lane :deploy_to_testflight do + match_appstore + + settings_to_override = { + :BUNDLE_IDENTIFIER => "io.getstream.flutter", + :PROVISIONING_PROFILE_SPECIFIER => "match AppStore io.getstream.flutter" + } + + gym( + workspace: "./Runner.xcworkspace", + scheme: "Runner", + export_method: "app-store", + export_options: "./fastlane/testflight_gym_export_options.plist", + silent: true, + clean: true, + xcargs: settings_to_override, + include_symbols: true, + output_directory: "./dist", + ) + + message = changelog_from_git_commits(commits_count: 10) + + upload_to_testflight( + groups: ['Public'], + distribute_external: true, + changelog: message, + reject_build_waiting_for_review: true + ) + end +end diff --git a/stream_chat_v1/ios/fastlane/Matchfile b/packages/stream_chat_v1/ios/fastlane/Matchfile similarity index 100% rename from stream_chat_v1/ios/fastlane/Matchfile rename to packages/stream_chat_v1/ios/fastlane/Matchfile diff --git a/stream_chat_v1/ios/fastlane/Pluginfile b/packages/stream_chat_v1/ios/fastlane/Pluginfile similarity index 100% rename from stream_chat_v1/ios/fastlane/Pluginfile rename to packages/stream_chat_v1/ios/fastlane/Pluginfile diff --git a/stream_chat_v1/ios/fastlane/README.md b/packages/stream_chat_v1/ios/fastlane/README.md similarity index 80% rename from stream_chat_v1/ios/fastlane/README.md rename to packages/stream_chat_v1/ios/fastlane/README.md index e464ef2..7658d64 100644 --- a/stream_chat_v1/ios/fastlane/README.md +++ b/packages/stream_chat_v1/ios/fastlane/README.md @@ -20,6 +20,11 @@ or alternatively using `brew install fastlane` fastlane match_me ``` Installs all Certs and Profiles necessary for development and ad-hoc +### match_appstore +``` +fastlane match_appstore +``` +Installs all Certs and Profiles necessary for appstore ---- @@ -29,6 +34,11 @@ Installs all Certs and Profiles necessary for development and ad-hoc fastlane ios deploy_to_firebase ``` Deploy build to Firebase +### ios deploy_to_testflight +``` +fastlane ios deploy_to_testflight +``` +Deploy build to TestFlight ---- diff --git a/stream_chat_v1/ios/fastlane/beta_gym_export_options.plist b/packages/stream_chat_v1/ios/fastlane/beta_gym_export_options.plist similarity index 76% rename from stream_chat_v1/ios/fastlane/beta_gym_export_options.plist rename to packages/stream_chat_v1/ios/fastlane/beta_gym_export_options.plist index 53c7409..e88559a 100644 --- a/stream_chat_v1/ios/fastlane/beta_gym_export_options.plist +++ b/packages/stream_chat_v1/ios/fastlane/beta_gym_export_options.plist @@ -8,8 +8,6 @@ io.getstream.flutter match AdHoc io.getstream.flutter - io.getstream.flutter.Notifications - match AdHoc io.getstream.flutter.Notifications \ No newline at end of file diff --git a/packages/stream_chat_v1/ios/fastlane/report.xml b/packages/stream_chat_v1/ios/fastlane/report.xml new file mode 100644 index 0000000..42d2518 --- /dev/null +++ b/packages/stream_chat_v1/ios/fastlane/report.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/stream_chat_v1/ios/fastlane/testflight_gym_export_options.plist b/packages/stream_chat_v1/ios/fastlane/testflight_gym_export_options.plist new file mode 100644 index 0000000..2d09042 --- /dev/null +++ b/packages/stream_chat_v1/ios/fastlane/testflight_gym_export_options.plist @@ -0,0 +1,13 @@ + + + + + iCloudContainerEnvironment + Production + provisioningProfiles + + io.getstream.flutter + match AppStore io.getstream.flutter + + + \ No newline at end of file diff --git a/stream_chat_v1/lib/advanced_options_page.dart b/packages/stream_chat_v1/lib/advanced_options_page.dart similarity index 92% rename from stream_chat_v1/lib/advanced_options_page.dart rename to packages/stream_chat_v1/lib/advanced_options_page.dart index f3ea431..a654f3d 100644 --- a/stream_chat_v1/lib/advanced_options_page.dart +++ b/packages/stream_chat_v1/lib/advanced_options_page.dart @@ -75,7 +75,8 @@ class _AdvancedOptionsPageState extends State { validator: (value) { if (value.isEmpty) { setState(() { - _apiKeyError = 'Please enter the Chat API Key'; + _apiKeyError = + 'Please enter the Chat API Key'.toUpperCase(); }); return _apiKeyError; } @@ -101,8 +102,9 @@ class _AdvancedOptionsPageState extends State { fillColor: StreamChatTheme.of(context).colorTheme.whiteSmoke, filled: true, - labelText: - 'Chat API Key ${_apiKeyError != null ? ': $_apiKeyError' : ''}', + labelText: _apiKeyError != null + ? 'CHAT API KEY: $_apiKeyError' + : 'Chat API Key', ), textInputAction: TextInputAction.next, ), @@ -119,7 +121,8 @@ class _AdvancedOptionsPageState extends State { validator: (value) { if (value.isEmpty) { setState(() { - _userIdError = 'Please enter the User ID'; + _userIdError = + 'Please enter the User ID'.toUpperCase(); }); return _userIdError; } @@ -146,8 +149,9 @@ class _AdvancedOptionsPageState extends State { fillColor: StreamChatTheme.of(context).colorTheme.whiteSmoke, filled: true, - labelText: - 'User ID ${_userIdError != null ? ': $_userIdError' : ''}', + labelText: _userIdError != null + ? 'USER ID: $_userIdError' + : 'User ID', ), ), SizedBox(height: 8), @@ -163,7 +167,8 @@ class _AdvancedOptionsPageState extends State { validator: (value) { if (value.isEmpty) { setState(() { - _userTokenError = 'Please enter the user token'; + _userTokenError = + 'Please enter the user token'.toUpperCase(); }); return _userTokenError; } @@ -190,8 +195,9 @@ class _AdvancedOptionsPageState extends State { fillColor: StreamChatTheme.of(context).colorTheme.whiteSmoke, filled: true, - labelText: - 'User Token ${_userTokenError != null ? ': $_userTokenError' : ''}', + labelText: _userTokenError != null + ? 'USER TOKEN: $_userTokenError' + : 'User Token', ), ), SizedBox(height: 8), @@ -272,7 +278,7 @@ class _AdvancedOptionsPageState extends State { )..chatPersistenceClient = chatPersistentClient; try { - await client.setUser( + await client.connectUser( User(id: userId, extraData: { 'name': username, }), @@ -292,6 +298,7 @@ class _AdvancedOptionsPageState extends State { key: kStreamToken, value: userToken, ); + await client.disconnect(); } catch (e) { var errorText = 'Error connecting, retry'; if (e is Map) { @@ -299,7 +306,7 @@ class _AdvancedOptionsPageState extends State { } Navigator.pop(context); setState(() { - _apiKeyError = errorText; + _apiKeyError = errorText.toUpperCase(); }); loading = false; await client.disconnect(); diff --git a/stream_chat_v1/lib/chat_info_screen.dart b/packages/stream_chat_v1/lib/chat_info_screen.dart similarity index 100% rename from stream_chat_v1/lib/chat_info_screen.dart rename to packages/stream_chat_v1/lib/chat_info_screen.dart diff --git a/stream_chat_v1/lib/chips_input_text_field.dart b/packages/stream_chat_v1/lib/chips_input_text_field.dart similarity index 100% rename from stream_chat_v1/lib/chips_input_text_field.dart rename to packages/stream_chat_v1/lib/chips_input_text_field.dart diff --git a/stream_chat_v1/lib/choose_user_page.dart b/packages/stream_chat_v1/lib/choose_user_page.dart similarity index 100% rename from stream_chat_v1/lib/choose_user_page.dart rename to packages/stream_chat_v1/lib/choose_user_page.dart diff --git a/stream_chat_v1/lib/group_chat_details_screen.dart b/packages/stream_chat_v1/lib/group_chat_details_screen.dart similarity index 100% rename from stream_chat_v1/lib/group_chat_details_screen.dart rename to packages/stream_chat_v1/lib/group_chat_details_screen.dart diff --git a/stream_chat_v1/lib/group_info_screen.dart b/packages/stream_chat_v1/lib/group_info_screen.dart similarity index 98% rename from stream_chat_v1/lib/group_info_screen.dart rename to packages/stream_chat_v1/lib/group_info_screen.dart index f0c7ff3..b76cc9b 100644 --- a/stream_chat_v1/lib/group_info_screen.dart +++ b/packages/stream_chat_v1/lib/group_info_screen.dart @@ -107,10 +107,11 @@ class _GroupInfoScreenState extends State { return Text( _getChannelName( - 2 * MediaQuery.of(context).size.width / 3, - members: snapshot.data, - extraData: state.data.channel.extraData, - maxFontSize: 16.0), + 2 * MediaQuery.of(context).size.width / 3, + members: snapshot.data, + extraData: state.data.channel.extraData, + maxFontSize: 16.0, + ), style: TextStyle( color: StreamChatTheme.of(context).colorTheme.black, fontSize: 16, @@ -376,8 +377,12 @@ class _GroupInfoScreenState extends State { child: StreamSvgIcon.closeSmall(), onTap: () { setState(() { - _nameController.text = - _getChannelName(MediaQuery.of(context).size.width); + _nameController.text = _getChannelName( + 2 * MediaQuery.of(context).size.width / 3, + members: channel.state.members, + extraData: channel.extraData, + maxFontSize: 16.0, + ); _focusNode.unfocus(); }); }, @@ -996,8 +1001,12 @@ class _GroupInfoScreenState extends State { ); } - String _getChannelName(double width, - {List members, Map extraData, double maxFontSize}) { + String _getChannelName( + double width, { + List members, + Map extraData, + double maxFontSize, + }) { String title; var client = StreamChat.of(context); if (extraData['name'] == null) { diff --git a/stream_chat_v1/lib/main.dart b/packages/stream_chat_v1/lib/main.dart similarity index 100% rename from stream_chat_v1/lib/main.dart rename to packages/stream_chat_v1/lib/main.dart diff --git a/stream_chat_v1/lib/new_chat_screen.dart b/packages/stream_chat_v1/lib/new_chat_screen.dart similarity index 100% rename from stream_chat_v1/lib/new_chat_screen.dart rename to packages/stream_chat_v1/lib/new_chat_screen.dart diff --git a/stream_chat_v1/lib/new_group_chat_screen.dart b/packages/stream_chat_v1/lib/new_group_chat_screen.dart similarity index 100% rename from stream_chat_v1/lib/new_group_chat_screen.dart rename to packages/stream_chat_v1/lib/new_group_chat_screen.dart diff --git a/stream_chat_v1/lib/notifications_service.dart b/packages/stream_chat_v1/lib/notifications_service.dart similarity index 100% rename from stream_chat_v1/lib/notifications_service.dart rename to packages/stream_chat_v1/lib/notifications_service.dart diff --git a/stream_chat_v1/lib/routes/app_routes.dart b/packages/stream_chat_v1/lib/routes/app_routes.dart similarity index 100% rename from stream_chat_v1/lib/routes/app_routes.dart rename to packages/stream_chat_v1/lib/routes/app_routes.dart diff --git a/stream_chat_v1/lib/routes/routes.dart b/packages/stream_chat_v1/lib/routes/routes.dart similarity index 100% rename from stream_chat_v1/lib/routes/routes.dart rename to packages/stream_chat_v1/lib/routes/routes.dart diff --git a/stream_chat_v1/lib/search_text_field.dart b/packages/stream_chat_v1/lib/search_text_field.dart similarity index 100% rename from stream_chat_v1/lib/search_text_field.dart rename to packages/stream_chat_v1/lib/search_text_field.dart diff --git a/stream_chat_v1/lib/stream_version.dart b/packages/stream_chat_v1/lib/stream_version.dart similarity index 100% rename from stream_chat_v1/lib/stream_version.dart rename to packages/stream_chat_v1/lib/stream_version.dart diff --git a/packages/stream_chat_v1/pubspec.yaml b/packages/stream_chat_v1/pubspec.yaml new file mode 100644 index 0000000..ba5f058 --- /dev/null +++ b/packages/stream_chat_v1/pubspec.yaml @@ -0,0 +1,57 @@ +name: example +description: A new Flutter project. +publish_to: 'none' +version: 1.3.3+2 + +environment: + sdk: ">=2.2.2 <3.0.0" + +dependencies: + flutter_app_badger: ^1.1.2 + flutter: + sdk: flutter + stream_chat_flutter: + git: + url: https://github.com/GetStream/stream-chat-flutter.git + ref: develop + path: packages/stream_chat_flutter + stream_chat_persistence: + git: + url: https://github.com/GetStream/stream-chat-flutter.git + ref: develop + path: packages/stream_chat_persistence + flutter_local_notifications: ^2.0.2 + flutter_svg: ^0.19.3 + flutter_secure_storage: ^3.3.5 + yaml: ^2.2.1 + uuid: ^2.2.2 + streaming_shared_preferences: ^1.0.2 + lottie: ^0.7.0+1 + +dependency_overrides: + stream_chat: + git: + url: https://github.com/GetStream/stream-chat-flutter.git + ref: develop + path: packages/stream_chat + stream_chat_flutter_core: + git: + url: https://github.com/GetStream/stream-chat-flutter.git + ref: develop + path: packages/stream_chat_flutter_core + +dev_dependencies: + flutter_launcher_icons: ^0.8.1 + test: any + +flutter: + assets: + - assets/ + - pubspec.lock + uses-material-design: true + +flutter_icons: + android: true + ios: true + image_path_android: "assets/android_icon.png" + image_path_ios: "assets/ios_icon.png" diff --git a/stream_chat_v1/web/favicon.png b/packages/stream_chat_v1/web/favicon.png similarity index 100% rename from stream_chat_v1/web/favicon.png rename to packages/stream_chat_v1/web/favicon.png diff --git a/stream_chat_v1/web/icons/Icon-192.png b/packages/stream_chat_v1/web/icons/Icon-192.png similarity index 100% rename from stream_chat_v1/web/icons/Icon-192.png rename to packages/stream_chat_v1/web/icons/Icon-192.png diff --git a/stream_chat_v1/web/icons/Icon-512.png b/packages/stream_chat_v1/web/icons/Icon-512.png similarity index 100% rename from stream_chat_v1/web/icons/Icon-512.png rename to packages/stream_chat_v1/web/icons/Icon-512.png diff --git a/stream_chat_v1/web/index.html b/packages/stream_chat_v1/web/index.html similarity index 100% rename from stream_chat_v1/web/index.html rename to packages/stream_chat_v1/web/index.html diff --git a/stream_chat_v1/web/manifest.json b/packages/stream_chat_v1/web/manifest.json similarity index 100% rename from stream_chat_v1/web/manifest.json rename to packages/stream_chat_v1/web/manifest.json diff --git a/stream_chat_v1/web/sql-wasm.js b/packages/stream_chat_v1/web/sql-wasm.js similarity index 100% rename from stream_chat_v1/web/sql-wasm.js rename to packages/stream_chat_v1/web/sql-wasm.js diff --git a/stream_chat_v1/web/sql-wasm.wasm b/packages/stream_chat_v1/web/sql-wasm.wasm similarity index 100% rename from stream_chat_v1/web/sql-wasm.wasm rename to packages/stream_chat_v1/web/sql-wasm.wasm diff --git a/stream_chat_v1/ios/Notifications/Info.plist b/stream_chat_v1/ios/Notifications/Info.plist deleted file mode 100644 index a225b5c..0000000 --- a/stream_chat_v1/ios/Notifications/Info.plist +++ /dev/null @@ -1,31 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - Notifications - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - NSExtension - - NSExtensionPointIdentifier - com.apple.usernotifications.service - NSExtensionPrincipalClass - $(PRODUCT_MODULE_NAME).NotificationService - - - diff --git a/stream_chat_v1/ios/Notifications/NotificationService.swift b/stream_chat_v1/ios/Notifications/NotificationService.swift deleted file mode 100644 index 976e8d6..0000000 --- a/stream_chat_v1/ios/Notifications/NotificationService.swift +++ /dev/null @@ -1,182 +0,0 @@ -// -// NotificationService.swift -// Notifications -// -// Created by Salvatore Giordano on 25/03/2020. -// Copyright © 2020 The Chromium Authors. All rights reserved. -// - -import UserNotifications -//import StreamChatClient - -final class NotificationService: UNNotificationServiceExtension { - - var contentHandler: ((UNNotificationContent) -> Void)? - var bestAttemptContent: UNMutableNotificationContent? - - override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) { - self.contentHandler = contentHandler - bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent) - - guard let sharedDefaults = UserDefaults(suiteName: "group.io.getstream.flutter"), - let apiKey = sharedDefaults.string(forKey: "KEY_API_KEY"), - let userId = sharedDefaults.string(forKey: "KEY_USER_ID"), - let token = sharedDefaults.string(forKey: "KEY_TOKEN"), - let messageId = bestAttemptContent?.userInfo["message_id"] as? String else { - return - } - -// Client.config = .init(apiKey: apiKey, logOptions: .error) -// Client.shared.set(user: User(id: userId), token: token) { res in -// guard res.isConnected else { -// return -// } -// -// Client.shared.message(withId: messageId) { [weak self] res in -// if let message = res.value?.message, -// let channel = res.value?.channel { -// let messageWrapper = MessageWrapper(channel: channel, message: message) -// if let encodedData = try? JSONEncoder.stream.encode(messageWrapper), -// let encodedString = String(data: encodedData, encoding: .utf8) { -// let storedMessages = sharedDefaults.stringArray(forKey: "messageQueue") ?? [] -// sharedDefaults.setValue(storedMessages + [encodedString], forKey: "messageQueue") -// -// // Modify the notification content here... -// self?.bestAttemptContent?.title = "[modified] \(self?.bestAttemptContent?.title ?? "")" -// contentHandler(self?.bestAttemptContent ?? request.content) -// } -// Client.shared.disconnect() -// } -// } -// } - } - - override func serviceExtensionTimeWillExpire() { - if let contentHandler = contentHandler, let bestAttemptContent = bestAttemptContent { - contentHandler(bestAttemptContent) - } - } -} - -//public struct MessageWrapper: Encodable { -// private enum CodingKeys: String, CodingKey { -// case id -// case channel -// case type -// case user -// case created = "created_at" -// case updated = "updated_at" -// case text -// case command -// case args -// case attachments -// case parentId = "parent_id" -// case showReplyInChannel = "show_in_channel" -// case mentionedUsers = "mentioned_users" -// } -// -// init(channel: Channel, message: Message) { -// id = message.id -// type = message.type -// user = message.user -// created = message.created -// updated = message.updated -// text = message.text -// command = message.command -// args = message.args -// attachments = message.attachments -// parentId = message.parentId -// showReplyInChannel = message.showReplyInChannel -// mentionedUsers = message.mentionedUsers -// extraData = message.extraData -// self.channel = ChannelWrapper(channel: channel) -// } -// -// /// A message id. -// public let id: String -// /// The channel cid. -// public let channel: ChannelWrapper? -// /// A message type (see `MessageType`). -// public let type: MessageType -// /// A user (see `User`). -// public let user: User -// /// A created date. -// public let created: Date -// /// A updated date. -// public let updated: Date -// /// A text. -// public let text: String -// /// A used command name. -// public let command: String? -// /// A used command args. -// public let args: String? -// /// Attachments (see `Attachment`). -// public let attachments: [Attachment] -// /// A parent message id. -// public let parentId: String? -// /// Check if this reply message needs to show in the channel. -// public let showReplyInChannel: Bool -// /// Mentioned users (see `User`). -// public let mentionedUsers: [User] -// /// An extra data for the message. -// public let extraData: Codable? -//} -// -//public struct ChannelWrapper: Encodable { -// /// Coding keys for the encoding. -// private enum CodingKeys: String, CodingKey { -// case id -// case cid -// case type -// case name -// case imageURL = "image" -// case members -// case lastMessageDate = "last_message_at" -// case createdBy = "created_by" -// case created = "created_at" -// case deleted = "deleted_at" -// case frozen -// } -// -// init(channel: Channel) { -// id = channel.id -// cid = channel.cid -// type = channel.type -// name = channel.name -// imageURL = channel.imageURL -// lastMessageDate = channel.lastMessageDate -// created = channel.created -// deleted = channel.deleted -// createdBy = channel.createdBy -// config = channel.config -// frozen = channel.frozen -// extraData = channel.extraData -// } -// -// /// A channel id. -// public let id: String -// /// A channel type + id. -// public let cid: ChannelId -// /// A channel type. -// public let type: ChannelType -// /// A channel name. -// public let name: String? -// /// An image of the channel. -// public let imageURL: URL? -// /// The last message date. -// public let lastMessageDate: Date? -// /// A channel created date. -// public let created: Date -// /// A channel deleted date. -// public let deleted: Date? -// /// A creator of the channel. -// public let createdBy: User? -// /// A config. -// public let config: Channel.Config -// /// Checks if the channel is frozen. -// public let frozen: Bool -// /// A list of user ids of the channel members. -// public let members = Set() -// /// An extra data for the channel. -// public let extraData: Codable? -//} diff --git a/stream_chat_v1/ios/fastlane/Fastfile b/stream_chat_v1/ios/fastlane/Fastfile deleted file mode 100644 index ec2adc8..0000000 --- a/stream_chat_v1/ios/fastlane/Fastfile +++ /dev/null @@ -1,46 +0,0 @@ -fastlane_version "2.162.0" -default_platform :ios - -before_all do - if is_ci - setup_ci() - end -end - -desc "Installs all Certs and Profiles necessary for development and ad-hoc" -lane :match_me do - match( - type: "adhoc", - app_identifier: [ - "io.getstream.flutter", - "io.getstream.flutter.Notifications" - ], - readonly: is_ci, - force_for_new_devices: true - ) -end - -platform :ios do - desc "Deploy build to Firebase" - lane :deploy_to_firebase do - match_me - - gym( - workspace: "./Runner.xcworkspace", - scheme: "Runner", - export_method: "ad-hoc", - export_options: "./fastlane/beta_gym_export_options.plist", - silent: true, - clean: true, - include_symbols: true, - output_directory: "./dist" - ) - - message = changelog_from_git_commits(commits_count: 10) - - firebase_app_distribution( - app: "1:674907137625:ios:cafb9fb076a453c4d7f348", - groups: "ios-stream-testers" - ) - end -end \ No newline at end of file diff --git a/stream_chat_v1/ios/fastlane/report.xml b/stream_chat_v1/ios/fastlane/report.xml deleted file mode 100644 index b6e7bdc..0000000 --- a/stream_chat_v1/ios/fastlane/report.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/stream_chat_v1/pubspec.yaml b/stream_chat_v1/pubspec.yaml index dcf44a6..cb4ba0e 100644 --- a/stream_chat_v1/pubspec.yaml +++ b/stream_chat_v1/pubspec.yaml @@ -10,8 +10,16 @@ dependencies: flutter_app_badger: ^1.1.2 flutter: sdk: flutter - stream_chat_flutter: ^1.4.0-beta - stream_chat_persistence: ^1.4.0-beta + stream_chat_flutter: + git: + url: https://github.com/GetStream/stream-chat-flutter.git + ref: develop + path: packages/stream_chat_flutter + stream_chat_persistence: + git: + url: https://github.com/GetStream/stream-chat-flutter.git + ref: develop + path: packages/stream_chat_persistence flutter_local_notifications: ^2.0.2 flutter_svg: ^0.19.3 flutter_secure_storage: ^3.3.5 @@ -24,6 +32,18 @@ dev_dependencies: flutter_launcher_icons: ^0.8.1 test: any +dependency_overrides: + stream_chat_flutter_core: + git: + url: https://github.com/GetStream/stream-chat-flutter.git + ref: develop + path: packages/stream_chat_flutter_core + stream_chat: + git: + url: https://github.com/GetStream/stream-chat-flutter.git + ref: develop + path: packages/stream_chat + flutter: assets: - assets/