update pin login

lib/pages/delivery_address/delivery_address_row.dart

@@ -1,7 +1,5 @@
 import 'package:fcs/domain/vo/delivery_address.dart';
-import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 

lib/pages/main/home_page.dart

@@ -357,7 +357,7 @@ class _HomePageState extends State<HomePage> {
       selectedColor: Colors.white,
       color: Colors.blue,
       children: <Widget>[
-        Icon(MaterialCommunityIcons.account_tie),
+        Icon(MaterialCommunityIcons.account_tie,size: 25),
       ],
       onPressed: (i) => this.setState(() {
         isFcs[0] = !isFcs[0];
@@ -381,16 +381,23 @@ class _HomePageState extends State<HomePage> {
       onPressed: () {
         Navigator.of(context).push(RightLeftPageRoute(Profile()));
       },
-      iconSize: 30,
+      iconSize: 25,
-      icon: Icon(Icons.account_circle,color: buttonColor,),
+      icon: Icon(
+        Icons.account_circle,
+        color: buttonColor,
+      ),
     );
+    
     final pinLoginBtn = IconButton(
       onPressed: () {
         Navigator.of(context)
             .push(CupertinoPageRoute(builder: (context) => PinLoginPage()));
       },
-      iconSize: 30,
+      iconSize: 25,
-      icon: Icon(SimpleLineIcons.lock,color: buttonColor,),
+      icon: Icon(
+        Icons.lock_outline,
+        color: buttonColor,
+      ),
     );
 
     var searchInput = Row(children: [
@@ -468,15 +475,15 @@ class _HomePageState extends State<HomePage> {
                   actions: login
                       ? user.isCustomer()
                           ? <Widget>[
-                             profileBtn,
+                              profileBtn,
                             ]
                           : <Widget>[
-                              fcsToggle,
                               pinLoginBtn,
+                              fcsToggle,
                               profileBtn,
                             ]
                       : <Widget>[
-                            signinBtn,
+                          signinBtn,
                         ]),
               body: Container(
                   decoration: BoxDecoration(
@@ -506,8 +513,6 @@ class _HomePageState extends State<HomePage> {
     );
   }
 
-  
-
   _lookup() async {
     setState(() {
       _isLoading = true;
@@ -515,7 +520,7 @@ class _HomePageState extends State<HomePage> {
 
     try {
       String term = _searchCtl.text;
-      if ( term.trim() == "") return;
+      if (term.trim() == "") return;
       var packageModel = Provider.of<PackageModel>(context, listen: false);
       Package? package = await packageModel.lookupPackage(term);
       if (package == null) {

lib/pages/signin/pinlogin_page.dart

@@ -16,15 +16,52 @@ class PinLoginPage extends StatefulWidget {
 class _PinLoginPageState extends State<PinLoginPage> {
   bool _isLoading = false;
   late String pin;
-  late bool allNumberEntered;
+  TextEditingController _fcsIdCtl = new TextEditingController();
+
   @override
   void initState() {
     pin = "";
-    allNumberEntered = false;
     super.initState();
   }
 
   Widget build(BuildContext context) {
+    final fcsIdBox = TextFormField(
+      controller: _fcsIdCtl,
+      autofocus: true,
+      style: TextStyle(
+          fontSize: 15, color: Colors.black87, fontWeight: FontWeight.w500),
+      cursorColor: primaryColor,
+      keyboardType: TextInputType.text,
+      decoration: new InputDecoration(
+        contentPadding: EdgeInsets.all(0),
+        labelStyle: newLabelStyle(color: Colors.black54, fontSize: 17),
+        enabledBorder: UnderlineInputBorder(
+            borderSide: BorderSide(color: primaryColor, width: 1.0)),
+        focusedBorder: UnderlineInputBorder(
+            borderSide: BorderSide(color: primaryColor, width: 1.0)),
+        disabledBorder: UnderlineInputBorder(
+            borderSide: BorderSide(color: primaryColor, width: 1.0)),
+      ),
+    );
+
+    final pinLoginLogo = Container(
+      width: 70,
+      height: 70,
+      child: FittedBox(
+        child: Image.asset(
+          "assets/logo.jpg",
+        ),
+        fit: BoxFit.fitHeight,
+      ),
+    );
+
+    final loginBtn = Padding(
+      padding: EdgeInsets.only(top: 30),
+      child: LocalButton(
+        textKey: "welcome.pinlogin",
+        callBack: () {},
+      ),
+    );
     return LocalProgress(
       inAsyncCall: _isLoading,
       child: new Scaffold(
@@ -32,96 +69,52 @@ class _PinLoginPageState extends State<PinLoginPage> {
             backgroundColor: null,
             arrowColor: Colors.black,
           ),
-          body: _buildLogin(context)),
+          body: ListView(
+            padding: EdgeInsets.only(top: 20, left: 15, right: 15, bottom: 20),
+            children: [
+              pinLoginLogo,
+              Padding(
+                padding: EdgeInsets.only(top: 20, bottom: 20),
+                child: Center(
+                  child: LocalText(context, "welcome.pinlogin",
+                      color: Colors.black, fontSize: 18),
+                ),
+              ),
+              LocalText(
+                context,
+                "welcome.pinlogin.fcsid",
+                color: Colors.black54,
+                fontSize: 15,
+              ),
+              fcsIdBox,
+              Padding(
+                  padding: EdgeInsets.only(top: 25, bottom: 20),
+                  child: LocalText(
+                    context,
+                    "welcome.pinlogin.pin",
+                    color: Colors.black54,
+                    fontSize: 15,
+                  )),
+              PinInputTextField(
+                cursor: Cursor(
+                    color: primaryColor, enabled: true, width: 2, height: 23),
+                pinLength: 6,
+                decoration: BoxLooseDecoration(
+                    strokeColorBuilder: PinListenColorBuilder(
+                        primaryColor, Colors.grey.shade400)),
+                textInputAction: TextInputAction.done,
+                autoFocus: false,
+                onChanged: _pinChange,
+              ),
+              loginBtn,
+            ],
+          )),
     );
   }
 
-  Widget _buildLogin(BuildContext context) {
-    return ListView(
-        padding: EdgeInsets.only(top: 20, left: 15, right: 15, bottom: 20),
-        children: <Widget>[
-          pinLoginLogo,
-          Padding(
-            padding: EdgeInsets.only(top: 20, bottom: 20),
-            child: Center(
-              child: LocalText(
-                context,
-                "welcome.pinlogin",
-                color: Colors.black,
-                fontSize: 18,
-              ),
-            ),
-          ),
-          LocalText(
-            context,
-            "welcome.pinlogin.fcsid",
-            color: Colors.grey,
-          ),
-          fcsIdBox,
-          Padding(
-              padding: EdgeInsets.only(top: 20, bottom: 20),
-              child: LocalText(
-                context,
-                "welcome.pinlogin.pin",
-                color: Colors.grey,
-              )),
-          Container(
-            child: PinInputTextField(
-              pinLength: 6,
-              decoration: BoxLooseDecoration(
-                  strokeColorBuilder: PinListenColorBuilder(
-                      primaryColor, Colors.grey.shade400)),
-              textInputAction: TextInputAction.done,
-              autoFocus: true,
-              onChanged: _pinChange,
-            ),
-          ),
-          loginBtn,
-        ]);
-  }
-
-  final pinLoginLogo = Container(
-    width: 70,
-    height: 70,
-    child: FittedBox(
-      child: Image.asset(
-        "assets/logo.jpg",
-      ),
-      fit: BoxFit.fitHeight,
-    ),
-  );
-  final fcsIdBox = Column(
-    children: <Widget>[
-      TextFormField(
-        // controller: controller,
-        style: textStyle,
-        cursorColor: primaryColor,
-        keyboardType: TextInputType.text,
-        decoration: new InputDecoration(
-          contentPadding: EdgeInsets.all(0),
-          labelStyle: newLabelStyle(color: Colors.black54, fontSize: 17),
-          enabledBorder: UnderlineInputBorder(
-              borderSide: BorderSide(color: primaryColor, width: 1.0)),
-          focusedBorder: UnderlineInputBorder(
-              borderSide: BorderSide(color: primaryColor, width: 1.0)),
-          disabledBorder: UnderlineInputBorder(
-              borderSide: BorderSide(color: primaryColor, width: 1.0)),
-        ),
-      ),
-    ],
-  );
-  final loginBtn = Padding(
-    padding: EdgeInsets.only(top: 30),
-    child: LocalButton(
-      textKey: "welcome.pinlogin",
-      callBack: () {},
-    ),
-  );
-
   _pinChange(pin) {
     setState(() {
       this.pin = pin;
-      this.allNumberEntered = this.pin.length == 6;
     });
   }
 }

lib/pages/staff/staff_pin_editor.dart

@@ -63,7 +63,7 @@ class _StaffPinEditorState extends State<StaffPinEditor> {
         const SizedBox(height: 8),
         PinInputTextField(
             cursor: Cursor(
-                color: primaryColor, enabled: true, width: 2, height: 30),
+                color: primaryColor, enabled: true, width: 2, height: 23),
             pinLength: 6,
             decoration: BoxLooseDecoration(
                 strokeColorBuilder:
@@ -82,8 +82,8 @@ class _StaffPinEditorState extends State<StaffPinEditor> {
         const SizedBox(height: 8),
         PinInputTextField(
             pinLength: 6,
-             cursor: Cursor(
+            cursor: Cursor(
-                color: primaryColor, enabled: true, width: 2, height: 30),
+                color: primaryColor, enabled: true, width: 2, height: 23),
             decoration: BoxLooseDecoration(
                 strokeColorBuilder:
                     PinListenColorBuilder(primaryColor, Colors.grey.shade400)),