Update themes

src/main/java/org/billthefarmer/tuner/Tuner.java

@@ -327,7 +327,7 @@ protected void onCreate(Bundle savedInstanceState)
             break;
         }
 
-        setContentView(R.layout.activity_main);
+        setContentView(R.layout.main);
 
         // Find the views, not all may be present
         spectrum = findViewById(R.id.spectrum);
@@ -384,7 +384,7 @@ public boolean onCreateOptionsMenu(Menu menu)
         // Inflate the menu; this adds items to the action bar if it
         // is present.
         MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.activity_main, menu);
+        inflater.inflate(R.menu.main, menu);
 
         return true;
     }

src/main/res/menu-land/main.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item
+      android:id="@+id/help"
+      android:icon="?attr/help"
+      android:showAsAction="ifRoom"
+      android:title="@string/help" />
+
+  <item
+      android:id="@+id/settings"
+      android:icon="?attr/settings"
+      android:showAsAction="ifRoom"
+      android:title="@string/settings" />
+
+</menu>

src/main/res/menu-large/main.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item
+      android:id="@+id/help"
+      android:icon="?attr/help"
+      android:showAsAction="ifRoom"
+      android:title="@string/help" />
+
+  <item
+      android:id="@+id/settings"
+      android:icon="?attr/settings"
+      android:showAsAction="ifRoom"
+      android:title="@string/settings" />
+
+</menu>

src/main/res/menu/main.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item
+      android:id="@+id/help"
+      android:icon="?attr/help"
+      android:showAsAction="never"
+      android:title="@string/help" />
+
+  <item
+      android:id="@+id/settings"
+      android:icon="?attr/settings"
+      android:showAsAction="never"
+      android:title="@string/settings" />
+
+</menu>

src/main/res/values/attrs.xml

@@ -13,6 +13,9 @@
         <attr name="TextColour" format="reference" />
         <attr name="BackgroundColour" format="reference" />
 
+        <attr name="help" format="reference" />
+        <attr name="settings" format="reference" />
+
         <attr name="screen" format="reference" />
         <attr name="lock" format="reference" />
 

src/main/res/values/styles.xml

@@ -39,6 +39,9 @@
     <item name="lock">@drawable/ic_action_secure</item>
     <item name="screen">@drawable/ic_action_brightness_low</item>
 
+    <item name="help">@drawable/ic_action_help</item>
+    <item name="settings">@drawable/ic_action_settings</item>
+
     <item name="pref_about">@drawable/ic_action_about</item>
     <item name="pref_bach">@drawable/ic_action_previous_item</item>
     <item name="pref_down">@drawable/ic_action_reply_all</item>
@@ -67,6 +70,9 @@
     <item name="lock">@drawable/ic_action_secure_dark</item>
     <item name="screen">@drawable/ic_action_brightness_low_dark</item>
 
+    <item name="help">@drawable/ic_action_help</item>
+    <item name="settings">@drawable/ic_action_settings</item>
+
     <item name="pref_about">@drawable/ic_action_about_dark</item>
     <item name="pref_bach">@drawable/ic_action_previous_item_dark</item>
     <item name="pref_down">@drawable/ic_action_reply_all_dark</item>
@@ -95,6 +101,9 @@
     <item name="lock">@drawable/ic_action_secure_dark</item>
     <item name="screen">@drawable/ic_action_brightness_low_dark</item>
 
+    <item name="help">@drawable/ic_action_help</item>
+    <item name="settings">@drawable/ic_action_settings</item>
+
     <item name="pref_about">@drawable/ic_action_about_dark</item>
     <item name="pref_bach">@drawable/ic_action_previous_item_dark</item>
     <item name="pref_down">@drawable/ic_action_reply_all_dark</item>
@@ -129,6 +138,9 @@
     <item name="lock">@drawable/ic_action_secure</item>
     <item name="screen">@drawable/ic_action_brightness_low</item>
 
+    <item name="help">@drawable/ic_action_help_light</item>
+    <item name="settings">@drawable/ic_action_settings_light</item>
+
     <item name="pref_about">@drawable/ic_action_about</item>
     <item name="pref_bach">@drawable/ic_action_previous_item</item>
     <item name="pref_down">@drawable/ic_action_reply_all</item>