Merge branch 'master' of https://git.mokkon.com/tzw/fcs

lib/pages/main/home_page.dart

@@ -6,7 +6,6 @@ import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/domain/entities/user.dart';
 import 'package:fcs/helpers/shared_pref.dart';
 import 'package:fcs/helpers/theme.dart';
-import 'package:fcs/localization/transalation.dart';
 import 'package:fcs/pages/carton/carton_list.dart';
 import 'package:fcs/pages/chat/message_detail.dart';
 import 'package:fcs/pages/chat/model/message_model.dart';
@@ -27,6 +26,7 @@ import 'package:fcs/pages/pickup/pickup_list.dart';
 import 'package:fcs/pages/processing/processing_list.dart';
 import 'package:fcs/pages/rates/shipment_rates.dart';
 import 'package:fcs/pages/receiving/receiving_list.dart';
+import 'package:fcs/pages/signin/pinlogin_page.dart';
 import 'package:fcs/pages/staff/staff_list.dart';
 import 'package:fcs/pages/widgets/badge.dart';
 import 'package:fcs/pages/widgets/bottom_widgets.dart';
@@ -366,25 +366,7 @@ class _HomePageState extends State<HomePage> {
       isSelected: isFcs,
       selectedBorderColor: Colors.white24,
     );
-    final langToggle = ToggleButtons(
-      children: <Widget>[
-        Image.asset(
-          'icons/flags/png/us.png',
-          package: 'country_icons',
-          fit: BoxFit.fitWidth,
-          width: 25,
-        ),
-        Image.asset(
-          'icons/flags/png/mm.png',
-          package: 'country_icons',
-          fit: BoxFit.fitWidth,
-          width: 25,
-        )
-      ],
-      onPressed: _langChange,
-      isSelected: languageModel.currentState,
-      selectedBorderColor: Colors.white24,
-    );
+    
     final signinBtn = TextButton(
       onPressed: () {
         Navigator.of(context)
@@ -402,6 +384,14 @@ class _HomePageState extends State<HomePage> {
       iconSize: 30,
       icon: Icon(Icons.account_circle,color: buttonColor,),
     );
+    final pinLoginBtn = IconButton(
+      onPressed: () {
+        Navigator.of(context)
+            .push(CupertinoPageRoute(builder: (context) => PinLoginPage()));
+      },
+      iconSize: 30,
+      icon: Icon(SimpleLineIcons.lock,color: buttonColor,),
+    );
 
     var searchInput = Row(children: [
       Expanded(
@@ -478,17 +468,15 @@ class _HomePageState extends State<HomePage> {
                   actions: login
                       ? user.isCustomer()
                           ? <Widget>[
-                              langToggle,
-                              profileBtn,
+                             profileBtn,
                             ]
                           : <Widget>[
                               fcsToggle,
-                              langToggle,
+                              pinLoginBtn,
                               profileBtn,
                             ]
                       : <Widget>[
-                          langToggle,
-                          signinBtn,
+                            signinBtn,
                         ]),
               body: Container(
                   decoration: BoxDecoration(
@@ -518,16 +506,7 @@ class _HomePageState extends State<HomePage> {
     );
   }
 
-  _langChange(index) {
-    var languageModel = Provider.of<LanguageModel>(context, listen: false);
-    languageModel.saveLanguage(Translation().supportedLanguages[index]);
-    setState(() {
-      isSelected.asMap().forEach((i, e) {
-        isSelected[i] = false;
-      });
-      isSelected[index] = !isSelected[index];
-    });
-  }
+  
 
   _lookup() async {
     setState(() {