Apply application preferences.

app/src/main/res/drawable/ic_baseline_add_24.xml

@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/colorPrimary" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/colorPrimary"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>

app/src/main/res/drawable/ic_baseline_undo_24.xml

@@ -1,5 +1,11 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/colorPrimary" android:pathData="M12.5,8c-2.65,0 -5.05,0.99 -6.9,2.6L2,7v9h9l-3.62,-3.62c1.39,-1.16 3.16,-1.88 5.12,-1.88 3.54,0 6.55,2.31 7.6,5.5l2.37,-0.78C21.08,11.03 17.15,8 12.5,8z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/colorPrimary"
+        android:pathData="M12.5,8c-2.65,0 -5.05,0.99 -6.9,2.6L2,7v9h9l-3.62,-3.62c1.39,-1.16 3.16,-1.88 5.12,-1.88 3.54,0 6.55,2.31 7.6,5.5l2.37,-0.78C21.08,11.03 17.15,8 12.5,8z" />
 </vector>

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

@@ -7,11 +7,11 @@
         android:icon="@drawable/ic_baseline_undo_24"
         android:orderInCategory="5"
         android:title="@string/undo"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_clear"
-        android:icon="@drawable/ic_baseline_add_24"
         android:checkable="false"
+        android:icon="@drawable/ic_baseline_add_24"
         android:orderInCategory="10"
         android:title="@string/clear"
         app:showAsAction="ifRoom" />

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

@@ -15,4 +15,5 @@
     <string name="light">Hell</string>
     <string name="dark">Dunkel</string>
     <string name="settings">Einstellungen</string>
+    <string name="display">Anzeige</string>
 </resources>

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

@@ -14,12 +14,12 @@
 
     <!-- Language Preference -->
     <string-array name="language_entries">
-        <item>@string/german</item>
         <item>@string/english</item>
+        <item>@string/german</item>
     </string-array>
 
     <string-array name="language_values">
-        <item>german</item>
-        <item>english</item>
+        <item>en</item>
+        <item>de</item>
     </string-array>
 </resources>

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

@@ -3,6 +3,7 @@
     <string name="app_name" translatable="false">Tichu Counter</string>
     <string name="team_a" translatable="false">Team A</string>
     <string name="team_b" translatable="false">Team B</string>
+    <string name="title_activity_settings" translatable="false">SettingsActivity</string>
 
     <string name="clear">Start new game</string>
     <string name="undo">Undo last round</string>
@@ -18,21 +19,6 @@
     <string name="german">German</string>
     <string name="light">Light</string>
     <string name="dark">Dark</string>
-    <string name="title_activity_settings">SettingsActivity</string>
-
-    <!-- Preference Titles -->
-    <string name="messages_header">Messages</string>
-    <string name="sync_header">Sync</string>
-
-    <!-- Messages Preferences -->
-    <string name="signature_title">Your signature</string>
-    <string name="reply_title">Theme</string>
-
-    <!-- Sync Preferences -->
-    <string name="sync_title">Sync email periodically</string>
-    <string name="attachment_title">Download incoming attachments</string>
-    <string name="attachment_summary_on">Automatically download attachments for incoming emails
-    </string>
-    <string name="attachment_summary_off">Only download attachments when manually requested</string>
+    <string name="display">Display</string>
     <string name="settings">Settings</string>
 </resources>

app/src/main/res/xml/root_preferences.xml

@@ -1,6 +1,6 @@
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory app:title="@string/messages_header">
+    <PreferenceCategory app:title="@string/display">
 
         <ListPreference
             app:defaultValue="default"
@@ -20,7 +20,8 @@
             app:useSimpleSummaryProvider="true" />
 
         <SwitchPreferenceCompat
-            app:key="screen"
+            app:defaultValue="true"
+            app:key="screen_on"
             app:title="@string/keep_screen_on" />
 
     </PreferenceCategory>