diff --git a/android-client/android-res/drawable-hdpi/ic_launcher.png b/android-client/android-res/drawable-hdpi/ic_launcher.png
index 2354391..edbd6c1 100644
Binary files a/android-client/android-res/drawable-hdpi/ic_launcher.png and b/android-client/android-res/drawable-hdpi/ic_launcher.png differ
diff --git a/android-client/android-res/drawable-ldpi/ic_launcher.png b/android-client/android-res/drawable-ldpi/ic_launcher.png
index da0d55c..3ef09c8 100644
Binary files a/android-client/android-res/drawable-ldpi/ic_launcher.png and b/android-client/android-res/drawable-ldpi/ic_launcher.png differ
diff --git a/android-client/android-res/drawable-mdpi/ic_launcher.png b/android-client/android-res/drawable-mdpi/ic_launcher.png
index 1835a14..6b143d3 100644
Binary files a/android-client/android-res/drawable-mdpi/ic_launcher.png and b/android-client/android-res/drawable-mdpi/ic_launcher.png differ
diff --git a/android-client/android-res/drawable-xhdpi/ic_launcher.png b/android-client/android-res/drawable-xhdpi/ic_launcher.png
index 9bea851..cb7c251 100644
Binary files a/android-client/android-res/drawable-xhdpi/ic_launcher.png and b/android-client/android-res/drawable-xhdpi/ic_launcher.png differ
diff --git a/android-client/android-res/drawable-xxhdpi/ic_launcher.png b/android-client/android-res/drawable-xxhdpi/ic_launcher.png
index 82ca917..910d884 100644
Binary files a/android-client/android-res/drawable-xxhdpi/ic_launcher.png and b/android-client/android-res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/android-client/android-res/drawable-xxxhdpi/ic_launcher.png b/android-client/android-res/drawable-xxxhdpi/ic_launcher.png
index ec6e195..d2a3e78 100644
Binary files a/android-client/android-res/drawable-xxxhdpi/ic_launcher.png and b/android-client/android-res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/android-client/android-res/drawable/ic_launcher_background.xml b/android-client/android-res/drawable/ic_launcher_background.xml
index 0786163..dcb79f4 100644
--- a/android-client/android-res/drawable/ic_launcher_background.xml
+++ b/android-client/android-res/drawable/ic_launcher_background.xml
@@ -1,13 +1,16 @@
-
+
+ android:fillColor="#1B3563"
+ android:pathData="M0,0 L108,0 L108,108 L0,108 Z" />
diff --git a/android-client/android-res/drawable/ic_launcher_foreground.xml b/android-client/android-res/drawable/ic_launcher_foreground.xml
index 7edb508..ad67b05 100644
--- a/android-client/android-res/drawable/ic_launcher_foreground.xml
+++ b/android-client/android-res/drawable/ic_launcher_foreground.xml
@@ -1,29 +1,26 @@
-
+ peut etre rogne selon le lanceur. Le dessin occupe 31..77 en x, 29..82
+ en y.
+
+ UN SEUL CHEMIN, EN EVENODD. La serrure n'est pas peinte de la couleur du
+ fond, elle est EVIDEE : le fond se voit au travers. Peinte, elle imposerait
+ de tenir deux fichiers d'accord sur une couleur, et le moindre ecart se
+ verrait comme une tache. Evidee, il n'y a rien a synchroniser.
+
+ Blanc plein plutot qu'un trait bleu : a 36 px un contour se boue, une
+ silhouette pleine tient. -->
-
-
-
-
-
-
+ android:fillColor="#FFFFFF"
+ android:fillType="evenOdd"
+ android:pathData="M54,29 L77,37 L77,56 C77,69.5 67,78 54,82 C41,78 31,69.5 31,56 L31,37 Z
+ M54,50 m-7,0 a7,7 0 1,0 14,0 a7,7 0 1,0 -14,0 Z
+ M51,55.5 L57,55.5 L58.6,70 L49.4,70 Z" />
diff --git a/android-client/android-res/drawable/ic_launcher_monochrome.xml b/android-client/android-res/drawable/ic_launcher_monochrome.xml
index f729035..0145ab3 100644
--- a/android-client/android-res/drawable/ic_launcher_monochrome.xml
+++ b/android-client/android-res/drawable/ic_launcher_monochrome.xml
@@ -1,22 +1,17 @@
-
+
-
+ android:pathData="M54,29 L77,37 L77,56 C77,69.5 67,78 54,82 C41,78 31,69.5 31,56 L31,37 Z
+ M54,50 m-7,0 a7,7 0 1,0 14,0 a7,7 0 1,0 -14,0 Z
+ M51,55.5 L57,55.5 L58.6,70 L49.4,70 Z" />
diff --git a/android-client/android-res/drawable/splash_vector.xml b/android-client/android-res/drawable/splash_vector.xml
index 9a2cee3..f1453bf 100644
--- a/android-client/android-res/drawable/splash_vector.xml
+++ b/android-client/android-res/drawable/splash_vector.xml
@@ -2,26 +2,25 @@
+ le dessin occupe 103..186, bien a l'interieur.
+ Meme bouclier que l'icone du lanceur, a l'echelle.
+
+ ICI LA SERRURE EST PEINTE, pas evidee : la couche de demarrage est posee
+ a plat sur le fond du systeme, et un evidement y ferait un trou. Elle est
+ entierement contenue dans le bouclier blanc, donc sa couleur n'a qu'a
+ trancher sur du blanc - elle ne depend d'aucun autre fichier. -->
+ android:fillColor="#FFFFFF"
+ android:pathData="M144,96.3 L185.4,110.7 L185.4,144.9 C185.4,169.2 167.4,184.5 144,191.7 C120.6,184.5 102.6,169.2 102.6,144.9 L102.6,110.7 Z" />
+ android:fillColor="#1B3563"
+ android:pathData="M144,134.1 m-12.6,0 a12.6,12.6 0 1,0 25.2,0 a12.6,12.6 0 1,0 -25.2,0 Z" />
-
+ android:fillColor="#1B3563"
+ android:pathData="M138.6,144 L149.4,144 L152.3,170.1 L135.7,170.1 Z" />
diff --git a/android-client/android-res/values/colors.xml b/android-client/android-res/values/colors.xml
index 8411c8b..a3a5529 100644
--- a/android-client/android-res/values/colors.xml
+++ b/android-client/android-res/values/colors.xml
@@ -3,5 +3,7 @@
ecran de demarrage blanc suivi d'une application sombre donne un flash
desagreable a chaque lancement. -->
- #0F172A
+
+ #3E6394
diff --git a/android-client/make-icons.ps1 b/android-client/make-icons.ps1
index 08a9f50..c58f020 100644
--- a/android-client/make-icons.ps1
+++ b/android-client/make-icons.ps1
@@ -1,6 +1,6 @@
# Genere les icones PNG du lanceur, pour Android < 8 qui ignore les icones
# adaptatives. Meme dessin que les vecteurs de android-res\drawable :
-# cadenas cyan sur ardoise.
+# bouclier blanc a serrure, sur le bleu de l'application.
#
# A relancer seulement si le dessin change ; les PNG sont suivis par git.
@@ -8,8 +8,8 @@ $ErrorActionPreference = 'Stop'
Add-Type -AssemblyName System.Drawing
$root = Join-Path $PSScriptRoot 'android-res'
-$bg = [System.Drawing.Color]::FromArgb(255, 15, 23, 42) # #0F172A
-$fg = [System.Drawing.Color]::FromArgb(255, 59, 130, 246) # #3B82F6
+$bg = [System.Drawing.Color]::FromArgb(255, 27, 53, 99) # #1B3563
+$fg = [System.Drawing.Color]::FromArgb(255, 255, 255, 255) # blanc
# densite -> cote en pixels, tel qu'Android les attend
$sizes = @{ 'drawable-ldpi' = 36; 'drawable-mdpi' = 48; 'drawable-hdpi' = 72
@@ -38,29 +38,37 @@ foreach ($dir in $sizes.Keys) {
# Echelle : le dessin vectoriel vit dans un carre de 108.
$u = $n / 108.0
$brush = New-Object System.Drawing.SolidBrush $fg
- $pen = New-Object System.Drawing.Pen $fg, ([float](5.5 * $u))
- $pen.StartCap = 'Round'; $pen.EndCap = 'Round'
- # Anse : demi-cercle ouvert vers le bas, puis deux montants.
- $g.DrawArc($pen, [float](44*$u), [float](37*$u), [float](20*$u), [float](20*$u), 180, 180)
- $g.DrawLine($pen, [float](44*$u), [float](47*$u), [float](44*$u), [float](56*$u))
- $g.DrawLine($pen, [float](64*$u), [float](47*$u), [float](64*$u), [float](56*$u))
+ # Bouclier : sommet, epaules, montants, puis les deux courbes qui se
+ # rejoignent en pointe. Memes coordonnees que ic_launcher_foreground.xml.
+ $s = New-Object System.Drawing.Drawing2D.GraphicsPath
+ $s.AddLines(@(
+ (New-Object System.Drawing.PointF ([float](54*$u), [float](29*$u))),
+ (New-Object System.Drawing.PointF ([float](77*$u), [float](37*$u))),
+ (New-Object System.Drawing.PointF ([float](77*$u), [float](56*$u)))))
+ $s.AddBezier(
+ [float](77*$u), [float](56*$u), [float](77*$u), [float](69.5*$u),
+ [float](67*$u), [float](78*$u), [float](54*$u), [float](82*$u))
+ $s.AddBezier(
+ [float](54*$u), [float](82*$u), [float](41*$u), [float](78*$u),
+ [float](31*$u), [float](69.5*$u), [float](31*$u), [float](56*$u))
+ $s.AddLine([float](31*$u), [float](56*$u), [float](31*$u), [float](37*$u))
+ $s.CloseFigure()
+ $g.FillPath($brush, $s)
- # Corps
- $body = New-Object System.Drawing.Drawing2D.GraphicsPath
- $bx = 34*$u; $by = 54*$u; $bw = 40*$u; $bh = 26*$u; $br = 4*$u
- $body.AddArc([float]$bx, [float]$by, [float](2*$br), [float](2*$br), 180, 90)
- $body.AddArc([float]($bx+$bw-2*$br), [float]$by, [float](2*$br), [float](2*$br), 270, 90)
- $body.AddArc([float]($bx+$bw-2*$br), [float]($by+$bh-2*$br), [float](2*$br), [float](2*$br), 0, 90)
- $body.AddArc([float]$bx, [float]($by+$bh-2*$br), [float](2*$br), [float](2*$br), 90, 90)
- $body.CloseFigure()
- $g.FillPath($brush, $body)
-
- # Serrure, evidee dans la couleur du fond
+ # Serrure, evidee dans la couleur du fond. Le vecteur y arrive par un
+ # remplissage pair-impair ; ici, repeindre par-dessus revient au meme,
+ # l'icone ancienne etant de toute facon opaque.
$bgBrush = New-Object System.Drawing.SolidBrush $bg
- $g.FillEllipse($bgBrush, [float](50*$u), [float](58*$u), [float](8*$u), [float](8*$u))
- $g.FillRectangle($bgBrush, [float](52.4*$u), [float](64*$u), [float](3.2*$u), [float](9*$u))
-
+ $g.FillEllipse($bgBrush, [float](47*$u), [float](43*$u), [float](14*$u), [float](14*$u))
+ $slot = New-Object System.Drawing.Drawing2D.GraphicsPath
+ $slot.AddLines(@(
+ (New-Object System.Drawing.PointF ([float](51*$u), [float](55.5*$u))),
+ (New-Object System.Drawing.PointF ([float](57*$u), [float](55.5*$u))),
+ (New-Object System.Drawing.PointF ([float](58.6*$u), [float](70*$u))),
+ (New-Object System.Drawing.PointF ([float](49.4*$u), [float](70*$u)))))
+ $slot.CloseFigure()
+ $g.FillPath($bgBrush, $slot)
$g.Dispose()
$bmp.Save((Join-Path $out 'ic_launcher.png'), [System.Drawing.Imaging.ImageFormat]::Png)
$bmp.Dispose()