Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,16 @@ public void run() {
}
}

public static int getNavigationBarHeight() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && instance != null) {
WindowMetrics windowMetrics = instance.getWindowManager().getCurrentWindowMetrics();
Insets insets = windowMetrics.getWindowInsets().getInsets(WindowInsets.Type.navigationBars());
float density = instance.getResources().getDisplayMetrics().density;
return Math.round(insets.bottom / density);
}
return 0;
}

public static VPNActivity getInstance() {
Log.d("VPNActivity", "getInstance");
if(instance != null){
Expand Down
4 changes: 3 additions & 1 deletion nebula/ui/components/MZBottomSheet.qml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import QtQuick.Layouts 1.14

import components 0.1
import Mozilla.Shared 1.0
import Mozilla.VPN 1.0

//SUMMARY: MZBottomSheet opens a drawer from the bottom of the screen showing it's contentItem

Expand Down Expand Up @@ -50,7 +51,8 @@ Loader {

sourceComponent: Drawer {
implicitWidth: window.width
implicitHeight: root.sizeToContent ? Math.min(contentItem.implicitHeight, maxSheetHeight) : maxSheetHeight
bottomPadding: Qt.platform.os === "android" ? VPNAndroidCommons.getNavigationBarHeight() : 0
implicitHeight: (root.sizeToContent ? Math.min(contentItem.implicitHeight, maxSheetHeight) : maxSheetHeight) + bottomPadding

topPadding: 0

Expand Down
7 changes: 7 additions & 0 deletions src/platforms/android/androidcommons.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,3 +231,10 @@ void AndroidCommons::dismissSplashScreen() {
QJniObject::callStaticMethod<void>("org/mozilla/firefox/vpn/qt/VPNActivity",
"dismissSplashScreen", "()V");
}

// static
int AndroidCommons::getNavigationBarHeight() {
return QJniObject::callStaticMethod<jint>(
"org/mozilla/firefox/vpn/qt/VPNActivity", "getNavigationBarHeight",
"()I");
}
2 changes: 2 additions & 0 deletions src/platforms/android/androidcommons.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class AndroidCommons final : public QObject {
static void dispatchToMainThread(std::function<void()> callback);

static void dismissSplashScreen();

static int getNavigationBarHeight();
};

#endif // ANDROIDCOMMONS_H
4 changes: 4 additions & 0 deletions src/ui/singletons/VPNAndroidCommons.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ class VPNAndroidCommons : public QObject {
Q_INVOKABLE int getAndroidApiLevel() {
return AndroidCommons::getSDKVersion();
}

Q_INVOKABLE int getNavigationBarHeight() {
return AndroidCommons::getNavigationBarHeight();
}
};

#endif // VPNANDROIDCOMMONS_H
Loading