TW-616 Refactor getSuccessOrNull

linagora · Sep 21, 2023 · edf7a2d · edf7a2d
1 parent 8a4d487
commit edf7a2d
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 28 deletions.
diff --git a/lib/app_state/success.dart b/lib/app_state/success.dart
@@ -1,5 +1,13 @@
+import 'package:dartz/dartz.dart';
 import 'package:equatable/equatable.dart';
 
 abstract class Success extends Equatable {
   const Success();
 }
+
+extension SuccessExtension on Either {
+  T? getSuccessOrNull<T extends Success>({T? fallbackValue}) => fold(
+        (failure) => fallbackValue,
+        (success) => success is T ? success : fallbackValue,
+      );
+}
diff --git a/lib/domain/app_state/room/chat_room_search_state.dart b/lib/domain/app_state/room/chat_room_search_state.dart
@@ -1,5 +1,3 @@
-import 'package:dartz/dartz.dart';
-
 import 'package:fluffychat/app_state/failure.dart';
 import 'package:fluffychat/app_state/initial.dart';
 import 'package:fluffychat/app_state/success.dart';
@@ -40,10 +38,3 @@ class ChatRoomSearchFailure extends Failure {
   @override
   List<Object?> get props => [exception];
 }
-
-extension ChatRoomSearchEitherExtension on Either {
-  ChatRoomSearchSuccess? getSuccessOrNull() => fold(
-        (failure) => null,
-        (success) => success is ChatRoomSearchSuccess ? success : null,
-      );
-}
diff --git a/lib/domain/app_state/room/timeline_search_event_state.dart b/lib/domain/app_state/room/timeline_search_event_state.dart
@@ -1,4 +1,3 @@
-import 'package:dartz/dartz.dart';
 import 'package:fluffychat/app_state/failure.dart';
 import 'package:fluffychat/app_state/success.dart';
 import 'package:matrix/matrix.dart';
@@ -33,10 +32,3 @@ extension TimelineSearchEventSuccessExtension on TimelineSearchEventSuccess {
     );
   }
 }
-
-extension TimelineSearchEventEitherExtension on Either {
-  TimelineSearchEventSuccess? getSuccessOrNull() => fold(
-        (failure) => null,
-        (success) => success is TimelineSearchEventSuccess ? success : null,
-      );
-}
diff --git a/lib/pages/chat/chat_room_search_mixin.dart b/lib/pages/chat/chat_room_search_mixin.dart
@@ -79,7 +79,7 @@ mixin ChatRoomSearchMixin {
         );
         searchStatus.value = event;
         _scrollToEvent(event);
-        canGoUp.value = event.getSuccessOrNull() != null;
+        canGoUp.value = event.getSuccessOrNull<ChatRoomSearchSuccess>() != null;
         canGoDown.value = false;
       },
     );
@@ -93,7 +93,7 @@ mixin ChatRoomSearchMixin {
   }
 
   void _scrollToEvent(Either<Failure, Success> event) {
-    final index = event.getSuccessOrNull()?.eventIndex;
+    final index = event.getSuccessOrNull<ChatRoomSearchSuccess>()?.eventIndex;
     if (index != null) {
       _scrollToIndex?.call(index);
     }
@@ -108,7 +108,8 @@ mixin ChatRoomSearchMixin {
   }
 
   void _goSearchResult(BuildContext context, {required Direction direction}) {
-    final lastSuccess = searchStatus.value.getSuccessOrNull();
+    final lastSuccess =
+        searchStatus.value.getSuccessOrNull<ChatRoomSearchSuccess>();
     final timeline = _getTimeline?.call();
     if (timeline == null || lastSuccess == null) return;
     _searchInteractor

diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart
@@ -1,3 +1,4 @@
+import 'package:fluffychat/app_state/success.dart';
 import 'package:fluffychat/domain/app_state/room/chat_room_search_state.dart';
 import 'package:fluffychat/pages/chat/chat.dart';
 import 'package:fluffychat/config/app_config.dart';
@@ -213,7 +214,9 @@ class MessageContent extends StatelessWidget {
                     return HtmlMessage(
                       event: event,
                       html: html,
-                      highlightText: searchStatus.getSuccessOrNull()?.keyword,
+                      highlightText: searchStatus
+                          .getSuccessOrNull<ChatRoomSearchSuccess>()
+                          ?.keyword,
                       defaultTextStyle:
                           Theme.of(context).textTheme.bodyLarge?.copyWith(
                                 // color: textColor,
@@ -323,8 +326,9 @@ class MessageContent extends StatelessWidget {
                 return ValueListenableBuilder(
                   valueListenable: controller.searchStatus,
                   builder: (context, searchStatus, child) {
-                    final highlightText =
-                        searchStatus.getSuccessOrNull()?.keyword;
+                    final highlightText = searchStatus
+                        .getSuccessOrNull<ChatRoomSearchSuccess>()
+                        ?.keyword;
                     return TwakeLinkPreview(
                       text: text,
                       textStyle:

diff --git a/lib/pages/chat_details/chat_details_page_view/links/chat_details_links_page.dart b/lib/pages/chat_details/chat_details_page_view/links/chat_details_links_page.dart
@@ -1,3 +1,4 @@
+import 'package:fluffychat/app_state/success.dart';
 import 'package:fluffychat/domain/app_state/room/timeline_search_event_state.dart';
 import 'package:fluffychat/pages/chat_details/chat_details_page_view/links/chat_details_links_style.dart';
 import 'package:fluffychat/utils/string_extension.dart';
@@ -23,7 +24,10 @@ class ChatDetailsLinksPage extends StatelessWidget {
       controller: eventsListController,
       getTimeline: getTimeline,
       builder: (context, eventsState) {
-        final events = eventsState.getSuccessOrNull()?.events ?? [];
+        final events = eventsState
+                .getSuccessOrNull<TimelineSearchEventSuccess>()
+                ?.events ??
+            [];
         return ListView.separated(
           itemCount: events.length,
           itemBuilder: (context, index) {

diff --git a/lib/pages/chat_details/chat_details_page_view/media/chat_details_media_page.dart b/lib/pages/chat_details/chat_details_page_view/media/chat_details_media_page.dart
@@ -1,3 +1,4 @@
+import 'package:fluffychat/app_state/success.dart';
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/domain/app_state/room/timeline_search_event_state.dart';
 import 'package:fluffychat/pages/chat_details/chat_details_page_view/media/chat_details_media_style.dart';
@@ -26,7 +27,10 @@ class ChatDetailsMediaPage extends StatelessWidget {
       controller: eventsListController,
       getTimeline: getTimeline,
       builder: (context, eventsState) {
-        final events = eventsState.getSuccessOrNull()?.events ?? [];
+        final events = eventsState
+                .getSuccessOrNull<TimelineSearchEventSuccess>()
+                ?.events ??
+            [];
         return CustomScrollView(
           slivers: [
             SliverGrid.builder(

diff --git a/lib/pages/chat_details/chat_details_page_view/same_type_events_list_controller.dart b/lib/pages/chat_details/chat_details_page_view/same_type_events_list_controller.dart
@@ -52,7 +52,8 @@ class SameTypeEventsListController {
   }
 
   void loadMore({required Future<Timeline> Function() getTimeline}) async {
-    final lastSuccess = eventsNotifier.value.getSuccessOrNull();
+    final lastSuccess =
+        eventsNotifier.value.getSuccessOrNull<TimelineSearchEventSuccess>();
     if (lastSuccess == null || lastSuccess.events.isEmpty) {
       refreshController.loadComplete();
       return;

diff --git a/lib/widgets/mxc_image.dart b/lib/widgets/mxc_image.dart
@@ -252,8 +252,8 @@ class _MxcImageState extends State<MxcImage>
               data,
               width: widget.width,
               height: widget.height,
-              cacheWidth: widget.width?.toInt(),
-              cacheHeight: widget.height?.toInt(),
+              cacheWidth: widget.event != null ? widget.width?.toInt() : null,
+              cacheHeight: widget.event != null ? widget.height?.toInt() : null,
               fit: widget.fit,
               filterQuality: FilterQuality.medium,
               errorBuilder: (context, __, ___) {