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

Revert changes. Fix lines.

This commit is contained in:
Snek 2017-03-10 19:51:16 +03:00
parent c5d064da54
commit 1639069bae
7 changed files with 79 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,80 +186,80 @@ public class MainActivity extends AppCompatActivity {
}
public void speak(VoiceLine line) {
m = MediaPlayer.create(getApplicationContext(), line.getId());
final Visualizer v = new Visualizer(m.getAudioSessionId());
if (sharedPreferences.getBoolean("show_subtitles", false)) {
subtitles.setText(line.getSubtitle());
}
Resources res = getResources();
try {
m = MediaPlayer.create(getApplicationContext(), line.getId());
final Visualizer v = new Visualizer(m.getAudioSessionId());
if (sharedPreferences.getBoolean("show_subtitles", false)) {
subtitles.setText(line.getSubtitle());
}
Resources res = getResources();
animation = (AnimationDrawable) Drawable.createFromXml(res, res.getXml(line.getMood()));
if (m.isPlaying()) {
m.stop();
m.release();
v.setEnabled(false);
m = new MediaPlayer();
}
m.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override
public void onPrepared(MediaPlayer mp) {
isSpeaking = true;
mp.start();
v.setEnabled(true);
}
});
m.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
@Override
public void onCompletion(MediaPlayer mp) {
isSpeaking = false;
mp.release();
v.setEnabled(false);
runOnUiThread(new Runnable() {
@Override
public void run() {
kurisu.setImageDrawable(animation.getFrame(0));
}
});
}
});
v.setEnabled(false);
v.setCaptureSize(Visualizer.getCaptureSizeRange()[1]);
v.setDataCaptureListener(
new Visualizer.OnDataCaptureListener() {
public void onWaveFormDataCapture(Visualizer visualizer, byte[] bytes, int samplingRate) {
int sum = 0;
for (int i = 1; i < bytes.length; i++) {
sum += bytes[i] + 128;
}
// The normalized volume
final float normalized = sum / (float) bytes.length;
runOnUiThread(new Runnable() {
@Override
public void run() {
if (normalized > 50) {
// Todo: Maybe choose sprite based on previous choice and volume instead of random
kurisu.setImageDrawable(animation.getFrame((int) Math.ceil(Math.random() * 2)));
} else {
kurisu.setImageDrawable(animation.getFrame(0));
}
}
});
}
public void onFftDataCapture(Visualizer visualizer, byte[] bytes, int samplingRate) { }
}, Visualizer.getMaxCaptureRate() / 2, true, false);
} catch (Exception e) {
e.printStackTrace();
}
if (m.isPlaying()) {
m.stop();
m.release();
v.setEnabled(false);
m = new MediaPlayer();
}
m.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override
public void onPrepared(MediaPlayer mp) {
isSpeaking = true;
mp.start();
v.setEnabled(true);
}
});
m.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
@Override
public void onCompletion(MediaPlayer mp) {
isSpeaking = false;
mp.release();
v.setEnabled(false);
runOnUiThread(new Runnable() {
@Override
public void run() {
kurisu.setImageDrawable(animation.getFrame(0));
}
});
}
});
v.setEnabled(false);
v.setCaptureSize(Visualizer.getCaptureSizeRange()[1]);
v.setDataCaptureListener(
new Visualizer.OnDataCaptureListener() {
public void onWaveFormDataCapture(Visualizer visualizer, byte[] bytes, int samplingRate) {
int sum = 0;
for (int i = 1; i < bytes.length; i++) {
sum += bytes[i] + 128;
}
// The normalized volume
final float normalized = sum / (float) bytes.length;
runOnUiThread(new Runnable() {
@Override
public void run() {
if (normalized > 50) {
// Todo: Maybe choose sprite based on previous choice and volume instead of random
kurisu.setImageDrawable(animation.getFrame((int) Math.ceil(Math.random() * 2)));
} else {
kurisu.setImageDrawable(animation.getFrame(0));
}
}
});
}
public void onFftDataCapture(Visualizer visualizer, byte[] bytes, int samplingRate) { }
}, Visualizer.getMaxCaptureRate() / 2, true, false);
}
private void openApp(String[] input) {
@ -289,6 +289,7 @@ public class MainActivity extends AppCompatActivity {
private void answerSpeech(String input) {
/* Split language string (en-US) */
String[] contextLang = recogLang.split("-");
/* Switch language within current context for voice recognition */

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

@ -3,8 +3,9 @@
<string name="call">Conectar a Kurisu?</string>
<string name="connecting">Conectando…</string>
<string name="disconnected">Desconectado.</string>
<string name="default_lang">es</string>
<string name="default_recog_lang">ja-JP</string>
<string name="google_app_error">Google App wasn\'t detected.</string>
<string name="lang_default_value">Pt-Pt</string>
<string name="line_hello">Hola.</string>
<string name="line_dont_call_me_like_that">No me llames así!</string>

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

@ -4,7 +4,7 @@
<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="default_recog_lang">ja-JP</string>
<string name="google_app_error">Google App wasn\'t detected.</string>
<string name="line_hello">Hello.</string>

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

@ -4,7 +4,7 @@
<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="default_recog_lang">ja-JP</string>
<string name="google_app_error">Google App wasn\'t detected.</string>
<string name="line_hello">Olá.</string>

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

@ -4,10 +4,11 @@
<string name="connecting">Подключение…</string>
<string name="disconnected">Отключено.</string>
<string name="default_lang">ru</string>
<string name="default_recog_lang">ja</string>
<string name="default_recog_lang">ja-JP</string>
<string name="google_app_error">Google App не найден.</string>
<!-- Настройки -->
<string name="pref_app_settings">Настройки приложения</string>
<string name="pref_recog_lang">Язык распознавания</string>
<string name="pref_recog_lang_desc">Выберите язык распознавания голоса</string>
<string name="pref_lang">Язык</string>

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

@ -4,10 +4,11 @@
<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="default_recog_lang">en-US</string>
<string name="google_app_error">Google App wasn\'t detected.</string>
<!-- Settings -->
<string name="pref_app_settings">Application settings</string>
<string name="pref_recog_lang">Recognition language</string>
<string name="pref_recog_lang_desc">Select voice recognition language</string>
<string name="pref_lang">Language</string>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="Application preferences">
<PreferenceCategory android:title="@string/pref_app_settings">
<SwitchPreference
android:defaultValue="false"
android:key="show_subtitles"