Fix UI chat wrong

linagora · Oct 2, 2023 · 4cca97c · 4cca97c
1 parent 2e26607
commit 4cca97c
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 50 deletions.
diff --git a/lib/widgets/twake_components/twake_header.dart b/lib/widgets/twake_components/twake_header.dart
@@ -37,47 +37,51 @@ class TwakeHeader extends StatelessWidget
               padding: TwakeHeaderStyle.padding,
               child: Row(
                 children: [
-                  Expanded(
-                    flex: TwakeHeaderStyle.flexActions,
-                    child: Row(
-                      children: [
-                        InkWell(
-                          onTap: onClearSelection,
-                          borderRadius: BorderRadius.circular(
-                            TwakeHeaderStyle.closeIconSize,
+                  if (!TwakeHeaderStyle.isDesktop(context))
+                    Expanded(
+                      flex: TwakeHeaderStyle.flexActions,
+                      child: Row(
+                        children: [
+                          InkWell(
+                            onTap: onClearSelection,
+                            borderRadius: BorderRadius.circular(
+                              TwakeHeaderStyle.closeIconSize,
+                            ),
+                            child: Icon(
+                              Icons.close,
+                              size: TwakeHeaderStyle.closeIconSize,
+                              color: selectMode == SelectMode.select
+                                  ? Theme.of(context)
+                                      .colorScheme
+                                      .onSurfaceVariant
+                                  : Colors.transparent,
+                            ),
                           ),
-                          child: Icon(
-                            Icons.close,
-                            size: TwakeHeaderStyle.closeIconSize,
-                            color: selectMode == SelectMode.select
-                                ? Theme.of(context).colorScheme.onSurfaceVariant
-                                : Colors.transparent,
+                          ValueListenableBuilder(
+                            valueListenable: conversationSelectionNotifier,
+                            builder: (context, conversationSelection, _) {
+                              return Padding(
+                                padding:
+                                    TwakeHeaderStyle.counterSelectionPadding,
+                                child: Text(
+                                  conversationSelection.length.toString(),
+                                  style: Theme.of(context)
+                                      .textTheme
+                                      .bodyLarge
+                                      ?.copyWith(
+                                        color: selectMode == SelectMode.select
+                                            ? Theme.of(context)
+                                                .colorScheme
+                                                .onSurfaceVariant
+                                            : Colors.transparent,
+                                      ),
+                                ),
+                              );
+                            },
                           ),
-                        ),
-                        ValueListenableBuilder(
-                          valueListenable: conversationSelectionNotifier,
-                          builder: (context, conversationSelection, _) {
-                            return Padding(
-                              padding: TwakeHeaderStyle.counterSelectionPadding,
-                              child: Text(
-                                conversationSelection.length.toString(),
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .bodyLarge
-                                    ?.copyWith(
-                                      color: selectMode == SelectMode.select
-                                          ? Theme.of(context)
-                                              .colorScheme
-                                              .onSurfaceVariant
-                                          : Colors.transparent,
-                                    ),
-                              ),
-                            );
-                          },
-                        ),
-                      ],
+                        ],
+                      ),
                     ),
-                  ),
                   Expanded(
                     flex: TwakeHeaderStyle.flexTitle,
                     child: Align(

diff --git a/lib/widgets/twake_components/twake_preview_link/twake_link_view.dart b/lib/widgets/twake_components/twake_preview_link/twake_link_view.dart
@@ -58,18 +58,15 @@ class TwakeLinkView extends StatelessWidget {
   }
 
   Widget _buildCleanRichText(BuildContext context) {
-    return Padding(
-      padding: TwakeLinkViewStyle.paddingCleanRichText,
-      child: TwakeCleanRichText(
-        text: text,
-        childWidget: childWidget,
-        textStyle: textStyle,
-        linkStyle: linkStyle,
-        textAlign: textAlign ?? TextAlign.start,
-        onLinkTap: onLinkTap,
-        maxLines: maxLines,
-        textSpanBuilder: textSpanBuilder,
-      ),
+    return TwakeCleanRichText(
+      text: text,
+      childWidget: childWidget,
+      textStyle: textStyle,
+      linkStyle: linkStyle,
+      textAlign: textAlign ?? TextAlign.start,
+      onLinkTap: onLinkTap,
+      maxLines: maxLines,
+      textSpanBuilder: textSpanBuilder,
     );
   }
 }