Rel v2.3.5

ios/Twake Share/Info.plist

@@ -45,8 +45,8 @@
 				<string>Image</string>
 			</array>
 		</dict>
-		<key>NSExtensionMainStoryboard</key>
-		<string>MainInterface</string>
+		<key>NSExtensionPrincipalClass</key>
+		<string>ShareViewController</string>
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.share-services</string>
 	</dict>

ios/Twake Share/ShareViewController.swift

@@ -3,7 +3,8 @@ import Social
 import MobileCoreServices
 import Photos
 
-class ShareViewController: SLComposeServiceViewController {
+@objc(ShareViewController)
+class ShareViewController: UIViewController {
     // TODO: IMPORTANT: This should be your host app bundle identifier
     var hostAppBundleIdentifier = "com.linagora.ios.twake"
     let sharedKey = "ShareKey"
@@ -31,10 +32,6 @@ class ShareViewController: SLComposeServiceViewController {
         appGroupId = (Bundle.main.object(forInfoDictionaryKey: "AppGroupId") as? String) ?? "group.\(hostAppBundleIdentifier)";
     }
 
-    override func isContentValid() -> Bool {
-        return true
-    }
-
     override func viewDidLoad() {
         super.viewDidLoad();
 
@@ -65,15 +62,6 @@ class ShareViewController: SLComposeServiceViewController {
         }
     }
 
-    override func didSelectPost() {
-        print("didSelectPost");
-    }
-
-    override func configurationItems() -> [Any]! {
-        // To add configuration options via table cells at the bottom of the sheet, return an array of SLComposeSheetConfigurationItem here.
-        return []
-    }
-
     private func handleText (content: NSExtensionItem, attachment: NSItemProvider, index: Int) {
         attachment.loadItem(forTypeIdentifier: textContentType, options: nil) { [weak self] data, error in
 

lib/pages/chat_list/chat_list.dart

@@ -225,6 +225,7 @@ class ChatListController extends State<ChatList>
   Future<void> actionWithToggleSelectMode(Function action) async {
     await action();
     toggleSelectMode();
+    _clearSelectionItem();
   }
 
   void _clearSelectionItem() {

lib/pages/chat_list/chat_list_item.dart

@@ -107,6 +107,7 @@ class ChatListItem extends StatelessWidget with ChatListItemMixin {
           onSecondaryTap: onSecondaryTap,
           onLongPress: onLongPress,
           child: Container(
+            height: ChatListItemStyle.chatItemHeight,
             padding: ChatListItemStyle.paddingBody,
             child: Row(
               children: [

lib/pages/chat_list/chat_list_item_style.dart

@@ -10,6 +10,8 @@ class ChatListItemStyle {
 
   static const double mentionIconWidth = 20;
 
+  static const double chatItemHeight = 85;
+
   static double unreadBadgeSize(
     bool unread,
     bool hasNewMessages,

lib/pages/chat_list/chat_list_item_subtitle.dart

@@ -31,14 +31,7 @@ class ChatListItemSubtitle extends StatelessWidget with ChatListItemMixin {
       children: <Widget>[
         Expanded(
           child: typingText.isNotEmpty
-              ? Column(
-                  children: [
-                    Flexible(
-                      child: typingTextWidget(typingText, context),
-                    ),
-                    const Spacer(),
-                  ],
-                )
+              ? typingTextWidget(typingText, context)
               : (isGroup
                   ? chatListItemSubtitleForGroup(
                       room: room,

lib/presentation/mixins/chat_list_item_mixin.dart

@@ -42,26 +42,18 @@ mixin ChatListItemMixin {
     );
   }
 
-  Row typingTextWidget(String typingText, BuildContext context) {
+  Widget typingTextWidget(String typingText, BuildContext context) {
     final displayedTypingText = "~ $typingText…";
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.center,
-      mainAxisAlignment: MainAxisAlignment.start,
-      children: [
-        Flexible(
-          child: Text(
-            displayedTypingText,
-            style: Theme.of(context).textTheme.labelLarge?.merge(
-                  TextStyle(
-                    overflow: TextOverflow.ellipsis,
-                    color: Theme.of(context).colorScheme.primary,
-                  ),
-                ),
-            maxLines: 2,
-            softWrap: true,
+    return Text(
+      displayedTypingText,
+      style: Theme.of(context).textTheme.labelLarge?.merge(
+            TextStyle(
+              overflow: TextOverflow.ellipsis,
+              color: Theme.of(context).colorScheme.primary,
+            ),
           ),
-        ),
-      ],
+      maxLines: 2,
+      softWrap: true,
     );
   }
 

pubspec.yaml

@@ -1,7 +1,7 @@
 name: fluffychat
 description: The open digital workplace.
 publish_to: none
-version: 2.3.4+2330
+version: 2.3.5+2330
 
 environment:
   sdk: '>=3.0.0 <4.0.0'