[APPC-4691] WebView Payment: screen resize with keyboard

Catappult · Jan 8, 2025 · 5ad8290 · 5ad8290
1 parent a8cc620
commit 5ad8290
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -338,7 +338,7 @@
     <activity
         android:name="com.asfoundation.wallet.ui.webview_payment.WebViewPaymentActivity"
         android:theme="@style/Theme.AppCompat.Transparent.WebPayment"
-        android:windowSoftInputMode="adjustPan" />
+        android:windowSoftInputMode="adjustResize" />
 
     <service
         android:name="com.asfoundation.wallet.transactions.PerkBonusAndGamificationService"

diff --git a/app/src/main/java/com/asfoundation/wallet/ui/webview_payment/WebViewPaymentActivity.kt b/app/src/main/java/com/asfoundation/wallet/ui/webview_payment/WebViewPaymentActivity.kt
@@ -121,7 +121,6 @@ class WebViewPaymentActivity : AppCompatActivity() {
     val webView = remember { WebView(context) }
 
     val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
-    val topSpacerHeight = if (isLandscape) 36.dp else 176.dp
 
     BackHandler(enabled = true) {
       if (webView.canGoBack()) {
@@ -136,14 +135,22 @@ class WebViewPaymentActivity : AppCompatActivity() {
         .fillMaxSize()
         .padding(horizontal = if (isLandscape) 56.dp else 0.dp)
     ) {
-      Spacer(
-        modifier = Modifier
-          .height(topSpacerHeight)
-          .fillMaxWidth()
-          .clickable {
-            finish()
-          }
-      )
+      if (isLandscape) {
+        Spacer(
+          modifier = Modifier
+            .height(36.dp)
+            .fillMaxWidth()
+            .clickable { finish() }
+        )
+      } else {
+        Spacer(
+          modifier = Modifier
+            .fillMaxWidth()
+            .weight(0.2f)
+            .clickable { finish() }
+        )
+      }
+
       Box(
         modifier = Modifier
           .fillMaxWidth()
@@ -159,6 +166,10 @@ class WebViewPaymentActivity : AppCompatActivity() {
       AndroidView(
         modifier = Modifier
           .fillMaxWidth()
+          .weight(
+            if (isLandscape) 1f
+            else 0.8f
+          )
           .background(styleguide_light_grey),
         factory = {
           webView.apply {

diff --git a/app/src/main/java/com/asfoundation/wallet/ui/webview_payment/repository/PayFlowRepository.kt b/app/src/main/java/com/asfoundation/wallet/ui/webview_payment/repository/PayFlowRepository.kt
@@ -16,12 +16,10 @@ class PayFlowRepository @Inject constructor(
 
   fun getPayFlow(
     packageName: String,
-    packageVercode: Int?,
     oemid: String?,
   ): Single<PayFlowResponse> {
     return payFlowApi.getPayFlow(
       packageName = packageName,
-      packageVercode = packageVercode,
       oemid = oemid?.takeIf { it.isNotEmpty() },
     )
       .subscribeOn(rxSchedulers.io)

diff --git a/...n/java/com/asfoundation/wallet/ui/webview_payment/usecases/IsWebViewPaymentFlowUseCase.kt b/...n/java/com/asfoundation/wallet/ui/webview_payment/usecases/IsWebViewPaymentFlowUseCase.kt
@@ -21,7 +21,6 @@ class IsWebViewPaymentFlowUseCase @Inject constructor(
       .flatMap { attributionEntity ->
         payFlowRepository.getPayFlow(
           packageName = transaction.domain,
-          packageVercode = 0,
           oemid = attributionEntity.oemId,
         )
       }

diff --git a/...es/src/main/java/com/appcoins/wallet/core/network/microservices/api/payflow/PayFlowApi.kt b/...es/src/main/java/com/appcoins/wallet/core/network/microservices/api/payflow/PayFlowApi.kt
@@ -10,7 +10,6 @@ interface PayFlowApi {
   @GET("v2/payment_flow")
   fun getPayFlow(
     @Query("package") packageName: String,
-    @Query("package_vercode") packageVercode: Int?,
     @Query("oemid") oemid: String?,
   ): Single<PayFlowResponse>