Merge branch 'release/v1.3.4' into main

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup JDK environment
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Make Gradle executable
         run: chmod +x ./gradlew

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.tanasi.streamflix"
         minSdk 23
         targetSdk 33
-        versionCode 8
-        versionName "1.3.3"
+        versionCode 9
+        versionName "1.3.4"
     }
 
     buildTypes {
@@ -40,11 +40,11 @@ dependencies {
     implementation 'androidx.leanback:leanback:1.0.0'
     implementation 'com.github.bumptech.glide:glide:4.13.1'
 
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.18.5'
-    implementation 'com.google.android.exoplayer:exoplayer-dash:2.18.5'
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.18.5'
-    implementation 'com.google.android.exoplayer:extension-mediasession:2.18.5'
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.18.5'
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.19.0'
+    implementation 'com.google.android.exoplayer:exoplayer-dash:2.19.0'
+    implementation 'com.google.android.exoplayer:exoplayer-hls:2.19.0'
+    implementation 'com.google.android.exoplayer:extension-mediasession:2.19.0'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.19.0'
 
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.9'

app/src/main/java/com/tanasi/streamflix/activities/main/MainActivity.kt

@@ -6,7 +6,6 @@ import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.fragment.app.FragmentActivity
-import androidx.navigation.NavOptions
 import androidx.navigation.fragment.NavHostFragment
 import com.bumptech.glide.Glide
 import com.tanasi.navigation.widget.setupWithNavController

app/src/main/java/com/tanasi/streamflix/adapters/AppAdapter.kt

@@ -3,9 +3,43 @@ package com.tanasi.streamflix.adapters
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.tanasi.streamflix.adapters.viewholders.*
-import com.tanasi.streamflix.databinding.*
-import com.tanasi.streamflix.models.*
+import com.tanasi.streamflix.adapters.viewholders.CategoryViewHolder
+import com.tanasi.streamflix.adapters.viewholders.EpisodeViewHolder
+import com.tanasi.streamflix.adapters.viewholders.GenreViewHolder
+import com.tanasi.streamflix.adapters.viewholders.MovieViewHolder
+import com.tanasi.streamflix.adapters.viewholders.PeopleViewHolder
+import com.tanasi.streamflix.adapters.viewholders.ProviderViewHolder
+import com.tanasi.streamflix.adapters.viewholders.SeasonViewHolder
+import com.tanasi.streamflix.adapters.viewholders.TvShowViewHolder
+import com.tanasi.streamflix.databinding.ContentCategorySwiperBinding
+import com.tanasi.streamflix.databinding.ContentMovieBinding
+import com.tanasi.streamflix.databinding.ContentMovieCastsBinding
+import com.tanasi.streamflix.databinding.ContentMovieRecommendationsBinding
+import com.tanasi.streamflix.databinding.ContentPeopleBinding
+import com.tanasi.streamflix.databinding.ContentTvShowBinding
+import com.tanasi.streamflix.databinding.ContentTvShowCastsBinding
+import com.tanasi.streamflix.databinding.ContentTvShowRecommendationsBinding
+import com.tanasi.streamflix.databinding.ContentTvShowSeasonsBinding
+import com.tanasi.streamflix.databinding.ItemCategoryBinding
+import com.tanasi.streamflix.databinding.ItemEpisodeBinding
+import com.tanasi.streamflix.databinding.ItemEpisodeContinueWatchingBinding
+import com.tanasi.streamflix.databinding.ItemGenreGridBinding
+import com.tanasi.streamflix.databinding.ItemMovieBinding
+import com.tanasi.streamflix.databinding.ItemMovieContinueWatchingBinding
+import com.tanasi.streamflix.databinding.ItemMovieGridBinding
+import com.tanasi.streamflix.databinding.ItemPeopleBinding
+import com.tanasi.streamflix.databinding.ItemProviderBinding
+import com.tanasi.streamflix.databinding.ItemSeasonBinding
+import com.tanasi.streamflix.databinding.ItemTvShowBinding
+import com.tanasi.streamflix.databinding.ItemTvShowGridBinding
+import com.tanasi.streamflix.models.Category
+import com.tanasi.streamflix.models.Episode
+import com.tanasi.streamflix.models.Genre
+import com.tanasi.streamflix.models.Movie
+import com.tanasi.streamflix.models.People
+import com.tanasi.streamflix.models.Provider
+import com.tanasi.streamflix.models.Season
+import com.tanasi.streamflix.models.TvShow
 
 class AppAdapter(
     val items: MutableList<Item> = mutableListOf()

app/src/main/java/com/tanasi/streamflix/adapters/viewholders/ProviderViewHolder.kt

@@ -1,11 +1,9 @@
 package com.tanasi.streamflix.adapters.viewholders
 
-import androidx.navigation.NavOptions
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import com.bumptech.glide.Glide
-import com.tanasi.streamflix.R
 import com.tanasi.streamflix.databinding.ItemProviderBinding
 import com.tanasi.streamflix.fragments.providers.ProvidersFragmentDirections
 import com.tanasi.streamflix.models.Provider

app/src/main/java/com/tanasi/streamflix/adapters/viewholders/TvShowViewHolder.kt

@@ -11,7 +11,12 @@ import androidx.viewbinding.ViewBinding
 import com.bumptech.glide.Glide
 import com.tanasi.streamflix.R
 import com.tanasi.streamflix.adapters.AppAdapter
-import com.tanasi.streamflix.databinding.*
+import com.tanasi.streamflix.databinding.ContentTvShowBinding
+import com.tanasi.streamflix.databinding.ContentTvShowCastsBinding
+import com.tanasi.streamflix.databinding.ContentTvShowRecommendationsBinding
+import com.tanasi.streamflix.databinding.ContentTvShowSeasonsBinding
+import com.tanasi.streamflix.databinding.ItemTvShowBinding
+import com.tanasi.streamflix.databinding.ItemTvShowGridBinding
 import com.tanasi.streamflix.fragments.genre.GenreFragment
 import com.tanasi.streamflix.fragments.genre.GenreFragmentDirections
 import com.tanasi.streamflix.fragments.home.HomeFragment

app/src/main/java/com/tanasi/streamflix/fragments/player/PlayerViewModel.kt

@@ -28,7 +28,7 @@ class PlayerViewModel(
     }
 
 
-    fun getVideo(
+    private fun getVideo(
         videoType: PlayerFragment.VideoType,
         id: String,
     ) = viewModelScope.launch(Dispatchers.IO) {

app/src/main/java/com/tanasi/streamflix/providers/Provider.kt

@@ -2,7 +2,13 @@ package com.tanasi.streamflix.providers
 
 import com.tanasi.streamflix.adapters.AppAdapter
 import com.tanasi.streamflix.fragments.player.PlayerFragment
-import com.tanasi.streamflix.models.*
+import com.tanasi.streamflix.models.Category
+import com.tanasi.streamflix.models.Episode
+import com.tanasi.streamflix.models.Genre
+import com.tanasi.streamflix.models.Movie
+import com.tanasi.streamflix.models.People
+import com.tanasi.streamflix.models.TvShow
+import com.tanasi.streamflix.models.Video
 
 interface Provider {
 

app/src/main/java/com/tanasi/streamflix/utils/Extensions.kt

@@ -19,7 +19,8 @@ import com.google.android.exoplayer2.Tracks
 import com.tanasi.streamflix.R
 import com.tanasi.streamflix.activities.main.MainActivity
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Calendar
+import java.util.Locale
 import kotlin.math.abs
 
 fun String.toCalendar(): Calendar? {
@@ -120,7 +121,12 @@ inline fun <reified T : ViewGroup.LayoutParams> View.layoutParams(block: T.() ->
     if (layoutParams is T) block(layoutParams as T)
 }
 
-fun View.margin(left: Float? = null, top: Float? = null, right: Float? = null, bottom: Float? = null) {
+fun View.margin(
+    left: Float? = null,
+    top: Float? = null,
+    right: Float? = null,
+    bottom: Float? = null
+) {
     layoutParams<ViewGroup.MarginLayoutParams> {
         left?.run { leftMargin = dpToPx(this) }
         top?.run { topMargin = dpToPx(this) }

build.gradle

@@ -10,8 +10,8 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '7.3.1' apply false
-    id 'com.android.library' version '7.3.1' apply false
+    id 'com.android.application' version '8.0.2' apply false
+    id 'com.android.library' version '8.0.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
 }
 

gradle.properties

@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat May 21 18:07:27 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME