From 79fae03e9b66c4c926337fa67c5a1bdf195298e8 Mon Sep 17 00:00:00 2001 From: def Date: Fri, 12 Jan 2024 18:23:13 +0200 Subject: [PATCH 1/3] fix: overflows use this domain --- .../setup/initializing/domain_picker.dart | 54 ++++++------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/lib/ui/pages/setup/initializing/domain_picker.dart b/lib/ui/pages/setup/initializing/domain_picker.dart index 1d64349c..f9bb83d9 100644 --- a/lib/ui/pages/setup/initializing/domain_picker.dart +++ b/lib/ui/pages/setup/initializing/domain_picker.dart @@ -87,9 +87,13 @@ class _DomainPickerState extends State { }); }, ), - Text( - domain, - style: Theme.of(context).textTheme.bodyLarge, + Expanded( + child: Text( + domain, + style: Theme.of(context).textTheme.bodyLarge, + overflow: TextOverflow.ellipsis, + maxLines: 1, + ), ), ], ), @@ -118,44 +122,20 @@ class _DomainPickerState extends State { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Text( - state.domain, - style: Theme.of(context).textTheme.headlineMedium?.copyWith( - color: Theme.of(context).colorScheme.onBackground, - ), - textAlign: TextAlign.center, + Expanded( + child: Text( + state.domain, + style: Theme.of(context).textTheme.headlineMedium?.copyWith( + color: Theme.of(context).colorScheme.onBackground, + ), + textAlign: TextAlign.center, + overflow: TextOverflow.ellipsis, + maxLines: 1, + ), ), ], ), ], - if (state is Empty) ...[ - const SizedBox(height: 30), - BrandButton.filled( - onPressed: () => context.read().load(), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Icon( - Icons.refresh, - color: Colors.white, - ), - const SizedBox(width: 10), - Text( - 'domain.update_list'.tr(), - style: Theme.of(context).textTheme.bodyLarge, - ), - ], - ), - ), - ], - if (state is Loaded) ...[ - const SizedBox(height: 32), - BrandButton.filled( - onPressed: () => - context.read().saveDomain(state.domain), - text: 'initializing.save_domain'.tr(), - ), - ], ], ), ); From 76d93ab7829c248f63cbf94e5fe854eb2aa90286 Mon Sep 17 00:00:00 2001 From: def Date: Thu, 18 Jan 2024 15:31:07 +0200 Subject: [PATCH 2/3] fix: missclicked on "Approve" button --- .../setup/initializing/domain_picker.dart | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/ui/pages/setup/initializing/domain_picker.dart b/lib/ui/pages/setup/initializing/domain_picker.dart index f9bb83d9..1d60ce74 100644 --- a/lib/ui/pages/setup/initializing/domain_picker.dart +++ b/lib/ui/pages/setup/initializing/domain_picker.dart @@ -132,10 +132,38 @@ class _DomainPickerState extends State { overflow: TextOverflow.ellipsis, maxLines: 1, ), - ), + ) ], ), ], + if (state is Empty) ...[ + const SizedBox(height: 30), + BrandButton.filled( + onPressed: () => context.read().load(), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon( + Icons.refresh, + color: Colors.white, + ), + const SizedBox(width: 10), + Text( + 'domain.update_list'.tr(), + style: Theme.of(context).textTheme.bodyLarge, + ), + ], + ), + ), + ], + if (state is Loaded) ...[ + const SizedBox(height: 32), + BrandButton.filled( + onPressed: () => + context.read().saveDomain(state.domain), + text: 'initializing.save_domain'.tr(), + ), + ], ], ), ); From 766f44ee1900dca967972c9cc29d339e5fb8553e Mon Sep 17 00:00:00 2001 From: Inex Code Date: Fri, 19 Jan 2024 16:38:07 +0300 Subject: [PATCH 3/3] style: Add missing trailing comma --- lib/ui/pages/setup/initializing/domain_picker.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ui/pages/setup/initializing/domain_picker.dart b/lib/ui/pages/setup/initializing/domain_picker.dart index 1d60ce74..69e11a8d 100644 --- a/lib/ui/pages/setup/initializing/domain_picker.dart +++ b/lib/ui/pages/setup/initializing/domain_picker.dart @@ -132,7 +132,7 @@ class _DomainPickerState extends State { overflow: TextOverflow.ellipsis, maxLines: 1, ), - ) + ), ], ), ],