Fix after rebase

lichess-org · Jan 20, 2025 · 4ce1319 · 4ce1319
1 parent d21f982
commit 4ce1319
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 38 deletions.
diff --git a/lib/src/view/broadcast/broadcast_list_screen.dart b/lib/src/view/broadcast/broadcast_list_screen.dart
@@ -647,6 +647,7 @@ class BroadcastCarouselItem extends StatefulWidget {
             website: null,
             location: null,
             dates: null,
+            standings: null,
           ),
         ),
         round: BroadcastRound(

diff --git a/lib/src/view/watch/watch_tab_screen.dart b/lib/src/view/watch/watch_tab_screen.dart
@@ -212,43 +212,6 @@ class _BroadcastWidget extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-<<<<<<< HEAD
-    return broadcastList.when(
-      data: (data) {
-        if (data.active.isEmpty && data.past.isEmpty) {
-          return const SizedBox.shrink();
-        }
-        return Padding(
-          padding: Styles.sectionBottomPadding,
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: Styles.horizontalBodyPadding.add(const EdgeInsets.only(bottom: 8.0)),
-                child: Row(
-                  mainAxisSize: MainAxisSize.max,
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Flexible(
-                      child: Text(
-                        context.l10n.broadcastBroadcasts,
-                        style: Styles.sectionTitle,
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                    ),
-                    const SizedBox(width: 6.0),
-                    NoPaddingTextButton(
-                      onPressed: () {
-                        pushPlatformRoute(
-                          context,
-                          title: context.l10n.broadcastBroadcasts,
-                          builder: (context) => const BroadcastListScreen(),
-                        );
-                      },
-                      child: Text(context.l10n.more),
-                    ),
-                  ],
-=======
     final isTablet = isTabletOrLarger(context);
     final aspectRatio = isTablet ? 1.7 : 1.55;
 
@@ -269,7 +232,6 @@ class _BroadcastWidget extends ConsumerWidget {
                     style: Styles.sectionTitle,
                     overflow: TextOverflow.ellipsis,
                   ),
->>>>>>> 6fee30f9 (More wip on broadcast carousel)
                 ),
                 const SizedBox(width: 6.0),
                 NoPaddingTextButton(