From 2fe3422895c19d93fdb515b72ae497f4263e77bc Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 16 Sep 2017 20:53:49 -0400
Subject: Feature/contextual overlays (#295)

* Update theme

* Update theme

* Compile compacts

* Update changelog

* Update theme

* Add overlay context items and their bindings

* Replace default with null and add changelog
---
 app/src/main/res/menu/menu_main.xml     | 2 +-
 app/src/main/res/menu/menu_settings.xml | 2 +-
 app/src/main/res/menu/menu_web.xml      | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'app/src/main/res/menu')

diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 3063ffec..8c6d3b34 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,7 +1,7 @@
 <menu 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"
-    tools:context="com.pitchedapps.myapplication.MainActivity">
+    tools:context="com.pitchedapps.frost.activities.MainActivity">
 
     <item
         android:id="@+id/action_search"
diff --git a/app/src/main/res/menu/menu_settings.xml b/app/src/main/res/menu/menu_settings.xml
index 7ae59ad2..d8348af4 100644
--- a/app/src/main/res/menu/menu_settings.xml
+++ b/app/src/main/res/menu/menu_settings.xml
@@ -1,7 +1,7 @@
 <menu 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"
-    tools:context="com.pitchedapps.myapplication.MainActivity">
+    tools:context="com.pitchedapps.frost.activities.SettingsActivity">
 
     <item
         android:id="@+id/action_email"
diff --git a/app/src/main/res/menu/menu_web.xml b/app/src/main/res/menu/menu_web.xml
index 833e7c27..5baefa1b 100644
--- a/app/src/main/res/menu/menu_web.xml
+++ b/app/src/main/res/menu/menu_web.xml
@@ -1,8 +1,7 @@
 <menu 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"
-    tools:context="com.pitchedapps.myapplication.MainActivity">
-
+    tools:context="com.pitchedapps.frost.activities.WebOverlayActivity">
 
     <item
         android:id="@+id/action_copy_link"
@@ -14,6 +13,6 @@
         android:id="@+id/action_share"
         android:orderInCategory="200"
         android:title="@string/kau_share"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
 </menu>
 
-- 
cgit v1.2.3