Procházet zdrojové kódy

Fix text overflow in table card, remove title shadow, standardize Event page header

- UitgaantabelKaartComponent: wrap horeca-naam, adres and datum texts in
  Flexible to prevent overflow on long values (same fix as the slider
  card).
- PUitgaanSliderKaartComponent: remove the drop shadow on the card title
  for a cleaner look.
- HeaderCurrent (used only by the Event page): replace the hamburger-only
  icon with the shared HeaderButtonsComponent (drawer + back), matching
  the header on every other page. No other page uses HeaderCurrent, so
  this is scoped to Event only.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
bob před 1 měsícem
rodič
revize
12d96230fb

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

@@ -44,8 +44,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>"; };
-		6436409027A31CD600820AF7 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		6436409927A31CD600820AF7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		6436409627A31CD400820AF7 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		6436409327A31CDB00820AF7 /* 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>"; };
 /* End PBXFileReference section */
 
@@ -225,8 +225,8 @@
 		6436409C27A31CD800820AF7 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				6436409027A31CD600820AF7 /* nl */,
-				6436409927A31CD600820AF7 /* en */,
+				6436409627A31CD400820AF7 /* nl */,
+				6436409327A31CDB00820AF7 /* en */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";

+ 16 - 2
lib/shared/header_current/header_current_model.dart

@@ -1,6 +1,8 @@
+import '/components/header_buttons_component_widget.dart';
 import '/flutter_flow/flutter_flow_theme.dart';
 import '/flutter_flow/flutter_flow_util.dart';
 import '/flutter_flow/flutter_flow_widgets.dart';
+import 'dart:ui';
 import 'header_current_widget.dart' show HeaderCurrentWidget;
 import 'package:flutter/material.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
@@ -8,20 +10,32 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:provider/provider.dart';
 
 class HeaderCurrentModel extends FlutterFlowModel<HeaderCurrentWidget> {
+  ///  State fields for stateful widgets in this component.
+
+  // Model for HeaderButtonsComponent component.
+  late HeaderButtonsComponentModel headerButtonsComponentModel;
+
   final Map<String, DebugDataField> debugGeneratorVariables = {};
   final Map<String, DebugDataField> debugBackendQueries = {};
   final Map<String, FlutterFlowModel> widgetBuilderComponents = {};
   @override
-  void initState(BuildContext context) {}
+  void initState(BuildContext context) {
+    headerButtonsComponentModel =
+        createModel(context, () => HeaderButtonsComponentModel());
+  }
 
   @override
-  void dispose() {}
+  void dispose() {
+    headerButtonsComponentModel.dispose();
+  }
 
   @override
   WidgetClassDebugData toWidgetClassDebugData() => WidgetClassDebugData(
         generatorVariables: debugGeneratorVariables.entries,
         backendQueries: debugBackendQueries.entries,
         componentStates: {
+          'headerButtonsComponentModel (HeaderButtonsComponent)':
+              headerButtonsComponentModel?.toWidgetClassDebugData(),
           ...widgetBuilderComponents.map(
             (key, value) => MapEntry(
               key,

+ 18 - 13
lib/shared/header_current/header_current_widget.dart

@@ -1,6 +1,8 @@
+import '/components/header_buttons_component_widget.dart';
 import '/flutter_flow/flutter_flow_theme.dart';
 import '/flutter_flow/flutter_flow_util.dart';
 import '/flutter_flow/flutter_flow_widgets.dart';
+import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:google_fonts/google_fonts.dart';
@@ -93,19 +95,22 @@ class _HeaderCurrentWidgetState extends State<HeaderCurrentWidget>
       child: AppBar(
         backgroundColor: Colors.white,
         automaticallyImplyLeading: true,
-        leading: InkWell(
-          splashColor: Colors.transparent,
-          focusColor: Colors.transparent,
-          hoverColor: Colors.transparent,
-          highlightColor: Colors.transparent,
-          onTap: () async {
-            Navigator.pop(context);
-          },
-          child: Icon(
-            Icons.menu,
-            color: FlutterFlowTheme.of(context).primaryText,
-            size: 36.0,
-          ),
+        leading: Row(
+          mainAxisSize: MainAxisSize.max,
+          children: [
+            Expanded(
+              child: wrapWithModel(
+                model: _model.headerButtonsComponentModel,
+                updateCallback: () => safeSetState(() {}),
+                child: Builder(builder: (_) {
+                  return DebugFlutterFlowModelContext(
+                    rootModel: _model.rootModel,
+                    child: HeaderButtonsComponentWidget(),
+                  );
+                }),
+              ),
+            ),
+          ],
         ),
         title: Padding(
           padding: EdgeInsetsDirectional.fromSTEB(0.0, 2.0, 0.0, 2.0),

+ 2 - 2
lib/uitgaanspaginas/p_uitgaan_slider_kaart_component/p_uitgaan_slider_kaart_component_widget.dart

@@ -263,8 +263,8 @@ class _PUitgaanSliderKaartComponentWidgetState
                           shadows: [
                             Shadow(
                               color: FlutterFlowTheme.of(context).secondaryText,
-                              offset: Offset(2.0, 2.0),
-                              blurRadius: 2.0,
+                              offset: Offset(0.0, 0.0),
+                              blurRadius: 0.0,
                             )
                           ],
                         ),

+ 69 - 57
lib/uitgaanspaginas/uitgaantabel_kaart_component/uitgaantabel_kaart_component_widget.dart

@@ -367,15 +367,28 @@ class _UitgaantabelKaartComponentWidgetState
                                             size: 20.0,
                                           ),
                                         ),
-                                        Text(
-                                          getJsonField(
-                                            evenementenItem,
-                                            r'''$.horecagelegenheid''',
-                                          ).toString(),
-                                          style: FlutterFlowTheme.of(context)
-                                              .bodySmall
-                                              .override(
-                                                font: GoogleFonts.inter(
+                                        Flexible(
+                                          child: Text(
+                                            getJsonField(
+                                              evenementenItem,
+                                              r'''$.horecagelegenheid''',
+                                            ).toString(),
+                                            style: FlutterFlowTheme.of(context)
+                                                .bodySmall
+                                                .override(
+                                                  font: GoogleFonts.inter(
+                                                    fontWeight:
+                                                        FlutterFlowTheme.of(
+                                                                context)
+                                                            .bodySmall
+                                                            .fontWeight,
+                                                    fontStyle:
+                                                        FlutterFlowTheme.of(
+                                                                context)
+                                                            .bodySmall
+                                                            .fontStyle,
+                                                  ),
+                                                  letterSpacing: 0.0,
                                                   fontWeight:
                                                       FlutterFlowTheme.of(
                                                               context)
@@ -387,16 +400,7 @@ class _UitgaantabelKaartComponentWidgetState
                                                           .bodySmall
                                                           .fontStyle,
                                                 ),
-                                                letterSpacing: 0.0,
-                                                fontWeight:
-                                                    FlutterFlowTheme.of(context)
-                                                        .bodySmall
-                                                        .fontWeight,
-                                                fontStyle:
-                                                    FlutterFlowTheme.of(context)
-                                                        .bodySmall
-                                                        .fontStyle,
-                                              ),
+                                          ),
                                         ),
                                       ],
                                     ),
@@ -414,15 +418,28 @@ class _UitgaantabelKaartComponentWidgetState
                                             size: 20.0,
                                           ),
                                         ),
-                                        Text(
-                                          getJsonField(
-                                            evenementenItem,
-                                            r'''$.adres''',
-                                          ).toString(),
-                                          style: FlutterFlowTheme.of(context)
-                                              .bodySmall
-                                              .override(
-                                                font: GoogleFonts.inter(
+                                        Flexible(
+                                          child: Text(
+                                            getJsonField(
+                                              evenementenItem,
+                                              r'''$.adres''',
+                                            ).toString(),
+                                            style: FlutterFlowTheme.of(context)
+                                                .bodySmall
+                                                .override(
+                                                  font: GoogleFonts.inter(
+                                                    fontWeight:
+                                                        FlutterFlowTheme.of(
+                                                                context)
+                                                            .bodySmall
+                                                            .fontWeight,
+                                                    fontStyle:
+                                                        FlutterFlowTheme.of(
+                                                                context)
+                                                            .bodySmall
+                                                            .fontStyle,
+                                                  ),
+                                                  letterSpacing: 0.0,
                                                   fontWeight:
                                                       FlutterFlowTheme.of(
                                                               context)
@@ -434,16 +451,7 @@ class _UitgaantabelKaartComponentWidgetState
                                                           .bodySmall
                                                           .fontStyle,
                                                 ),
-                                                letterSpacing: 0.0,
-                                                fontWeight:
-                                                    FlutterFlowTheme.of(context)
-                                                        .bodySmall
-                                                        .fontWeight,
-                                                fontStyle:
-                                                    FlutterFlowTheme.of(context)
-                                                        .bodySmall
-                                                        .fontStyle,
-                                              ),
+                                          ),
                                         ),
                                         Text(
                                           FFLocalizations.of(context).getText(
@@ -522,15 +530,28 @@ class _UitgaantabelKaartComponentWidgetState
                                             size: 20.0,
                                           ),
                                         ),
-                                        Text(
-                                          getJsonField(
-                                            evenementenItem,
-                                            r'''$.datum''',
-                                          ).toString(),
-                                          style: FlutterFlowTheme.of(context)
-                                              .bodySmall
-                                              .override(
-                                                font: GoogleFonts.inter(
+                                        Flexible(
+                                          child: Text(
+                                            getJsonField(
+                                              evenementenItem,
+                                              r'''$.datum''',
+                                            ).toString(),
+                                            style: FlutterFlowTheme.of(context)
+                                                .bodySmall
+                                                .override(
+                                                  font: GoogleFonts.inter(
+                                                    fontWeight:
+                                                        FlutterFlowTheme.of(
+                                                                context)
+                                                            .bodySmall
+                                                            .fontWeight,
+                                                    fontStyle:
+                                                        FlutterFlowTheme.of(
+                                                                context)
+                                                            .bodySmall
+                                                            .fontStyle,
+                                                  ),
+                                                  letterSpacing: 0.0,
                                                   fontWeight:
                                                       FlutterFlowTheme.of(
                                                               context)
@@ -542,16 +563,7 @@ class _UitgaantabelKaartComponentWidgetState
                                                           .bodySmall
                                                           .fontStyle,
                                                 ),
-                                                letterSpacing: 0.0,
-                                                fontWeight:
-                                                    FlutterFlowTheme.of(context)
-                                                        .bodySmall
-                                                        .fontWeight,
-                                                fontStyle:
-                                                    FlutterFlowTheme.of(context)
-                                                        .bodySmall
-                                                        .fontStyle,
-                                              ),
+                                          ),
                                         ),
                                       ],
                                     ),