Merge branch 'florian' into 'main'

Merge branch 'florian.G' into 'main'

See merge request !22

app/src/main/java/com/example/tdsaeandroid/SearchMediasActivity.kt

@@ -36,9 +36,21 @@ class SearchMediasActivity : AppCompatActivity() {
         type = (intent?.getSerializableExtra("type") ?: throw Exception("No activity type found")) as ActivityType
 
         findViewById<TextView>(R.id.search_movies__title).text = if (type == ActivityType.Movie) {
-            getString(R.string.movies)
+            getString(R.string.movies_c)
         } else {
-            getString(R.string.tv)
+            getString(R.string.tv_c)
+        }
+
+        searchName.hint =  if (type == ActivityType.Movie) {
+            getString(R.string.search_for, getString(R.string.movies))
+        } else {
+            getString(R.string.search_for, getString(R.string.tv))
+        }
+
+        btPopular.text = if (type == ActivityType.Movie) {
+            getString(R.string.see_popular, getString(R.string.movies))
+        } else {
+            getString(R.string.see_popular, getString(R.string.tv))
         }
 
         // add event to components

app/src/main/res/layout-land/activity_search_medias.xml

@@ -13,7 +13,7 @@
         android:id="@+id/search_movies__title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/movies"
+        android:text="@string/movies_c"
         android:textColor="@color/white"
         android:textAppearance="@style/TextAppearance.Material3.DisplaySmall"
         app:layout_constraintBottom_toTopOf="@+id/search_movies__cl0"
@@ -72,7 +72,7 @@
                 android:autofillHints="no"
                 android:background="@android:color/black"
                 android:drawableStart="@android:drawable/ic_menu_search"
-                android:hint="@string/search_for_a_movie"
+                android:hint="@string/search_for"
                 android:inputType="text"
                 android:padding="10dp"
                 android:textColor="@color/white"
@@ -107,7 +107,7 @@
             android:id="@+id/search_medias__bt_popular"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/see_popular_movies"
+            android:text="@string/see_popular"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/search_medias__search_name"
             app:layout_constraintStart_toStartOf="@+id/search_medias__search_name"

app/src/main/res/layout-port/activity_search_medias.xml

@@ -12,7 +12,7 @@
         android:id="@+id/search_movies__title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/movies"
+        android:text="@string/movies_c"
         android:textColor="@color/white"
         android:textAppearance="@style/TextAppearance.Material3.DisplaySmall"
         app:layout_constraintBottom_toTopOf="@+id/search_movies__cl0"
@@ -49,7 +49,7 @@
             android:layout_height="50dp"
             android:autofillHints="no"
             android:drawableStart="@android:drawable/ic_menu_search"
-            android:hint="@string/search_for_a_movie"
+            android:hint="@string/search_for"
             android:inputType="text"
             android:padding="10dp"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -74,7 +74,7 @@
             android:id="@+id/search_medias__bt_popular"
             android:layout_width="0dp"
             android:layout_height="50dp"
-            android:text="@string/see_popular_movies"
+            android:text="@string/see_popular"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/search_medias__search_name"
             app:layout_constraintStart_toStartOf="@+id/search_medias__search_name"

app/src/main/res/values-fr/strings.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">TD SAE Android</string>
-    <string name="movies">Films</string>
+    <string name="movies_c">Films</string>
     <string name="date_f">Date :</string>
     <string name="genres_f">Genres :</string>
     <string name="number_f">Nombre :</string>
-    <string name="search_for_a_movie">Rechercher un film</string>
+    <string name="search_for">Rechercher des %1$s</string>
     <string name="what_watch">Que voulez-vous regarder ce soir ?</string>
     <string name="see_movie">Envie d\'un film ?</string>
     <string name="see_tv">Envie d\'une série ?</string>
@@ -14,7 +14,7 @@
     <string name="rating_min_f">Note min :</string>
     <string name="search">Chercher</string>
     <string name="results">Resultats</string>
-    <string name="see_popular_movies">Voir les films les plus populaire !</string>
+    <string name="see_popular">Voir les %1$s les plus populaire  !</string>
     <string name="previous_page">Page précédente</string>
     <string name="next_page">Page suivante</string>
     <string name="released_after_f">Sortie après :</string>
@@ -29,8 +29,10 @@
     <string name="rating_according">Note: %1$s/10, selon %2$s personnes</string>
     <string name="warning_not_suitable">Attention, se film n\'est pas adapté aux enfants</string>
     <string name="image">image</string>
-    <string name="tv">Séries</string>
+    <string name="tv_c">Séries</string>
     <string name="select">Sélectionner</string>
     <string name="data_not_found">Données non trouvées</string>
     <string name="clear">Effacer</string>
+    <string name="movies">films</string>
+    <string name="tv">séries</string>
 </resources>
\ No newline at end of file