Merge remote-tracking branch 'origin/master' into feature/facebook_auth

# Conflicts:
#	chat_sample/android/app/src/main/AndroidManifest.xml
#	chat_sample/build/web/assets/NOTICES
#	chat_sample/build/web/flutter_service_worker.js
#	chat_sample/build/web/index.html
#	chat_sample/build/web/main.dart.js
#	chat_sample/ios/Podfile.lock
#	chat_sample/ios/Runner.xcodeproj/project.pbxproj
#	chat_sample/lib/main.dart
#	chat_sample/lib/src/utils/api_utils.dart
#	chat_sample/lib/src/utils/configs.dart
#	chat_sample/macos/Podfile.lock
#	chat_sample/macos/Runner/Info.plist
#	chat_sample/pubspec.yaml

README.md

@@ -7,6 +7,7 @@ This project contains chat and video chat code samples for Flutter platform base
 The following code samples are available:
 
 - [Chat code sample](https://github.com/ConnectyCube/connectycube-flutter-samples/tree/master/chat_sample)
+- [Chat Sample Web App](https://connectycube.github.io/connectycube-flutter-samples/chat_sample/build/web)
 
 <kbd><img alt="Flutter Chat sample, select dialogs" src="https://developers.connectycube.com/docs/_images/code_samples/flutter/dialogs_screen.png" height="440" /></kbd>
 <kbd><img alt="Flutter Chat code sample, chat" src="https://developers.connectycube.com/docs/_images/code_samples/flutter/chat_screen.png" height="440" /></kbd>
@@ -16,14 +17,15 @@ The following code samples are available:
 
 <kbd><img alt="Flutter P2P Calls code sample, login" src="https://developers.connectycube.com/docs/_images/code_samples/flutter/login_screen.png" height="440" /></kbd>
 <kbd><img alt="Flutter P2P Calls code sample, select users" src="https://developers.connectycube.com/docs/_images/code_samples/flutter/select_opponents_screen.png" height="440" /></kbd>
-<kbd><img alt="Flutter P2P Calls code sample, video chat" src="https://developers.connectycube.com/docs/_images/code_samples/flutter/call_screen.png" height="440" /></kbd>
+<kbd><img alt="Flutter P2P Calls code sample, video chat" src="https://developers.connectycube.com/docs/_images/code_samples/flutter/call_screen_private.png" height="440" /></kbd>
 </kbd> <kbd><img alt="Flutter P2P Calls code sample, video chat (macOS)" src="https://developers.connectycube.com/docs/_images/code_samples/flutter/call_screen_macos.png" height="440" /></kbd>
 
 - [Conference Calls code sample](https://github.com/ConnectyCube/connectycube-flutter-samples/tree/master/conf_call_sample)
+- [Conference Calls Sample Web App](https://connectycube.github.io/connectycube-flutter-samples/conf_call_sample/build/web)
 
-<kbd><img alt="Flutter Conference Calls code sample, select users" src="https://developers.connectycube.com/docs/_images/code_samples/flutter/select_opponents_screen.png" height="440" /></kbd>
-<kbd><img alt="Flutter Conference Calls code sample, video chat" src="https://developers.connectycube.com/docs/_images/code_samples/flutter/call_screen.png" height="440" /></kbd>
-</kbd> <kbd><img alt="Flutter Conference Calls code sample, video chat (macOS)" src="https://developers.connectycube.com/docs/_images/code_samples/flutter/call_screen_macos.png" height="440" /></kbd>
+<kbd><img alt="Flutter Conference Calls code sample, select users" src="https://developers.connectycube.com/docs/_images/code_samples/flutter/select_opponents_screen_conf.png" height="440" /></kbd>
+<kbd><img alt="Flutter Conference Calls code sample, video chat" src="https://developers.connectycube.com/docs/_images/code_samples/flutter/call_screen_group_conf.png" height="440" /></kbd>
+</kbd> <kbd><img alt="Flutter Conference Calls code sample, video chat (macOS)" src="https://developers.connectycube.com/docs/_images/code_samples/flutter/call_screen_macos_conf.png" height="440" /></kbd>
 ## Documentation
 
 All the samples use ConnectyCube SDK. The following tech integration documentation is available:
@@ -36,7 +38,10 @@ All the samples use ConnectyCube SDK. The following tech integration documentati
 
 ## Have an issue?
 
-Got troubles with integration? Just create an issue at [Issues page](https://github.com/ConnectyCube/connectycube-flutter-samples/issues) - we will create the sample for you. For FREE!
+Got troubles with integration? Сreate an issue at [Issues page](https://github.com/ConnectyCube/connectycube-flutter-samples/issues)
+
+**Want to support our team**:<br>
+<a href="https://www.buymeacoffee.com/connectycube" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-blue.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>
 
 ## License
 

chat_sample/README.md

@@ -12,11 +12,18 @@ The project contains the following features implemented:
 - Chat dialogs creation
 - 1-1 messaging
 - Group messaging
+- Media attachments:
+  - Images;
+  - Voice;
+  - Videos;
+- BlurHash feature for Images attachments;
 - ‘Is typing’ statuses
 - Group chat: edit a name, photo; list of participants, add/remove participants; leave a group
 - Push notification: subscribe/unsubscribe, show local notification, navigate to the app click on a local notification
 - Messages' reactions
 
+[**Chat Sample Web App**](https://connectycube.github.io/connectycube-flutter-samples/chat_sample/build/web)
+
 ## Documentation
 
 ConnectyCube Flutter getting started - [https://developers.connectycube.com/flutter](https://developers.connectycube.com/flutter)

chat_sample/android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-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'
@@ -21,12 +22,9 @@ 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 33
+    compileSdkVersion 34
+    ndkVersion "25.2.9519653"
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -39,7 +37,7 @@ android {
     defaultConfig {
         applicationId "com.connectycube.flutter.chat_sample"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -64,7 +62,7 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinVersion}"
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'

chat_sample/android/app/src/main/AndroidManifest.xml

@@ -8,26 +8,26 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:label="Chat Sample">
+        android:label="Chat Sample"
+        android:largeHeap="true">
         <activity
             android:name=".MainActivity"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:exported="true"
-            android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:windowSoftInputMode="adjustResize">
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-
-
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data

chat_sample/android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.6.10'
-    repositories {
-        google()
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()

chat_sample/android/gradle.properties

@@ -2,3 +2,5 @@ org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
+kotlinVersion=1.8.22
+agpVersion=7.3.1

chat_sample/android/settings.gradle

@@ -1,15 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
 }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "${agpVersion}" apply false
+    id "org.jetbrains.kotlin.android" version "${kotlinVersion}" apply false
 }
+
+include ":app"

chat_sample/build/web/.last_build_id

@@ -1 +1 @@
-e1ddf578a6bdca58ac1738835329f332
+846120b4c5c0513ff1e25f1352e8304a

chat_sample/build/web/assets/AssetManifest.bin

@@ -0,0 +1 @@
+'assets/fonts/NotoColorEmoji-Regular.ttf

asset'assets/fonts/NotoColorEmoji-Regular.ttf#assets/images/img_not_available.jpg

asset#assets/images/img_not_available.jpgassets/images/splash.png

assetassets/images/splash.png6packages/flutter_image_compress_web/assets/pica.min.js

asset6packages/flutter_image_compress_web/assets/pica.min.js)packages/fluttertoast/assets/toastify.css

asset)packages/fluttertoast/assets/toastify.css(packages/fluttertoast/assets/toastify.js

asset(packages/fluttertoast/assets/toastify.js/packages/record_web/assets/js/record.worklet.js

asset/packages/record_web/assets/js/record.worklet.js

chat_sample/build/web/assets/AssetManifest.bin.json

@@ -0,0 +1 @@
+"DQcHJ2Fzc2V0cy9mb250cy9Ob3RvQ29sb3JFbW9qaS1SZWd1bGFyLnR0ZgwBDQEHBWFzc2V0Bydhc3NldHMvZm9udHMvTm90b0NvbG9yRW1vamktUmVndWxhci50dGYHI2Fzc2V0cy9pbWFnZXMvaW1nX25vdF9hdmFpbGFibGUuanBnDAENAQcFYXNzZXQHI2Fzc2V0cy9pbWFnZXMvaW1nX25vdF9hdmFpbGFibGUuanBnBxhhc3NldHMvaW1hZ2VzL3NwbGFzaC5wbmcMAQ0BBwVhc3NldAcYYXNzZXRzL2ltYWdlcy9zcGxhc2gucG5nBzZwYWNrYWdlcy9mbHV0dGVyX2ltYWdlX2NvbXByZXNzX3dlYi9hc3NldHMvcGljYS5taW4uanMMAQ0BBwVhc3NldAc2cGFja2FnZXMvZmx1dHRlcl9pbWFnZV9jb21wcmVzc193ZWIvYXNzZXRzL3BpY2EubWluLmpzBylwYWNrYWdlcy9mbHV0dGVydG9hc3QvYXNzZXRzL3RvYXN0aWZ5LmNzcwwBDQEHBWFzc2V0BylwYWNrYWdlcy9mbHV0dGVydG9hc3QvYXNzZXRzL3RvYXN0aWZ5LmNzcwcocGFja2FnZXMvZmx1dHRlcnRvYXN0L2Fzc2V0cy90b2FzdGlmeS5qcwwBDQEHBWFzc2V0ByhwYWNrYWdlcy9mbHV0dGVydG9hc3QvYXNzZXRzL3RvYXN0aWZ5LmpzBy9wYWNrYWdlcy9yZWNvcmRfd2ViL2Fzc2V0cy9qcy9yZWNvcmQud29ya2xldC5qcwwBDQEHBWFzc2V0By9wYWNrYWdlcy9yZWNvcmRfd2ViL2Fzc2V0cy9qcy9yZWNvcmQud29ya2xldC5qcw=="

chat_sample/build/web/assets/AssetManifest.json

@@ -1 +1 @@
-{"assets/fonts/NotoColorEmoji-Regular.ttf":["assets/fonts/NotoColorEmoji-Regular.ttf"],"assets/images/splash.png":["assets/images/splash.png"],"packages/fluttertoast/assets/toastify.css":["packages/fluttertoast/assets/toastify.css"],"packages/fluttertoast/assets/toastify.js":["packages/fluttertoast/assets/toastify.js"]}
+{"assets/fonts/NotoColorEmoji-Regular.ttf":["assets/fonts/NotoColorEmoji-Regular.ttf"],"assets/images/img_not_available.jpg":["assets/images/img_not_available.jpg"],"assets/images/splash.png":["assets/images/splash.png"],"packages/flutter_image_compress_web/assets/pica.min.js":["packages/flutter_image_compress_web/assets/pica.min.js"],"packages/fluttertoast/assets/toastify.css":["packages/fluttertoast/assets/toastify.css"],"packages/fluttertoast/assets/toastify.js":["packages/fluttertoast/assets/toastify.js"],"packages/record_web/assets/js/record.worklet.js":["packages/record_web/assets/js/record.worklet.js"]}