Merge release/3.0.0 into development

app/build.gradle

@@ -21,7 +21,7 @@ android {
         applicationId "tech.salroid.filmy"
         minSdkVersion 24
         targetSdkVersion 35
-        versionCode 22
+        versionCode 23
         versionName "3.0.0"
         multiDexEnabled true
         resourceConfigurations += ['en', 'de', 'es-rES', 'hi-rIN', 'nl-rNL']

app/src/main/AndroidManifest.xml

@@ -12,8 +12,7 @@
         android:label="@string/app_name"
         android:resizeableActivity="true"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.MD3"
-        android:usesCleartextTraffic="true">
+        android:theme="@style/AppTheme.MD3">
 
         <uses-library
             android:name="org.apache.http.legacy"

app/src/main/java/tech/salroid/filmy/data/network/MoviesApiService.kt

@@ -11,7 +11,7 @@ interface MoviesApiService {
 
     companion object{
         var BASE_URL = "https://api.themoviedb.org/3/"
-        var BASE_URL_OMDB = "http://www.omdbapi.com/"
+        var BASE_URL_OMDB = "https://www.omdbapi.com/"
     }
 
     @GET("movie/popular")

app/src/main/java/tech/salroid/filmy/di/MoviesModule.kt

@@ -57,6 +57,6 @@ object MoviesModule {
             appContext,
             FilmyDatabase::class.java,
             "filmy"
-        ).build()
+        ).fallbackToDestructiveMigration(true).build()
     }
 }

app/src/main/java/tech/salroid/filmy/ui/details/MovieDetailsActivity.kt

@@ -611,7 +611,7 @@ class MovieDetailsActivity : AppCompatActivity() {
         else {
             var smallTitle = movieTitleHyphen?.lowercase()
             smallTitle = smallTitle?.replace("[^\\d-a-z]".toRegex(), "")
-            val url = "http://www.metacritic.com/movie/$smallTitle"
+            val url = "https://www.metacritic.com/movie/$smallTitle"
 
             if (metaScoreRating != null) {
                 when {

app/src/main/java/tech/salroid/filmy/ui/home/MoviesFragment.kt

@@ -181,7 +181,7 @@ class MoviesFragment : Fragment() {
     }
 
     private fun lightThemeLogic() {
-        binding.logo.setTextColor(ContextCompat.getColor(requireActivity(), R.color.dark))
+        binding.logo.setTextColor(ContextCompat.getColor(requireActivity(), R.color.textColorDark))
         binding.ivLogo.imageTintList =
             ContextCompat.getColorStateList(requireActivity(), R.color.colorMore)
         binding.searchIcon.background =

app/src/main/res/layout/activity_detailed.xml

@@ -141,7 +141,7 @@
                             android:layout_gravity="center_horizontal"
                             android:layout_marginTop="8dp"
                             android:fontFamily="@font/circularstd_book"
-                            android:text="+ More"
+                            android:text="@string/more_plus"
                             android:textAllCaps="true" />
 
                     </LinearLayout>

app/src/main/res/layout/all_trailer_layout.xml

@@ -42,7 +42,6 @@
                 android:layout_marginEnd="16dp"
                 android:layout_toEndOf="@+id/cross"
                 android:fontFamily="@font/circularstd_book"
-                android:text=""
                 android:textColor="#000000"
                 android:textSize="20sp"
                 android:textStyle="bold" />

app/src/main/res/layout/custom_row.xml

@@ -12,7 +12,7 @@
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/poster"
         android:layout_width="120dp"
-        android:layout_height="170dp"
+        android:layout_height="180dp"
         android:layout_gravity="center_vertical"
         android:scaleType="fitXY"
         app:shapeAppearanceOverlay="@style/roundedImageView" />

app/src/main/res/layout/extra_info_movie_detail.xml

@@ -32,7 +32,6 @@
             android:layout_marginStart="8dp"
             android:layout_toEndOf="@id/runtime_holder"
             android:fontFamily="@font/circularstd_book"
-            android:text=""
             android:textSize="14sp" />
 
         <TextView
@@ -58,7 +57,6 @@
             android:ellipsize="end"
             android:fontFamily="@font/circularstd_book"
             android:maxLines="1"
-            android:text=""
             android:textSize="14sp" />
 
         <TextView
@@ -82,7 +80,6 @@
             android:layout_marginStart="8dp"
             android:layout_toEndOf="@id/language_holder"
             android:fontFamily="@font/circularstd_book"
-            android:text=""
             android:textSize="14sp" />
 
         <TextView
@@ -106,7 +103,6 @@
             android:layout_marginStart="8dp"
             android:layout_toEndOf="@id/release_holder"
             android:fontFamily="@font/circularstd_book"
-            android:text=""
             android:textSize="14sp" />
 
     </RelativeLayout>

app/src/main/res/layout/filmy_appwidget.xml

@@ -38,7 +38,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="16dp"
-                    android:text="TRENDING"
+                    android:text="@string/trending_widget_title"
                     android:textColor="@color/white"
                     android:textStyle="bold"
                     android:fontFamily="@font/circularstd_book"
@@ -58,7 +58,7 @@
                         android:padding="16dp"
                         android:textStyle="bold"
                         android:textColor="@color/white"
-                        android:text=" "
+                        android:text="@string/empty_space"
                         android:fontFamily="@font/circularstd_book"
 
                         />

app/src/main/res/layout/fragment_movies.xml

@@ -37,11 +37,11 @@
                 android:id="@+id/logo"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/pacifico_regular"
+                android:layout_marginTop="8dp"
+                android:fontFamily="@font/host_grotesk_bold"
                 android:text="@string/app_name"
-                android:textColor="@color/black"
                 android:textSize="22sp"
-                android:textStyle="bold"
+                app:fontFamily="@font/host_grotesk_bold"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@id/ivLogo"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -51,6 +51,7 @@
                 android:layout_width="46dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|center_vertical"
+                android:layout_marginTop="8dp"
                 android:layout_marginEnd="16dp"
                 android:background="@drawable/bg_search_icon"
                 android:clickable="true"
@@ -107,7 +108,7 @@
                 android:fontFamily="@font/circularstd_book"
                 android:gravity="center_vertical"
                 android:letterSpacing="0.1"
-                android:text="Popular"
+                android:text="@string/popular_title"
                 android:textAllCaps="false"
                 android:textSize="14sp"
                 android:textStyle="bold"
@@ -135,7 +136,7 @@
                 android:fontFamily="@font/circularstd_book"
                 android:gravity="center_vertical"
                 android:letterSpacing="0.1"
-                android:text="Now Playing"
+                android:text="@string/now_playing_title"
                 android:textAllCaps="false"
                 android:textSize="14sp"
                 android:textStyle="bold"
@@ -163,7 +164,7 @@
                 android:fontFamily="@font/circularstd_book"
                 android:gravity="center_vertical"
                 android:letterSpacing="0.1"
-                android:text="Upcoming"
+                android:text="@string/upcoming_title"
                 android:textAllCaps="false"
                 android:textSize="14sp"
                 android:textStyle="bold"
@@ -208,4 +209,3 @@
         app:layout_constraintTop_toBottomOf="@id/appbar" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-

app/src/main/res/values/colors.xml

@@ -23,6 +23,7 @@
     <color name="grey3">#CCCCCC</color>
 
     <color name="dark">#616161</color>
+    <color name="textColorDark">#434343</color>
     <color name="lightColorOnSurface">#323232</color>
     <color name="surfaceColorDark">#1C1B20</color>
     <color name="surfaceColorLight">#FFFBFF</color>

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

@@ -3,15 +3,15 @@
     <string name="trakt_base_url" translatable="false">https://api.trakt.tv/people/</string>
     <string name="trakt_cast_suffix" translatable="false">/people?extended=images</string>
 
-    <string name="tmdb_movie_base_url" translatable="false">http://api.themoviedb.org/3/movie/</string>
+    <string name="tmdb_movie_base_url" translatable="false">https://api.themoviedb.org/3/movie/</string>
 
     <string name="person_details_suffix" translatable="false">extended=full,images</string>
     <string name="person_movies_details" translatable="false">/movies?extended=images,full</string>
-    <string name="imdb_link_prefix" translatable="false">http://www.imdb.com/title/</string>
-    <string name="trailer_img_url" formatted="false" translatable="false">http://img.youtube.com/vi/%1$s/0.jpg</string>
-    <string name="poster_prefix_185" translatable="false">http://image.tmdb.org/t/p/w342</string>
-    <string name="poster_prefix_500" translatable="false">http://image.tmdb.org/t/p/w1280</string>
-    <string name="poster_prefix_add_quality" translatable="false">http://image.tmdb.org/t/p/</string>
+    <string name="imdb_link_prefix" translatable="false">https://www.imdb.com/title/</string>
+    <string name="trailer_img_url" formatted="false" translatable="false">https://img.youtube.com/vi/%1$s/0.jpg</string>
+    <string name="poster_prefix_185" translatable="false">https://image.tmdb.org/t/p/w342</string>
+    <string name="poster_prefix_500" translatable="false">https://image.tmdb.org/t/p/w1280</string>
+    <string name="poster_prefix_add_quality" translatable="false">https://image.tmdb.org/t/p/</string>
     <string name="trailer_link_prefix" translatable="false">https://www.youtube.com/watch?v=</string>
 
     <string name="collection_short_label" translatable="false">Collections</string>
@@ -306,11 +306,18 @@ limitations under the License.
     <string name="github">GitHub</string>
 
     <!-- New: TODO Finalise position -->
-    <string name="movie_poster_url" formatted="false" translatable="false">http://image.tmdb.org/t/p/w500%1$s</string>
-    <string name="member_profile_url" formatted="false" translatable="false">http://image.tmdb.org/t/p/w185%1$s</string>
-    <string name="member_profile_url_2" formatted="false" translatable="false">http://image.tmdb.org/t/p/w185%1$s</string>
+    <string name="movie_poster_url" formatted="false" translatable="false">https://image.tmdb.org/t/p/w500%1$s</string>
+    <string name="member_profile_url" formatted="false" translatable="false">https://image.tmdb.org/t/p/w185%1$s</string>
+    <string name="member_profile_url_2" formatted="false" translatable="false">https://image.tmdb.org/t/p/w185%1$s</string>
     <string name="remove" translatable="false">Remove</string>
     <string name="close_video">Close Video</string>
     <string name="video_player">Video Player</string>
 
+    <string name="popular_title">Popular</string>
+    <string name="now_playing_title">Now Playing</string>
+    <string name="upcoming_title">Upcoming</string>
+    <string name="more_plus">+ More</string>
+    <string name="trending_widget_title">TRENDING</string>
+    <string name="empty_space">" "</string>
+
 </resources>