From 4e1ab621ed8788a9985a253c0256562c6b44486a Mon Sep 17 00:00:00 2001 From: Gabriel Calero Date: Thu, 5 Jul 2018 20:29:30 -0300 Subject: [PATCH] Fix webview dimensions --- .../highfidelity/hifiinterface/InterfaceActivity.java | 10 ++++++---- android/app/src/main/res/layout/web_drawer.xml | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java index 2b73f21294..9f115de472 100644 --- a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java +++ b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java @@ -49,8 +49,10 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW public static final String DOMAIN_URL = "url"; private static final String TAG = "Interface"; - private static final int WEB_DRAWER_RIGHT_MARGIN = 262; - private static final int WEB_DRAWER_BOTTOM_MARGIN = 217; + private static final int WEB_DRAWER_RIGHT_MARGIN_DP = 13; + private static final int WEB_DRAWER_BOTTOM_MARGIN_DP = 13; + private static final int WEB_DRAWER_WIDTH_DP = 244; + private static final int WEB_DRAWER_HEIGHT_DP = 145; private static final int NORMAL_DPI = 160; private Vibrator mVibrator; @@ -142,8 +144,8 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW int widthPx = Math.max(size.x, size.y); int heightPx = Math.min(size.x, size.y); - layoutParams.x = (int) (widthPx - WEB_DRAWER_RIGHT_MARGIN * getResources().getDisplayMetrics().xdpi / NORMAL_DPI); - layoutParams.y = (int) (heightPx - WEB_DRAWER_BOTTOM_MARGIN * getResources().getDisplayMetrics().ydpi / NORMAL_DPI); + layoutParams.x = (int) (widthPx - (WEB_DRAWER_RIGHT_MARGIN_DP + WEB_DRAWER_WIDTH_DP) * getResources().getDisplayMetrics().xdpi / NORMAL_DPI); + layoutParams.y = (int) (heightPx - (WEB_DRAWER_BOTTOM_MARGIN_DP + WEB_DRAWER_HEIGHT_DP) * getResources().getDisplayMetrics().ydpi / NORMAL_DPI); layoutParams.resolveLayoutDirection(View.LAYOUT_DIRECTION_RTL); qtLayout.addView(webSlidingDrawer, layoutParams); webSlidingDrawer.setVisibility(View.GONE); diff --git a/android/app/src/main/res/layout/web_drawer.xml b/android/app/src/main/res/layout/web_drawer.xml index 0ebda2e75a..c72a18a4d4 100644 --- a/android/app/src/main/res/layout/web_drawer.xml +++ b/android/app/src/main/res/layout/web_drawer.xml @@ -1,7 +1,7 @@