Merge pull request #1031 from GetStream/feat/slidable-1.2.0

feat(ui): Update slidable to 1.2.0

packages/stream_chat_flutter/example/pubspec.yaml

@@ -38,6 +38,10 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
 
+dependency_overrides: 
+  stream_chat_flutter: 
+    path: ../
+
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 

packages/stream_chat_flutter/lib/src/channel_list_view.dart

@@ -207,8 +207,6 @@ class ChannelListView extends StatefulWidget {
 }
 
 class _ChannelListViewState extends State<ChannelListView> {
-  final _slideController = SlidableController();
-
   late final _defaultController = ChannelListController();
 
   ChannelListController get _channelListController =>
@@ -270,7 +268,8 @@ class _ChannelListViewState extends State<ChannelListView> {
             _gridItemBuilder(context, index, channels),
       );
     }
-    return ListView.separated(
+    return SlidableAutoCloseBehavior(
+      child: ListView.separated(
         padding: widget.padding,
         physics: const AlwaysScrollableScrollPhysics(),
         // all channels + progress loader
@@ -283,6 +282,7 @@ class _ChannelListViewState extends State<ChannelListView> {
         },
         itemBuilder: (context, index) =>
             _listItemBuilder(context, index, channels),
+      ),
     );
   }
 
@@ -510,32 +510,34 @@ class _ChannelListViewState extends State<ChannelListView> {
     final backgroundColor = chatThemeData.colorTheme.inputBg;
     final channel = channels[i];
 
+    final canDeleteChannel =
+        channel.ownCapabilities.contains(PermissionType.deleteChannel);
+
     return StreamChannel(
       key: ValueKey<String>('CHANNEL-${channel.cid}'),
       channel: channel,
       child: Slidable(
-        controller: _slideController,
         enabled: widget.swipeToAction,
-        actionPane: const SlidableBehindActionPane(),
+        endActionPane: ActionPane(
-        actionExtentRatio: 0.12,
+          extentRatio: canDeleteChannel ? 0.4 : 0.2,
-        secondaryActions: widget.swipeActions
+          motion: const BehindMotion(),
-                ?.map((e) => IconSlideAction(
+          children: widget.swipeActions
-                      color: e.color,
+                  ?.map((e) => CustomSlidableAction(
-                      iconWidget: e.iconWidget,
+                        backgroundColor: e.color ?? Colors.white,
-                      onTap: () {
+                        child: e.iconWidget,
+                        onPressed: (_) {
                           e.onTap?.call(channel);
                         },
                       ))
                   .toList() ??
               <Widget>[
-              IconSlideAction(
+                CustomSlidableAction(
-                color: backgroundColor,
+                  backgroundColor: backgroundColor,
-                icon: Icons.more_horiz,
+                  onPressed: widget.onMoreDetailsPressed != null
-                onTap: widget.onMoreDetailsPressed != null
+                      ? (_) {
-                    ? () {
                           widget.onMoreDetailsPressed!(channel);
                         }
-                    : () {
+                      : (_) {
                           showModalBottomSheet(
                             clipBehavior: Clip.hardEdge,
                             shape: const RoundedRectangleBorder(
@@ -556,24 +558,22 @@ class _ChannelListViewState extends State<ChannelListView> {
                             ),
                           );
                         },
+                  child: const Icon(Icons.more_horiz),
                 ),
-              if (channel.ownCapabilities
+                if (canDeleteChannel)
-                  .contains(PermissionType.deleteChannel))
+                  CustomSlidableAction(
-                IconSlideAction(
+                    backgroundColor: backgroundColor,
-                  color: backgroundColor,
+                    onPressed: widget.onDeletePressed != null
-                  iconWidget: StreamSvgIcon.delete(
+                        ? (_) {
-                    color: chatThemeData.colorTheme.accentError,
-                  ),
-                  onTap: widget.onDeletePressed != null
-                      ? () {
                             widget.onDeletePressed?.call(channel);
                           }
-                      : () async {
+                        : (_) async {
                             final res = await showConfirmationDialog(
                               context,
-                            title: context.translations.deleteConversationLabel,
+                              title:
-                            question:
+                                  context.translations.deleteConversationLabel,
-                                context.translations.deleteConversationQuestion,
+                              question: context
+                                  .translations.deleteConversationQuestion,
                               okText: context.translations.deleteLabel,
                               cancelText: context.translations.cancelLabel,
                               icon: StreamSvgIcon.delete(
@@ -584,8 +584,12 @@ class _ChannelListViewState extends State<ChannelListView> {
                               await channel.delete();
                             }
                           },
+                    child: StreamSvgIcon.delete(
+                      color: chatThemeData.colorTheme.accentError,
+                    ),
                   ),
               ],
+        ),
         child: widget.channelPreviewBuilder?.call(context, channel) ??
             DecoratedBox(
               decoration: BoxDecoration(

packages/stream_chat_flutter/pubspec.yaml

@@ -22,7 +22,7 @@ dependencies:
     sdk: flutter
   flutter_markdown: ^0.6.1
   flutter_portal: ^0.4.0
-  flutter_slidable: ^0.6.0
+  flutter_slidable: ^1.2.0
   flutter_svg: ^1.0.1
   http_parser: ^4.0.0
   image_gallery_saver: ^1.7.0

packages/stream_chat_localizations/example/android/app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="example"
         android:icon="@mipmap/ic_launcher">
         <activity

packages/stream_chat_localizations/example/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>

packages/stream_chat_localizations/example/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

packages/stream_chat_localizations/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

packages/stream_chat_localizations/example/pubspec.yaml

@@ -11,8 +11,15 @@ dependencies:
   cupertino_icons: ^1.0.3
   flutter:
     sdk: flutter
-  stream_chat_flutter: ^2.2.1
+  stream_chat_flutter:
-  stream_chat_localizations: ^1.1.0
+    path: ../../stream_chat_flutter
+  stream_chat_localizations: 
+    path: ../
+
+
+dependency_overrides: 
+  stream_chat_flutter: 
+    path: ../../stream_chat_flutter
 
 dev_dependencies:
   flutter_test:

packages/stream_chat_persistence/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 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

packages/stream_chat_persistence/example/android/app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="example"
         android:icon="@mipmap/ic_launcher">
         <activity

packages/stream_chat_persistence/example/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.0'
     repositories {
         google()
         jcenter()