Fixed Language Fliper

3 files changed, 43 insertions, 19 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 20aa319..a31be8d 100644
--- a/app/src/main/java/com/softwarefools/nik/spiritlevel/LevelActivity.java
+++ b/app/src/main/java/com/softwarefools/nik/spiritlevel/LevelActivity.java
@@ -1,5 +1,6 @@
 package com.softwarefools.nik.spiritlevel;
 
+import java.sql.Array;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -93,7 +94,9 @@ public class LevelActivity extends Activity implements MySensorListener{
 
 
 		mySettings = PreferenceManager.getDefaultSharedPreferences(this);
-
+		SharedPreferences.Editor editor = mySettings.edit();
+		editor.putBoolean("applicationRecording", false);
+		editor.commit();
 		//Fragments
 		//getFragmentManager().beginTransaction().replace(android.R.id.content, new PrefsFragment()).commit();
 		/*FragmentManager mFragmentManager = getFragmentManager();
@@ -105,14 +108,14 @@ public class LevelActivity extends Activity implements MySensorListener{
 
 
 		r = new Random();
-		mysupplangs = new ArrayList<String>();
+		/*mysupplangs = new ArrayList<String>();
 		mysupplangs.add("de");
 		mysupplangs.add("en");
 		mysupplangs.add("es");
 		mysupplangs.add("pl");
 		mysupplangs.add("ru");
 		mysupplangs.add("fr");
-		mysupplangs.add("it");
+		mysupplangs.add("it");*/
 
 		t1=new TextToSpeech(getApplicationContext(), new TextToSpeech.OnInitListener() {
 			@Override
@@ -249,9 +252,8 @@ public class LevelActivity extends Activity implements MySensorListener{
 					editor.commit();
 				} else {
 					beLoud(this.getString(R.string.action_record_text_off));
-					SharedPreferences.Editor editor = prefs.edit();
-					editor.putBoolean("applicationRecording", false);
-					editor.commit();
+
+
 
 					Toast.makeText(getBaseContext(), "Vector:"+accelvector.size()+"\n"+printVect(accelvector), Toast.LENGTH_SHORT).show();
 
@@ -275,11 +277,12 @@ public class LevelActivity extends Activity implements MySensorListener{
 			case R.id.action_changelang:
 				//t1.speak(this.getString(R.string.change_text), TextToSpeech.QUEUE_FLUSH, null);
 
+				String[] sf=getResources().getStringArray(R.array.langValues);
 				String comp=getResources().getConfiguration().locale.getLanguage();
 				String neus;
 				do {
-					int neur = r.nextInt(mysupplangs.size());
-					neus = mysupplangs.get(neur);
+					int neur = r.nextInt(sf.length);
+					neus = sf[neur];
 				}while(comp.contains(neus));
 
 				setLocale(neus);
@@ -421,7 +424,7 @@ public class LevelActivity extends Activity implements MySensorListener{
 		Intent refresh = new Intent(this, LevelActivity.class);
 		startActivity(refresh);
 		t1.setLanguage(getResources().getConfiguration().locale);
-		if(t1.isLanguageAvailable(getResources().getConfiguration().locale)<=TextToSpeech.LANG_MISSING_DATA) {
+		if(t1.isLanguageAvailable(getResources().getConfiguration().locale)<TextToSpeech.LANG_AVAILABLE) {
 			Toast.makeText(getBaseContext(), this.getString(R.string.action_lang_NA), Toast.LENGTH_LONG).show();
 		}
 		beLoud(this.getString(R.string.change_text));
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 237b4f2..fa7577e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,6 +11,11 @@
 
     <string name="lang_german">Deutsch</string>
     <string name="lang_english">English</string>
+    <string name="lang_spanish">Español</string>
+    <string name="lang_french">Français</string>
+    <string name="lang_italian">Italiano</string>
+    <string name="lang_polish">Polski</string>
+    <string name="lang_russian">Русский</string>
 
     <string name="settings_devname">Device Name</string>
     <string name="settings_devname_sum">Please provide Devices Name</string>
@@ -25,6 +30,11 @@
     <string name="setting_speak_sum">Let the System Talk to you</string>
     <string name="setting_write">Write</string>
     <string name="setting_write_sum">Recieve written Notes from the System</string>
-
+    <string name="settings_devweight">Device Weight</string>
+    <string name="settings_devweight_sum">Put in your devices weight in gramm</string>
+    <string name="settings_intent_bugreport">Report A Bug</string>
+    <string name="settings_intent_bugreport_sum">Redirect to the SF.com Mantis server</string>
+    <string name="settings_language">Select Language</string>
+    <string name="settings_language_sum">Select one of the available Languages</string>
 
 </resources>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index de13ed0..0a740ab 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -6,6 +6,17 @@
         <EditTextPreference android:title="@string/settings_devname"
             android:key="devicename"
             android:summary="@string/settings_devname_sum"></EditTextPreference>
+
+        <EditTextPreference android:title="@string/settings_devweight"
+            android:key="deviceweight"
+            android:summary="@string/settings_devweight_sum"></EditTextPreference>
+        <ListPreference     android:title="@string/settings_language"
+            android:summary="@string/settings_language_sum"
+            android:key="applicationLanguage"
+            android:defaultValue="de"
+            android:entries="@array/langlist"
+            android:entryValues="@array/langValues" />
+
         <CheckBoxPreference android:title="@string/setting_speak"
             android:defaultValue="true"
             android:summary="@string/setting_speak_sum"
@@ -15,16 +26,8 @@
             android:summary="@string/setting_write_sum"
             android:key="applicationWriting" />
     </PreferenceCategory>
-    <PreferenceCategory
-        android:title="@string/settings_recording_preferences">
 
-    <CheckBoxPreference android:title="@string/setting_recording"
-        android:defaultValue="false"
-        android:summary="@string/setting_recording_sum"
-        android:key="applicationRecording" />
-    </PreferenceCategory>
-    <PreferenceCategory
-        android:title="@string/settings_launch_preferences">
+    <PreferenceCategory android:title="@string/settings_launch_preferences">
     <PreferenceScreen
         android:title="@string/settings_intent_reset"
         android:summary="@string/settings_intent_reset_sum">
@@ -33,6 +36,14 @@
             android:data="http://www.android.com" />
 
     </PreferenceScreen>
+        <PreferenceScreen
+            android:title="@string/settings_intent_bugreport"
+            android:summary="@string/settings_intent_bugreport_sum">
+
+            <intent android:action="android.intent.action.VIEW"
+                android:data="https://secure.softwarefools.com/mantis/" />
+
+        </PreferenceScreen>
 
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file