Fix orientation reset (#13)

DHosseiny · web-flow · commit bb1295e96245 · 2023-11-12T13:35:51.000+03:30
* Add configChanges to Payment activity

* Use context instead of activity

* Update ui to see logs

* Move some code to App class

* Add PaymentTest1000 in-app item

* Rename to context

* Some refactoring
diff --git a/poolakeyunitysdk-android/app/build.gradle b/poolakeyunitysdk-android/app/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.application'
+    id 'kotlin-android'
 }
 
 android {
diff --git a/poolakeyunitysdk-android/app/src/main/AndroidManifest.xml b/poolakeyunitysdk-android/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:name=".App"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.PoolakeyUnitySDK">
diff --git a/poolakeyunitysdk-android/app/src/main/java/com/sample/android/trivialdrivesample/App.kt b/poolakeyunitysdk-android/app/src/main/java/com/sample/android/trivialdrivesample/App.kt
@@ -0,0 +1,55 @@
+package com.sample.android.trivialdrivesample
+
+import android.app.Application
+import androidx.lifecycle.MutableLiveData
+import com.farsitel.bazaar.PoolakeyKotlinBridge.connect
+import com.farsitel.bazaar.PoolakeyKotlinBridge.getSkuDetails
+import com.farsitel.bazaar.callback.ConnectionCallback
+import com.farsitel.bazaar.callback.SKUDetailsCallback
+import ir.cafebazaar.poolakey.entity.SkuDetails
+
+class App : Application() {
+
+    val liveData = MutableLiveData<String>()
+
+    override fun onCreate() {
+        super.onCreate()
+
+        connect(applicationContext, null, object : ConnectionCallback {
+            override fun onConnect() {
+                log("onConnect")
+                getSKUDetails()
+            }
+
+            override fun onDisconnect() {
+                log("onDisconnect")
+            }
+
+            override fun onFailure(message: String, stackTrace: String) {
+                log("onFailure $message")
+            }
+        })
+    }
+
+    private fun getSKUDetails() {
+        getSkuDetails(
+            "inapp",
+            listOf(
+                "gas", "premium", "trial_subscription", "infinite_gas_monthly", "dynamic_price",
+                "PaymentTest1000"
+            ),
+            object : SKUDetailsCallback {
+                override fun onSuccess(data: List<SkuDetails?>) {
+                    log("onSkuDetailsSuccess $data")
+                }
+
+                override fun onFailure(message: String, stackTrace: String) {
+                    log("onSkuDetailsFailure $message")
+                }
+            })
+    }
+
+    fun log(text: String) {
+        liveData.postValue(liveData.value.orEmpty() + "\n" + text)
+    }
+}
diff --git a/poolakeyunitysdk-android/app/src/main/java/com/sample/android/trivialdrivesample/MainActivity.java b/poolakeyunitysdk-android/app/src/main/java/com/sample/android/trivialdrivesample/MainActivity.java
@@ -1,6 +1,7 @@
 package com.sample.android.trivialdrivesample;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.MutableLiveData;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -10,16 +11,8 @@
 import com.farsitel.bazaar.PaymentActivity;
 import com.farsitel.bazaar.PoolakeyBridge;
 import com.farsitel.bazaar.PoolakeyKotlinBridge;
-import com.farsitel.bazaar.callback.ConnectionCallback;
 import com.farsitel.bazaar.callback.ConsumeCallback;
 import com.farsitel.bazaar.callback.PaymentCallback;
-import com.farsitel.bazaar.callback.PurchasesCallback;
-import com.farsitel.bazaar.callback.SKUDetailsCallback;
-
-import java.util.Arrays;
-import java.util.List;
-
-import ir.cafebazaar.poolakey.entity.SkuDetails;
 
 public class MainActivity extends AppCompatActivity {
     private TextView textView;
@@ -30,82 +23,56 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         textView = findViewById(R.id.textView);
-
-        PoolakeyKotlinBridge.INSTANCE.connect(getApplicationContext(), null, new ConnectionCallback() {
-            @Override
-            public void onConnect() {
-                log("onConnect");
-                getSKUDetails();
-            }
-
-            @Override
-            public void onDisconnect() {
-                log("onDisconnect");
-            }
-
-            @Override
-            public void onFailure(String message, String stackTrace) {
-                log("onFailure " + message);
-            }
-        });
-    }
-
-    private void getSKUDetails() {
-        PoolakeyKotlinBridge.INSTANCE.getSkuDetails("inapp", Arrays.asList("gas,premium,trial_subscription,infinite_gas_monthly,dynamic_price".split(",")), new SKUDetailsCallback() {
-            @Override
-            public void onSuccess(List<SkuDetails> data) {
-                log("onSkuDetailsSuccess " + data.toString());
-            }
-
-            @Override
-            public void onFailure(String message, String stackTrace) {
-                log("onSkuDetailsFailure " + message);
-            }
-        });
+        MutableLiveData<String> logLiveData = getApp().getLiveData();
+        logLiveData.observe(this, this::log);
     }
 
     public void purchase(View view) {
         PoolakeyKotlinBridge.INSTANCE.startActivity(this, PaymentActivity.Command.PurchaseProduct, new PaymentCallback() {
             @Override
             public void onStart() {
-                log("onPurchaseStart");
+                getApp().log("onPurchaseStart");
             }
 
             @Override
             public void onCancel() {
-                log("onPurchaseCancel");
+                getApp().log("onPurchaseCancel");
             }
 
             @Override
             public void onSuccess(String orderId, String purchaseToken, String payload, String packageName, int purchaseState, long purchaseTime, String productId, String originalJson, String dataSignature) {
-                log("onPurchaseSuccess " + orderId);
+                getApp().log("onPurchaseSuccess " + orderId);
                 consume(purchaseToken);
             }
 
             @Override
             public void onFailure(String message, String stackTrace) {
-                log("onPurchaseFailure " + message);
+                getApp().log("onPurchaseFailure " + message);
             }
-        }, "gas", "", "");
+        }, "PaymentTest1000", "", "");
     }
 
     public void consume(String purchaseToken) {
         PoolakeyKotlinBridge.INSTANCE.consume(purchaseToken, new ConsumeCallback() {
             @Override
             public void onSuccess() {
-                log("onConsumeSuccess");
+                getApp().log("onConsumeSuccess");
             }
 
             @Override
             public void onFailure(String message, String stackTrace) {
-                log("onConsumeFailure " + message);
+                getApp().log("onConsumeFailure " + message);
 
             }
         });
     }
 
     void log(String message) {
         Log.i(PoolakeyBridge.TAG, message);
-        textView.append(message + "\n");
+        textView.setText(message);
+    }
+
+    private App getApp() {
+        return (App) getApplication();
     }
 }
diff --git a/poolakeyunitysdk-android/app/src/main/res/layout/activity_main.xml b/poolakeyunitysdk-android/app/src/main/res/layout/activity_main.xml
@@ -12,18 +12,24 @@
         android:layout_height="wrap_content"
         android:onClick="purchase"
         android:text="Purchase Gas"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginTop="150dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="0dp"
+    <ScrollView
+        android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/button" />
+        app:layout_constraintTop_toBottomOf="@+id/button">
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/poolakeyunitysdk-android/poolakey/src/main/AndroidManifest.xml b/poolakeyunitysdk-android/poolakey/src/main/AndroidManifest.xml
@@ -6,6 +6,9 @@
     <application>
         <activity
             android:name="com.farsitel.bazaar.PaymentActivity"
+            android:configChanges="screenSize|orientation|mnc|mcc|colorMode|fontWeightAdjustment
+|fontScale|keyboard|keyboardHidden|locale|layoutDirection|screenLayout|smallestScreenSize|navigation
+|touchscreen|density|uiMode"
             android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
     </application>
     
diff --git a/poolakeyunitysdk-android/poolakey/src/main/java/com/farsitel/bazaar/PaymentActivity.kt b/poolakeyunitysdk-android/poolakey/src/main/java/com/farsitel/bazaar/PaymentActivity.kt
@@ -1,6 +1,6 @@
 package com.farsitel.bazaar
 
-import android.app.Activity
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.FragmentActivity
@@ -147,20 +147,20 @@ class PaymentActivity : FragmentActivity() {
 
         @JvmStatic
         fun start(
-            activity: Activity,
+            context: Context,
             command: Command,
             productId: String,
             callback: PaymentCallback,
             payload: String?,
             dynamicPriceToken: String?
         ) {
             paymentCallback = callback
-            val intent = Intent(activity, PaymentActivity::class.java)
+            val intent = Intent(context, PaymentActivity::class.java)
             intent.putExtra(KEY_PRODUCT_ID, productId)
             intent.putExtra(KEY_PAYLOAD, payload)
             intent.putExtra(KEY_DYNAMIC_PRICE_TOKEN, dynamicPriceToken)
             intent.putExtra(KEY_COMMAND, command.name)
-            activity.startActivity(intent)
+            context.startActivity(intent)
         }
     }
 
diff --git a/poolakeyunitysdk-android/poolakey/src/main/java/com/farsitel/bazaar/PoolakeyKotlinBridge.kt b/poolakeyunitysdk-android/poolakey/src/main/java/com/farsitel/bazaar/PoolakeyKotlinBridge.kt
@@ -1,6 +1,5 @@
 package com.farsitel.bazaar
 
-import android.app.Activity
 import android.content.Context
 import com.farsitel.bazaar.callback.*
 import ir.cafebazaar.poolakey.Connection
@@ -146,7 +145,7 @@ object PoolakeyKotlinBridge {
     }
 
     fun startActivity(
-        activity: Activity,
+        context: Context,
         command: PaymentActivity.Command,
         callback: PaymentCallback,
         productId: String,
@@ -163,7 +162,7 @@ object PoolakeyKotlinBridge {
             return
         }
         PaymentActivity.start(
-            activity,
+            context,
             command,
             productId,
             callback,

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'com.android.application'`
	`3`	`+ id 'kotlin-android'`
`3`	`4`	`}`
`4`	`5`
`5`	`6`	`android {`