Merge remote-tracking branch 'origin/main' into fix/health-probe-logic

Author: saibatizoku

catalyst_voices/apps/voices/lib/pages/discovery/sections/current_campaign.dart

@@ -44,7 +44,7 @@ class CurrentCampaign extends StatelessWidget {
           ),
         ),
         Padding(
-          padding: const EdgeInsets.only(top: 32, bottom: 160),
+          padding: const EdgeInsets.only(top: 32, bottom: 100),
           child: CampaignTimeline(
             timelineItems: CampaignTimelineViewModelX.mockData,
             placement: CampaignTimelinePlacement.discovery,

catalyst_voices/apps/voices/lib/pages/discovery/state_selectors/most_recent_proposals_selector.dart

@@ -49,15 +49,15 @@ class _MostRecentProposalsError extends StatelessWidget {
     return BlocSelector<DiscoveryCubit, DiscoveryState, VisibilityState>(
       selector: (state) {
         return (
-          show: state.currentCampaign.showError,
-          error: state.currentCampaign.error,
+          show: state.mostRecentProposals.showError,
+          error: state.mostRecentProposals.error,
         );
       },
       builder: (context, state) {
         final errorMessage = state.error?.message(context);
         return Offstage(
           key: const Key('MostRecentError'),
-          offstage: state.show,
+          offstage: !state.show,
           child: Padding(
             padding: const EdgeInsets.all(16),
             child: Center(

catalyst_voices/apps/voices/lib/pages/overall_spaces/brands_navigation.dart

@@ -1,4 +1,6 @@
 import 'package:catalyst_voices/common/ext/brand_ext.dart';
+import 'package:catalyst_voices/common/ext/build_context_ext.dart';
+import 'package:catalyst_voices/widgets/common/affix_decorator.dart';
 import 'package:catalyst_voices/widgets/widgets.dart';
 import 'package:catalyst_voices_assets/catalyst_voices_assets.dart';
 import 'package:catalyst_voices_brands/catalyst_voices_brands.dart';
@@ -20,6 +22,7 @@ class BrandsNavigation extends StatelessWidget {
       padding: const EdgeInsets.symmetric(vertical: 8),
       child: Column(
         mainAxisSize: MainAxisSize.max,
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           ...Brand.values.map(
             (brand) {
@@ -35,59 +38,26 @@ class BrandsNavigation extends StatelessWidget {
             indent: 0,
             endIndent: 0,
           ),
-          const _SearchTile(),
-          const _TasksTile(),
+          const _SpacesTile(),
+          const _OpportunitiesTile(),
         ],
       ),
     );
   }
 }
 
-class _BrandTile extends StatelessWidget {
-  final Brand brand;
-  final VoidCallback? onTap;
-
-  const _BrandTile(
-    this.brand, {
-    super.key,
-    this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    final isCurrent = theme.brandAssets.brand == brand;
-
-    return _BrandsNavigationTile(
-      onTap: onTap,
-      isSelected: isCurrent,
-      leading: brand.logoIcon(context).buildIcon(allowColorFilter: false),
-      content: Text(brand.localizedName(context.l10n)),
-    );
-  }
-}
+final class _BackgroundColor implements WidgetStateProperty<Color?> {
+  final VoicesColorScheme colors;
 
-class _SearchTile extends StatelessWidget {
-  const _SearchTile();
+  _BackgroundColor(this.colors);
 
   @override
-  Widget build(BuildContext context) {
-    return _BrandsNavigationTile(
-      leading: VoicesAssets.icons.search.buildIcon(),
-      content: Text(context.l10n.overallSpacesSearchBrands),
-    );
-  }
-}
-
-class _TasksTile extends StatelessWidget {
-  const _TasksTile();
+  Color? resolve(Set<WidgetState> states) {
+    if (states.contains(WidgetState.selected)) {
+      return colors.onSurfacePrimaryContainer.withValues(alpha: 0.12);
+    }
 
-  @override
-  Widget build(BuildContext context) {
-    return _BrandsNavigationTile(
-      leading: VoicesAssets.icons.collection.buildIcon(),
-      content: Text(context.l10n.overallSpacesTasks),
-    );
+    return Colors.transparent;
   }
 }
 
@@ -158,18 +128,32 @@ class _BrandsNavigationTile extends StatelessWidget {
   }
 }
 
-final class _BackgroundColor implements WidgetStateProperty<Color?> {
-  final VoicesColorScheme colors;
+class _BrandTile extends StatelessWidget {
+  final Brand brand;
+  final VoidCallback? onTap;
 
-  _BackgroundColor(this.colors);
+  const _BrandTile(
+    this.brand, {
+    super.key,
+    this.onTap,
+  });
 
   @override
-  Color? resolve(Set<WidgetState> states) {
-    if (states.contains(WidgetState.selected)) {
-      return colors.onSurfacePrimaryContainer.withValues(alpha: 0.12);
-    }
-
-    return Colors.transparent;
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(
+        horizontal: 12,
+        vertical: 8,
+      ),
+      child: AffixDecorator(
+        prefix: brand.logoIcon(context).buildIcon(allowColorFilter: false),
+        child: Text(
+          brand.localizedName(context.l10n),
+          style: context.textTheme.titleMedium
+              ?.copyWith(color: context.colorScheme.primary),
+        ),
+      ),
+    );
   }
 }
 
@@ -187,3 +171,29 @@ final class _ForegroundColor implements WidgetStateProperty<Color?> {
     return colors.textOnPrimaryLevel0;
   }
 }
+
+class _OpportunitiesTile extends StatelessWidget {
+  const _OpportunitiesTile();
+
+  @override
+  Widget build(BuildContext context) {
+    return _BrandsNavigationTile(
+      leading: VoicesAssets.icons.collection.buildIcon(),
+      content: Text(context.l10n.opportunities),
+    );
+  }
+}
+
+class _SpacesTile extends StatelessWidget {
+  const _SpacesTile();
+
+  @override
+  Widget build(BuildContext context) {
+    return _BrandsNavigationTile(
+      isSelected: true,
+      leading: VoicesAssets.icons.viewGrid.buildIcon(),
+      content: Text(context.l10n.spaces),
+      onTap: () {},
+    );
+  }
+}

catalyst_voices/apps/voices/lib/pages/overall_spaces/overall_spaces_page.dart

@@ -1,7 +1,6 @@
 import 'package:catalyst_voices/pages/overall_spaces/back_fab.dart';
 import 'package:catalyst_voices/pages/overall_spaces/brands_navigation.dart';
 import 'package:catalyst_voices/pages/overall_spaces/spaces_overview_list_view.dart';
-import 'package:catalyst_voices/pages/overall_spaces/update_ready.dart';
 import 'package:flutter/material.dart';
 
 class OverallSpacesPage extends StatelessWidget {
@@ -38,8 +37,6 @@ class _Navigation extends StatelessWidget {
         children: [
           BrandsNavigation(),
           Spacer(),
-          UpdateReady(),
-          SizedBox(height: 20),
           Align(
             alignment: Alignment.centerLeft,
             child: BackFab(),