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

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

@@ -50,8 +50,8 @@ public class MainActivity extends AppCompatActivity {
     Random randomgen = new Random();
     SharedPreferences sharedPreferences;
     String lang;
-    private SpeechRecognizer sr;
     MediaPlayer m;
+    private SpeechRecognizer sr;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -404,6 +404,9 @@ public class MainActivity extends AppCompatActivity {
                     speak(voiceLines.get(11));
                     break;
             }
+        } else if (input.contains(getString(R.string.robotics_notes))
+                || input.contains(getString(R.string.antimatter))) {
+            speak(voiceLines.get(21)); //Hehehe
         } else {
             speak(voiceLines.get(16 + randomGen.nextInt(7)));
         }

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

@@ -82,4 +82,6 @@
     <string name="sexy">セクシー</string>
     <string name="boobies">ボビーズ</string>
     <string name="oppai">おっぱい</string>
+    <string name="robotics_notes">ロボティクスノーツ</string>
+    <string name="antimatter">アンティメタ</string>
 </resources>

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

@@ -84,4 +84,6 @@
     <string name="sexy">sexy</string>
     <string name="boobies">boobies</string>
     <string name="oppai">oppai</string>
+    <string name="robotics_notes">Robotics Notes</string>
+    <string name="antimatter">antimatter</string>
 </resources>