diff --git a/lib/logic/cubit/app_config/app_config_repository.dart b/lib/logic/cubit/app_config/app_config_repository.dart index e59c1255ce..5fcba08d3e 100644 --- a/lib/logic/cubit/app_config/app_config_repository.dart +++ b/lib/logic/cubit/app_config/app_config_repository.dart @@ -21,10 +21,6 @@ class AppConfigRepository { Box box = Hive.box(BNames.appConfig); AppConfigState load() { - // saveIsServerStarted(false); - // saveIsServerReseted(false); - // saveHasFinalChecked(false); - return AppConfigState( hetznerKey: box.get(BNames.hetznerKey), cloudFlareKey: box.get(BNames.cloudFlareKey), diff --git a/lib/ui/components/brand_button/brand_button.dart b/lib/ui/components/brand_button/brand_button.dart index 192f8a8b29..df6cfc3979 100644 --- a/lib/ui/components/brand_button/brand_button.dart +++ b/lib/ui/components/brand_button/brand_button.dart @@ -100,6 +100,7 @@ class _TextButton extends StatelessWidget { Widget build(BuildContext context) { return GestureDetector( onTap: onPressed, + behavior: HitTestBehavior.opaque, child: Container( height: 48, width: double.infinity, diff --git a/lib/ui/components/brand_card/brand_card.dart b/lib/ui/components/brand_card/brand_card.dart index 9fcfcb6be6..18fd26eb4c 100644 --- a/lib/ui/components/brand_card/brand_card.dart +++ b/lib/ui/components/brand_card/brand_card.dart @@ -13,7 +13,6 @@ class BrandCard extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - margin: EdgeInsets.only(bottom: 30), decoration: BoxDecoration( color: Theme.of(context).brightness == Brightness.dark ? BrandColors.black diff --git a/lib/ui/pages/initializing/initializing.dart b/lib/ui/pages/initializing/initializing.dart index d35aa90fae..e26ebd5403 100644 --- a/lib/ui/pages/initializing/initializing.dart +++ b/lib/ui/pages/initializing/initializing.dart @@ -47,25 +47,20 @@ class InitializingPage extends StatelessWidget { body: ListView( children: [ Padding( - padding: brandPagePadding1, - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - ProgressBar( - steps: [ - 'Hetzner', - 'CloudFlare', - 'Backblaze', - 'Domain', - 'User', - 'Server', - ' ✅', - ' ✅', - ' ✅' - ], - activeIndex: cubit.state.progress, - ), + padding: brandPagePadding2.copyWith(top: 10, bottom: 10), + child: ProgressBar( + steps: [ + 'Hetzner', + 'CloudFlare', + 'Backblaze', + 'Domain', + 'User', + 'Server', + ' ✅', + ' ✅', + ' ✅' ], + activeIndex: cubit.state.progress, ), ), _addCard( @@ -84,7 +79,6 @@ class InitializingPage extends StatelessWidget { (predicate) => false, ); }), - SizedBox(height: 30), ], ), ), @@ -415,7 +409,7 @@ class InitializingPage extends StatelessWidget { BrandButton.rised( onPressed: isLoading! ? null : appConfigCubit.createServerAndSetDnsRecords, - title: isLoading ? 'loading' : 'initializing.11'.tr(), + title: isLoading ? 'basis.loading'.tr() : 'initializing.11'.tr(), ), Spacer(flex: 2), BrandButton.text( @@ -472,7 +466,7 @@ class InitializingPage extends StatelessWidget { Widget _addCard(Widget child) { return Container( - height: 500, + height: 450, padding: brandPagePadding2, child: BrandCard(child: child), );