cleanup

10 files changed, 92 insertions, 30 deletions

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3ea8f885..5e76ef5d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -121,7 +121,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 362ac6b8..c25418ad 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,7 +56,7 @@ dependencies {
     compile "com.jakewharton.timber:timber:${TIMBER}"
 
     //Dialog
-    compile "com.afollestad.material-dialogs:core:${MD}"
+    compile "com.afollestad.material-dialogs:core:${MATERIAL_DIALOG}"
 
     compile "com.github.Raizlabs.DBFlow:dbflow:${DBFLOW}"
     compile "com.github.Raizlabs.DBFlow:dbflow-core:${DBFLOW}"
@@ -103,11 +103,15 @@ dependencies {
     compile "com.github.bumptech.glide:glide:${GLIDE}"
     annotationProcessor "com.github.bumptech.glide:compiler:${GLIDE}"
 
-    compile "com.google.auto.value:auto-value:${AUTO}"
-    annotationProcessor "com.google.auto.value:auto-value:${AUTO}"
-    annotationProcessor "com.ryanharter.auto.value:auto-value-parcel:${AUTO_VALUE_PARCEL}"
+//    compile "com.google.auto.value:auto-value:${AUTO}"
+//    annotationProcessor "com.google.auto.value:auto-value:${AUTO}"
+//    annotationProcessor "com.ryanharter.auto.value:auto-value-parcel:${AUTO_VALUE_PARCEL}"
 
     compile "com.f2prateek.rx.preferences2:rx-preferences:${RX_PREFS}"
+
+    compile("com.mikepenz:materialdrawer:${MATERIAL_DRAWER}@aar") {
+        transitive = true
+    }
 }
 
 kapt {
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt
index 41de3578..2cf8cd5b 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt
@@ -12,6 +12,7 @@ import android.support.v7.widget.Toolbar
 import android.view.Menu
 import android.view.MenuItem
 import butterknife.ButterKnife
+import com.mikepenz.materialdrawer.Drawer
 import com.pitchedapps.frost.dbflow.loadFbTabs
 import com.pitchedapps.frost.dbflow.saveAsync
 import com.pitchedapps.frost.facebook.FbTab
@@ -28,6 +29,7 @@ class MainActivity : AppCompatActivity() {
     val viewPager: ViewPager by bindView(R.id.container)
     val fab: FloatingActionButton by bindView(R.id.fab)
     val tabs: TabLayout by bindView(R.id.tabs)
+    lateinit var drawer: Drawer
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -70,7 +72,8 @@ class MainActivity : AppCompatActivity() {
 //                finish()
             }
             R.id.action_changelog -> Changelog.show(this)
-            R.id.action_call -> {}
+            R.id.action_call -> {
+            }
             R.id.action_db -> adapter.pages.saveAsync(this)
             R.id.action_restart -> {
                 finish();
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt
new file mode 100644
index 00000000..25c20594
--- /dev/null
+++ b/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt
@@ -0,0 +1,37 @@
+package com.pitchedapps.frost
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.support.v4.widget.SwipeRefreshLayout
+import android.support.v7.app.AppCompatActivity
+import android.support.v7.widget.Toolbar
+import butterknife.ButterKnife
+import com.pitchedapps.frost.utils.bindView
+import com.pitchedapps.frost.web.FrostWebView
+
+/**
+ * Created by Allan Wang on 2017-06-01.
+ */
+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)
+
+    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)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_web_overlay)
+        ButterKnife.bind(this)
+        setSupportActionBar(toolbar)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt
index ba9584eb..f55579e0 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt
@@ -25,7 +25,7 @@ class WebFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener {
     }
 
     companion object {
-        private val ARG_URL = "arg_url"
+        private const val ARG_URL = "arg_url"
         fun newInstance(position: Int, url: String) = BaseFragment.newInstance(WebFragment(), position).putString(ARG_URL, url)
     }
 
diff --git a/app/src/main/res/layout/activity_web_overlay.xml b/app/src/main/res/layout/activity_web_overlay.xml
new file mode 100644
index 00000000..1e81dba7
--- /dev/null
+++ b/app/src/main/res/layout/activity_web_overlay.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".MainActivity">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:layout_scrollFlags="scroll|enterAlways"
+        app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    <include layout="@layout/swipe_webview" />
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/login_teest.xml b/app/src/main/res/layout/login_teest.xml
deleted file mode 100644
index 47e72acd..00000000
--- a/app/src/main/res/layout/login_teest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.facebook.login.widget.LoginButton
-        android:id="@+id/login_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="30dp"
-        android:layout_marginTop="30dp" />
-
-    <Button
-        android:id="@+id/switchh"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="switch" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml
index 58c3fd1d..8a46973a 100644
--- a/app/src/main/res/xml/changelog.xml
+++ b/app/src/main/res/xml/changelog.xml
@@ -7,5 +7,17 @@
     -->
 
     <version title="v0.1" />
-    <item text="Initial" />
+    <item text="Initial Changelog" />
+    <item text="Created core databases" />
+    <item text="Implemented CSS/Js injectors" />
+    <item text="Implemented ripple preferences" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
 </resources>
\ No newline at end of file
diff --git a/docs/Changelog.md b/docs/Changelog.md
index df173bb4..e984f383 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,4 +1,7 @@
 # Changelog
 
 ## v0.1
-* Initial
+* Initial Changelog
+* Created core databases
+* Implemented CSS/Js injectors
+* Implemented ripple preferences
diff --git a/gradle.properties b/gradle.properties
index d28c00b2..207290f0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,8 +19,10 @@ BUILD_TOOLS=25.0.2
 VERSION_CODE=1
 VERSION_NAME=0.1
 ANDROID_SUPPORT_LIBS=25.3.1
+
 TIMBER=4.5.1
-MD=0.9.4.3
+MATERIAL_DIALOG=0.9.4.3
+MATERIAL_DRAWER=5.9.2
 ICONICS=2.8.5
 IICON_GOOGLE=3.0.1.0
 IICON_MATERIAL=2.2.0.2