6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit bb0a6642

AuthorEdmir Suljic<esu@dwarf.dk>

Date2025-06-04 15:14:54 +0200

added null checks

Changed files

.../components/address_bottom_sheet.dart                 | 16 ++++++++--------
 comwell_key_app/lib/profile_settings/model/address.dart  |  2 +-
 .../lib/profile_settings/profile_settings_page.dart      |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

Diff

diff --git a/comwell_key_app/lib/profile_settings/components/address_bottom_sheet.dart b/comwell_key_app/lib/profile_settings/components/address_bottom_sheet.dart

index 80b90475..f0d99f43 100644

--- a/comwell_key_app/lib/profile_settings/components/address_bottom_sheet.dart

+++ b/comwell_key_app/lib/profile_settings/components/address_bottom_sheet.dart

@@ -9,7 +9,7 @@ import 'package:flutter/material.dart';

import 'package:go_router/go_router.dart';

class AddressBottomSheet extends StatefulWidget {

- final User user;

+ final User? user;

final String selectedCountry;

const AddressBottomSheet({

@@ -32,11 +32,11 @@ class _AddressBottomSheetState extends State<AddressBottomSheet> {

void initState() {

super.initState();

_addressController =

- TextEditingController(text: widget.user.address.street);

+ TextEditingController(text: widget.user?.address.street);

_zipCodeController =

- TextEditingController(text: widget.user.address.zipCode);

- _cityController = TextEditingController(text: widget.user.address.city);

- _selectedCountry = widget.user.address.country != '' ? widget.user.address.country : 'DK';

+ TextEditingController(text: widget.user?.address.zipCode);

+ _cityController = TextEditingController(text: widget.user?.address.city);

+ _selectedCountry = widget.user?.address.country != '' ? widget.user?.address.country ?? '' : 'DK';

}

@override

@@ -95,7 +95,7 @@ class _AddressBottomSheetState extends State<AddressBottomSheet> {

padding: const EdgeInsets.symmetric(horizontal: 16),

child: ComwellTextField(

fieldName: "profile_settings_address".tr(),

- initialValue: widget.user.address.street,

+ initialValue: widget.user?.address.street ?? '',

readOnly: false,

controller: _addressController)),

const SizedBox(height: 8),

@@ -103,7 +103,7 @@ class _AddressBottomSheetState extends State<AddressBottomSheet> {

padding: const EdgeInsets.symmetric(horizontal: 16),

child: ComwellTextField(

fieldName: "zipCode".tr(),

- initialValue: widget.user.address.zipCode,

+ initialValue: widget.user?.address.zipCode ?? '',

readOnly: false,

controller: _zipCodeController)),

const SizedBox(height: 8),

@@ -111,7 +111,7 @@ class _AddressBottomSheetState extends State<AddressBottomSheet> {

padding: const EdgeInsets.symmetric(horizontal: 16),

child: ComwellTextField(

fieldName: "city".tr(),

- initialValue: widget.user.address.city,

+ initialValue: widget.user?.address.city ?? '',

readOnly: false,

controller: _cityController)),

const SizedBox(height: 8),

diff --git a/comwell_key_app/lib/profile_settings/model/address.dart b/comwell_key_app/lib/profile_settings/model/address.dart

index 31a5bbb9..01f608b3 100644

--- a/comwell_key_app/lib/profile_settings/model/address.dart

+++ b/comwell_key_app/lib/profile_settings/model/address.dart

@@ -8,7 +8,7 @@ class Address {

required this.street,

required this.city,

required this.country,

- required this.zipCode,

+ required this.zipCode

});

@override

diff --git a/comwell_key_app/lib/profile_settings/profile_settings_page.dart b/comwell_key_app/lib/profile_settings/profile_settings_page.dart

index 4df24baa..6b3028eb 100644

--- a/comwell_key_app/lib/profile_settings/profile_settings_page.dart

+++ b/comwell_key_app/lib/profile_settings/profile_settings_page.dart

@@ -98,9 +98,9 @@ class ProfileSettingsPage extends StatelessWidget {

const SizedBox(height: 8),

ComwellTextField(

fieldName: "profile_settings_email".tr(),

- initialValue: state.user!.email,

+ initialValue: state.user!.email ?? '',

readOnly: true,

- controller: TextEditingController(text: state.user!.email),

+ controller: TextEditingController(text: state.user!.email ?? ''),

const SizedBox(height: 8),

IntlPhoneField(

@@ -124,7 +124,7 @@ class ProfileSettingsPage extends StatelessWidget {

isScrollControlled: true,

backgroundColor: Colors.white,

builder: (context) =>

- AddressBottomSheet(user: state.user!, selectedCountry: cubit.selectedCountry));

+ AddressBottomSheet(user: state.user, selectedCountry: cubit.selectedCountry));

if (response is Address) {

cubit.updateAddress(response);

@@ -136,7 +136,7 @@ class ProfileSettingsPage extends StatelessWidget {

const SizedBox(height: 8),

DateTimePicker(

title: "profile_settings_birthday".tr(),

- initialValue: state.user!.birthDate,

+ initialValue: state.user!.birthDate ?? DateTime(1990, 1, 1),

const SizedBox(height: 8),

TextFieldWithTrailingIcon(