From 9bc005696dfa2d1dfe29bee2924274e25cc0467e Mon Sep 17 00:00:00 2001
From: r-zakarya <82443831+r-zakarya@users.noreply.github.com>
Date: Sun, 16 Aug 2026 22:18:16 +0100
Subject: [PATCH] fix(android): a field should look recessed, a button raised

They carried the same fill and the same pill, so the password field looked like a command. A field now holds 10 per cent white against a button's 18 and a main action's 30 - hollow against raised, which is the only cue left once borders are gone.

The settings panel also reclaimed the top of the screen, above the title: created hidden, FMX moves it to the head of the stack when it becomes visible. Its position is now reasserted each time it appears.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 android-client/theme/make-style.ps1 | 5 ++++-
 android-client/theme/pm-dark.style  | 4 ++--
 mainApk.pas                         | 5 +++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/android-client/theme/make-style.ps1 b/android-client/theme/make-style.ps1
index 9325217..390eb8c 100644
--- a/android-client/theme/make-style.ps1
+++ b/android-client/theme/make-style.ps1
@@ -19,7 +19,10 @@ $src = 'C:\Program Files (x86)\Embarcadero\Studio\23.0\Redist\styles\Fmx\Dark.st
 $dst = Join-Path $PSScriptRoot 'pm-dark.style'
 
 # Doivent suivre les constantes de PMA.Theme.
-$surface = 'x2EFFFFFF'   # COL_RAISED : blanc translucide, sans bordure
+# Un champ est CREUX : moins de blanc qu'un bouton (18 %) et bien moins que
+# l'action principale (30 %). Sans cet ecart, une saisie ressemble a une
+# commande - le mot de passe avait l'air d'un bouton.
+$surface = 'x1AFFFFFF'
 $border  = 'x00000000'   # plus de filet : la reference n'en a aucun
 $text    = 'xFFFFFFFF'   # COL_TEXT
 
diff --git a/android-client/theme/pm-dark.style b/android-client/theme/pm-dark.style
index 38c7299..509de97 100644
--- a/android-client/theme/pm-dark.style
+++ b/android-client/theme/pm-dark.style
@@ -2075,7 +2075,7 @@
     object TRectangle
       StyleName = 'background'
       Align = Contents
-      Fill.Color = x2EFFFFFF
+      Fill.Color = x1AFFFFFF
       Locked = True
       Height = 22.000000000000000000
       HitTest = False
@@ -2509,7 +2509,7 @@
     object TRectangle
       StyleName = 'background'
       Align = Contents
-      Fill.Color = x2EFFFFFF
+      Fill.Color = x1AFFFFFF
       Locked = True
       Height = 131.000000000000000000
       HitTest = False
diff --git a/mainApk.pas b/mainApk.pas
index 56db60e..229f8ce 100644
--- a/mainApk.pas
+++ b/mainApk.pas
@@ -875,6 +875,11 @@ end;
 procedure TForm8.OnToggleSettings(Sender: TObject);
 begin
   FLaySettings.Visible := not FLaySettings.Visible;
+  // Sa place doit etre REPOSEE a chaque apparition : cree masque, FMX le
+  // replace en tete de la pile quand il devient visible, et les deux champs
+  // se retrouvaient au-dessus du titre. Index 0 le renvoie en bas, juste
+  // au-dessus du journal, ou on attend des reglages.
+  if FLaySettings.Visible then FLaySettings.Index := 0;
 end;
 
 procedure TForm8.OnToggleLog(Sender: TObject);