From 5a174fc2f6c58c81379b2f3ce6aa877d01f6180c Mon Sep 17 00:00:00 2001
From: Jordan Artzet <jordan.artzet@etu.uca.fr>
Date: Wed, 25 Jan 2023 23:02:50 +0100
Subject: [PATCH] :construction: navigation view is dynamic

dynamic added to navigationView
add the fragment movies
maybe add a generic fragment
---
 .../ui/activity/MainActivity.kt               | 44 ++++++++++++++-
 .../ui/adapter/CategoryItemDecoration.kt      | 12 ++++
 .../ui/adapter/HomeItemAdapter.kt             |  8 ++-
 .../ui/fragments/HomeSectionsFragment.kt      | 11 ++--
 .../ui/fragments/MoviesFragment.kt            | 12 +++-
 .../main/res/drawable/home_page_header.xml    | 12 ++++
 .../drawable/ic_baseline_star_border_24.xml   |  2 +-
 Sources/app/src/main/res/drawable/ic_home.xml |  2 +-
 .../app/src/main/res/drawable/ic_movie.xml    |  2 +-
 .../app/src/main/res/drawable/ic_tv_shows.xml |  2 +-
 .../app/src/main/res/layout/activity_main.xml | 55 +++++++++----------
 .../src/main/res/layout/fragment_movies.xml   |  2 -
 .../res/layout/item_vertical_fragment.xml     |  9 ++-
 .../res/menu-v26/bottom_navigation_menu.xml   | 23 ++++++++
 .../app/src/main/res/values-night/themes.xml  | 12 ++--
 Sources/app/src/main/res/values/colors.xml    |  4 ++
 Sources/app/src/main/res/values/strings.xml   |  2 +-
 Sources/app/src/main/res/values/themes.xml    |  8 +--
 18 files changed, 163 insertions(+), 59 deletions(-)
 create mode 100644 Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/adapter/CategoryItemDecoration.kt
 create mode 100644 Sources/app/src/main/res/drawable/home_page_header.xml
 create mode 100644 Sources/app/src/main/res/menu-v26/bottom_navigation_menu.xml

diff --git a/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/activity/MainActivity.kt b/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/activity/MainActivity.kt
index 9214665..1410f0f 100644
--- a/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/activity/MainActivity.kt
+++ b/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/activity/MainActivity.kt
@@ -1,23 +1,63 @@
 package fr.iut.pm.movieapplication.ui.activity
 
+import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import fr.iut.pm.movieapplication.R
 import fr.iut.pm.movieapplication.ui.fragments.HomeSectionsFragment
+import fr.iut.pm.movieapplication.ui.fragments.MoviesFragment
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        loadFragments(HomeSectionsFragment(this))
+
+        val navigationView = findViewById<BottomNavigationView>(R.id.navigation_view)
+        navigationView.setOnItemSelectedListener {
+            when(it.itemId)
+            {
+                R.id.home_page -> {
+                    loadFragments(HomeSectionsFragment(this))
+                    return@setOnItemSelectedListener true
+                }
+
+                R.id.movies_page -> {
+                    loadFragments(MoviesFragment(this))
+                    return@setOnItemSelectedListener true
+                }
+                else -> false
+            }
+        }
+    /*
         //Trends fragment injected in main activity
         val transaction = supportFragmentManager.beginTransaction()
-        transaction.replace(R.id.trends_section_container, HomeSectionsFragment())
+        transaction.replace(R.id.fragment_container, HomeSectionsFragment())
         transaction.addToBackStack(null)
         transaction.commit()
+    */
+        if(Build.VERSION.SDK_INT < 33) {
+            // Hide the status bar.
+            window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
+            // Remember that you should never show the action bar if the
+            // status bar is hidden, so hide that too if necessary.
+            actionBar?.hide()
+        }
+
+
+
 
-        //val bottomNavigationView = findViewById<BottomNavigationView>(R.id.navigation_view)
 
+    }
+
+    private fun loadFragments(fragment: Fragment) {
+        val transaction = supportFragmentManager.beginTransaction()
+        transaction.replace(R.id.fragment_container, fragment)
+        transaction.addToBackStack(null)
+        transaction.commit()
     }
 }
\ No newline at end of file
diff --git a/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/adapter/CategoryItemDecoration.kt b/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/adapter/CategoryItemDecoration.kt
new file mode 100644
index 0000000..fe08862
--- /dev/null
+++ b/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/adapter/CategoryItemDecoration.kt
@@ -0,0 +1,12 @@
+package fr.iut.pm.movieapplication.ui.adapter
+
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+
+class CategoryItemDecoration : RecyclerView.ItemDecoration() {
+
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+        outRect.bottom = 50
+    }
+}
\ No newline at end of file
diff --git a/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/adapter/HomeItemAdapter.kt b/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/adapter/HomeItemAdapter.kt
index b2c3ef3..2e6f389 100644
--- a/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/adapter/HomeItemAdapter.kt
+++ b/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/adapter/HomeItemAdapter.kt
@@ -6,8 +6,12 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import fr.iut.pm.movieapplication.R
+import fr.iut.pm.movieapplication.ui.activity.MainActivity
 
-class HomeItemAdapter(private val layoutId : Int) : RecyclerView.Adapter<HomeItemAdapter.ViewHolder>() {
+class HomeItemAdapter(
+    private val context : MainActivity,
+    private val layoutId : Int
+    ) : RecyclerView.Adapter<HomeItemAdapter.ViewHolder>() {
 
     class ViewHolder(view : View) : RecyclerView.ViewHolder(view) {
     }
@@ -15,7 +19,7 @@ class HomeItemAdapter(private val layoutId : Int) : RecyclerView.Adapter<HomeIte
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val view = LayoutInflater
             .from(parent.context)
-            .inflate(R.layout.item_horizontal_home_page, parent, false)
+            .inflate(layoutId, parent, false)
         return ViewHolder(view)
     }
 
diff --git a/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/fragments/HomeSectionsFragment.kt b/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/fragments/HomeSectionsFragment.kt
index ebcb9f5..4e47377 100644
--- a/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/fragments/HomeSectionsFragment.kt
+++ b/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/fragments/HomeSectionsFragment.kt
@@ -7,27 +7,30 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 import fr.iut.pm.movieapplication.R
+import fr.iut.pm.movieapplication.ui.activity.MainActivity
 import fr.iut.pm.movieapplication.ui.adapter.HomeItemAdapter
 import fr.iut.pm.movieapplication.ui.adapter.HomeItemDecoration
 
-class HomeSectionsFragment : Fragment() {
+class HomeSectionsFragment(
+    private val context : MainActivity
+) : Fragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(R.layout.fragment_home_sections, container, false)
 
         //get the trends RecyclerView
         val homeTrendsRecyclerView = view?.findViewById<RecyclerView>(R.id.home_trends_recycler_view)
-        homeTrendsRecyclerView?.adapter = HomeItemAdapter(R.layout.item_horizontal_home_page)
+        homeTrendsRecyclerView?.adapter = HomeItemAdapter(context,R.layout.item_horizontal_home_page)
         homeTrendsRecyclerView?.addItemDecoration(HomeItemDecoration())
 
         //get the popularity RecyclerView
         val homePopularityRecyclerView = view?.findViewById<RecyclerView>(R.id.home_popularity_recycler_view)
-        homePopularityRecyclerView?.adapter = HomeItemAdapter(R.layout.item_horizontal_home_page)
+        homePopularityRecyclerView?.adapter = HomeItemAdapter(context,R.layout.item_horizontal_home_page)
         homePopularityRecyclerView?.addItemDecoration(HomeItemDecoration())
 
         //get the free RecyclerView
         val homeFreeRecyclerView = view?.findViewById<RecyclerView>(R.id.home_free_recycler_view)
-        homeFreeRecyclerView?.adapter = HomeItemAdapter(R.layout.item_horizontal_home_page)
+        homeFreeRecyclerView?.adapter = HomeItemAdapter(context,R.layout.item_horizontal_home_page)
         homeFreeRecyclerView?.addItemDecoration(HomeItemDecoration())
         return view
     }
diff --git a/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/fragments/MoviesFragment.kt b/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/fragments/MoviesFragment.kt
index 66eb838..2989585 100644
--- a/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/fragments/MoviesFragment.kt
+++ b/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/fragments/MoviesFragment.kt
@@ -5,20 +5,26 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import fr.iut.pm.movieapplication.R
+import fr.iut.pm.movieapplication.ui.activity.MainActivity
+import fr.iut.pm.movieapplication.ui.adapter.CategoryItemDecoration
 import fr.iut.pm.movieapplication.ui.adapter.HomeItemAdapter
 import fr.iut.pm.movieapplication.ui.adapter.HomeItemDecoration
 
-class MoviesFragment : Fragment() {
+class MoviesFragment(
+    private val context : MainActivity
+) : Fragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(R.layout.fragment_movies, container, false)
 
         //get the recycler view
         val moviesRecyclerView = view?.findViewById<RecyclerView>(R.id.movies_item_recycler_view)
-        moviesRecyclerView?.adapter = HomeItemAdapter(R.layout.item_vertical_fragment)
-        moviesRecyclerView?.addItemDecoration(HomeItemDecoration())
+        moviesRecyclerView?.adapter = HomeItemAdapter(context,R.layout.item_vertical_fragment)
+        moviesRecyclerView?.layoutManager = GridLayoutManager(context, 2)
+        moviesRecyclerView?.addItemDecoration(CategoryItemDecoration())
 
 
         return view
diff --git a/Sources/app/src/main/res/drawable/home_page_header.xml b/Sources/app/src/main/res/drawable/home_page_header.xml
new file mode 100644
index 0000000..0dcd345
--- /dev/null
+++ b/Sources/app/src/main/res/drawable/home_page_header.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item>
+    <shape>
+        <gradient
+            android:angle="0"
+            android:startColor="@color/dark_blue"
+            android:endColor="@color/light_blue"
+            android:type="linear" />
+    </shape>
+</item>
+</selector>
\ No newline at end of file
diff --git a/Sources/app/src/main/res/drawable/ic_baseline_star_border_24.xml b/Sources/app/src/main/res/drawable/ic_baseline_star_border_24.xml
index 59aef55..76916cf 100644
--- a/Sources/app/src/main/res/drawable/ic_baseline_star_border_24.xml
+++ b/Sources/app/src/main/res/drawable/ic_baseline_star_border_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#000000"
+<vector android:height="24dp" android:tint="#FFF"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
diff --git a/Sources/app/src/main/res/drawable/ic_home.xml b/Sources/app/src/main/res/drawable/ic_home.xml
index 5a870f5..b4c94be 100644
--- a/Sources/app/src/main/res/drawable/ic_home.xml
+++ b/Sources/app/src/main/res/drawable/ic_home.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#000000"
+<vector android:height="24dp" android:tint="#FFF"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
diff --git a/Sources/app/src/main/res/drawable/ic_movie.xml b/Sources/app/src/main/res/drawable/ic_movie.xml
index a0e2d16..986d02f 100644
--- a/Sources/app/src/main/res/drawable/ic_movie.xml
+++ b/Sources/app/src/main/res/drawable/ic_movie.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#000000"
+<vector android:height="24dp" android:tint="#FFF"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M18,4l2,4h-3l-2,-4h-2l2,4h-3l-2,-4H8l2,4H7L5,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V4h-4z"/>
diff --git a/Sources/app/src/main/res/drawable/ic_tv_shows.xml b/Sources/app/src/main/res/drawable/ic_tv_shows.xml
index cdd0f67..b8dc7d7 100644
--- a/Sources/app/src/main/res/drawable/ic_tv_shows.xml
+++ b/Sources/app/src/main/res/drawable/ic_tv_shows.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#000000"
+<vector android:height="24dp" android:tint="#FFF"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M21,6h-7.59l3.29,-3.29L16,2l-4,4 -4,-4 -0.71,0.71L10.59,6L3,6c-1.1,0 -2,0.89 -2,2v12c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.11 -0.9,-2 -2,-2zM21,20L3,20L3,8h18v12zM9,10v8l7,-4z"/>
diff --git a/Sources/app/src/main/res/layout/activity_main.xml b/Sources/app/src/main/res/layout/activity_main.xml
index 1c12462..a93879b 100644
--- a/Sources/app/src/main/res/layout/activity_main.xml
+++ b/Sources/app/src/main/res/layout/activity_main.xml
@@ -7,48 +7,47 @@
     android:layout_height="match_parent"
     tools:context=".ui.activity.MainActivity">
 
-    <TextView
-        android:id="@+id/home_page_title"
+    <LinearLayout
+        android:id="@+id/home_page_header_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="30sp"
-        android:text="@string/home_page_title"
-        android:textColor="@color/design_default_color_primary_variant"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        android:orientation="vertical"
+        android:background="@drawable/home_page_header"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-        android:id="@+id/home_page_subtitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="24sp"
-        android:text="@string/home_page_subtitle"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/home_page_title" />
+        <TextView
+            android:id="@+id/home_page_subtitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/home_page_subtitle"
+            android:textColor="#FFF"
+            android:textSize="24sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="parent" />
 
-    <androidx.appcompat.widget.SearchView
-        android:id="@+id/searchView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/home_page_subtitle" />
 
+        <androidx.appcompat.widget.SearchView
+            android:id="@+id/searchView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/home_page_subtitle" />
+
+    </LinearLayout>
 
     <FrameLayout
-        android:id="@+id/trends_section_container"
+        android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="150dp"
-        android:layout_marginBottom="55dp"
+        android:layout_marginTop="110dp"
+        android:layout_marginBottom="70dp"
         app:layout_constraintBottom_toTopOf="@+id/navigation_view"
-        app:layout_constraintTop_toBottomOf="@+id/searchView" />
+        app:layout_constraintTop_toBottomOf="@+id/home_page_header_container" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/navigation_view"
         android:layout_width="match_parent"
-        android:layout_height="55dp"
-        android:background="@color/material_dynamic_neutral80"
+        android:layout_height="75dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/Sources/app/src/main/res/layout/fragment_movies.xml b/Sources/app/src/main/res/layout/fragment_movies.xml
index c6f31e4..8b0c3d2 100644
--- a/Sources/app/src/main/res/layout/fragment_movies.xml
+++ b/Sources/app/src/main/res/layout/fragment_movies.xml
@@ -8,8 +8,6 @@
         android:id="@+id/movies_item_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Sources/app/src/main/res/layout/item_vertical_fragment.xml b/Sources/app/src/main/res/layout/item_vertical_fragment.xml
index 00ff925..a07abbd 100644
--- a/Sources/app/src/main/res/layout/item_vertical_fragment.xml
+++ b/Sources/app/src/main/res/layout/item_vertical_fragment.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="150dp"
+    android:layout_width="175dp"
     android:layout_height="match_parent">
 
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="250dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
         app:layout_constraintTop_toTopOf="parent"
         app:cardCornerRadius="10dp">
 
@@ -17,7 +20,7 @@
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="200dp"
+            android:layout_height="210dp"
             android:background="@color/black" />
 
         <TextView
diff --git a/Sources/app/src/main/res/menu-v26/bottom_navigation_menu.xml b/Sources/app/src/main/res/menu-v26/bottom_navigation_menu.xml
new file mode 100644
index 0000000..675901b
--- /dev/null
+++ b/Sources/app/src/main/res/menu-v26/bottom_navigation_menu.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/home_page"
+        android:title="@string/bottom_home_item"
+        android:icon="@drawable/ic_home"
+        />
+    <item
+        android:id="@+id/movies_page"
+        android:title="@string/bottom_movies_item"
+        android:icon="@drawable/ic_movie"
+        />
+    <item
+        android:id="@+id/series_page"
+        android:title="@string/bottom_series_item"
+        android:icon="@drawable/ic_tv_shows"
+        />
+    <item
+        android:id="@+id/artist_page"
+        android:title="@string/bottom_artist_item"
+        android:icon="@drawable/ic_baseline_star_border_24"/>
+</menu>
\ No newline at end of file
diff --git a/Sources/app/src/main/res/values-night/themes.xml b/Sources/app/src/main/res/values-night/themes.xml
index 9c99240..9817c27 100644
--- a/Sources/app/src/main/res/values-night/themes.xml
+++ b/Sources/app/src/main/res/values-night/themes.xml
@@ -1,14 +1,14 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.MovieApplication" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.MovieApplication" parent="Theme.Material3.Dark.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
+        <item name="colorPrimary">@color/dark_blue</item>
+        <item name="colorPrimaryVariant">@color/black</item>
+        <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondary">@color/teal_700</item>
         <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorOnSecondary">@color/white</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="21">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
diff --git a/Sources/app/src/main/res/values/colors.xml b/Sources/app/src/main/res/values/colors.xml
index f8c6127..a95c9cd 100644
--- a/Sources/app/src/main/res/values/colors.xml
+++ b/Sources/app/src/main/res/values/colors.xml
@@ -7,4 +7,8 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
+    <color name="dark_blue">#032541</color>
+    <color name="light_blue">#01B4E4</color>
+    <color name="light_green">#1ed5a9 </color>
 </resources>
\ No newline at end of file
diff --git a/Sources/app/src/main/res/values/strings.xml b/Sources/app/src/main/res/values/strings.xml
index 059d1c4..260cd67 100644
--- a/Sources/app/src/main/res/values/strings.xml
+++ b/Sources/app/src/main/res/values/strings.xml
@@ -7,7 +7,7 @@
     <string name="bottom_artist_item">Artistes</string>
 
     <!-- Home page -->
-    <string name="home_page_title">Bienvenue</string>
+    <string name="home_page_title">Bienvenue,</string>
     <string name="home_page_subtitle">Des millions de films, émissions télévisées et artistes…</string>
     <string name="home_page_trends_section_title">Tendances</string>
     <string name="home_page_popularity_section_title">Populaires</string>
diff --git a/Sources/app/src/main/res/values/themes.xml b/Sources/app/src/main/res/values/themes.xml
index e39b3bc..5bd7185 100644
--- a/Sources/app/src/main/res/values/themes.xml
+++ b/Sources/app/src/main/res/values/themes.xml
@@ -1,14 +1,14 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.MovieApplication" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.MovieApplication" parent="@style/Theme.Material3.Light.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/light_blue</item>
+        <item name="colorPrimaryVariant">@color/dark_blue</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="colorOnSecondary">@color/black</item>
+        <item name="colorOnSecondary">@color/white</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="21">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->