diff --git a/lib/pages/approval_page.dart b/lib/pages/approval_page.dart index 37d39e6..6a37bba 100644 --- a/lib/pages/approval_page.dart +++ b/lib/pages/approval_page.dart @@ -1,11 +1,9 @@ -import 'dart:developer'; import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; import 'package:ocbo_esign_mobile/blocs/user/functions/bloc_getuser.dart'; import 'package:ocbo_esign_mobile/functions/get_api.dart'; import 'package:ocbo_esign_mobile/widgets/box_widget.dart'; -import 'package:ocbo_esign_mobile/widgets/image_widget.dart'; import 'package:ocbo_esign_mobile/widgets/text_widget.dart'; class ApprovalPage extends StatefulWidget { diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart index 3db7cd1..2042626 100644 --- a/lib/pages/login_page.dart +++ b/lib/pages/login_page.dart @@ -1,5 +1,3 @@ -import 'dart:developer'; - import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:gap/gap.dart'; @@ -137,15 +135,18 @@ class _LoginPageState extends State { InputWidget(controller: _passwordController, password: true), const Gap(24), - ValueListenableBuilder( - valueListenable: passwordNotifier, - builder: (context, password, child) { - return ButtonWidget( - text: password.isNotEmpty ? 'Login' : 'Required password', - onPressed: password.isNotEmpty ? _login : _ignoreButton, - disabled: password.isEmpty, - ); - }, + Center( + child: ValueListenableBuilder( + valueListenable: passwordNotifier, + builder: (context, password, child) { + return ButtonWidget( + width: MediaQuery.of(context).size.width, + text: password.isNotEmpty ? 'Login' : 'Required password', + onPressed: password.isNotEmpty ? _login : _ignoreButton, + disabled: password.isEmpty, + ); + }, + ), ), // ValueListenableBuilder( // valueListenable: passwordNotifier, diff --git a/lib/widgets/login_box_widget.dart b/lib/widgets/login_box_widget.dart index a307bdc..39fab2d 100644 --- a/lib/widgets/login_box_widget.dart +++ b/lib/widgets/login_box_widget.dart @@ -10,14 +10,16 @@ class LoginBoxWidget extends StatelessWidget { @override Widget build(BuildContext context) { + final responsiveWidth = (MediaQuery.of(context).size.width - 30).clamp(100.0, 400.0); + return Container( padding: EdgeInsets.all(16), decoration: BoxDecoration( borderRadius: BorderRadius.circular(8), - color: Color.fromRGBO(16, 22, 28, 0.584), + color: const Color.fromRGBO(16, 22, 28, 0.584), border: Border.all(color: const Color.fromRGBO(41, 60, 78, 0.914)), ), - width: MediaQuery.of(context).size.width - 30, + width: responsiveWidth, // height: MediaQuery.of(context).size.height / 2.2, child: Column( crossAxisAlignment: CrossAxisAlignment.start,