diff --git a/app/build.gradle b/app/build.gradle
index 0ad257e..ab67d89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,9 +14,12 @@ android {
applicationId "com.utsmm.kbz.sit"
minSdk 24
targetSdk 33
- versionCode 1
+ versionCode 10
versionName "1.0"
+// applicationId "com.utsmm.kbz"
+// versionName "1.10"
+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// // Add CMake configuration
@@ -37,7 +40,7 @@ android {
buildTypes {
release {
- minifyEnabled false
+ minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
diff --git a/app/src/main/java/com/utsmm/kbz/ui/SettingsFragment.java b/app/src/main/java/com/utsmm/kbz/ui/SettingsFragment.java
index 0c44a8f..c74703f 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/SettingsFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/SettingsFragment.java
@@ -98,9 +98,11 @@ public class SettingsFragment extends DataBindingFragment {
super.onViewCreated(view, savedInstanceState);
try {
LogUtil.d(TAG, "onViewCreated called");
+ SystemParamsOperation.getInstance().setDemoStatus(false);
// Get the binding from the base class - this is automatically created
binding = (FragmentSettingsModernBinding) mBinding;
+ updateDemoSettings();
LogUtil.d(TAG, "Updating settings...");
updateSettings();
@@ -110,6 +112,7 @@ public class SettingsFragment extends DataBindingFragment {
LogUtil.e(TAG, "Error initializing fragment: " + e.getMessage());
e.printStackTrace();
}
+
}
@Override
@@ -152,10 +155,10 @@ public class SettingsFragment extends DataBindingFragment {
private void updateDemoSettings() {
boolean isDemo = SystemParamsOperation.getInstance().getDemoStatus();
- binding.demoSwitch.setChecked(isDemo);
- binding.demoSummary.setText(isDemo ?
- "Demo mode active - Test transactions without real processing" :
- "Simulator mode active - Real transaction processing");
+// binding.demoSwitch.setChecked(isDemo);
+// binding.demoSummary.setText(isDemo ?
+// "Demo mode active - Test transactions without real processing" :
+// "Simulator mode active - Real transaction processing");
}
private void updateAlertSoundSettings() {
diff --git a/app/src/main/res/layout/fragment_settings_modern.xml b/app/src/main/res/layout/fragment_settings_modern.xml
index de28f63..795cdb0 100644
--- a/app/src/main/res/layout/fragment_settings_modern.xml
+++ b/app/src/main/res/layout/fragment_settings_modern.xml
@@ -465,82 +465,82 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
-
+
-
+
@@ -900,7 +900,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
- android:clickable="true"
+ android:clickable="false"
android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="16dp"
@@ -1045,79 +1045,79 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
-
+
-
+