Browse Source

EventCurrent: reuzenlogo weg, pagina scrolt, overflows opgelost

- AppBar: de placeholder-Image logo800px.png (width * 0.7) stond nog in
  FlexibleSpaceBar.background terwijl HeaderButtonsComponent in de title-slot
  zat. Die image is weg; de header ziet er nu uit als op elke andere pagina.
- Body: Column is Scrollable, dus de pagina scrolt. Daarvoor moesten de twee
  Expanded-kinderen weg -- onder een SingleChildScrollView is canFlex false en
  gooit een flex-kind een assertion.
- De Row met de gradient-kaart naast een Container van width * 0.6 is een
  Column geworden; op 411 dp viel de beschrijving daardoor volledig buiten
  beeld. De beschrijving staat nu op volle breedte onder de kaart.
- EvenementHorecagelegenheid heeft zijn eigen Expanded/tabs en kan dus niet in
  een scrollende ouder zonder begrensde hoogte; gewrapt in een Container van
  500 px. FlutterFlow weigerde de Expanded te verwijderen ("Invalid Action")
  tot die hoogte er stond.
- Knop "Alle evenementen" verwijderd (Bob: leek op een terugknop).

Getest met een profile-build op telefoon (411 dp) en tablet (1280 dp): pagina
scrolt, horeca-carousel compleet, geen overflow-strepen en geen RenderFlex in
logcat. dart analyze lib/: 0 errors. Bevat ook de link-styling (onderstreept,
secondary) uit Bob's parallelle sessie.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
bob 2 hours ago
parent
commit
00e5fb273f

+ 4 - 4
ios/Runner.xcodeproj/project.pbxproj

@@ -49,8 +49,8 @@
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		6436409E27A31CD500820AF7 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		6436409727A31CD900820AF7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		6436409827A31CD800820AF7 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		6436409C27A31CDC00820AF7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A9C17DEFA21738E5FBD7F54A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		B8285832C7E7A3262A5A897C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -317,8 +317,8 @@
 		6436409C27A31CD800820AF7 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				6436409E27A31CD500820AF7 /* nl */,
-				6436409727A31CD900820AF7 /* en */,
+				6436409827A31CD800820AF7 /* nl */,
+				6436409C27A31CDC00820AF7 /* en */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";

+ 28 - 0
lib/evenement/evenement_horecagelegenheid/evenement_horecagelegenheid_widget.dart

@@ -730,6 +730,8 @@ class _EvenementHorecagelegenheidWidgetState
                                                   .bodyMedium
                                                   .fontStyle,
                                         ),
+                                        color: FlutterFlowTheme.of(context)
+                                            .secondary,
                                         letterSpacing: 0.0,
                                         fontWeight: FlutterFlowTheme.of(context)
                                             .bodyMedium
@@ -737,6 +739,7 @@ class _EvenementHorecagelegenheidWidgetState
                                         fontStyle: FlutterFlowTheme.of(context)
                                             .bodyMedium
                                             .fontStyle,
+                                        decoration: TextDecoration.underline,
                                       ),
                                 ),
                               ),
@@ -966,6 +969,9 @@ class _EvenementHorecagelegenheidWidgetState
                                                             .bodyMedium
                                                             .fontStyle,
                                                   ),
+                                                  color: FlutterFlowTheme.of(
+                                                          context)
+                                                      .secondary,
                                                   letterSpacing: 0.0,
                                                   fontWeight:
                                                       FlutterFlowTheme.of(
@@ -977,6 +983,8 @@ class _EvenementHorecagelegenheidWidgetState
                                                               context)
                                                           .bodyMedium
                                                           .fontStyle,
+                                                  decoration:
+                                                      TextDecoration.underline,
                                                 ),
                                           ),
                                         ),
@@ -1027,6 +1035,9 @@ class _EvenementHorecagelegenheidWidgetState
                                                             .bodyMedium
                                                             .fontStyle,
                                                   ),
+                                                  color: FlutterFlowTheme.of(
+                                                          context)
+                                                      .secondary,
                                                   letterSpacing: 0.0,
                                                   fontWeight:
                                                       FlutterFlowTheme.of(
@@ -1038,6 +1049,8 @@ class _EvenementHorecagelegenheidWidgetState
                                                               context)
                                                           .bodyMedium
                                                           .fontStyle,
+                                                  decoration:
+                                                      TextDecoration.underline,
                                                 ),
                                           ),
                                         ),
@@ -1085,6 +1098,9 @@ class _EvenementHorecagelegenheidWidgetState
                                                             .bodyMedium
                                                             .fontStyle,
                                                   ),
+                                                  color: FlutterFlowTheme.of(
+                                                          context)
+                                                      .secondary,
                                                   letterSpacing: 0.0,
                                                   fontWeight:
                                                       FlutterFlowTheme.of(
@@ -1096,6 +1112,8 @@ class _EvenementHorecagelegenheidWidgetState
                                                               context)
                                                           .bodyMedium
                                                           .fontStyle,
+                                                  decoration:
+                                                      TextDecoration.underline,
                                                 ),
                                           ),
                                         ),
@@ -1146,6 +1164,9 @@ class _EvenementHorecagelegenheidWidgetState
                                                             .bodyMedium
                                                             .fontStyle,
                                                   ),
+                                                  color: FlutterFlowTheme.of(
+                                                          context)
+                                                      .secondary,
                                                   letterSpacing: 0.0,
                                                   fontWeight:
                                                       FlutterFlowTheme.of(
@@ -1157,6 +1178,8 @@ class _EvenementHorecagelegenheidWidgetState
                                                               context)
                                                           .bodyMedium
                                                           .fontStyle,
+                                                  decoration:
+                                                      TextDecoration.underline,
                                                 ),
                                           ),
                                         ),
@@ -1207,6 +1230,9 @@ class _EvenementHorecagelegenheidWidgetState
                                                             .bodyMedium
                                                             .fontStyle,
                                                   ),
+                                                  color: FlutterFlowTheme.of(
+                                                          context)
+                                                      .secondary,
                                                   letterSpacing: 0.0,
                                                   fontWeight:
                                                       FlutterFlowTheme.of(
@@ -1218,6 +1244,8 @@ class _EvenementHorecagelegenheidWidgetState
                                                               context)
                                                           .bodyMedium
                                                           .fontStyle,
+                                                  decoration:
+                                                      TextDecoration.underline,
                                                 ),
                                           ),
                                         ),

+ 4 - 4
lib/flutter_flow/internationalization.dart

@@ -284,10 +284,6 @@ final kTranslationsMap = <Map<String, Map<String, String>>>[
       'nl': 'Delen',
       'en': 'Share',
     },
-    '89l5y9jd': {
-      'nl': 'Alle evenementen',
-      'en': 'All events',
-    },
     '4qrjs6hg': {
       'nl': 'Home',
       'en': 'Home',
@@ -1096,6 +1092,10 @@ final kTranslationsMap = <Map<String, Map<String, String>>>[
       'nl': 'Gemeente volgen',
       'en': 'Add to favorites',
     },
+    'elx7kse2': {
+      'nl': 'Je volgt deze gemeente',
+      'en': 'Add to favorites',
+    },
     '24bdnkhi': {
       'nl':
           'Bij favoriete gemeenten krijg je een agenda per mail met daarin alle evenementen uit die favoriete gemeenten.',

+ 0 - 1
lib/horecagelegenhedenoverzicht/event_current/event_current_model.dart

@@ -10,7 +10,6 @@ import '/flutter_flow/flutter_flow_util.dart';
 import '/flutter_flow/flutter_flow_widgets.dart';
 import '/shared/drawer_component/drawer_component_widget.dart';
 import 'dart:ui';
-import '/index.dart';
 import 'event_current_widget.dart' show EventCurrentWidget;
 import 'package:aligned_tooltip/aligned_tooltip.dart';
 import 'package:carousel_slider/carousel_slider.dart';

+ 271 - 332
lib/horecagelegenhedenoverzicht/event_current/event_current_widget.dart

@@ -10,7 +10,6 @@ import '/flutter_flow/flutter_flow_util.dart';
 import '/flutter_flow/flutter_flow_widgets.dart';
 import '/shared/drawer_component/drawer_component_widget.dart';
 import 'dart:ui';
-import '/index.dart';
 import 'package:aligned_tooltip/aligned_tooltip.dart';
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:cached_network_image/cached_network_image.dart';
@@ -109,7 +108,6 @@ class _EventCurrentWidgetState extends State<EventCurrentWidget>
     DebugFlutterFlowModelContext.maybeOf(context)
         ?.parentModelCallback
         ?.call(_model);
-    context.watch<FFAppState>();
 
     return FutureBuilder<ApiCallResponse>(
       future: EvenementCall.call(
@@ -203,21 +201,7 @@ class _EventCurrentWidgetState extends State<EventCurrentWidget>
                       ],
                     ),
                   ),
-                  background: Align(
-                    alignment: AlignmentDirectional(0.0, 0.0),
-                    child: Padding(
-                      padding:
-                          EdgeInsetsDirectional.fromSTEB(100.0, 0.0, 15.0, 0.0),
-                      child: ClipRRect(
-                        borderRadius: BorderRadius.circular(8.0),
-                        child: Image.asset(
-                          'assets/images/logo800px.png',
-                          width: MediaQuery.sizeOf(context).width * 0.7,
-                          fit: BoxFit.fitWidth,
-                        ),
-                      ),
-                    ),
-                  ),
+                  background: Container(),
                   centerTitle: true,
                   expandedTitleScale: 1.0,
                 ),
@@ -227,115 +211,124 @@ class _EventCurrentWidgetState extends State<EventCurrentWidget>
             ),
             body: SafeArea(
               top: true,
-              child: Column(
-                mainAxisSize: MainAxisSize.max,
-                children: [
-                  Builder(
-                    builder: (context) {
-                      final fotoos = EvenementCall.eventFotoos(
-                            eventCurrentEvenementResponse.jsonBody,
-                          )?.toList() ??
-                          [];
-                      _model.debugGeneratorVariables[
-                              'fotoos${fotoos.length > 100 ? ' (first 100)' : ''}'] =
-                          debugSerializeParam(
-                        fotoos.take(100),
-                        ParamType.String,
-                        isList: true,
-                        link:
-                            'https://app.flutterflow.io/project/uitgaanskrant-1qhvtd?tab=uiBuilder&page=EventCurrent',
-                        name: 'String',
-                        nullable: false,
-                      );
-                      debugLogWidgetClass(_model);
+              child: SingleChildScrollView(
+                child: Column(
+                  mainAxisSize: MainAxisSize.max,
+                  children: [
+                    Builder(
+                      builder: (context) {
+                        final fotoos = EvenementCall.eventFotoos(
+                              eventCurrentEvenementResponse.jsonBody,
+                            )?.toList() ??
+                            [];
+                        _model.debugGeneratorVariables[
+                                'fotoos${fotoos.length > 100 ? ' (first 100)' : ''}'] =
+                            debugSerializeParam(
+                          fotoos.take(100),
+                          ParamType.String,
+                          isList: true,
+                          link:
+                              'https://app.flutterflow.io/project/uitgaanskrant-1qhvtd?tab=uiBuilder&page=EventCurrent',
+                          name: 'String',
+                          nullable: false,
+                        );
+                        debugLogWidgetClass(_model);
 
-                      return Container(
-                        width: double.infinity,
-                        height: 200.0,
-                        child: CarouselSlider.builder(
-                          itemCount: fotoos.length,
-                          itemBuilder: (context, fotoosIndex, _) {
-                            final fotoosItem = fotoos[fotoosIndex];
-                            return Builder(
-                              builder: (context) {
-                                if (fotoosItem != null && fotoosItem != '') {
-                                  return ClipRRect(
-                                    borderRadius: BorderRadius.circular(8.0),
-                                    child: OctoImage(
-                                      placeholderBuilder: (_) {
-                                        final blurHash =
-                                            'L6PZfSi_.AyE_3t7t7R**0o#DgR4';
+                        return Container(
+                          width: double.infinity,
+                          height: 200.0,
+                          child: CarouselSlider.builder(
+                            itemCount: fotoos.length,
+                            itemBuilder: (context, fotoosIndex, _) {
+                              final fotoosItem = fotoos[fotoosIndex];
+                              return Builder(
+                                builder: (context) {
+                                  if (fotoosItem != null && fotoosItem != '') {
+                                    return ClipRRect(
+                                      borderRadius: BorderRadius.circular(8.0),
+                                      child: OctoImage(
+                                        placeholderBuilder: (_) {
+                                          final blurHash =
+                                              'L6PZfSi_.AyE_3t7t7R**0o#DgR4';
 
-                                        if (!validateBlurhash(blurHash)) {
-                                          return const SizedBox.shrink();
-                                        }
-                                        return SizedBox.expand(
-                                          child: Image(
-                                            image: BlurHashImage(blurHash),
-                                            fit: BoxFit.cover,
-                                          ),
-                                        );
-                                      },
-                                      image: CachedNetworkImageProvider(
-                                        fotoosItem,
+                                          if (!validateBlurhash(blurHash)) {
+                                            return const SizedBox.shrink();
+                                          }
+                                          return SizedBox.expand(
+                                            child: Image(
+                                              image: BlurHashImage(blurHash),
+                                              fit: BoxFit.cover,
+                                            ),
+                                          );
+                                        },
+                                        image: CachedNetworkImageProvider(
+                                          fotoosItem,
+                                        ),
+                                        width: 200.0,
+                                        height: 200.0,
+                                        fit: BoxFit.cover,
                                       ),
-                                      width: 200.0,
-                                      height: 200.0,
-                                      fit: BoxFit.cover,
-                                    ),
-                                  );
-                                } else {
-                                  return Icon(
-                                    Icons.image_not_supported,
-                                    color: FlutterFlowTheme.of(context)
-                                        .primaryText,
-                                    size: 24.0,
-                                  );
-                                }
-                              },
-                            );
-                          },
-                          carouselController: _model.carouselController ??=
-                              CarouselSliderController(),
-                          options: CarouselOptions(
-                            initialPage: max(0, min(1, fotoos.length - 1)),
-                            viewportFraction: 0.5,
-                            disableCenter: true,
-                            enlargeCenterPage: true,
-                            enlargeFactor: 0.25,
-                            enableInfiniteScroll: true,
-                            scrollDirection: Axis.horizontal,
-                            autoPlay: false,
-                            onPageChanged: (index, _) =>
-                                _model.carouselCurrentIndex = index,
+                                    );
+                                  } else {
+                                    return Icon(
+                                      Icons.image_not_supported,
+                                      color: FlutterFlowTheme.of(context)
+                                          .primaryText,
+                                      size: 24.0,
+                                    );
+                                  }
+                                },
+                              );
+                            },
+                            carouselController: _model.carouselController ??=
+                                CarouselSliderController(),
+                            options: CarouselOptions(
+                              initialPage: max(0, min(1, fotoos.length - 1)),
+                              viewportFraction: 0.5,
+                              disableCenter: true,
+                              enlargeCenterPage: true,
+                              enlargeFactor: 0.25,
+                              enableInfiniteScroll: true,
+                              scrollDirection: Axis.horizontal,
+                              autoPlay: false,
+                              onPageChanged: (index, _) =>
+                                  _model.carouselCurrentIndex = index,
+                            ),
                           ),
-                        ),
-                      );
-                    },
-                  ),
-                  Row(
-                    mainAxisSize: MainAxisSize.max,
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      if (getJsonField(
-                            eventCurrentEvenementResponse.jsonBody,
-                            r'''$[0].title''',
-                          ) !=
-                          null)
-                        Padding(
-                          padding: EdgeInsetsDirectional.fromSTEB(
-                              0.0, 0.0, 8.0, 0.0),
-                          child: Text(
-                            valueOrDefault<String>(
-                              EvenementCall.eventTitle(
-                                eventCurrentEvenementResponse.jsonBody,
+                        );
+                      },
+                    ),
+                    Row(
+                      mainAxisSize: MainAxisSize.max,
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        if (getJsonField(
+                              eventCurrentEvenementResponse.jsonBody,
+                              r'''$[0].title''',
+                            ) !=
+                            null)
+                          Padding(
+                            padding: EdgeInsetsDirectional.fromSTEB(
+                                0.0, 0.0, 8.0, 0.0),
+                            child: Text(
+                              valueOrDefault<String>(
+                                EvenementCall.eventTitle(
+                                  eventCurrentEvenementResponse.jsonBody,
+                                ),
+                                'title',
                               ),
-                              'title',
-                            ),
-                            style: FlutterFlowTheme.of(context)
-                                .headlineLarge
-                                .override(
-                                  font: GoogleFonts.roboto(
+                              style: FlutterFlowTheme.of(context)
+                                  .headlineLarge
+                                  .override(
+                                    font: GoogleFonts.roboto(
+                                      fontWeight: FlutterFlowTheme.of(context)
+                                          .headlineLarge
+                                          .fontWeight,
+                                      fontStyle: FlutterFlowTheme.of(context)
+                                          .headlineLarge
+                                          .fontStyle,
+                                    ),
+                                    letterSpacing: 0.0,
                                     fontWeight: FlutterFlowTheme.of(context)
                                         .headlineLarge
                                         .fontWeight,
@@ -343,34 +336,19 @@ class _EventCurrentWidgetState extends State<EventCurrentWidget>
                                         .headlineLarge
                                         .fontStyle,
                                   ),
-                                  letterSpacing: 0.0,
-                                  fontWeight: FlutterFlowTheme.of(context)
-                                      .headlineLarge
-                                      .fontWeight,
-                                  fontStyle: FlutterFlowTheme.of(context)
-                                      .headlineLarge
-                                      .fontStyle,
-                                ),
-                          ),
-                        ),
-                      AlignedTooltip(
-                        content: Padding(
-                          padding: EdgeInsets.all(4.0),
-                          child: Text(
-                            FFLocalizations.of(context).getText(
-                              '2cyobro5' /* Delen */,
                             ),
-                            style:
-                                FlutterFlowTheme.of(context).bodyLarge.override(
-                                      font: GoogleFonts.roboto(
-                                        fontWeight: FlutterFlowTheme.of(context)
-                                            .bodyLarge
-                                            .fontWeight,
-                                        fontStyle: FlutterFlowTheme.of(context)
-                                            .bodyLarge
-                                            .fontStyle,
-                                      ),
-                                      letterSpacing: 0.0,
+                          ),
+                        AlignedTooltip(
+                          content: Padding(
+                            padding: EdgeInsets.all(4.0),
+                            child: Text(
+                              FFLocalizations.of(context).getText(
+                                '2cyobro5' /* Delen */,
+                              ),
+                              style: FlutterFlowTheme.of(context)
+                                  .bodyLarge
+                                  .override(
+                                    font: GoogleFonts.roboto(
                                       fontWeight: FlutterFlowTheme.of(context)
                                           .bodyLarge
                                           .fontWeight,
@@ -378,56 +356,72 @@ class _EventCurrentWidgetState extends State<EventCurrentWidget>
                                           .bodyLarge
                                           .fontStyle,
                                     ),
+                                    letterSpacing: 0.0,
+                                    fontWeight: FlutterFlowTheme.of(context)
+                                        .bodyLarge
+                                        .fontWeight,
+                                    fontStyle: FlutterFlowTheme.of(context)
+                                        .bodyLarge
+                                        .fontStyle,
+                                  ),
+                            ),
                           ),
-                        ),
-                        offset: 4.0,
-                        preferredDirection: AxisDirection.down,
-                        borderRadius: BorderRadius.circular(8.0),
-                        backgroundColor:
-                            FlutterFlowTheme.of(context).secondaryBackground,
-                        elevation: 4.0,
-                        tailBaseWidth: 24.0,
-                        tailLength: 12.0,
-                        waitDuration: Duration(milliseconds: 100),
-                        showDuration: Duration(milliseconds: 1500),
-                        triggerMode: TooltipTriggerMode.tap,
-                        child: Builder(
-                          builder: (context) => FlutterFlowIconButton(
-                            borderRadius: 8.0,
-                            buttonSize: 40.0,
-                            fillColor: Color(0xFFF265A0),
-                            icon: Icon(
-                              Icons.share,
-                              color: FlutterFlowTheme.of(context).info,
-                              size: 24.0,
+                          offset: 4.0,
+                          preferredDirection: AxisDirection.down,
+                          borderRadius: BorderRadius.circular(8.0),
+                          backgroundColor:
+                              FlutterFlowTheme.of(context).secondaryBackground,
+                          elevation: 4.0,
+                          tailBaseWidth: 24.0,
+                          tailLength: 12.0,
+                          waitDuration: Duration(milliseconds: 100),
+                          showDuration: Duration(milliseconds: 1500),
+                          triggerMode: TooltipTriggerMode.tap,
+                          child: Builder(
+                            builder: (context) => FlutterFlowIconButton(
+                              borderRadius: 8.0,
+                              buttonSize: 40.0,
+                              fillColor: Color(0xFFF265A0),
+                              icon: Icon(
+                                Icons.share,
+                                color: FlutterFlowTheme.of(context).info,
+                                size: 24.0,
+                              ),
+                              onPressed: () async {
+                                await Share.share(
+                                  'https://uitgk.com/${widget!.nid}',
+                                  sharePositionOrigin:
+                                      getWidgetBoundingBox(context),
+                                );
+                              },
                             ),
-                            onPressed: () async {
-                              await Share.share(
-                                'https://uitgk.com/${widget!.nid}',
-                                sharePositionOrigin:
-                                    getWidgetBoundingBox(context),
-                              );
-                            },
                           ),
                         ),
-                      ),
-                    ],
-                  ),
-                  if (getJsonField(
-                        eventCurrentEvenementResponse.jsonBody,
-                        r'''$[0].datum''',
-                      ) !=
-                      null)
-                    Text(
-                      valueOrDefault<String>(
-                        EvenementCall.eventDate(
+                      ],
+                    ),
+                    if (getJsonField(
                           eventCurrentEvenementResponse.jsonBody,
+                          r'''$[0].datum''',
+                        ) !=
+                        null)
+                      Text(
+                        valueOrDefault<String>(
+                          EvenementCall.eventDate(
+                            eventCurrentEvenementResponse.jsonBody,
+                          ),
+                          'date',
                         ),
-                        'date',
-                      ),
-                      style:
-                          FlutterFlowTheme.of(context).headlineSmall.override(
-                                font: GoogleFonts.roboto(
+                        style:
+                            FlutterFlowTheme.of(context).headlineSmall.override(
+                                  font: GoogleFonts.roboto(
+                                    fontWeight: FlutterFlowTheme.of(context)
+                                        .headlineSmall
+                                        .fontWeight,
+                                    fontStyle: FlutterFlowTheme.of(context)
+                                        .headlineSmall
+                                        .fontStyle,
+                                  ),
+                                  letterSpacing: 0.0,
                                   fontWeight: FlutterFlowTheme.of(context)
                                       .headlineSmall
                                       .fontWeight,
@@ -435,18 +429,9 @@ class _EventCurrentWidgetState extends State<EventCurrentWidget>
                                       .headlineSmall
                                       .fontStyle,
                                 ),
-                                letterSpacing: 0.0,
-                                fontWeight: FlutterFlowTheme.of(context)
-                                    .headlineSmall
-                                    .fontWeight,
-                                fontStyle: FlutterFlowTheme.of(context)
-                                    .headlineSmall
-                                    .fontStyle,
-                              ),
-                    ),
-                  Expanded(
-                    child: Row(
-                      mainAxisSize: MainAxisSize.max,
+                      ),
+                    Column(
+                      mainAxisSize: MainAxisSize.min,
                       children: [
                         Material(
                           color: Colors.transparent,
@@ -474,7 +459,7 @@ class _EventCurrentWidgetState extends State<EventCurrentWidget>
                               ),
                             ),
                             child: Column(
-                              mainAxisSize: MainAxisSize.max,
+                              mainAxisSize: MainAxisSize.min,
                               children: [
                                 Padding(
                                   padding: EdgeInsetsDirectional.fromSTEB(
@@ -652,69 +637,67 @@ class _EventCurrentWidgetState extends State<EventCurrentWidget>
                                     }
                                   },
                                 ),
-                                Expanded(
-                                  child: wrapWithModel(
-                                    model: _model.evenementInfoModel,
-                                    updateCallback: () => safeSetState(() {}),
-                                    child: Builder(builder: (_) {
-                                      return DebugFlutterFlowModelContext(
-                                        rootModel: _model.rootModel,
-                                        child: EvenementInfoWidget(
-                                          nid: EvenementCall.eventNid(
-                                            eventCurrentEvenementResponse
-                                                .jsonBody,
-                                          ),
-                                          title: EvenementCall.eventTitle(
-                                            eventCurrentEvenementResponse
-                                                .jsonBody,
-                                          ),
-                                          date: EvenementCall.eventDate(
-                                            eventCurrentEvenementResponse
-                                                .jsonBody,
-                                          ),
-                                          adres: EvenementCall.eventAdres(
-                                            eventCurrentEvenementResponse
-                                                .jsonBody,
-                                          ),
-                                          plaats: EvenementCall.eventPlaats(
-                                            eventCurrentEvenementResponse
-                                                .jsonBody,
-                                          ),
-                                          entreetoelichting: EvenementCall
-                                              .eventEntreeToelichting(
-                                            eventCurrentEvenementResponse
-                                                .jsonBody,
-                                          ),
-                                          entreeprijs:
-                                              EvenementCall.eventEntreeprijs(
-                                            eventCurrentEvenementResponse
-                                                .jsonBody,
-                                          ),
-                                          website: EvenementCall.eventWebsiteg(
-                                            eventCurrentEvenementResponse
-                                                .jsonBody,
-                                          ),
-                                          contact: EvenementCall.eventContact(
-                                            eventCurrentEvenementResponse
-                                                .jsonBody,
-                                          ),
-                                          logo: EvenementCall.eventLogog(
-                                            eventCurrentEvenementResponse
-                                                .jsonBody,
-                                          ),
-                                          fotoos: EvenementCall.eventFotoos(
-                                            eventCurrentEvenementResponse
-                                                .jsonBody,
-                                          ),
-                                          categories:
-                                              EvenementCall.eventCategorie(
-                                            eventCurrentEvenementResponse
-                                                .jsonBody,
-                                          ),
+                                wrapWithModel(
+                                  model: _model.evenementInfoModel,
+                                  updateCallback: () => safeSetState(() {}),
+                                  child: Builder(builder: (_) {
+                                    return DebugFlutterFlowModelContext(
+                                      rootModel: _model.rootModel,
+                                      child: EvenementInfoWidget(
+                                        nid: EvenementCall.eventNid(
+                                          eventCurrentEvenementResponse
+                                              .jsonBody,
                                         ),
-                                      );
-                                    }),
-                                  ),
+                                        title: EvenementCall.eventTitle(
+                                          eventCurrentEvenementResponse
+                                              .jsonBody,
+                                        ),
+                                        date: EvenementCall.eventDate(
+                                          eventCurrentEvenementResponse
+                                              .jsonBody,
+                                        ),
+                                        adres: EvenementCall.eventAdres(
+                                          eventCurrentEvenementResponse
+                                              .jsonBody,
+                                        ),
+                                        plaats: EvenementCall.eventPlaats(
+                                          eventCurrentEvenementResponse
+                                              .jsonBody,
+                                        ),
+                                        entreetoelichting: EvenementCall
+                                            .eventEntreeToelichting(
+                                          eventCurrentEvenementResponse
+                                              .jsonBody,
+                                        ),
+                                        entreeprijs:
+                                            EvenementCall.eventEntreeprijs(
+                                          eventCurrentEvenementResponse
+                                              .jsonBody,
+                                        ),
+                                        website: EvenementCall.eventWebsiteg(
+                                          eventCurrentEvenementResponse
+                                              .jsonBody,
+                                        ),
+                                        contact: EvenementCall.eventContact(
+                                          eventCurrentEvenementResponse
+                                              .jsonBody,
+                                        ),
+                                        logo: EvenementCall.eventLogog(
+                                          eventCurrentEvenementResponse
+                                              .jsonBody,
+                                        ),
+                                        fotoos: EvenementCall.eventFotoos(
+                                          eventCurrentEvenementResponse
+                                              .jsonBody,
+                                        ),
+                                        categories:
+                                            EvenementCall.eventCategorie(
+                                          eventCurrentEvenementResponse
+                                              .jsonBody,
+                                        ),
+                                      ),
+                                    );
+                                  }),
                                 ),
                                 wrapWithModel(
                                   model: _model.googleMapsIconButtonModel,
@@ -744,7 +727,7 @@ class _EventCurrentWidgetState extends State<EventCurrentWidget>
                             mainAxisSize: MainAxisSize.max,
                             children: [
                               Container(
-                                width: MediaQuery.sizeOf(context).width * 0.6,
+                                width: MediaQuery.sizeOf(context).width * 1.0,
                                 decoration: BoxDecoration(
                                   color: FlutterFlowTheme.of(context).alternate,
                                   boxShadow: [
@@ -783,72 +766,28 @@ class _EventCurrentWidgetState extends State<EventCurrentWidget>
                         ),
                       ],
                     ),
-                  ),
-                  if (widget!.horecaid != null && widget!.horecaid != '')
-                    Expanded(
-                      child: wrapWithModel(
-                        model: _model.evenementHorecagelegenheidModel,
-                        updateCallback: () => safeSetState(() {}),
-                        child: Builder(builder: (_) {
-                          return DebugFlutterFlowModelContext(
-                            rootModel: _model.rootModel,
-                            child: EvenementHorecagelegenheidWidget(
-                              establishmentID: widget!.horecaid!,
-                            ),
-                          );
-                        }),
-                      ),
-                    ),
-                  FFButtonWidget(
-                    onPressed: () async {
-                      context.pushNamed(
-                        PUitgaanPageWidget.routeName,
-                        queryParameters: {
-                          'plaats': serializeParam(
-                            FFAppState().gemeenteSelectId,
-                            ParamType.String,
-                          ),
-                          'services': serializeParam(
-                            'services_1',
-                            ParamType.String,
-                          ),
-                        }.withoutNulls,
-                      );
-                    },
-                    text: FFLocalizations.of(context).getText(
-                      '89l5y9jd' /* Alle evenementen */,
-                    ),
-                    options: FFButtonOptions(
-                      height: 40.0,
-                      padding:
-                          EdgeInsetsDirectional.fromSTEB(16.0, 0.0, 16.0, 0.0),
-                      iconPadding:
-                          EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 0.0),
-                      color: FlutterFlowTheme.of(context).secondary,
-                      textStyle:
-                          FlutterFlowTheme.of(context).titleSmall.override(
-                                font: GoogleFonts.roboto(
-                                  fontWeight: FlutterFlowTheme.of(context)
-                                      .titleSmall
-                                      .fontWeight,
-                                  fontStyle: FlutterFlowTheme.of(context)
-                                      .titleSmall
-                                      .fontStyle,
-                                ),
-                                color: Colors.white,
-                                letterSpacing: 0.0,
-                                fontWeight: FlutterFlowTheme.of(context)
-                                    .titleSmall
-                                    .fontWeight,
-                                fontStyle: FlutterFlowTheme.of(context)
-                                    .titleSmall
-                                    .fontStyle,
+                    Container(
+                      height: 500.0,
+                      decoration: BoxDecoration(),
+                      child: Visibility(
+                        visible:
+                            widget!.horecaid != null && widget!.horecaid != '',
+                        child: wrapWithModel(
+                          model: _model.evenementHorecagelegenheidModel,
+                          updateCallback: () => safeSetState(() {}),
+                          child: Builder(builder: (_) {
+                            return DebugFlutterFlowModelContext(
+                              rootModel: _model.rootModel,
+                              child: EvenementHorecagelegenheidWidget(
+                                establishmentID: widget!.horecaid!,
                               ),
-                      elevation: 0.0,
-                      borderRadius: BorderRadius.circular(8.0),
+                            );
+                          }),
+                        ),
+                      ),
                     ),
-                  ),
-                ],
+                  ],
+                ),
               ),
             ),
           ),

+ 30 - 0
lib/horecagelegenhedenoverzicht/horecagelegenheid_current/horecagelegenheid_current_widget.dart

@@ -993,6 +993,9 @@ class _HorecagelegenheidCurrentWidgetState
                                                         .bodyMedium
                                                         .fontStyle,
                                               ),
+                                              color:
+                                                  FlutterFlowTheme.of(context)
+                                                      .secondary,
                                               letterSpacing: 0.0,
                                               fontWeight:
                                                   FlutterFlowTheme.of(context)
@@ -1002,6 +1005,8 @@ class _HorecagelegenheidCurrentWidgetState
                                                   FlutterFlowTheme.of(context)
                                                       .bodyMedium
                                                       .fontStyle,
+                                              decoration:
+                                                  TextDecoration.underline,
                                             ),
                                       ),
                                     ),
@@ -1048,6 +1053,9 @@ class _HorecagelegenheidCurrentWidgetState
                                                         .bodyMedium
                                                         .fontStyle,
                                               ),
+                                              color:
+                                                  FlutterFlowTheme.of(context)
+                                                      .secondary,
                                               letterSpacing: 0.0,
                                               fontWeight:
                                                   FlutterFlowTheme.of(context)
@@ -1057,6 +1065,8 @@ class _HorecagelegenheidCurrentWidgetState
                                                   FlutterFlowTheme.of(context)
                                                       .bodyMedium
                                                       .fontStyle,
+                                              decoration:
+                                                  TextDecoration.underline,
                                             ),
                                       ),
                                     ),
@@ -1103,6 +1113,9 @@ class _HorecagelegenheidCurrentWidgetState
                                                         .bodyMedium
                                                         .fontStyle,
                                               ),
+                                              color:
+                                                  FlutterFlowTheme.of(context)
+                                                      .secondary,
                                               letterSpacing: 0.0,
                                               fontWeight:
                                                   FlutterFlowTheme.of(context)
@@ -1112,6 +1125,8 @@ class _HorecagelegenheidCurrentWidgetState
                                                   FlutterFlowTheme.of(context)
                                                       .bodyMedium
                                                       .fontStyle,
+                                              decoration:
+                                                  TextDecoration.underline,
                                             ),
                                       ),
                                     ),
@@ -1158,6 +1173,9 @@ class _HorecagelegenheidCurrentWidgetState
                                                         .bodyMedium
                                                         .fontStyle,
                                               ),
+                                              color:
+                                                  FlutterFlowTheme.of(context)
+                                                      .secondary,
                                               letterSpacing: 0.0,
                                               fontWeight:
                                                   FlutterFlowTheme.of(context)
@@ -1167,6 +1185,8 @@ class _HorecagelegenheidCurrentWidgetState
                                                   FlutterFlowTheme.of(context)
                                                       .bodyMedium
                                                       .fontStyle,
+                                              decoration:
+                                                  TextDecoration.underline,
                                             ),
                                       ),
                                     ),
@@ -1213,6 +1233,9 @@ class _HorecagelegenheidCurrentWidgetState
                                                         .bodyMedium
                                                         .fontStyle,
                                               ),
+                                              color:
+                                                  FlutterFlowTheme.of(context)
+                                                      .secondary,
                                               letterSpacing: 0.0,
                                               fontWeight:
                                                   FlutterFlowTheme.of(context)
@@ -1222,6 +1245,8 @@ class _HorecagelegenheidCurrentWidgetState
                                                   FlutterFlowTheme.of(context)
                                                       .bodyMedium
                                                       .fontStyle,
+                                              decoration:
+                                                  TextDecoration.underline,
                                             ),
                                       ),
                                     ),
@@ -1312,6 +1337,9 @@ class _HorecagelegenheidCurrentWidgetState
                                                         .bodyMedium
                                                         .fontStyle,
                                               ),
+                                              color:
+                                                  FlutterFlowTheme.of(context)
+                                                      .secondary,
                                               letterSpacing: 0.0,
                                               fontWeight:
                                                   FlutterFlowTheme.of(context)
@@ -1321,6 +1349,8 @@ class _HorecagelegenheidCurrentWidgetState
                                                   FlutterFlowTheme.of(context)
                                                       .bodyMedium
                                                       .fontStyle,
+                                              decoration:
+                                                  TextDecoration.underline,
                                             ),
                                       ),
                                     ),

+ 22 - 0
lib/selecteer_plaats/select_state_drop_down_component/select_state_drop_down_component_widget.dart

@@ -368,6 +368,28 @@ class _SelectStateDropDownComponentWidgetState
                                   .fontStyle,
                             ),
                       ),
+                      Text(
+                        FFLocalizations.of(context).getText(
+                          'elx7kse2' /* Je volgt deze gemeente */,
+                        ),
+                        style: FlutterFlowTheme.of(context).bodyMedium.override(
+                              font: GoogleFonts.roboto(
+                                fontWeight: FlutterFlowTheme.of(context)
+                                    .bodyMedium
+                                    .fontWeight,
+                                fontStyle: FlutterFlowTheme.of(context)
+                                    .bodyMedium
+                                    .fontStyle,
+                              ),
+                              letterSpacing: 0.0,
+                              fontWeight: FlutterFlowTheme.of(context)
+                                  .bodyMedium
+                                  .fontWeight,
+                              fontStyle: FlutterFlowTheme.of(context)
+                                  .bodyMedium
+                                  .fontStyle,
+                            ),
+                      ),
                       Builder(
                         builder: (context) {
                           if (FFAppState()