Tap-Payments · aMaqboolTapPayments · Sep 26, 2022 · Sep 27, 2022 · Sep 27, 2022 · Sep 27, 2022
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -60,30 +60,30 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation project(':tapuilibrary')
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 //    annotationProcessor 'com.android.databinding:compiler:3.1.4'
     implementation 'com.google.android.material:material:1.2.1'
     implementation "androidx.viewpager2:viewpager2:1.0.0"
     implementation 'com.google.firebase:firebase-analytics:17.6.0'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
-    implementation 'com.github.Tap-Payments:TapCardInputKit-Android:0.1.0.36.50'
-    api 'com.github.Tap-Payments:TapCardInputKit-Android:0.1.0.36.50'
+    implementation 'com.github.Tap-Payments:TapCardInputKit-Android:0.1.0.36.102'
+    api 'com.github.Tap-Payments:TapCardInputKit-Android:0.1.0.36.102'
     implementation 'com.github.Tap-Payments:TapNFCCardReaderKit-Android:0.0.1'
     implementation "io.reactivex.rxjava2:rxjava:2.2.19"
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'com.github.Tap-Payments:TapCardScannerKit-Android:0.0.1.5'
     implementation 'company.tap:PayCards-Tap-Android:0.1.6.4'
     implementation 'io.alterac.blurkit:blurkit:1.1.0'
-    implementation 'androidx.biometric:biometric:1.0.1'
+    implementation 'androidx.biometric:biometric:1.1.0'
     implementation "androidx.constraintlayout:constraintlayout:2.0.2"
     implementation 'jp.wasabeef:blurry:4.0.0'
     implementation "com.hbb20:ccp:2.4.1"
     implementation 'jp.wasabeef:recyclerview-animators:4.0.1'
-    api 'com.github.Tap-Payments:LocalisationManager-Android:0.0.1.26'
+    api 'com.github.Tap-Payments:LocalisationManager-Android:0.0.1.30'
 
  //   implementation 'com.github.Tap-Payments:TapUIKit-Android:1.1.1.306'
   //  api 'com.github.Tap-Payments:TapUIKit-Android:1.1.1.306'

diff --git a/app/src/main/java/company/tap/tapuisample/activities/LoyaltyViewActivity.kt b/app/src/main/java/company/tap/tapuisample/activities/LoyaltyViewActivity.kt
@@ -4,7 +4,6 @@ import android.content.Intent
 import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
-import android.provider.Browser
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -18,9 +17,9 @@ import company.tap.tapuilibrary.uikit.organisms.TapLoyaltyView
 import company.tap.tapuisample.R
 
 class LoyaltyViewActivity : AppCompatActivity() {
-    var loyaltyView: TapLoyaltyView?=null
-    var constraintt: ConstraintLayout?=null
-    var textViewClickable: TapTextView ?=null
+    var loyaltyView: TapLoyaltyView? = null
+    var constraintt: ConstraintLayout? = null
+    var textViewClickable: TapTextView? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_loyalty_view)
@@ -36,36 +35,43 @@ class LoyaltyViewActivity : AppCompatActivity() {
         loyaltyView?.switchLoyalty?.setOnCheckedChangeListener { buttonView, isChecked ->
             loyaltyView?.switchTheme()
 
-            if(isChecked){
-               loyaltyView?.linearLayout2?.visibility = View.VISIBLE
-               loyaltyView?.linearLayout3?.visibility = View.VISIBLE
+            if (isChecked) {
+                loyaltyView?.linearLayout2?.visibility = View.VISIBLE
+                loyaltyView?.linearLayout3?.visibility = View.VISIBLE
 
-            }else {
+            } else {
 
                 loyaltyView?.linearLayout2?.visibility = View.GONE
                 loyaltyView?.linearLayout3?.visibility = View.GONE
 
             }
         }
         constraintt?.setBackgroundColor(Color.parseColor(ThemeManager.getValue("amountSectionView.backgroundColor")))
-        loyaltyView?.setLoyaltyHeaderDataSource(LoyaltyHeaderDataSource("ADCB","https://user-images.githubusercontent.com/57221514/191747750-544516b5-94d1-4b00-86d5-916f3da9f55a.png"))
+        loyaltyView?.setLoyaltyHeaderDataSource(
+            LoyaltyHeaderDataSource(
+                "ADCB",
+                "https://user-images.githubusercontent.com/57221514/191747750-544516b5-94d1-4b00-86d5-916f3da9f55a.png"
+            )
+        )
 
-      loyaltyView?.textViewClickable?.makeLinks(
-          Pair("(T&C)", View.OnClickListener {
-              val url = "https://www.adcb.com/en/tools-resources/adcb-privacy-policy/"
-              val intent = Intent(Intent.ACTION_VIEW)
-              intent.data = Uri.parse(url)
-              startActivity(intent)
-              Toast.makeText(this, "Terms of Service Clicked", Toast.LENGTH_SHORT).show()
-          }))
+        loyaltyView?.textViewClickable?.makeLinks(
+            Pair("(T&C)", View.OnClickListener {
+                val url = "https://www.adcb.com/en/tools-resources/adcb-privacy-policy/"
+                val intent = Intent(Intent.ACTION_VIEW)
+                intent.data = Uri.parse(url)
+                startActivity(intent)
+                Toast.makeText(this, "Terms of Service Clicked", Toast.LENGTH_SHORT).show()
+            })
+        )
 
         loyaltyView?.editTextAmount?.doOnTextChanged { text, start, count, after ->
             // action which will be invoked when the text is changing
-            if(text.toString()=="340"){
-                loyaltyView?.loyaltyAlertView?.alertMessage?.text = "Minimum redemption is AED 20.00 "
-                loyaltyView?.loyaltyAlertView?.visibility =View.VISIBLE
-            }else{
-                loyaltyView?.loyaltyAlertView?.visibility =View.GONE
+            if (text.toString() == "340") {
+                loyaltyView?.loyaltyAlertView?.alertMessage?.text =
+                    "Minimum redemption is AED 20.00 "
+                loyaltyView?.loyaltyAlertView?.visibility = View.VISIBLE
+            } else {
+                loyaltyView?.loyaltyAlertView?.visibility = View.GONE
             }
         }
 
@@ -75,6 +81,4 @@ class LoyaltyViewActivity : AppCompatActivity() {
     }
 
 
-
-
 }
diff --git a/app/src/main/java/company/tap/tapuisample/activities/MainActivity.kt b/app/src/main/java/company/tap/tapuisample/activities/MainActivity.kt
@@ -19,10 +19,7 @@ import android.os.Handler
 import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyProperties
 import android.util.Log
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.view.WindowManager
+import android.view.*
 import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatDelegate
@@ -75,11 +72,11 @@ class MainActivity : BaseActivity(),
         setLocale(this, LocalizationManager.getLocale(context).language)
 
         LocalizationManager.loadTapLocale(resources, R.raw.lang)
-//        ThemeManager.loadTapTheme(resources, R.raw.defaultdarktheme, "defaultdarktheme")
+       ThemeManager.loadTapTheme(resources, R.raw.defaultdarktheme2, "defaultdarktheme")
 //        if (ThemeManager.currentTheme.isNotEmpty() && ThemeManager.currentTheme.contains("dark"))
-            ThemeManager.loadTapTheme(this,"https://gist.githubusercontent.com/AhlaamK-tap/976650c60952b525d51b739254cd417c/raw/575a99cc7e7c78f3523a1c8e29850cd09333c198/defaultlighttheme1.json")
-         //  ThemeManager.loadTapTheme(this,"https://gist.githubusercontent.com/AhlaamK-tap/2ca0cbeaf430c6d40baa4d0700024848/raw/246e213d715b1d28e6b7adf633df17224d108c4d/darktheme.json")
-//        else   ThemeManager.loadTapTheme(this,"https://gist.githubusercontent.com/AhlaamK-tap/9862436dff3b3ca222243dad3705ec6a/raw/76f9bd9d4e12e7d9dccf5f4969baf09c15a1ea47/lighttheme")
+          //  ThemeManager.loadTapTheme(this,"https://gist.githubusercontent.com/AhlaamK-tap/976650c60952b525d51b739254cd417c/raw/4ca48d48f3cd5dc8a0d4ab49b788bb3e2e9bdc0c/defaultlighttheme1.json","lighttheme")
+         //  ThemeManager.loadTapTheme(this,"https://gist.githubusercontent.com/AhlaamK-tap/2ca0cbeaf430c6d40baa4d0700024848/raw/aba506185d267ee9d379b5c84d71c8cbed1cbbf2/darktheme.json","darktheme")
+//        else   ThemeManager.loadTapTheme(this,"https://gist.githubusercontent.com/AhlaamK-tap/9862436dff3b3ca222243dad3705ec6a/raw/76f9bd9d4e12e7d9dccf5f4969baf09c15a1ea47/lighttheme","lighttheme")
 
 
         supportActionBar?.setBackgroundDrawable( ColorDrawable(Color.parseColor("#005959")))
@@ -219,9 +216,9 @@ class MainActivity : BaseActivity(),
 //        startActivity(Intent(this, ThemeTestActivity::class.java))
 
         if (ThemeManager.currentTheme.isNotEmpty() && ThemeManager.currentTheme.contains("dark")) {
-            ThemeManager.loadTapTheme(resources, R.raw.defaultlighttheme, "defaultlighttheme")
+            ThemeManager.loadTapTheme(resources, R.raw.defaultlighttheme1, "defaultlighttheme")
         }else{
-            ThemeManager.loadTapTheme(resources, R.raw.defaultdarktheme, "defaultdarktheme")
+            ThemeManager.loadTapTheme(resources, R.raw.defaultdarktheme1, "defaultdarktheme")
         }
 
         }

diff --git a/app/src/main/java/company/tap/tapuisample/activities/ThemeTestActivity.kt b/app/src/main/java/company/tap/tapuisample/activities/ThemeTestActivity.kt
@@ -1,16 +1,11 @@
 package company.tap.tapuisample.activities
 
-import android.graphics.Color
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
-import android.view.ViewGroup
 import android.widget.Toast
 import company.tap.tapuilibrary.themekit.ThemeManager
-import company.tap.tapuilibrary.themekit.theme.TextViewTheme
 import company.tap.tapuisample.R
-import company.tap.tapuisample.adapters.context
-import jp.wasabeef.blurry.Blurry
 
 import kotlinx.android.synthetic.main.activity_theme_test.*
 
@@ -21,7 +16,7 @@ class ThemeTestActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_theme_test)
 //        initAppTheme(R.raw.defaultlighttheme)
-        ThemeManager.loadTapTheme(resources, R.raw.defaultdarktheme, "defaultdarktheme")
+        ThemeManager.loadTapTheme(resources, R.raw.defaultdarktheme1, "defaultdarktheme")
 
 
     }
@@ -41,16 +36,16 @@ class ThemeTestActivity : AppCompatActivity() {
 
 
     fun swap(view: View?) {
-        if (currentTheme == R.raw.defaultdarktheme) {
-            ThemeManager.loadTapTheme(resources, R.raw.defaultdarktheme, "defaultdarktheme")
+        if (currentTheme == R.raw.defaultdarktheme1) {
+            ThemeManager.loadTapTheme(resources, R.raw.defaultdarktheme1, "defaultdarktheme")
             setTheme(R.style.AppTheme);
             Toast.makeText(
                 applicationContext,
                 "Theme switched to defaultlighttheme",
                 Toast.LENGTH_SHORT
             ).show()
         } else {
-            ThemeManager.loadTapTheme(resources, R.raw.defaultdarktheme, "defaultdarktheme")
+            ThemeManager.loadTapTheme(resources, R.raw.defaultdarktheme1, "defaultdarktheme")
 
             setTheme(R.style.AppThemeBlack);
             Toast.makeText(