Skip to content

Commit 45fec1d

Browse files
committed
Post-merge fixes
1 parent 46039f9 commit 45fec1d

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

lib/pages/new_group_page.dart

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ class _NewGroupPageState extends State<NewGroupPage> {
6767
@override
6868
void initState() {
6969
super.initState();
70-
WidgetsBinding.instance.addPostFrameCallback((_) {
71-
context.read<TabsViewModel>().setNewGroupPageInStack(true);
72-
});
7370

7471
// Reset errors on input change
7572
_nameController.addListener(() {
@@ -332,11 +329,6 @@ class _NewGroupPageState extends State<NewGroupPage> {
332329
return;
333330
}
334331

335-
TabsViewModel model = context.read<TabsViewModel>();
336-
WidgetsBinding.instance.addPostFrameCallback((_) {
337-
model.setNewGroupPageInStack(false);
338-
});
339-
340332
// Pass the new created group back to the previous screen where its handled
341333
Navigator.pop(
342334
context,
@@ -361,17 +353,10 @@ class _NewGroupPageState extends State<NewGroupPage> {
361353

362354
@override
363355
Widget build(BuildContext context) {
364-
TabsViewModel model = context.read<TabsViewModel>();
365-
366356
return DefaultPageTemplate(
367357
showAppBar: true,
368358
appBarTitle: AppLocalizations.of(context).newGroupTitle,
369359
includePadding: false,
370-
onBackButtonPressed: () {
371-
WidgetsBinding.instance.addPostFrameCallback((_) {
372-
model.setNewGroupPageInStack(false);
373-
});
374-
},
375360
body: _buildPageBody());
376361
}
377362

lib/services/settings_controller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class SettingsController {
1414
static const defaultThemeMode = ThemeMode.system;
1515
static const minGroupMembersKey = 'minGroupMembers';
1616
static const currentLanguageKey = 'currentLanguage';
17-
static const defaultLanguage = 'cs';
17+
static const defaultLanguage = 'en';
1818
static const closeWithoutConfirmationKey = 'close_without_confirmation';
1919

2020
// Seed settings controller stream with default settings

0 commit comments

Comments
 (0)