material lib for time picker

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.utsmm.kbz"
         minSdk 24
         targetSdk 33
-        versionCode 1
+        versionCode 21
-        versionName "1.0"
+        versionName "2.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -222,9 +222,6 @@ dependencies {
 
     testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
     testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
-
+    //time picker
-
+    implementation "com.google.android.material:material:1.11.0"
-
-
-
 }

app/src/main/java/com/utsmm/kbz/ui/management/TransactionSummaryFragment.java

@@ -5,6 +5,8 @@ import android.app.TimePickerDialog;
 
 import androidx.lifecycle.Observer;
 
+import com.google.android.material.timepicker.MaterialTimePicker;
+import com.google.android.material.timepicker.TimeFormat;
 import com.nexgo.oaf.apiv3.SdkResult;
 import com.utsmyanmar.baselib.fragment.DataBindingFragment;
 import com.utsmyanmar.baselib.util.DataBindingConfig;
@@ -155,15 +157,15 @@ public class TransactionSummaryFragment extends DataBindingFragment {
                 summaryViewModel.startDate.postValue(selectedDate);
 //                LogUtil.d(TAG, "Start date updated: " + selectedDate);
                 // STATIC START TIME
-                summaryViewModel.startHr.setValue("00");
+//                summaryViewModel.startHr.setValue("00");
-                summaryViewModel.startMin.setValue("00");
+//                summaryViewModel.startMin.setValue("00");
                 summaryViewModel.startDayOrNight.setValue(getString(R.string.txt_am));
             } else {
                 String selectedDate = dateFormat.format(myCalendar2.getTime());
                 summaryViewModel.endDate.postValue(selectedDate);
                 // STATIC END TIME
-                summaryViewModel.endHr.setValue("23");
+//                summaryViewModel.endHr.setValue("23");
-                summaryViewModel.endMin.setValue("59");
+//                summaryViewModel.endMin.setValue("59");
                 summaryViewModel.endDayOrNight.setValue(getString(R.string.txt_pm));
 //                LogUtil.d(TAG, "End date updated: " + selectedDate);
             }
@@ -471,39 +473,92 @@ public class TransactionSummaryFragment extends DataBindingFragment {
         }
 
         public void onClickStartHr() {
-            showTimePicker(startTime, myCalendar);
+//            showTimePicker(startTime, myCalendar);
+            showMaterialTimePicker(myCalendar, true);
         }
 
         public void onClickEndHr() {
-            showTimePicker(endTime, myCalendar2);
+//            showTimePicker(endTime, myCalendar2);
+            showMaterialTimePicker(myCalendar2, false);
         }
 
         public void onClickStartMin() {
-            showTimePicker(startTime, myCalendar);
+//            showTimePicker(startTime, myCalendar);
+            showMaterialTimePicker(myCalendar, true);
         }
 
         public void onClickEndMin() {
-            showTimePicker(endTime, myCalendar2);
+//            showTimePicker(endTime, myCalendar2);
+            showMaterialTimePicker(myCalendar2, false);
         }
 
         public void onClickStartDayOrNight() {
-            showTimePicker(startTime, myCalendar);
+//            showTimePicker(startTime, myCalendar);
+            showMaterialTimePicker(myCalendar, true);
         }
 
         public void onClickEndDayOrNight() {
-            showTimePicker(endTime, myCalendar2);
+//            showTimePicker(endTime, myCalendar2);
+            showMaterialTimePicker(myCalendar2, false);
         }
 
         private void showTimePicker(TimePickerDialog.OnTimeSetListener listener, Calendar calendar) {
             try {
-                TimePickerDialog timePickerDialog = new TimePickerDialog(requireContext(),
+                TimePickerDialog timePickerDialog =
-                        listener, calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE), false);
+                        new TimePickerDialog(
+                                requireContext(),
+                                listener,
+                                calendar.get(Calendar.HOUR_OF_DAY),
+                                calendar.get(Calendar.MINUTE),
+                                false);
+
                 timePickerDialog.show();
             } catch (Exception e) {
                 LogUtil.e(TAG, "Error showing time picker: " + e.getMessage());
             }
         }
 
+        private void showMaterialTimePicker(
+                Calendar calendar,
+                boolean isStart
+        ) {
+            MaterialTimePicker timePicker = new MaterialTimePicker.Builder()
+                    .setTimeFormat(TimeFormat.CLOCK_24H)
+                    .setHour(calendar.get(Calendar.HOUR_OF_DAY))
+                    .setMinute(calendar.get(Calendar.MINUTE))
+                    .setInputMode(MaterialTimePicker.INPUT_MODE_KEYBOARD)
+                    .setTitleText("Select Time")
+                    .build();
+
+            timePicker.addOnPositiveButtonClickListener(v -> {
+                int hour = timePicker.getHour();
+                int minute = timePicker.getMinute();
+
+                calendar.set(Calendar.HOUR_OF_DAY, hour);
+                calendar.set(Calendar.MINUTE, minute);
+
+                String amPm = hour >= 12
+                        ? getString(R.string.txt_pm)
+                        : getString(R.string.txt_am);
+
+                if (isStart) {
+                    summaryViewModel.startHr.setValue(String.format(Locale.getDefault(), "%02d", hour));
+                    summaryViewModel.startMin.setValue(String.format(Locale.getDefault(), "%02d", minute));
+                    summaryViewModel.startDayOrNight.setValue(amPm);
+                } else {
+                    summaryViewModel.endHr.setValue(String.format(Locale.getDefault(), "%02d", hour));
+                    summaryViewModel.endMin.setValue(String.format(Locale.getDefault(), "%02d", minute));
+                    summaryViewModel.endDayOrNight.setValue(amPm);
+                }
+
+                LogUtil.d(TAG, (isStart ? "Start" : "End") +
+                        " time selected: " + hour + ":" + minute);
+            });
+
+            timePicker.show(getParentFragmentManager(), "material_time_picker");
+        }
+
+
         public void onPrint() {
             try {
                 if (summaryViewModel.validateField()) {

app/src/main/res/layout/activity_main.xml

@@ -37,4 +37,4 @@
 
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
-</layout>
+</layout>

app/src/main/res/layout/activity_main_new.xml

@@ -78,4 +78,4 @@
 </androidx.drawerlayout.widget.DrawerLayout>
 
 
-</layout>
+</layout>

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>
+</RelativeLayout>

app/src/main/res/layout/card_template.xml

@@ -87,4 +87,4 @@
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
+</layout>

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>
+</androidx.constraintlayout.widget.ConstraintLayout>

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>
+</layout>

app/src/main/res/layout/fragment_capture_card_screen.xml

@@ -325,4 +325,4 @@
         </androidx.cardview.widget.CardView>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

app/src/main/res/layout/fragment_config_settings_modern.xml

@@ -739,4 +739,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
+</layout>

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>
+</layout>

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>
+</layout>

app/src/main/res/layout/fragment_dashboard_screen_old.xml

@@ -330,4 +330,4 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

app/src/main/res/layout/fragment_dashboard_trans_screen.xml

@@ -48,4 +48,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
+</layout>

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>
+</layout>

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>
+</layout>

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>
+</layout>

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>
+</layout>

app/src/main/res/layout/fragment_emv_input_pin.xml

@@ -157,4 +157,4 @@
             app:layout_constraintBottom_toBottomOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

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>
+</layout>

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"

app/src/main/res/layout/fragment_inject_key.xml

@@ -349,4 +349,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
+</layout>

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>
+</layout>

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>
+</layout>

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"

app/src/main/res/layout/fragment_management_screen.xml

@@ -502,4 +502,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
+</layout>

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>
+</layout>

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>
+</layout>

app/src/main/res/layout/fragment_pin_pad_base.xml

@@ -211,4 +211,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

app/src/main/res/layout/fragment_print_receipt_screen.xml

@@ -430,4 +430,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

app/src/main/res/layout/fragment_processing_card_screen.xml

@@ -41,4 +41,4 @@
         app:lottie_loop="true" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

app/src/main/res/layout/fragment_processing_screen.xml

@@ -89,4 +89,4 @@
             tools:text="Sending Reversal" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

app/src/main/res/layout/fragment_qr_connecting.xml

@@ -44,4 +44,4 @@
             app:lottie_loop="true" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

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>
+</layout>

app/src/main/res/layout/fragment_qr_inquiry_result.xml

@@ -43,4 +43,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

app/src/main/res/layout/fragment_qr_pay.xml

@@ -37,4 +37,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
+</layout>

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>
+</layout>

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>
+</layout>

app/src/main/res/layout/fragment_qr_refund_process.xml

@@ -41,4 +41,4 @@
             app:lottie_loop="true" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

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>
+</layout>

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>
+</layout>

app/src/main/res/layout/fragment_qr_transaction.xml

@@ -187,4 +187,4 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
-</layout>
+</layout>

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>
+</layout>

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>
+</layout>

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>
+</layout>

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>
+</layout>

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>
+</layout>

app/src/main/res/layout/fragment_settings_modern.xml

@@ -1128,4 +1128,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
+</layout>

app/src/main/res/layout/fragment_sign_on.xml

@@ -173,4 +173,4 @@
     </androidx.cardview.widget.CardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

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>
+</layout>

app/src/main/res/layout/fragment_success_screen.xml

@@ -42,4 +42,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

app/src/main/res/layout/fragment_test.xml

@@ -238,4 +238,4 @@
 
 <!--        </LinearLayout>-->
 <!--    </ScrollView>-->
-</layout>
+</layout>

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>
+</layout>

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>
+</layout>

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>
+</layout>

app/src/main/res/layout/fragment_tms_process.xml

@@ -49,4 +49,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

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>
+</layout>

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>
+</layout>

app/src/main/res/layout/fragment_trans_result_screen.xml

@@ -228,4 +228,4 @@
         </androidx.cardview.widget.CardView>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

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>
+</layout>

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>
+</layout>

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>
+</layout>

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>
+</layout>

app/src/main/res/layout/fragment_transaction_summary_screen.xml

@@ -189,7 +189,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="horizontal"
-                            android:visibility="gone"
+                            android:visibility="visible"
                             android:gravity="center">
 
                             <!-- Hour -->
@@ -406,7 +406,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="horizontal"
-                            android:visibility="gone"
+                            android:visibility="visible"
                             android:gravity="center">
 
                             <!-- Hour -->
@@ -540,7 +540,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"
@@ -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>
+</layout>

app/src/main/res/layout/fragment_version_screen.xml

@@ -217,4 +217,4 @@
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

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>
+</layout>

app/src/main/res/layout/header_layout.xml

@@ -25,4 +25,4 @@
             android:textSize="20sp" />
     </RelativeLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/item_qr_history.xml

@@ -157,4 +157,4 @@
         </LinearLayout>
 
     </androidx.cardview.widget.CardView>
-</layout>
+</layout>

app/src/main/res/layout/item_qr_pay_button.xml

@@ -66,4 +66,4 @@
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
+</layout>

app/src/main/res/layout/item_qr_refund.xml

@@ -156,4 +156,4 @@
         </LinearLayout>
 
     </androidx.cardview.widget.CardView>
-</layout>
+</layout>

app/src/main/res/layout/item_row.xml

@@ -126,4 +126,4 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>
-</layout>
+</layout>

app/src/main/res/layout/item_view_dashboard_old.xml

@@ -59,4 +59,4 @@
 
     </androidx.cardview.widget.CardView>
 
-</layout>
+</layout>

app/src/main/res/layout/item_view_dashboard_premium.xml

@@ -83,4 +83,4 @@
     </LinearLayout>
 
 </androidx.cardview.widget.CardView>
-</layout>
+</layout>

app/src/main/res/layout/item_view_detail_report.xml

@@ -138,4 +138,4 @@
         android:layout_marginTop="4dp" />
 
 </LinearLayout>
-</layout>
+</layout>

app/src/main/res/layout/item_view_history.xml

@@ -131,4 +131,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

app/src/main/res/layout/item_view_trans.xml

@@ -162,4 +162,4 @@
         </LinearLayout>
 
 </androidx.cardview.widget.CardView>
-</layout>
+</layout>

app/src/main/res/layout/item_view_void.xml

@@ -123,4 +123,4 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>
-</layout>
+</layout>

app/src/main/res/layout/layout_bottom_sheet_item.xml

@@ -50,4 +50,4 @@
         android:src="@drawable/ic_right_arrow" />
 
 </LinearLayout>
-</layout>
+</layout>

app/src/main/res/layout/layout_item_capture_card.xml

@@ -54,4 +54,4 @@
     </androidx.cardview.widget.CardView>
 
     <!--</androidx.constraintlayout.widget.ConstraintLayout>-->
-</layout>
+</layout>

app/src/main/res/layout/layout_loading.xml

@@ -17,4 +17,4 @@
         android:textColor="@color/colorTextTitle"
         android:textSize="16sp" />
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/layout_management_item.xml

@@ -47,4 +47,4 @@
             android:src="@drawable/ic_right_arrow" />
 
     </LinearLayout>
-</layout>
+</layout>

app/src/main/res/layout/navi_admin_layout.xml

@@ -103,4 +103,4 @@
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</layout>

app/src/main/res/layout/navi_main_layout.xml

@@ -608,4 +608,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
+</layout>

app/src/main/res/layout/navi_setup_layout.xml

@@ -819,4 +819,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
+</layout>

app/src/main/res/layout/preference_card_modern.xml

@@ -69,4 +69,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

app/src/main/res/layout/preference_category_modern.xml

@@ -17,4 +17,4 @@
         android:textStyle="bold"
         android:layout_marginBottom="12dp" />
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/preference_switch_card_modern.xml

@@ -71,4 +71,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

app/src/main/res/values/styles.xml

@@ -2,7 +2,7 @@
 <resources>
     <!-- Base application theme. -->
 <!--    DarkActionBar-->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
 <!--    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">-->
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
@@ -25,7 +25,7 @@
         <item name="iconTint">@color/white</item>
     </style>
 
-    <style name="DefaultDialogStyle" parent="android:Theme.Holo.Light.Dialog">
+    <style name="DefaultDialogStyle" parent="Theme.MaterialComponents.Light.Dialog">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>

baselib/src/main/res/layout/dialog_animation.xml

@@ -45,4 +45,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

baselib/src/main/res/layout/dialog_decline.xml

@@ -45,4 +45,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

baselib/src/main/res/layout/dialog_info.xml

@@ -57,4 +57,4 @@ tools:ignore="MissingDefaultResource">
 
 </LinearLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

baselib/src/main/res/layout/dialog_info_single.xml

@@ -45,4 +45,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

baselib/src/main/res/layout/dialog_loading.xml

@@ -36,4 +36,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

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>
+</androidx.cardview.widget.CardView>

baselib/src/main/res/layout/dialog_success.xml

@@ -45,4 +45,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

baselib/src/main/res/layout/num_key.xml

@@ -9,4 +9,4 @@
     >
 
 
-</TextView>
+</TextView>

baselib/src/main/res/layout/num_key_clean.xml

@@ -12,4 +12,4 @@
         android:layout_height="20dp"
         android:src="@drawable/keyborad_clean" />
 
-</RelativeLayout>
+</RelativeLayout>

baselib/src/main/res/layout/num_key_del.xml

@@ -13,4 +13,4 @@
         android:layout_height="26dp"
         android:src="@drawable/calculator_keyborad_del" />
 
-</RelativeLayout>
+</RelativeLayout>

baselib/src/main/res/layout/password_fix_keyboard.xml

@@ -170,4 +170,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>

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>
+</RelativeLayout>