Skip to content
Extraits de code Groupes Projets
Valider b4e88585 rédigé par RomainFo's avatar RomainFo
Parcourir les fichiers

dark theme

parent 8e5d39a0
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!22Design
Affichage de avec 23 ajouts et 34 suppressions
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="5dp" /> <corners android:radius="5dp" />
<solid android:color="#000000" /> <solid android:color="@color/orange" />
</shape> </shape>
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Deconnexion" android:text="Deconnexion"
android:backgroundTint="@color/orange"
app:layout_constraintBottom_toBottomOf="@+id/relativeLayout" app:layout_constraintBottom_toBottomOf="@+id/relativeLayout"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/bwhite"
tools:context=".MainActivity"> tools:context=".MainActivity">
<Button <Button
...@@ -51,7 +50,6 @@ ...@@ -51,7 +50,6 @@
android:fontFamily="@font/poppins_extrabold" android:fontFamily="@font/poppins_extrabold"
android:gravity="center" android:gravity="center"
android:text="" android:text=""
android:textColor="#454040"
android:textSize="24sp" android:textSize="24sp"
android:translationY="40dp" android:translationY="40dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -66,7 +64,6 @@ ...@@ -66,7 +64,6 @@
android:fontFamily="@font/poppins" android:fontFamily="@font/poppins"
android:gravity="center" android:gravity="center"
android:text="toucher les noms des exercices pour plus de détails" android:text="toucher les noms des exercices pour plus de détails"
android:textColor="#3A3535"
android:textSize="12sp" android:textSize="12sp"
android:translationY="65dp" android:translationY="65dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/bwhite"
tools:context=".MainActivity"> tools:context=".MainActivity">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
...@@ -44,7 +43,6 @@ ...@@ -44,7 +43,6 @@
android:fontFamily="@font/poppins_semibold" android:fontFamily="@font/poppins_semibold"
android:gravity="center" android:gravity="center"
android:text="@string/bienvenue_message" android:text="@string/bienvenue_message"
android:textColor="#1E2432"
android:textSize="29sp" android:textSize="29sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -65,7 +63,8 @@ ...@@ -65,7 +63,8 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:src="@drawable/user"/> android:src="@drawable/user"
app:tint="@color/orange" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
...@@ -99,9 +98,7 @@ ...@@ -99,9 +98,7 @@
android:id="@+id/program_creation_button" android:id="@+id/program_creation_button"
android:layout_width="318dp" android:layout_width="318dp"
android:layout_height="37dp" android:layout_height="37dp"
android:background="@drawable/homepage_add_prog"
android:backgroundTint="@color/orange" android:backgroundTint="@color/orange"
android:backgroundTintMode="add"
android:clipToOutline="true" android:clipToOutline="true"
android:text="Créer un programme" /> android:text="Créer un programme" />
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
android:layout_marginTop="25dp" android:layout_marginTop="25dp"
android:fontFamily="@font/poppins_semibold" android:fontFamily="@font/poppins_semibold"
android:text="" android:text=""
android:textColor="@color/bwhite"
android:textSize="20dp" android:textSize="20dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -24,7 +25,6 @@ ...@@ -24,7 +25,6 @@
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:backgroundTint="@color/light_grey"
android:fontFamily="@font/poppins_semibold" android:fontFamily="@font/poppins_semibold"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="1dp" android:paddingTop="1dp"
......
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="@color/bwhite">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
...@@ -80,7 +79,6 @@ ...@@ -80,7 +79,6 @@
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:background="@color/orange" android:background="@color/orange"
android:text="Sauvegarder modifications" android:text="Sauvegarder modifications"
android:textColor="@color/white"
android:textSize="16sp" /> android:textSize="16sp" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
...@@ -29,6 +30,7 @@ ...@@ -29,6 +30,7 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:clickable="true" android:clickable="true"
android:src="@drawable/ic_launcher_background" android:src="@drawable/ic_launcher_background"
android:focusable="true" android:focusable="true"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp"/> android:layout_height="20dp"/>
...@@ -40,7 +42,8 @@ ...@@ -40,7 +42,8 @@
android:src="@drawable/ic_launcher_background" android:src="@drawable/ic_launcher_background"
android:focusable="true" android:focusable="true"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp"/> android:layout_height="20dp"
app:tint="@color/orange" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="@color/bwhite">
<TextView <TextView
android:id="@+id/exercise_popup_name" android:id="@+id/exercise_popup_name"
......
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="@color/bwhite">
<TextView <TextView
android:id="@+id/exercise_popup_name" android:id="@+id/exercise_popup_name"
...@@ -39,7 +38,6 @@ ...@@ -39,7 +38,6 @@
android:layout_width="350dp" android:layout_width="350dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="• Pour commencer, sélectionnez le(s) jour(s) au(x)quel(s) vous voulez ajouter un ou plusieurs exercices." android:text="• Pour commencer, sélectionnez le(s) jour(s) au(x)quel(s) vous voulez ajouter un ou plusieurs exercices."
android:textColor="@color/black"
android:textSize="16dp" android:textSize="16dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
...@@ -50,7 +48,6 @@ ...@@ -50,7 +48,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:text="• Sélectionnez l'exercice que vous voulez ajouter pour ce(s) jour(s) dans la liste déroulante et cliquez sur le bouton ajouter exercice." android:text="• Sélectionnez l'exercice que vous voulez ajouter pour ce(s) jour(s) dans la liste déroulante et cliquez sur le bouton ajouter exercice."
android:textColor="@color/black"
android:textSize="16dp" android:textSize="16dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -63,7 +60,6 @@ ...@@ -63,7 +60,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:text="• Cliquez sur un jour pour voir le(s) exercice(s) enregistré(s) pour ce dernier." android:text="• Cliquez sur un jour pour voir le(s) exercice(s) enregistré(s) pour ce dernier."
android:textColor="@color/black"
android:textSize="16dp" android:textSize="16dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -75,7 +71,6 @@ ...@@ -75,7 +71,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:text="• Cliquez sur le bouton Enregistrer pour sauvegarder votre nouveau programme." android:text="• Cliquez sur le bouton Enregistrer pour sauvegarder votre nouveau programme."
android:textColor="@color/black"
android:textSize="16dp" android:textSize="16dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
......
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="@color/bwhite">
<RelativeLayout <RelativeLayout
android:id="@+id/relativeLayout4" android:id="@+id/relativeLayout4"
...@@ -93,7 +92,6 @@ ...@@ -93,7 +92,6 @@
android:fontFamily="@font/poppins_extrabold" android:fontFamily="@font/poppins_extrabold"
android:gravity="center" android:gravity="center"
android:text="Création de programme" android:text="Création de programme"
android:textColor="@color/black"
android:textSize="18sp" android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -190,6 +188,7 @@ ...@@ -190,6 +188,7 @@
android:id="@+id/checkbox_monday" android:id="@+id/checkbox_monday"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:buttonTint="@color/orange"
android:fontFamily="@font/poppins" /> android:fontFamily="@font/poppins" />
<TextView <TextView
...@@ -202,13 +201,13 @@ ...@@ -202,13 +201,13 @@
android:onClick="onNewDayTextClick" android:onClick="onNewDayTextClick"
android:tag="lundi" android:tag="lundi"
android:text="Lundi" android:text="Lundi"
android:textColor="@color/black"
android:textSize="15dp" /> android:textSize="15dp" />
<CheckBox <CheckBox
android:id="@+id/checkbox_tuesday" android:id="@+id/checkbox_tuesday"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:buttonTint="@color/orange"
android:fontFamily="@font/poppins" /> android:fontFamily="@font/poppins" />
<TextView <TextView
...@@ -221,13 +220,13 @@ ...@@ -221,13 +220,13 @@
android:onClick="onNewDayTextClick" android:onClick="onNewDayTextClick"
android:tag="mardi" android:tag="mardi"
android:text="Mardi" android:text="Mardi"
android:textColor="@color/black"
android:textSize="15dp" /> android:textSize="15dp" />
<CheckBox <CheckBox
android:id="@+id/checkbox_wednesday" android:id="@+id/checkbox_wednesday"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:buttonTint="@color/orange"
android:fontFamily="@font/poppins" /> android:fontFamily="@font/poppins" />
<TextView <TextView
...@@ -240,7 +239,6 @@ ...@@ -240,7 +239,6 @@
android:onClick="onNewDayTextClick" android:onClick="onNewDayTextClick"
android:tag="mercredi" android:tag="mercredi"
android:text="Mercre" android:text="Mercre"
android:textColor="@color/black"
android:textSize="15dp" /> android:textSize="15dp" />
</LinearLayout> </LinearLayout>
...@@ -254,6 +252,7 @@ ...@@ -254,6 +252,7 @@
android:id="@+id/checkbox_thursday" android:id="@+id/checkbox_thursday"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:buttonTint="@color/orange"
android:fontFamily="@font/poppins" /> android:fontFamily="@font/poppins" />
<TextView <TextView
...@@ -266,13 +265,13 @@ ...@@ -266,13 +265,13 @@
android:onClick="onNewDayTextClick" android:onClick="onNewDayTextClick"
android:tag="jeudi" android:tag="jeudi"
android:text="Jeudi" android:text="Jeudi"
android:textColor="@color/black"
android:textSize="15dp" /> android:textSize="15dp" />
<CheckBox <CheckBox
android:id="@+id/checkbox_friday" android:id="@+id/checkbox_friday"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:buttonTint="@color/orange"
android:fontFamily="@font/poppins" /> android:fontFamily="@font/poppins" />
<TextView <TextView
...@@ -285,13 +284,13 @@ ...@@ -285,13 +284,13 @@
android:onClick="onNewDayTextClick" android:onClick="onNewDayTextClick"
android:tag="vendredi" android:tag="vendredi"
android:text="Vendredi" android:text="Vendredi"
android:textColor="@color/black"
android:textSize="15dp" /> android:textSize="15dp" />
<CheckBox <CheckBox
android:id="@+id/checkbox_saturday" android:id="@+id/checkbox_saturday"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:buttonTint="@color/orange"
android:fontFamily="@font/poppins" /> android:fontFamily="@font/poppins" />
<TextView <TextView
...@@ -304,7 +303,6 @@ ...@@ -304,7 +303,6 @@
android:onClick="onNewDayTextClick" android:onClick="onNewDayTextClick"
android:tag="samedi" android:tag="samedi"
android:text="Samedi" android:text="Samedi"
android:textColor="@color/black"
android:textSize="15dp" /> android:textSize="15dp" />
</LinearLayout> </LinearLayout>
...@@ -318,6 +316,7 @@ ...@@ -318,6 +316,7 @@
android:id="@+id/checkbox_sunday" android:id="@+id/checkbox_sunday"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:buttonTint="@color/orange"
android:fontFamily="@font/poppins" /> android:fontFamily="@font/poppins" />
<TextView <TextView
...@@ -330,7 +329,6 @@ ...@@ -330,7 +329,6 @@
android:onClick="onNewDayTextClick" android:onClick="onNewDayTextClick"
android:tag="dimanche" android:tag="dimanche"
android:text="Dimanche" android:text="Dimanche"
android:textColor="@color/black"
android:textSize="15dp" /> android:textSize="15dp" />
</LinearLayout> </LinearLayout>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<item name="colorOnSecondary">@color/orange</item> <item name="colorOnSecondary">@color/orange</item>
<!-- Status bar color. --> <!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item> <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
<item name="android:textColor">@color/bwhite</item>
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
</style> </style>
</resources> </resources>
\ No newline at end of file
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="Theme.WorkoutWarrior" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> <style name="Theme.WorkoutWarrior" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. --> <!-- Primary brand color. -->
<item name="colorPrimary">@color/orange</item> <item name="colorPrimary">@color/bwhite</item>
<item name="colorPrimaryVariant">@color/black</item> <item name="colorPrimaryVariant">@color/black</item>
<item name="colorOnPrimary">@color/black</item> <item name="colorOnPrimary">@color/black</item>
<!-- Secondary brand color. --> <!-- Secondary brand color. -->
<item name="colorSecondary">@color/black</item> <item name="colorSecondary">@color/bwhite</item>
<item name="colorSecondaryVariant">@color/black</item> <item name="colorSecondaryVariant">@color/black</item>
<item name="colorOnSecondary">@color/orange</item> <item name="colorOnSecondary">@color/orange</item>
<!-- Status bar color. --> <!-- Status bar color. -->
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter