From 4ab90d0e089eca471c20d4eed40f74657981ebc9 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 30 Jun 2016 23:12:46 +0200
Subject: [PATCH] scale up the sizes properly for tablets

---
 .../com/simplemobiletools/gallery/Utils.java  | 32 +++++++++++++++++--
 .../gallery/fragments/VideoFragment.java      | 11 ++++---
 app/src/main/res/layout/activity_medium.xml   |  4 +--
 app/src/main/res/layout/directory_item.xml    |  2 +-
 app/src/main/res/values-sw600dp/dimens.xml    | 14 ++++++++
 app/src/main/res/values/dimens.xml            |  4 +++
 app/src/main/res/values/styles.xml            |  1 +
 7 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/values-sw600dp/dimens.xml

diff --git a/app/src/main/java/com/simplemobiletools/gallery/Utils.java b/app/src/main/java/com/simplemobiletools/gallery/Utils.java
index 56bc50e20..20cec3c1b 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/Utils.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/Utils.java
@@ -1,13 +1,20 @@
 package com.simplemobiletools.gallery;
 
 import android.Manifest;
+import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.os.Build;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.ActionBar;
+import android.util.DisplayMetrics;
 import android.util.TypedValue;
+import android.view.Display;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
 import android.view.View;
+import android.view.ViewConfiguration;
 import android.view.Window;
 import android.webkit.MimeTypeMap;
 import android.widget.Toast;
@@ -46,9 +53,28 @@ public class Utils {
         return 0;
     }
 
-    public static boolean hasNavBar(Resources res) {
-        int id = res.getIdentifier("config_showNavigationBar", "bool", "android");
-        return id > 0 && res.getBoolean(id);
+    public static boolean hasNavBar(Activity act) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            Display display = act.getWindowManager().getDefaultDisplay();
+
+            DisplayMetrics realDisplayMetrics = new DisplayMetrics();
+            display.getRealMetrics(realDisplayMetrics);
+
+            int realHeight = realDisplayMetrics.heightPixels;
+            int realWidth = realDisplayMetrics.widthPixels;
+
+            DisplayMetrics displayMetrics = new DisplayMetrics();
+            display.getMetrics(displayMetrics);
+
+            int displayHeight = displayMetrics.heightPixels;
+            int displayWidth = displayMetrics.widthPixels;
+
+            return (realWidth - displayWidth) > 0 || (realHeight - displayHeight) > 0;
+        } else {
+            boolean hasMenuKey = ViewConfiguration.get(act).hasPermanentMenuKey();
+            boolean hasBackKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_BACK);
+            return !hasMenuKey && !hasBackKey;
+        }
     }
 
     public static boolean hasStoragePermission(Context cxt) {
diff --git a/app/src/main/java/com/simplemobiletools/gallery/fragments/VideoFragment.java b/app/src/main/java/com/simplemobiletools/gallery/fragments/VideoFragment.java
index 82c86fc32..57e24cddc 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/fragments/VideoFragment.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/fragments/VideoFragment.java
@@ -103,15 +103,16 @@ public class VideoFragment extends ViewPagerFragment
         final int height = Utils.getNavBarHeight(res);
         final int left = mTimeHolder.getPaddingLeft();
         final int top = mTimeHolder.getPaddingTop();
-        final int right = mTimeHolder.getPaddingRight();
-        final int bottom = mTimeHolder.getPaddingBottom();
+        int right = mTimeHolder.getPaddingRight();
+        int bottom = mTimeHolder.getPaddingBottom();
 
-        if (Utils.hasNavBar(res)) {
+        if (Utils.hasNavBar(getActivity())) {
             if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
-                mTimeHolder.setPadding(left, top, right, bottom + height);
+                bottom += height;
             } else {
-                mTimeHolder.setPadding(left, top, right + height, bottom);
+                right += height;
             }
+            mTimeHolder.setPadding(left, top, right, bottom);
         }
 
         mCurrTimeView = (TextView) view.findViewById(R.id.video_curr_time);
diff --git a/app/src/main/res/layout/activity_medium.xml b/app/src/main/res/layout/activity_medium.xml
index ff8eb2e52..d3240bdd9 100644
--- a/app/src/main/res/layout/activity_medium.xml
+++ b/app/src/main/res/layout/activity_medium.xml
@@ -13,8 +13,8 @@
 
     <ImageView
         android:id="@+id/undo_delete"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
+        android:layout_width="@dimen/undo_size"
+        android:layout_height="@dimen/undo_size"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:padding="@dimen/undo_padding"
diff --git a/app/src/main/res/layout/directory_item.xml b/app/src/main/res/layout/directory_item.xml
index 34d7edc6d..fc60d4b4f 100644
--- a/app/src/main/res/layout/directory_item.xml
+++ b/app/src/main/res/layout/directory_item.xml
@@ -17,7 +17,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="@dimen/tmb_shadow_height"
         android:layout_alignParentBottom="true"
         android:background="#55000000"
         android:paddingBottom="4dp"
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
new file mode 100644
index 000000000..d2dca980a
--- /dev/null
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -0,0 +1,14 @@
+<resources>
+    <dimen name="dir_tmb_size">200dp</dimen>
+    <dimen name="medium_tmb_size">150dp</dimen>
+    <dimen name="play_outline_size">60dp</dimen>
+    <dimen name="play_outline_size_big">240dp</dimen>
+    <dimen name="undo_padding">16dp</dimen>
+    <dimen name="timer_padding">32dp</dimen>
+    <dimen name="social_padding">12dp</dimen>
+    <dimen name="social_logo">50dp</dimen>
+    <dimen name="tmb_shadow_height">60dp</dimen>
+    <dimen name="undo_size">64dp</dimen>
+
+    <dimen name="normal_text_size">18sp</dimen>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 498fbc15c..6e3e99650 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,4 +8,8 @@
     <dimen name="timer_padding">24dp</dimen>
     <dimen name="social_padding">8dp</dimen>
     <dimen name="social_logo">40dp</dimen>
+    <dimen name="tmb_shadow_height">50dp</dimen>
+    <dimen name="undo_size">56dp</dimen>
+
+    <dimen name="normal_text_size">14sp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 14401f3be..268af1d35 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,6 +5,7 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="actionBarStyle">@style/AppTheme.ActionBarStyle</item>
+        <item name="android:textSize">@dimen/normal_text_size</item>
     </style>
 
     <style name="FullScreenTheme.Base" parent="AppTheme">