From 5ee5902524e9d8aeafb2997ebc41f93ab54de2af Mon Sep 17 00:00:00 2001
From: Patrick Alvin Alcala <patrick_alv@yahoo.com>
Date: Wed, 10 Dec 2025 18:12:15 +0800
Subject: [PATCH] Updated widgets

---
 lib/widgets/box_widget.dart    |  6 ++--
 lib/widgets/button_widget.dart | 56 +++++++++++-----------------------
 lib/widgets/input_widget.dart  |  9 ++++--
 lib/widgets/menu_widget.dart   |  2 +-
 4 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/lib/widgets/box_widget.dart b/lib/widgets/box_widget.dart
index e35d944..d992392 100644
--- a/lib/widgets/box_widget.dart
+++ b/lib/widgets/box_widget.dart
@@ -14,11 +14,11 @@ class BoxWidget extends StatelessWidget {
       padding: EdgeInsets.all(16),
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(8),
-        color: Color.fromARGB(149, 16, 22, 28),
+        color: Color.fromRGBO(16, 22, 28, 0.584),
         border: Border.all(color: const Color.fromRGBO(32, 47, 61, 1)),
       ),
-      width: MediaQuery.of(context).size.width - 100,
-      height: MediaQuery.of(context).size.height / 2.2,
+      width: MediaQuery.of(context).size.width - 30,
+      // height: MediaQuery.of(context).size.height / 2.2,
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
diff --git a/lib/widgets/button_widget.dart b/lib/widgets/button_widget.dart
index 7778db8..348bf4f 100644
--- a/lib/widgets/button_widget.dart
+++ b/lib/widgets/button_widget.dart
@@ -1,53 +1,33 @@
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
+import 'package:ocbo_esign_validator/widgets/text_widget.dart';
 
 class ButtonWidget extends StatelessWidget {
   final String text;
-  final VoidCallback onPressed;
-  final bool? outline;
+  final VoidCallback? onPressed;
   final double? width;
+  final bool disabled;
 
-  const ButtonWidget({super.key, required this.text, required this.onPressed, this.outline, this.width});
+  const ButtonWidget({super.key, required this.text, this.onPressed, this.width, required this.disabled});
 
   @override
   Widget build(BuildContext context) {
     return ElevatedButton(
-      style: outline == true
-          ? OutlinedButton.styleFrom(
-              foregroundColor: const Color.fromRGBO(0, 0, 0, 1),
-              backgroundColor: Colors.transparent,
-              side: const BorderSide(color: Color.fromRGBO(198, 133, 232, 1)),
-              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
-              minimumSize: Size(
-                MediaQuery.of(context).size.width <= 768 ? MediaQuery.of(context).size.width - 96 : 320,
-                44,
-              ),
-              padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16),
-            )
-          : ElevatedButton.styleFrom(
-              foregroundColor: const Color.fromRGBO(0, 0, 0, 1), // text color
-              backgroundColor: const Color.fromRGBO(198, 133, 232, 1),
-              side: const BorderSide(color: Color.fromRGBO(79, 51, 94, 0.4)), // border color
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(20), // rounded corners
-              ),
-              minimumSize: Size(
-                width ?? (MediaQuery.of(context).size.width <= 768 ? MediaQuery.of(context).size.width - 96 : 320),
-                44,
-              ),
+      style: ElevatedButton.styleFrom(
+        foregroundColor: const Color.fromRGBO(250, 250, 250, 1), // text color
+        backgroundColor: disabled ? const Color.fromARGB(112, 13, 109, 253) : const Color(0xff0d6efd),
+        elevation: disabled ? 0 : 4,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(8), // rounded corners
+        ),
+        minimumSize: Size(
+          width ?? (MediaQuery.of(context).size.width <= 768 ? MediaQuery.of(context).size.width - 96 : 320),
+          44,
+        ),
 
-              padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16),
-            ),
+        padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16),
+      ),
       onPressed: onPressed,
-      child: Text(text, style: _textStyle(outline)),
+      child: TextWidget(text: text, size: 16),
     );
   }
-
-  TextStyle _textStyle(bool? outline) {
-    if (outline == true) {
-      return GoogleFonts.roboto(textStyle: const TextStyle(fontSize: 14, color: Color.fromRGBO(198, 133, 232, 1)));
-    } else {
-      return GoogleFonts.roboto(textStyle: const TextStyle(fontSize: 14, color: Color.fromRGBO(0, 0, 0, 1)));
-    }
-  }
 }
diff --git a/lib/widgets/input_widget.dart b/lib/widgets/input_widget.dart
index fd0b3b5..e77af5a 100644
--- a/lib/widgets/input_widget.dart
+++ b/lib/widgets/input_widget.dart
@@ -1,17 +1,20 @@
 import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 class InputWidget extends StatelessWidget {
   final TextEditingController controller;
-  final String placeholder;
+  final String? placeholder;
+  final bool password;
 
-  const InputWidget({super.key, required this.controller, required this.placeholder});
+  const InputWidget({super.key, required this.controller, this.placeholder, required this.password});
 
   @override
   Widget build(BuildContext context) {
     return TextField(
       controller: controller,
+      obscureText: password,
+      enableSuggestions: !password,
+      autocorrect: !password,
       decoration: InputDecoration(
         filled: true,
         fillColor: const Color.fromRGBO(255, 255, 255, 1),
diff --git a/lib/widgets/menu_widget.dart b/lib/widgets/menu_widget.dart
index 1a5bec4..b342438 100644
--- a/lib/widgets/menu_widget.dart
+++ b/lib/widgets/menu_widget.dart
@@ -18,7 +18,7 @@ class MenuWidget extends StatelessWidget {
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(8),
           color: Color.fromARGB(149, 16, 22, 28),
-          border: Border.all(color: const Color(0xff202f3d)),
+          border: Border.all(color: const Color.fromRGBO(32, 47, 61, 1)),
         ),
         width: 120,
         height: 120,