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

Fix for call simulation. Animation fine tuning.

This commit is contained in:
Snek 2017-03-04 12:10:56 +03:00
parent 6023fa6ade
commit c553d1022e
3 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
View File

@ -14,14 +14,8 @@ public class LaunchActivity extends AppCompatActivity {
TextView status;
AnimationDrawable logo;
ImageView imageViewLogo;
Boolean isPressed = false;
@Override
public void onWindowFocusChanged(boolean hasFocus) {
if (hasFocus) {
logo.start();
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -32,6 +26,7 @@ public class LaunchActivity extends AppCompatActivity {
imageViewLogo = (ImageView) findViewById(R.id.imageView_logo);
imageViewLogo.setImageResource(R.drawable.logo_animation);
logo = (AnimationDrawable) imageViewLogo.getDrawable();
logo.start();
connect.setImageResource(R.drawable.connect_unselect);
cancel.setImageResource(R.drawable.cancel_unselect);
@ -39,26 +34,29 @@ public class LaunchActivity extends AppCompatActivity {
connect.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
MediaPlayer m = MediaPlayer.create(getApplicationContext(), R.raw.tone);
if (!isPressed) {
isPressed = true;
MediaPlayer m = MediaPlayer.create(getApplicationContext(), R.raw.tone);
connect.setImageResource(R.drawable.connect_select);
connect.setImageResource(R.drawable.connect_select);
m.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override
public void onPrepared(MediaPlayer mp) {
mp.start();
status.setText(R.string.connect);
}
});
m.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override
public void onPrepared(MediaPlayer mp) {
mp.start();
status.setText(R.string.connect);
}
});
m.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
@Override
public void onCompletion(MediaPlayer mp) {
mp.release();
Intent intent = new Intent(LaunchActivity.this,MainActivity.class);
startActivity(intent);
}
});
m.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
@Override
public void onCompletion(MediaPlayer mp) {
mp.release();
Intent intent = new Intent(LaunchActivity.this,MainActivity.class);
startActivity(intent);
}
});
}
}
});
@ -76,7 +74,8 @@ public class LaunchActivity extends AppCompatActivity {
}
@Override
protected void onResume(){
protected void onResume() {
isPressed = false;
connect.setImageResource(R.drawable.connect_unselect);
cancel.setImageResource(R.drawable.cancel_unselect);
status.setText(R.string.call);

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

@ -37,11 +37,10 @@ public class MainActivity extends AppCompatActivity {
private SpeechRecognizer sr;
@Override
public void onWindowFocusChanged(boolean hasFocus){
if(hasFocus){
public void onWindowFocusChanged(boolean hasFocus) {
if (hasFocus) {
speak(voiceLines.get(0));
}
}
@Override

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

@ -2,5 +2,5 @@
<string name="app_name">Amadeus</string>
<string name="call">Connect to Kurisu?</string>
<string name="connect">Connecting...</string>
<integer name="duration">25</integer>
<integer name="duration">40</integer>
</resources>