diff --git a/.gitignore b/.gitignore
index aa724b7..6118307 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
+/.idea
 /.idea/assetWizardSettings.xml
 .DS_Store
 /build
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 74ba676..cdf8979 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index 3b94446..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="artifactory-maven-resolver" />
-      <option name="name" value="artifactory-maven-resolver" />
-      <option name="url" value="https://primer.jfrog.io/artifactory/primer-android" />
-    </remote-repository>
-  </component>
-</project>
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 315f6fb..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
diff --git a/build.gradle b/build.gradle
index af6d2bb..1708157 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,6 +18,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        mavenLocal()
     }
 }
 
diff --git a/config/dependencies.gradle b/config/dependencies.gradle
index 0bb6b5c..c169547 100644
--- a/config/dependencies.gradle
+++ b/config/dependencies.gradle
@@ -4,7 +4,9 @@ ext {
     Dependencies = [
             Android: [
                     appCompat: "androidx.appcompat:appcompat:${Versions.appCompat}",
-                    playServicesBase: "com.google.android.gms:play-services-base:${Versions.playServices}"
+            ],
+            iPay88 : [
+                    iPay88: "io.primer:ipay88:${Versions.iPay88Sdk}",
             ],
     ]
 }
diff --git a/config/versions.gradle b/config/versions.gradle
index 48f97f9..4182c36 100644
--- a/config/versions.gradle
+++ b/config/versions.gradle
@@ -1,6 +1,6 @@
 ext {
     Versions = [
-            appCompat   : "1.3.0",
-            playServices: "17.6.0"
+            appCompat: "1.3.0",
+            iPay88Sdk   : "1.0.0"
     ]
 }
diff --git a/gradle.properties b/gradle.properties
index 46beb80..293c048 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,8 +22,8 @@ kotlin.code.style=official
 # Publishing values (see publish.gradle)
 GROUP=io.primer
 POM_ARTIFACT_ID=ipay88-android
-VERSION_NAME=0.0.1
-POM_NAME=ipay88
+VERSION_NAME=1.0.0
+POM_NAME=ipay88-android
 POM_DESCRIPTION=Primer wrapper for iPay88 SDK for Android
 POM_INCEPTION_YEAR=2022
 POM_URL=https://github.com/primer-io/primer-ipay88-sdk-android
diff --git a/ipay88/build.gradle b/ipay88/build.gradle
index 465800e..3603805 100644
--- a/ipay88/build.gradle
+++ b/ipay88/build.gradle
@@ -18,7 +18,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             consumerProguardFiles 'consumer-rules.pro'
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -31,14 +31,16 @@ android {
         jvmTarget = '1.8'
     }
 
+    sourceSets {
+        main.java.srcDirs += 'src/main/java'
+    }
+
     buildTypes.each {
         it.buildConfigField 'String', 'SDK_VERSION_STRING', "\"$VERSION_NAME\""
     }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
     implementation Dependencies.Android.appCompat
-    implementation Dependencies.Android.playServicesBase
+    implementation Dependencies.iPay88.iPay88
 }
diff --git a/ipay88/libs/classes.jar b/ipay88/libs/classes.jar
deleted file mode 100644
index 4f97385..0000000
Binary files a/ipay88/libs/classes.jar and /dev/null differ
diff --git a/ipay88/proguard-rules.pro b/ipay88/proguard-rules.pro
index f1b4245..08f395c 100644
--- a/ipay88/proguard-rules.pro
+++ b/ipay88/proguard-rules.pro
@@ -19,3 +19,36 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-dontusemixedcaseclassnames
+-repackageclasses 'io.primer.ipay88.internal'
+-allowaccessmodification
+-renamesourcefileattribute SourceFile
+-keepattributes Signature,Exceptions,*Annotation*,
+                InnerClasses,PermittedSubclasses,EnclosingMethod,
+                Deprecated,SourceFile,LineNumberTable
+
+# keep class BuildConfig
+-keep public class **.BuildConfig { *; }
+
+-keep class io.primer.ipay88.api.** {
+    public *;
+}
+
+-keep class io.primer.ipay88.api.ui.NativeIPay88Activity {
+    public protected static <methods>;
+    *** Companion;
+}
+
+-keep class io.primer.ipay88.api.ui.NativeIPay88Activity$Companion {
+    *;
+}
+
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
diff --git a/ipay88/src/main/AndroidManifest.xml b/ipay88/src/main/AndroidManifest.xml
index 910b28e..ae922a4 100644
--- a/ipay88/src/main/AndroidManifest.xml
+++ b/ipay88/src/main/AndroidManifest.xml
@@ -1,7 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.primer.android.ipay88">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="io.primer.ipay88">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+
+    <application>
+        <activity
+            android:name="io.primer.ipay88.api.ui.NativeIPay88Activity"
+            android:exported="false"
+            android:label=""
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.AppCompat.NoActionBar.FullScreen.IPay" />
+
+        <activity
+            android:name="com.ipay.IPayIHActivity"
+            android:configChanges="orientation|screenSize"
+            android:exported="false"
+            tools:ignore="AppLinkUrlError" />
+
+        <activity
+            android:name="com.ipay.IPayIHAcitivityR"
+            android:configChanges="orientation|screenSize" />
+    </application>
 
 </manifest>
diff --git a/ipay88/src/main/java/io/primer/ipay88/api/exceptions/IPayConnectionErrorException.kt b/ipay88/src/main/java/io/primer/ipay88/api/exceptions/IPayConnectionErrorException.kt
new file mode 100644
index 0000000..255ca4e
--- /dev/null
+++ b/ipay88/src/main/java/io/primer/ipay88/api/exceptions/IPayConnectionErrorException.kt
@@ -0,0 +1,3 @@
+package io.primer.ipay88.api.exceptions
+
+class IPayConnectionErrorException : IllegalStateException()
diff --git a/ipay88/src/main/java/io/primer/ipay88/api/exceptions/IPayPaymentCancelledException.kt b/ipay88/src/main/java/io/primer/ipay88/api/exceptions/IPayPaymentCancelledException.kt
new file mode 100644
index 0000000..c20d38f
--- /dev/null
+++ b/ipay88/src/main/java/io/primer/ipay88/api/exceptions/IPayPaymentCancelledException.kt
@@ -0,0 +1,3 @@
+package io.primer.ipay88.api.exceptions
+
+class IPayPaymentCancelledException : IllegalStateException()
diff --git a/ipay88/src/main/java/io/primer/ipay88/api/exceptions/IPayPaymentFailedException.kt b/ipay88/src/main/java/io/primer/ipay88/api/exceptions/IPayPaymentFailedException.kt
new file mode 100644
index 0000000..31beb4c
--- /dev/null
+++ b/ipay88/src/main/java/io/primer/ipay88/api/exceptions/IPayPaymentFailedException.kt
@@ -0,0 +1,7 @@
+package io.primer.ipay88.api.exceptions
+
+class IPayPaymentFailedException(
+    val transactionId: String?,
+    val refNo: String?,
+    val errorDescription: String?
+) : IllegalStateException()
diff --git a/ipay88/src/main/java/io/primer/ipay88/api/ui/IPay88LauncherParams.kt b/ipay88/src/main/java/io/primer/ipay88/api/ui/IPay88LauncherParams.kt
new file mode 100644
index 0000000..59a06e9
--- /dev/null
+++ b/ipay88/src/main/java/io/primer/ipay88/api/ui/IPay88LauncherParams.kt
@@ -0,0 +1,19 @@
+package io.primer.ipay88.api.ui
+
+import java.io.Serializable
+
+data class IPay88LauncherParams(
+    val iPayPaymentId: String,
+    val iPayMethod: Int,
+    val merchantCode: String,
+    val amount: String,
+    val referenceNumber: String,
+    val prodDesc: String,
+    val currencyCode: String?,
+    val countryCode: String?,
+    val customerName: String?,
+    val customerEmail: String?,
+    val backendCallbackUrl: String,
+    val deeplinkUrl: String,
+    val errorCode: Int
+) : Serializable
diff --git a/ipay88/src/main/java/io/primer/ipay88/api/ui/NativeIPay88Activity.kt b/ipay88/src/main/java/io/primer/ipay88/api/ui/NativeIPay88Activity.kt
new file mode 100644
index 0000000..07090a4
--- /dev/null
+++ b/ipay88/src/main/java/io/primer/ipay88/api/ui/NativeIPay88Activity.kt
@@ -0,0 +1,119 @@
+package io.primer.ipay88.api.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import com.ipay.IPayIH
+import io.primer.ipay88.api.exceptions.IPayConnectionErrorException
+import io.primer.ipay88.api.exceptions.IPayPaymentCancelledException
+import io.primer.ipay88.api.exceptions.IPayPaymentFailedException
+import io.primer.ipay88.internal.IPayPaymentState
+import io.primer.ipay88.internal.IPayStateHolder
+import io.primer.ipay88.internal.PrimerIPay88Delegate
+import io.primer.ipay88.internal.extension.toIPayIHPayment
+import io.primer.ipay88.internal.extension.toIPayIHR
+
+class NativeIPay88Activity : AppCompatActivity() {
+
+    private val iPayIH by lazy { IPayIH.getInstance() }
+
+    private val launcherIntent = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) { activityResult ->
+        when (activityResult.resultCode) {
+            RESULT_CANCELED -> {
+                setCancelledResult(IPayPaymentCancelledException())
+                finish()
+            }
+            RESULT_OK -> {
+                when (val state = IPayStateHolder.currentState) {
+                    is IPayPaymentState.Cancelled -> {
+                        setCancelledResult(IPayPaymentCancelledException())
+                        finish()
+                    }
+                    is IPayPaymentState.ConnectionError -> {
+                        setErrorResult(IPayConnectionErrorException())
+                        finish()
+                    }
+                    is IPayPaymentState.Failed -> {
+                        setErrorResult(
+                            IPayPaymentFailedException(
+                                state.transId,
+                                state.refNo,
+                                state.errorDescription
+                            )
+                        )
+                        finish()
+                    }
+                    is IPayPaymentState.ReQuery -> {
+                        reQuery(
+                            intent.getSerializableExtra(INTENT_PARAMS_EXTRA_KEY) as IPay88LauncherParams
+                        )
+                    }
+                    is IPayPaymentState.Success -> {
+                        setResult(RESULT_OK)
+                        finish()
+                    }
+                    else -> {
+                        setErrorResult(IllegalStateException())
+                        finish()
+                    }
+                }
+            }
+            else -> finish()
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (savedInstanceState == null) {
+            startCheckout(getLauncherParams())
+        }
+    }
+
+    private fun startCheckout(params: IPay88LauncherParams) {
+        launcherIntent.launch(
+            iPayIH.checkout(
+                params.toIPayIHPayment(),
+                this,
+                PrimerIPay88Delegate(),
+                params.iPayMethod
+            )
+        )
+    }
+
+    private fun reQuery(params: IPay88LauncherParams) {
+        launcherIntent.launch(
+            iPayIH.requery(
+                params.toIPayIHR(),
+                this,
+                PrimerIPay88Delegate(),
+            )
+        )
+    }
+
+    private fun setErrorResult(exception: IllegalStateException) {
+        val errorCode = getLauncherParams().errorCode
+        setResult(errorCode, Intent().apply { putExtra(ERROR_KEY, exception) })
+    }
+
+    private fun setCancelledResult(exception: IllegalStateException) {
+        setResult(RESULT_CANCELED, Intent().apply { putExtra(ERROR_KEY, exception) })
+    }
+
+    private fun getLauncherParams() =
+        intent.getSerializableExtra(INTENT_PARAMS_EXTRA_KEY) as IPay88LauncherParams
+
+    companion object {
+
+        private const val INTENT_PARAMS_EXTRA_KEY = "INTENT_PARAMS_EXTRA"
+        const val ERROR_KEY = "ERROR"
+
+        fun getLaunchIntent(context: Context, params: IPay88LauncherParams) =
+            Intent(context, NativeIPay88Activity::class.java).apply {
+                putExtra(INTENT_PARAMS_EXTRA_KEY, params)
+            }
+    }
+}
diff --git a/ipay88/src/main/java/io/primer/ipay88/internal/IPayStateHolder.kt b/ipay88/src/main/java/io/primer/ipay88/internal/IPayStateHolder.kt
new file mode 100644
index 0000000..2235a35
--- /dev/null
+++ b/ipay88/src/main/java/io/primer/ipay88/internal/IPayStateHolder.kt
@@ -0,0 +1,6 @@
+package io.primer.ipay88.internal
+
+internal object IPayStateHolder {
+
+    var currentState: IPayPaymentState? = null
+}
\ No newline at end of file
diff --git a/ipay88/src/main/java/io/primer/ipay88/internal/PrimerIPay88Delegate.kt b/ipay88/src/main/java/io/primer/ipay88/internal/PrimerIPay88Delegate.kt
new file mode 100644
index 0000000..7040c95
--- /dev/null
+++ b/ipay88/src/main/java/io/primer/ipay88/internal/PrimerIPay88Delegate.kt
@@ -0,0 +1,68 @@
+package io.primer.ipay88.internal
+
+import com.ipay.IPayIHResultDelegate
+import java.io.Serializable
+
+internal class PrimerIPay88Delegate :
+    IPayIHResultDelegate, Serializable {
+
+    override fun onPaymentSucceeded(
+        transId: String?,
+        refNo: String?,
+        amount: String?,
+        remark: String?,
+        authCode: String?,
+    ) {
+        IPayStateHolder.currentState = IPayPaymentState.Success
+    }
+
+    override fun onPaymentFailed(
+        transId: String?,
+        refNo: String?,
+        amount: String?,
+        remark: String?,
+        errorDescription: String?,
+    ) {
+        IPayStateHolder.currentState = IPayPaymentState.Failed(transId, refNo, errorDescription)
+    }
+
+    override fun onPaymentCanceled(
+        transId: String?,
+        refNo: String?,
+        amount: String?,
+        remark: String?,
+        errorDescription: String?,
+    ) {
+        IPayStateHolder.currentState = IPayPaymentState.Cancelled(transId, errorDescription)
+    }
+
+    override fun onRequeryResult(
+        merchantCode: String?,
+        refNo: String?,
+        amount: String?,
+        result: String?
+    ) {
+        IPayStateHolder.currentState = IPayPaymentState.ReQuery
+    }
+
+    override fun onConnectionError(
+        merchantCode: String?,
+        refNo: String?,
+        amount: String?,
+        remark: String?,
+        lang: String?,
+        country: String?
+    ) {
+        IPayStateHolder.currentState = IPayPaymentState.ConnectionError
+    }
+}
+
+internal sealed class IPayPaymentState {
+    object Success : IPayPaymentState()
+    data class Failed(val transId: String?, val refNo: String?, val errorDescription: String?) :
+        IPayPaymentState()
+
+    data class Cancelled(val transId: String?, val errorDescription: String?) : IPayPaymentState()
+    object ReQuery : IPayPaymentState()
+    object ConnectionError : IPayPaymentState()
+}
\ No newline at end of file
diff --git a/ipay88/src/main/java/io/primer/ipay88/internal/extension/IPay88LauncherParams.kt b/ipay88/src/main/java/io/primer/ipay88/internal/extension/IPay88LauncherParams.kt
new file mode 100644
index 0000000..84ee151
--- /dev/null
+++ b/ipay88/src/main/java/io/primer/ipay88/internal/extension/IPay88LauncherParams.kt
@@ -0,0 +1,29 @@
+package io.primer.ipay88.internal.extension
+
+import com.ipay.IPayIHPayment
+import com.ipay.IPayIHR
+import io.primer.ipay88.api.ui.IPay88LauncherParams
+
+internal fun IPay88LauncherParams.toIPayIHPayment() = IPayIHPayment().let {
+    it.amount = amount
+    it.refNo = referenceNumber
+    it.paymentId = iPayPaymentId
+    it.fixpaymentid = iPayPaymentId
+    it.userName = customerName
+    it.userEmail = customerEmail
+    it.currency = currencyCode
+    it.country = countryCode
+    it.merchantCode = merchantCode
+    it.prodDesc = prodDesc
+    it.appdeeplink = deeplinkUrl
+    it.backendPostURL = backendCallbackUrl
+    it
+}
+
+internal fun IPay88LauncherParams.toIPayIHR() = IPayIHR().let {
+    it.amount = amount
+    it.refNo = referenceNumber
+    it.merchantCode = merchantCode
+    it.country_Code = countryCode
+    it
+}
\ No newline at end of file
diff --git a/ipay88/src/main/res/drawable-hdpi-v4/ic_arrow_back_white_48dp.png b/ipay88/src/main/res/drawable-hdpi-v4/ic_arrow_back_white_48dp.png
deleted file mode 100644
index 32a6d91..0000000
Binary files a/ipay88/src/main/res/drawable-hdpi-v4/ic_arrow_back_white_48dp.png and /dev/null differ
diff --git a/ipay88/src/main/res/drawable-hdpi-v4/ic_ipay.png b/ipay88/src/main/res/drawable-hdpi-v4/ic_ipay.png
deleted file mode 100644
index 71ef2b5..0000000
Binary files a/ipay88/src/main/res/drawable-hdpi-v4/ic_ipay.png and /dev/null differ
diff --git a/ipay88/src/main/res/drawable-mdpi-v4/ic_arrow_back_white_48dp.png b/ipay88/src/main/res/drawable-mdpi-v4/ic_arrow_back_white_48dp.png
deleted file mode 100644
index 832f5a3..0000000
Binary files a/ipay88/src/main/res/drawable-mdpi-v4/ic_arrow_back_white_48dp.png and /dev/null differ
diff --git a/ipay88/src/main/res/drawable-mdpi-v4/ic_ipay.png b/ipay88/src/main/res/drawable-mdpi-v4/ic_ipay.png
deleted file mode 100644
index 71ef2b5..0000000
Binary files a/ipay88/src/main/res/drawable-mdpi-v4/ic_ipay.png and /dev/null differ
diff --git a/ipay88/src/main/res/drawable-xhdpi-v4/ic_arrow_back_white_48dp.png b/ipay88/src/main/res/drawable-xhdpi-v4/ic_arrow_back_white_48dp.png
deleted file mode 100644
index e27034d..0000000
Binary files a/ipay88/src/main/res/drawable-xhdpi-v4/ic_arrow_back_white_48dp.png and /dev/null differ
diff --git a/ipay88/src/main/res/drawable-xhdpi-v4/ic_ipay.png b/ipay88/src/main/res/drawable-xhdpi-v4/ic_ipay.png
deleted file mode 100644
index 71ef2b5..0000000
Binary files a/ipay88/src/main/res/drawable-xhdpi-v4/ic_ipay.png and /dev/null differ
diff --git a/ipay88/src/main/res/drawable-xxhdpi-v4/ic_arrow_back_white_48dp.png b/ipay88/src/main/res/drawable-xxhdpi-v4/ic_arrow_back_white_48dp.png
deleted file mode 100644
index f6ad880..0000000
Binary files a/ipay88/src/main/res/drawable-xxhdpi-v4/ic_arrow_back_white_48dp.png and /dev/null differ
diff --git a/ipay88/src/main/res/drawable-xxhdpi-v4/ic_ipay.png b/ipay88/src/main/res/drawable-xxhdpi-v4/ic_ipay.png
deleted file mode 100644
index 71ef2b5..0000000
Binary files a/ipay88/src/main/res/drawable-xxhdpi-v4/ic_ipay.png and /dev/null differ
diff --git a/ipay88/src/main/res/drawable-xxxhdpi-v4/ic_arrow_back_white_48dp.png b/ipay88/src/main/res/drawable-xxxhdpi-v4/ic_arrow_back_white_48dp.png
deleted file mode 100644
index a70e614..0000000
Binary files a/ipay88/src/main/res/drawable-xxxhdpi-v4/ic_arrow_back_white_48dp.png and /dev/null differ
diff --git a/ipay88/src/main/res/drawable-xxxhdpi-v4/ic_ipay.png b/ipay88/src/main/res/drawable-xxxhdpi-v4/ic_ipay.png
deleted file mode 100644
index 71ef2b5..0000000
Binary files a/ipay88/src/main/res/drawable-xxxhdpi-v4/ic_ipay.png and /dev/null differ
diff --git a/ipay88/src/main/res/layout/tool_bar.xml b/ipay88/src/main/res/layout/tool_bar.xml
deleted file mode 100644
index cce633e..0000000
--- a/ipay88/src/main/res/layout/tool_bar.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/toolbar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/color_toolbar"
-    android:orientation="vertical"
-    android:padding="5dp">
-
-    <ImageView
-        android:id="@+id/iv_back"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:visibility="gone"
-        android:src="@drawable/ic_arrow_back_white_48dp" />
-
-    <TextView
-        android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:gravity="center"
-        android:text="ePayment"
-        android:textColor="@color/color_toolbar_item"
-        android:textSize="20sp" />
-
-</androidx.appcompat.widget.Toolbar>
diff --git a/ipay88/src/main/res/values-vi/values-vi.xml b/ipay88/src/main/res/values-vi/values-vi.xml
deleted file mode 100644
index 6faf45a..0000000
--- a/ipay88/src/main/res/values-vi/values-vi.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="Amount">Số tiền (RM)</string>
-    <string name="ProdDesc">Miêu tả sản phẩm</string>
-    <string name="Result">Kết quả</string>
-    <string name="UserEmail">Email</string>
-    <string name="UserName">Tên khách hàng</string>
-    <string name="app_name">v3 IPAY88 Android Payment</string>
-    <string name="btnHome">Home</string>
-    <string name="btnPrint">In hóa đơn</string>
-    <string name="imgDesc">ipay demo logo</string>
-    <string name="msg_decode_error">Quá trình giải mã thất bại với một lỗi không mong muốn</string>
-    <string name="msg_error_ssl_date_invalid">Chứng chỉ SSL ngày không hợp lệ!</string>
-    <string name="msg_error_ssl_expired">Chứng chỉ SSL đã hết hạn!</string>
-    <string name="msg_error_ssl_idmismatch">Mã chứng chỉ SSL không phù hợp!</string>
-    <string name="msg_error_ssl_invalid">Chứng chỉ SSL không hợp lệ!</string>
-    <string name="msg_error_ssl_notyet_valid">Chứng chỉ SSL chưa hợp lệ!</string>
-    <string name="msg_error_ssl_untrusted">Chứng chỉ SSL không đáng tin cậy!</string>
-    <string name="msg_oh_no">Ôi không!</string>
-    <string name="msg_select_method">Hãy chọn 1 phương thức thanh toán</string>
-    <string name="msg_transition_empty">Thông tin giao dịch bị trống</string>
-    <string name="strAmount">Số tiền</string>
-    <string name="strAuthCode">Mã xác thực</string>
-    <string name="strBackendPost">Backend Post URL</string>
-    <string name="strCancel">Hủy bỏ</string>
-    <string name="strCountry">Quốc gia</string>
-    <string name="strCurrency">Đơn vị tiền tệ</string>
-    <string name="strErrDesc">ErrDesc</string>
-    <string name="strLang">Ngôn ngữ</string>
-    <string name="strMerchantCode">Merchant Code</string>
-    <string name="strMerchantKey">Merchant Key</string>
-    <string name="strOK">Đồng ý</string>
-    <string name="strPay">Thanh toán</string>
-    <string name="strPaymentID">Mã thanh toán</string>
-    <string name="strPaymentId">Mã thanh toán</string>
-    <string name="strREFID">Mã Tham chiếu</string>
-    <string name="strRefNo">RefNo</string>
-    <string name="strRemark">Ghi chú</string>
-    <string name="strRequery">Yêu cầu</string>
-    <string name="strRhbMerchantId">Rhb Merchant Id</string>
-    <string name="strRhbOrderId">Rhb Order Id</string>
-    <string name="strRhbOwnHash">Use own hash?</string>
-    <string name="strRhbShaKey">Rhb Sha key</string>
-    <string name="strSelectPayment">Chọn cách thức thanh toán</string>
-    <string name="strSignature">Chữ ký</string>
-    <string name="strStatus">Trạng thái</string>
-    <string name="strTransId">Mã chuyển đổi</string>
-</resources>
diff --git a/ipay88/src/main/res/values/styles.xml b/ipay88/src/main/res/values/styles.xml
new file mode 100644
index 0000000..444b9d9
--- /dev/null
+++ b/ipay88/src/main/res/values/styles.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.AppCompat.NoActionBar.FullScreen.IPay" parent="@style/Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/ipay88/src/main/res/values/values.xml b/ipay88/src/main/res/values/values.xml
deleted file mode 100644
index 9685f98..0000000
--- a/ipay88/src/main/res/values/values.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="bg_notice_color">#a0f16822</color>
-    <color name="color_toolbar">#2a5381</color>
-    <color name="color_toolbar_item">#ffffff</color>
-    <color name="viewfinder_border">#fff5f5</color>
-    <color name="viewfinder_laser">#ffcc0000</color>
-    <color name="viewfinder_mask">#60000000</color>
-    <string name="Amount">Amount (RM)</string>
-    <string name="ProdDesc">Product Description</string>
-    <string name="Result">Result</string>
-    <string name="UserEmail">Email</string>
-    <string name="UserName">Customer Name</string>
-    <string name="app_name">v3 IPAY88 Android Payment</string>
-    <string name="btnHome">Home</string>
-    <string name="btnPrint">Print Receipt</string>
-    <string name="imgDesc">ipay demo logo</string>
-    <string name="msg_decode_error">Decoding operation failed with an unexpected error</string>
-    <string name="msg_error_ssl_date_invalid">SSL Certificate date invalid!</string>
-    <string name="msg_error_ssl_expired">SSL Certificate expired!</string>
-    <string name="msg_error_ssl_idmismatch">SSL Certificate id mismatch!</string>
-    <string name="msg_error_ssl_invalid">SSL Certificate invalid!</string>
-    <string name="msg_error_ssl_notyet_valid">SSL Certificate not yet valid!</string>
-    <string name="msg_error_ssl_untrusted">SSL Certificate untrusted!</string>
-    <string name="msg_oh_no">Oh no!</string>
-    <string name="msg_select_method">Please select a payment method</string>
-    <string name="msg_transition_empty">Transaction information is empty</string>
-    <string name="strAmount">Amount</string>
-    <string name="strAuthCode">AuthCode</string>
-    <string name="strBackendPost">Backend Post URL</string>
-    <string name="strCancel">Cancel</string>
-    <string name="strCountry">Country</string>
-    <string name="strCreditCard">Credit Card</string>
-    <string name="strCurrency">Currency</string>
-    <string name="strErrDesc">ErrDesc</string>
-    <string name="strLang">Language</string>
-    <string name="strMerchantCode">Merchant Code</string>
-    <string name="strMerchantKey">Merchant Key</string>
-    <string name="strOK">OK</string>
-    <string name="strPay">Pay Now</string>
-    <string name="strPaymentID">Payment ID</string>
-    <string name="strPaymentId">PaymentId</string>
-    <string name="strREFID">Reference ID</string>
-    <string name="strRefNo">RefNo</string>
-    <string name="strRemark">Remark</string>
-    <string name="strRequery">Requery</string>
-    <string name="strRhbMerchantId">Rhb Merchant Id</string>
-    <string name="strRhbOrderId">Rhb Order Id</string>
-    <string name="strRhbOwnHash">Use own hash?</string>
-    <string name="strRhbShaKey">Rhb Sha key</string>
-    <string name="strSelectPayment">Select your payment</string>
-    <string name="strSignature">Signature</string>
-    <string name="strStatus">Status</string>
-    <string name="strTransId">TransId</string>
-</resources>