Merge pull request #8 from RIP95/master

Cosmetics

app/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0"
+        versionName "0.6.2-beta.3"
     }
     buildTypes {
         release {

app/src/main/java/com/example/yink/amadeus/LaunchActivity.java

@@ -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.connecting);
+                        }
+                    });
 
-                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,10 +74,15 @@ public class LaunchActivity extends AppCompatActivity {
     }
 
     @Override
-    protected void onResume(){
+    protected void onResume() {
+        if (isPressed) {
+            status.setText(R.string.disconnected);
+        } else {
+            status.setText(R.string.call);
+        }
+        isPressed = false;
         connect.setImageResource(R.drawable.connect_unselect);
         cancel.setImageResource(R.drawable.cancel_unselect);
-        status.setText(R.string.call);
         super.onResume();
     }
 }

app/src/main/java/com/example/yink/amadeus/MainActivity.java

@@ -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

app/src/main/res/values/strings.xml

@@ -1,6 +1,7 @@
 <resources>
     <string name="app_name">Amadeus</string>
     <string name="call">Connect to Kurisu?</string>
-    <string name="connect">Connecting...</string>
-    <integer name="duration">25</integer>
+    <string name="connecting">Connecting...</string>
+    <string name="disconnected">Disconnected.</string>
+    <integer name="duration">40</integer>
 </resources>