Lots of theming and fixes

5 files changed, 35 insertions, 35 deletions

diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 5169e794..e82d1f44 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -5,13 +5,8 @@
 
     <item
         android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never" />
-    <item
-        android:id="@+id/action_changelog"
         android:orderInCategory="200"
-        android:title="@string/changelog"
-        app:showAsAction="never" />
+        android:title="@string/kau_settings"
+        app:showAsAction="always" />
 </menu>
 
diff --git a/app/src/main/res/menu/menu_settings.xml b/app/src/main/res/menu/menu_settings.xml
new file mode 100644
index 00000000..7ae59ad2
--- /dev/null
+++ b/app/src/main/res/menu/menu_settings.xml
@@ -0,0 +1,17 @@
+<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">
+
+    <item
+        android:id="@+id/action_email"
+        android:orderInCategory="100"
+        android:title="@string/kau_send_feedback"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/action_changelog"
+        android:orderInCategory="200"
+        android:title="@string/kau_changelog"
+        app:showAsAction="ifRoom" />
+</menu>
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c0d49bdd..977c83ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,9 +1,7 @@
 <resources>
-    <string name="action_settings">Settings</string>
+    <string name="dev_email" translatable="false">pitchedapps@gmail.com</string>
     <string name="section_format">Hello World from section: %1$d</string>
 
-    <string name="changelog">Changelog</string>
-    <string name="great">Great</string>
     <string name="feed">Feed</string>
     <string name="most_recent">Most Recent</string>
     <string name="top_stories">Top Stories</string>
@@ -20,37 +18,18 @@
     <string name="birthdays">Birthdays</string>
     <string name="chat">Chat</string>
     <string name="photos">Photos</string>
-    <string name="settings">Settings</string>
-    <string name="menu">Menu</string>
+    <string name="menu">@string/kau_menu</string>
+    <string name="settings">@string/kau_settings</string>
+    <string name="notes">Notes</string>
+    <string name="on_this_day">On This Day</string>
 
     <string name="loading_account">Getting everything ready…</string>
     <string name="welcome">Welcome %s</string>
-    <string name="login">Login</string>
     <string name="select_facebook_account">Select Facebook Account</string>
     <string name="account_not_found">Current account is not in the database</string>
-    <string name="logout">Logout</string>
-    <string name="logout_confirm">Are you sure you want to log out as %s?</string>
-    <string name="add_account">Add Account</string>
-    <string name="manage_account">Manage Account</string>
-    <string name="exit">Exit</string>
-    <string name="exit_confirmation">Are you sure you want to exit Frost?</string>
-    <string name="do_not_show_again">Don\'t show again</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
 
-    <string name="_default">Default</string>
-    <string name="light">Light</string>
-    <string name="dark">Dark</string>
-    <string name="amoled">AMOLED</string>
-    <string name="glass">Glass</string>
-    <string name="custom">Custom</string>
     <string name="frost_notifications">Frost Notifications</string>
     <string name="requires_custom_theme">Requires custom theme</string>
 
-    <string name="none">None</string>
-    <string name="x_minutes">%d minutes</string>
-    <string name="one_hour">1 hour</string>
-    <string name="x_hours">%d hours</string>
-    <string name="one_day">1 day</string>
-    <string name="x_days">%d days</string>
+    <string name="frost_feedback">Frost for Facebook: Feedback</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b999d606..cbea18c9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -32,6 +32,10 @@
         <item name="android:windowAnimationStyle">@style/KauSlideInFadeOut</item>
     </style>
 
+    <style name="FrostTheme.Settings" parent="FrostTheme">
+        <item name="android:windowAnimationStyle">@style/KauSlideInFadeOut</item>
+    </style>
+
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark" />
diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml
index fc87ce08..d0f7e50b 100644
--- a/app/src/main/res/xml/changelog.xml
+++ b/app/src/main/res/xml/changelog.xml
@@ -12,7 +12,12 @@
     <item text="Themed more components" />
     <item text="Separated independent web overlay from in app overlay" />
     <item text="Allow notifications from any account" />
-    <item text="" />
+    <item text="Smoothed transition from Settings and only restart when necessary" />
+    <item text="Add logout option from drawer" />
+    <item text="Added many more drawer urls" />
+    <item text="Added anonymous analytics" />
+    <item text="Moved settings to drawer" />
+    <item text="Added feedback option" />
     <item text="" />
     <item text="" />