resolve conflit

.gitignore

@@ -41,3 +41,8 @@ app.*.map.json
 
 # Exceptions to above rules.
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+android/key.properties
+android/key.jks
+android/app/src/prod/AndroidManifest.xml
+android/app/src/prod/google-services.json
+android/app/src/prod/res/values/strings.xml

.vscode/launch.json

@@ -2,7 +2,43 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Flutter Dev",
+            "name": "Prod",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main-prod.dart",
+            "args": [
+                "-t",
+                "lib/main-prod.dart",
+                "--flavor",
+                "prod"
+            ],
+        },      
+        {
+            "name": "Local Dev",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main-local.dart",
+            "args": [
+                "-t",
+                "lib/main-local.dart",
+                "--flavor",
+                "dev"
+            ],
+        },       
+        {
+            "name": "Dev",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main-dev.dart",
+            "args": [
+                "-t",
+                "lib/main-dev.dart",
+                "--flavor",
+                "dev"
+            ],
+        },
+        {
+            "name": "Dev iOS",
             "request": "launch",
             "type": "dart",
             "program": "lib/main-dev.dart",
@@ -12,13 +48,13 @@
             ],
         },       
         {
-            "name": "Flutter Dev2",
+            "name": "Prod iOS",
             "request": "launch",
             "type": "dart",
-            "program": "lib/main-dev.dart",
+            "program": "lib/main-prod.dart",
             "args": [
                 "-t",
-                "lib/main-dev.dart",
+                "lib/main-prod.dart",
             ],
         },       
     ]

android/app/build.gradle

@@ -24,6 +24,12 @@ if (flutterVersionName == null) {
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     compileSdkVersion 28
 
@@ -32,20 +38,53 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.mokkon.fcs_dev.fcs"
         minSdkVersion 21
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
+        multiDexEnabled true
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+
+
+    flavorDimensions "app"
+    productFlavors {
+        prod {
+            dimension "app"
+            applicationId "com.mokkon.fcs"
+            versionCode flutterVersionCode.toInteger()
+            versionName flutterVersionName
+        }
+        dev {
+            dimension "app"
+            applicationId "com.mokkon.fcs.dev"
+            versionCode flutterVersionCode.toInteger()
+            versionName flutterVersionName
+        }
+    }
+
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
     }
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
+            signingConfig signingConfigs.release
-            // Signing with the debug keys for now, so `flutter run --release` works.
+
-            signingConfig signingConfigs.debug
+            minifyEnabled true
+            useProguard false
+
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            debuggable true
+        }        
+
     }
 }
 
@@ -53,11 +92,17 @@ flutter {
     source '../..'
 }
 
+apply plugin: 'kotlin-android'
+
 dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'com.android.support:multidex:1.0.3'
+    implementation 'com.google.firebase:firebase-analytics:17.5.0'
     implementation 'com.google.firebase:firebase-auth:19.0.0'
     implementation 'com.google.firebase:firebase-messaging:20.1.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
+
+apply plugin: 'com.google.gms.google-services'

android/app/src/dev/AndroidManifest.xml

@@ -0,0 +1,38 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mokkon.fcs_dev.fcs">
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
+    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
+         calls FlutterMain.startInitialization(this); in its onCreate method.
+         In most cases you can leave this as-is, but you if you want to provide
+         additional functionality it is fine to subclass or reimplement
+         FlutterApplication and put your custom class here. -->
+    <application
+        android:name=".Application" 
+        android:label="@string/app_name"
+        android:icon="@mipmap/ic_launcher">
+        <activity
+            android:name=".MainActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- This keeps the window background of the activity showing
+                 until Flutter renders its first frame. It can be removed if
+                 there is no splash screen (such as the default splash screen
+                 defined in @style/LaunchTheme). -->
+            <meta-data
+                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
+                android:value="true" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="FLUTTER_NOTIFICATION_CLICK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>            
+        </activity>
+    </application>
+</manifest>

android/app/src/dev/google-services.json

@@ -0,0 +1,40 @@
+{
+  "project_info": {
+    "project_number": "944560757353",
+    "firebase_url": "https://fcs-dev1.firebaseio.com",
+    "project_id": "fcs-dev1",
+    "storage_bucket": "fcs-dev1.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:944560757353:android:d21ae04e44e82f10fa60f8",
+        "android_client_info": {
+          "package_name": "com.mokkon.fcs.dev"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "944560757353-n44kricufdgign6ki6eu1fqvh7ppa29m.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA3v2o4UqvL61fw8sVHer6pYU9tGiBagu8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "944560757353-n44kricufdgign6ki6eu1fqvh7ppa29m.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/dev/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">FCS - Dev</string>
+</resources>

android/app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.CAMERA" />
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -12,7 +13,7 @@
          FlutterApplication and put your custom class here. -->
     <application
         android:name=".Application" 
-        android:label="fcs"
+        android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true">
         <activity
@@ -38,14 +39,5 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>            
         </activity>
-        <provider
-            android:name="vn.hunghd.flutterdownloader.DownloadedFileProvider"
-            android:authorities="${applicationId}.flutter_downloader.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"/>
-        </provider>
     </application>
 </manifest>

android/app/src/main/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">FCS</string>
+</resources>

android/build.gradle

@@ -1,11 +1,15 @@
 buildscript {
+    ext.kotlin_version = '1.3.61'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.google.gms:google-services:4.3.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12' //add this line
     }
 }
 

android/proguard-rules.pro

@@ -0,0 +1,7 @@
+## Flutter wrapper
+-keep class io.flutter.app.** { *; }
+-keep class io.flutter.plugin.**  { *; }
+-keep class io.flutter.util.**  { *; }
+-keep class io.flutter.view.**  { *; }
+-keep class io.flutter.**  { *; }
+-keep class io.flutter.plugins.**  { *; }

android/settings_aar.gradle

@@ -0,0 +1 @@
+include ':app'

assets/local/localization_en.json

@@ -1,6 +1,164 @@
 {
+    "contact.btn":"Contact Us",
+    "contact.title":"Contact Us",
+    "contact.phone.title":"Input Phone Number",
+    "contact.phone":"Phone Number",
+    "contact.phone.confim":"Call {0}?",
+    "contact.phone.empty":"Please enter phone number",
+    "contact.email":"Email",
+    "contact.email.configm":"Email to '{0}'?",
+    "contact.email.empty":"Please enter email",
+    "contact.facebook":"Facebook",
+    "contact.facebook.empty":"Please enter facebook url",
+    "contact.google":"Website",
+    "contact.google.empty":"Please enter website url",
+    "contact.confrim":"Confirm update contact?",
+    "contact.open.confrim":"Open '{0}'?",
+    "contact.bank.accounts":"Bank Accounts Info",
+    "contact.address":"Address",
+    "contact.usa.address":"USA Address",
+    "contact.mm.address":"Myanmar Address",
+    "contact.delivery.phone":"Delivery Phone",
+    "contact.fcs.email":"FCS Email",
+    "contact.callus":"Call Us",
+    "contact.findus":"Find Us",
+    "contact.emailus":"Email Us",
+    "contact.visitus":"Visit Us",
+    "contact.usa.phone": "USA Phone",
+    "contact.mm.phone": "Myanmar Phone",
+
+    "contact.edit.title":"Edit Contact Us",
+
+    "term":"Terms of service",
+    "term.btn":"Terms of service",
+
+    "faq.btn":"FAQs",
+    "faq.title":"Frequently Asked Questions",
+    
+    "faq.add.title":"New FAQ",
+    "faq.edit.title":"Edit FAQ",
+    "faq.edit.eng":"English",
+    "faq.edit.mm":"Myanmar",
+    "faq.edit.question":"Question",
+    "faq.edit.answer":"Answer",
+    "faq.edit.sn":"S/N",
+    "faq.edit.delete.confirm":"Delete this FAQ?",
+    "faq.edit.page":"Additional Page",
+    "faq.edit.page.label.eng":"Page label in English",
+    "faq.edit.page.label.mm":"Page label in Myanmar",
+
+        
+    "language.selection.title":"Please select your language",
+
+    "welcome.signin":"Sign In",
+    "welcome.msg":"Welcome to FCS!",
+
+    "home.invitation.request.msg":"We are working on your invitation request!",
+
+    "sms.verify.title":"Verify your number",
+    "sms.six.digit":"Enter 6 digit sms code sent to",
+    "sms.resend":"Resend",
+    "sms.resend.seconds":"Resend again in {0} seconds",
+
+    "invite.title":"You need invitation from FCS",
+    "invite.name.enter":"Please enter your name",
+    "invite.request":"Request Invitation",
+    "invite.request.successful":"Successfully requested!",
+    "invite.btn":"Invite",
+
+    "customer.list.title":"Customers",
+    "customer.name":"Name",
+    "customer.phone":"Phone Number",
+    "customer.status":"Status",
+    "customer.fcs.id":"FCS ID",
+    "customer.invitation.request.confirm":"Accept Customer",
+
+    "invitation.list": "Invitations",
+    "invitation.edit": "Invitation",
+    "invitation.new": "New Invitation",
+    "invitation.confirm.delete": "Delete this invitation?",
+
+    "staff.title":"Staffs",
+    "staff.list.title":"Staffs",
+    "staff.new":"New Staff",
+    "staff.form.title":"Staff",
+    "staff.add":"Add",
+    "staff.update":"Update",
+    "staff.phone.search":"Enter phone number",
+
+    "profile.title": "My Profile",
+    "profile.edit_title": "Edit My Profile",
+    "profile.name": "Name",
+    "profile.phone": "Phone",
+    "profile.language": "Languages",
+    "profile.logout": "logout",
+    "profile.usa.shipping.address": "USA Shipping Address",
+    "profile.logout.confirm":"Are you sure want to logout?",
+    "profile.devices":"Devices",
+    "profile.email":"Email",
+    "profile.privilege":"Privilege",
+
+    "package.btn.name":"Track Packages",
+    "package.title":"Packages",
+    "package.create.title":"New Packages",
+    "package.create.fcs.id":"FCS ID",
+    "package.create.name":"Customer Name",
+    "package.create.phone":"Phone Number",
+    "package.tracking.id":"Tracking ID",
+    "package.create.packages":"Complete receiving",
+    "package.create.market":"Market",
+    "package.delete.confirm":"Delete this package?",
+
+    "package.edit.status":"Status",
+    "package.edit.title":"Edit Package",
+    "package.edit.remark":"Remark",
+    "package.edit.desc":"Description",
+    "package.edit.complete.process.btn":"Complete processing",
+    "package.edit.procseeing":"Processing",
+
+    "package.info.title":"Package",
+
+    "package.arrival.date":"Arrival Date",
+    "package.number":"Box Number",
+    "package.rate":"Rate",
+    "package.weight":"Weight",
+    "package.amount":"Amount",
+
+    "market.edit.title":"Markets",
+    "market.edit.name":"Market Name",
+    "market.remove.confirm":"Remove this market?",
+
+    "buy_online.title":"Buying instructions",
+    "buy_online":"Buying Instructions",
+    "buy_online.buying_instruction":"See below instructions to add USA shipping address while shoping online",
+    "buy_online.fullname":"With Full Name",
+    "buy_online.first.last":"With First Name and Last Name",
+
+    "pm.title":"Payment Methods",
+    "pm.new":"New Payment Method",
+    "pm.update":"Update Payment Method",
+    "pm.btn":"Payment Methods",
+    "pm.name":"Name",
+    "pm.account.name":"Account Name",
+    "pm.account.no":"Account Number",
+    "pm.phone":"Phone Number",
+    "pm.email":"Email Address",
+    "pm.link":"Link",
+    "pm.add.btn":"Add Payment Method",
+    "pm.save.btn":"Save Payment Method",
+    "pm.delete.confirm":"Delete this Payment Method?",
+
+    "message.view.detail":"View Deatil",
+    "message.hint.input":"Type your message...",
+
     "btn.save": "Save",
     "btn.approve":"Approve",
+    "btn.delete":"Delete",
+    "btn.select":"Select",
+    "btn.cancel":"Cancel",
+
+    "================================================================":"",
+
 
     "product": "Product",
     "price": "Price",
@@ -104,16 +262,7 @@
     "reg.confirm":"Submit Registration?",
     "reg.date":"Registeration Date",
 
-    "profile.title": "Profile",
+
-    "profile.edit_title": "Edit FCS Profile",
-    "profile.name": "Name",
-    "profile.phone": "Phone",
-    "profile.language": "Languages",
-    "profile.logout": "logout",
-    "profile.logout.confirm":"Are you sure want to logout?",
-    "profile.devices":"Devices",
-    "profile.email":"Email",
-    "profile.privilege":"Privilege",
 
     "device.confirm":"Confirm this device?",
     "device.logout":"Logout this device?",
@@ -267,8 +416,6 @@
     "buyer.delete.confirm":"Delete buyer request?",
     "buyer.allocate.quota.confirm":"Allocate Quota?",
    
-    "term.agree_btn":"Agree",
-    "term.iagree":"I agree on terms and condition.",
 
     "noti.title":"Notifications",
     "noti.list.title":"NOTIFICATIONS",
@@ -279,25 +426,8 @@
     "document.by":"By",
     "document.desc":"Description",
 
-    "contact.title":"Contacts",
-    "contact.phone.title":"Input Phone Number",
-    "contact.phone":"Phone Number",
-    "contact.phone.confim":"Call {0}?",
-    "contact.phone.empty":"Please enter phone number",
-    "contact.email":"Email",
-    "contact.email.configm":"Email to '{0}'?",
-    "contact.email.empty":"Please enter email",
-    "contact.facebook":"Facebook",
-    "contact.facebook.empty":"Please enter facebook url",
-    "contact.google":"Website",
-    "contact.google.empty":"Please enter website url",
-    "contact.confrim":"Confirm update contact?",
-    "contact.open.confrim":"Open '{0}'?",
-    "contact.bank.accounts":"Bank Accounts Info",
-    "contact.address":"Address",
-    "contact.delivery.phone":"Delivery Phone",
 
-    "term.title":"Terms",
+    
     "manual.title":"Manual",
     "myreg.title":"My\nRegistration",
     "storage.title":"Storages",
@@ -467,11 +597,6 @@
     "login": "SignIn",
     "login.title":"Sign in to FCS",
     "login.phone":"Enter phone number",
-    "login.smscode.retry":"Resend again in {0} seconds",
-
-    "singup.verify.title":"Verify your number",
-    "singup.code_sent":"Enter 6 digit sms code sent to",
-    "singup.resend":"Resend",
 
     "user_edit.welcome":"Welcome to FCS",
     "user_edit.name":"Please enter your name",
@@ -479,24 +604,11 @@
     "user.fcs_id":"MY FCS_ID",
     "user.shipping_address":"USA SHIPPING ADDRESS",
     "user.deliveryAddress":"My delivery address",
-    "user.buying_instruction":"See below instructions to add USA shipping address while shoping online",
     "user.form.shipping_address":"ADDRESS",
 
-    "buy_online":"Buying Instructions",
-    "buy_online.title":"BUYING INSTRUCTIONS",
-    "buy.amazon":"Amazon",
-    "buy.newegg":"Newegg",
-    "buy.macy":"Macy",
-    "buy.instruction":"Adding your shipment address in {0}",
 
     "notifications.title":"Notification",
 
-    "staff.title":"Staffs",
-    "staff.list.title":"STAFFS",
-    "staff.new":"New Staff",
-    "staff.form.title":"STAFF",
-    "staff.add":"Add",
-    "staff.update":"Update",
 
     "shipment.title":"FCS Shipments",
     "shipment.list.title":"FCS SHIPMENTS",
@@ -535,17 +647,6 @@
     "box.width":"Width",
     "box.height":"Height",
 
-    "package.name":"Packages",
-    "package.title":"PACKAGES",
-    "package.new":"New Package",
-    "package.edit.title":"PACKAGE",
-    "package.arrival.date":"Arrival Date",
-    "package.number":"Box Number",
-    "package.rate":"Rate",
-    "package.weight":"Weight",
-    "package.amount":"Amount",
-    
-
     "pickup.date": "Pickup Date",
     "pickup.location_time": "Pickup Location / Time",
     "pickup.information": "Pickup Informations",
@@ -565,20 +666,11 @@
     "invoice.add_box":"Add Box",
     "invoice.add_package":"Add Package",
 
-    "term":"TERMS",
-    "term.btn":"Terms of services",
 
-    "customer.list.title":"CUSTOMERS",
-    "customer.form.title":"CUSTOMER",
-    "customer.invite":"Invite",
-
-    "contact": "CONTACT US",
 
     "fcs.btn": "FCS Profile",
     "fcs.profile": "FCS PROFILE",
 
-    "contact.usa.phone": "USA Phone",
-    "contact.mm.phone": "Myanmar Phone",
 
     "payment.title": "PAYMENT",
     "payment.date": "Date",
@@ -589,11 +681,6 @@
     "remaining_balance":"Remaining Balance : ",
     "total.amount": "Amount :",
 
-    "payment.method.btn":"Payment Methods",
-    "payment.method.title":"PAYMENT METHODS",
-    "payment.method.new":"New Payment Method",
-    "payment.method.form":"PAYMENT METHOD",
-
     "discount.btn":"Discounts",
     "discount.title":"DISCOUNTS",
     "discount.new":"New Discount",

assets/local/localization_mu.json

@@ -1,6 +1,172 @@
 {
+    "contact.btn":"ဆက်သွယ်ရန်",
+    "contact.title":"ဆက်သွယ်ရန်",
+    "contact.phone.title":"ဖုန်းနံပါတ်ထည့်သွင်းရန်",
+    "contact.phone":"ဖုန်းနံပါတ်",
+    "contact.usa.phone": "အမေရိကား ဖုန်းနံပါတ်",
+    "contact.mm.phone": "မြန်မာ ဖုန်းနံပါတ်",
+    "contact.phone.confim":"ဖုန်းနံပါတ် '{0}' ကို ခေါ်မလား?",
+    "contact.phone.empty":"ကျေးဇူးပြု၍ ဖုန်းနံပါတ်ထည့်ပါ",
+    "contact.email":"အီးမေးလ်",
+    "contact.email.configm":"အီးမေးလ် '{0}' ကိုပို့ မလား?",
+    "contact.email.empty":"ကျေးဇူးပြု၍ အီးမေးလ်ထည့်ပါ",
+    "contact.facebook":"ဖေ့စ်ဘွတ်ခ်",
+    "contact.facebook.empty":"ကျေးဇူးပြုပြီး ဖေ့စ်ဘွတ်ခ် လင့်ခ် ကိုရိုက်ထည့်ပါ",
+    "contact.google":"ဝဘ်ဆိုက်",
+    "contact.google.empty":"ကျေးဇူးပြုပြီး ဝဘ်ဆိုက် လင့်ခ် ကိုရိုက်ထည့်ပါ",
+    "contact.confrim":"ဆက်သွယ်ခြင်း ကိုပြင်မည်လား?",
+    "contact.open.confrim":"'{0}' ကိုဖွင့် မလား?",
+    "contact.bank.accounts":"ဘဏ်အကောင့်အချက်အလက်",
+    "contact.address":"လိပ်စာ",
+    "contact.delivery.phone":"သီလဝါ ဆီထုတ် ဖုန်းနံပါတ်",
+    "contact.usa.address":"အမေရိကား လိပ်စာ",
+    "contact.mm.address":"မြန်မာ လိပ်စာ",
+    "contact.fcs.email":"FCS အီးမေးလ်",
+    "contact.callus":"ခေါ်ရန်",
+    "contact.findus":"တည်နေရာ",
+    "contact.emailus":"အီးမေးလ်",
+    "contact.visitus":"ကြည့်ပါ",
+
+    "contact.edit.title":"ဆက်သွယ်ရန် ပြုပြင်ခြင်း",
+
+    "term":"စည်းကမ်းချက်များ",
+    "term.btn":"စည်းကမ်းချက်များ",
+
+    "faq.btn":"မေးလေ့ရှိသောမေးခွန်းများ",
+    "faq.title":"မေးလေ့ရှိသောမေးခွန်းများ",
+
+    "faq.add.title":"မေးခွန်း အသစ်",
+    "faq.edit.title":"မေးခွန်း ပြုပြင်ခြင်း",    
+    "faq.edit.eng":"အင်္ဂလိပ်",
+    "faq.edit.mm":"မြန်မာ",
+    "faq.edit.question":"မေးခွန်း",
+    "faq.edit.answer":"အဖြေ",
+    "faq.edit.sn":"S/N",
+    "faq.edit.delete.confirm":"Delete this FAQ?",
+    "faq.edit.page":"Additional Page",
+    "faq.edit.page.label":"Page label",
+    "faq.edit.page.label.eng":"Page label in English",
+    "faq.edit.page.label.mm":"Page label in Myanmar",
+
+
+    "language.selection.title":"ဘာသာစကား ရွေးချယ်ပါ",
+
+    "welcome.signin":"ဝင်မည်",
+    "welcome.msg":"FCS က ကြိုဆိုပါတယ်!",
+
+    "home.invitation.request.msg":"ဖိတ်ကြားမှု တောင်းဆိုသည်ကို လုပ်ဆောင်နေပါသည်!",
+
+    "sms.verify.title":"သင့်နံပါတ်ကိုအတည်ပြုပါ",
+    "sms.six.digit":"SMS ဂဏန်း ခြောက်လုံး ကိုရိုက်ထဲ့ပါ",
+    "sms.resend":"ပြန်ပို့ရန်",
+    "sms.resend.seconds":"SMS ပြန်ပို့ရန် {0} စက္ကန့် စောင့်ပါ",
+
+    "invite.title":"FCS ဖိတ်ကြားမှု လိုအပ်သည်",
+    "invite.name.enter":"နာမည် ရိုက်ထည့်ပါ",
+    "invite.request":"ဖိတ်ကြားမှု တောင်းဆိုမည်",
+    "invite.request.successful":"တောင်းဆိုမှု အောင်မြင်သည်!",
+    "invite.btn":"ဖိတ်ကြားမည်",
+
+    "customer.list.title":"ဝယ်ယူသူများ",
+    "customer.name":"နာမည်",
+    "customer.phone":"ဖုန်းနံပါတ်",
+    "customer.status":"အခြေအနေ",
+    "customer.fcs.id":"FCS ID",
+    "customer.invitation.request.confirm":"လက်ခံ လိုက်ပါ",
+
+    "invitation.list": "ဖိတ်ကြားမှုများ",
+    "invitation.edit": "ဖိတ်ကြားမှု",
+    "invitation.new": "ဖိတ်ကြားမှု အသစ်",
+    "invitation.confirm.delete": "ဖိတ်ကြားမှု ဖျက်မလား?",
+
+    "staff.title":"ဝန်ထမ်းများ",
+    "staff.list.title":"ဝန်ထမ်းများ",
+    "staff.new":"ဝန်ထမ်း အသစ်",
+    "staff.form.title":"ဝန်ထမ်း",
+    "staff.add":"အသစ်ထည့်မည်",
+    "staff.update":"ပြုပြင်မည်",
+    "staff.phone.search":"ဖုန်းနံပါတ် ရိုက်ထည့်ပါ",
+
+    "profile.title":"ကျွန်ုပ် ပရိုဖိုင်",
+    "profile.edit_title":"ကျွန်ုပ် ပရိုဖိုင်ကိုပြုပြင်ရန်",
+    "profile.name":"နာမည်",
+    "profile.phone": "ဖုန်းနံပါတ်",
+    "profile.language": "ဘာသာစကားများ",
+    "profile.logout": "အကောင့်ထွက်ရန်",
+    "profile.usa.shipping.address": "အမေရိကား ပစည်းပို့ရန်လိပ်စာ",
+    "profile.logout.confirm":"အကောင့်ထွက်ရန်သေချာပြီလား?",
+    "profile.devices":"ဖုန်းမော်ဒယ်အမျိုးအစားများ",
+    "profile.email":"အီးမေးလ်",
+    "profile.privilege":"လုပ်ပိုင်ခွင့်",
+
+
+    "package.btn.name":"အထုပ်များ",
+    "package.title":"အထုပ်များ",
+    "package.create.title":"အထုပ် အသစ်များ",
+    "package.create.fcs.id":"FCS ID",
+    "package.create.name":"နာမည်",
+    "package.create.phone":"ဖုန်းနံပါတ်",
+    "package.tracking.id":"Tracking ID",
+    "package.create.packages":"အထုပ် အသစ်များ လက်ခံမည်",
+    "package.create.market":"အွန်လိုင်စျေးဆိုင်",
+    "package.delete.confirm":"အထုပ်ကို ဖျက်မလား?",
+
+    "package.edit.title":"အထုပ် ပြင်ဆင်ခြင်း",
+    "package.edit.remark":"မှတ်ချက်",
+    "package.edit.desc":"ဖော်ပြချက်",
+    "package.edit.complete.process.btn":"မွမ်းမံခြင်း ပြီးဆုံးသည်",
+    "package.edit.status":"အခြေအနေ",
+    "package.edit.procseeing":"မွမ်းမံခြင်း",
+
+    "package.info.title":"အထုပ်",
+
+    "package.arrival.date":"Arrival Date",
+    "package.number":"Package Number",
+    "package.rate":"Rate",
+    "package.weight":"Weight",
+    "package.amount":"Amount",
+
+    "market.edit.title":"Markets",
+    "market.edit.name":"Market Name",
+    "market.remove.confirm":"Remove this market?",
+
+    "buy_online.title":"ဝယ်ယူရန်ညွှန်ကြားချက်များ",
+    "buy_online":"ဝယ်ယူရန်ညွှန်ကြားချက်များ",
+    "buy_online.buying_instruction":"လိပ်စာထည့်ရန် ညွှန်ကြားချက်များကို အောက်တွင်ကြည့်ပါ",
+    "buy_online.fullname":"နာမည် အပြည့်အစုံ",
+    "buy_online.first.last":"ပထမအမည် နှင့် နောက်ဆုံးအမည်",
+
+    "pm.title":"ငွေပေးချေစနစ်များ",
+    "pm.new":"ငွေပေးချေစနစ်အသစ်",
+    "pm.update":"ငွေပေးချေစနစ် ပြင်ဆင်ခြင်း",
+    "pm.btn":"ငွေပေးချေစနစ်များ",
+    "pm.name":"အမည်",
+    "pm.account.name":"အကောင့် အမည်",
+    "pm.account.no":"အကောင့် နံပါတ်",
+    "pm.phone":"ဖုန်း နံပါတ်",
+    "pm.email":"အီးမေးလ် လိပ်စာ",
+    "pm.link":"အင်တာနက် လင့်",
+    "pm.add.btn":"ပေါင်းထည့်ရန်",
+    "pm.save.btn":"သိမ်းဆည်းရန်",
+    "pm.delete.confirm":"ငွေပေးချေစနစ်ကို ဖျက်မလား?",
+
+    "message.view.detail":"အသေးစိတ် ကြည့်ရန်",
+    "message.hint.input":"စာကို ဒီမှာ ရိုက်ထည့်ပါ...",
+
+    "boxes.name":"Boxes",
+    "boxes.title":"Boxes",
+    "boxes.new":"New Box",
+    "box.edit.title":"Edit Box",
+
     "btn.save":"သိမ်းဆည်းရန်",
     "btn.approve":"အတည်ပြုရန်",
+    "btn.delete":"ဖျက်ရန်",
+    "btn.select":"ရွေးချယ်ပါ",
+    "btn.cancel":"Cancel",
+
+    "================================================================":"",
+
+
 
     "product": "ကုန်ပစ္စည်း",
     "price": "ဈေးနှုန်း",
@@ -102,17 +268,6 @@
     "reg.confirm":"မှတ်ပုံတင်သွင်းမည်လား?",
     "reg.date":"မှတ်ပုံတင်သည့် နေ့စွဲ",
 
-    "profile.title":"ပရိုဖိုင်",
-    "profile.edit_title":"ပရိုဖိုင်ကိုပြုပြင်ရန်",
-    "profile.name":"နာမည်",
-    "profile.phone": "ဖုန်းနံပါတ်",
-    "profile.language": "ဘာသာစကားများ",
-    "profile.logout": "အကောင့်ထွက်ရန်",
-    "profile.logout.confirm":"အကောင့်ထွက်ရန်သေချာပြီလား?",
-    "profile.devices":"ဖုန်းမော်ဒယ်အမျိုးအစားများ",
-    "profile.email":"အီးမေးလ်",
-    "profile.privilege":"လုပ်ပိုင်ခွင့်",
-
     "device.confirm":"ဒီဖုန်းမော်ဒယ်ကိုအတည်ပြုမည်လား?",
     "device.logout":"ဒီဖုန်းမော်ဒယ်ကိုထွက်ရန်သေချာပြီလား?",
     "device.set_primary":"ဒီဖုန်းမော်ဒယ်ကိုမူလမော်ဒယ်ထည့်ရန်သေချာပြီလား?",
@@ -262,9 +417,6 @@
     "buyer.delete.confirm":"ဝယ်ယူသူပယ်ဖျက်မည်လား?",
     "buyer.allocate.quota.confirm":"ခွဲတမ်းသတ်မှတ်မည်လား?",
 
-    "term.agree_btn":"သဘောတူပါသည်",
-    "term.iagree":"ကျွန်တော် သဘောတူပါသည်",
-
     "noti.title":"အသိပေးချက်များ",
     "noti.list.title":"NOTIFICATIONS",
     "log.title":"မှတ်တမ်းများ",
@@ -274,26 +426,7 @@
     "document.by":"အားဖြင့်",
     "document.desc":"ဖော်ပြချက်",
 
-    "contact.title":"ဆက်သွယ်ရန်",
-    "contact.phone.title":"ဖုန်းနံပါတ်ထည့်သွင်းရန်",
-    "contact.phone":"ဖုန်းနံပါတ်",
-    "contact.phone.confim":"ဖုန်းနံပါတ် '{0}' ကို ခေါ်မလား?",
-    "contact.phone.empty":"ကျေးဇူးပြု၍ ဖုန်းနံပါတ်ထည့်ပါ",
-    "contact.email":"အီးမေးလ်",
-    "contact.email.configm":"အီးမေးလ် '{0}' ကိုပို့ မလား?",
-    "contact.email.empty":"ကျေးဇူးပြု၍ အီးမေးလ်ထည့်ပါ",
-    "contact.facebook":"ဖေ့စ်ဘွတ်ခ်",
-    "contact.facebook.empty":"ကျေးဇူးပြုပြီး ဖေ့စ်ဘွတ်ခ် လင့်ခ် ကိုရိုက်ထည့်ပါ",
-    "contact.google":"ဝဘ်ဆိုက်",
-    "contact.google.empty":"ကျေးဇူးပြုပြီး ဝဘ်ဆိုက် လင့်ခ် ကိုရိုက်ထည့်ပါ",
-    "contact.confrim":"ဆက်သွယ်ခြင်း ကိုပြင်မည်လား?",
-    "contact.open.confrim":"'{0}' ကိုဖွင့် မလား?",
-    "contact.bank.accounts":"ဘဏ်အကောင့်အချက်အလက်",
-    "contact.address":"လိပ်စာ",
-    "contact.delivery.phone":"သီလဝါ ဆီထုတ် ဖုန်းနံပါတ်",
 
-
-    "term.title":"စည်းကမ်းချက်များ",
     "manual.title":"လက်စွဲစာအုပ်",
     "myreg.title":"ကိုယ်ရေး\nအချက်အလက်",
     "storage.title":"သိုလှောင်ကန်များ",
@@ -500,11 +633,6 @@
     "login": "SignIn",
     "login.title":"FCS သို့အကောင့်ဒ်၀င်ပါ",
     "login.phone":"ဖုန်းနံပါတ်ထည့်ပါ",
-    "login.smscode.retry":"Resend again in {0} seconds",
-
-    "singup.verify.title":"သင့်နံပါတ်ကိုအတည်ပြုပါ",
-    "singup.code_sent":"Enter 6 digit sms code sent to",
-    "singup.resend":"ပြန်ပို့ရန်",
 
     "user_edit.welcome":"FCS မှကြိုဆိုပါသည်",
     "user_edit.name":"ကျေးဇူးပြု၍ နာမည်ထည့်ပေးပါ",
@@ -512,42 +640,16 @@
     "user.fcs_id":"My FCS_ID",
     "user.shipping_address":"My USA shipping address",
     "user.deliveryAddress":"My delivery address",
-    "user.buying_instruction":"See below instructions to add shipping address",
     "user.form.shipping_address":"ကုန်ပစ္စည်းပို့ဆောင်ရမည့်လိပ်စာ",
 
-    "buy_online":"ဝယ်ယူရန်ညွှန်ကြားချက်များ",
-    "buy_online.title":"ဝယ်ယူရန်ညွှန်ကြားချက်များ",
-    "buy.amazon":"Amazon",
-    "buy.newegg":"Newegg",
-    "buy.macy":"Macy",
-    "buy.instruction":"Adding your shipment address in {0}",
-
     "notifications.title":"Notifications",
 
-    "staff.title":"FCS ဝန်ထမ်းများ",
-    "staff.list.title":"FCS ဝန်ထမ်းများ",
-    "staff.new":"New Staff",
-    "staff.form.title":"FCS STAFF",
-    "staff.add":"Add",
-    "staff.update":"Update",
-
     "shipment.title":"FCS တင်ပို့ခြင်းများ",
     "shipment.list.title":"FCS တင်ပို့ခြင်းများ",
     "shipment.add":"New FCS shipment",
     "shipment.form.title":"FCS SHIPMENT",
     "shipment.number":"FCS Shipment Number",
         
-    
-    "package.name":"Packages",
-    "package.title":"PACKAGES",
-    "package.new":"New Package",
-    "package.edit.title":"PACKAGE",
-    "package.arrival.date":"Arrival Date",
-    "package.number":"Package Number",
-    "package.rate":"Rate",
-    "package.weight":"Weight",
-    "package.amount":"Amount",
-    
     "pickup": "Shipments",
     "pickup.title": "SHIPMENTS",
     "pickup.new": "New Shipment",
@@ -574,7 +676,6 @@
 
     "customers.btn": "ဝယ်ယူသူများ",
     "customers.title": "ဝယ်ယူသူများ",
-    "customer.invite":"Invite",
 
     "invoices.btn": "ငွေတောင်းခံလွှာများ",
     "invoices.title": "ငွေတောင်းခံလွှာများ",
@@ -584,18 +685,10 @@
     "invoice.add_package":"Add Package",
     "invoice.add_box":"Add Box",
 
-    "term":"စည်းကမ်းချက်များ",
-    "term.btn":"စည်းကမ်းချက်များ",
 
-    "customer.list.title":"ဝယ်ယူသူများ",
-    "customer.form.title":"ဝယ်ယူသူ",
-
-    "contact": "ဆက်သွယ်ရန်",
 
     "fcs.profile": "ပရိုဖိုင်",
 
-    "contact.usa.phone": "ယူအက်စ်အေ ဖုန်းနံပါတ်",
-    "contact.mm.phone": "မြန်မာ ဖုန်းနံပါတ်",
 
     "payment.title": "ငွေပေးချေခြင်း",
     "payment.date": "ရက်စွဲ",
@@ -606,11 +699,6 @@
     "remaining_balance":"ပေးချေရန်ကျန်ရှိငွေ : ", 
     "total.amount": "ပမာဏ :",
 
-    "payment.method.btn":"ငွေပေးချေစနစ်",
-    "payment.method.title":"ငွေပေးချေစနစ်",
-    "payment.method.new":"ငွေပေးချေစနစ်အသစ်",
-    "payment.method.form":"ငွေပေးချေစနစ်",
-
     "discount.btn":"လျှော့စျေးများ",
     "discount.title":"လျှော့စျေးများ",
     "discount.new":"လျှော့စျေး",

ios/Flutter/.last_build_id

@@ -0,0 +1 @@
+771d17f946c2bdb9cccb6f6067d288ab

ios/GoogleService-Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>944560757353-o6emrja7ad8g8ulbcvvpah9a1tul3s21.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.944560757353-o6emrja7ad8g8ulbcvvpah9a1tul3s21</string>
+	<key>API_KEY</key>
+	<string>AIzaSyBZICfIDWbWqjxHwY_jFnWv34EtCpiiE78</string>
+	<key>GCM_SENDER_ID</key>
+	<string>944560757353</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.mokkon.fcs.dev</string>
+	<key>PROJECT_ID</key>
+	<string>fcs-dev1</string>
+	<key>STORAGE_BUCKET</key>
+	<string>fcs-dev1.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:944560757353:ios:de037244faea4173fa60f8</string>
+	<key>DATABASE_URL</key>
+	<string>https://fcs-dev1.firebaseio.com</string>
+</dict>
+</plist>

ios/Podfile

@@ -10,75 +10,30 @@ project 'Runner', {
   'Release' => :release,
 }
 
-def parse_KV_file(file, separator='=')
+def flutter_root
-  file_abs_path = File.expand_path(file)
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
-  if !File.exists? file_abs_path
+  unless File.exist?(generated_xcode_build_settings_path)
-    return [];
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
   end
-  generated_key_values = {}
+
-  skip_line_start_symbols = ["#", "/"]
+  File.foreach(generated_xcode_build_settings_path) do |line|
-  File.foreach(file_abs_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
-    next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
+    return matches[1].strip if matches
-    plugin = line.split(pattern=separator)
-    if plugin.length == 2
-      podname = plugin[0].strip()
-      path = plugin[1].strip()
-      podpath = File.expand_path("#{path}", file_abs_path)
-      generated_key_values[podname] = podpath
-    else
-      puts "Invalid plugin specification: #{line}"
-    end
   end
-  generated_key_values
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
 end
 
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
 target 'Runner' do
-  # Flutter Pod
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-
-  copied_flutter_dir = File.join(__dir__, 'Flutter')
-  copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework')
-  copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec')
-  unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path)
-    # Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet.
-    # That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration.
-    # CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist.
-
-    generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig')
-    unless File.exist?(generated_xcode_build_settings_path)
-      raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first"
-    end
-    generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path)
-    cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR'];
-
-    unless File.exist?(copied_framework_path)
-      FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir)
-    end
-    unless File.exist?(copied_podspec_path)
-      FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir)
-    end
-  end
-
-  # Keep pod path relative so it can be checked into Podfile.lock.
-  pod 'Flutter', :path => 'Flutter'
-
-  # Plugin Pods
-
-  # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
-  # referring to absolute paths on developers' machines.
-  system('rm -rf .symlinks')
-  system('mkdir -p .symlinks/plugins')
-  plugin_pods = parse_KV_file('../.flutter-plugins')
-  plugin_pods.each do |name, path|
-    symlink = File.join('.symlinks', 'plugins', name)
-    File.symlink(path, symlink)
-    pod name, :path => File.join(symlink, 'ios')
-  end
 end
 
 post_install do |installer|
   installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
+    flutter_additional_ios_build_settings(target)
-      config.build_settings['ENABLE_BITCODE'] = 'NO'
-    end
   end
 end
+use_frameworks!

ios/Podfile.lock

@@ -212,6 +212,10 @@ PODS:
     - abseil/base/base_internal
     - abseil/base/config
     - abseil/meta/type_traits
+  - barcode_scan (0.0.1):
+    - Flutter
+    - MTBBarcodeScanner
+    - SwiftProtobuf
   - BoringSSL-GRPC (0.0.7):
     - BoringSSL-GRPC/Implementation (= 0.0.7)
     - BoringSSL-GRPC/Interface (= 0.0.7)
@@ -224,43 +228,37 @@ PODS:
     - Firebase/Core
     - Firebase/Firestore (~> 6.0)
     - Flutter
-  - cloud_firestore_web (0.1.0):
-    - Flutter
   - connectivity (0.0.1):
     - Flutter
     - Reachability
-  - connectivity_macos (0.0.1):
-    - Flutter
   - device_info (0.0.1):
     - Flutter
   - downloads_path_provider (0.0.1):
     - Flutter
-  - Firebase/Auth (6.25.0):
+  - Firebase/Auth (6.31.1):
     - Firebase/CoreOnly
-    - FirebaseAuth (~> 6.5.3)
+    - FirebaseAuth (~> 6.9.0)
-  - Firebase/Core (6.25.0):
+  - Firebase/Core (6.31.1):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (= 6.5.1)
+    - FirebaseAnalytics (= 6.8.0)
-  - Firebase/CoreOnly (6.25.0):
+  - Firebase/CoreOnly (6.31.1):
-    - FirebaseCore (= 6.7.1)
+    - FirebaseCore (= 6.10.1)
-  - Firebase/Firestore (6.25.0):
+  - Firebase/Firestore (6.31.1):
     - Firebase/CoreOnly
-    - FirebaseFirestore (~> 1.14.0)
+    - FirebaseFirestore (~> 1.17.0)
-  - Firebase/Messaging (6.25.0):
+  - Firebase/Messaging (6.31.1):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 4.4.1)
+    - FirebaseMessaging (~> 4.6.2)
-  - Firebase/Storage (6.25.0):
+  - Firebase/Storage (6.31.1):
     - Firebase/CoreOnly
-    - FirebaseStorage (~> 3.6.1)
+    - FirebaseStorage (~> 3.9.0)
   - firebase_auth (0.0.1):
-    - Firebase/Auth (~> 6.0)
+    - Firebase/Auth (~> 6.3)
     - Firebase/Core
     - Flutter
   - firebase_core (0.0.1):
     - Firebase/Core
     - Flutter
-  - firebase_core_web (0.1.0):
-    - Flutter
   - firebase_messaging (0.0.1):
     - Firebase/Core
     - Firebase/Messaging
@@ -268,36 +266,30 @@ PODS:
   - firebase_storage (0.0.1):
     - Firebase/Storage
     - Flutter
-  - FirebaseAnalytics (6.5.1):
+  - FirebaseAnalytics (6.8.0):
-    - FirebaseCore (~> 6.7)
+    - FirebaseCore (~> 6.10)
-    - FirebaseInstallations (~> 1.2)
+    - FirebaseInstallations (~> 1.6)
-    - GoogleAppMeasurement (= 6.5.1)
+    - GoogleAppMeasurement (= 6.8.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
-    - GoogleUtilities/MethodSwizzler (~> 6.0)
+    - GoogleUtilities/MethodSwizzler (~> 6.7)
-    - GoogleUtilities/Network (~> 6.0)
+    - GoogleUtilities/Network (~> 6.7)
-    - "GoogleUtilities/NSData+zlib (~> 6.0)"
+    - "GoogleUtilities/NSData+zlib (~> 6.7)"
-    - nanopb (~> 1.30905.0)
+    - nanopb (~> 1.30906.0)
-  - FirebaseAnalyticsInterop (1.5.0)
+  - FirebaseAuth (6.9.0):
-  - FirebaseAuth (6.5.3):
+    - FirebaseCore (~> 6.10)
-    - FirebaseAuthInterop (~> 1.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
-    - FirebaseCore (~> 6.6)
+    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.5)
-    - GoogleUtilities/Environment (~> 6.5)
     - GTMSessionFetcher/Core (~> 1.1)
-  - FirebaseAuthInterop (1.1.0)
+  - FirebaseCore (6.10.1):
-  - FirebaseCore (6.7.1):
+    - FirebaseCoreDiagnostics (~> 1.6)
-    - FirebaseCoreDiagnostics (~> 1.3)
+    - GoogleUtilities/Environment (~> 6.7)
-    - FirebaseCoreDiagnosticsInterop (~> 1.2)
+    - GoogleUtilities/Logger (~> 6.7)
-    - GoogleUtilities/Environment (~> 6.5)
+  - FirebaseCoreDiagnostics (1.6.0):
-    - GoogleUtilities/Logger (~> 6.5)
+    - GoogleDataTransport (~> 7.2)
-  - FirebaseCoreDiagnostics (1.3.0):
+    - GoogleUtilities/Environment (~> 6.7)
-    - FirebaseCoreDiagnosticsInterop (~> 1.2)
+    - GoogleUtilities/Logger (~> 6.7)
-    - GoogleDataTransportCCTSupport (~> 3.1)
+    - nanopb (~> 1.30906.0)
-    - GoogleUtilities/Environment (~> 6.5)
+  - FirebaseFirestore (1.17.0):
-    - GoogleUtilities/Logger (~> 6.5)
-    - nanopb (~> 1.30905.0)
-  - FirebaseCoreDiagnosticsInterop (1.2.0)
-  - FirebaseFirestore (1.14.0):
     - abseil/algorithm (= 0.20200225.0)
     - abseil/base (= 0.20200225.0)
     - abseil/memory (= 0.20200225.0)
@@ -305,71 +297,66 @@ PODS:
     - abseil/strings/strings (= 0.20200225.0)
     - abseil/time (= 0.20200225.0)
     - abseil/types (= 0.20200225.0)
-    - FirebaseAuthInterop (~> 1.0)
+    - FirebaseCore (~> 6.10)
-    - FirebaseCore (~> 6.2)
     - "gRPC-C++ (~> 1.28.0)"
     - leveldb-library (~> 1.22)
-    - nanopb (~> 1.30905.0)
+    - nanopb (~> 1.30906.0)
-  - FirebaseInstallations (1.2.0):
+  - FirebaseInstallations (1.7.0):
-    - FirebaseCore (~> 6.6)
+    - FirebaseCore (~> 6.10)
-    - GoogleUtilities/Environment (~> 6.6)
+    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/UserDefaults (~> 6.6)
+    - GoogleUtilities/UserDefaults (~> 6.7)
     - PromisesObjC (~> 1.2)
-  - FirebaseInstanceID (4.3.4):
+  - FirebaseInstanceID (4.6.0):
-    - FirebaseCore (~> 6.6)
+    - FirebaseCore (~> 6.10)
-    - FirebaseInstallations (~> 1.0)
+    - FirebaseInstallations (~> 1.6)
-    - GoogleUtilities/Environment (~> 6.5)
+    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/UserDefaults (~> 6.5)
+    - GoogleUtilities/UserDefaults (~> 6.7)
-  - FirebaseMessaging (4.4.1):
+  - FirebaseMessaging (4.6.2):
-    - FirebaseAnalyticsInterop (~> 1.5)
+    - FirebaseCore (~> 6.10)
-    - FirebaseCore (~> 6.6)
+    - FirebaseInstanceID (~> 4.6)
-    - FirebaseInstanceID (~> 4.3)
+    - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.5)
+    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/Environment (~> 6.5)
+    - GoogleUtilities/Reachability (~> 6.7)
-    - GoogleUtilities/Reachability (~> 6.5)
+    - GoogleUtilities/UserDefaults (~> 6.7)
-    - GoogleUtilities/UserDefaults (~> 6.5)
     - Protobuf (>= 3.9.2, ~> 3.9)
-  - FirebaseStorage (3.6.1):
+  - FirebaseStorage (3.9.0):
-    - FirebaseAuthInterop (~> 1.1)
+    - FirebaseCore (~> 6.10)
-    - FirebaseCore (~> 6.6)
     - GTMSessionFetcher/Core (~> 1.1)
   - Flutter (1.0.0)
   - flutter_downloader (0.0.1):
     - Flutter
-  - flutter_plugin_android_lifecycle (0.0.1):
+  - flutter_local_notifications (0.0.1):
+    - Flutter
+  - flutter_pdfview (1.0.2):
     - Flutter
   - flutter_ringtone_player (0.0.1):
     - Flutter
-  - google_api_availability (2.0.4):
+  - GoogleAppMeasurement (6.8.0):
-    - Flutter
+    - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
-  - GoogleAppMeasurement (6.5.1):
+    - GoogleUtilities/MethodSwizzler (~> 6.7)
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
+    - GoogleUtilities/Network (~> 6.7)
-    - GoogleUtilities/MethodSwizzler (~> 6.0)
+    - "GoogleUtilities/NSData+zlib (~> 6.7)"
-    - GoogleUtilities/Network (~> 6.0)
+    - nanopb (~> 1.30906.0)
-    - "GoogleUtilities/NSData+zlib (~> 6.0)"
+  - GoogleDataTransport (7.3.0):
-    - nanopb (~> 1.30905.0)
+    - nanopb (~> 1.30906.0)
-  - GoogleDataTransport (6.1.1)
+  - GoogleUtilities/AppDelegateSwizzler (6.7.2):
-  - GoogleDataTransportCCTSupport (3.1.0):
-    - GoogleDataTransport (~> 6.1)
-    - nanopb (~> 1.30905.0)
-  - GoogleUtilities/AppDelegateSwizzler (6.6.0):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (6.6.0):
+  - GoogleUtilities/Environment (6.7.2):
     - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Logger (6.6.0):
+  - GoogleUtilities/Logger (6.7.2):
     - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (6.6.0):
+  - GoogleUtilities/MethodSwizzler (6.7.2):
     - GoogleUtilities/Logger
-  - GoogleUtilities/Network (6.6.0):
+  - GoogleUtilities/Network (6.7.2):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (6.6.0)"
+  - "GoogleUtilities/NSData+zlib (6.7.2)"
-  - GoogleUtilities/Reachability (6.6.0):
+  - GoogleUtilities/Reachability (6.7.2):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (6.6.0):
+  - GoogleUtilities/UserDefaults (6.7.2):
     - GoogleUtilities/Logger
   - "gRPC-C++ (1.28.2)":
     - "gRPC-C++/Implementation (= 1.28.2)"
@@ -399,67 +386,52 @@ PODS:
   - image_picker (0.0.1):
     - Flutter
   - leveldb-library (1.22)
-  - nanopb (1.30905.0):
+  - MTBBarcodeScanner (5.0.11)
-    - nanopb/decode (= 1.30905.0)
+  - nanopb (1.30906.0):
-    - nanopb/encode (= 1.30905.0)
+    - nanopb/decode (= 1.30906.0)
-  - nanopb/decode (1.30905.0)
+    - nanopb/encode (= 1.30906.0)
-  - nanopb/encode (1.30905.0)
+  - nanopb/decode (1.30906.0)
+  - nanopb/encode (1.30906.0)
   - open_file (0.0.1):
     - Flutter
   - package_info (0.0.1):
     - Flutter
   - path_provider (0.0.1):
     - Flutter
-  - path_provider_macos (0.0.1):
-    - Flutter
   - "permission_handler (4.4.0+hotfix.4)":
     - Flutter
-  - PromisesObjC (1.2.8)
+  - PromisesObjC (1.2.10)
-  - Protobuf (3.12.0)
+  - Protobuf (3.13.0)
   - Reachability (3.2)
   - shared_preferences (0.0.1):
     - Flutter
-  - shared_preferences_macos (0.0.1):
+  - SwiftProtobuf (1.12.0)
-    - Flutter
-  - shared_preferences_web (0.0.1):
-    - Flutter
   - url_launcher (0.0.1):
     - Flutter
-  - url_launcher_macos (0.0.1):
-    - Flutter
-  - url_launcher_web (0.0.1):
-    - Flutter
 
 DEPENDENCIES:
+  - barcode_scan (from `.symlinks/plugins/barcode_scan/ios`)
   - camera (from `.symlinks/plugins/camera/ios`)
   - cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`)
-  - cloud_firestore_web (from `.symlinks/plugins/cloud_firestore_web/ios`)
   - connectivity (from `.symlinks/plugins/connectivity/ios`)
-  - connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`)
   - device_info (from `.symlinks/plugins/device_info/ios`)
   - downloads_path_provider (from `.symlinks/plugins/downloads_path_provider/ios`)
   - firebase_auth (from `.symlinks/plugins/firebase_auth/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
-  - firebase_core_web (from `.symlinks/plugins/firebase_core_web/ios`)
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - firebase_storage (from `.symlinks/plugins/firebase_storage/ios`)
   - Flutter (from `Flutter`)
   - flutter_downloader (from `.symlinks/plugins/flutter_downloader/ios`)
-  - flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`)
+  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
+  - flutter_pdfview (from `.symlinks/plugins/flutter_pdfview/ios`)
   - flutter_ringtone_player (from `.symlinks/plugins/flutter_ringtone_player/ios`)
-  - google_api_availability (from `.symlinks/plugins/google_api_availability/ios`)
   - image_picker (from `.symlinks/plugins/image_picker/ios`)
   - open_file (from `.symlinks/plugins/open_file/ios`)
   - package_info (from `.symlinks/plugins/package_info/ios`)
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
-  - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`)
   - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
-  - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
-  - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
   - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
-  - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`)
-  - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`)
 
 SPEC REPOS:
   trunk:
@@ -467,12 +439,9 @@ SPEC REPOS:
     - BoringSSL-GRPC
     - Firebase
     - FirebaseAnalytics
-    - FirebaseAnalyticsInterop
     - FirebaseAuth
-    - FirebaseAuthInterop
     - FirebaseCore
     - FirebaseCoreDiagnostics
-    - FirebaseCoreDiagnosticsInterop
     - FirebaseFirestore
     - FirebaseInstallations
     - FirebaseInstanceID
@@ -480,28 +449,27 @@ SPEC REPOS:
     - FirebaseStorage
     - GoogleAppMeasurement
     - GoogleDataTransport
-    - GoogleDataTransportCCTSupport
     - GoogleUtilities
     - "gRPC-C++"
     - gRPC-Core
     - GTMSessionFetcher
     - leveldb-library
+    - MTBBarcodeScanner
     - nanopb
     - PromisesObjC
     - Protobuf
     - Reachability
+    - SwiftProtobuf
 
 EXTERNAL SOURCES:
+  barcode_scan:
+    :path: ".symlinks/plugins/barcode_scan/ios"
   camera:
     :path: ".symlinks/plugins/camera/ios"
   cloud_firestore:
     :path: ".symlinks/plugins/cloud_firestore/ios"
-  cloud_firestore_web:
-    :path: ".symlinks/plugins/cloud_firestore_web/ios"
   connectivity:
     :path: ".symlinks/plugins/connectivity/ios"
-  connectivity_macos:
-    :path: ".symlinks/plugins/connectivity_macos/ios"
   device_info:
     :path: ".symlinks/plugins/device_info/ios"
   downloads_path_provider:
@@ -510,8 +478,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_auth/ios"
   firebase_core:
     :path: ".symlinks/plugins/firebase_core/ios"
-  firebase_core_web:
-    :path: ".symlinks/plugins/firebase_core_web/ios"
   firebase_messaging:
     :path: ".symlinks/plugins/firebase_messaging/ios"
   firebase_storage:
@@ -520,12 +486,12 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_downloader:
     :path: ".symlinks/plugins/flutter_downloader/ios"
-  flutter_plugin_android_lifecycle:
+  flutter_local_notifications:
-    :path: ".symlinks/plugins/flutter_plugin_android_lifecycle/ios"
+    :path: ".symlinks/plugins/flutter_local_notifications/ios"
+  flutter_pdfview:
+    :path: ".symlinks/plugins/flutter_pdfview/ios"
   flutter_ringtone_player:
     :path: ".symlinks/plugins/flutter_ringtone_player/ios"
-  google_api_availability:
-    :path: ".symlinks/plugins/google_api_availability/ios"
   image_picker:
     :path: ".symlinks/plugins/image_picker/ios"
   open_file:
@@ -534,81 +500,62 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/package_info/ios"
   path_provider:
     :path: ".symlinks/plugins/path_provider/ios"
-  path_provider_macos:
-    :path: ".symlinks/plugins/path_provider_macos/ios"
   permission_handler:
     :path: ".symlinks/plugins/permission_handler/ios"
   shared_preferences:
     :path: ".symlinks/plugins/shared_preferences/ios"
-  shared_preferences_macos:
-    :path: ".symlinks/plugins/shared_preferences_macos/ios"
-  shared_preferences_web:
-    :path: ".symlinks/plugins/shared_preferences_web/ios"
   url_launcher:
     :path: ".symlinks/plugins/url_launcher/ios"
-  url_launcher_macos:
-    :path: ".symlinks/plugins/url_launcher_macos/ios"
-  url_launcher_web:
-    :path: ".symlinks/plugins/url_launcher_web/ios"
 
 SPEC CHECKSUMS:
   abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f
+  barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
   BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879
   camera: d56ad165545ae5a0ffb892376033760a969c68c8
-  cloud_firestore: 4cc700e236ebfe2d5d980e49cb066d202cfee0e9
+  cloud_firestore: 2a4f8f802fb0b701cf809b283b6bec7477ebaa6f
-  cloud_firestore_web: 9ec3dc7f5f98de5129339802d491c1204462bfec
   connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
-  connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191
   device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
   downloads_path_provider: fe0d06888d4b8c055a59edbc2f51f03e63cb0e28
-  Firebase: 5719b4f965f76643241a1bb8244483ff6117db39
+  Firebase: 658370fa0181826a74b7cfca8d68c5856ca749ae
-  firebase_auth: d99b993c1405096e66c58211b1cd956c23eed1c5
+  firebase_auth: af8784c4d8d87c36f730a305f97bfbcb24db024b
   firebase_core: 335c02abd48672b7c83c683df833d0488a72e73e
-  firebase_core_web: d501d8b946b60c8af265428ce483b0fff5ad52d1
   firebase_messaging: 21344b3b3a7d9d325d63a70e3750c0c798fe1e03
   firebase_storage: 22966fce4aa6e8848cbaa017df62107cee29f327
-  FirebaseAnalytics: 93565f3f0f0f50a5d8770850bfe6a82eaba5db27
+  FirebaseAnalytics: 0ca9aa2af7cc4dc92392b7a78bfc49feaa2eb60f
-  FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae
+  FirebaseAuth: 09f086fae98643f1ef235674cf3ae171ce26f5ba
-  FirebaseAuth: 7047aec89c0b17ecd924a550c853f0c27ac6015e
+  FirebaseCore: 6fb954e350af0885803d5aa49865d15d9a6b264c
-  FirebaseAuthInterop: a0f37ae05833af156e72028f648d313f7e7592e9
+  FirebaseCoreDiagnostics: 7415bfb3883b3500c5a95c42b6ba66baae78f600
-  FirebaseCore: 6023faeada5afa95a349fccafb40900e32e9ac42
+  FirebaseFirestore: ef0ad529a72c8e6542050dc7742fbd4cf009f297
-  FirebaseCoreDiagnostics: 4a773a47bd83bbd5a9b1ccf1ce7caa8b2d535e67
+  FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
-  FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
+  FirebaseInstanceID: 84f5f5762f1bee94ca2254f693bbf5aec6666504
-  FirebaseFirestore: deb7242803734c97376278698de097499cf5194f
+  FirebaseMessaging: 82d75b3770a78bbce470769a6980429608b4c407
-  FirebaseInstallations: 2119fb3e46b0a88bfdbf12562f855ee3252462fa
+  FirebaseStorage: 33b92875a9b556824886cc7a65120c7d2cb3a8d8
-  FirebaseInstanceID: cef67c4967c7cecb56ea65d8acbb4834825c587b
-  FirebaseMessaging: 29543feb343b09546ab3aa04d008ee8595b43c44
-  FirebaseStorage: f4f39ae834a7145963b913f54e2f24a9db1d8fac
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
   flutter_downloader: 058b9c41564a90500f67f3e432e3524613a7fd83
-  flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35
+  flutter_local_notifications: 9e4738ce2471c5af910d961a6b7eadcf57c50186
+  flutter_pdfview: 25f53dd6097661e6395b17de506e6060585946bd
   flutter_ringtone_player: 15eba85187230b87b2512f0e1b92225618bc03e7
-  google_api_availability: 15fa42a8cd83c0a6738507ffe6e87096f12abcb8
+  GoogleAppMeasurement: ecc30d0ab5b66d7d18e85ce1b8e2b345db60626d
-  GoogleAppMeasurement: 137afe68bfa406c3f4221b9395253d9e5d4654cf
+  GoogleDataTransport: e85fb700c9b027079ce182c3d08e12e0f9618bb4
-  GoogleDataTransport: ad884314b81cdb808fb1d23787b367ff8da4e28a
+  GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
-  GoogleDataTransportCCTSupport: d70a561f7d236af529fee598835caad5e25f6d3d
-  GoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1
   "gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2
   gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5
   GTMSessionFetcher: 6f5c8abbab8a9bce4bb3f057e317728ec6182b10
-  image_picker: 66aa71bc96850a90590a35d4c4a2907b0d823109
+  image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09
   leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7
-  nanopb: c43f40fadfe79e8b8db116583945847910cbabc9
+  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
+  nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
   open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
   path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
-  path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
   permission_handler: 8278954f2382902f63f00dd8828769c0bd6d511b
-  PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
+  PromisesObjC: b14b1c6b68e306650688599de8a45e49fae81151
-  Protobuf: 2793fcd0622a00b546c60e7cbbcc493e043e9bb9
+  Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
-  shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
+  SwiftProtobuf: 4ef85479c18ca85b5482b343df9c319c62bda699
-  shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
   url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
-  url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
-  url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
 
-PODFILE CHECKSUM: f32fb4e7c14f8b3ca19a369d7be425dd9241af27
+PODFILE CHECKSUM: a7be649ff08e382c76abdb82aa94dd2686e03de2
 
 COCOAPODS: 1.9.3

ios/Runner.xcodeproj/project.pbxproj

@@ -8,9 +8,9 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		2BCB1E06702BEB21CC67037C /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 32AB59F1C62AF5CE5121AFEC /* libPods-Runner.a */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		846AC7DA24839A57005EDC47 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 846AC7D924839A57005EDC47 /* GoogleService-Info.plist */; };
+		84CCB9CC250686A6007CA635 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 84CCB9CB250686A6007CA635 /* GoogleService-Info.plist */; };
+		8FF2990E87F63E94C0E96E91 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 31321200669E6437325AD4E8 /* Pods_Runner.framework */; };
 		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
 		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -34,13 +34,14 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		32AB59F1C62AF5CE5121AFEC /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		31321200669E6437325AD4E8 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		4EC225A1B805CDBD5F102E79 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		846AC7D924839A57005EDC47 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
+		843570B12507BCA20027CE07 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
+		84CCB9CB250686A6007CA635 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -58,7 +59,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2BCB1E06702BEB21CC67037C /* libPods-Runner.a in Frameworks */,
+				8FF2990E87F63E94C0E96E91 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -89,7 +90,7 @@
 		97C146E51CF9000F007C117D = {
 			isa = PBXGroup;
 			children = (
-				846AC7D924839A57005EDC47 /* GoogleService-Info.plist */,
+				84CCB9CB250686A6007CA635 /* GoogleService-Info.plist */,
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
@@ -109,6 +110,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				843570B12507BCA20027CE07 /* Runner.entitlements */,
 				7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
 				7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
@@ -133,7 +135,7 @@
 		DAE0DFCA6468DD1B18DA1D13 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				32AB59F1C62AF5CE5121AFEC /* libPods-Runner.a */,
+				31321200669E6437325AD4E8 /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -153,7 +155,6 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				39EACD7450202B9456DD1588 /* [CP] Embed Pods Frameworks */,
-				3F40F0B932775B103C077553 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -203,7 +204,7 @@
 			files = (
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				846AC7DA24839A57005EDC47 /* GoogleService-Info.plist in Resources */,
+				84CCB9CC250686A6007CA635 /* GoogleService-Info.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
@@ -243,23 +244,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		3F40F0B932775B103C077553 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		7B5736D5587E0AC72E154BA7 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -333,7 +317,6 @@
 /* Begin XCBuildConfiguration section */
 		249021D3217E4FDB00AE95B9 /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -387,6 +370,9 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = M7FNQK9WX4;
 				ENABLE_BITCODE = NO;
@@ -395,6 +381,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -403,15 +390,15 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.mokkon.easycard-dev";
+				PRODUCT_BUNDLE_IDENTIFIER = com.mokkon.fcs.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
 		};
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -467,7 +454,6 @@
 		};
 		97C147041CF9000F007C117D /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -521,6 +507,9 @@
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = M7FNQK9WX4;
 				ENABLE_BITCODE = NO;
@@ -529,6 +518,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -537,8 +527,9 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.mokkon.easycard-dev";
+				PRODUCT_BUNDLE_IDENTIFIER = com.mokkon.fcs.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -548,6 +539,9 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = M7FNQK9WX4;
 				ENABLE_BITCODE = NO;
@@ -556,6 +550,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -564,8 +559,9 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.mokkon.easycard-dev";
+				PRODUCT_BUNDLE_IDENTIFIER = com.mokkon.fcs.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

ios/Runner/AppDelegate.m

@@ -1,5 +1,6 @@
 #import "AppDelegate.h"
 #import "GeneratedPluginRegistrant.h"
+@import Firebase;
 
 @implementation AppDelegate
 
@@ -7,7 +8,16 @@
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
   [GeneratedPluginRegistrant registerWithRegistry:self];
   // Override point for customization after application launch.
+    if (@available(iOS 10.0, *)) {
+      [UNUserNotificationCenter currentNotificationCenter].delegate = (id<UNUserNotificationCenterDelegate>) self;
+    }
   return [super application:application didFinishLaunchingWithOptions:launchOptions];
 }
 
+//- (void)application:(UIApplication *)application
+//    didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+//  // Pass device token to auth.
+//  [[FIRAuth auth] setAPNSToken:deviceToken type:FIRAuthAPNSTokenTypeUnknown];
+//  // Further handling of the device token if needed by the app.
+//}
 @end

ios/Runner/GoogleService-Info.plist

@@ -3,21 +3,21 @@
 <plist version="1.0">
 <dict>
 	<key>CLIENT_ID</key>
-	<string>865099544652-okjme55c71n8piiphtjaqk543ngl2n3g.apps.googleusercontent.com</string>
+	<string>944560757353-o6emrja7ad8g8ulbcvvpah9a1tul3s21.apps.googleusercontent.com</string>
 	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.865099544652-okjme55c71n8piiphtjaqk543ngl2n3g</string>
+	<string>com.googleusercontent.apps.944560757353-o6emrja7ad8g8ulbcvvpah9a1tul3s21</string>
 	<key>API_KEY</key>
-	<string>AIzaSyCdYfjf7aYtMHMHwS4_pZ2H6lHg0kSVOlk</string>
+	<string>AIzaSyBZICfIDWbWqjxHwY_jFnWv34EtCpiiE78</string>
 	<key>GCM_SENDER_ID</key>
-	<string>865099544652</string>
+	<string>944560757353</string>
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
-	<string>com.mokkon.easycard-dev</string>
+	<string>com.mokkon.fcs.dev</string>
 	<key>PROJECT_ID</key>
-	<string>easy-card-dev</string>
+	<string>fcs-dev1</string>
 	<key>STORAGE_BUCKET</key>
-	<string>easy-card-dev.appspot.com</string>
+	<string>fcs-dev1.appspot.com</string>
 	<key>IS_ADS_ENABLED</key>
 	<false></false>
 	<key>IS_ANALYTICS_ENABLED</key>
@@ -29,8 +29,8 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:865099544652:ios:4dfae368fb05f4cc</string>
+	<string>1:944560757353:ios:de037244faea4173fa60f8</string>
 	<key>DATABASE_URL</key>
-	<string>https://easy-card-dev.firebaseio.com</string>
+	<string>https://fcs-dev1.firebaseio.com</string>
 </dict>
 </plist>

ios/Runner/Info.plist

@@ -18,10 +18,28 @@
 	<string>$(FLUTTER_BUILD_NAME)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>com.googleusercontent.apps.944560757353-o6emrja7ad8g8ulbcvvpah9a1tul3s21</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>Camera permission is required for barcode scanning.</string>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>fetch</string>
+		<string>remote-notification</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

ios/Runner/Runner.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
+</plist>

lib/app.dart

@@ -1,47 +1,31 @@
-import 'package:fcs/model/discount_model.dart';
+import 'package:fcs/localization/app_translations_delegate.dart';
-import 'package:fcs/model/shipment_model.dart';
+import 'package:fcs/localization/transalation.dart';
-import 'package:fcs/model_fcs/message_model.dart';
+import 'package:fcs/pages/box/model/box_model.dart';
-import 'package:fcs/model_fcs/package_model.dart';
+import 'package:fcs/pages/chat/model/message_model.dart';
-import 'package:fcs/vo/message.dart';
+import 'package:fcs/pages/contact/model/contact_model.dart';
+import 'package:fcs/pages/customer/model/customer_model.dart';
+import 'package:fcs/pages/discount/model/discount_model.dart';
+import 'package:fcs/pages/faq/model/faq_model.dart';
+import 'package:fcs/pages/fcs_shipment/model/fcs_shipment_model.dart';
+import 'package:fcs/pages/main/home_page.dart';
+import 'package:fcs/pages/main/initial_language_selection.dart';
+import 'package:fcs/pages/invoice/model/invoice_model.dart';
+import 'package:fcs/pages/market/model/market_model.dart';
+import 'package:fcs/pages/main/model/language_model.dart';
+import 'package:fcs/pages/main/model/main_model.dart';
+import 'package:fcs/pages/package/model/package_model.dart';
+import 'package:fcs/pages/payment_methods/model/payment_method_model.dart';
+import 'package:fcs/pages/rates/model/shipment_rate_model.dart';
+import 'package:fcs/pages/shipment/model/pickup_model.dart';
+import 'package:fcs/pages/shipment_address/model/shipment_address_model.dart';
+import 'package:fcs/pages/main/splash_page.dart';
+import 'package:fcs/pages/staff/model/staff_model.dart';
+import 'package:fcs/pages/term/model/term_model.dart';
+import 'package:fcs/pages/main/welcome_page.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:provider/provider.dart';
-import 'package:fcs/model/buyer_model.dart';
-import 'package:fcs/model/delivery_model.dart';
-import 'package:fcs/model/manual_model.dart';
-import 'package:fcs/model/notification_model.dart';
-import 'package:fcs/model/pd_model.dart';
-import 'package:fcs/model/reg_model.dart';
-import 'package:fcs/model/report_model.dart';
-import 'package:fcs/model/storage_model.dart';
-import 'package:fcs/model/test_model.dart';
-import 'package:fcs/pages/email_page.dart';
-import 'package:fcs/pages/login_page.dart';
-
-import 'model/announcement_model.dart';
-import 'model/chart_model.dart';
-import 'model/customer_model.dart';
-import 'model/device_model.dart';
-import 'model/do_model.dart';
-import 'model/employee_model.dart';
-import 'model/invoice_model.dart';
-import 'model/language_model.dart';
-import 'model/log_model.dart';
-import 'model/main_model.dart';
-import 'model/pickup_model.dart';
-import 'model/po_model.dart';
-import 'model/product_model.dart';
-import 'model/report_user_model.dart';
-import 'model/shipment_rate_model.dart';
-import 'model/user_model.dart';
-import 'model_fcs/box_model.dart';
-import 'pages/home_page.dart';
-import 'pages/home_page_welcome.dart';
-import 'pages/splash.dart';
-import 'pages/term.dart';
-import 'pages/welcome_page.dart';
-import 'widget/localization/app_translations_delegate.dart';
-import 'widget/localization/transalation.dart';
 
 class App extends StatefulWidget {
   @override
@@ -50,76 +34,45 @@ class App extends StatefulWidget {
 
 class _AppState extends State<App> {
   final MainModel mainModel = new MainModel();
-  final UserModel userModel = new UserModel();
+  final ContactModel contactModel = new ContactModel();
-  final ProductModel productModel = new ProductModel();
+  final TermModel termModel = new TermModel();
-  final EmployeeModel employeeModel = new EmployeeModel();
+  final FAQModel faqModel = new FAQModel();
-  final POSubmissionModel poSubmissionModel = new POSubmissionModel();
+  final PaymentMethodModel paymentMethodModel = new PaymentMethodModel();
-  final DOModel doModel = new DOModel();
+  final FcsShipmentModel fcsShipmentModel = new FcsShipmentModel();
   final LanguageModel lanuguageModel = new LanguageModel();
-  final StorageModel storageModel = new StorageModel();
-  final PDModel pdModel = new PDModel();
-  final RegModel regModel = new RegModel();
-  final BuyerModel buyerModel = new BuyerModel();
-  final NotificationModel notificationModel = new NotificationModel();
-  final ChartModel chartModel = new ChartModel();
-  final DeliveryModel deliveryModel = new DeliveryModel();
-  final ManualModel manualModel = new ManualModel();
-  final TestModel testModel = new TestModel();
-  final LogModel logModel = new LogModel();
-  final PhoneDeviceModel phoneDeviceModel = new PhoneDeviceModel();
-  final ReportModel reportModel = new ReportModel();
-  final AnnouncementModel announcementModel = new AnnouncementModel();
-  final ReportUserModel reportUserModel = new ReportUserModel();
   final PickUpModel pickUpModel = new PickUpModel();
   final ShipmentRateModel shipmentRateModel = new ShipmentRateModel();
-  final ShipmentModel shipmentModel = new ShipmentModel();
-  final PackageModel packageModel = new PackageModel();
   final BoxModel boxModel = new BoxModel();
   final MessageModel messageModel = new MessageModel();
   final InvoiceModel invoiceModel = new InvoiceModel();
   final CustomerModel customerModel = new CustomerModel();
   final DiscountModel discountModel = new DiscountModel();
+  final StaffModel staffModel = new StaffModel();
+  final ShipmentAddressModel shipmentAddressModel = new ShipmentAddressModel();
+  final PackageModel packageModel = new PackageModel();
+  final MarketModel marketModel = new MarketModel();
 
   AppTranslationsDelegate _newLocaleDelegate;
 
   @override
   void initState() {
     super.initState();
+    mainModel
+      ..addModel(customerModel)
+      ..addModel(staffModel)
+      ..addModel(shipmentAddressModel)
+      ..addModel(packageModel)
+      ..addModel(messageModel)
+      ..addModel(fcsShipmentModel)
+      ..addModel(discountModel)
+      ..addModel(shipmentRateModel)
+      ..addModel(boxModel)
+      ..addModel(pickUpModel)
+      ..addModel(invoiceModel)
+      ..addModel(marketModel);
+
     _newLocaleDelegate = AppTranslationsDelegate(newLocale: null);
     Translation().onLocaleChanged = onLocaleChange;
-    mainModel
-      ..addModel(userModel)
-      ..addModel(employeeModel)
-      ..addModel(lanuguageModel)
-      ..addModel(storageModel)
-      ..addModel(regModel)
-      ..addModel(poSubmissionModel)
-      ..addModel(doModel)
-      ..addModel(productModel)
-      ..addModel(pdModel)
-      ..addModel(buyerModel)
-      ..addModel(notificationModel)
-      ..addModel(chartModel)
-      ..addModel(deliveryModel)
-      ..addModel(logModel)
-      ..addModel(manualModel)
-      ..addModel(phoneDeviceModel)
-      ..addModel(regModel)
-      ..addModel(announcementModel)
-      ..addModel(reportModel)
-      ..addModel(testModel)
-      ..addModel(reportUserModel)
-      ..addModel(pickUpModel)
-      ..addModel(shipmentRateModel)
-      ..addModel(shipmentModel)
-      ..addModel(packageModel)
-      ..addModel(boxModel)
-      ..addModel(messageModel)
-      ..addModel(shipmentRateModel)
-      ..addModel(invoiceModel)
-      ..addModel(customerModel)
-      ..addModel(discountModel);
-    this.mainModel.init();
   }
 
   void onLocaleChange(Locale locale) {
@@ -131,14 +84,9 @@ class _AppState extends State<App> {
   Map<String, WidgetBuilder> route(BuildContext context) {
     final routes = <String, WidgetBuilder>{
       '/': (_) => SplashScreen(),
-      '/home': (_) => HomePageWelcome(),
+      '/welcome': (_) => WelcomePage(),
-      '/homeLogin': (_) => HomePage(),
+      '/home': (_) => HomePage(),
-      '/welcome': (context) => WelcomePage(),
+      '/language_selection': (context) => InitialLanguageSelectionPage(),
-      '/term': (context) => Term(
-            agreePage: true,
-          ),
-      '/login': (context) => LoginPage(),
-      '/email': (context) => EmailPage()
     };
     return routes;
   }
@@ -146,58 +94,54 @@ class _AppState extends State<App> {
   @override
   Widget build(BuildContext context) {
     return MultiProvider(
-      providers: [
+        providers: [
-        ChangeNotifierProvider(builder: (context) => mainModel),
+          ChangeNotifierProvider.value(value: mainModel),
-        ChangeNotifierProvider(builder: (context) => userModel),
+          ChangeNotifierProvider.value(value: staffModel),
-        ChangeNotifierProvider(builder: (context) => productModel),
+          ChangeNotifierProvider.value(value: lanuguageModel),
-        ChangeNotifierProvider(builder: (context) => employeeModel),
+          ChangeNotifierProvider.value(value: pickUpModel),
-        ChangeNotifierProvider(builder: (context) => poSubmissionModel),
+          ChangeNotifierProvider.value(value: shipmentRateModel),
-        ChangeNotifierProvider(builder: (context) => doModel),
+          ChangeNotifierProvider.value(value: shipmentAddressModel),
-        ChangeNotifierProvider(builder: (context) => storageModel),
+          ChangeNotifierProvider.value(value: packageModel),
-        ChangeNotifierProvider(builder: (context) => pdModel),
+          ChangeNotifierProvider.value(value: boxModel),
-        ChangeNotifierProvider(builder: (context) => lanuguageModel),
+          ChangeNotifierProvider.value(value: messageModel),
-        ChangeNotifierProvider(builder: (context) => regModel),
+          ChangeNotifierProvider.value(value: invoiceModel),
-        ChangeNotifierProvider(builder: (context) => buyerModel),
+          ChangeNotifierProvider.value(value: customerModel),
-        ChangeNotifierProvider(builder: (context) => notificationModel),
+          ChangeNotifierProvider.value(value: discountModel),
-        ChangeNotifierProvider(builder: (context) => chartModel),
+          ChangeNotifierProvider.value(value: contactModel),
-        ChangeNotifierProvider(builder: (context) => deliveryModel),
+          ChangeNotifierProvider.value(value: termModel),
-        ChangeNotifierProvider(builder: (context) => manualModel),
+          ChangeNotifierProvider.value(value: faqModel),
-        ChangeNotifierProvider(builder: (context) => logModel),
+          ChangeNotifierProvider.value(value: paymentMethodModel),
-        ChangeNotifierProvider(builder: (context) => deliveryModel),
+          ChangeNotifierProvider.value(value: marketModel),
-        ChangeNotifierProvider(builder: (context) => phoneDeviceModel),
+          ChangeNotifierProvider.value(value: fcsShipmentModel),
-        ChangeNotifierProvider(builder: (context) => reportModel),
+        ],
-        ChangeNotifierProvider(builder: (context) => announcementModel),
+        child: Consumer<LanguageModel>(
-        ChangeNotifierProvider(builder: (context) => reportUserModel),
+          builder: (context, value, child) {
-        ChangeNotifierProvider(builder: (context) => pickUpModel),
+            return CupertinoApp(
-        ChangeNotifierProvider(builder: (context) => shipmentRateModel),
+                debugShowCheckedModeBanner: false,
-        ChangeNotifierProvider(builder: (context) => shipmentModel),
+                title: 'FCS',
-        ChangeNotifierProvider(builder: (context) => packageModel),
+                // theme: CupertinoThemeData(
-        ChangeNotifierProvider(builder: (context) => boxModel),
+                //     textTheme: CupertinoTextThemeData(
-        ChangeNotifierProvider(builder: (context) => messageModel),
+                //   navActionTextStyle: TextStyle(color: Colors.white),
-        ChangeNotifierProvider(builder: (context) => invoiceModel),
+                //   navTitleTextStyle: TextStyle(
-        ChangeNotifierProvider(builder: (context) => customerModel),
+                //       color: Colors.white,
-        ChangeNotifierProvider(builder: (context) => discountModel),
+                //       fontSize: value.isEng ? 20 : 18,
-        ChangeNotifierProvider(
+                //       fontWeight: FontWeight.w600),
-          builder: (context) => testModel,
+                //   navLargeTitleTextStyle: TextStyle(
-        ),
+                //       color: Colors.white,
-      ],
+                //       fontSize: value.isEng ? 40 : 24,
-      child: Consumer<LanguageModel>(
+                //       fontWeight: FontWeight.w600),
-        builder: (BuildContext context, LanguageModel value, Widget child) {
+                //   primaryColor: primaryColor,
-          return MaterialApp(
+                //   textStyle: TextStyle(color: Colors.white),
-              debugShowCheckedModeBanner: false,
+                //   actionTextStyle: TextStyle(color: Colors.white),
-              title: 'Ok Energy',
+                // )),
-              routes: route(context),
+                routes: route(context),
-              theme: ThemeData(accentColor: Colors.black),
+                localizationsDelegates: [
-              localizationsDelegates: [
+                  _newLocaleDelegate,
-                _newLocaleDelegate,
+                  GlobalMaterialLocalizations.delegate,
-                //provides localised strings
+                  GlobalWidgetsLocalizations.delegate,
-                GlobalMaterialLocalizations.delegate,
+                ],
-                //provides RTL support
+                supportedLocales: Translation().supportedLocales());
-                GlobalWidgetsLocalizations.delegate,
+          },
-              ],
+        ));
-              supportedLocales: Translation().supportedLocales());
-        },
-      ),
-    );
   }
 }

lib/charts/bar_chart.dart

@@ -1,119 +0,0 @@
-import 'package:charts_flutter/flutter.dart' as charts;
-import 'package:charts_flutter/flutter.dart';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:fcs/charts/qtyby_customer_table.dart';
-import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/model/product_model.dart';
-import 'package:fcs/theme/theme.dart';
-import 'package:fcs/vo/po.dart';
-import 'package:fcs/widget/local_text.dart';
-
-class BarChart extends StatefulWidget {
-  @override
-  _BarChartState createState() => _BarChartState();
-}
-
-class _BarChartState extends State<BarChart> {
-  static final numberFormatter = new NumberFormat("#,###");
-  List<POChartData> chartSummary = new List();
-  List<charts.Series<POChartData, String>> series;
-
-  @override
-  void initState() {
-    super.initState();
-    var chartModel = Provider.of<ChartModel>(context, listen: false);
-    this.chartSummary = chartModel.chartSummary;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    var productModel = Provider.of<ProductModel>(context);
-    if (this.chartSummary.isNotEmpty) {
-      this.chartSummary.forEach((s) {
-        productModel.products.forEach((p) {
-          if (p.id == s.productID) {
-            s.displayOrder = p.displayOrder;
-          } else {
-            return;
-          }
-        });
-      });
-
-      this.chartSummary
-          .sort((s1, s2) => s1.displayOrder.compareTo(s2.displayOrder));
-    }
-    List<charts.Series<POChartData, String>> series = [
-      charts.Series(
-          id: "Subscribers",
-          data: this.chartSummary,
-          domainFn: (POChartData series, _) => series.productName,
-          measureFn: (POChartData series, _) => series.balanceQty,
-          colorFn: (POChartData series, _) =>
-              charts.ColorUtil.fromDartColor(series.getColor),
-          labelAccessorFn: (POChartData series, _) =>
-              '${numberFormatter.format(series.balanceQty)}'),
-    ];
-
-    return Container(
-      height: 200,
-      child: Column(
-        children: <Widget>[
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: <Widget>[
-              LocalText(context, 'product.balance_qty',
-                  color: primaryColor, fontSize: 16),
-              IconButton(
-                icon: Icon(
-                  Icons.refresh,
-                  color: primaryColor,
-                ),
-                onPressed: () {
-                  _load();
-                },
-              )
-            ],
-          ),
-          Expanded(
-            child: charts.BarChart(
-              series,
-              animate: true,
-              vertical: false,
-              defaultRenderer: new charts.BarRendererConfig(
-                barRendererDecorator: new charts.BarLabelDecorator<String>(
-                  labelPosition: charts.BarLabelPosition.auto,
-                ),
-              ),
-              selectionModels: [
-                SelectionModelConfig(changedListener: (SelectionModel model) {
-                  final selectedDatum = model.selectedDatum;
-                  if (selectedDatum.isNotEmpty) {
-                    selectedDatum.forEach((charts.SeriesDatum datumPair) {
-                      Navigator.push(
-                        context,
-                        MaterialPageRoute(
-                            builder: (context) => QtyByCustomerTable(
-                                  poChartData: datumPair.datum,
-                                )),
-                      );
-                    });
-                  }
-                })
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Future<void> _load() async {
-    var chartModel = Provider.of<ChartModel>(context);
-    var _s = await chartModel.loadSummary();
-    setState(() {
-      this.chartSummary = _s ?? [];
-    });
-  }
-}

lib/charts/delivery_do_line.dart

@@ -1,83 +0,0 @@
-import 'package:charts_flutter/flutter.dart' as charts;
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/theme/theme.dart';
-import 'package:fcs/vo/revenue.dart';
-import 'package:fcs/widget/local_text.dart';
-
-import 'delivery_do_line_detail.dart';
-
-class DODeliveryLineChart extends StatefulWidget {
-  @override
-  _DODeliveryLineChartState createState() => _DODeliveryLineChartState();
-}
-
-class _DODeliveryLineChartState extends State<DODeliveryLineChart> {
-  static final numberFormatter = new NumberFormat("#,###");
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    var chartModel = Provider.of<ChartModel>(context);
-
-    List<charts.Series<Data, DateTime>> series = [
-      charts.Series(
-        id: "Subscribers",
-        data: chartModel.revenue.getDeliveryDo(),
-        domainFn: (Data series, _) => series.date,
-        measureFn: (Data series, _) => series.count,
-        colorFn: (_, __) => charts.ColorUtil.fromDartColor(primaryColor),
-        labelAccessorFn: (Data series, _) =>
-            '${numberFormatter.format(series.count)}',
-      ),
-    ];
-
-    return Container(
-      height: 200,
-      child: Column(
-        children: <Widget>[
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: <Widget>[
-              LocalText(context, "delivery.do.title", color: primaryColor, fontSize: 16),
-              InkWell(
-                child: LocalText(
-                  context,
-                  "delivery.do.details",
-                  color: secondaryColor,
-                  fontSize: 14,
-                ),
-                onTap: () {
-                  Navigator.of(context)
-                      .push(MaterialPageRoute(builder: (_) => DODeliveryLineDetail()));
-                },
-              ),
-            ],
-          ),
-          Expanded(
-            child: charts.TimeSeriesChart(
-              series,
-              animate: true,
-              defaultRenderer: new charts.LineRendererConfig(
-                includePoints: true,
-              ),
-              primaryMeasureAxis: new charts.NumericAxisSpec(
-                  tickProviderSpec: new charts.BasicNumericTickProviderSpec(
-                      zeroBound: false, desiredTickCount: 10),
-                  renderSpec: new charts.GridlineRendererSpec(
-                      lineStyle: charts.LineStyleSpec(
-                    dashPattern: [4, 4],
-                  ))),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}