Added dio for api

Updated widgets
Updated pages
2025-12-10 18:12:26 +08:00 · 2025-12-10 18:12:15 +08:00 · 2025-12-10 18:11:42 +08:00
8 changed files with 112 additions and 133 deletions
--- a/lib/pages/login_page.dart
+++ b/lib/pages/login_page.dart
@ -14,20 +14,29 @@ class LoginPage extends StatefulWidget {
 }

 class _LoginPageState extends State<LoginPage> {
-  //  final List _ =;
-  // ["Cluj-Napoca", "Bucuresti", "Timisoara", "Brasov", "Constanta"];
-
  final _passwordController = TextEditingController();
  final _approver = "ARCH. KHASHAYAR L. TOGHYANI";
+  late ValueNotifier<String> passwordNotifier;
+
+  @override
+  void initState() {
+    super.initState();
+    passwordNotifier = ValueNotifier(_passwordController.text);
+    _passwordController.addListener(() {
+      passwordNotifier.value = _passwordController.text;
+    });
+  }

  void _login() {
-    // Add your login logic here
-    print("Login button clicked");
+    debugPrint("Login button clicked");
  }

+  void _ignoreButton() {}
+
  @override
  void dispose() {
    _passwordController.dispose();
+    passwordNotifier.dispose();
    super.dispose();
  }

@ -54,7 +63,7 @@ class _LoginPageState extends State<LoginPage> {
          children: [
            const Gap(88),
            const ImageWidget(imagePath: 'assets/logo.png', size: 100, measureByHeight: true),
-            const Gap(50),
+            const Gap(58),
            BoxWidget(
              title: 'Login',
              content: Column(
@ -63,12 +72,21 @@ class _LoginPageState extends State<LoginPage> {
                  const TextWidget(text: 'Name', bold: true, size: 16),
                  const Gap(8),
                  TextWidget(text: _approver, bold: false, size: 16),
-                  const Gap(8),
+                  const Gap(16),
                  const TextWidget(text: 'Password', bold: true, size: 16),
                  const Gap(8),
-                  InputWidget(controller: _passwordController, placeholder: 'placeholder'),
-                  const Gap(16),
-                  ButtonWidget(text: 'Login', onPressed: _login),
+                  InputWidget(controller: _passwordController, password: true),
+                  const Gap(24),
+                  ValueListenableBuilder<String>(
+                    valueListenable: passwordNotifier,
+                    builder: (context, password, child) {
+                      return ButtonWidget(
+                        text: password.isNotEmpty ? 'Login' : 'Required password',
+                        onPressed: password.isNotEmpty ? _login : _ignoreButton,
+                        disabled: password.isEmpty,
+                      );
+                    },
+                  ),
                ],
              ),
            ),
--- a/lib/pages/validate_page.dart
+++ b/lib/pages/validate_page.dart
@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
 import 'package:mobile_scanner/mobile_scanner.dart';
 import 'package:ocbo_esign_validator/widgets/text_widget.dart';

@ -41,89 +42,41 @@ class _BarcodeScannerScreenState extends State<BarcodeScannerScreen> {
          ),
        ),
        child: Center(
-          child: Column(
-            children: [
-              Expanded(
-                flex: 3,
-                child: MobileScanner(
-                  onDetect: (BarcodeCapture capture) {
-                    final List<Barcode> barcodes = capture.barcodes;
-                    if (barcodes.isNotEmpty && barcodes.first.rawValue != null) {
-                      setState(() {
-                        barcodeResult = barcodes.first.rawValue!;
-                      });
-                    }
-                  },
+          child: Padding(
+            padding: const EdgeInsets.only(top: 64, left: 16, right: 16),
+            child: Column(
+              children: [
+                Expanded(
+                  flex: 2,
+                  child: ClipRRect(
+                    borderRadius: BorderRadius.circular(20), // Adjust the radius as needed
+                    child: MobileScanner(
+                      fit: BoxFit.cover,
+                      onDetect: (BarcodeCapture capture) {
+                        final List<Barcode> barcodes = capture.barcodes;
+                        if (barcodes.isNotEmpty && barcodes.first.rawValue != null) {
+                          setState(() {
+                            barcodeResult = barcodes.first.rawValue!;
+                          });
+                        }
+                      },
+                    ),
+                  ),
                ),
-              ),
-              Expanded(
-                flex: 1,
-                child: Center(
-                  child: Center(child: TextWidget(text: barcodeResult, bold: false, size: 18)),
+                Expanded(
+                  flex: 2,
+                  child: Column(
+                    children: [
+                      Gap(20),
+                      TextWidget(text: 'Scan OCBO e-Sign QR', size: 20, bold: true),
+                    ],
+                  ),
                ),
-              ),
-            ],
+              ],
+            ),
          ),
        ),
      ),
    );
  }
 }
-
-// class ValidatePage extends StatefulWidget {
-//   const ValidatePage({super.key});
-
-//   @override
-//   State<ValidatePage> createState() => _ValidatePageState();
-// }
-
-// class _ValidatePageState extends State<ValidatePage> {
-//   final qrKey = GlobalKey(debugLabel: 'QR');
-//   String barcodeResult = "Point the camera at a barcode";
-
-//   @override
-//   Widget build(BuildContext context) {
-//     return Scaffold(
-//       resizeToAvoidBottomInset: false,
-//       body: Container(
-//         alignment: Alignment.center,
-//         height: MediaQuery.of(context).size.height,
-//         decoration: const BoxDecoration(
-//           gradient: LinearGradient(
-//             begin: Alignment.topCenter,
-//             end: Alignment.bottomCenter,
-//             colors: [
-//               Color.fromRGBO(39, 26, 47, 1),
-//               Color.fromRGBO(22, 33, 44, 1),
-//               Color.fromRGBO(22, 33, 44, 1),
-//               Color.fromRGBO(24, 45, 40, 1),
-//             ],
-//           ),
-//         ),
-//         child: Center(
-//           child: Column(
-//             children: [
-//               Expanded(
-//                 flex: 2,
-//                 child: MobileScanner(
-//                   onDetect: (BarcodeCapture capture) {
-//                     final List<Barcode> barcodes = capture.barcodes;
-//                     if (barcodes.isNotEmpty && barcodes.first.rawValue != null) {
-//                       setState(() {
-//                         barcodeResult = barcodes.first.rawValue!;
-//                       });
-//                     }
-//                   },
-//                 ),
-//               ),
-//               Expanded(
-//                 flex: 1,
-//                 child: Center(child: TextWidget(text: barcodeResult, bold: false, size: 18)),
-//               ),
-//             ],
-//           ),
-//         ),
-//       ),
-//     );
-//   }
-// }
--- 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: [
--- 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)));
-    }
-  }
 }
--- 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),
--- 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,
--- a/pubspec.lock
+++ b/pubspec.lock
@ -81,6 +81,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.7.11"
+  dio:
+    dependency: "direct main"
+    description:
+      name: dio
+      sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.9.0"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
  equatable:
    dependency: transitive
    description:
@ -240,6 +256,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.17.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
  mobile_scanner:
    dependency: "direct main"
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -18,6 +18,7 @@ dependencies:
  qr_flutter: ^4.1.0
  qr_code_scanner_plus: ^2.0.14
  mobile_scanner: ^7.1.3
+  dio: ^5.9.0

 dev_dependencies:
  flutter_test:
Author	SHA1	Message	Date
Patrick Alvin Alcala	23911c02cf	Added dio for api	2025-12-10 18:12:26 +08:00
Patrick Alvin Alcala	5ee5902524	Updated widgets	2025-12-10 18:12:15 +08:00
Patrick Alvin Alcala	78259a6f7e	Updated pages	2025-12-10 18:11:42 +08:00