From 1e0eafef9b2095e06ca9e48c4503c649dfa079d5 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 9 May 2022 10:40:51 +0200
Subject: [PATCH] Customize instances

---
 app/src/acad/res/values-night/styles.xml  | 51 ++++++++++++---------
 app/src/acad/res/values/colors.xml        |  3 ++
 app/src/acad/res/values/styles.xml        | 55 +++++++++++++----------
 app/src/main/res/layout/activity_main.xml |  4 +-
 4 files changed, 66 insertions(+), 47 deletions(-)

diff --git a/app/src/acad/res/values-night/styles.xml b/app/src/acad/res/values-night/styles.xml
index 814c8aa..180595a 100644
--- a/app/src/acad/res/values-night/styles.xml
+++ b/app/src/acad/res/values-night/styles.xml
@@ -1,15 +1,22 @@
 <resources>
 
     <attr name="backgroundView" format="color" />
+
+    <style name="BaseTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+        <item name="backgroundView">@color/backgroundDark</item>
+    </style>
+    <style name="BaseThemeNoAction" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="backgroundView">@color/backgroundDark</item>
+    </style>
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="AppTheme" parent="BaseTheme">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="AppThemeNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="AppThemeNoActionBar" parent="BaseThemeNoAction">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -17,111 +24,111 @@
     </style>
 
     <!-- Institutionnel theme. -->
-    <style name="Institutionnel" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Institutionnel" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_institutionnel</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_institutionnel</item>
         <item name="colorAccent">@color/colorAccent_institutionnel</item>
     </style>
-    <style name="InstitutionnelNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="InstitutionnelNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_institutionnel</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_institutionnel</item>
         <item name="colorAccent">@color/colorAccent_institutionnel</item>
     </style>
     <!-- Maternelle theme. -->
-    <style name="Maternelle" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Maternelle" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_maternelle</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_maternelle</item>
         <item name="colorAccent">@color/colorAccent_maternelle</item>
     </style>
-    <style name="MaternelleNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="MaternelleNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_maternelle</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_maternelle</item>
         <item name="colorAccent">@color/colorAccent_maternelle</item>
     </style>
     <!-- Art theme. -->
-    <style name="Art" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Art" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_art</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_art</item>
         <item name="colorAccent">@color/colorAccent_art</item>
     </style>
-    <style name="ArtNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="ArtNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_art</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_art</item>
         <item name="colorAccent">@color/colorAccent_art</item>
     </style>
     <!-- Sciences theme. -->
-    <style name="Sciences" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Sciences" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_sciences</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_sciences</item>
         <item name="colorAccent">@color/colorAccent_sciences</item>
     </style>
-    <style name="SciencesNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="SciencesNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_sciences</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_sciences</item>
         <item name="colorAccent">@color/colorAccent_sciences</item>
     </style>
     <!-- Education theme. -->
-    <style name="Education" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Education" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_education</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_education</item>
         <item name="colorAccent">@color/colorAccent_education</item>
     </style>
-    <style name="EducationNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="EducationNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_education</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_education</item>
         <item name="colorAccent">@color/colorAccent_education</item>
     </style>
     <!-- Enseignement Pro theme. -->
-    <style name="EnseignementPro" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="EnseignementPro" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_enseignement_pro</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_enseignement_pro</item>
         <item name="colorAccent">@color/colorAccent_enseignement_pro</item>
     </style>
-    <style name="EnseignementProNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="EnseignementProNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_enseignement_pro</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_enseignement_pro</item>
         <item name="colorAccent">@color/colorAccent_enseignement_pro</item>
     </style>
     <!-- Langues theme. -->
-    <style name="Langues" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Langues" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_langues</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_langues</item>
         <item name="colorAccent">@color/colorAccent_langues</item>
     </style>
-    <style name="LanguesNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="LanguesNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_langues</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_langues</item>
         <item name="colorAccent">@color/colorAccent_langues</item>
     </style>
     <!-- ActionEducative theme. -->
-    <style name="ActionEducative" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="ActionEducative" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_action_educative</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_action_educative</item>
         <item name="colorAccent">@color/colorAccent_action_educative</item>
     </style>
-    <style name="ActionEducativeNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="ActionEducativeNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_action_educative</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_action_educative</item>
         <item name="colorAccent">@color/colorAccent_action_educative</item>
     </style>
     <!-- Cycle 2 theme. -->
-    <style name="Cycle2" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Cycle2" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_cycle2</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle2</item>
         <item name="colorAccent">@color/colorAccent_cycle2</item>
     </style>
-    <style name="Cycle2NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="Cycle2NoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_cycle2</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle2</item>
         <item name="colorAccent">@color/colorAccent_cycle2</item>
     </style>
     <!-- Cycle 3 theme. -->
-    <style name="Cycle3" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Cycle3" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_cycle3</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle3</item>
         <item name="colorAccent">@color/colorAccent_cycle3</item>
     </style>
-    <style name="Cycle3NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="Cycle3NoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_cycle3</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle3</item>
         <item name="colorAccent">@color/colorAccent_cycle3</item>
diff --git a/app/src/acad/res/values/colors.xml b/app/src/acad/res/values/colors.xml
index b7695c5..22127c4 100644
--- a/app/src/acad/res/values/colors.xml
+++ b/app/src/acad/res/values/colors.xml
@@ -46,12 +46,15 @@
     <color name="colorPrimaryDark_cycle3">#341047</color>
     <color name="colorAccent_cycle3">#C1661B</color>
 
+
+
     <color name="tag_color">#bbF2690D</color>
     <color name="tag_color_text">#FAFAFA</color>
     <color name="positive_thumbs">#2b90d9</color>
     <color name="favorite">#ca8f04</color>
     <color name="bookmark">#795548</color>
     <color name="negative_thumbs">#F44336</color>
+    <color name="backgroundLight">#DDFFFFFF</color>
     <color name="backgroundDark">#DD000000</color>
     <color name="red_1">#F44336</color>
     <color name="gray_light">#80808080</color>
diff --git a/app/src/acad/res/values/styles.xml b/app/src/acad/res/values/styles.xml
index 184c8fc..139a08b 100644
--- a/app/src/acad/res/values/styles.xml
+++ b/app/src/acad/res/values/styles.xml
@@ -1,125 +1,134 @@
 <resources>
-
+    
     <attr name="backgroundView" format="color" />
+
+
+    <style name="BaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="backgroundView">@color/backgroundLight</item>
+    </style>
+    <style name="BaseThemeNoAction" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="backgroundView">@color/backgroundLight</item>
+    </style>
+    
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="AppTheme" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="AppThemeNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="AppThemeNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
     <!-- Institutionnel theme. -->
-    <style name="Institutionnel" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Institutionnel" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_institutionnel</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_institutionnel</item>
         <item name="colorAccent">@color/colorAccent_institutionnel</item>
     </style>
-    <style name="InstitutionnelNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="InstitutionnelNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_institutionnel</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_institutionnel</item>
         <item name="colorAccent">@color/colorAccent_institutionnel</item>
     </style>
     <!-- Maternelle theme. -->
-    <style name="Maternelle" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Maternelle" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_maternelle</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_maternelle</item>
         <item name="colorAccent">@color/colorAccent_maternelle</item>
     </style>
-    <style name="MaternelleNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="MaternelleNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_maternelle</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_maternelle</item>
         <item name="colorAccent">@color/colorAccent_maternelle</item>
     </style>
     <!-- Art theme. -->
-    <style name="Art" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Art" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_art</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_art</item>
         <item name="colorAccent">@color/colorAccent_art</item>
     </style>
-    <style name="ArtNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="ArtNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_art</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_art</item>
         <item name="colorAccent">@color/colorAccent_art</item>
     </style>
     <!-- Sciences theme. -->
-    <style name="Sciences" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Sciences" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_sciences</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_sciences</item>
         <item name="colorAccent">@color/colorAccent_sciences</item>
     </style>
-    <style name="SciencesNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="SciencesNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_sciences</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_sciences</item>
         <item name="colorAccent">@color/colorAccent_sciences</item>
     </style>
     <!-- Education theme. -->
-    <style name="Education" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Education" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_education</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_education</item>
         <item name="colorAccent">@color/colorAccent_education</item>
     </style>
-    <style name="EducationNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="EducationNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_education</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_education</item>
         <item name="colorAccent">@color/colorAccent_education</item>
     </style>
     <!-- Enseignement Pro theme. -->
-    <style name="EnseignementPro" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="EnseignementPro" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_enseignement_pro</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_enseignement_pro</item>
         <item name="colorAccent">@color/colorAccent_enseignement_pro</item>
     </style>
-    <style name="EnseignementProNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="EnseignementProNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_enseignement_pro</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_enseignement_pro</item>
         <item name="colorAccent">@color/colorAccent_enseignement_pro</item>
     </style>
     <!-- Langues theme. -->
-    <style name="Langues" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Langues" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_langues</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_langues</item>
         <item name="colorAccent">@color/colorAccent_langues</item>
     </style>
-    <style name="LanguesNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="LanguesNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_langues</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_langues</item>
         <item name="colorAccent">@color/colorAccent_langues</item>
     </style>
     <!-- ActionEducative theme. -->
-    <style name="ActionEducative" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="ActionEducative" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_action_educative</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_action_educative</item>
         <item name="colorAccent">@color/colorAccent_action_educative</item>
     </style>
-    <style name="ActionEducativeNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="ActionEducativeNoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_action_educative</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_action_educative</item>
         <item name="colorAccent">@color/colorAccent_action_educative</item>
     </style>
     <!-- Cycle 2 theme. -->
-    <style name="Cycle2" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Cycle2" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_cycle2</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle2</item>
         <item name="colorAccent">@color/colorAccent_cycle2</item>
     </style>
-    <style name="Cycle2NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="Cycle2NoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_cycle2</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle2</item>
         <item name="colorAccent">@color/colorAccent_cycle2</item>
     </style>
     <!-- Cycle 3 theme. -->
-    <style name="Cycle3" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Cycle3" parent="BaseTheme">
         <item name="colorPrimary">@color/colorPrimary_cycle3</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle3</item>
         <item name="colorAccent">@color/colorAccent_cycle3</item>
     </style>
-    <style name="Cycle3NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="Cycle3NoActionBar" parent="BaseThemeNoAction">
         <item name="colorPrimary">@color/colorPrimary_cycle3</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark_cycle3</item>
         <item name="colorAccent">@color/colorAccent_cycle3</item>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5726697..56f25fb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -144,8 +144,8 @@
                 android:layout_marginStart="0dp"
                 android:layout_marginEnd="0dp"
                 android:background="?android:attr/windowBackground"
-                app:itemIconTint="@color/bottom_nav_color"
-                app:itemTextColor="@color/bottom_nav_color"
+                app:itemIconTint="?attr/colorAccent"
+                app:itemTextColor="?attr/colorAccent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />