diff --git a/lib/application/component/otp/otp_view.dart b/lib/application/component/otp/otp_view.dart index 1ab57b0..8538e79 100644 --- a/lib/application/component/otp/otp_view.dart +++ b/lib/application/component/otp/otp_view.dart @@ -1,3 +1,4 @@ +import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart'; import 'package:cims_apps/application/component/otp/otp_viewmodel.dart'; import 'package:cims_apps/application/component/text_caption/text_caption.dart'; import 'package:cims_apps/application/theme/color_palette.dart'; @@ -112,10 +113,8 @@ class OtpView extends StatelessWidget { create: (context) => OtpViewModel(), builder: (context, child) { return Scaffold( - appBar: AppBar( - title: Text(title), - ), - body: Container( + appBar: CustomAppBar(height: SizeConfig.height * .1, title: title), + body: SingleChildScrollView( padding: const EdgeInsets.all(16.0), child: Consumer(builder: (context, provider, child) { diff --git a/lib/features/auth/registration/view/registration_password_view.dart b/lib/features/auth/registration/view/registration_password_view.dart index 4210406..ce8d3ac 100644 --- a/lib/features/auth/registration/view/registration_password_view.dart +++ b/lib/features/auth/registration/view/registration_password_view.dart @@ -1,5 +1,6 @@ import 'package:cims_apps/application/assets/path_assets.dart'; import 'package:cims_apps/application/component/button/button_view.dart'; +import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart'; import 'package:cims_apps/application/component/image/image_view.dart'; import 'package:cims_apps/application/component/text_caption/text_caption.dart'; import 'package:cims_apps/application/component/text_form/text_form_view.dart'; @@ -20,9 +21,8 @@ class RegistrationPasswordView extends StatelessWidget { create: (context) => RegistrationViewModel(), builder: (context, child) { return Scaffold( - appBar: AppBar( - title: const Text('Sign Up'), - ), + appBar: + CustomAppBar(height: SizeConfig.height * .1, title: 'Sign Up'), body: SingleChildScrollView( padding: const EdgeInsets.all(16.0), child: Consumer( diff --git a/lib/features/auth/registration/view/registration_view.dart b/lib/features/auth/registration/view/registration_view.dart index 04cdf85..4d7b29c 100644 --- a/lib/features/auth/registration/view/registration_view.dart +++ b/lib/features/auth/registration/view/registration_view.dart @@ -1,5 +1,6 @@ import 'package:cims_apps/application/assets/path_assets.dart'; import 'package:cims_apps/application/component/button/button_view.dart'; +import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart'; import 'package:cims_apps/application/component/image/image_view.dart'; import 'package:cims_apps/application/component/otp/otp_view.dart'; import 'package:cims_apps/application/component/text_caption/text_caption.dart'; @@ -24,6 +25,11 @@ class RegistrationView extends StatelessWidget { context: context, isScrollControlled: true, enableDrag: false, + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.vertical( + top: Radius.zero, + ), + ), builder: (BuildContext context) { return Padding( padding: EdgeInsets.only( @@ -46,10 +52,9 @@ class RegistrationView extends StatelessWidget { create: (context) => RegistrationViewModel(), builder: (context, child) { return Scaffold( - appBar: AppBar( - title: const Text('Sign Up'), - ), - body: Container( + appBar: + CustomAppBar(height: SizeConfig.height * .1, title: 'Sign Up'), + body: SingleChildScrollView( padding: const EdgeInsets.all(24.0), child: Consumer( builder: (context, provider, child) { @@ -68,6 +73,7 @@ class RegistrationView extends StatelessWidget { inputFormatters: [ FilteringTextInputFormatter.deny(RegExp(r'^0')) ], + contentPadding: EdgeInsets.zero, prefixIcon: Container( width: SizeConfig.width * .23, padding: diff --git a/lib/features/dashboard/dashboard_public/view/dashboard_public_view.dart b/lib/features/dashboard/dashboard_public/view/dashboard_public_view.dart index 93bed19..8645822 100644 --- a/lib/features/dashboard/dashboard_public/view/dashboard_public_view.dart +++ b/lib/features/dashboard/dashboard_public/view/dashboard_public_view.dart @@ -38,7 +38,7 @@ class DashboardPublicView extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( - body: Container( + body: SingleChildScrollView( padding: const EdgeInsets.only( top: 32.0, bottom: 8.0,