Merge branch 'develop' into cds-189

packages/stream_chat_flutter/example/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -41,7 +41,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.example"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

packages/stream_chat_flutter/example/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.20'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

packages/stream_chat_flutter/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ 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
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip

packages/stream_chat_flutter/example/lib/main.dart

@@ -1,11 +1,8 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
-import 'package:stream_chat_persistence/stream_chat_persistence.dart';
-
-/// A chat-persisted StreamChatClient
-final chatPersistentClient = StreamChatPersistenceClient(
-  logLevel: Level.INFO,
-);
+import 'package:stream_chat_localizations/stream_chat_localizations.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -15,7 +12,7 @@ void main() async {
   final client = StreamChatClient(
     'kv7mcsxr24p8',
     logLevel: Level.INFO,
-  )..chatPersistenceClient = chatPersistentClient;
+  );
 
   /// Set the current user and connect the websocket. In a production
   /// scenario, this should be done using a backend to generate a user token
@@ -76,6 +73,13 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) => MaterialApp(
         theme: ThemeData.light(),
         darkTheme: ThemeData.dark(),
+        supportedLocales: const [
+          Locale('en'),
+          Locale('hi'),
+          Locale('fr'),
+          Locale('it'),
+        ],
+        localizationsDelegates: GlobalStreamChatLocalizations.delegates,
         builder: (context, widget) => StreamChat(
           client: client,
           child: widget,

packages/stream_chat_flutter/example/lib/split_view.dart

@@ -103,7 +103,7 @@ class ChannelListPage extends StatelessWidget {
                 : null,
             filter: Filter.in_(
               'members',
-              [StreamChat.of(context).user!.id],
+              [StreamChat.of(context).currentUser!.id],
             ),
             sort: const [SortOption('last_message_at')],
             pagination: const PaginationParams(

packages/stream_chat_flutter/example/lib/tutorial_part_2.dart

@@ -80,7 +80,7 @@ class ChannelListPage extends StatelessWidget {
         child: ChannelListView(
           filter: Filter.in_(
             'members',
-            [StreamChat.of(context).user!.id],
+            [StreamChat.of(context).currentUser!.id],
           ),
           sort: const [SortOption('last_message_at')],
           pagination: const PaginationParams(

packages/stream_chat_flutter/example/lib/tutorial_part_3.dart

@@ -81,7 +81,7 @@ class ChannelListPage extends StatelessWidget {
         child: ChannelListView(
           filter: Filter.in_(
             'members',
-            [StreamChat.of(context).user!.id],
+            [StreamChat.of(context).currentUser!.id],
           ),
           channelPreviewBuilder: _channelPreviewBuilder,
           // sort: [SortOption('last_message_at')],

packages/stream_chat_flutter/example/lib/tutorial_part_4.dart

@@ -66,7 +66,7 @@ class ChannelListPage extends StatelessWidget {
         child: ChannelListView(
           filter: Filter.in_(
             'members',
-            [StreamChat.of(context).user!.id],
+            [StreamChat.of(context).currentUser!.id],
           ),
           sort: const [SortOption('last_message_at')],
           pagination: const PaginationParams(

packages/stream_chat_flutter/example/lib/tutorial_part_5.dart

@@ -72,7 +72,7 @@ class ChannelListPage extends StatelessWidget {
         child: ChannelListView(
           filter: Filter.in_(
             'members',
-            [StreamChat.of(context).user!.id],
+            [StreamChat.of(context).currentUser!.id],
           ),
           sort: const [SortOption('last_message_at')],
           pagination: const PaginationParams(
@@ -115,7 +115,8 @@ class ChannelPage extends StatelessWidget {
     MessageWidget _,
   ) {
     final message = details.message;
-    final isCurrentUser = StreamChat.of(context).user!.id == message.user!.id;
+    final isCurrentUser =
+        StreamChat.of(context).currentUser!.id == message.user!.id;
     final textAlign = isCurrentUser ? TextAlign.right : TextAlign.left;
     final color = isCurrentUser ? Colors.blueGrey : Colors.blue;
 

packages/stream_chat_flutter/example/lib/tutorial_part_6.dart

@@ -99,7 +99,7 @@ class ChannelListPage extends StatelessWidget {
         child: ChannelListView(
           filter: Filter.in_(
             'members',
-            [StreamChat.of(context).user!.id],
+            [StreamChat.of(context).currentUser!.id],
           ),
           sort: const [SortOption('last_message_at')],
           pagination: const PaginationParams(

packages/stream_chat_flutter/example/pubspec.yaml

@@ -33,6 +33,8 @@ dependencies:
   #    path: ../../stream_chat_flutter_core
   stream_chat_flutter:
     path: ../
+  stream_chat_localizations:
+    path: ../../stream_chat_localizations
   stream_chat_persistence:
     path: ../../stream_chat_persistence