diff --git a/.idea/misc.xml b/.idea/misc.xml index 38514ef..d61f88c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,22 +1,32 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 29f0cab..a6e64a6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,7 +31,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'com.google.android.material:material:1.4.0' - testImplementation 'junit:junit:4.+' + implementation 'com.agrawalsuneet.androidlibs:dotsloader:1.4' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/ListeningActivity.java b/app/src/main/java/ch/mathieubroillet/jarvis/android/ListeningActivity.java index ebfe3f2..7e8f705 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/ListeningActivity.java +++ b/app/src/main/java/ch/mathieubroillet/jarvis/android/ListeningActivity.java @@ -35,4 +35,19 @@ public class ListeningActivity extends AppCompatActivity { public void quit(View view) { finish(); } + + public void startRecording(View view) { + view.setVisibility(View.INVISIBLE); + + View dots = findViewById(R.id.dots); + dots.setVisibility(View.VISIBLE); + + } + + public void stopRecording(View view) { + view.setVisibility(View.INVISIBLE); + + View dots = findViewById(R.id.microphone); + dots.setVisibility(View.VISIBLE); + } } \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/PorcupineService.java b/app/src/main/java/ch/mathieubroillet/jarvis/android/PorcupineService.java index c9094d3..b6ca96a 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/PorcupineService.java +++ b/app/src/main/java/ch/mathieubroillet/jarvis/android/PorcupineService.java @@ -36,7 +36,8 @@ public class PorcupineService extends Service { getApplicationContext(), (keywordIndex) -> { - Intent dialogIntent = new Intent(this, ListeningActivity.class); + Intent dialogIntent = new Intent(getApplicationContext(), ListeningActivity.class); + dialogIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); dialogIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(dialogIntent); diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png new file mode 100644 index 0000000..58c4100 Binary files /dev/null and b/app/src/main/res/drawable/logo.png differ diff --git a/app/src/main/res/drawable/microphone.xml b/app/src/main/res/drawable/microphone.xml new file mode 100644 index 0000000..791b475 --- /dev/null +++ b/app/src/main/res/drawable/microphone.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/activity_listening.xml b/app/src/main/res/layout/activity_listening.xml index b5cf8fc..012f999 100644 --- a/app/src/main/res/layout/activity_listening.xml +++ b/app/src/main/res/layout/activity_listening.xml @@ -1,10 +1,11 @@ @@ -20,8 +21,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginBottom="300dp" - android:fontFamily="@font/google_bold" android:alpha="0" + android:fontFamily="@font/google_bold" android:onClick="quit" android:text="" /> @@ -34,24 +35,80 @@ android:background="@drawable/rounded_white_on_top"> + + + android:layout_marginTop="70dp" + android:fontFamily="@font/google_medium" + android:text="@string/imjarvis" + android:textSize="25sp" /> - + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:layout_marginTop="105dp" + android:fontFamily="@font/google_light" + android:text="@string/howcanihelp" + android:textSize="20sp" /> + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6543432..d653f5e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,6 @@ Jarvis Client Android - Je vous écoute… + J\'écoute… + Salut, je suis Jarvis. + Dis moi comment je peux t\'aider. \ No newline at end of file