Merge remote-tracking branch 'origin/dev' into dev

app/build.gradle.kts

@@ -43,8 +43,8 @@ android {
             dimension = "env"
             applicationIdSuffix = ".uat"
             versionNameSuffix = "-UAT"
-            versionCode = 2
+            versionCode = 3
-            versionName = "2.0"
+            versionName = "2.1"
             buildConfigField("String", "ENV", "\"UAT\"")
             resValue("string", "app_name", "MOB-UAT")
         }

paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java

@@ -52,6 +52,7 @@ public abstract class BaseXPrint {
 
     protected String currentTime;
 
+    protected static final String typeface_name = "libre_basker_ville.ttf";
     protected static final String MPU_AID = "A0000004820000000001";
 
     protected static final String HOST_NAME_VM = "VISA/ MASTERCARD";
@@ -400,20 +401,20 @@ public abstract class BaseXPrint {
 
             sunmiPrinterService.sendRAWData(boldOn(), innerResultCallback);
             sunmiPrinterService.setAlignment(0, innerResultCallback);
-            sunmiPrinterService.printTextWithFont(schemeName, "rubik_medium.ttf", 26, innerResultCallback);
+            sunmiPrinterService.printTextWithFont(schemeName, typeface_name, 26, innerResultCallback);
             sunmiPrinterService.printText("\n", innerResultCallback);
-            sunmiPrinterService.printTextWithFont(PrintUtils.getInstance().maskCardNumberPciDss(payDetail.getCardNo()), "rubik_medium.ttf", 26, innerResultCallback);
+            sunmiPrinterService.printTextWithFont(PrintUtils.getInstance().maskCardNumberPciDss(payDetail.getCardNo()), typeface_name, 26, innerResultCallback);
             sunmiPrinterService.printText("\n", innerResultCallback);
-            sunmiPrinterService.printTextWithFont(PrintUtils.getInstance().getFormatExpDateWithSlash(payDetail.getEXPDate()), "rubik_medium.ttf", 26, innerResultCallback);
+            sunmiPrinterService.printTextWithFont(PrintUtils.getInstance().getFormatExpDateWithSlash(payDetail.getEXPDate()), typeface_name, 26, innerResultCallback);
             sunmiPrinterService.printText("\n", innerResultCallback);
-            sunmiPrinterService.printTextWithFont(PrintUtils.getInstance().getEntryType(payDetail.getCardType()) + " ENTRY", "rubik_medium.ttf", 26, innerResultCallback);
+            sunmiPrinterService.printTextWithFont(PrintUtils.getInstance().getEntryType(payDetail.getCardType()) + " ENTRY", typeface_name, 26, innerResultCallback);
             sunmiPrinterService.printText("\n", innerResultCallback);
 
             if (payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_APPROVED) || payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_ACCEPT)) {
-                sunmiPrinterService.printTextWithFont("APPR CODE:" + payDetail.getApprovalCode(), "rubik_medium.ttf", 26, innerResultCallback);
+                sunmiPrinterService.printTextWithFont("APPR CODE:" + payDetail.getApprovalCode(), typeface_name, 26, innerResultCallback);
                 sunmiPrinterService.printText("\n", innerResultCallback);
                 sunmiPrinterService.sendRAWData(boldOff(), innerResultCallback);
-                sunmiPrinterService.setFontName("rubik_medium.ttf",innerResultCallback);
+                sunmiPrinterService.setFontName(typeface_name,innerResultCallback);
 
                 // manual entry or refund
                 if(payDetail.getCardType() == -1 || payDetail.getTransactionType() == TransactionsType.REFUND.value) {
@@ -428,7 +429,7 @@ public abstract class BaseXPrint {
             } else {
                 sunmiPrinterService.printText("\n", innerResultCallback);
                 sunmiPrinterService.sendRAWData(boldOff(), innerResultCallback);
-                sunmiPrinterService.setFontName("rubik_medium.ttf",innerResultCallback);
+                sunmiPrinterService.setFontName(typeface_name,innerResultCallback);
                 sunmiPrinterService.printText("TVR   :"+payDetail.getTVR()+"\n",innerResultCallback);
             }
 
@@ -456,7 +457,7 @@ public abstract class BaseXPrint {
                 sunmiPrinterService.setAlignment(1, innerResultCallback);
                 lineBreak();
                 emptyLine(3);
-                sunmiPrinterService.printTextWithFont(BaseErrorCode.getCode(payDetail.getTradeAnswerCode()) + "\n", "rubik_medium.ttf", 26, innerResultCallback);
+                sunmiPrinterService.printTextWithFont(BaseErrorCode.getCode(payDetail.getTradeAnswerCode()) + "\n", typeface_name, 26, innerResultCallback);
                 emptyLine(3);
                 lineBreak();
             }
@@ -825,7 +826,7 @@ public abstract class BaseXPrint {
         try {
 
             sunmiPrinterService.sendRAWData(boldOn(), innerResultCallback);
-            sunmiPrinterService.setFontName("rubik_medium.ttf", innerResultCallback);
+            sunmiPrinterService.setFontName(typeface_name, innerResultCallback);
             sunmiPrinterService.setFontSize(22, innerResultCallback);
             sunmiPrinterService.printText(receiptHeader + "\n", innerResultCallback);
 //            sunmiPrinterService.printTextWithFont(merchantName + "\n", "", 24, null);

paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java

@@ -158,7 +158,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
             sunmiPrinterService.lineWrap(4, innerResultCallback);
 
             sunmiPrinterService.setAlignment(0, innerResultCallback);
-            sunmiPrinterService.setFontName("rubik_medium.ttf", innerResultCallback);
+            sunmiPrinterService.setFontName(typeface_name, innerResultCallback);
             sunmiPrinterService.setFontSize(21, innerResultCallback);
             sunmiPrinterService.printText("[ Send Packets ]" + "\n", innerResultCallback);
             printParsedField(msgFieldSend);