1 files changed, 26 insertions, 3 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt
index 25c20594..fafcf7ae 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt
@@ -3,12 +3,17 @@ package com.pitchedapps.frost
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.support.v4.app.ActivityOptionsCompat
+import android.support.v4.content.ContextCompat
 import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.Toolbar
 import butterknife.ButterKnife
+import com.jude.swipbackhelper.SwipeBackHelper
 import com.pitchedapps.frost.utils.bindView
 import com.pitchedapps.frost.web.FrostWebView
+import com.pitchedapps.frost.web.FrostWebViewCore
+
 
 /**
  * Created by Allan Wang on 2017-06-01.
@@ -16,15 +21,15 @@ import com.pitchedapps.frost.web.FrostWebView
 class WebOverlayActivity : AppCompatActivity() {
 
     val toolbar: Toolbar by bindView(R.id.toolbar)
-    val refresh: SwipeRefreshLayout by bindView(R.id.swipe_refresh)
-    val web: FrostWebView by bindView(R.id.frost_webview)
+    val frostWeb:FrostWebView by bindView(R.id.frost_webview)
 
     companion object {
         private const val ARG_URL = "arg_url"
         fun newInstance(context: Context, url: String) {
             val intent = Intent(context, WebOverlayActivity::class.java)
             intent.putExtra(ARG_URL, url)
-            context.startActivity(intent)
+            val bundle = ActivityOptionsCompat.makeCustomAnimation(context, R.anim.slide_in_right, R.anim.slide_out_right).toBundle()
+            ContextCompat.startActivity(context, intent, bundle)
         }
     }
 
@@ -33,5 +38,23 @@ class WebOverlayActivity : AppCompatActivity() {
         setContentView(R.layout.activity_web_overlay)
         ButterKnife.bind(this)
         setSupportActionBar(toolbar)
+        frostWeb.baseUrl = intent.extras.getString(ARG_URL)
+        SwipeBackHelper.onCreate(this)
+        SwipeBackHelper.getCurrentPage(this)
+                .setSwipeBackEnable(true)
+                .setSwipeSensitivity(0.5f)
+                .setSwipeRelateEnable(true)
+                .setSwipeRelateOffset(300)
+    }
+
+    override fun onPostCreate(savedInstanceState: Bundle?) {
+        super.onPostCreate(savedInstanceState)
+        SwipeBackHelper.onPostCreate(this)
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        SwipeBackHelper.onDestroy(this)
+    }
+
 }
\ No newline at end of file