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 f6fb97a..558a3c5 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
@@ -3,7 +3,10 @@ package fr.iut.pm.movieapplication.ui.activity
import android.os.Build
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
+import android.view.Menu
import android.view.View
+import android.widget.SearchView.OnQueryTextListener
+import androidx.appcompat.widget.SearchView
import androidx.fragment.app.Fragment
import com.google.android.material.bottomnavigation.BottomNavigationView
import fr.iut.pm.movieapplication.R
@@ -12,6 +15,7 @@ import fr.iut.pm.movieapplication.api.config.GlobalImageConfig
import fr.iut.pm.movieapplication.repository.MovieRepository
import fr.iut.pm.movieapplication.ui.fragments.HomeSectionsFragment
import fr.iut.pm.movieapplication.ui.fragments.MoviesFragment
+import fr.iut.pm.movieapplication.ui.fragments.ShowsFragment
import fr.iut.pm.movieapplication.utils.Constants
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
@@ -41,6 +45,11 @@ class MainActivity : AppCompatActivity() {
loadFragments(MoviesFragment(this))
return@setOnItemSelectedListener true
}
+
+ R.id.series_page -> {
+ loadFragments(ShowsFragment(this))
+ return@setOnItemSelectedListener true
+ }
else -> false
}
}
@@ -58,11 +67,29 @@ class MainActivity : AppCompatActivity() {
// status bar is hidden, so hide that too if necessary.
actionBar?.hide()
}
+ }
+ override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+ menuInflater.inflate(R.menu.app_menu, menu)
+ val searchItem = menu?.findItem(R.id.search_bar)
+ val searchView : SearchView = searchItem?.actionView as SearchView
+ searchView.setOnQueryTextListener( object : SearchView.OnQueryTextListener {
+
+ override fun onQueryTextSubmit(query: String?): Boolean {
+ TODO("Not yet implemented")
+ return false
+ }
+
+ override fun onQueryTextChange(newText: String?): Boolean {
+ TODO("Not yet implemented")
+ return false
+ }
+ })
+ return true
}
private fun loadFragments(fragment: Fragment) {
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 eaa3d22..3623498 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
@@ -37,13 +37,6 @@ class MoviesFragment(
moviesRecyclerView?.addItemDecoration(CategoryItemDecoration())
}
-
-
-
-
-
-
-
return view
}
}
\ No newline at end of file
diff --git a/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/fragments/ShowsFragment.kt b/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/fragments/ShowsFragment.kt
new file mode 100644
index 0000000..b9f7feb
--- /dev/null
+++ b/Sources/app/src/main/java/fr/iut/pm/movieapplication/ui/fragments/ShowsFragment.kt
@@ -0,0 +1,15 @@
+package fr.iut.pm.movieapplication.ui.fragments
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import fr.iut.pm.movieapplication.ui.activity.MainActivity
+
+class ShowsFragment(
+ private val context : MainActivity
+) : Fragment() {
+
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ }
+}
\ No newline at end of file
diff --git a/Sources/app/src/main/res/drawable/item_selector.xml b/Sources/app/src/main/res/drawable/item_selector.xml
new file mode 100644
index 0000000..1666c03
--- /dev/null
+++ b/Sources/app/src/main/res/drawable/item_selector.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Sources/app/src/main/res/font/source_sans_pro.ttf b/Sources/app/src/main/res/font/source_sans_pro.ttf
new file mode 100644
index 0000000..6791613
Binary files /dev/null and b/Sources/app/src/main/res/font/source_sans_pro.ttf differ
diff --git a/Sources/app/src/main/res/layout/activity_main.xml b/Sources/app/src/main/res/layout/activity_main.xml
index d0fbc8a..b98f75d 100644
--- a/Sources/app/src/main/res/layout/activity_main.xml
+++ b/Sources/app/src/main/res/layout/activity_main.xml
@@ -11,7 +11,7 @@
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginBottom="75dp"
+ android:layout_marginBottom="55dp"
app:layout_constraintBottom_toTopOf="@+id/navigation_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -20,10 +20,14 @@
\ No newline at end of file
diff --git a/Sources/app/src/main/res/layout/fragment_home_sections.xml b/Sources/app/src/main/res/layout/fragment_home_sections.xml
index 6c2afed..12275b5 100644
--- a/Sources/app/src/main/res/layout/fragment_home_sections.xml
+++ b/Sources/app/src/main/res/layout/fragment_home_sections.xml
@@ -12,48 +12,58 @@
android:layout_height="wrap_content"
>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Sources/app/src/main/res/layout/fragment_movies.xml b/Sources/app/src/main/res/layout/fragment_movies.xml
index 8b0c3d2..4094d47 100644
--- a/Sources/app/src/main/res/layout/fragment_movies.xml
+++ b/Sources/app/src/main/res/layout/fragment_movies.xml
@@ -8,6 +8,7 @@
android:id="@+id/movies_item_recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/default_margin"
/>
\ No newline at end of file
diff --git a/Sources/app/src/main/res/layout/item_horizontal_home_page.xml b/Sources/app/src/main/res/layout/item_horizontal_home_page.xml
index 1864ae7..a98f4f9 100644
--- a/Sources/app/src/main/res/layout/item_horizontal_home_page.xml
+++ b/Sources/app/src/main/res/layout/item_horizontal_home_page.xml
@@ -4,7 +4,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="150dp"
- android:layout_height="match_parent" >
+ android:layout_height="match_parent"
+ android:layout_marginTop="10dp">
@@ -38,7 +38,6 @@
android:id="@+id/item_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="23 nov 2012"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/item_name" />
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 c9a8ae4..6c2d62a 100644
--- a/Sources/app/src/main/res/layout/item_vertical_fragment.xml
+++ b/Sources/app/src/main/res/layout/item_vertical_fragment.xml
@@ -10,6 +10,7 @@
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
+ android:layout_marginTop="@dimen/default_margin"
app:layout_constraintTop_toTopOf="parent"
app:cardCornerRadius="10dp">
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
index 675901b..26edad9 100644
--- a/Sources/app/src/main/res/menu-v26/bottom_navigation_menu.xml
+++ b/Sources/app/src/main/res/menu-v26/bottom_navigation_menu.xml
@@ -3,21 +3,18 @@
+ android:title="@string/bottom_home_item" />
+ android:title="@string/bottom_movies_item" />
+ android:title="@string/bottom_series_item" />
+ android:icon="@drawable/ic_baseline_star_border_24"
+ android:title="@string/bottom_artist_item" />
\ No newline at end of file
diff --git a/Sources/app/src/main/res/menu/app_menu.xml b/Sources/app/src/main/res/menu/app_menu.xml
new file mode 100644
index 0000000..340dd81
--- /dev/null
+++ b/Sources/app/src/main/res/menu/app_menu.xml
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/Sources/app/src/main/res/menu/bottom_navigation_menu.xml b/Sources/app/src/main/res/menu/bottom_navigation_menu.xml
index 675901b..26edad9 100644
--- a/Sources/app/src/main/res/menu/bottom_navigation_menu.xml
+++ b/Sources/app/src/main/res/menu/bottom_navigation_menu.xml
@@ -3,21 +3,18 @@
+ android:title="@string/bottom_home_item" />
+ android:title="@string/bottom_movies_item" />
+ android:title="@string/bottom_series_item" />
+ android:icon="@drawable/ic_baseline_star_border_24"
+ android:title="@string/bottom_artist_item" />
\ 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 9817c27..aaa9e8e 100644
--- a/Sources/app/src/main/res/values-night/themes.xml
+++ b/Sources/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file