From d1e7eb0cb30cab613326a990d548db67be811ab8 Mon Sep 17 00:00:00 2001 From: Mathieu Date: Fri, 15 Oct 2021 23:33:37 +0200 Subject: [PATCH] Added logo, microphone and improved UI a lot + fixed not starting in background --- .idea/misc.xml | 48 ++++++---- app/build.gradle | 2 +- .../jarvis/android/ListeningActivity.java | 15 ++++ .../jarvis/android/PorcupineService.java | 3 +- app/src/main/res/drawable/logo.png | Bin 0 -> 24762 bytes app/src/main/res/drawable/microphone.xml | 10 +++ .../main/res/layout/activity_listening.xml | 83 +++++++++++++++--- app/src/main/res/values/strings.xml | 4 +- 8 files changed, 130 insertions(+), 35 deletions(-) create mode 100644 app/src/main/res/drawable/logo.png create mode 100644 app/src/main/res/drawable/microphone.xml 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 0000000000000000000000000000000000000000..58c41009cabfa1447c9678fc973e81defb4b673b GIT binary patch literal 24762 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 + + 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