One theme : Theme.Robotise and Elevated button everywhere

app/src/main/AndroidManifest.xml

@@ -38,7 +38,7 @@
 
         <activity
             android:configChanges="orientation"
-            android:theme="@style/Theme.Robotise.BlueLagoon"
+            android:theme="@style/Theme.Robotise"
             android:exported="true"
             tools:ignore="IntentFilterExportedReceiver"
             android:name=".control.LoginActivity">
@@ -70,7 +70,7 @@
         </activity>
         <activity
             android:name=".control.PopUpCocktail"
-            android:theme="@style/Theme.Robotise.BlueLagoon"
+            android:theme="@style/Theme.Robotise"
             android:exported="true"
             tools:ignore="IntentFilterExportedReceiver">
             <intent-filter>
@@ -80,7 +80,7 @@
         <activity
             android:name=".control.AdminMajQuantityActivity"
             android:configChanges="orientation"
-            android:theme="@style/Theme.Robotise.BlueLagoon"
+            android:theme="@style/Theme.Robotise"
             android:exported="true"
             tools:ignore="IntentFilterExportedReceiver">
             <intent-filter>
@@ -91,7 +91,7 @@
         <activity
             android:name=".control.AdminMajListIngredientActivity"
             android:configChanges="orientation"
-            android:theme="@style/Theme.Robotise.BlueLagoon"
+            android:theme="@style/Theme.Robotise"
             android:exported="true"
             tools:ignore="IntentFilterExportedReceiver">
             <intent-filter>

app/src/main/res/layout/admin_activity.xml

@@ -49,44 +49,56 @@
             android:gravity="center"
             android:orientation="vertical">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                android:theme = "@style/Widget.Material3.Button.ElevatedButton"
                 android:id="@+id/admin_choisir_cocktail"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginHorizontal="20dp"
                 android:layout_height="wrap_content"
                 android:text="Choisir un cocktail"
                 android:textAlignment="center" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                android:theme = "@style/Widget.Material3.Button.ElevatedButton"
                 android:id="@+id/admin_ajouter_cocktail"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginHorizontal="20dp"
                 android:layout_height="wrap_content"
                 android:text="Ajouter cocktail"
                 android:textAlignment="center" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                android:theme = "@style/Widget.Material3.Button.ElevatedButton"
                 android:id="@+id/admin_nettoyer_machine"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginHorizontal="20dp"
                 android:layout_height="wrap_content"
                 android:text="Nettoyer machine"
                 android:textAlignment="center" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                android:theme = "@style/Widget.Material3.Button.ElevatedButton"
                 android:id="@+id/admin_maj_machine"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginHorizontal="20dp"
                 android:layout_height="wrap_content"
                 android:text="Récupérer cocktails de la machine"
                 android:textAlignment="center" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                android:theme = "@style/Widget.Material3.Button.ElevatedButton"
                 android:id="@+id/admin_maj_ingrédients"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginHorizontal="20dp"
                 android:layout_height="wrap_content"
                 android:text="Mettre à jour la liste des ingrédients"
                 android:textAlignment="center" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                android:theme = "@style/Widget.Material3.Button.ElevatedButton"
                 android:id="@+id/admin_maj_quantite"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginHorizontal="20dp"
                 android:layout_height="wrap_content"
                 android:text="Mettre à jour les quantités"
                 android:textAlignment="center" />

app/src/main/res/layout/admin_maj_list.xml

@@ -79,8 +79,9 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="2" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/button_ajout_liquide"
+                    android:theme="@style/Widget.Material3.Button.ElevatedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:minWidth="50dp"
@@ -88,8 +89,9 @@
             </LinearLayout>
 
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/majsuite"
+                android:theme="@style/Widget.Material3.Button.ElevatedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"

app/src/main/res/layout/admin_maj_quantite.xml

@@ -66,8 +66,9 @@
                 android:listSelector="#600"/>
 
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/majBDQuantité"
+                android:theme="@style/Widget.Material3.Button.ElevatedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"

app/src/main/res/layout/cocktail_item.xml

@@ -55,8 +55,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/commanderCocktail"
+                android:theme="@style/Widget.Material3.Button.ElevatedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"

app/src/main/res/layout/info_cocktail.xml

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/retour"
             android:text = "Retour"
             android:layout_width="wrap_content"
@@ -21,8 +21,7 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
-            android:background="@color/teal_200"
-            android:textColor="@color/black"
+            android:theme = "@style/Widget.Material3.Button.ElevatedButton"
             app:icon="@android:drawable/ic_delete" />
 
         <TableLayout
@@ -37,15 +36,14 @@
                 android:gravity="top"
                 android:minHeight="300dp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/nomCocktail"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="100dp"
-                android:background="@color/teal_200"
+                android:theme="@style/Widget.Material3.Button.ElevatedButton"
                 android:textAlignment="center"
-                android:textSize="20dp"
                 tools:ignore="TextContrastCheck,TextContrastCheck" />
 
 
@@ -55,20 +53,18 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_margin="10dp"
-                android:dividerHeight="0dp"
-                android:listSelector="#600" />
+                android:dividerHeight="0dp"/>
 
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/commanderCocktail"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="100dp"
-                android:background="@color/teal_200"
+                android:theme = "@style/Widget.Material3.Button.ElevatedButton"
                 android:text="Commander"
                 android:textAlignment="center"
-                android:textSize="20dp"
                 tools:ignore="TextContrastCheck" />
         </TableLayout>
 

app/src/main/res/layout/login_activity.xml

@@ -88,8 +88,9 @@
                 android:inputType="textPassword"
                 android:visibility="gone" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/buttonValiderFirst"
+                android:theme="@style/Widget.Material3.Button.ElevatedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Valider" />

app/src/main/res/values/themes.xml

@@ -6,8 +6,8 @@
         <item name="colorPrimaryVariant">@color/SOTB</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorSecondary">@color/purple_200</item>
+        <item name="colorSecondaryVariant">@color/purple_500</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>