From 604dc90ab14d4d3bee72d5fc7ded02f62e451e4b Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Thu, 27 Oct 2016 16:55:55 +0200 Subject: [PATCH] reduce the bottom margin on devices with hardware navigation --- .../simplemobiletools/camera/activities/MainActivity.java | 6 ++++++ app/src/main/res/layout/activity_main.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java index 4c0c0377..c9ef4c3f 100644 --- a/app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java @@ -159,6 +159,12 @@ public class MainActivity extends SimpleActivity setContentView(R.layout.activity_main); ButterKnife.bind(this); + if (Utils.hasNavBar(getResources())) { + final View btnLayout = findViewById(R.id.btn_holder); + final int bottomMargin = (int) getResources().getDimension(R.dimen.preview_btn_margin); + ((RelativeLayout.LayoutParams) btnLayout.getLayoutParams()).setMargins(0, 0, 0, bottomMargin); + } + mCurrCamera = mConfig.getLastUsedCamera(); mPreview = new Preview(this, (SurfaceView) findViewById(R.id.camera_view), this); mPreview.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 488d1ac6..9a2b45fa 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -50,7 +50,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_marginBottom="@dimen/preview_btn_margin" + android:layout_marginBottom="@dimen/activity_margin" android:gravity="center_horizontal|bottom">