Compare commits

..

3 Commits

Author SHA1 Message Date
MooN
cb5177fa38 material lib for time picker 2026-02-03 22:32:03 +06:30
MooN
02629279cb button fix 2026-02-03 22:31:42 +06:30
MooN
caf656be60 timePicker added 2026-02-03 22:21:15 +06:30
102 changed files with 236 additions and 184 deletions

View File

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

View File

@ -5,6 +5,8 @@ import android.app.TimePickerDialog;
import androidx.lifecycle.Observer; 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.nexgo.oaf.apiv3.SdkResult;
import com.utsmyanmar.baselib.fragment.DataBindingFragment; import com.utsmyanmar.baselib.fragment.DataBindingFragment;
import com.utsmyanmar.baselib.util.DataBindingConfig; import com.utsmyanmar.baselib.util.DataBindingConfig;
@ -155,15 +157,15 @@ public class TransactionSummaryFragment extends DataBindingFragment {
summaryViewModel.startDate.postValue(selectedDate); summaryViewModel.startDate.postValue(selectedDate);
// LogUtil.d(TAG, "Start date updated: " + selectedDate); // LogUtil.d(TAG, "Start date updated: " + selectedDate);
// STATIC START TIME // 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)); summaryViewModel.startDayOrNight.setValue(getString(R.string.txt_am));
} else { } else {
String selectedDate = dateFormat.format(myCalendar2.getTime()); String selectedDate = dateFormat.format(myCalendar2.getTime());
summaryViewModel.endDate.postValue(selectedDate); summaryViewModel.endDate.postValue(selectedDate);
// STATIC END TIME // 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)); summaryViewModel.endDayOrNight.setValue(getString(R.string.txt_pm));
// LogUtil.d(TAG, "End date updated: " + selectedDate); // LogUtil.d(TAG, "End date updated: " + selectedDate);
} }
@ -471,39 +473,92 @@ public class TransactionSummaryFragment extends DataBindingFragment {
} }
public void onClickStartHr() { public void onClickStartHr() {
showTimePicker(startTime, myCalendar); // showTimePicker(startTime, myCalendar);
showMaterialTimePicker(myCalendar, true);
} }
public void onClickEndHr() { public void onClickEndHr() {
showTimePicker(endTime, myCalendar2); // showTimePicker(endTime, myCalendar2);
showMaterialTimePicker(myCalendar2, false);
} }
public void onClickStartMin() { public void onClickStartMin() {
showTimePicker(startTime, myCalendar); // showTimePicker(startTime, myCalendar);
showMaterialTimePicker(myCalendar, true);
} }
public void onClickEndMin() { public void onClickEndMin() {
showTimePicker(endTime, myCalendar2); // showTimePicker(endTime, myCalendar2);
showMaterialTimePicker(myCalendar2, false);
} }
public void onClickStartDayOrNight() { public void onClickStartDayOrNight() {
showTimePicker(startTime, myCalendar); // showTimePicker(startTime, myCalendar);
showMaterialTimePicker(myCalendar, true);
} }
public void onClickEndDayOrNight() { public void onClickEndDayOrNight() {
showTimePicker(endTime, myCalendar2); // showTimePicker(endTime, myCalendar2);
showMaterialTimePicker(myCalendar2, false);
} }
private void showTimePicker(TimePickerDialog.OnTimeSetListener listener, Calendar calendar) { private void showTimePicker(TimePickerDialog.OnTimeSetListener listener, Calendar calendar) {
try { 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(); timePickerDialog.show();
} catch (Exception e) { } catch (Exception e) {
LogUtil.e(TAG, "Error showing time picker: " + e.getMessage()); 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() { public void onPrint() {
try { try {
if (summaryViewModel.validateField()) { if (summaryViewModel.validateField()) {

View File

@ -128,7 +128,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_cancel" android:id="@+id/btn_amount_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -139,7 +139,7 @@
android:text="@string/layout_cancel" android:text="@string/layout_cancel"
android:textColor="@color/colorPrimary" /> android:textColor="@color/colorPrimary" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_confirm" android:id="@+id/btn_amount_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -93,7 +93,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_cancel" android:id="@+id/btn_amount_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -104,7 +104,7 @@
android:text="@string/layout_cancel" android:text="@string/layout_cancel"
android:textColor="@color/colorPrimary" /> android:textColor="@color/colorPrimary" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_confirm" android:id="@+id/btn_amount_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -469,7 +469,7 @@
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<!-- Cancel Button --> <!-- Cancel Button -->
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_weight="1" android:layout_weight="1"
@ -485,7 +485,7 @@
android:textAllCaps="false" /> android:textAllCaps="false" />
<!-- Print Button --> <!-- Print Button -->
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_weight="1" android:layout_weight="1"

View File

@ -108,7 +108,7 @@
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_cancel" android:id="@+id/btn_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -129,7 +129,7 @@
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" /> app:layout_constraintGuide_percent="0.5" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_confirm" android:id="@+id/btn_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -95,7 +95,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_cancel" android:id="@+id/btn_amount_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -106,7 +106,7 @@
android:text="@string/layout_cancel" android:text="@string/layout_cancel"
android:textColor="@color/colorPrimary" /> android:textColor="@color/colorPrimary" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_confirm" android:id="@+id/btn_amount_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -40,7 +40,7 @@
app:layout_constraintTop_toBottomOf="@+id/appCompatImageView" app:layout_constraintTop_toBottomOf="@+id/appCompatImageView"
tools:text="FUNCTION NOT SUPPORTED" /> tools:text="FUNCTION NOT SUPPORTED" />
<!-- <Button--> <!-- <androidx.appcompat.widget.AppCompatButton-->
<!-- android:layout_width="match_parent"--> <!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/txt_close"--> <!-- android:text="@string/txt_close"-->

View File

@ -260,7 +260,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_weight="1" android:layout_weight="1"
@ -271,7 +271,7 @@
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textStyle="bold"/> android:textStyle="bold"/>
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_weight="1" android:layout_weight="1"

View File

@ -83,7 +83,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_cancel" android:id="@+id/btn_amount_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -94,7 +94,7 @@
android:text="@string/layout_cancel" android:text="@string/layout_cancel"
android:textColor="@color/colorPrimary" /> android:textColor="@color/colorPrimary" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_confirm" android:id="@+id/btn_amount_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -152,7 +152,7 @@
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<!-- Cancel Button --> <!-- Cancel Button -->
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnCancel" android:id="@+id/btnCancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="42dp" android:layout_height="42dp"
@ -169,7 +169,7 @@
android:textAllCaps="false" /> android:textAllCaps="false" />
<!-- Confirm Button --> <!-- Confirm Button -->
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnConfirm" android:id="@+id/btnConfirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="42dp" android:layout_height="42dp"

View File

@ -85,7 +85,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_cancel" android:id="@+id/btn_amount_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -96,7 +96,7 @@
android:text="@string/layout_cancel" android:text="@string/layout_cancel"
android:textColor="@color/colorPrimary" /> android:textColor="@color/colorPrimary" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_confirm" android:id="@+id/btn_amount_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -221,7 +221,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_cancel" android:id="@+id/btn_amount_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="44dp" android:layout_height="44dp"
@ -233,7 +233,7 @@
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textSize="14sp" /> android:textSize="14sp" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_confirm" android:id="@+id/btn_amount_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="44dp" android:layout_height="44dp"

View File

@ -163,7 +163,7 @@
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<!-- Cancel Button --> <!-- Cancel Button -->
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnCancel" android:id="@+id/btnCancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="48dp" android:layout_height="48dp"
@ -180,7 +180,7 @@
android:textAllCaps="false" /> android:textAllCaps="false" />
<!-- Confirm Button --> <!-- Confirm Button -->
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnConfirm" android:id="@+id/btnConfirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="48dp" android:layout_height="48dp"

View File

@ -141,7 +141,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_cancel_cancel" android:id="@+id/btn_cancel_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -152,7 +152,7 @@
android:text="@string/layout_cancel" android:text="@string/layout_cancel"
android:textColor="@color/colorPrimary" /> android:textColor="@color/colorPrimary" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_refund_confirm" android:id="@+id/btn_refund_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -163,7 +163,7 @@
android:text="@string/layout_confirm" android:text="@string/layout_confirm"
android:textColor="@color/white" /> android:textColor="@color/white" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_refund_scan" android:id="@+id/btn_refund_scan"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -323,7 +323,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/error_message"> app:layout_constraintTop_toBottomOf="@+id/error_message">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_cancel" android:id="@+id/btn_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -335,7 +335,7 @@
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textSize="16sp" /> android:textSize="16sp" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_confirm" android:id="@+id/btn_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -319,7 +319,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/error_message"> app:layout_constraintTop_toBottomOf="@+id/error_message">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_cancel" android:id="@+id/btn_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -331,7 +331,7 @@
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textSize="16sp" /> android:textSize="16sp" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_confirm" android:id="@+id/btn_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -264,7 +264,7 @@
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:visibility="@{manageViewModel.detailReportBottomLayoutVisibility}"> android:visibility="@{manageViewModel.detailReportBottomLayoutVisibility}">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_qr_settlement_cancel" android:id="@+id/btn_qr_settlement_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -275,7 +275,7 @@
android:text="@string/layout_cancel" android:text="@string/layout_cancel"
android:textColor="@color/colorPrimary" /> android:textColor="@color/colorPrimary" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_qr_settlement_confirm" android:id="@+id/btn_qr_settlement_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -56,7 +56,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/confirm_button" android:id="@+id/confirm_button"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -272,7 +272,7 @@
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:background="@color/white"
@ -296,7 +296,7 @@
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_rounded_btn_cv" android:background="@drawable/bg_rounded_btn_cv"

View File

@ -367,7 +367,7 @@
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<!-- Cancel Button --> <!-- Cancel Button -->
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="52dp" android:layout_height="52dp"
android:text="@string/layout_cancel" android:text="@string/layout_cancel"

View File

@ -238,7 +238,7 @@
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<!-- Cancel Button --> <!-- Cancel Button -->
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="52dp" android:layout_height="52dp"
android:text="@string/layout_cancel" android:text="@string/layout_cancel"

View File

@ -32,7 +32,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_card_settlement" android:id="@+id/btn_card_settlement"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
@ -44,7 +44,7 @@
android:textSize="16sp" android:textSize="16sp"
app:cornerRadius="8dp" /> app:cornerRadius="8dp" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_qr_settlement" android:id="@+id/btn_qr_settlement"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
@ -56,7 +56,7 @@
android:textSize="16sp" android:textSize="16sp"
app:cornerRadius="8dp" /> app:cornerRadius="8dp" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_cancel" android:id="@+id/btn_cancel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"

View File

@ -239,7 +239,7 @@
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_rounded_btn_cancel_cv" android:background="@drawable/bg_rounded_btn_cancel_cv"
@ -264,7 +264,7 @@
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_rounded_btn_cv" android:background="@drawable/bg_rounded_btn_cv"

View File

@ -99,7 +99,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_cancel" android:id="@+id/btn_amount_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -110,7 +110,7 @@
android:text="@string/layout_cancel" android:text="@string/layout_cancel"
android:textColor="@color/colorPrimary" /> android:textColor="@color/colorPrimary" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_confirm" android:id="@+id/btn_amount_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -214,7 +214,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_cancel" android:id="@+id/btn_amount_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -225,7 +225,7 @@
android:text="@string/layout_cancel" android:text="@string/layout_cancel"
android:textColor="@color/colorPrimary" /> android:textColor="@color/colorPrimary" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_confirm" android:id="@+id/btn_amount_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -526,7 +526,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_weight="1" android:layout_weight="1"
@ -541,7 +541,7 @@
android:elevation="2dp" android:elevation="2dp"
android:textAllCaps="false" /> android:textAllCaps="false" />
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_weight="1" android:layout_weight="1"
@ -567,7 +567,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_weight="1" android:layout_weight="1"
@ -582,7 +582,7 @@
android:elevation="2dp" android:elevation="2dp"
android:textAllCaps="false" /> android:textAllCaps="false" />
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_weight="1" android:layout_weight="1"
@ -606,7 +606,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="52dp" android:layout_height="52dp"
android:text="@string/layout_close" android:text="@string/layout_close"

View File

@ -80,7 +80,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_cancel" android:id="@+id/btn_amount_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -91,7 +91,7 @@
android:text="@string/layout_cancel" android:text="@string/layout_cancel"
android:textColor="@color/colorPrimary" /> android:textColor="@color/colorPrimary" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_confirm" android:id="@+id/btn_amount_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -136,7 +136,7 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<!-- Search Button --> <!-- Search Button -->
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="56dp" android:layout_height="56dp"
android:paddingHorizontal="20dp" android:paddingHorizontal="20dp"

View File

@ -33,7 +33,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_start_date" android:id="@+id/btn_start_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -50,7 +50,7 @@
android:text="@string/txt_minus" android:text="@string/txt_minus"
android:textSize="20sp" /> android:textSize="20sp" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_end_date" android:id="@+id/btn_end_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -59,7 +59,7 @@
android:layout_weight="2" android:layout_weight="2"
android:text="@string/txt_end_date" /> android:text="@string/txt_end_date" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_confirm" android:id="@+id/btn_amount_confirm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -189,7 +189,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone" android:visibility="visible"
android:gravity="center"> android:gravity="center">
<!-- Hour --> <!-- Hour -->
@ -406,7 +406,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone" android:visibility="visible"
android:gravity="center"> android:gravity="center">
<!-- Hour --> <!-- Hour -->
@ -540,7 +540,7 @@
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<!-- Cancel Button --> <!-- Cancel Button -->
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_weight="1" android:layout_weight="1"
@ -556,7 +556,7 @@
android:textAllCaps="false" /> android:textAllCaps="false" />
<!-- Print Button --> <!-- Print Button -->
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_weight="1" android:layout_weight="1"

View File

@ -280,7 +280,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_cancel" android:id="@+id/btn_amount_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -291,7 +291,7 @@
android:text="@string/layout_cancel" android:text="@string/layout_cancel"
android:textColor="@color/colorPrimary" /> android:textColor="@color/colorPrimary" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_amount_confirm" android:id="@+id/btn_amount_confirm"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

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

View File

@ -51,7 +51,7 @@
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingEnd="8dp"> android:paddingEnd="8dp">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_cancel" android:id="@+id/btn_cancel"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="30dp" android:layout_height="30dp"
@ -61,7 +61,7 @@
android:text="@string/btn_txt_cancel" android:text="@string/btn_txt_cancel"
android:textColor="@color/smilePrimaryColor" /> android:textColor="@color/smilePrimaryColor" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_retry" android:id="@+id/btn_retry"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="30dp" android:layout_height="30dp"

View File

@ -3,7 +3,7 @@
android:orientation="vertical" android:layout_width="match_parent" android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<Button <androidx.appcompat.widget.AppCompatButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Click" android:text="Click"