diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 810e824..30820f4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -37,4 +37,4 @@
 
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/activity_main_new.xml b/app/src/main/res/layout/activity_main_new.xml
index 9317e6f..2eb1b71 100644
--- a/app/src/main/res/layout/activity_main_new.xml
+++ b/app/src/main/res/layout/activity_main_new.xml
@@ -78,4 +78,4 @@
 </androidx.drawerlayout.widget.DrawerLayout>
 
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/activity_uts_manage_space.xml b/app/src/main/res/layout/activity_uts_manage_space.xml
index aa299e1..8123327 100644
--- a/app/src/main/res/layout/activity_uts_manage_space.xml
+++ b/app/src/main/res/layout/activity_uts_manage_space.xml
@@ -15,4 +15,4 @@
         android:textColor="@color/white"
         android:text="@string/not_clear_cache" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/card_template.xml b/app/src/main/res/layout/card_template.xml
index db529e6..f5612c9 100644
--- a/app/src/main/res/layout/card_template.xml
+++ b/app/src/main/res/layout/card_template.xml
@@ -87,4 +87,4 @@
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 522ddee..3fd14d1 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -17,4 +17,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navGraph="@navigation/mobile_navigation" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_amount_screen.xml b/app/src/main/res/layout/fragment_amount_screen.xml
index 9498ff3..3b29835 100644
--- a/app/src/main/res/layout/fragment_amount_screen.xml
+++ b/app/src/main/res/layout/fragment_amount_screen.xml
@@ -128,7 +128,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_cancel"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -139,7 +139,7 @@
                 android:text="@string/layout_cancel"
                 android:textColor="@color/colorPrimary" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_confirm"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -154,4 +154,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_capture_card_screen.xml b/app/src/main/res/layout/fragment_capture_card_screen.xml
index ca2e581..a479148 100644
--- a/app/src/main/res/layout/fragment_capture_card_screen.xml
+++ b/app/src/main/res/layout/fragment_capture_card_screen.xml
@@ -325,4 +325,4 @@
         </androidx.cardview.widget.CardView>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_config_settings_modern.xml b/app/src/main/res/layout/fragment_config_settings_modern.xml
index a96e3ce..0b8523b 100644
--- a/app/src/main/res/layout/fragment_config_settings_modern.xml
+++ b/app/src/main/res/layout/fragment_config_settings_modern.xml
@@ -739,4 +739,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_dashboard_bottom_sheet_pre_auth.xml b/app/src/main/res/layout/fragment_dashboard_bottom_sheet_pre_auth.xml
index dbeae3d..bf17b9b 100644
--- a/app/src/main/res/layout/fragment_dashboard_bottom_sheet_pre_auth.xml
+++ b/app/src/main/res/layout/fragment_dashboard_bottom_sheet_pre_auth.xml
@@ -109,4 +109,4 @@
     </androidx.cardview.widget.CardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_dashboard_bottom_sheet_pre_auth_cancel.xml b/app/src/main/res/layout/fragment_dashboard_bottom_sheet_pre_auth_cancel.xml
index 4062f3f..593f4c4 100644
--- a/app/src/main/res/layout/fragment_dashboard_bottom_sheet_pre_auth_cancel.xml
+++ b/app/src/main/res/layout/fragment_dashboard_bottom_sheet_pre_auth_cancel.xml
@@ -84,4 +84,4 @@
     </androidx.cardview.widget.CardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_dashboard_screen_old.xml b/app/src/main/res/layout/fragment_dashboard_screen_old.xml
index fad586e..50dc38c 100644
--- a/app/src/main/res/layout/fragment_dashboard_screen_old.xml
+++ b/app/src/main/res/layout/fragment_dashboard_screen_old.xml
@@ -330,4 +330,4 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_dashboard_trans_screen.xml b/app/src/main/res/layout/fragment_dashboard_trans_screen.xml
index d82f689..eea314d 100644
--- a/app/src/main/res/layout/fragment_dashboard_trans_screen.xml
+++ b/app/src/main/res/layout/fragment_dashboard_trans_screen.xml
@@ -48,4 +48,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_delete_key.xml b/app/src/main/res/layout/fragment_delete_key.xml
index f41f44c..4a5462f 100644
--- a/app/src/main/res/layout/fragment_delete_key.xml
+++ b/app/src/main/res/layout/fragment_delete_key.xml
@@ -93,7 +93,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_cancel"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -104,7 +104,7 @@
                 android:text="@string/layout_cancel"
                 android:textColor="@color/colorPrimary" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_confirm"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -117,4 +117,4 @@
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_detail_report_screen.xml b/app/src/main/res/layout/fragment_detail_report_screen.xml
index 7b6fff8..9b544bd 100644
--- a/app/src/main/res/layout/fragment_detail_report_screen.xml
+++ b/app/src/main/res/layout/fragment_detail_report_screen.xml
@@ -469,7 +469,7 @@
             app:layout_constraintStart_toStartOf="parent">
 
             <!-- Cancel Button -->
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:layout_width="0dp"
                 android:layout_height="52dp"
                 android:layout_weight="1"
@@ -485,7 +485,7 @@
                 android:textAllCaps="false" />
 
             <!-- Print Button -->
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:layout_width="0dp"
                 android:layout_height="52dp"
                 android:layout_weight="1"
@@ -503,4 +503,4 @@
         </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_disable_terminal.xml b/app/src/main/res/layout/fragment_disable_terminal.xml
index 593594c..76a3d80 100644
--- a/app/src/main/res/layout/fragment_disable_terminal.xml
+++ b/app/src/main/res/layout/fragment_disable_terminal.xml
@@ -108,7 +108,7 @@
 
 
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_cancel"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -129,7 +129,7 @@
             android:orientation="vertical"
             app:layout_constraintGuide_percent="0.5" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_confirm"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -146,4 +146,4 @@
             app:layout_constraintStart_toEndOf="@+id/guideline_middle" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_edit_stan_screen.xml b/app/src/main/res/layout/fragment_edit_stan_screen.xml
index c4e11e2..85525cb 100644
--- a/app/src/main/res/layout/fragment_edit_stan_screen.xml
+++ b/app/src/main/res/layout/fragment_edit_stan_screen.xml
@@ -95,7 +95,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_cancel"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -106,7 +106,7 @@
                 android:text="@string/layout_cancel"
                 android:textColor="@color/colorPrimary" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_confirm"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -119,4 +119,4 @@
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_emv_input_pin.xml b/app/src/main/res/layout/fragment_emv_input_pin.xml
index 903477f..bef418c 100644
--- a/app/src/main/res/layout/fragment_emv_input_pin.xml
+++ b/app/src/main/res/layout/fragment_emv_input_pin.xml
@@ -157,4 +157,4 @@
             app:layout_constraintBottom_toBottomOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_error_screen.xml b/app/src/main/res/layout/fragment_error_screen.xml
index e505cc6..872bee0 100644
--- a/app/src/main/res/layout/fragment_error_screen.xml
+++ b/app/src/main/res/layout/fragment_error_screen.xml
@@ -40,7 +40,7 @@
             app:layout_constraintTop_toBottomOf="@+id/appCompatImageView"
             tools:text="FUNCTION NOT SUPPORTED" />
 
-<!--        <Button-->
+<!--        <androidx.appcompat.widget.AppCompatButton-->
 <!--            android:layout_width="match_parent"-->
 <!--            android:layout_height="wrap_content"-->
 <!--            android:text="@string/txt_close"-->
@@ -53,4 +53,4 @@
 <!--            app:layout_constraintStart_toStartOf="parent" />-->
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_host_config.xml b/app/src/main/res/layout/fragment_host_config.xml
index b35542e..6a93adb 100644
--- a/app/src/main/res/layout/fragment_host_config.xml
+++ b/app/src/main/res/layout/fragment_host_config.xml
@@ -260,7 +260,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:layout_width="0dp"
                 android:layout_height="52dp"
                 android:layout_weight="1"
@@ -271,7 +271,7 @@
                 android:textColor="@color/colorPrimary"
                 android:textStyle="bold"/>
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:layout_width="0dp"
                 android:layout_height="52dp"
                 android:layout_weight="1"
diff --git a/app/src/main/res/layout/fragment_inject_key.xml b/app/src/main/res/layout/fragment_inject_key.xml
index fc7ac25..4157264 100644
--- a/app/src/main/res/layout/fragment_inject_key.xml
+++ b/app/src/main/res/layout/fragment_inject_key.xml
@@ -349,4 +349,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_input_approval_screen.xml b/app/src/main/res/layout/fragment_input_approval_screen.xml
index 3f17891..4cd0f63 100644
--- a/app/src/main/res/layout/fragment_input_approval_screen.xml
+++ b/app/src/main/res/layout/fragment_input_approval_screen.xml
@@ -83,7 +83,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_amount_cancel"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -94,7 +94,7 @@
             android:text="@string/layout_cancel"
             android:textColor="@color/colorPrimary" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_amount_confirm"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -106,4 +106,4 @@
             android:textColor="@color/white" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_input_invoice_screen.xml b/app/src/main/res/layout/fragment_input_invoice_screen.xml
index 43c7ca4..29f194a 100644
--- a/app/src/main/res/layout/fragment_input_invoice_screen.xml
+++ b/app/src/main/res/layout/fragment_input_invoice_screen.xml
@@ -152,7 +152,7 @@
             app:layout_constraintStart_toStartOf="parent">
 
             <!-- Cancel Button -->
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btnCancel"
                 android:layout_width="0dp"
                 android:layout_height="42dp"
@@ -169,7 +169,7 @@
                 android:textAllCaps="false" />
 
             <!-- Confirm Button -->
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btnConfirm"
                 android:layout_width="0dp"
                 android:layout_height="42dp"
@@ -188,4 +188,4 @@
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_input_rrn_screen.xml b/app/src/main/res/layout/fragment_input_rrn_screen.xml
index 6c49f38..4ae17ed 100644
--- a/app/src/main/res/layout/fragment_input_rrn_screen.xml
+++ b/app/src/main/res/layout/fragment_input_rrn_screen.xml
@@ -85,7 +85,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_amount_cancel"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
             android:text="@string/layout_cancel"
             android:textColor="@color/colorPrimary" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_amount_confirm"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_management_screen.xml b/app/src/main/res/layout/fragment_management_screen.xml
index 488f0c6..e375f75 100644
--- a/app/src/main/res/layout/fragment_management_screen.xml
+++ b/app/src/main/res/layout/fragment_management_screen.xml
@@ -502,4 +502,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_manual_entry_screen.xml b/app/src/main/res/layout/fragment_manual_entry_screen.xml
index 30aa0d1..1968d26 100644
--- a/app/src/main/res/layout/fragment_manual_entry_screen.xml
+++ b/app/src/main/res/layout/fragment_manual_entry_screen.xml
@@ -221,7 +221,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_cancel"
                 android:layout_width="0dp"
                 android:layout_height="44dp"
@@ -233,7 +233,7 @@
                 android:textColor="@color/colorPrimary"
                 android:textSize="14sp" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_confirm"
                 android:layout_width="0dp"
                 android:layout_height="44dp"
@@ -247,4 +247,4 @@
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_password_screen.xml b/app/src/main/res/layout/fragment_password_screen.xml
index 910cb65..bc19ebf 100644
--- a/app/src/main/res/layout/fragment_password_screen.xml
+++ b/app/src/main/res/layout/fragment_password_screen.xml
@@ -163,7 +163,7 @@
             app:layout_constraintStart_toStartOf="parent">
 
             <!-- Cancel Button -->
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btnCancel"
                 android:layout_width="0dp"
                 android:layout_height="48dp"
@@ -180,7 +180,7 @@
                 android:textAllCaps="false" />
 
             <!-- Confirm Button -->
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btnConfirm"
                 android:layout_width="0dp"
                 android:layout_height="48dp"
@@ -199,4 +199,4 @@
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_pin_pad_base.xml b/app/src/main/res/layout/fragment_pin_pad_base.xml
index dfe4467..5496d33 100644
--- a/app/src/main/res/layout/fragment_pin_pad_base.xml
+++ b/app/src/main/res/layout/fragment_pin_pad_base.xml
@@ -211,4 +211,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_print_receipt_screen.xml b/app/src/main/res/layout/fragment_print_receipt_screen.xml
index 4de290f..4123609 100644
--- a/app/src/main/res/layout/fragment_print_receipt_screen.xml
+++ b/app/src/main/res/layout/fragment_print_receipt_screen.xml
@@ -430,4 +430,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_processing_card_screen.xml b/app/src/main/res/layout/fragment_processing_card_screen.xml
index 485bb02..6836d0d 100644
--- a/app/src/main/res/layout/fragment_processing_card_screen.xml
+++ b/app/src/main/res/layout/fragment_processing_card_screen.xml
@@ -41,4 +41,4 @@
         app:lottie_loop="true" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_processing_screen.xml b/app/src/main/res/layout/fragment_processing_screen.xml
index 8efdce8..d674289 100644
--- a/app/src/main/res/layout/fragment_processing_screen.xml
+++ b/app/src/main/res/layout/fragment_processing_screen.xml
@@ -89,4 +89,4 @@
             tools:text="Sending Reversal" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_qr_connecting.xml b/app/src/main/res/layout/fragment_qr_connecting.xml
index 2b2b605..5f7b6fd 100644
--- a/app/src/main/res/layout/fragment_qr_connecting.xml
+++ b/app/src/main/res/layout/fragment_qr_connecting.xml
@@ -44,4 +44,4 @@
             app:lottie_loop="true" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_qr_history.xml b/app/src/main/res/layout/fragment_qr_history.xml
index 8057312..481bfa0 100644
--- a/app/src/main/res/layout/fragment_qr_history.xml
+++ b/app/src/main/res/layout/fragment_qr_history.xml
@@ -25,4 +25,4 @@
 <!--            android:padding="16dp"-->
 <!--            android:visibility="@{vm.refundList.size() == 0 ? View.VISIBLE : View.GONE}" />-->
     </FrameLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_qr_inquiry_result.xml b/app/src/main/res/layout/fragment_qr_inquiry_result.xml
index d3c1dea..0232591 100644
--- a/app/src/main/res/layout/fragment_qr_inquiry_result.xml
+++ b/app/src/main/res/layout/fragment_qr_inquiry_result.xml
@@ -43,4 +43,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_qr_pay.xml b/app/src/main/res/layout/fragment_qr_pay.xml
index 34b9e3e..e8ea992 100644
--- a/app/src/main/res/layout/fragment_qr_pay.xml
+++ b/app/src/main/res/layout/fragment_qr_pay.xml
@@ -37,4 +37,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_qr_refund_deprecated.xml b/app/src/main/res/layout/fragment_qr_refund_deprecated.xml
index 87bc93d..94ec507 100644
--- a/app/src/main/res/layout/fragment_qr_refund_deprecated.xml
+++ b/app/src/main/res/layout/fragment_qr_refund_deprecated.xml
@@ -141,7 +141,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_cancel_cancel"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -152,7 +152,7 @@
             android:text="@string/layout_cancel"
             android:textColor="@color/colorPrimary" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_refund_confirm"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -163,7 +163,7 @@
             android:text="@string/layout_confirm"
             android:textColor="@color/white" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_refund_scan"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -175,4 +175,4 @@
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_qr_refund_detail.xml b/app/src/main/res/layout/fragment_qr_refund_detail.xml
index f85b0ac..3c17fd9 100644
--- a/app/src/main/res/layout/fragment_qr_refund_detail.xml
+++ b/app/src/main/res/layout/fragment_qr_refund_detail.xml
@@ -323,7 +323,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/error_message">
 
-                <Button
+                <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/btn_cancel"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -335,7 +335,7 @@
                     android:textColor="@color/colorPrimary"
                     android:textSize="16sp" />
 
-                <Button
+                <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/btn_confirm"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -350,4 +350,4 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_qr_refund_process.xml b/app/src/main/res/layout/fragment_qr_refund_process.xml
index baabe78..17eb434 100644
--- a/app/src/main/res/layout/fragment_qr_refund_process.xml
+++ b/app/src/main/res/layout/fragment_qr_refund_process.xml
@@ -41,4 +41,4 @@
             app:lottie_loop="true" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_qr_refund_screen.xml b/app/src/main/res/layout/fragment_qr_refund_screen.xml
index 8286588..fb57717 100644
--- a/app/src/main/res/layout/fragment_qr_refund_screen.xml
+++ b/app/src/main/res/layout/fragment_qr_refund_screen.xml
@@ -319,7 +319,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/error_message">
 
-                <Button
+                <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/btn_cancel"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -331,7 +331,7 @@
                     android:textColor="@color/colorPrimary"
                     android:textSize="16sp" />
 
-                <Button
+                <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/btn_confirm"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -346,4 +346,4 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_qr_settlement_screen.xml b/app/src/main/res/layout/fragment_qr_settlement_screen.xml
index 61eb92c..528cc53 100644
--- a/app/src/main/res/layout/fragment_qr_settlement_screen.xml
+++ b/app/src/main/res/layout/fragment_qr_settlement_screen.xml
@@ -264,7 +264,7 @@
             android:paddingEnd="8dp"
             android:visibility="@{manageViewModel.detailReportBottomLayoutVisibility}">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_qr_settlement_cancel"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -275,7 +275,7 @@
                 android:text="@string/layout_cancel"
                 android:textColor="@color/colorPrimary" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_qr_settlement_confirm"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -290,4 +290,4 @@
 
     </RelativeLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_qr_transaction.xml b/app/src/main/res/layout/fragment_qr_transaction.xml
index 18a8bb1..03500c9 100644
--- a/app/src/main/res/layout/fragment_qr_transaction.xml
+++ b/app/src/main/res/layout/fragment_qr_transaction.xml
@@ -187,4 +187,4 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_receipt_screen.xml b/app/src/main/res/layout/fragment_receipt_screen.xml
index 2395cf6..2c7c854 100644
--- a/app/src/main/res/layout/fragment_receipt_screen.xml
+++ b/app/src/main/res/layout/fragment_receipt_screen.xml
@@ -56,7 +56,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/confirm_button"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -72,4 +72,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_reprint_receipt_screen.xml b/app/src/main/res/layout/fragment_reprint_receipt_screen.xml
index bfb8288..2c144d3 100644
--- a/app/src/main/res/layout/fragment_reprint_receipt_screen.xml
+++ b/app/src/main/res/layout/fragment_reprint_receipt_screen.xml
@@ -272,7 +272,7 @@
                 android:clickable="true"
                 android:focusable="true">
 
-                <Button
+                <androidx.appcompat.widget.AppCompatButton
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/white"
@@ -296,7 +296,7 @@
                 android:clickable="true"
                 android:focusable="true">
 
-                <Button
+                <androidx.appcompat.widget.AppCompatButton
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@drawable/bg_rounded_btn_cv"
@@ -312,4 +312,4 @@
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_select_host_screen.xml b/app/src/main/res/layout/fragment_select_host_screen.xml
index 7c7c209..d793f85 100644
--- a/app/src/main/res/layout/fragment_select_host_screen.xml
+++ b/app/src/main/res/layout/fragment_select_host_screen.xml
@@ -367,7 +367,7 @@
             app:layout_constraintStart_toStartOf="parent">
 
             <!-- Cancel Button -->
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:layout_width="match_parent"
                 android:layout_height="52dp"
                 android:text="@string/layout_cancel"
@@ -384,4 +384,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_select_refund_screen.xml b/app/src/main/res/layout/fragment_select_refund_screen.xml
index 8330dd0..213e99e 100644
--- a/app/src/main/res/layout/fragment_select_refund_screen.xml
+++ b/app/src/main/res/layout/fragment_select_refund_screen.xml
@@ -238,7 +238,7 @@
             app:layout_constraintStart_toStartOf="parent">
 
             <!-- Cancel Button -->
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:layout_width="match_parent"
                 android:layout_height="52dp"
                 android:text="@string/layout_cancel"
@@ -255,4 +255,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_select_settlement_screen.xml b/app/src/main/res/layout/fragment_select_settlement_screen.xml
index 5667d2f..1aba144 100644
--- a/app/src/main/res/layout/fragment_select_settlement_screen.xml
+++ b/app/src/main/res/layout/fragment_select_settlement_screen.xml
@@ -32,7 +32,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_card_settlement"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
@@ -44,7 +44,7 @@
                 android:textSize="16sp"
                 app:cornerRadius="8dp" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_qr_settlement"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
@@ -56,7 +56,7 @@
                 android:textSize="16sp"
                 app:cornerRadius="8dp" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_cancel"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
@@ -71,4 +71,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_settings_modern.xml b/app/src/main/res/layout/fragment_settings_modern.xml
index a6f61ef..ebd11b8 100644
--- a/app/src/main/res/layout/fragment_settings_modern.xml
+++ b/app/src/main/res/layout/fragment_settings_modern.xml
@@ -1128,4 +1128,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_sign_on.xml b/app/src/main/res/layout/fragment_sign_on.xml
index 8231e90..72ea1bc 100644
--- a/app/src/main/res/layout/fragment_sign_on.xml
+++ b/app/src/main/res/layout/fragment_sign_on.xml
@@ -173,4 +173,4 @@
     </androidx.cardview.widget.CardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_signature_view.xml b/app/src/main/res/layout/fragment_signature_view.xml
index 6d7a6ca..d61d2ed 100644
--- a/app/src/main/res/layout/fragment_signature_view.xml
+++ b/app/src/main/res/layout/fragment_signature_view.xml
@@ -239,7 +239,7 @@
                 android:clickable="true"
                 android:focusable="true">
 
-                <Button
+                <androidx.appcompat.widget.AppCompatButton
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@drawable/bg_rounded_btn_cancel_cv"
@@ -264,7 +264,7 @@
                 android:clickable="true"
                 android:focusable="true">
 
-                <Button
+                <androidx.appcompat.widget.AppCompatButton
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@drawable/bg_rounded_btn_cv"
@@ -282,4 +282,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_success_screen.xml b/app/src/main/res/layout/fragment_success_screen.xml
index 6fff888..9e54545 100644
--- a/app/src/main/res/layout/fragment_success_screen.xml
+++ b/app/src/main/res/layout/fragment_success_screen.xml
@@ -42,4 +42,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_test.xml b/app/src/main/res/layout/fragment_test.xml
index da457b3..3601b87 100644
--- a/app/src/main/res/layout/fragment_test.xml
+++ b/app/src/main/res/layout/fragment_test.xml
@@ -238,4 +238,4 @@
 
 <!--        </LinearLayout>-->
 <!--    </ScrollView>-->
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_timeout_screen.xml b/app/src/main/res/layout/fragment_timeout_screen.xml
index 897f0c5..46e2faa 100644
--- a/app/src/main/res/layout/fragment_timeout_screen.xml
+++ b/app/src/main/res/layout/fragment_timeout_screen.xml
@@ -37,4 +37,4 @@
         app:lottie_fileName="lottie_timeout.json"
         app:lottie_loop="true" />
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_tip_amount_screen.xml b/app/src/main/res/layout/fragment_tip_amount_screen.xml
index 9a34f00..7446a53 100644
--- a/app/src/main/res/layout/fragment_tip_amount_screen.xml
+++ b/app/src/main/res/layout/fragment_tip_amount_screen.xml
@@ -99,7 +99,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_cancel"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -110,7 +110,7 @@
                 android:text="@string/layout_cancel"
                 android:textColor="@color/colorPrimary" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_confirm"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -125,4 +125,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_tip_amount_screen_backup.xml b/app/src/main/res/layout/fragment_tip_amount_screen_backup.xml
index a2c4cf9..49e5b0d 100644
--- a/app/src/main/res/layout/fragment_tip_amount_screen_backup.xml
+++ b/app/src/main/res/layout/fragment_tip_amount_screen_backup.xml
@@ -214,7 +214,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_cancel"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -225,7 +225,7 @@
                 android:text="@string/layout_cancel"
                 android:textColor="@color/colorPrimary" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_confirm"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -240,4 +240,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_tms_process.xml b/app/src/main/res/layout/fragment_tms_process.xml
index 951128a..707afa6 100644
--- a/app/src/main/res/layout/fragment_tms_process.xml
+++ b/app/src/main/res/layout/fragment_tms_process.xml
@@ -49,4 +49,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_trans_info_screen.xml b/app/src/main/res/layout/fragment_trans_info_screen.xml
index e1cb731..d10c594 100644
--- a/app/src/main/res/layout/fragment_trans_info_screen.xml
+++ b/app/src/main/res/layout/fragment_trans_info_screen.xml
@@ -526,7 +526,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
 
-                    <Button
+                    <androidx.appcompat.widget.AppCompatButton
                         android:layout_width="0dp"
                         android:layout_height="52dp"
                         android:layout_weight="1"
@@ -541,7 +541,7 @@
                         android:elevation="2dp"
                         android:textAllCaps="false" />
 
-                    <Button
+                    <androidx.appcompat.widget.AppCompatButton
                         android:layout_width="0dp"
                         android:layout_height="52dp"
                         android:layout_weight="1"
@@ -567,7 +567,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <Button
+                <androidx.appcompat.widget.AppCompatButton
                     android:layout_width="0dp"
                     android:layout_height="52dp"
                     android:layout_weight="1"
@@ -582,7 +582,7 @@
                     android:elevation="2dp"
                     android:textAllCaps="false" />
 
-                <Button
+                <androidx.appcompat.widget.AppCompatButton
                     android:layout_width="0dp"
                     android:layout_height="52dp"
                     android:layout_weight="1"
@@ -606,7 +606,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <Button
+                <androidx.appcompat.widget.AppCompatButton
                     android:layout_width="match_parent"
                     android:layout_height="52dp"
                     android:text="@string/layout_close"
@@ -625,4 +625,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_trans_not_found.xml b/app/src/main/res/layout/fragment_trans_not_found.xml
index a665967..75e5a14 100644
--- a/app/src/main/res/layout/fragment_trans_not_found.xml
+++ b/app/src/main/res/layout/fragment_trans_not_found.xml
@@ -40,4 +40,4 @@
         app:layout_constraintTop_toBottomOf="@+id/lav_no_trans" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_trans_result_screen.xml b/app/src/main/res/layout/fragment_trans_result_screen.xml
index cdf4d9c..997c0fb 100644
--- a/app/src/main/res/layout/fragment_trans_result_screen.xml
+++ b/app/src/main/res/layout/fragment_trans_result_screen.xml
@@ -228,4 +228,4 @@
         </androidx.cardview.widget.CardView>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_transaction_detail.xml b/app/src/main/res/layout/fragment_transaction_detail.xml
index 1804b77..1d8f7cf 100644
--- a/app/src/main/res/layout/fragment_transaction_detail.xml
+++ b/app/src/main/res/layout/fragment_transaction_detail.xml
@@ -50,4 +50,4 @@
         app:layout_constraintTop_toBottomOf="@+id/textView19"
         tools:text="0200123123123123123\nlbah blah blah" />
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_transaction_history_screen.xml b/app/src/main/res/layout/fragment_transaction_history_screen.xml
index c824cf3..3af3f9d 100644
--- a/app/src/main/res/layout/fragment_transaction_history_screen.xml
+++ b/app/src/main/res/layout/fragment_transaction_history_screen.xml
@@ -80,7 +80,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_cancel"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -91,7 +91,7 @@
                 android:text="@string/layout_cancel"
                 android:textColor="@color/colorPrimary" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_amount_confirm"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -106,4 +106,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_transaction_reprint_any_screen.xml b/app/src/main/res/layout/fragment_transaction_reprint_any_screen.xml
index a9a52c8..8074153 100644
--- a/app/src/main/res/layout/fragment_transaction_reprint_any_screen.xml
+++ b/app/src/main/res/layout/fragment_transaction_reprint_any_screen.xml
@@ -136,7 +136,7 @@
             </androidx.cardview.widget.CardView>
 
             <!-- Search Button -->
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:layout_width="wrap_content"
                 android:layout_height="56dp"
                 android:paddingHorizontal="20dp"
@@ -228,4 +228,4 @@
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_transaction_reprint_screen.xml b/app/src/main/res/layout/fragment_transaction_reprint_screen.xml
index da99995..2fde45a 100644
--- a/app/src/main/res/layout/fragment_transaction_reprint_screen.xml
+++ b/app/src/main/res/layout/fragment_transaction_reprint_screen.xml
@@ -33,7 +33,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_start_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
             android:text="@string/txt_minus"
             android:textSize="20sp" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_end_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -59,7 +59,7 @@
             android:layout_weight="2"
             android:text="@string/txt_end_date" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_amount_confirm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -120,4 +120,4 @@
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_transaction_summary_screen.xml b/app/src/main/res/layout/fragment_transaction_summary_screen.xml
index 1149d0a..cdc6ce6 100644
--- a/app/src/main/res/layout/fragment_transaction_summary_screen.xml
+++ b/app/src/main/res/layout/fragment_transaction_summary_screen.xml
@@ -556,7 +556,7 @@
                 android:textAllCaps="false" />
 
             <!-- Print Button -->
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:layout_width="0dp"
                 android:layout_height="52dp"
                 android:layout_weight="1"
@@ -575,4 +575,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_version_screen.xml b/app/src/main/res/layout/fragment_version_screen.xml
index 700e061..0bfba49 100644
--- a/app/src/main/res/layout/fragment_version_screen.xml
+++ b/app/src/main/res/layout/fragment_version_screen.xml
@@ -217,4 +217,4 @@
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_view_batch_screen.xml b/app/src/main/res/layout/fragment_view_batch_screen.xml
index 1af8548..3b9329b 100644
--- a/app/src/main/res/layout/fragment_view_batch_screen.xml
+++ b/app/src/main/res/layout/fragment_view_batch_screen.xml
@@ -280,7 +280,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_amount_cancel"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -291,7 +291,7 @@
             android:text="@string/layout_cancel"
             android:textColor="@color/colorPrimary" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_amount_confirm"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -307,4 +307,4 @@
 
 
 </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/header_layout.xml b/app/src/main/res/layout/header_layout.xml
index 2463f07..3919323 100644
--- a/app/src/main/res/layout/header_layout.xml
+++ b/app/src/main/res/layout/header_layout.xml
@@ -25,4 +25,4 @@
             android:textSize="20sp" />
     </RelativeLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_qr_history.xml b/app/src/main/res/layout/item_qr_history.xml
index 6153cc2..835a10d 100644
--- a/app/src/main/res/layout/item_qr_history.xml
+++ b/app/src/main/res/layout/item_qr_history.xml
@@ -157,4 +157,4 @@
         </LinearLayout>
 
     </androidx.cardview.widget.CardView>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/item_qr_pay_button.xml b/app/src/main/res/layout/item_qr_pay_button.xml
index b439607..1cf009f 100644
--- a/app/src/main/res/layout/item_qr_pay_button.xml
+++ b/app/src/main/res/layout/item_qr_pay_button.xml
@@ -66,4 +66,4 @@
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/item_qr_refund.xml b/app/src/main/res/layout/item_qr_refund.xml
index 68f9a8b..8c69c0c 100644
--- a/app/src/main/res/layout/item_qr_refund.xml
+++ b/app/src/main/res/layout/item_qr_refund.xml
@@ -156,4 +156,4 @@
         </LinearLayout>
 
     </androidx.cardview.widget.CardView>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/item_row.xml b/app/src/main/res/layout/item_row.xml
index e27a058..eabb9dc 100644
--- a/app/src/main/res/layout/item_row.xml
+++ b/app/src/main/res/layout/item_row.xml
@@ -126,4 +126,4 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/item_view_dashboard_old.xml b/app/src/main/res/layout/item_view_dashboard_old.xml
index d4405f1..dd8e050 100644
--- a/app/src/main/res/layout/item_view_dashboard_old.xml
+++ b/app/src/main/res/layout/item_view_dashboard_old.xml
@@ -59,4 +59,4 @@
 
     </androidx.cardview.widget.CardView>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/item_view_dashboard_premium.xml b/app/src/main/res/layout/item_view_dashboard_premium.xml
index a986a3a..659ef94 100644
--- a/app/src/main/res/layout/item_view_dashboard_premium.xml
+++ b/app/src/main/res/layout/item_view_dashboard_premium.xml
@@ -83,4 +83,4 @@
     </LinearLayout>
 
 </androidx.cardview.widget.CardView>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/item_view_detail_report.xml b/app/src/main/res/layout/item_view_detail_report.xml
index 1ae0f8f..ca3e691 100644
--- a/app/src/main/res/layout/item_view_detail_report.xml
+++ b/app/src/main/res/layout/item_view_detail_report.xml
@@ -138,4 +138,4 @@
         android:layout_marginTop="4dp" />
 
 </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/item_view_history.xml b/app/src/main/res/layout/item_view_history.xml
index c366f5a..e145f7a 100644
--- a/app/src/main/res/layout/item_view_history.xml
+++ b/app/src/main/res/layout/item_view_history.xml
@@ -131,4 +131,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/item_view_trans.xml b/app/src/main/res/layout/item_view_trans.xml
index 0a17bc3..ff56e77 100644
--- a/app/src/main/res/layout/item_view_trans.xml
+++ b/app/src/main/res/layout/item_view_trans.xml
@@ -162,4 +162,4 @@
         </LinearLayout>
 
 </androidx.cardview.widget.CardView>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/item_view_void.xml b/app/src/main/res/layout/item_view_void.xml
index 043c7f8..bb36e84 100644
--- a/app/src/main/res/layout/item_view_void.xml
+++ b/app/src/main/res/layout/item_view_void.xml
@@ -123,4 +123,4 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/layout_bottom_sheet_item.xml b/app/src/main/res/layout/layout_bottom_sheet_item.xml
index a3c9348..d787d64 100644
--- a/app/src/main/res/layout/layout_bottom_sheet_item.xml
+++ b/app/src/main/res/layout/layout_bottom_sheet_item.xml
@@ -50,4 +50,4 @@
         android:src="@drawable/ic_right_arrow" />
 
 </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/layout_item_capture_card.xml b/app/src/main/res/layout/layout_item_capture_card.xml
index 18c8e45..58491a3 100644
--- a/app/src/main/res/layout/layout_item_capture_card.xml
+++ b/app/src/main/res/layout/layout_item_capture_card.xml
@@ -54,4 +54,4 @@
     </androidx.cardview.widget.CardView>
 
     <!--</androidx.constraintlayout.widget.ConstraintLayout>-->
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/layout_loading.xml b/app/src/main/res/layout/layout_loading.xml
index 322c662..8ec0184 100644
--- a/app/src/main/res/layout/layout_loading.xml
+++ b/app/src/main/res/layout/layout_loading.xml
@@ -17,4 +17,4 @@
         android:textColor="@color/colorTextTitle"
         android:textSize="16sp" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_management_item.xml b/app/src/main/res/layout/layout_management_item.xml
index 883a812..3cf6179 100644
--- a/app/src/main/res/layout/layout_management_item.xml
+++ b/app/src/main/res/layout/layout_management_item.xml
@@ -47,4 +47,4 @@
             android:src="@drawable/ic_right_arrow" />
 
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/navi_admin_layout.xml b/app/src/main/res/layout/navi_admin_layout.xml
index 38c3df8..9963d97 100644
--- a/app/src/main/res/layout/navi_admin_layout.xml
+++ b/app/src/main/res/layout/navi_admin_layout.xml
@@ -103,4 +103,4 @@
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/navi_main_layout.xml b/app/src/main/res/layout/navi_main_layout.xml
index 7ad0e2a..0c654e1 100644
--- a/app/src/main/res/layout/navi_main_layout.xml
+++ b/app/src/main/res/layout/navi_main_layout.xml
@@ -608,4 +608,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/navi_setup_layout.xml b/app/src/main/res/layout/navi_setup_layout.xml
index 596e60b..e5085f9 100644
--- a/app/src/main/res/layout/navi_setup_layout.xml
+++ b/app/src/main/res/layout/navi_setup_layout.xml
@@ -819,4 +819,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/preference_card_modern.xml b/app/src/main/res/layout/preference_card_modern.xml
index a5ca246..ed90850 100644
--- a/app/src/main/res/layout/preference_card_modern.xml
+++ b/app/src/main/res/layout/preference_card_modern.xml
@@ -69,4 +69,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/preference_category_modern.xml b/app/src/main/res/layout/preference_category_modern.xml
index 5f16e2a..32445fa 100644
--- a/app/src/main/res/layout/preference_category_modern.xml
+++ b/app/src/main/res/layout/preference_category_modern.xml
@@ -17,4 +17,4 @@
         android:textStyle="bold"
         android:layout_marginBottom="12dp" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/preference_switch_card_modern.xml b/app/src/main/res/layout/preference_switch_card_modern.xml
index f413c0f..f207c2f 100644
--- a/app/src/main/res/layout/preference_switch_card_modern.xml
+++ b/app/src/main/res/layout/preference_switch_card_modern.xml
@@ -71,4 +71,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
diff --git a/baselib/src/main/res/layout/dialog_animation.xml b/baselib/src/main/res/layout/dialog_animation.xml
index 08cfec8..0a0dc73 100644
--- a/baselib/src/main/res/layout/dialog_animation.xml
+++ b/baselib/src/main/res/layout/dialog_animation.xml
@@ -45,4 +45,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
diff --git a/baselib/src/main/res/layout/dialog_decline.xml b/baselib/src/main/res/layout/dialog_decline.xml
index 2e42726..6ace398 100644
--- a/baselib/src/main/res/layout/dialog_decline.xml
+++ b/baselib/src/main/res/layout/dialog_decline.xml
@@ -45,4 +45,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
diff --git a/baselib/src/main/res/layout/dialog_info.xml b/baselib/src/main/res/layout/dialog_info.xml
index a481f96..619a91b 100644
--- a/baselib/src/main/res/layout/dialog_info.xml
+++ b/baselib/src/main/res/layout/dialog_info.xml
@@ -57,4 +57,4 @@ tools:ignore="MissingDefaultResource">
 
 </LinearLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
diff --git a/baselib/src/main/res/layout/dialog_info_single.xml b/baselib/src/main/res/layout/dialog_info_single.xml
index d148439..ab94bda 100644
--- a/baselib/src/main/res/layout/dialog_info_single.xml
+++ b/baselib/src/main/res/layout/dialog_info_single.xml
@@ -45,4 +45,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
diff --git a/baselib/src/main/res/layout/dialog_loading.xml b/baselib/src/main/res/layout/dialog_loading.xml
index ec5a533..19a0334 100644
--- a/baselib/src/main/res/layout/dialog_loading.xml
+++ b/baselib/src/main/res/layout/dialog_loading.xml
@@ -36,4 +36,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
diff --git a/baselib/src/main/res/layout/dialog_printer_status.xml b/baselib/src/main/res/layout/dialog_printer_status.xml
index 91d06bb..1008c3e 100644
--- a/baselib/src/main/res/layout/dialog_printer_status.xml
+++ b/baselib/src/main/res/layout/dialog_printer_status.xml
@@ -51,7 +51,7 @@
             android:paddingStart="8dp"
             android:paddingEnd="8dp">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_cancel"
                 android:layout_width="0dp"
                 android:layout_height="30dp"
@@ -61,7 +61,7 @@
                 android:text="@string/btn_txt_cancel"
                 android:textColor="@color/smilePrimaryColor" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_retry"
                 android:layout_width="0dp"
                 android:layout_height="30dp"
@@ -73,4 +73,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
diff --git a/baselib/src/main/res/layout/dialog_success.xml b/baselib/src/main/res/layout/dialog_success.xml
index f17a0b7..35cadf6 100644
--- a/baselib/src/main/res/layout/dialog_success.xml
+++ b/baselib/src/main/res/layout/dialog_success.xml
@@ -45,4 +45,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
diff --git a/baselib/src/main/res/layout/num_key.xml b/baselib/src/main/res/layout/num_key.xml
index a7725d9..38c2cb6 100644
--- a/baselib/src/main/res/layout/num_key.xml
+++ b/baselib/src/main/res/layout/num_key.xml
@@ -9,4 +9,4 @@
     >
 
 
-</TextView>
\ No newline at end of file
+</TextView>
diff --git a/baselib/src/main/res/layout/num_key_clean.xml b/baselib/src/main/res/layout/num_key_clean.xml
index 5506ae3..f665788 100644
--- a/baselib/src/main/res/layout/num_key_clean.xml
+++ b/baselib/src/main/res/layout/num_key_clean.xml
@@ -12,4 +12,4 @@
         android:layout_height="20dp"
         android:src="@drawable/keyborad_clean" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/baselib/src/main/res/layout/num_key_del.xml b/baselib/src/main/res/layout/num_key_del.xml
index 1238583..321eeae 100644
--- a/baselib/src/main/res/layout/num_key_del.xml
+++ b/baselib/src/main/res/layout/num_key_del.xml
@@ -13,4 +13,4 @@
         android:layout_height="26dp"
         android:src="@drawable/calculator_keyborad_del" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/baselib/src/main/res/layout/password_fix_keyboard.xml b/baselib/src/main/res/layout/password_fix_keyboard.xml
index 5e16e3e..0ac5f7c 100644
--- a/baselib/src/main/res/layout/password_fix_keyboard.xml
+++ b/baselib/src/main/res/layout/password_fix_keyboard.xml
@@ -170,4 +170,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/baselib/src/main/res/layout/test_activity.xml b/baselib/src/main/res/layout/test_activity.xml
index a5b4211..7995d94 100644
--- a/baselib/src/main/res/layout/test_activity.xml
+++ b/baselib/src/main/res/layout/test_activity.xml
@@ -3,7 +3,7 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <Button
+    <androidx.appcompat.widget.AppCompatButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Click"
@@ -11,4 +11,4 @@
         android:layout_centerInParent="true"/>
 
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/baselib/src/main/res/layout/ui_item_lv.xml b/baselib/src/main/res/layout/ui_item_lv.xml
index f13cfa1..ed0e0dc 100644
--- a/baselib/src/main/res/layout/ui_item_lv.xml
+++ b/baselib/src/main/res/layout/ui_item_lv.xml
@@ -18,4 +18,4 @@
         android:textColor="@color/colorTextContent"
         android:textSize="14sp" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/baselib/src/main/res/layout/view_fix_password_keyboard.xml b/baselib/src/main/res/layout/view_fix_password_keyboard.xml
index 089b15d..ac38153 100644
--- a/baselib/src/main/res/layout/view_fix_password_keyboard.xml
+++ b/baselib/src/main/res/layout/view_fix_password_keyboard.xml
@@ -303,4 +303,4 @@
 
 <!--    </LinearLayout>-->
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>