rixty
/
Amadeus
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #29 from RIP95/master 

Voice recognition switch
This commit is contained in:
Nille 2017-03-09 02:35:26 +01:00 committed by GitHub
parent 8fd6a7b75c 58e9ec8fa7
commit 6606b08ca5
8 changed files with 82 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/example/yink/amadeus/LangContextWrapper.java
View File

@ -7,10 +7,8 @@ import android.content.Context;
import android.content.ContextWrapper;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Build;
import android.preference.PreferenceManager;
import android.util.DisplayMetrics;
import java.util.Locale;

96
app/src/main/java/com/example/yink/amadeus/MainActivity.java
View File

@ -11,6 +11,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.Drawable;
@ -33,6 +34,7 @@ import android.widget.TextView;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Random;
public class MainActivity extends AppCompatActivity {
@ -48,7 +50,7 @@ public class MainActivity extends AppCompatActivity {
int shaman_girls = -1;
Random randomgen = new Random();
SharedPreferences sharedPreferences;
String lang;
String lang, recogLang;
MediaPlayer m;
private SpeechRecognizer sr;
@ -62,6 +64,7 @@ public class MainActivity extends AppCompatActivity {
ImageView imageViewSubtitles = (ImageView) findViewById(R.id.imageView_subtitles);
sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
lang = sharedPreferences.getString("lang", "ja");
recogLang = sharedPreferences.getString("recognition_lang", "ja");
if (!sharedPreferences.getBoolean("show_subtitles", false)) {
imageViewSubtitles.setVisibility(View.INVISIBLE);
}
@ -154,11 +157,15 @@ public class MainActivity extends AppCompatActivity {
Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL,
RecognizerIntent.LANGUAGE_MODEL_FREE_FORM);
String lang = "ja-JP";
if (!getString(R.string.lang_default_value).equals("ja-JP")) {
lang = "en-US";
switch (recogLang) {
case "ja":
intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, "ja-JP");
break;
case "en":
intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, "en-US");
break;
}
intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, lang);
/* Temporary workaround for strange bug on 4.0.3-4.0.4 */
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
try {
@ -170,7 +177,7 @@ public class MainActivity extends AppCompatActivity {
sr.startListening(intent);
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
@ -293,10 +300,27 @@ public class MainActivity extends AppCompatActivity {
}
private void answerSpeech(String input) {
Log.e(TAG, input);
Context context = getApplicationContext();
Configuration config = context.getResources().getConfiguration();
Locale locale = new Locale(recogLang);
Locale.setDefault(locale);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
config.setLocale(locale);
} else {
config.locale = locale;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
context = context.createConfigurationContext(config);
} else {
context.getResources().updateConfiguration(config, context.getResources().getDisplayMetrics());
}
input = input.toLowerCase();
Random randomGen = new Random();
if (input.contains(getString(R.string.christina))) {
if (input.contains(context.getString(R.string.christina))) {
switch (randomGen.nextInt(4)) {
case 0:
speak(voiceLines.get(10));
@ -311,7 +335,7 @@ public class MainActivity extends AppCompatActivity {
speak(voiceLines.get(15));
break;
}
} else if (input.contains(getString(R.string.nullpo))) {
} else if (input.contains(context.getString(R.string.nullpo))) {
shaman_girls += 1;
if (shaman_girls < 5) {
switch (randomGen.nextInt(2)) {
@ -342,29 +366,29 @@ public class MainActivity extends AppCompatActivity {
break;
}
}
} else if (input.contains(getString(R.string.the_zombie))
|| input.contains(getString(R.string.celeb17))) {
} else if (input.contains(context.getString(R.string.the_zombie))
|| input.contains(context.getString(R.string.celeb17))) {
speak(voiceLines.get(32));
} else if (input.contains(getString(R.string.atchannel))
|| input.contains(getString(R.string.kurigohan))
|| input.contains(getString(R.string.kamehameha))) {
} else if (input.contains(context.getString(R.string.atchannel))
|| input.contains(context.getString(R.string.kurigohan))
|| input.contains(context.getString(R.string.kamehameha))) {
speak(voiceLines.get(30 + randomGen.nextInt(2)));
} else if (input.contains(getString(R.string.salieri))
|| input.contains(getString(R.string.maho))
|| input.contains(getString(R.string.hiyajo))) {
} else if (input.contains(context.getString(R.string.salieri))
|| input.contains(context.getString(R.string.maho))
|| input.contains(context.getString(R.string.hiyajo))) {
speak(voiceLines.get(26 + randomGen.nextInt(4)));
} else if (input.contains(getString(R.string.time_machine))
|| input.contains(getString(R.string.cern))
|| input.contains(getString(R.string.time_travel))) {
} else if (input.contains(context.getString(R.string.time_machine))
|| input.contains(context.getString(R.string.cern))
|| input.contains(context.getString(R.string.time_travel))) {
speak(voiceLines.get(33 + randomGen.nextInt(5)));
} else if (input.contains(getString(R.string.memory))
|| input.contains(getString(R.string.amadeus))
|| input.contains(getString(R.string.science))) {
} else if (input.contains(context.getString(R.string.memory))
|| input.contains(context.getString(R.string.amadeus))
|| input.contains(context.getString(R.string.science))) {
speak(voiceLines.get(38 + randomGen.nextInt(5)));
} else if (input.contains(getString(R.string.hello))
|| input.contains(getString(R.string.good_morning))
|| input.contains(getString(R.string.konnichiwa))
|| input.contains(getString(R.string.good_evening))) {
} else if (input.contains(context.getString(R.string.hello))
|| input.contains(context.getString(R.string.good_morning))
|| input.contains(context.getString(R.string.konnichiwa))
|| input.contains(context.getString(R.string.good_evening))) {
switch (randomGen.nextInt(4)) {
case 0:
speak(voiceLines.get(12));
@ -379,11 +403,11 @@ public class MainActivity extends AppCompatActivity {
speak(voiceLines.get(1));
break;
}
} else if (input.contains(getString(R.string.nice_body))
|| input.contains(getString(R.string.hot))
|| input.contains(getString(R.string.sexy))
|| input.contains(getString(R.string.boobies))
|| input.contains(getString(R.string.oppai))) {
} else if (input.contains(context.getString(R.string.nice_body))
|| input.contains(context.getString(R.string.hot))
|| input.contains(context.getString(R.string.sexy))
|| input.contains(context.getString(R.string.boobies))
|| input.contains(context.getString(R.string.oppai))) {
switch (randomGen.nextInt(3)) {
case 0:
speak(voiceLines.get(2));
@ -395,8 +419,8 @@ public class MainActivity extends AppCompatActivity {
speak(voiceLines.get(11));
break;
}
} else if (input.contains(getString(R.string.robotics_notes))
|| input.contains(getString(R.string.antimatter))) {
} else if (input.contains(context.getString(R.string.robotics_notes))
|| input.contains(context.getString(R.string.antimatter))) {
speak(voiceLines.get(21)); //Hehehe
} else {
speak(voiceLines.get(16 + randomGen.nextInt(7)));
@ -502,6 +526,7 @@ public class MainActivity extends AppCompatActivity {
/* TODO: Japanese doesn't split the words. Sigh. */
String[] splitInput = input.split(" ");
/* TODO: Works only with english right now (and best with english) */
if (splitInput.length > 1 && splitInput[0].equalsIgnoreCase(getString(R.string.christina))) {
String cmd = splitInput[1].toLowerCase();
String[] args = new String[splitInput.length - 2];
@ -512,9 +537,6 @@ public class MainActivity extends AppCompatActivity {
case "open":
openApp(args);
break;
case "открой":
openApp(args);
break;
}
} else {
answerSpeech(input);

3
app/src/main/res/values-ja/strings.xml
View File

@ -3,8 +3,9 @@
<string name="call">Connect to Kurisu?</string>
<string name="connecting">Connecting…</string>
<string name="disconnected">Disconnected.</string>
<string name="default_lang">ja</string>
<string name="default_recog_lang">ja</string>
<string name="google_app_error">Google App wasn\'t detected.</string>
<string name="lang_default_value">ja-JP</string>
<string name="line_hello">Hello.</string>
<string name="line_dont_call_me_like_that">Don\'t call me like that!</string>

33
app/src/main/res/values-pt/strings.xml
View File

@ -3,9 +3,9 @@
<string name="call">Conectar a Kurisu?</string>
<string name="connecting">Conectando…</string>
<string name="disconnected">Desconectado.</string>
<string name="default_lang">pt</string>
<string name="default_recog_lang">ja</string>
<string name="google_app_error">Google App wasn\'t detected.</string>
<string name="lang_default_value">Pt-Pt</string>
<integer name="duration">40</integer>
<string name="line_hello">Olá.</string>
<string name="line_dont_call_me_like_that">Não me chames assim!</string>
@ -56,33 +56,4 @@
<string name="line_Leskinen_shaman">Onde tão as meninas shaman japonesas, Lintahlo?</string>
<string name="line_Leskinen_holy_cow">Porra! Eu bem disse que devíamos ter vindo mais cedo.</string>
<string name="line_should_christina">Ou será que devia ter dito "É a Christina"?</string>
<!-- Input strings -->
<string name="christina">christina</string>
<string name="nullpo">nullpo</string>
<string name="the_zombie">the zombie</string>
<string name="celeb17">celeb seventeen</string>
<string name="atchannel">atchannel</string>
<string name="kurigohan">kurigohan</string>
<string name="kamehameha">kamehameha</string>
<string name="salieri">salieri</string>
<string name="maho">maho</string>
<string name="hiyajo">hiyajo</string>
<string name="time_machine">time machine</string>
<string name="cern">cern</string>
<string name="time_travel">time travel</string>
<string name="memory">memory</string>
<string name="amadeus">amadeus</string>
<string name="science">science</string>
<string name="hello">hello</string>
<string name="good_morning">good morning</string>
<string name="konnichiwa">good afternoon</string>
<string name="good_evening">good evening</string>
<string name="nice_body">nice body</string>
<string name="hot">hot</string>
<string name="sexy">sexy</string>
<string name="boobies">boobies</string>
<string name="oppai">oppai</string>
<string name="robotics_notes">Robotics Notes</string>
<string name="antimatter">antimatter</string>
</resources>

3
app/src/main/res/values-ru/strings.xml
View File

@ -3,8 +3,9 @@
<string name="call">Подключиться к Курису?</string>
<string name="connecting">Подключение…</string>
<string name="disconnected">Отключено.</string>
<string name="default_lang">ru</string>
<string name="default_recog_lang">ja</string>
<string name="google_app_error">Google App не найден.</string>
<string name="lang_default_value">ru-RU</string>
<!-- Многие фразы были вырваны из контекста, поэтому прошу не пинать -->
<string name="line_hello">Привет.</string>

12
app/src/main/res/values/arrays.xml
View File

@ -14,9 +14,13 @@
<item>ja</item>
</string-array>
<string-array name="commandChristina">
<item>Christina</item>
<item>Кристина</item>
<item>クリスティーナ</item>
<string-array name="languagesRecogArray">
<item>English</item>
<item>日本語</item>
</string-array>
<string-array name="languagesRecogValues">
<item>en</item>
<item>ja</item>
</string-array>
</resources>

3
app/src/main/res/values/strings.xml
View File

@ -3,8 +3,9 @@
<string name="call">Connect to Kurisu?</string>
<string name="connecting">Connecting…</string>
<string name="disconnected">Disconnected.</string>
<string name="default_lang">en</string>
<string name="default_recog_lang">en</string>
<string name="google_app_error">Google App wasn\'t detected.</string>
<string name="lang_default_value">en-US</string>
<integer name="duration">40</integer>
<string name="line_hello">Hello.</string>

7
app/src/main/res/xml/preferences.xml
View File

@ -6,6 +6,13 @@
android:key="show_subtitles"
android:summary="Shows subtitles for Amadeus' answers"
android:title="Show subtitles" />
<ListPreference
android:key="recognition_lang"
android:title="Recognition language"
android:summary="Voice recognition language"
android:defaultValue="@string/lang_default_value"
android:entries="@array/languagesRecogArray"
android:entryValues="@array/languagesRecogValues" />
<ListPreference
android:summary="Select app language (app restart required)"
android:title="Language"