From a7f7bb92793571d2a995e61d699a3a0474e2d860 Mon Sep 17 00:00:00 2001
From: Shenjun Ma <mashenjun0902@gmail.com>
Date: Wed, 2 Dec 2015 17:19:16 +0100
Subject: [PATCH 1/4] update

---
 .../main/java/com/leanote/android/ui/post/BlogHomeActivity.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java b/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java
index a78d392..4f36500 100644
--- a/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java
+++ b/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java
@@ -2,6 +2,7 @@
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.view.Window;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
@@ -14,6 +15,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         //setContentView(R.layout.activity_blog_home);
         WebView webview = new WebView(this);
+        this.requestWindowFeature(Window.FEATURE_NO_TITLE);
 
         webview.setWebViewClient(new WebViewClient() {
 

From 6bb47fb339565151b93811f9fc71d57cdddedac8 Mon Sep 17 00:00:00 2001
From: Shenjun Ma <mashenjun0902@gmail.com>
Date: Fri, 4 Dec 2015 15:14:42 +0100
Subject: [PATCH 2/4] improve the blogHomwView, scolling listener and hide/show
 toolbar

---
 .idea/gradle.xml                              |   2 +-
 app/src/main/AndroidManifest.xml              |   4 +-
 .../leanote/android/ui/ObservableWebView.java |  70 ++++++++
 .../leanote/android/ui/WebViewActivity.java   |  36 +---
 .../android/ui/post/BlogHomeActivity.java     | 168 ++++++++++++++++--
 app/src/main/res/layout/title_bar.xml         |   5 +-
 app/src/main/res/layout/webview.xml           |  39 ++--
 app/src/main/res/values/styles.xml            |  18 ++
 8 files changed, 273 insertions(+), 69 deletions(-)
 create mode 100644 app/src/main/java/com/leanote/android/ui/ObservableWebView.java

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0833b17..bd4202c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
-        <option name="gradleJvm" value="1.7" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 35d1bc8..af1fbe1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -109,7 +109,9 @@
             android:exported="true" >
         </service>
 
-        <activity android:name=".ui.post.BlogHomeActivity" >
+        <activity
+            android:theme="@style/BlogHomeView"
+            android:name=".ui.post.BlogHomeActivity" >
         </activity>
     </application>
 
diff --git a/app/src/main/java/com/leanote/android/ui/ObservableWebView.java b/app/src/main/java/com/leanote/android/ui/ObservableWebView.java
new file mode 100644
index 0000000..90d8886
--- /dev/null
+++ b/app/src/main/java/com/leanote/android/ui/ObservableWebView.java
@@ -0,0 +1,70 @@
+package com.leanote.android.ui;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.webkit.WebView;
+
+/**
+ * Created by mashenjun on 3-12-15.
+ */
+public class ObservableWebView extends WebView {
+
+    private OnScrollChangedCallback mOnScrollChangedCallback;
+
+    public ObservableWebView(final Context context) {
+        super(context);
+    }
+
+    public ObservableWebView(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ObservableWebView(final Context context, final AttributeSet attrs,
+                             final int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onScrollChanged(final int l, final int t, final int oldl,
+                                   final int oldt) {
+        super.onScrollChanged(l, t, oldl, oldt);
+
+        float webcontent = getContentHeight() * (getResources().getDisplayMetrics().density);// webview的高度
+        float webnow = getHeight() + getScrollY();// 当前webview的高度
+        Log.i(this.getClass().getSimpleName(),"para "+webcontent+" "+webnow);
+
+        if (mOnScrollChangedCallback != null) {
+
+            if (Math.abs(webcontent - webnow) < 1) {
+                // 已经处于底端
+                // Log.i("TAG1", "已经处于底端");
+                mOnScrollChangedCallback.onPageEnd(l, t, oldl, oldt);
+            } else if (getScrollY() == 0) {
+                // Log.i("TAG1", "已经处于顶端");
+                mOnScrollChangedCallback.onPageTop(l, t, oldl, oldt);
+            }
+            else {
+                mOnScrollChangedCallback.onScroll(l - oldl, t - oldt);
+            }
+        }
+    }
+
+    public OnScrollChangedCallback getOnScrollChangedCallback() {
+        return mOnScrollChangedCallback;
+    }
+
+    public void setOnScrollChangedCallback(
+            final OnScrollChangedCallback onScrollChangedCallback) {
+        mOnScrollChangedCallback = onScrollChangedCallback;
+    }
+
+    /**
+     * Impliment in the activity/fragment/view that you want to listen to the webview
+     */
+    public static interface OnScrollChangedCallback {
+        public void onScroll(int dx, int dy);
+        public void onPageEnd(int l, int t, int oldl, int oldt);
+        public void onPageTop(int l, int t, int oldl, int oldt);
+    }
+}
diff --git a/app/src/main/java/com/leanote/android/ui/WebViewActivity.java b/app/src/main/java/com/leanote/android/ui/WebViewActivity.java
index 6c120f4..8b81ff0 100644
--- a/app/src/main/java/com/leanote/android/ui/WebViewActivity.java
+++ b/app/src/main/java/com/leanote/android/ui/WebViewActivity.java
@@ -3,53 +3,25 @@
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.Window;
 import android.webkit.WebView;
 
-import com.leanote.android.R;
-
 /**
  * Basic activity for displaying a WebView.
  */
 public abstract class WebViewActivity extends AppCompatActivity {
     /** Primary webview used to display content. */
 
-    private static final String URL = "url";
+    protected static String URL = "";
 
     protected WebView mWebView;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        supportRequestWindowFeature(Window.FEATURE_PROGRESS);
-
+//        supportRequestWindowFeature(Window.FEATURE_PROGRESS);
+//
         super.onCreate(savedInstanceState);
-
-        // clear title text so there's no title until actual web page title can be shown
-        // this is done here rather than in the manifest to automatically handle descendants
-        // such as AuthenticatedWebViewActivity
-        setTitle("");
-
-        setContentView(R.layout.webview);
-
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayShowTitleEnabled(true);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        // note: do NOT call mWebView.getSettings().setUserAgentString(WordPress.getUserAgent())
-        // here since it causes problems with the browser-sniffing that some sites rely on to
-        // format the page for mobile display
-        mWebView = (WebView) findViewById(R.id.webView);
-        mWebView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);
-
-        // load URL if one was provided in the intent
-        String url = getIntent().getStringExtra(URL);
-        if (url != null) {
-            loadUrl(url);
-        }
+//
     }
 
     @Override
diff --git a/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java b/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java
index 68e4600..318ebc5 100644
--- a/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java
+++ b/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java
@@ -1,39 +1,169 @@
 package com.leanote.android.ui.post;
 
+import android.animation.ObjectAnimator;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.animation.Animation;
+import android.view.animation.Transformation;
 import android.webkit.WebView;
-import android.webkit.WebViewClient;
+import android.widget.FrameLayout;
 
+import com.leanote.android.R;
 import com.leanote.android.model.AccountHelper;
+import com.leanote.android.ui.ObservableWebView;
+import com.leanote.android.ui.WebViewActivity;
+
+
+public class BlogHomeActivity extends WebViewActivity {
+    private String username;
+    private FrameLayout webview_wrapper ;
+    private Toolbar toolbar ;
+    private Boolean hasMeasured = false;
+    private Boolean isTopHide = false;
+    static long TIME_ANIMATION =1000;
+    static String Url ;
+
 
-public class BlogHomeActivity extends AppCompatActivity {
-    String userid;
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.webview);
+        setTitle("Blog");
+        webview_wrapper =  (FrameLayout) findViewById(R.id.webview_wrapper);
+
+
+        toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayShowTitleEnabled(true);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        // note: do NOT call mWebView.getSettings().setUserAgentString(WordPress.getUserAgent())
+        // here since it causes problems with the browser-sniffing that some sites rely on to
+        // format the page for mobile display
+        mWebView = (WebView) this.findViewById(R.id.webView);
+        mWebView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);
+
+        ViewTreeObserver viewTreeObserver = webview_wrapper.getViewTreeObserver();
+        viewTreeObserver.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+            @Override
+            public boolean onPreDraw() {
+
+                if (!hasMeasured) {
+                    FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(FrameLayout
+                            .LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
+                    layoutParams.setMargins(0,toolbar.getHeight(), 0, 0);
+                    mWebView.setLayoutParams(layoutParams);
+
+                    hasMeasured = true;
+                }
+                return true;
+            }
+        });
+
 
 
+        ((ObservableWebView)mWebView).setOnScrollChangedCallback(new ObservableWebView.OnScrollChangedCallback() {
+            public void onScroll(int dx, int dy) {
 
-        //this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                //这里我们根据dx和dy参数做自己想做的事情
+                if (dy > 100 && isTopHide == false) {
 
-        WebView webview = new WebView(this);
+                    hideTop();
 
-        webview.setWebViewClient(new WebViewClient() {
+                }
+            }
 
             @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                // TODO Auto-generated method stub
-                view.loadUrl(url);
-                return true;
+            public void onPageEnd(int l, int t, int oldl, int oldt) {
+
+            }
+
+            @Override
+            public void onPageTop(int l, int t, int oldl, int oldt) {
+                if (isTopHide == true) {
+
+                    showTop();
+
+                }
             }
         });
 
-        webview.getSettings().setJavaScriptEnabled(true);
-        userid = AccountHelper.getDefaultAccount().getmUserName();
-        Log.i("userid",userid);
-        webview.loadUrl("http://blog.leanote.com/"+userid);
-        setContentView(webview);
+        // load URL if one was provided in the intent
+        username=AccountHelper.getDefaultAccount().getmUserName();
+        Url = "http://blog.leanote.com/" + username;
+        if (Url != null) {
+            mWebView.loadUrl(Url);
+        }
+    }
+
+
+
+
+    private void showTop() {
+        //toolbar.animate().translationY(0).setInterpolator(new DecelerateInterpolator(2));
+
+        ObjectAnimator anim1 = ObjectAnimator.ofFloat(toolbar, "y", toolbar.getY(),
+                0);
+        anim1.setDuration(TIME_ANIMATION-200);
+        anim1.start();
+//
+//
+//        ObjectAnimator anim4 = ObjectAnimator.ofFloat(mWebView, "y", mWebView.getY(),
+//                0);
+//        anim4.setDuration(TIME_ANIMATION);
+//        anim4.start();
+
+
+        final int topmatgin = toolbar.getHeight();
+        Animation a = new Animation() {
+
+            @Override
+            protected void applyTransformation(float interpolatedTime, Transformation t) {
+                FrameLayout.LayoutParams params = (FrameLayout.LayoutParams)mWebView.getLayoutParams();
+                params.topMargin = (int)(topmatgin * interpolatedTime);
+                mWebView.setLayoutParams(params);
+            }
+        };
+        a.setDuration(TIME_ANIMATION); // in ms
+        mWebView.startAnimation(a);
+
+
+        isTopHide = false;
+    }
+
+
+    /**
+     * 隐藏上部的布局
+     */
+    private void hideTop() {
+
+        //toolbar.animate().translationY(-toolbar.getHeight()).setInterpolator(new AccelerateInterpolator(2)).start();
+
+        ObjectAnimator anim1 = ObjectAnimator.ofFloat(toolbar, "y", 0,
+                -toolbar.getHeight());
+        anim1.setDuration(TIME_ANIMATION+200);
+        anim1.start();
+//
+//        Log.i(this.getClass().getSimpleName(), "para " + mWebView.getY() + " " + webview_wrapper.getY());
+//        ObjectAnimator anim4 = ObjectAnimator.ofFloat(mWebView, "y",  mWebView.getY(),
+//                0);
+//        anim4.setDuration(TIME_ANIMATION);
+//        anim4.start();
+
+        final int topmatgin = 0;
+        Animation a = new Animation() {
+
+            @Override
+            protected void applyTransformation(float interpolatedTime, Transformation t) {
+                FrameLayout.LayoutParams params = (FrameLayout.LayoutParams)mWebView.getLayoutParams();
+                params.topMargin = (int)(topmatgin * interpolatedTime);
+                mWebView.setLayoutParams(params);
+            }
+        };
+        a.setDuration(TIME_ANIMATION); // in ms
+        mWebView.startAnimation(a);
+
+        isTopHide = true;
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/title_bar.xml b/app/src/main/res/layout/title_bar.xml
index 88db546..c60ce40 100644
--- a/app/src/main/res/layout/title_bar.xml
+++ b/app/src/main/res/layout/title_bar.xml
@@ -11,6 +11,9 @@
         android:text=""
         android:textColor="#fff"
         android:textSize="20sp"
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        android:id = "@+id/title_bar"
+        />
+
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/webview.xml b/app/src/main/res/layout/webview.xml
index c0a865d..d5118ec 100644
--- a/app/src/main/res/layout/webview.xml
+++ b/app/src/main/res/layout/webview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/webview_wrapper"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -8,19 +8,28 @@
         layout="@layout/toolbar"
         android:id="@+id/toolbar" />
 
-    <WebView
-        android:id="@+id/webView"
-        android:layout_below="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
 
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        style="@android:style/Widget.ProgressBar.Horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/progress_bar_height"
-        android:indeterminate="false"
-        android:layout_alignTop="@+id/webView"
-        android:progressDrawable="@drawable/progressbar_horizontal" />
+        <!--<FrameLayout-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:orientation="vertical"-->
+            <!--android:gravity="top">-->
 
-</RelativeLayout>
\ No newline at end of file
+            <com.leanote.android.ui.ObservableWebView
+                android:id="@+id/webView"
+                android:layout_below="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                />
+
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                style="@android:style/Widget.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/progress_bar_height"
+                android:indeterminate="false"
+                android:layout_alignTop="@+id/webView"
+                android:progressDrawable="@drawable/progressbar_horizontal" />
+        <!--</FrameLayout>-->
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4a6d582..38f7a45 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -341,6 +341,24 @@
         <item name="android:textColor">@color/white</item>
     </style>
 
+    <style name="BlogHomeView" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">@color/color_primary</item>
+        <item name="colorPrimaryDark">@color/color_primary_dark</item>
+        <item name="colorAccent">@color/color_accent</item>
+        <item name="colorControlActivated">@color/color_control_activated</item>
+        <item name="colorControlHighlight">@color/color_control_highlight</item>
+
+        <item name="android:windowBackground">@color/grey_lighten_30</item>
+        <item name="android:actionBarItemBackground">@drawable/selectable_background_leanote</item>
+        <item name="android:popupMenuStyle">@style/PopupMenu.Leanote</item>
+        <item name="android:dropDownListViewStyle">@style/DropDownListView.Light.Leanote</item>
+        <item name="android:actionDropDownStyle">@style/DropDownNav.Leanote</item>
+        <item name="android:actionModeCloseButtonStyle">@style/ActionButton.CloseMode.Leanote</item>
+        <item name="android:actionModeBackground">@color/color_primary_dark</item>
+        <item name="android:actionBarTabTextStyle">@style/TabTextStyle.Leanote</item>
+        <item name="android:actionBarTabBarStyle">@style/TabBarStyle.Leanote</item>
+        <item name="windowActionModeOverlay">true</item>
+    </style>
 
 
 </resources>

From f8bae1be1674280011f1d6f31368c441b0fdfc86 Mon Sep 17 00:00:00 2001
From: Shenjun Ma <mashenjun0902@gmail.com>
Date: Fri, 4 Dec 2015 15:39:53 +0100
Subject: [PATCH 3/4] need test when the webview hit the bottom

---
 .../main/java/com/leanote/android/ui/post/BlogHomeActivity.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java b/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java
index b13745a..924e0b1 100644
--- a/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java
+++ b/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java
@@ -23,6 +23,7 @@ public class BlogHomeActivity extends WebViewActivity {
     private Toolbar toolbar ;
     private Boolean hasMeasured = false;
     private Boolean isTopHide = false;
+    private Boolean isTop = true;
     static long TIME_ANIMATION =1000;
     static String Url ;
 

From b507608a2bbf9a1ffb96d16e83d26a0a82be4055 Mon Sep 17 00:00:00 2001
From: yunlu-amber <luyun1991sea@gmail.com>
Date: Tue, 8 Dec 2015 20:21:21 +0100
Subject: [PATCH 4/4] change the param for TIME_ANIMATION

---
 .../java/com/leanote/android/ui/post/BlogHomeActivity.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java b/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java
index 924e0b1..ddb485c 100644
--- a/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java
+++ b/app/src/main/java/com/leanote/android/ui/post/BlogHomeActivity.java
@@ -24,7 +24,7 @@ public class BlogHomeActivity extends WebViewActivity {
     private Boolean hasMeasured = false;
     private Boolean isTopHide = false;
     private Boolean isTop = true;
-    static long TIME_ANIMATION =1000;
+    static long TIME_ANIMATION =600;
     static String Url ;
 
 
@@ -109,7 +109,7 @@ private void showTop() {
 
         ObjectAnimator anim1 = ObjectAnimator.ofFloat(toolbar, "y", toolbar.getY(),
                 0);
-        anim1.setDuration(TIME_ANIMATION-200);
+        anim1.setDuration(TIME_ANIMATION);
         anim1.start();
 //
 //
@@ -146,7 +146,7 @@ private void hideTop() {
 
         ObjectAnimator anim1 = ObjectAnimator.ofFloat(toolbar, "y", 0,
                 -toolbar.getHeight());
-        anim1.setDuration(TIME_ANIMATION+200);
+        anim1.setDuration(TIME_ANIMATION);
         anim1.start();
 //
 //        Log.i(this.getClass().getSimpleName(), "para " + mWebView.getY() + " " + webview_wrapper.getY());