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

…for tall keyboards
Catappult · Jan 9, 2025 · aae5f02 · aae5f02
1 parent fc2fd97
commit aae5f02
Showing 1 changed file with 29 additions and 6 deletions.
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
@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
+import android.graphics.Rect
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
@@ -27,6 +28,8 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
@@ -42,7 +45,6 @@ import com.appcoins.wallet.ui.common.theme.WalletColors.styleguide_light_grey
 import com.asf.wallet.R
 import com.asfoundation.wallet.analytics.PaymentMethodAnalyticsMapper
 import com.asfoundation.wallet.backup.BackupNotificationUtils
-import com.asfoundation.wallet.billing.adyen.PaymentType
 import com.asfoundation.wallet.billing.paypal.usecases.CreateSuccessBundleUseCase
 import com.asfoundation.wallet.entity.TransactionBuilder
 import com.asfoundation.wallet.promotions.usecases.StartVipReferralPollingUseCase
@@ -107,11 +109,27 @@ class WebViewPaymentActivity : AppCompatActivity() {
     super.onCreate(savedInstanceState)
     requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LOCKED
     overridePendingTransition(R.anim.slide_in_bottom, R.anim.stay)
+    setKeyboardListener()
     setContent {
       MainContent(url)
     }
   }
 
+  var isPortraitSpaceForWeb = mutableStateOf(false)
+  fun setKeyboardListener() {
+    val decorView = window.decorView
+    decorView.viewTreeObserver.addOnGlobalLayoutListener {
+      val rect = Rect()
+      decorView.getWindowVisibleDisplayFrame(rect)
+      val ratio = (rect.height() * 0.8f) / rect.width()
+      if (ratio > 1.05) {
+        isPortraitSpaceForWeb.value = true
+      } else {
+        isPortraitSpaceForWeb.value = false
+      }
+    }
+  }
+
   @SuppressLint("SetJavaScriptEnabled")
   @Composable
   fun MainContent(url: String) {
@@ -146,15 +164,15 @@ class WebViewPaymentActivity : AppCompatActivity() {
         Spacer(
           modifier = Modifier
             .fillMaxWidth()
-            .weight(0.2f)
+            .weight(if (isPortraitSpaceForWeb.value) 0.2f else 0.02f)
             .clickable { finish() }
         )
       }
 
       Box(
         modifier = Modifier
           .fillMaxWidth()
-          .height(17.dp)
+          .height(16.dp)
           .background(
             color = if (isDarkModeEnabled(context))
               styleguide_blue_webview_payment
@@ -167,8 +185,13 @@ class WebViewPaymentActivity : AppCompatActivity() {
         modifier = Modifier
           .fillMaxWidth()
           .weight(
-            if (isLandscape) 1f
-            else 0.8f
+            if (isLandscape)
+              1f
+            else
+              if (isPortraitSpaceForWeb.value)
+                0.8f
+              else
+                0.98f
           )
           .background(styleguide_light_grey),
         factory = {
@@ -272,7 +295,7 @@ class WebViewPaymentActivity : AppCompatActivity() {
           Log.i(TAG, "createSuccessBundleAndFinish: ${it.message}")
           finish()
         }
-        .subscribe({}, {Log.i(TAG, "createSuccessBundleAndFinish: ${it.message}")})
+        .subscribe({}, { Log.i(TAG, "createSuccessBundleAndFinish: ${it.message}") })
     )
   }