Bug fix for fixed navbar (1.5.1)

indywidualny · Apr 28, 2015 · f5d17b7 · f5d17b7
1 parent e19de27
commit f5d17b7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.indywidualni.fblite"
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 4
-        versionName "1.5.0"
+        versionCode 5
+        versionName "1.5.1"
     }
     buildTypes {
         release {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.indywidualni.fblite"
-    android:versionCode="4"
-    android:versionName="1.5.0" >
+    android:versionCode="5"
+    android:versionName="1.5.1" >
 
     <uses-sdk
         android:minSdkVersion="14"

diff --git a/app/src/main/java/org/indywidualni/fblite/MyAppWebViewClient.java b/app/src/main/java/org/indywidualni/fblite/MyAppWebViewClient.java
@@ -23,9 +23,13 @@ public class MyAppWebViewClient extends WebViewClient {
     // get shared preferences
     final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
 
+    // get window's needed height
+    private static final float density = context.getResources().getDisplayMetrics().density;
+    private static final float height = (context.getResources().getDisplayMetrics().heightPixels - 48) / density - 44;
+
     // convert css file to string only one time
     private static String cssFile;
-    private static final String cssFixed = "#header{ position: fixed !important; z-index: 500; top: 0px; } #root{ padding-top: 44px; }";
+    private static final String cssFixed = "#header{ position: fixed; z-index: 11; top: 0px; } #root{ padding-top: 44px; } .flyout{ max-height: " + height + "px; overflow-y: scroll; }";
 
     @Override
     public boolean shouldOverrideUrlLoading(WebView view, String url) {
@@ -57,14 +61,14 @@ public void onPageFinished(WebView view, String url) {
                 cssFile = readRawTextFile(context, R.raw.black);
             view.loadUrl("javascript:function addStyleString(str) { var node = document.createElement('style'); node.innerHTML = str; document.body.appendChild(node); } addStyleString('" + cssFile + "');");
         }
-        // apply extra bottom padding for transparent navigation
-        if (preferences.getBoolean("transparent_nav", false)) {
-            view.loadUrl("javascript:function addStyleString(str) { var node = document.createElement('style'); node.innerHTML = str; document.body.appendChild(node); } addStyleString('body{ padding-bottom: 48px; }');");
-        }
         // blue navigation bar always on top
         if (preferences.getBoolean("fixed_nav", false)) {
             view.loadUrl("javascript:function addStyleString(str) { var node = document.createElement('style'); node.innerHTML = str; document.body.appendChild(node); } addStyleString('" + cssFixed + "');");
         }
+        // apply extra bottom padding for transparent navigation
+        if (preferences.getBoolean("transparent_nav", false)) {
+            view.loadUrl("javascript:function addStyleString(str) { var node = document.createElement('style'); node.innerHTML = str; document.body.appendChild(node); } addStyleString('body{ padding-bottom: 48px; }');");
+        }
     }
 
     // read raw files to string (for css files)