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

Fix animations

This commit is contained in:
Snek 2017-03-02 03:27:14 +03:00
parent 430bccd4cf
commit da0089ae1a
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/java/solidsnek/amadeus_fork/MainActivity.java
View File

@ -1,5 +1,6 @@
package solidsnek.amadeus_fork; package solidsnek.amadeus_fork;
import android.content.ActivityNotFoundException;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.AnimationDrawable;
import android.media.MediaPlayer; import android.media.MediaPlayer;
@ -11,8 +12,10 @@ import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.speech.RecognizerIntent; import android.speech.RecognizerIntent;
import android.widget.Toast;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
@ -20,6 +23,7 @@ public class MainActivity extends AppCompatActivity {
ImageView kurisu; ImageView kurisu;
AnimationDrawable animation; AnimationDrawable animation;
/* Don't forget about permission to use audio! */
private SpeechRecognizer sr; private SpeechRecognizer sr;
protected static final int REQ_CODE_SPEECH_INPUT = 1; protected static final int REQ_CODE_SPEECH_INPUT = 1;
@ -44,16 +48,17 @@ public class MainActivity extends AppCompatActivity {
@Override @Override
protected void onDestroy() { protected void onDestroy() {
//tts.shutdown();
super.onDestroy(); super.onDestroy();
} }
private void promptSpeechInput() { private void promptSpeechInput() {
Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH); Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL,RecognizerIntent.LANGUAGE_MODEL_FREE_FORM); intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL,
intent.putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, "solidsnek.amadeus_fork"); RecognizerIntent.LANGUAGE_MODEL_FREE_FORM);
intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, Locale.getDefault());
intent.putExtra(RecognizerIntent.EXTRA_PROMPT,
getString(R.string.speech_prompt));
intent.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS,1);
sr.startListening(intent); sr.startListening(intent);
} }
@ -62,6 +67,7 @@ public class MainActivity extends AppCompatActivity {
MediaPlayer m = MediaPlayer.create(getApplicationContext(), raw); MediaPlayer m = MediaPlayer.create(getApplicationContext(), raw);
kurisu.setImageResource(sprite); kurisu.setImageResource(sprite);
animation = (AnimationDrawable) kurisu.getDrawable();
if (m.isPlaying()) { if (m.isPlaying()) {
m.stop(); m.stop();
@ -71,6 +77,31 @@ public class MainActivity extends AppCompatActivity {
m.start(); m.start();
m.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override
public void onPrepared(MediaPlayer mp) {
runOnUiThread(new Runnable() {
@Override
public void run() {
animation.start();
}
});
}
});
m.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
@Override
public void onCompletion(MediaPlayer mp) {
runOnUiThread(new Runnable() {
@Override
public void run() {
animation.stop();
kurisu.setImageDrawable(animation.getFrame(0));
}
});
}
});
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -115,4 +146,4 @@ public class MainActivity extends AppCompatActivity {
} }
} }
} }