Merge branch 'master' of https://github.com/Yink/Amadeus

README.md

@@ -6,8 +6,13 @@ Hit me up on the Steins;Gate Discord.
 
 To start speech recognition simply touch her once. If you long-click her, she will go on a loop and say random sentences in random intervals. Long-Click again to stop.
 
-<a href="https://github.com/Yink/Amadeus/blob/master/Screenshots/Callscreeen.png?raw=true">Screenshot 1</a>
-<a href="https://github.com/Yink/Amadeus/blob/master/Screenshots/Kurisuscreen.png?raw=true">Screenshot 2</a>
+#Screenshots
+<ul>
+<li><a href="https://github.com/Yink/Amadeus/blob/master/Screenshots/Callscreen.png?raw=true">Launch View</a></li>
+<li><a href="https://github.com/Yink/Amadeus/blob/master/Screenshots/Kurisuscreen.png?raw=true">Main View</a></li>
+<li><a href="https://github.com/Yink/Amadeus/blob/master/Screenshots/Settingscreen.png?raw=true">Preference Menu</a></li>
+<li><a href="https://github.com/Yink/Amadeus/blob/master/Screenshots/Subscreen.png?raw=true">Main View with English subtitles</a></li>
+</ul>
 
 #Recognized commands
 Keep in mind that the voice recognition is Japanese in order to register the Japanese names. Thus you may have to alter your pronouncation a bit.
@@ -20,6 +25,7 @@ Keep in mind that the voice recognition is Japanese in order to register the Jap
 <li>Time machine, SERN, Time travel</li>
 <li>Memory, Amadeus, Science</li>
 <li>Nice body, Hot, Sexy, Boobies</li>
+<li>Robitics;Notes, antimatter</li>
 </ul>
 
 #Credits

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

@@ -50,8 +50,8 @@ public class MainActivity extends AppCompatActivity {
     SharedPreferences sharedPreferences;
     String lang, recogLang;
     MediaPlayer m;
-    private SpeechRecognizer sr;
     String[] contextLang;
+    private SpeechRecognizer sr;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -148,6 +148,10 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onPause() {
         isLoop = false;
+        if (animation != null && animation.isRunning())
+            animation.stop();
+        kurisu.setImageResource(R.drawable.kurisu2a);
+        animation = null;
         super.onPause();
     }
 

app/src/main/res/layout/activity_main.xml

@@ -20,8 +20,8 @@
         android:id="@+id/imageView_kurisu"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:src="@drawable/kurisu9a"
-        android:scaleType="centerCrop" />
+        android:scaleType="centerCrop"
+        android:src="@drawable/kurisu9a" />
 
     <ImageView
         android:id="@+id/imageView_logo_small"
@@ -44,7 +44,16 @@
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:src="@drawable/subtitle_frame" />
+        android:scaleType="centerCrop"
+        android:src="@drawable/subtitle_frame_big" />
+    <!--<ImageView
+        android:id="@+id/imageView_subtitles"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:src="@drawable/subtitle_frame" />-->
 
     <TextView
         android:id="@+id/textView_subtitles"

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files