Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Changing light/dark mode in wizard clears first/last names

This commit is contained in:
Hillel Coren 2023-03-12 09:37:26 +02:00
parent cd9f153943
commit fbf79c5e67
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ui/dashboard/dashboard_screen.dart
View File

@ -105,6 +105,7 @@ class _DashboardScreenState extends State<DashboardScreen>
builder: (BuildContext context) { builder: (BuildContext context) {
return SettingsWizard( return SettingsWizard(
user: state.user, user: state.user,
company: state.company,
); );
}); });
}); });

15
lib/ui/settings/settings_wizard.dart
View File

@ -3,6 +3,7 @@ import 'dart:async';
import 'dart:convert'; import 'dart:convert';
// Flutter imports: // Flutter imports:
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@ -12,6 +13,7 @@ import 'package:flutter_redux/flutter_redux.dart';
// Project imports: // Project imports:
import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/data/models/company_model.dart';
import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart';
import 'package:invoiceninja_flutter/data/models/user_model.dart'; import 'package:invoiceninja_flutter/data/models/user_model.dart';
import 'package:invoiceninja_flutter/data/web_client.dart'; import 'package:invoiceninja_flutter/data/web_client.dart';
@ -34,9 +36,11 @@ import 'package:invoiceninja_flutter/utils/platforms.dart';
class SettingsWizard extends StatefulWidget { class SettingsWizard extends StatefulWidget {
const SettingsWizard({ const SettingsWizard({
@required this.user, @required this.user,
@required this.company,
}); });
final UserEntity user; final UserEntity user;
final CompanyEntity company;
@override @override
_SettingsWizardState createState() => _SettingsWizardState(); _SettingsWizardState createState() => _SettingsWizardState();
@ -73,17 +77,10 @@ class _SettingsWizardState extends State<SettingsWizard> {
_lastNameController, _lastNameController,
_subdomainController, _subdomainController,
]; ];
}
@override
void didChangeDependencies() {
final store = StoreProvider.of<AppState>(context);
_firstNameController.text = widget.user.firstName; _firstNameController.text = widget.user.firstName;
_lastNameController.text = widget.user.lastName; _lastNameController.text = widget.user.lastName;
_subdomainController.text = store.state.company.subdomain; _subdomainController.text = widget.company.subdomain;
super.didChangeDependencies();
} }
@override @override
@ -313,7 +310,7 @@ class _SettingsWizardState extends State<SettingsWizard> {
); );
var showNameFields = true; var showNameFields = true;
if (state.companies.length > 1) { if (state.companies.length > 1 && kReleaseMode) {
showNameFields = false; showNameFields = false;
} }
if (state.user.isConnectedToApple && state.user.fullName.isEmpty) { if (state.user.isConnectedToApple && state.user.fullName.isEmpty) {