Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MPP-1815: VT payment system bar issue. #205

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ object Sdk {
}

object Versions {
const val ACTIVITY = "1.4.0"
const val ACTIVITY = "1.9.3"
const val FRAGMENT = "1.4.1"
const val ACTIVITY_COMPOSE = "1.3.0-beta01"
const val VIEWMODEL_COMPOSE = "1.0.0-alpha04"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ import android.content.Intent
import android.content.pm.ActivityInfo
import android.os.Build
import android.os.Bundle
import android.view.View
import android.view.WindowManager
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.animation.AnimatedVisibility
Expand All @@ -22,6 +24,9 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updatePadding
import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController
import androidx.navigation.NavType
Expand Down Expand Up @@ -87,7 +92,9 @@ class PaymentFlowContainerActivity : AppCompatActivity() {
}

override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge()
super.onCreate(savedInstanceState)
applyWindowInset(window.decorView)
disableScreenRecord()
lockToPortrait()
configureDojoPayCore()
Expand Down Expand Up @@ -515,4 +522,22 @@ class PaymentFlowContainerActivity : AppCompatActivity() {
setResult(RESULT_OK, data)
overridePendingTransition(200, R.anim.exit)
}

private fun applyWindowInset(root: View) {
ViewCompat.setOnApplyWindowInsetsListener(root) { v, insets ->
val bars = insets.getInsets(
WindowInsetsCompat.Type.navigationBars()
or WindowInsetsCompat.Type.statusBars()
or WindowInsetsCompat.Type.displayCutout()
or WindowInsetsCompat.Type.ime(),
)
v.updatePadding(
left = bars.left,
top = bars.top,
right = bars.right,
bottom = bars.bottom,
)
WindowInsetsCompat.CONSUMED
}
}
}