Language Flipper

4 files changed, 37 insertions, 13 deletions

diff --git a/app/src/main/java/com/softwarefools/nik/spiritlevel/LevelActivity.java b/app/src/main/java/com/softwarefools/nik/spiritlevel/LevelActivity.java
index 6086f31..c0f517f 100644
--- a/app/src/main/java/com/softwarefools/nik/spiritlevel/LevelActivity.java
+++ b/app/src/main/java/com/softwarefools/nik/spiritlevel/LevelActivity.java
@@ -1,10 +1,14 @@
 package com.softwarefools.nik.spiritlevel;
 
 import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 
 
 import java.util.Locale;
+import java.util.Random;
+
 import android.os.Bundle;
 import android.app.Activity;
 import android.content.Intent;
@@ -48,6 +52,9 @@ public class LevelActivity extends Activity implements MySensorListener{
 	private TextView accelField;
 	private TextView gravityField;
 
+	private Random r;
+	public ArrayList<String> mysupplangs;
+
 	private Locale myLocale;
 
 
@@ -62,6 +69,14 @@ public class LevelActivity extends Activity implements MySensorListener{
 		levelView = new LevelView(this);
 	    setContentView(levelView);
 
+		r = new Random();
+		mysupplangs = new ArrayList<String>();
+		mysupplangs.add("de");
+		mysupplangs.add("en");
+		mysupplangs.add("es");
+		mysupplangs.add("pl");
+		mysupplangs.add("ru");
+
 
 		t1=new TextToSpeech(getApplicationContext(), new TextToSpeech.OnInitListener() {
 			@Override
@@ -165,6 +180,17 @@ public class LevelActivity extends Activity implements MySensorListener{
 
 			case R.id.action_changelang:
 				String comp=getResources().getConfiguration().locale.getLanguage();
+				String neus;
+				do {
+					int neur = r.nextInt(mysupplangs.size());
+					neus = mysupplangs.get(neur);
+				}while(comp.contains(neus));
+				setLocale(neus);
+				t1.speak(this.getString(R.string.change_text), TextToSpeech.QUEUE_FLUSH, null);
+
+
+				/*
+
 				if (comp.contains("en")) {
 
 					t1.speak(this.getString(R.string.change_text)+this.getString(R.string.change_german), TextToSpeech.QUEUE_FLUSH, null);
@@ -176,9 +202,7 @@ public class LevelActivity extends Activity implements MySensorListener{
 					//t1.setLanguage(Locale.ENGLISH);
 					setLocale("en");
 				}else t1.speak(this.getString(R.string.fuckoff), TextToSpeech.QUEUE_FLUSH, null);
-
-
-
+				*/
 				return true;
 			default:
 				return super.onOptionsItemSelected(item);
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ce9ca0c..37a365f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -9,10 +9,9 @@
     <string name="action_lang">Sprachwechsel</string>
     <string name="action_exit">Beenden</string>
 
-    <string name="change_text">Wechsele Sprache zu </string>
-    <string name="change_german">Deutsch</string>
-    <string name="change_english">Englisch</string>
+    <string name="change_text">Wechsele Sprache zu Deutsch</string>
+
     <string name="goodby">Danke dass sie Software Fools Software Verwenden!</string>
 
-    <string name="toast_force">Kraft detektiert! \n Kraft:</string>
+    <string name="toast_force">Beschleunigung detektiert! \n Kraft:</string>
 </resources>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 9704ddd..bb044b6 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -6,13 +6,12 @@
     
     <string name="alert">Attention! Thats about </string>
 
-    <string name="action_lang">Flip Language</string>
+    <string name="action_lang">Change Language</string>
     <string name="action_exit">Exit</string>
 
-    <string name="change_text">Changing Language to </string>
-    <string name="change_german">German</string>
-    <string name="change_english">English</string>
-    <string name="goodby">Thank You for Using Software Fools Software!</string>
+    <string name="change_text">Changing Language to English</string>
 
-    <string name="toast_force">Motion detected \n Force:</string>
+    <string name="goodby">Thank You for using Software Fools Software!    Which never fooled anybody</string>
+
+    <string name="toast_force">Accelleration detected \n Force:</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 17288e8..789db9f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,4 +9,6 @@
     <string name="newton_short">N</string>
     <string name="fuckoff">Fuck Off!</string>
 
+    <string name="lang_german">Deutsch</string>
+    <string name="lang_english">English</string>
 </resources>