From 1f8facacc8c4bec9a46847683efcf636cc28023c Mon Sep 17 00:00:00 2001
From: OliE <olie.xdev@googlemail.com>
Date: Sun, 7 Oct 2018 12:57:22 +0200
Subject: [PATCH] update version to 1.8.2 and updated target version to sdk 28

---
 android_app/app/build.gradle                  | 10 +++----
 .../health/openscale/gui/MainActivity.java    | 26 -------------------
 .../gui/fragments/GraphFragment.java          |  2 +-
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle
index dec14165..bb2c532f 100644
--- a/android_app/app/build.gradle
+++ b/android_app/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.health.openscale"
         testApplicationId "com.health.openscale.test"
         minSdkVersion 19
-        targetSdkVersion 27
-        versionCode 28
-        versionName "1.8.1"
+        targetSdkVersion 28
+        versionCode 29
+        versionName "1.8.2"
 
         javaCompileOptions {
             annotationProcessorOptions { arguments = ["room.schemaLocation":"$projectDir/schemas".toString()] }
@@ -35,7 +35,7 @@ android {
 }
 
 ext {
-    supportLibVersion = '27.1.1'
+    supportLibVersion = '28.0.0'
 }
 
 dependencies {
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
index 4cc2391e..7cbe29a4 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
@@ -124,8 +124,6 @@ public class MainActivity extends BaseAppCompatActivity
             }
         });
 
-        disableShiftMode(navBottomDrawer);
-
         //Create Drawer Toggle
         drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, R.string.open_drawer, R.string.close_drawer){
 
@@ -719,28 +717,4 @@ public class MainActivity extends BaseAppCompatActivity
                 break;
         }
     }
-
-    @SuppressLint("RestrictedApi")
-    private static void disableShiftMode(BottomNavigationView view) {
-        BottomNavigationMenuView menuView = (BottomNavigationMenuView) view.getChildAt(0);
-        try {
-            Field shiftingMode = menuView.getClass().getDeclaredField("mShiftingMode");
-            shiftingMode.setAccessible(true);
-            shiftingMode.setBoolean(menuView, false);
-            shiftingMode.setAccessible(false);
-            for (int i = 0; i < menuView.getChildCount(); i++) {
-                BottomNavigationItemView item = (BottomNavigationItemView) menuView.getChildAt(i);
-                //noinspection RestrictedApi
-                item.setShiftingMode(false);
-                item.setPadding(0, 20, 0, 0);
-                // set once again checked value, so view will be updated
-                //noinspection RestrictedApi
-                item.setChecked(item.getItemData().isChecked());
-            }
-        } catch (NoSuchFieldException e) {
-            Timber.e(e, "Unable to get shift mode field");
-        } catch (IllegalAccessException e) {
-            Timber.e(e, "Unable to change value of shift mode");
-        }
-    }
 }
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java
index 28e56931..deeec704 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java
@@ -595,7 +595,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
     }
 
     private class chartBottomListener implements View.OnTouchListener {
-        final GestureDetector gestureDetector = new GestureDetector(new GestureDetector.SimpleOnGestureListener() {
+        final GestureDetector gestureDetector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() {
             public void onLongPress(MotionEvent e) {
                 chartBottom.setCurrentViewport(defaultTopViewport);
             }