SettingsActivity now works properly

app/src/main/java/srct/whatsopen/views/activities/SettingsActivity.java

@@ -17,11 +17,9 @@ public class SettingsActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        setContentView(R.layout.activity_settings);
 
-        // Configure toolbar
-        Toolbar toolbar = ButterKnife.findById(this, R.id.toolbar);
-        setSupportActionBar(toolbar);
+        configureToolbar();
 
         getSupportFragmentManager().beginTransaction()
                 .replace(R.id.activity_settings, new SettingsFragment())
@@ -31,7 +29,8 @@ public class SettingsActivity extends AppCompatActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_main, menu);
+        getMenuInflater().inflate(R.menu.menu_settings, menu);
+
         return true;
     }
 
@@ -45,5 +44,16 @@ public class SettingsActivity extends AppCompatActivity {
                 return super.onOptionsItemSelected(item);
         }
     }
+
+    private void configureToolbar() {
+        Toolbar toolbar = ButterKnife.findById(this, R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        getSupportActionBar().setTitle("Settings");
+
+        // Display back button
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayShowHomeEnabled(true);
+    }
 }
 

app/src/main/res/menu/menu_detail.xml

@@ -13,4 +13,9 @@
         app:showAsAction="never"
         android:title="Settings"/>
 
+    <item
+        android:id="@+id/action_about"
+        app:showAsAction="never"
+        android:title="About"/>
+
 </menu>

app/src/main/res/menu/menu_settings.xml

+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_settings"
+        app:showAsAction="never"
+        android:title="About"/>
+
+</menu>
\ No newline at end of file

app/src/main/res/values-v21/styles.xml

@@ -9,6 +9,7 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:colorControlHighlight">@color/tabButtonPressed</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
     </style>
 
 </resources>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -5,14 +5,14 @@
 
     <!-- Strings from PreferenceFragment -->
     <string name="title_list_view">List View Preferences</string>
-    <string name="title_list_view_information">Duration Display</string>
+    <string name="title_list_view_information">Duration display</string>
     <string name="title_rotation">Rotation Preferences</string>
     <string name="title_turn_off_rotation">Turn off rotation</string>
     <string name="title_notification">Notification Preferences</string>
-    <string name="title_turn_off_notifications">Turn off rotation</string>
+    <string name="title_turn_off_vibrations">Turn off vibrations</string>
     <string-array name="entries_list_view_information_preference">
-        <item>Duration on Open Facilities</item>
-        <item>Duration on Closed Facilities</item>
+        <item>Only for open Facilities</item>
+        <item>Only for closed Facilities</item>
         <item>Both</item>
     </string-array>
     <string-array name="entryvalues_list_view_information_preference">

app/src/main/res/values/styles.xml

@@ -7,6 +7,7 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
     </style>
 
 </resources>

app/src/main/res/xml/settings.xml

@@ -26,8 +26,8 @@
         android:title="@string/title_notification">
 
         <CheckBoxPreference
-            android:key="turn_off_notifications_preference"
-            android:title="@string/title_turn_off_notifications" />
+            android:key="turn_off_vibrations_preference"
+            android:title="@string/title_turn_off_vibrations" />
 
     </PreferenceCategory>