From e1e3b178e8e4fb1e0058253f28ea530d43846d45 Mon Sep 17 00:00:00 2001
From: mmk2410 <marcelmichaelkapfer@yahoo.co.nz>
Date: Sat, 14 Feb 2015 18:45:28 +0100
Subject: [PATCH] Language Support

---
 .idea/workspace.xml                                  | 10 +++++++---
 .../de/marcelkapfer/morseconverter/MainActivity.java |  9 ++++++---
 app/src/main/res/values-de/strings.xml               |  9 +--------
 app/src/main/res/values/strings.xml                  | 12 +-----------
 4 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f8a2d0b..15ae446 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,7 +21,6 @@
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values-de/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values-de/strings.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="Morse Converter.iws" />
@@ -1133,7 +1132,11 @@
       <created>1423932347469</created>
       <updated>1423932347469</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="Better KitKat support">
+      <created>1423935864836</created>
+      <updated>1423935864836</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="ToolWindowManager">
@@ -1218,7 +1221,8 @@
       <TodoPanelSettings />
     </option>
     <MESSAGE value="Added the other sections" />
-    <option name="LAST_COMMIT_MESSAGE" value="Added the other sections" />
+    <MESSAGE value="Better KitKat support" />
+    <option name="LAST_COMMIT_MESSAGE" value="Better KitKat support" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
index 61319a3..d080a9a 100644
--- a/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
+++ b/app/src/main/java/de/marcelkapfer/morseconverter/MainActivity.java
@@ -1,5 +1,6 @@
 package de.marcelkapfer.morseconverter;
 
+import android.content.res.Resources;
 import android.os.Bundle;
 import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer;
 import it.neokree.materialnavigationdrawer.elements.MaterialSection;
@@ -11,12 +12,14 @@ public class MainActivity extends MaterialNavigationDrawer {
 
     @Override
     public void init(Bundle savedInstanceState) {
+        Resources res = getResources();
         writtenMorse = this.newSection("writtenMorse", new MainFragment());
-        normalMorse = this.newSection("Normal Morse", new MorseFragment());
-        about = this.newSection("About", new AboutFragment());
+        normalMorse = this.newSection(res.getString(R.string.normalMorse), new MorseFragment());
+        about = this.newSection(res.getString(R.string.about), new AboutFragment());
         this.addSection(writtenMorse);
         this.addSection(normalMorse);
-        this.addBottomSection(about);
+        this.addDivisor();
+        this.addSection(about);
         this.setDrawerHeaderImage(this.getResources().getDrawable(R.drawable.feature_graphics));
         allowArrowAnimation();
         this.disableLearningPattern();
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3a12140..3543255 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -45,12 +45,5 @@
         \n \nFehlender Code \nWenn du auf einen fehlenden Code aufmerksam geworden bist, dann schreibe eine Email an marcelmichaelkapfer@yahoo.co.nz.</string>
 
     <string name="about">Über</string>
-    
-        <string name="drawer_open">Navigationsmenü öffnen</string>
-    <string name="drawer_close">Navigationsmenü schließen</string>
-    <string-array name="menu_array">
-        <item>writtenMorse</item>
-        <item>Normal Morse</item>
-        <item>Über</item>
-    </string-array>
+    <string name="normalMorse">Normales Morse</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 09e29e2..ae64a58 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,15 +42,5 @@
         \n \nHow to \nYou can find a detailed guide on marcel-kapfer.de/projects/morse/index.html#howto_android
         \n \nMissing Code \nIf you discovered, that code is missing, then write me a mail to marcelmichaelkapfer@yahoo.co.nz and tell me about it.</string>
     <string name="about">About</string>
-    <string name="drawer_open">Open navigation drawer</string>
-    <string name="drawer_close">Close navigation drawer</string>
-
-    <string-array name="menu_array">
-        <item>writtenMorse</item>
-        <item>Normal Morse</item>
-        <item>About</item>
-    </string-array>
-
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-
+    <string name="normalMorse">Normal Morse</string>
 </resources>