Refactor/media details

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+### Description
+
+_A brief, high-level summary of the changes in this pull request._
+
+---
+
+### Screenshots or Screen Recordings
+
+_If applicable, add screenshots or screen recordings to help visualize the changes._
+
+---

.github/workflows/android-ci.yml

@@ -0,0 +1,33 @@
+name: Android CI
+
+on:
+  pull_request:
+    branches:
+      - main
+      - develop
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v3
+
+      - name: Setup JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Create google-services.json from secret
+        run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > app/google-services.json
+
+      - name: Build (skip tests & lint)
+        run: ./gradlew assembleDebug -x test -x lint

app/build.gradle

@@ -1,132 +1,157 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id "kotlin-kapt"
+    id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
-    id 'androidx.navigation.safeargs'
+    id 'androidx.navigation.safeargs.kotlin'
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
     id 'com.google.firebase.firebase-perf'
 }
 
+// Load local properties at the project level
 def localProperties = new Properties()
-localProperties.load(new FileInputStream(rootProject.file("local.properties")))
+def localPropertiesFile = rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.withReader('UTF-8') { reader ->
+        localProperties.load(reader)
+    }
+}
 
 android {
-    compileSdk 32
+    namespace 'com.karrar.movieapp'
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.karrar.movieapp"
         minSdk 21
-        targetSdk 32
+        targetSdk 34
         versionCode 1
         versionName "1.0"
-        buildConfigField "String", "API_KEY", localProperties['apiKey']
+
+        // Build config fields with safe property access
+        buildConfigField "String", "API_KEY", "\"${localProperties.getProperty('apiKey', '')}\""
         buildConfigField "String", "BASE_URL", "\"https://api.themoviedb.org/3/\""
         buildConfigField "String", "IMAGE_BASE_PATH", "\"https://image.tmdb.org/t/p/w500\""
         buildConfigField "String", "TMDB_SIGNUP_URL", "\"https://www.themoviedb.org/signup\""
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArgument "runnerBuilder", "de.mannodermaus.junit5.AndroidJUnitPlatformBuilder"
     }
 
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
-    }
-    testOptions {
-        unitTests.all {
-            useJUnitPlatform()
+        debug {
+            // Add debug-specific configurations if needed
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        // For newer AGP versions, consider using VERSION_11
+        // sourceCompatibility JavaVersion.VERSION_11
+        // targetCompatibility JavaVersion.VERSION_11
     }
+
     kotlinOptions {
         jvmTarget = '1.8'
+        // For newer Kotlin versions, consider using '11'
+        // jvmTarget = '11'
     }
+
     buildFeatures {
+        buildConfig true
         dataBinding true
         viewBinding true
     }
 
+    testOptions {
+        unitTests.all {
+            useJUnitPlatform()
+        }
+        unitTests.returnDefaultValues = true
+    }
 }
 
 dependencies {
-
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.1'
+    // Core Android
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-
-    //Test
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.2"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.2"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.8.2"
-
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
-    implementation "com.squareup.okhttp3:okhttp:4.9.1"
+    // Architecture Components
+    implementation 'androidx.fragment:fragment-ktx:1.8.2'
+    implementation 'androidx.activity:activity-ktx:1.9.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.4'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.4'
 
-    //viewModel
-    implementation 'androidx.fragment:fragment-ktx:1.5.2'
-    implementation 'androidx.activity:activity-ktx:1.5.1'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.2'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.2'
+    // Navigation
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
 
-    implementation "androidx.recyclerview:recyclerview:1.2.0"
+    // RecyclerView
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
 
-    //picasso
-    implementation 'com.squareup.picasso:picasso:2.71828'
+    // Networking
+    implementation 'com.squareup.retrofit2:retrofit:2.11.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.11.0'
+    implementation "com.squareup.okhttp3:okhttp:4.12.0"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
 
-    // room dependency
-    def room_version = "2.4.3"
-    implementation("androidx.room:room-runtime:$room_version")
-    kapt("androidx.room:room-compiler:$room_version")
-    implementation("androidx.room:room-ktx:$room_version")
+    // Image Loading
+    implementation 'io.coil-kt:coil:2.7.0'
 
-    implementation "com.google.dagger:hilt-android:2.42"
-    kapt "com.google.dagger:hilt-compiler:2.42"
+    // Room Database
+    def room_version = "2.6.1"
+    implementation "androidx.room:room-runtime:$room_version"
+    implementation "androidx.room:room-ktx:$room_version"
+    implementation "androidx.room:room-paging:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
 
-    implementation "androidx.compose.material3:material3:1.0.0-alpha14"
-    implementation "androidx.compose.material3:material3-window-size-class:1.0.0-alpha14"
-    //data store preferences
-    implementation "androidx.datastore:datastore-preferences:1.0.0"
+    // Hilt (Dependency Injection)
+    implementation "com.google.dagger:hilt-android:2.52"
+    kapt "com.google.dagger:hilt-compiler:2.52"
 
+    // Paging
+    implementation "androidx.paging:paging-runtime-ktx:3.3.2"
 
-    implementation 'androidx.core:core-splashscreen:1.0.0'
+    // DataStore
+    implementation "androidx.datastore:datastore-preferences:1.1.1"
 
-    implementation 'androidx.appcompat:appcompat:1.0.0-alpha1'
-    implementation 'com.google.android.material:material:1.0.0-alpha1'
+    // Splash Screen
+    implementation 'androidx.core:core-splashscreen:1.0.1'
 
-    // Lottie
-    implementation 'com.airbnb.android:lottie:5.2.0'
+    // ViewPager2 for OnBoarding
+    implementation 'androidx.viewpager2:viewpager2:1.0.0'
 
-    //Coil
-    implementation 'io.coil-kt:coil:2.2.2'
+    // Lottie Animations
+    implementation 'com.airbnb.android:lottie:6.4.1'
 
-    implementation 'io.github.glailton.expandabletextview:expandabletextview:1.0.2'
+    // YouTube Player
+    implementation 'com.pierfrancescosoffritti.androidyoutubeplayer:core:12.1.0'
 
-    implementation 'com.pierfrancescosoffritti.androidyoutubeplayer:core:11.1.0'
-
-    // paging
-    implementation "androidx.paging:paging-runtime:3.1.1"
-    implementation "androidx.paging:paging-runtime-ktx:3.1.1"
-
-    // firebase
-    implementation platform('com.google.firebase:firebase-bom:31.1.0')
+    // Firebase
+    implementation platform('com.google.firebase:firebase-bom:33.1.2')
     implementation 'com.google.firebase:firebase-analytics-ktx'
-
     implementation 'com.google.firebase:firebase-crashlytics-ktx'
     implementation 'com.google.firebase:firebase-perf-ktx'
 
-
-
+    // Testing
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.2"
+    testImplementation "io.mockk:mockk:1.13.10"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0"
+
+    // Android Testing
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    androidTestImplementation "io.mockk:mockk-android:1.13.10"
 }

app/secret.properties

@@ -0,0 +1,2 @@
+API_KEY="b77ea619291736aea2b7740de4f6bfdc"
+BASE_URL="api.themoviedb.org"

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.karrar.movieapp">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -19,18 +18,25 @@
         tools:targetApi="31">
 
         <activity
-            android:name=".ui.main.MainActivity"
+            android:name=".ui.onboarding.OnBoardingActivity"
             android:exported="true"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustNothing"
-            android:theme="@style/Theme.MovieApp.SplashScreen">
+            android:theme="@style/Theme.MovieApp">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".ui.main.MainActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustNothing"
+            android:theme="@style/Theme.MovieApp">
+        </activity>
+
         <activity
             android:name=".ui.youtubePlayer.YoutubePlayerActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode|locale|layoutDirection"

app/src/main/java/com/karrar/movieapp/domain/enums/AllMediaType.kt

@@ -7,7 +7,7 @@ enum class AllMediaType {
     POPULAR,
     TOP_RATED,
     TRENDING,
-    NOW_STREAMING,
+    RECENTLY_RELEASED,
     UPCOMING,
     MYSTERY,
     ADVENTURE,

app/src/main/java/com/karrar/movieapp/domain/enums/HomeItemsType.kt

@@ -1,11 +1,10 @@
 package com.karrar.movieapp.domain.enums
 
 enum class HomeItemsType(val value :String) {
-    ON_THE_AIR("On the air"),
-    TRENDING("Trending"),
-    NOW_STREAMING("Now streaming"),
-    UPCOMING("Upcoming"),
-    MYSTERY("Mystery"),
-    ADVENTURE("Adventure"),
+    TOP_RATED_TV_SHOWS("Top Rated Tv Shows"),
+    RECENTLY_RELEASED("Recently Released"),
+    UPCOMING("Upcoming Movies"),
+    RECENTLY_VIEWED("You Recently Viewed"),
+    YOUR_COLLECTIONS("Your Collections"),
     NON("")
 }

app/src/main/java/com/karrar/movieapp/domain/usecases/allMedia/GetMediaByTypeUseCase.kt

@@ -27,8 +27,7 @@ class GetMediaByTypeUseCase @Inject constructor(
                 wrapper({ movieRepository.getActorMoviesPager(actorId) }, movieMapper::map)
             }
             AllMediaType.LATEST,
-            AllMediaType.AIRING_TODAY,
-            -> {
+            AllMediaType.AIRING_TODAY, -> {
                 wrapper(seriesRepository::getAiringTodayTvShowPager, tvShowMapper::map)
             }
             AllMediaType.ON_THE_AIR -> {
@@ -43,7 +42,7 @@ class GetMediaByTypeUseCase @Inject constructor(
             AllMediaType.TRENDING -> {
                 wrapper(movieRepository::getTrendingMoviesPager, movieMapper::map)
             }
-            AllMediaType.NOW_STREAMING -> {
+            AllMediaType.RECENTLY_RELEASED -> {
                 wrapper(movieRepository::getNowPlayingMoviesPager, movieMapper::map)
             }
             AllMediaType.UPCOMING -> {

app/src/main/java/com/karrar/movieapp/domain/usecases/home/HomeUseCasesContainer.kt

@@ -5,6 +5,10 @@ import com.karrar.movieapp.domain.usecase.home.getData.series.GetAiringTodaySeri
 import com.karrar.movieapp.domain.usecase.home.getData.series.GetOnTheAirSeriesUseCase
 import com.karrar.movieapp.domain.usecase.home.getData.series.GetTopRatedTvShowSeriesUseCase
 import com.karrar.movieapp.domain.usecase.home.getData.movie.*
+import com.karrar.movieapp.domain.usecases.CheckIfLoggedInUseCase
+import com.karrar.movieapp.domain.usecases.GetAccountDetailsUseCase
+import com.karrar.movieapp.domain.usecases.GetWatchHistoryUseCase
+import com.karrar.movieapp.domain.usecases.mylist.GetMyListUseCase
 
 import javax.inject.Inject
 
@@ -19,4 +23,8 @@ class HomeUseCasesContainer @Inject constructor(
     val getAdventureMoviesUseCase: GetAdventureMoviesUseCase,
     val getNowStreamingMoviesUseCase: GetNowStreamingMoviesUseCase,
     val getTrendingActorsUseCase: GetTrendingActorsUseCase,
+    val getWatchHistoryUseCase: GetWatchHistoryUseCase,
+    val getMyListUseCase: GetMyListUseCase,
+    val getAccountDetailsUseCase: GetAccountDetailsUseCase,
+    val checkIfLoggedInUseCase: CheckIfLoggedInUseCase
 )

app/src/main/java/com/karrar/movieapp/ui/actors/ActorsAdapter.kt

@@ -6,10 +6,9 @@ import com.karrar.movieapp.ui.adapters.ActorsInteractionListener
 import com.karrar.movieapp.ui.base.BasePagingAdapter
 import com.karrar.movieapp.ui.models.ActorUiState
 
-class ActorsAdapter(listener: ActorsInteractionListener) :
+class ActorsAdapter(listener: ActorsInteractionListener, override val layoutID: Int) :
     BasePagingAdapter<ActorUiState>(ActorComparator, listener) {
 
-    override val layoutID: Int = R.layout.item_actor_see_all
 
     object ActorComparator : DiffUtil.ItemCallback<ActorUiState>() {
         override fun areItemsTheSame(oldItem: ActorUiState, newItem: ActorUiState) =