aarnaude / PFE

Commit e5e6f3efe64edd0e279eaf1238054be676704fe3

Authored by aarnaude
1 parent 2ff2b441

intégration noa à l'activité bravo, choix police, couleurs, dimensions.

Showing 20 changed files with 107 additions and 188 deletions   Show diff stats
Inline Side-by-side
app/src/main/java/tonio/noa/BravoActivity.java
  Show/Hide comments   View file @e5e6f3e
@@ -5,6 +5,7 @@ import android.content.Intent; @@ -5,6 +5,7 @@ import android.content.Intent;
5 import android.os.Bundle; 5 import android.os.Bundle;
6 import android.view.MotionEvent; 6 import android.view.MotionEvent;
7 import android.view.View; 7 import android.view.View;
  8 +import android.widget.TextView;
8 9
9 /** 10 /**
10 * Created by tonio on 23/11/17. 11 * Created by tonio on 23/11/17.
app/src/main/res/drawable/bulle_bd.png 0 → 100644
View file @e5e6f3e

37.1 KB
app/src/main/res/drawable/ic_launcher_background.xml
  Show/Hide comments   View file @e5e6f3e
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<vector xmlns:android="http://schemas.android.com/apk/res/android"  
3 - android:width="108dp" 2 +<vector
4 android:height="108dp" 3 android:height="108dp"
  4 + android:width="108dp"
5 android:viewportHeight="108" 5 android:viewportHeight="108"
6 - android:viewportWidth="108">  
7 - <path  
8 - android:fillColor="#26A69A"  
9 - android:pathData="M0,0h108v108h-108z" />  
10 - <path  
11 - android:fillColor="#00000000"  
12 - android:pathData="M9,0L9,108"  
13 - android:strokeColor="#33FFFFFF"  
14 - android:strokeWidth="0.8" />  
15 - <path  
16 - android:fillColor="#00000000"  
17 - android:pathData="M19,0L19,108"  
18 - android:strokeColor="#33FFFFFF"  
19 - android:strokeWidth="0.8" />  
20 - <path  
21 - android:fillColor="#00000000"  
22 - android:pathData="M29,0L29,108"  
23 - android:strokeColor="#33FFFFFF"  
24 - android:strokeWidth="0.8" />  
25 - <path  
26 - android:fillColor="#00000000"  
27 - android:pathData="M39,0L39,108"  
28 - android:strokeColor="#33FFFFFF"  
29 - android:strokeWidth="0.8" />  
30 - <path  
31 - android:fillColor="#00000000"  
32 - android:pathData="M49,0L49,108"  
33 - android:strokeColor="#33FFFFFF"  
34 - android:strokeWidth="0.8" />  
35 - <path  
36 - android:fillColor="#00000000"  
37 - android:pathData="M59,0L59,108"  
38 - android:strokeColor="#33FFFFFF"  
39 - android:strokeWidth="0.8" />  
40 - <path  
41 - android:fillColor="#00000000"  
42 - android:pathData="M69,0L69,108"  
43 - android:strokeColor="#33FFFFFF"  
44 - android:strokeWidth="0.8" />  
45 - <path  
46 - android:fillColor="#00000000"  
47 - android:pathData="M79,0L79,108"  
48 - android:strokeColor="#33FFFFFF"  
49 - android:strokeWidth="0.8" />  
50 - <path  
51 - android:fillColor="#00000000"  
52 - android:pathData="M89,0L89,108"  
53 - android:strokeColor="#33FFFFFF"  
54 - android:strokeWidth="0.8" />  
55 - <path  
56 - android:fillColor="#00000000"  
57 - android:pathData="M99,0L99,108"  
58 - android:strokeColor="#33FFFFFF"  
59 - android:strokeWidth="0.8" />  
60 - <path  
61 - android:fillColor="#00000000"  
62 - android:pathData="M0,9L108,9"  
63 - android:strokeColor="#33FFFFFF"  
64 - android:strokeWidth="0.8" />  
65 - <path  
66 - android:fillColor="#00000000"  
67 - android:pathData="M0,19L108,19"  
68 - android:strokeColor="#33FFFFFF"  
69 - android:strokeWidth="0.8" />  
70 - <path  
71 - android:fillColor="#00000000"  
72 - android:pathData="M0,29L108,29"  
73 - android:strokeColor="#33FFFFFF"  
74 - android:strokeWidth="0.8" />  
75 - <path  
76 - android:fillColor="#00000000"  
77 - android:pathData="M0,39L108,39"  
78 - android:strokeColor="#33FFFFFF"  
79 - android:strokeWidth="0.8" />  
80 - <path  
81 - android:fillColor="#00000000"  
82 - android:pathData="M0,49L108,49"  
83 - android:strokeColor="#33FFFFFF"  
84 - android:strokeWidth="0.8" />  
85 - <path  
86 - android:fillColor="#00000000"  
87 - android:pathData="M0,59L108,59"  
88 - android:strokeColor="#33FFFFFF"  
89 - android:strokeWidth="0.8" />  
90 - <path  
91 - android:fillColor="#00000000"  
92 - android:pathData="M0,69L108,69"  
93 - android:strokeColor="#33FFFFFF"  
94 - android:strokeWidth="0.8" />  
95 - <path  
96 - android:fillColor="#00000000"  
97 - android:pathData="M0,79L108,79"  
98 - android:strokeColor="#33FFFFFF"  
99 - android:strokeWidth="0.8" />  
100 - <path  
101 - android:fillColor="#00000000"  
102 - android:pathData="M0,89L108,89"  
103 - android:strokeColor="#33FFFFFF"  
104 - android:strokeWidth="0.8" />  
105 - <path  
106 - android:fillColor="#00000000"  
107 - android:pathData="M0,99L108,99"  
108 - android:strokeColor="#33FFFFFF"  
109 - android:strokeWidth="0.8" />  
110 - <path  
111 - android:fillColor="#00000000"  
112 - android:pathData="M19,29L89,29"  
113 - android:strokeColor="#33FFFFFF"  
114 - android:strokeWidth="0.8" />  
115 - <path  
116 - android:fillColor="#00000000"  
117 - android:pathData="M19,39L89,39"  
118 - android:strokeColor="#33FFFFFF"  
119 - android:strokeWidth="0.8" />  
120 - <path  
121 - android:fillColor="#00000000"  
122 - android:pathData="M19,49L89,49"  
123 - android:strokeColor="#33FFFFFF"  
124 - android:strokeWidth="0.8" />  
125 - <path  
126 - android:fillColor="#00000000"  
127 - android:pathData="M19,59L89,59"  
128 - android:strokeColor="#33FFFFFF"  
129 - android:strokeWidth="0.8" />  
130 - <path  
131 - android:fillColor="#00000000"  
132 - android:pathData="M19,69L89,69"  
133 - android:strokeColor="#33FFFFFF"  
134 - android:strokeWidth="0.8" />  
135 - <path  
136 - android:fillColor="#00000000"  
137 - android:pathData="M19,79L89,79"  
138 - android:strokeColor="#33FFFFFF"  
139 - android:strokeWidth="0.8" />  
140 - <path  
141 - android:fillColor="#00000000"  
142 - android:pathData="M29,19L29,89"  
143 - android:strokeColor="#33FFFFFF"  
144 - android:strokeWidth="0.8" />  
145 - <path  
146 - android:fillColor="#00000000"  
147 - android:pathData="M39,19L39,89"  
148 - android:strokeColor="#33FFFFFF"  
149 - android:strokeWidth="0.8" />  
150 - <path  
151 - android:fillColor="#00000000"  
152 - android:pathData="M49,19L49,89"  
153 - android:strokeColor="#33FFFFFF"  
154 - android:strokeWidth="0.8" />  
155 - <path  
156 - android:fillColor="#00000000"  
157 - android:pathData="M59,19L59,89"  
158 - android:strokeColor="#33FFFFFF"  
159 - android:strokeWidth="0.8" />  
160 - <path  
161 - android:fillColor="#00000000"  
162 - android:pathData="M69,19L69,89"  
163 - android:strokeColor="#33FFFFFF"  
164 - android:strokeWidth="0.8" />  
165 - <path  
166 - android:fillColor="#00000000"  
167 - android:pathData="M79,19L79,89"  
168 - android:strokeColor="#33FFFFFF"  
169 - android:strokeWidth="0.8" /> 6 + android:viewportWidth="108"
  7 + xmlns:android="http://schemas.android.com/apk/res/android">
  8 + <path android:fillColor="#26A69A"
  9 + android:pathData="M0,0h108v108h-108z"/>
  10 + <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
  11 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  12 + <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
  13 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  14 + <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
  15 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  16 + <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
  17 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  18 + <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
  19 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  20 + <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
  21 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  22 + <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
  23 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  24 + <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
  25 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  26 + <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
  27 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  28 + <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
  29 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  30 + <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
  31 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  32 + <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
  33 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  34 + <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
  35 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  36 + <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
  37 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  38 + <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
  39 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  40 + <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
  41 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  42 + <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
  43 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  44 + <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
  45 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  46 + <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
  47 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  48 + <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
  49 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  50 + <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
  51 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  52 + <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
  53 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  54 + <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
  55 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  56 + <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
  57 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  58 + <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
  59 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  60 + <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
  61 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  62 + <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
  63 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  64 + <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
  65 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  66 + <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
  67 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  68 + <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
  69 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  70 + <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
  71 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
  72 + <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
  73 + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
170 </vector> 74 </vector>
app/src/main/res/drawable/noa_bravo.png 0 → 100644
View file @e5e6f3e

164 KB
app/src/main/res/drawable/noa_consigne.png 0 → 100644
View file @e5e6f3e

164 KB
app/src/main/res/layout/bravo_display.xml
  Show/Hide comments   View file @e5e6f3e
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:id="@+id/bravo_view"
3 android:layout_width="match_parent" 4 android:layout_width="match_parent"
4 android:layout_height="match_parent" 5 android:layout_height="match_parent"
5 - android:focusable="true"  
6 android:clickable="true" 6 android:clickable="true"
  7 + android:focusable="true"
7 android:focusableInTouchMode="true" 8 android:focusableInTouchMode="true"
8 - android:id="@+id/bravo_view"  
9 android:orientation="vertical"> 9 android:orientation="vertical">
10 10
11 - <TextView 11 + <ImageView
12 android:layout_width="wrap_content" 12 android:layout_width="wrap_content"
13 android:layout_height="wrap_content" 13 android:layout_height="wrap_content"
14 - android:layout_alignParentTop="true"  
15 - android:layout_centerHorizontal="true"  
16 - android:text="Bien joué! Touche l'écran pour continuer à jouer!"  
17 - android:textStyle="bold"/> 14 + android:layout_alignParentBottom="true"
  15 + android:layout_alignParentStart="true"
  16 + android:layout_margin="20dp"
  17 + android:adjustViewBounds="true"
  18 + android:maxWidth="400dp"
  19 + android:src="@drawable/noa_bravo" />
18 20
19 - <ImageView 21 + <TextView
  22 + android:id="@+id/bravo"
20 android:layout_width="wrap_content" 23 android:layout_width="wrap_content"
21 android:layout_height="wrap_content" 24 android:layout_height="wrap_content"
22 - android:layout_centerInParent="true"  
23 - android:maxHeight="50dp"  
24 - android:src="@drawable/bravo" /> 25 + android:layout_margin="50dp"
  26 + android:layout_centerHorizontal="true"
  27 + android:gravity="center"
  28 + android:maxLines="3"
  29 + android:text="Bravo !\nTu as réussi la mission.\nClique sur l'écran pour continuer à jouer."
  30 + android:textAppearance="@style/TextFont"/>
25 31
26 </RelativeLayout> 32 </RelativeLayout>
27 \ No newline at end of file 33 \ No newline at end of file
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  Show/Hide comments   View file @e5e6f3e
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> 2 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3 - <background android:drawable="@drawable/ic_launcher_background" />  
4 - <foreground android:drawable="@drawable/ic_launcher_foreground" /> 3 + <background android:drawable="@drawable/ic_launcher_background"/>
  4 + <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
5 </adaptive-icon> 5 </adaptive-icon>
6 \ No newline at end of file 6 \ No newline at end of file
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  Show/Hide comments   View file @e5e6f3e
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> 2 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3 - <background android:drawable="@drawable/ic_launcher_background" />  
4 - <foreground android:drawable="@drawable/ic_launcher_foreground" /> 3 + <background android:drawable="@drawable/ic_launcher_background"/>
  4 + <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
5 </adaptive-icon> 5 </adaptive-icon>
6 \ No newline at end of file 6 \ No newline at end of file
app/src/main/res/mipmap-hdpi/ic_launcher.png
View file @e5e6f3e

2.98 KB | W: | H:

3.89 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
View file @e5e6f3e

4.91 KB | W: | H:

6.13 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-mdpi/ic_launcher.png
View file @e5e6f3e

2.05 KB | W: | H:

2.44 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
View file @e5e6f3e

2.79 KB | W: | H:

3.42 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xhdpi/ic_launcher.png
View file @e5e6f3e

4.46 KB | W: | H:

6.21 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
View file @e5e6f3e

6.93 KB | W: | H:

9.15 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View file @e5e6f3e

6.31 KB | W: | H:

9.92 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
View file @e5e6f3e

10.4 KB | W: | H:

14.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View file @e5e6f3e

9.03 KB | W: | H:

14.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
View file @e5e6f3e

15.2 KB | W: | H:

22.3 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/values/colors.xml
  Show/Hide comments   View file @e5e6f3e
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <resources> 2 <resources>
3 - <color name="colorPrimary">#3F51B5</color>  
4 - <color name="colorPrimaryDark">#303F9F</color>  
5 - <color name="colorAccent">#FF4081</color> 3 + <color name="colorPrimary">#69BADD</color>
  4 + <color name="colorPrimaryDark">#065679</color>
  5 + <color name="colorAccent">#FFBD73</color>
6 </resources> 6 </resources>
app/src/main/res/values/styles.xml
  Show/Hide comments   View file @e5e6f3e
1 <resources> 1 <resources>
2 2
3 <!-- Base application theme. --> 3 <!-- Base application theme. -->
4 - <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> 4 + <style name="AppTheme">
5 <!-- Customize your theme here. --> 5 <!-- Customize your theme here. -->
6 - <item name="colorPrimary">@color/colorPrimary</item>  
7 - <item name="colorPrimaryDark">@color/colorPrimaryDark</item>  
8 - <item name="colorAccent">@color/colorAccent</item> 6 + <item name="colorPrimary">#69BADD</item>
  7 + <item name="colorPrimaryDark">#065679</item>
  8 + <item name="colorAccent">#FFBD73</item>
  9 + </style>
  10 +
  11 + <style name="TextFont">
  12 + <item name="android:textColor">#065679</item>
  13 + <item name="android:textStyle">bold</item>
  14 + <item name="android:textSize">30sp</item>
  15 + <item name="android:typeface">monospace</item>
  16 + <item name="android:fontFamily">arial</item>
9 </style> 17 </style>
10 18
11 </resources> 19 </resources>