From 3fe711cc2f64f721f02e31dc79cf6bd5e3768088 Mon Sep 17 00:00:00 2001 From: MooN <56061215+MgKyawLay@users.noreply.github.com> Date: Mon, 8 Dec 2025 11:44:23 +0630 Subject: [PATCH] multi variant --- app/build.gradle | 65 +++++++++++++++---- .../ui/dashboard/DashboardTransFragment.java | 8 ++- .../utsmm/kbz/util/enums/FeaturesType.java | 3 +- .../java/com/utsmm/kbz/util/tms/TMSUtil.java | 3 +- .../main/res/navigation/mobile_navigation.xml | 6 ++ 5 files changed, 69 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 43146ae..e8c3d9d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,25 +11,63 @@ android { compileSdk 34 defaultConfig { - applicationId "com.utsmm.kbz.sit" + minSdk 23 + } + defaultConfig { minSdk 24 targetSdk 33 versionCode 1 versionName "1.0" - -// applicationId "com.utsmm.kbz" -// versionName "1.10" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - -// // Add CMake configuration -// externalNativeBuild { -// cmake { -// cppFlags "-std=c++14" -// } -// } } + // ----------------------------- + // 🔥 MULTI-VARIANT FLAVORS + // ----------------------------- + flavorDimensions "env" + + productFlavors { + sit { + dimension "env" + applicationId "com.utsmm.kbz.sit" + versionNameSuffix "-sit" + resValue "string", "app_name", "KBZ-POS-SIT" + } + + uat { + dimension "env" + applicationId "com.utsmm.kbz.uat" + versionNameSuffix "-uat" + resValue "string", "app_name", "KBZ-POS-UAT" + } + + prod { + dimension "env" + applicationId "com.utsmm.kbz" + versionNameSuffix "" + } + } + +// defaultConfig { +// applicationId "com.utsmm.kbz.sit" +// minSdk 24 +// targetSdk 33 +// versionCode 1 +// versionName "1.0" +// +//// applicationId "com.utsmm.kbz" +//// versionName "1.10" +// +// testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" +// +//// // Add CMake configuration +//// externalNativeBuild { +//// cmake { +//// cppFlags "-std=c++14" +//// } +//// } +// } + // Configure CMake // externalNativeBuild { // cmake { @@ -43,6 +81,9 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } + debug { + debuggable true + } } compileOptions { sourceCompatibility JavaVersion.VERSION_11 diff --git a/app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardTransFragment.java b/app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardTransFragment.java index 724c115..800e79f 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardTransFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardTransFragment.java @@ -106,6 +106,9 @@ public class DashboardTransFragment extends DataBindingFragment { case HISTORY: new DashboardTransFragment.ClickEvent().onClickHistory(); break; + case DEVICE_CONFIG: + new DashboardTransFragment.ClickEvent().onClickDeviceConfig(); + break; } }); @@ -210,7 +213,10 @@ public class DashboardTransFragment extends DataBindingFragment { safeRouteTo(currentId,routeId,hostId); } - + public void onClickDeviceConfig(){ + routeId = R.id.action_dashboardTransFragment_to_deviceConfig; + safeRouteTo(currentId, routeId, hostId); + } } } diff --git a/app/src/main/java/com/utsmm/kbz/util/enums/FeaturesType.java b/app/src/main/java/com/utsmm/kbz/util/enums/FeaturesType.java index e7ab1e8..7c92e7a 100644 --- a/app/src/main/java/com/utsmm/kbz/util/enums/FeaturesType.java +++ b/app/src/main/java/com/utsmm/kbz/util/enums/FeaturesType.java @@ -21,5 +21,6 @@ public enum FeaturesType { TEST, QR_INQUIRY, QR_REFUND, - LOG_OUT + LOG_OUT, + DEVICE_CONFIG } \ No newline at end of file diff --git a/app/src/main/java/com/utsmm/kbz/util/tms/TMSUtil.java b/app/src/main/java/com/utsmm/kbz/util/tms/TMSUtil.java index cb2a6f0..34d76f4 100644 --- a/app/src/main/java/com/utsmm/kbz/util/tms/TMSUtil.java +++ b/app/src/main/java/com/utsmm/kbz/util/tms/TMSUtil.java @@ -177,7 +177,6 @@ public class TMSUtil { LogUtil.d(TAG,"Receipt Footer: "+SystemParamsOperation.getInstance().getReceiptFooter()); LogUtil.d(TAG,"Manual Update: "+SystemParamsOperation.getInstance().getManualUpdate()); LogUtil.d(TAG,"Master Enabled: "+SystemParamsOperation.getInstance().isEmvEnabled()); - } @@ -220,7 +219,7 @@ public class TMSUtil { // featuresList.add(new Features(5, fragmentActivity.getString(R.string.menu_wavepay_inquiry), R.drawable.ic_wave_status_dash, FeaturesType.WAVE_PAY_INQUIRY, wavePayInquiryStatus)); featuresList.add(new Features(1, fragmentActivity.getString(R.string.menu_cash_advance), R.drawable.ic_cash_advance, FeaturesType.CASH_ADVANCE, cashAdvanceStatus)); featuresList.add(new Features(9, fragmentActivity.getString(R.string.menu_history), R.drawable.ic_history, FeaturesType.HISTORY, true)); - + featuresList.add(new Features(10, "Configs", R.drawable.ic_host, FeaturesType.DEVICE_CONFIG, true)); } public TMSValidity checkParams() { diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index ce8bc82..7dc56fa 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -589,6 +589,12 @@ app:popUpToInclusive="true" android:id="@+id/action_dashboardTransFragment_to_manageFunctionFragment" app:destination="@id/managementFunctionFragment" /> +