From e5e6f3efe64edd0e279eaf1238054be676704fe3 Mon Sep 17 00:00:00 2001 From: aarnaude Date: Mon, 22 Jan 2018 16:10:35 +0100 Subject: [PATCH] intégration noa à l'activité bravo, choix police, couleurs, dimensions. --- app/src/main/java/tonio/noa/BravoActivity.java | 1 + app/src/main/res/drawable/bulle_bd.png | Bin 0 -> 38019 bytes app/src/main/res/drawable/ic_launcher_background.xml | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------- app/src/main/res/drawable/noa_bravo.png | Bin 0 -> 167673 bytes app/src/main/res/drawable/noa_consigne.png | Bin 0 -> 168026 bytes app/src/main/res/layout/bravo_display.xml | 28 +++++++++++++++++----------- app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 4 ++-- app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml | 4 ++-- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3056 -> 0 bytes app/src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 5024 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2096 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2858 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4569 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 7098 -> 0 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 6464 -> 0 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10676 -> 0 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 9250 -> 0 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 15523 -> 0 bytes app/src/main/res/values/colors.xml | 6 +++--- app/src/main/res/values/styles.xml | 16 ++++++++++++---- 20 files changed, 107 insertions(+), 188 deletions(-) create mode 100644 app/src/main/res/drawable/bulle_bd.png create mode 100644 app/src/main/res/drawable/noa_bravo.png create mode 100644 app/src/main/res/drawable/noa_consigne.png diff --git a/app/src/main/java/tonio/noa/BravoActivity.java b/app/src/main/java/tonio/noa/BravoActivity.java index 4cba385..0ca581a 100644 --- a/app/src/main/java/tonio/noa/BravoActivity.java +++ b/app/src/main/java/tonio/noa/BravoActivity.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Bundle; import android.view.MotionEvent; import android.view.View; +import android.widget.TextView; /** * Created by tonio on 23/11/17. diff --git a/app/src/main/res/drawable/bulle_bd.png b/app/src/main/res/drawable/bulle_bd.png new file mode 100644 index 0000000..85cf95b Binary files /dev/null and b/app/src/main/res/drawable/bulle_bd.png differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index d5fccc5..01f0af0 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:viewportWidth="108" + xmlns:android="http://schemas.android.com/apk/res/android"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/noa_bravo.png b/app/src/main/res/drawable/noa_bravo.png new file mode 100644 index 0000000..7cfa842 Binary files /dev/null and b/app/src/main/res/drawable/noa_bravo.png differ diff --git a/app/src/main/res/drawable/noa_consigne.png b/app/src/main/res/drawable/noa_consigne.png new file mode 100644 index 0000000..276842e Binary files /dev/null and b/app/src/main/res/drawable/noa_consigne.png differ diff --git a/app/src/main/res/layout/bravo_display.xml b/app/src/main/res/layout/bravo_display.xml index a106dfa..87d013b 100644 --- a/app/src/main/res/layout/bravo_display.xml +++ b/app/src/main/res/layout/bravo_display.xml @@ -1,26 +1,32 @@ - + android:layout_alignParentBottom="true" + android:layout_alignParentStart="true" + android:layout_margin="20dp" + android:adjustViewBounds="true" + android:maxWidth="400dp" + android:src="@drawable/noa_bravo" /> - + android:layout_margin="50dp" + android:layout_centerHorizontal="true" + android:gravity="center" + android:maxLines="3" + android:text="Bravo !\nTu as réussi la mission.\nClique sur l'écran pour continuer à jouer." + android:textAppearance="@style/TextFont"/> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index eca70cf..c4a603d 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cf..c4a603d 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a2f5908..25930e0 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 1b52399..7cdd4ad 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index ff10afd..6b1371c 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 115a4c7..8248539 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index dcd3cd8..45a459c 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 459ca60..32d275c 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 8ca12fe..af84634 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 8e19b41..6319e9d 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index b824ebd..914abf8 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 4c19a13..38e5003 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3ab3e9c..44be8ee 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ - #3F51B5 - #303F9F - #FF4081 + #69BADD + #065679 + #FFBD73 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5885930..4934a9e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,11 +1,19 @@ - + + -- libgit2 0.21.2