Skip to content

Commit 35bf74b

Browse files
author
Tibor Kaputa
committed
scale the bottom padding more dynamically
1 parent 3e88fc7 commit 35bf74b

4 files changed

Lines changed: 4 additions & 8 deletions

File tree

app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import android.hardware.SensorManager;
1717
import android.media.MediaScannerConnection;
1818
import android.net.Uri;
19+
import android.os.Build;
1920
import android.os.Bundle;
2021
import android.os.Handler;
2122
import android.provider.MediaStore;
@@ -159,10 +160,10 @@ private void initializeCamera() {
159160
setContentView(R.layout.activity_main);
160161
ButterKnife.bind(this);
161162

162-
if (Utils.hasNavBar(getResources())) {
163+
if (Utils.hasNavBar(getResources()) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
163164
final View btnLayout = findViewById(R.id.btn_holder);
164-
final int bottomMargin = (int) getResources().getDimension(R.dimen.preview_btn_margin);
165-
((RelativeLayout.LayoutParams) btnLayout.getLayoutParams()).setMargins(0, 0, 0, bottomMargin);
165+
final RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) btnLayout.getLayoutParams();
166+
lp.setMargins(0, 0, 0, lp.bottomMargin + Utils.getNavBarHeight(getResources()));
166167
}
167168

168169
mCurrCamera = mConfig.getLastUsedCamera();

app/src/main/res/values-sw600dp/dimens.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<dimen name="settings_padding">12dp</dimen>
44
<dimen name="social_padding">12dp</dimen>
55
<dimen name="social_logo">50dp</dimen>
6-
<dimen name="preview_btn_margin">32dp</dimen>
76

87
<dimen name="normal_text_size">18sp</dimen>
98
</resources>

app/src/main/res/values-v21/dimens.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/src/main/res/values/dimens.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<resources>
22
<dimen name="activity_margin">16dp</dimen>
3-
<dimen name="preview_btn_margin">32dp</dimen>
43
<dimen name="side_icon_padding">12dp</dimen>
54
<dimen name="side_preview_padding">8dp</dimen>
65
<dimen name="icon_size">56dp</dimen>

0 commit comments

Comments
 (0)