From efb8ce2b860a7bf95bc7af7b946144ac6fc412ac Mon Sep 17 00:00:00 2001 From: Paul Miller Date: Mon, 6 Nov 2023 13:35:28 -0600 Subject: [PATCH] get rid of android rubber band effect --- .../mutinywallet/mutinywallet/MainActivity.java | 17 ++++++++++++++++- src/root.css | 5 ++--- src/styles/dialogs.ts | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/java/com/mutinywallet/mutinywallet/MainActivity.java b/android/app/src/main/java/com/mutinywallet/mutinywallet/MainActivity.java index 898d204..13cefd8 100644 --- a/android/app/src/main/java/com/mutinywallet/mutinywallet/MainActivity.java +++ b/android/app/src/main/java/com/mutinywallet/mutinywallet/MainActivity.java @@ -1,5 +1,20 @@ package com.mutinywallet.mutinywallet; +import android.os.Bundle; +import android.webkit.WebView; + import com.getcapacitor.BridgeActivity; -public class MainActivity extends BridgeActivity {} +public class MainActivity extends BridgeActivity { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public void onStart() { + super.onStart(); + WebView webview = getBridge().getWebView(); + webview.setOverScrollMode(WebView.OVER_SCROLL_NEVER); + } +} diff --git a/src/root.css b/src/root.css index 4b30ea3..d3f2e0c 100644 --- a/src/root.css +++ b/src/root.css @@ -4,12 +4,11 @@ body { @apply text-white; - @apply min-h-[100dvh] overflow-y-scroll overscroll-y-none safe-top safe-bottom disable-scrollbars; + @apply min-h-[100dvh] overflow-y-scroll safe-top safe-bottom disable-scrollbars; } html { - /* Fixed stops it from stretchy overscrolling (more app-like) */ - @apply fixed inset-0 h-[100dvh] overflow-y-scroll overscroll-y-none disable-scrollbars; + @apply h-[100dvh]; @apply bg-neutral-900; } diff --git a/src/styles/dialogs.ts b/src/styles/dialogs.ts index b73be00..293698b 100644 --- a/src/styles/dialogs.ts +++ b/src/styles/dialogs.ts @@ -1,3 +1,3 @@ export const DIALOG_POSITIONER = "fixed inset-0 h-[100dvh] z-50"; export const DIALOG_CONTENT = - "h-[100dvh] flex flex-col justify-between px-4 pt-4 pb-8 bg-m-grey-800 touch-manipulation select-none overflow-y-scroll disable-scrollbars"; + "safe-top safe-bottom h-full flex flex-col justify-between px-4 pt-4 pb-8 bg-m-grey-800 touch-manipulation select-none overflow-y-scroll disable-scrollbars";