added layout Params and invalidation

Tap-Payments · Oct 31, 2023 · a34c5f8 · a34c5f8
1 parent 3ff3078
commit a34c5f8
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 64 deletions.
diff --git a/.gradle/8.0/executionHistory/executionHistory.bin b/.gradle/8.0/executionHistory/executionHistory.bin
diff --git a/.gradle/8.0/executionHistory/executionHistory.lock b/.gradle/8.0/executionHistory/executionHistory.lock
diff --git a/.gradle/8.0/fileHashes/fileHashes.bin b/.gradle/8.0/fileHashes/fileHashes.bin
diff --git a/.gradle/8.0/fileHashes/fileHashes.lock b/.gradle/8.0/fileHashes/fileHashes.lock
diff --git a/.gradle/8.0/fileHashes/resourceHashesCache.bin b/.gradle/8.0/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/src/main/java/company/tap/paybutton/MainActivity.kt b/app/src/main/java/company/tap/paybutton/MainActivity.kt
@@ -177,44 +177,8 @@ class MainActivity : AppCompatActivity() {
         configuration.put("scope",scopeKey.toString())
         configuration.put("transaction",transaction)
 
-//
-//        findViewById<PayButton>(R.id.paybutton).initPayButton(this, configuration,
-//            PayButtonType.valueOf(buttonKey.toString()),object : PayButtonStatusDelegate {
-//            override fun onSuccess(data: String) {
-//                Toast.makeText(this@MainActivity,"success $data",Toast.LENGTH_SHORT).show()
-//            }
-//
-//            override fun onError(error: String) {
-//                Toast.makeText(this@MainActivity,"error $error",Toast.LENGTH_SHORT).show()
-//                Log.e("error",error.toString())
-//            }
-//
-//            override fun onCancel() {
-//                Toast.makeText(this@MainActivity,"cancel",Toast.LENGTH_SHORT).show()
-//            }
-//
-//            override fun onChargeCreated(data: String) {
-//                Toast.makeText(this@MainActivity,"charge created $data",Toast.LENGTH_SHORT).show()
-//
-//            }
-//
-//            override fun onClick() {
-//                Toast.makeText(this@MainActivity,"click",Toast.LENGTH_SHORT).show()
-//            }
-//
-//            override fun onReady() {
-//                Toast.makeText(this@MainActivity,"ready",Toast.LENGTH_SHORT).show()
-//            }
-//
-//            override fun onOrderCreated(data: String) {
-//                Toast.makeText(this@MainActivity,"order created $data",Toast.LENGTH_SHORT).show()
-//            }
-//
-//        })
-
-        PayButtonConfig.initPayButton(this,configuration,PayButtonType.KNET,findViewById<PayButton>(R.id.paybutton))
-
-        PayButtonConfig.addPayButtonStatusDelegate(object : PayButtonStatusDelegate {
+        findViewById<PayButton>(R.id.paybutton).initPayButton(this, configuration,
+            PayButtonType.valueOf(buttonKey.toString()),object : PayButtonStatusDelegate {
             override fun onSuccess(data: String) {
                 Toast.makeText(this@MainActivity,"success $data",Toast.LENGTH_SHORT).show()
             }
@@ -248,6 +212,7 @@ class MainActivity : AppCompatActivity() {
         })
 
 
+
     }
 
     private fun getPayButtonType(key: String): PayButtonType {

diff --git a/tappaybutton/src/main/java/company/tap/tappaybutton/PayButton.kt b/tappaybutton/src/main/java/company/tap/tappaybutton/PayButton.kt
@@ -57,8 +57,10 @@ class PayButton :LinearLayout {
             PayButtonType.BENEFIT_PAY ->{
                 tapBenefitPay = TapBenefitPay(context)
                 tapBenefitPay.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
-                this.addView(tapBenefitPay)
-                this.invalidate()
+                this.post(Runnable {
+                    this.addView(tapBenefitPay)
+                    this.invalidate()
+                })
                 BeneiftPayConfiguration.configureWithTapBenfitPayDictionaryConfiguration(context,tapBenefitPay,
                     configuration,object :TapBenefitPayStatusDelegate{
                         override fun onError(error: String) = payButtonStatusDelegate.onError(error)
@@ -80,8 +82,10 @@ class PayButton :LinearLayout {
             PayButtonType.KNET,PayButtonType.BENEFIT,PayButtonType.PAYPAL,PayButtonType.TABBY,PayButtonType.FAWRY-> {
                     tapKnetPay = TapKnetPay(context)
                     tapKnetPay.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
-                this.addView(tapKnetPay)
-                this.invalidate()
+                this.post(Runnable {
+                    this.addView(tapKnetPay)
+                    this.invalidate()
+                })
                     TapKnetConfiguration.configureWithKnetDictionary(
                         context,
                         tapKnetPay,