From ac11e7d167d973e38adca147ee881ceb2ade3549 Mon Sep 17 00:00:00 2001 From: Nikolaus Gotsche Date: Wed, 2 Dec 2015 01:11:10 +0100 Subject: Solved Language Issues --- .../nik/spiritlevel/LevelActivity.java | 74 ++++++++++++++++++++-- .../softwarefools/nik/spiritlevel/nikVector.java | 7 ++ app/src/main/res/values-de/strings.xml | 2 + app/src/main/res/values-en/strings.xml | 3 + app/src/main/res/values-es/strings.xml | 2 + app/src/main/res/values-pl/strings.xml | 3 + 6 files changed, 84 insertions(+), 7 deletions(-) (limited to 'app/src/main') 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 6875f54..20aa319 100644 --- a/app/src/main/java/com/softwarefools/nik/spiritlevel/LevelActivity.java +++ b/app/src/main/java/com/softwarefools/nik/spiritlevel/LevelActivity.java @@ -2,6 +2,7 @@ package com.softwarefools.nik.spiritlevel; import java.text.DecimalFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.List; import java.util.Locale; @@ -110,7 +111,8 @@ public class LevelActivity extends Activity implements MySensorListener{ mysupplangs.add("es"); mysupplangs.add("pl"); mysupplangs.add("ru"); - + mysupplangs.add("fr"); + mysupplangs.add("it"); t1=new TextToSpeech(getApplicationContext(), new TextToSpeech.OnInitListener() { @Override @@ -133,6 +135,9 @@ public class LevelActivity extends Activity implements MySensorListener{ setLocale(setlang); } //t1.setLanguage(getResources().getConfiguration().locale); + + accelvector= new Vector(); + gravvector = new Vector(); } } }); @@ -238,16 +243,23 @@ public class LevelActivity extends Activity implements MySensorListener{ //Toast.makeText(getBaseContext(), "Setting on Recording:"+prefs.getBoolean("applicationRecording",true), Toast.LENGTH_SHORT).show(); if (!prefs.getBoolean("applicationRecording",true)) { Boolean a= prefs.getBoolean("applicationRecording",false); - beLoud(this.getString(R.string.action_record_text),a.toString()); + beLoud(this.getString(R.string.action_record_text)); SharedPreferences.Editor editor = prefs.edit(); editor.putBoolean("applicationRecording",true); 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(); + // Save The DATA + + //dump the vectors + accelvector.clear(); + gravvector.clear(); } @@ -262,6 +274,7 @@ 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 comp=getResources().getConfiguration().locale.getLanguage(); String neus; do { @@ -287,6 +300,12 @@ public class LevelActivity extends Activity implements MySensorListener{ // TODO Auto-generated method stub float sq= (float)x*x+y*y+z*z; float sum=(float)Math.sqrt(sq); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + + nikVector temp=new nikVector(); + temp.setVector(getTime(),x/sum,y/sum,z/sum); + if(prefs.getBoolean("applicationRecording",true))gravvector.add(temp); + levelView.updateData(x/sum, y/sum, z/sum,orientation); } @@ -295,6 +314,11 @@ public class LevelActivity extends Activity implements MySensorListener{ // TODO Auto-generated method stub float sq= (float)x*x+y*y+z*z; float sum=(float)Math.sqrt(sq); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + + nikVector temp=new nikVector(); + temp.setVector(getTime(),x/sum,y/sum,z/sum); + if(prefs.getBoolean("applicationRecording",true))accelvector.add(temp); levelView.updateAccelData(x/sum, y/sum, z/sum,orientation); } @@ -397,6 +421,9 @@ 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) { + Toast.makeText(getBaseContext(), this.getString(R.string.action_lang_NA), Toast.LENGTH_LONG).show(); + } beLoud(this.getString(R.string.change_text)); //t1.speak(this.getString(R.string.change_text), TextToSpeech.QUEUE_FLUSH, null); setupActionBar(); @@ -405,20 +432,53 @@ public class LevelActivity extends Activity implements MySensorListener{ } public void beLoud(String whatsay,String whatwrite){ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - if(prefs.getBoolean("applicationWriting",true))Toast.makeText(getBaseContext(), whatwrite, Toast.LENGTH_LONG).show(); - if(prefs.getBoolean("applicationTalking",true))t1.speak(whatsay, TextToSpeech.QUEUE_FLUSH, null); + if(t1.isLanguageAvailable(getResources().getConfiguration().locale)>TextToSpeech.LANG_MISSING_DATA) { + t1.setLanguage(getResources().getConfiguration().locale); + + if(prefs.getBoolean("applicationTalking",true))t1.speak(whatsay, TextToSpeech.QUEUE_FLUSH, null); + } + if (prefs.getBoolean("applicationWriting", true))Toast.makeText(getBaseContext(), whatwrite, Toast.LENGTH_LONG).show(); } public void beLoud(String what){ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - if(prefs.getBoolean("applicationWriting",true))Toast.makeText(getBaseContext(), what, Toast.LENGTH_LONG).show(); - if(prefs.getBoolean("applicationTalking",true))t1.speak(what, TextToSpeech.QUEUE_FLUSH, null); + if(t1.isLanguageAvailable(getResources().getConfiguration().locale)>TextToSpeech.LANG_MISSING_DATA) { + + t1.setLanguage(getResources().getConfiguration().locale); + + if(prefs.getBoolean("applicationTalking",true))t1.speak(what, TextToSpeech.QUEUE_FLUSH, null); + + } + + if (prefs.getBoolean("applicationWriting", true))Toast.makeText(getBaseContext(), what, Toast.LENGTH_SHORT).show(); + + } + public String printVect(Vector v){ + String str=""; + for (int i =0;iTextToSpeech.LANG_MISSING_DATA){ + t1.speak(this.getString(R.string.goodby), TextToSpeech.QUEUE_FLUSH, null); + } while (t1.isSpeaking()){ //system.Out.Println("Do something or nothing while speaking..") } diff --git a/app/src/main/java/com/softwarefools/nik/spiritlevel/nikVector.java b/app/src/main/java/com/softwarefools/nik/spiritlevel/nikVector.java index 9ff671a..e4a3e2f 100644 --- a/app/src/main/java/com/softwarefools/nik/spiritlevel/nikVector.java +++ b/app/src/main/java/com/softwarefools/nik/spiritlevel/nikVector.java @@ -24,6 +24,13 @@ public class nikVector { this.y=b; this.z=c; + } + public void setVector(long ts,double a, double b , double c){ + this.t=ts; + this.x=a; + this.y=b; + this.z=c; + } public String getString(){ String str=t+" : "+x+";"+y+";"+z ; diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 75b7eb3..1ddbeb4 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -5,10 +5,12 @@ Einstellungen Aufnehmen Ich nehme Auf! + Ich Stoppe die Aufnahme! Achtung! Das waren Sprachwechsel + Es ist kein Packet für Deutsche Sprachausgabe vorhanden! Installieren Sie es, wenn geünscht, in Ihren Telefon Einstellungn Beenden Wechsele Sprache zu Deutsch diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 8a32421..5bf2777 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -5,10 +5,13 @@ Settings Record I start to record! + I stop to record! Attention! Thats about Change Language + English speech files are not installed! Please install them in your Phone Settings, when needed + Exit Changing Language to English diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8405214..4fa7b47 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -5,11 +5,13 @@ Calibración Grabar Empiezo a grabar! + Me detengo para grabar! ¡Guarda! Estos son Cambiar idioma Salida + Archivos de voz españoles no están instalados! Por favor, instalarlos en sus opciones del teléfono, cuando sea necesario Cambio idioma a español diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a322da9..7b127b6 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -5,11 +5,14 @@ Ustawienia Rekord Zacznę nagrywać! + Zatrzymać nagrywanie! Uwaga! To jest to około Zmień język + Polscy pliki mowy nie są zainstalowane! Proszę zainstalować je w ustawieniach telefonu, w razie potrzeby + Wyjście Zmiana języka polerować -- cgit v1.2.3