diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..ef3b106 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,24 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 25 + buildToolsVersion '25.0.2' + defaultConfig { + applicationId "solidsnek.amadeus_fork" + minSdkVersion 15 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(include: ['*.jar'], dir: 'libs') + compile 'com.android.support:appcompat-v7:25.2.0' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..d8f7d50 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in D:\Soft\AndroidSDK/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ea88bf4..ef46c1e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,8 @@ + package="solidsnek.amadeus_fork"> + + map; - private final int eyes_closed = 0; - private final int normal = 1; - private final int sad = 2; - private final int indifferent = 3; - private final int wink = 4; - private final int pissed = 5; - private final int annoyed = 6; - private final int disappointed = 7; - private final int happy = 8; - private final int angry = 9; - private final int blush = 10; - private final int side = 11; - - ArrayList voiceLines = new ArrayList<>(); - - - @Override - public void onWindowFocusChanged(boolean hasFocus){ - if(hasFocus) - speak(new VoiceLine("Hallo.",happy)); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - kurisu = (ImageView) findViewById(R.id.imageView_kurisu); - setupLines(); - map = new HashMap(); - tts = new TextToSpeech(this, this); - kurisu.setImageResource(R.drawable.kurisu_1); - animation = (AnimationDrawable) kurisu.getDrawable(); - kurisu.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Random randomgen = new Random(); - speak(voiceLines.get(randomgen.nextInt(voiceLines.size()))); - }}); - } - - @Override - public void onInit(int status) { - if(status==TextToSpeech.SUCCESS){ - tts.setLanguage(Locale.JAPAN); - tts.setPitch(1.05f); - tts.setOnUtteranceProgressListener(new UtteranceProgressListener() { - @Override - public void onStart(String s) { - runOnUiThread(new Runnable() { - @Override - public void run() { - animation.start(); - } - }); - } - - @Override - public void onDone(String s) { - runOnUiThread(new Runnable() { - @Override - public void run() { - animation.stop(); - kurisu.setImageDrawable(animation.getFrame(0)); - } - }); - } - - @Override - public void onError(String s) { - animation.stop(); - } - }); - } - } - - public void speak(VoiceLine line){ - switch (line.getState()){ - case eyes_closed: - kurisu.setImageResource(R.drawable.kurisu_1); - break; - case normal: - kurisu.setImageResource(R.drawable.kurisu_2); - break; - case sad: - kurisu.setImageResource(R.drawable.kurisu_3); - break; - case indifferent: - kurisu.setImageResource(R.drawable.kurisu_4); - break; - case wink: - kurisu.setImageResource(R.drawable.kurisu_5); - break; - case pissed: - kurisu.setImageResource(R.drawable.kurisu_6); - break; - case annoyed: - kurisu.setImageResource(R.drawable.kurisu_7); - break; - case disappointed: - kurisu.setImageResource(R.drawable.kurisu_8); - break; - case happy: - tts.setPitch(1.5f); - kurisu.setImageResource(R.drawable.kurisu_9); - break; - case angry: - kurisu.setImageResource(R.drawable.kurisu_10); - break; - case blush: - tts.setPitch(1.5f); - tts.setSpeechRate(1.3f); - kurisu.setImageResource(R.drawable.kurisu_11); - break; - case side: - kurisu.setImageResource(R.drawable.kurisu_12); - break; - default:kurisu.setImageResource(R.drawable.kurisu_2); - - } - animation = (AnimationDrawable) kurisu.getDrawable(); - map.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID,"UniqueID"); - tts.speak(line.getText(),TextToSpeech.QUEUE_FLUSH,map); - tts.setPitch(1.05f); - tts.setSpeechRate(1.0f); - } - - @Override - protected void onDestroy(){ - tts.shutdown(); - super.onDestroy(); - } - - protected void setupLines(){ - voiceLines.add(new VoiceLine("Konban wa, Okabe. Okaeri!",happy)); - voiceLines.add(new VoiceLine("Okabe, sabishi des!",sad)); - voiceLines.add(new VoiceLine("Tsumaranai",indifferent)); - voiceLines.add(new VoiceLine("Okabe ga ski",blush)); - voiceLines.add(new VoiceLine("Chigau",angry)); - } -} diff --git a/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java b/app/src/main/java/solidsnek/amadeus_fork/LaunchActivity.java similarity index 96% rename from app/src/main/java/com/example/yink/amadeus/LaunchActivity.java rename to app/src/main/java/solidsnek/amadeus_fork/LaunchActivity.java index 791c0bb..4f005d9 100644 --- a/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java +++ b/app/src/main/java/solidsnek/amadeus_fork/LaunchActivity.java @@ -1,8 +1,8 @@ -package com.example.yink.amadeus; +package solidsnek.amadeus_fork; import android.content.Intent; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.ImageView; @@ -11,7 +11,9 @@ public class LaunchActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_launch); connect = (ImageView) findViewById(R.id.imageView_connect); connect.setImageResource(R.drawable.connect_unselect); diff --git a/app/src/main/java/solidsnek/amadeus_fork/MainActivity.java b/app/src/main/java/solidsnek/amadeus_fork/MainActivity.java new file mode 100644 index 0000000..bc70234 --- /dev/null +++ b/app/src/main/java/solidsnek/amadeus_fork/MainActivity.java @@ -0,0 +1,118 @@ +package solidsnek.amadeus_fork; + +import android.content.Intent; +import android.graphics.drawable.AnimationDrawable; +import android.media.MediaPlayer; +import android.speech.RecognitionListener; +import android.speech.SpeechRecognizer; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.ImageView; +import android.speech.RecognizerIntent; + +import java.util.ArrayList; + +public class MainActivity extends AppCompatActivity { + + String TAG = "Amadeus"; + ImageView kurisu; + AnimationDrawable animation; + + private SpeechRecognizer sr; + protected static final int REQ_CODE_SPEECH_INPUT = 1; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + kurisu = (ImageView) findViewById(R.id.imageView_kurisu); + kurisu.setImageResource(R.drawable.kurisu_1); + animation = (AnimationDrawable) kurisu.getDrawable(); + + sr = SpeechRecognizer.createSpeechRecognizer(this); + sr.setRecognitionListener(new listener()); + + kurisu.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + promptSpeechInput(); + } + }); + } + + @Override + protected void onDestroy() { + //tts.shutdown(); + super.onDestroy(); + } + + private void promptSpeechInput() { + Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH); + intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL,RecognizerIntent.LANGUAGE_MODEL_FREE_FORM); + intent.putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, "solidsnek.amadeus_fork"); + + intent.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS,1); + sr.startListening(intent); + } + + public void play(int raw, int sprite) { + try { + MediaPlayer m = MediaPlayer.create(getApplicationContext(), raw); + + kurisu.setImageResource(sprite); + + if (m.isPlaying()) { + m.stop(); + m.release(); + m = new MediaPlayer(); + } + + m.start(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + class listener implements RecognitionListener { + public void onReadyForSpeech(Bundle params) { + Log.d(TAG, "onReadyForSpeech"); + } + public void onBeginningOfSpeech() { + Log.d(TAG, "onBeginningOfSpeech"); + } + public void onRmsChanged(float rmsdB) { + Log.d(TAG, "onRmsChanged"); + } + public void onBufferReceived(byte[] buffer) { + Log.d(TAG, "onBufferReceived"); + } + public void onEndOfSpeech() { + Log.d(TAG, "onEndofSpeech"); + } + public void onError(int error) { + Log.d(TAG, "error " + error); + } + public void onResults(Bundle results) { + String str = ""; + Log.d(TAG, "onResults " + results); + ArrayList data = results.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION); + str += data.get(0); + if (str.equals("hello")) { + play(R.raw.haro, R.drawable.kurisu_9); + } + if (str.equals("hey")) { + play(R.raw.hai, R.drawable.kurisu_9); + } + } + public void onPartialResults(Bundle partialResults) { + Log.d(TAG, "onPartialResults"); + } + public void onEvent(int eventType, Bundle params) { + Log.d(TAG, "onEvent " + eventType); + } + } + +} diff --git a/app/src/main/java/com/example/yink/amadeus/voiceLine.java b/app/src/main/java/solidsnek/amadeus_fork/VoiceLine.java similarity index 80% rename from app/src/main/java/com/example/yink/amadeus/voiceLine.java rename to app/src/main/java/solidsnek/amadeus_fork/VoiceLine.java index 57baced..f66f35f 100644 --- a/app/src/main/java/com/example/yink/amadeus/voiceLine.java +++ b/app/src/main/java/solidsnek/amadeus_fork/VoiceLine.java @@ -1,8 +1,4 @@ -package com.example.yink.amadeus; - -/** - * Created by Yink on 28.02.2017. - */ +package solidsnek.amadeus_fork; public class VoiceLine { public String getText() { diff --git a/app/src/main/res/drawable/amadeus_icon.png b/app/src/main/res/drawable/amadeus_icon.png new file mode 100644 index 0000000..5ac86ee Binary files /dev/null and b/app/src/main/res/drawable/amadeus_icon.png differ diff --git a/app/src/main/res/drawable/amadeus_icon_smaller.png b/app/src/main/res/drawable/amadeus_icon_smaller.png new file mode 100644 index 0000000..be2ff19 Binary files /dev/null and b/app/src/main/res/drawable/amadeus_icon_smaller.png differ diff --git a/app/src/main/res/drawable/cancel_select.png b/app/src/main/res/drawable/cancel_select.png new file mode 100644 index 0000000..bbd62ea Binary files /dev/null and b/app/src/main/res/drawable/cancel_select.png differ diff --git a/app/src/main/res/drawable/cancel_unselect.png b/app/src/main/res/drawable/cancel_unselect.png new file mode 100644 index 0000000..d5eb542 Binary files /dev/null and b/app/src/main/res/drawable/cancel_unselect.png differ diff --git a/app/src/main/res/drawable/connect_select.png b/app/src/main/res/drawable/connect_select.png new file mode 100644 index 0000000..341dba2 Binary files /dev/null and b/app/src/main/res/drawable/connect_select.png differ diff --git a/app/src/main/res/drawable/connect_unselect.png b/app/src/main/res/drawable/connect_unselect.png new file mode 100644 index 0000000..280d987 Binary files /dev/null and b/app/src/main/res/drawable/connect_unselect.png differ diff --git a/app/src/main/res/drawable/kurisu10a.png b/app/src/main/res/drawable/kurisu10a.png deleted file mode 100644 index d3d9628..0000000 Binary files a/app/src/main/res/drawable/kurisu10a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu10b.png b/app/src/main/res/drawable/kurisu10b.png deleted file mode 100644 index 64ca865..0000000 Binary files a/app/src/main/res/drawable/kurisu10b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu10c.png b/app/src/main/res/drawable/kurisu10c.png deleted file mode 100644 index 823d85d..0000000 Binary files a/app/src/main/res/drawable/kurisu10c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu11a.png b/app/src/main/res/drawable/kurisu11a.png deleted file mode 100644 index da69d67..0000000 Binary files a/app/src/main/res/drawable/kurisu11a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu11b.png b/app/src/main/res/drawable/kurisu11b.png deleted file mode 100644 index 91f4c0c..0000000 Binary files a/app/src/main/res/drawable/kurisu11b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu11c.png b/app/src/main/res/drawable/kurisu11c.png deleted file mode 100644 index 7237e68..0000000 Binary files a/app/src/main/res/drawable/kurisu11c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu12a.png b/app/src/main/res/drawable/kurisu12a.png deleted file mode 100644 index 59eb11a..0000000 Binary files a/app/src/main/res/drawable/kurisu12a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu12b.png b/app/src/main/res/drawable/kurisu12b.png deleted file mode 100644 index bf68925..0000000 Binary files a/app/src/main/res/drawable/kurisu12b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu12c.png b/app/src/main/res/drawable/kurisu12c.png deleted file mode 100644 index 31a7655..0000000 Binary files a/app/src/main/res/drawable/kurisu12c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu13a.png b/app/src/main/res/drawable/kurisu13a.png deleted file mode 100644 index 7e9876a..0000000 Binary files a/app/src/main/res/drawable/kurisu13a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu13b.png b/app/src/main/res/drawable/kurisu13b.png deleted file mode 100644 index 730d889..0000000 Binary files a/app/src/main/res/drawable/kurisu13b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu13c.png b/app/src/main/res/drawable/kurisu13c.png deleted file mode 100644 index 60c6c16..0000000 Binary files a/app/src/main/res/drawable/kurisu13c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu14a.png b/app/src/main/res/drawable/kurisu14a.png deleted file mode 100644 index 34095d5..0000000 Binary files a/app/src/main/res/drawable/kurisu14a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu14b.png b/app/src/main/res/drawable/kurisu14b.png deleted file mode 100644 index ff2bfc2..0000000 Binary files a/app/src/main/res/drawable/kurisu14b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu14c.png b/app/src/main/res/drawable/kurisu14c.png deleted file mode 100644 index 64acde4..0000000 Binary files a/app/src/main/res/drawable/kurisu14c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu15a.png b/app/src/main/res/drawable/kurisu15a.png deleted file mode 100644 index 8800178..0000000 Binary files a/app/src/main/res/drawable/kurisu15a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu15b.png b/app/src/main/res/drawable/kurisu15b.png deleted file mode 100644 index bcedb3c..0000000 Binary files a/app/src/main/res/drawable/kurisu15b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu15c.png b/app/src/main/res/drawable/kurisu15c.png deleted file mode 100644 index 2cabdc4..0000000 Binary files a/app/src/main/res/drawable/kurisu15c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu16a.png b/app/src/main/res/drawable/kurisu16a.png deleted file mode 100644 index 892ee07..0000000 Binary files a/app/src/main/res/drawable/kurisu16a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu16b.png b/app/src/main/res/drawable/kurisu16b.png deleted file mode 100644 index 81229af..0000000 Binary files a/app/src/main/res/drawable/kurisu16b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu16c.png b/app/src/main/res/drawable/kurisu16c.png deleted file mode 100644 index 2877a95..0000000 Binary files a/app/src/main/res/drawable/kurisu16c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu17a.png b/app/src/main/res/drawable/kurisu17a.png deleted file mode 100644 index 0287a56..0000000 Binary files a/app/src/main/res/drawable/kurisu17a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu17b.png b/app/src/main/res/drawable/kurisu17b.png deleted file mode 100644 index 2a74cc3..0000000 Binary files a/app/src/main/res/drawable/kurisu17b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu17c.png b/app/src/main/res/drawable/kurisu17c.png deleted file mode 100644 index 3ca8dee..0000000 Binary files a/app/src/main/res/drawable/kurisu17c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu18a.png b/app/src/main/res/drawable/kurisu18a.png deleted file mode 100644 index 53b575d..0000000 Binary files a/app/src/main/res/drawable/kurisu18a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu18b.png b/app/src/main/res/drawable/kurisu18b.png deleted file mode 100644 index e231642..0000000 Binary files a/app/src/main/res/drawable/kurisu18b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu18c.png b/app/src/main/res/drawable/kurisu18c.png deleted file mode 100644 index fb62175..0000000 Binary files a/app/src/main/res/drawable/kurisu18c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu19a.png b/app/src/main/res/drawable/kurisu19a.png deleted file mode 100644 index eb3e399..0000000 Binary files a/app/src/main/res/drawable/kurisu19a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu19b.png b/app/src/main/res/drawable/kurisu19b.png deleted file mode 100644 index 42b1716..0000000 Binary files a/app/src/main/res/drawable/kurisu19b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu19c.png b/app/src/main/res/drawable/kurisu19c.png deleted file mode 100644 index 6c3305d..0000000 Binary files a/app/src/main/res/drawable/kurisu19c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu1a.png b/app/src/main/res/drawable/kurisu1a.png deleted file mode 100644 index 7a5d94a..0000000 Binary files a/app/src/main/res/drawable/kurisu1a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu1b.png b/app/src/main/res/drawable/kurisu1b.png deleted file mode 100644 index 607c285..0000000 Binary files a/app/src/main/res/drawable/kurisu1b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu1c.png b/app/src/main/res/drawable/kurisu1c.png deleted file mode 100644 index 788692d..0000000 Binary files a/app/src/main/res/drawable/kurisu1c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu20.png b/app/src/main/res/drawable/kurisu20.png deleted file mode 100644 index a94e4d1..0000000 Binary files a/app/src/main/res/drawable/kurisu20.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu2a.png b/app/src/main/res/drawable/kurisu2a.png deleted file mode 100644 index 985fa07..0000000 Binary files a/app/src/main/res/drawable/kurisu2a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu2b.png b/app/src/main/res/drawable/kurisu2b.png deleted file mode 100644 index 73bb4fc..0000000 Binary files a/app/src/main/res/drawable/kurisu2b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu2c.png b/app/src/main/res/drawable/kurisu2c.png deleted file mode 100644 index 9610e4e..0000000 Binary files a/app/src/main/res/drawable/kurisu2c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu3a.png b/app/src/main/res/drawable/kurisu3a.png deleted file mode 100644 index 75855b8..0000000 Binary files a/app/src/main/res/drawable/kurisu3a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu3b.png b/app/src/main/res/drawable/kurisu3b.png deleted file mode 100644 index ae56f3b..0000000 Binary files a/app/src/main/res/drawable/kurisu3b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu3c.png b/app/src/main/res/drawable/kurisu3c.png deleted file mode 100644 index 205c23c..0000000 Binary files a/app/src/main/res/drawable/kurisu3c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu4a.png b/app/src/main/res/drawable/kurisu4a.png deleted file mode 100644 index e1e4313..0000000 Binary files a/app/src/main/res/drawable/kurisu4a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu4b.png b/app/src/main/res/drawable/kurisu4b.png deleted file mode 100644 index 9c84896..0000000 Binary files a/app/src/main/res/drawable/kurisu4b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu4c.png b/app/src/main/res/drawable/kurisu4c.png deleted file mode 100644 index 2ace598..0000000 Binary files a/app/src/main/res/drawable/kurisu4c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu5a.png b/app/src/main/res/drawable/kurisu5a.png deleted file mode 100644 index 92374ed..0000000 Binary files a/app/src/main/res/drawable/kurisu5a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu5b.png b/app/src/main/res/drawable/kurisu5b.png deleted file mode 100644 index e39f25b..0000000 Binary files a/app/src/main/res/drawable/kurisu5b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu5c.png b/app/src/main/res/drawable/kurisu5c.png deleted file mode 100644 index 18e9c2b..0000000 Binary files a/app/src/main/res/drawable/kurisu5c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu6a.png b/app/src/main/res/drawable/kurisu6a.png deleted file mode 100644 index 7dd7ace..0000000 Binary files a/app/src/main/res/drawable/kurisu6a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu6b.png b/app/src/main/res/drawable/kurisu6b.png deleted file mode 100644 index fe33813..0000000 Binary files a/app/src/main/res/drawable/kurisu6b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu6c.png b/app/src/main/res/drawable/kurisu6c.png deleted file mode 100644 index c917b81..0000000 Binary files a/app/src/main/res/drawable/kurisu6c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu7a.png b/app/src/main/res/drawable/kurisu7a.png deleted file mode 100644 index 89d97f3..0000000 Binary files a/app/src/main/res/drawable/kurisu7a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu7b.png b/app/src/main/res/drawable/kurisu7b.png deleted file mode 100644 index a0b163d..0000000 Binary files a/app/src/main/res/drawable/kurisu7b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu7c.png b/app/src/main/res/drawable/kurisu7c.png deleted file mode 100644 index 9dc4da3..0000000 Binary files a/app/src/main/res/drawable/kurisu7c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu8a.png b/app/src/main/res/drawable/kurisu8a.png deleted file mode 100644 index 7d3a17d..0000000 Binary files a/app/src/main/res/drawable/kurisu8a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu8b.png b/app/src/main/res/drawable/kurisu8b.png deleted file mode 100644 index b3d9b37..0000000 Binary files a/app/src/main/res/drawable/kurisu8b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu8c.png b/app/src/main/res/drawable/kurisu8c.png deleted file mode 100644 index 1d48be1..0000000 Binary files a/app/src/main/res/drawable/kurisu8c.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu9a.png b/app/src/main/res/drawable/kurisu9a.png deleted file mode 100644 index 068d867..0000000 Binary files a/app/src/main/res/drawable/kurisu9a.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu9b.png b/app/src/main/res/drawable/kurisu9b.png deleted file mode 100644 index 4f0f703..0000000 Binary files a/app/src/main/res/drawable/kurisu9b.png and /dev/null differ diff --git a/app/src/main/res/drawable/kurisu9c.png b/app/src/main/res/drawable/kurisu9c.png deleted file mode 100644 index 4a572f1..0000000 Binary files a/app/src/main/res/drawable/kurisu9c.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_launch.xml b/app/src/main/res/layout/activity_launch.xml index 39a3255..8ef3c83 100644 --- a/app/src/main/res/layout/activity_launch.xml +++ b/app/src/main/res/layout/activity_launch.xml @@ -1,51 +1,48 @@ - - - + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingBottom="@dimen/activity_vertical_margin" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + xmlns:android="http://schemas.android.com/apk/res/android"> + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c544d90..1d5e99d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,39 +1,38 @@ - - tools:context="com.example.yink.amadeus.MainActivity"> - - + android:scaleType="centerCrop" /> + - + \ No newline at end of file diff --git a/app/src/main/res/raw/hai.ogg b/app/src/main/res/raw/hai.ogg new file mode 100644 index 0000000..6702f54 Binary files /dev/null and b/app/src/main/res/raw/hai.ogg differ diff --git a/app/src/main/res/raw/haro.ogg b/app/src/main/res/raw/haro.ogg new file mode 100644 index 0000000..3112e63 Binary files /dev/null and b/app/src/main/res/raw/haro.ogg differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ee6bb15..59d6f8a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,6 @@ Amadeus Connect to Kurisu? + Say something… + Sorry! Your device doesn\'t support speech input diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..74b2ab0 --- /dev/null +++ b/build.gradle @@ -0,0 +1,23 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.2.3' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..aac7c9b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..04e285f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Dec 28 10:00:20 PST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'