diff --git a/app/src/main/res/layout/activity_fontend.xml b/app/src/main/res/layout/activity_fontend.xml
index 39fa6a3..4bb185d 100644
--- a/app/src/main/res/layout/activity_fontend.xml
+++ b/app/src/main/res/layout/activity_fontend.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4ae78f4..9bc1a93 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_access_code.xml b/app/src/main/res/layout/dialog_access_code.xml
index 08697c7..8173ad8 100644
--- a/app/src/main/res/layout/dialog_access_code.xml
+++ b/app/src/main/res/layout/dialog_access_code.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_admin_login.xml b/app/src/main/res/layout/dialog_admin_login.xml
index 7939a6f..6e1af48 100644
--- a/app/src/main/res/layout/dialog_admin_login.xml
+++ b/app/src/main/res/layout/dialog_admin_login.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_buy.xml b/app/src/main/res/layout/dialog_buy.xml
index 4eeef62..b263b62 100644
--- a/app/src/main/res/layout/dialog_buy.xml
+++ b/app/src/main/res/layout/dialog_buy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_checkout_cash.xml b/app/src/main/res/layout/dialog_checkout_cash.xml
index ba7f09f..51e56d4 100644
--- a/app/src/main/res/layout/dialog_checkout_cash.xml
+++ b/app/src/main/res/layout/dialog_checkout_cash.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_checkout_cash_pay.xml b/app/src/main/res/layout/dialog_checkout_cash_pay.xml
index 843d2b6..de56a43 100644
--- a/app/src/main/res/layout/dialog_checkout_cash_pay.xml
+++ b/app/src/main/res/layout/dialog_checkout_cash_pay.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_checkout_esun_pay.xml b/app/src/main/res/layout/dialog_checkout_esun_pay.xml
index 07d0242..dfe3448 100644
--- a/app/src/main/res/layout/dialog_checkout_esun_pay.xml
+++ b/app/src/main/res/layout/dialog_checkout_esun_pay.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_checkout_line_pay.xml b/app/src/main/res/layout/dialog_checkout_line_pay.xml
index e74c634..37afe31 100644
--- a/app/src/main/res/layout/dialog_checkout_line_pay.xml
+++ b/app/src/main/res/layout/dialog_checkout_line_pay.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_checkout_nfc_card.xml b/app/src/main/res/layout/dialog_checkout_nfc_card.xml
index 22a8613..51f6d99 100644
--- a/app/src/main/res/layout/dialog_checkout_nfc_card.xml
+++ b/app/src/main/res/layout/dialog_checkout_nfc_card.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_checkout_nfc_phone.xml b/app/src/main/res/layout/dialog_checkout_nfc_phone.xml
index 0c7cb3c..61f5d2c 100644
--- a/app/src/main/res/layout/dialog_checkout_nfc_phone.xml
+++ b/app/src/main/res/layout/dialog_checkout_nfc_phone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_checkout_nfc_recharge.xml b/app/src/main/res/layout/dialog_checkout_nfc_recharge.xml
index 5f8f5a4..3f1c2cd 100644
--- a/app/src/main/res/layout/dialog_checkout_nfc_recharge.xml
+++ b/app/src/main/res/layout/dialog_checkout_nfc_recharge.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_checkout_tap_pay.xml b/app/src/main/res/layout/dialog_checkout_tap_pay.xml
index fe3621e..4c69862 100644
--- a/app/src/main/res/layout/dialog_checkout_tap_pay.xml
+++ b/app/src/main/res/layout/dialog_checkout_tap_pay.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_close_access_code.xml b/app/src/main/res/layout/dialog_close_access_code.xml
index 49deb0b..48b3096 100644
--- a/app/src/main/res/layout/dialog_close_access_code.xml
+++ b/app/src/main/res/layout/dialog_close_access_code.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_customer_identifier.xml b/app/src/main/res/layout/dialog_customer_identifier.xml
index d88be34..ffb36d6 100644
--- a/app/src/main/res/layout/dialog_customer_identifier.xml
+++ b/app/src/main/res/layout/dialog_customer_identifier.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_dispatch.xml b/app/src/main/res/layout/dialog_dispatch.xml
index 0a8fa6e..3e94c4d 100644
--- a/app/src/main/res/layout/dialog_dispatch.xml
+++ b/app/src/main/res/layout/dialog_dispatch.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_free_gift_code.xml b/app/src/main/res/layout/dialog_free_gift_code.xml
index a9548d2..44a68a3 100644
--- a/app/src/main/res/layout/dialog_free_gift_code.xml
+++ b/app/src/main/res/layout/dialog_free_gift_code.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_invoice_barcode.xml b/app/src/main/res/layout/dialog_invoice_barcode.xml
index d0321aa..9f5576c 100644
--- a/app/src/main/res/layout/dialog_invoice_barcode.xml
+++ b/app/src/main/res/layout/dialog_invoice_barcode.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_marketing_plan.xml b/app/src/main/res/layout/dialog_marketing_plan.xml
index 3104051..5b4985b 100644
--- a/app/src/main/res/layout/dialog_marketing_plan.xml
+++ b/app/src/main/res/layout/dialog_marketing_plan.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_member_card_pickup.xml b/app/src/main/res/layout/dialog_member_card_pickup.xml
index 6ed71bb..8c2bec5 100644
--- a/app/src/main/res/layout/dialog_member_card_pickup.xml
+++ b/app/src/main/res/layout/dialog_member_card_pickup.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_pickup_code_buy.xml b/app/src/main/res/layout/dialog_pickup_code_buy.xml
index f640633..74dfc27 100644
--- a/app/src/main/res/layout/dialog_pickup_code_buy.xml
+++ b/app/src/main/res/layout/dialog_pickup_code_buy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/dialog_pickup_code_fontend.xml b/app/src/main/res/layout/dialog_pickup_code_fontend.xml
index 89d324f..fea08d9 100644
--- a/app/src/main/res/layout/dialog_pickup_code_fontend.xml
+++ b/app/src/main/res/layout/dialog_pickup_code_fontend.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/recycler_dialog_buy_list.xml b/app/src/main/res/layout/recycler_dialog_buy_list.xml
index 1cab530..178c4e2 100644
--- a/app/src/main/res/layout/recycler_dialog_buy_list.xml
+++ b/app/src/main/res/layout/recycler_dialog_buy_list.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/recycler_electric_buy_list.xml b/app/src/main/res/layout/recycler_electric_buy_list.xml
index 11976d6..189d2b0 100644
--- a/app/src/main/res/layout/recycler_electric_buy_list.xml
+++ b/app/src/main/res/layout/recycler_electric_buy_list.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/recycler_vmc_buy_list.xml b/app/src/main/res/layout/recycler_vmc_buy_list.xml
index f426052..097e17b 100644
--- a/app/src/main/res/layout/recycler_vmc_buy_list.xml
+++ b/app/src/main/res/layout/recycler_vmc_buy_list.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"