5 files changed, 39 insertions, 28 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5bb44c47..a2b2d7c0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -32,7 +32,7 @@
 
     </android.support.design.widget.AppBarLayout>
 
-    <android.support.v4.view.ViewPager
+    <com.pitchedapps.frost.views.FrostViewPager
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/iitem_context_menu.xml b/app/src/main/res/layout/iitem_context_menu.xml
new file mode 100644
index 00000000..30bd3034
--- /dev/null
+++ b/app/src/main/res/layout/iitem_context_menu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/item_context_text"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/context_menu_height"
+    android:gravity="center_vertical"
+    android:padding="@dimen/kau_padding_normal" />
+\ No newline at end of file
diff --git a/app/src/main/res/layout/item_about_links.xml b/app/src/main/res/layout/item_about_links.xml
index 52cf3f57..09c79f37 100644
--- a/app/src/main/res/layout/item_about_links.xml
+++ b/app/src/main/res/layout/item_about_links.xml
@@ -1,27 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-    A greatly compacted link layout with just the ids
-    The constraints are handled programmatically in AboutActivity
--->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--Just the container core so we can bind it to an AdapterItem-->
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/about_icons_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clickable="false"
-    android:padding="@dimen/kau_spacing_normal">
-
-    <ImageView
-        android:id="@+id/about_rate"
-        android:layout_width="@dimen/kau_avatar_bounds"
-        android:layout_height="@dimen/kau_avatar_bounds" />
-
-    <ImageView
-        android:id="@+id/about_reddit"
-        android:layout_width="@dimen/kau_avatar_bounds"
-        android:layout_height="@dimen/kau_avatar_bounds" />
-
-    <ImageView
-        android:id="@+id/about_github"
-        android:layout_width="@dimen/kau_avatar_bounds"
-        android:layout_height="@dimen/kau_avatar_bounds" />
-
-</android.support.constraint.ConstraintLayout>
-\ No newline at end of file
+    android:padding="@dimen/kau_spacing_normal" />
+\ No newline at end of file
diff --git a/app/src/main/res/layout/swipe_webview.xml b/app/src/main/res/layout/swipe_webview.xml
index 12bccf11..d7a33d5b 100644
--- a/app/src/main/res/layout/swipe_webview.xml
+++ b/app/src/main/res/layout/swipe_webview.xml
@@ -27,9 +27,4 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top" />
-
-    <com.pitchedapps.frost.web.FrostWebContextMenu
-        android:id="@+id/context_menu"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
 </FrameLayout>
 \ No newline at end of file
diff --git a/app/src/main/res/layout/web_context_menu.xml b/app/src/main/res/layout/web_context_menu.xml
new file mode 100644
index 00000000..d5f80c0f
--- /dev/null
+++ b/app/src/main/res/layout/web_context_menu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/menu_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/kau_shadow_overlay"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:visibility="gone"
+    android:padding="@dimen/kau_padding_normal">
+
+    <TextView
+        android:id="@+id/menu_url"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/kau_padding_normal" />
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/menu_recycler"
+        android:layout_width="match_parent"
+        android:visibility="gone"
+        android:layout_height="wrap_content"
+        app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
+
+</LinearLayout>
+\ No newline at end of file