Marvel API to TheMoviedb (#390)

* Marvel to Movies

* Update CI

* Update e2e tests and app id

* Use Wiremock

* Use Wiremock latest

* Upload script permission

* Update script

* Remove Marvel JSON files

* Fix upload script

* Build a custom wiremock

* Build a custom wiremock

* Update docker image name

* Trigger workflow

* Use custom wiremock

* Fix some bugs

* Fix mapping

* Update code

* Edge2edge

* Update things

* Use JUnit instead of kotest

* Dependency updates

* Update AGP, fix deprecated gradle syntax

* Use Compose BOM, use material3

* Update README and screenshots

Author: LordRaydenMK

.github/workflows/build-wiremock.yml

@@ -0,0 +1,29 @@
+name: Build WireMock Image
+
+on:
+  push:
+    paths:
+      - 'wiremock/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        run: |
+          docker build -t ghcr.io/lordraydenmk/wiremock ./wiremock
+          docker push ghcr.io/lordraydenmk/wiremock

.github/workflows/ci.yml

@@ -18,8 +18,7 @@ jobs:
 
       - name: Setup secrets
         run: |
-          echo marvel_public_api_key=${{ secrets.MARVEL_PUBLIC_API_KEY }} >> gradle.properties
-          echo marvel_private_api_key=${{ secrets.MARVEL_PRIVATE_API_KEY }} >> gradle.properties
+          echo tmdb_api_key=${{ secrets.TMDB_API_KEY }} >> gradle.properties
 
       - name: Setup Java
         uses: actions/setup-java@v4
@@ -43,6 +42,13 @@ jobs:
   test:
     runs-on: ubuntu-latest
     timeout-minutes: 30
+
+    services:
+      wiremock:
+        image: ghcr.io/lordraydenmk/wiremock
+        ports:
+          - 8080:8080
+
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -64,8 +70,7 @@ jobs:
 
     - name: Setup secrets
       run: |
-        echo marvel_public_api_key=${{ secrets.MARVEL_PUBLIC_API_KEY }} >> gradle.properties
-        echo marvel_private_api_key=${{ secrets.MARVEL_PRIVATE_API_KEY }} >> gradle.properties
+        echo tmdb_api_key=${{ secrets.TMDB_API_KEY }} >> gradle.properties
 
     - name: Install Maestro
       run: | 
@@ -79,7 +84,7 @@ jobs:
         emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
         disable-animations: true
         script: |
-          ./gradlew installDebug
+          ./gradlew installDebug -Ptmdb_base_url=http://10.0.2.2:8080/
           chmod +x e2e.sh
           ./e2e.sh
 

README.md

@@ -1,39 +1,38 @@
-# Superheroes App
+# Movies App
 
-A sample project using the Marvel API to show a list of superheroes and some stats about them.
+A sample project using the TMDB API to show a list of popular movies and some stats about them.
 
-| Superheroes List                             | Superhero Details                         | Error & Retry                       |
-|----------------------------------------------|-------------------------------------------|-------------------------------------|
-| ![Superheroes List](/images/superheroes.png) | ![Superhero Details](/images/details.png) | ![Error Loading](/images/error.png) |
+| Popular Movies List                             | Movie Details                         | Error & Retry                       |
+|-------------------------------------------------|---------------------------------------|-------------------------------------|
+| ![Popular Movies List](/images/popular.png) | ![Movie Details](/images/details.png) | ![Error Loading](/images/error.png) |
 
-## Marvel API KEY
+## TMDB API KEY
 
-The project need `marvel_public_api_key` and `marvel_private_api_key` to build. You can add them to your home level `gradle.properties` file (located in `~/.gradle` on Unix based systems):
+The project need `tmdb_api_key` to build. You can add it to your home level `gradle.properties` file (located in `~/.gradle` on Unix based systems):
 
 ```
-marvel_public_api_key=<PUBLIC API KEY HERE>
-marvel_private_api_key=<PRIVATE API KEY HERE>
+tmdb_api_key=<API KEY HERE>
 ```
 
-or using `-Pmarvel_public_api_key=<PUBLIC API KEY HERE> -Pmarvel_private_api_key=<PRIVATE API KEY HERE>` to each gradle command e.g.:
+or using `-Ptmdb_api_key=<API KEY HERE>` to each gradle command e.g.:
 
 ```
-./gradlew assembleDebug -Pmarvel_public_api_key=<PUBLIC API KEY HERE> -Pmarvel_private_api_key=<PRIVATE API KEY HERE>
+./gradlew assembleDebug -Ptmdb_api_key=<PUBLIC API KEY HERE>
 ``` 
 
-Check out the [Marvel Developer portal][mdp] for more info.
+Check out the [TMDB developer documentation][tmdb] for more info.
 
 ## App Architecture
 
 The app uses a reactive architecture built atop Flow. The app follows a layered architecture with data, domain and presentation layer. The package structure is an attempt to package by feature, however both screens share the data and domain layers. The app uses a single activity + fragments and the Jetpack Navigation Component.
 
 ### Data Layer
 
-The API call is modeled using Retrofit, KotlinX Serialization as the converter. The data layer converts the DTO objects to Domain objects. Any expected errors that happen up to this point are mapped to a sealed class `SuperheroError`. A custom exception `SuperheroException` that contains a property of the error is delivered as an `Flow` error in the stream.
+The API call is modeled using Retrofit, KotlinX Serialization as the converter. The data layer converts the DTO objects to Domain objects. Any expected errors that happen up to this point are mapped to a sealed class `MovieError`. A custom exception `MovieException` that contains a property of the error is delivered as an `Flow` error in the stream.
 
 ### Domain Layer
 
-The main class here is `Superhero`. It has a static `create` function that converts the string that comes from the API (as a thumbnail) into a `HttpUrl` also making sure it's https (so it works on Android).
+The main class here is `Movie`. It has a static `create` function that converts the string that comes from the API into a typesafe `HttpUrl`.
 
 ### Presentation Layer
 
@@ -59,9 +58,9 @@ The logic is written as extension functions on top of a module (collection of de
 
 ### Testing
 
-This sample uses [kotest][kotest] as a testing library. The presentation logic is tested by mocking the Retrofit Service and using a `TestViewModel` that uses `MutableSharedFlow` instead of `MutableStateFlow` and remembers all events. Tests use the real schedulers and Turbine for testing `Flow`.
+This sample uses JUnit as a testing library and [kotest assertions][kotest] for assertions. The presentation logic is tested by mocking the Retrofit Service and using a `TestViewModel` that uses `MutableSharedFlow` instead of `MutableStateFlow` and remembers all events. Tests use the real schedulers and Turbine for testing `Flow`.
 
-The view is tested in isolation using Espresso, by setting a ViewState and verifying the correct elements are displayed/hidden and the text matches the expected. 
+The view is tested in isolation using Paparazzi, by setting a ViewState and verifying the current image matches the golden images from the repo. 
 
 There is also one E2E (black box) test using Maestro that tests both fragments + activity together.
 
@@ -72,9 +71,9 @@ Approaches is this sample are heavily inspired by open source code I have read.
 - [47degrees/FunctionalStreamsSpringSample][fun-stream]
 - [Simple Kotlin DI][simple-di]
 
-[mdp]: https://developer.marvel.com/
+[tmdb]: https://developer.themoviedb.org/docs/getting-started
 [fun-stream]: https://github.com/47degrees/FunctionalStreamsSpringSample
 [simple-di]: https://gist.github.com/raulraja/97e2d5bf60e9d96680cf1fddcc90ee67
 [view-binding]: https://developer.android.com/topic/libraries/view-binding
-[fork]: app/src/main/java/io/github/lordraydenmk/superheroesapp/common/observable.kt
+[fork]: app/src/main/java/io/github/lordraydenmk/themoviedbapp/common/observable.kt
 [kotest]: https://github.com/kotest/kotest

app/build.gradle

@@ -7,28 +7,28 @@ plugins {
 }
 
 android {
-    namespace 'io.github.lordraydenmk.superheroesapp'
-    compileSdk 35
+    namespace 'io.github.lordraydenmk.themoviedbapp'
+    compileSdkVersion 36
 
     defaultConfig {
-        applicationId "io.github.lordraydenmk.superheroesapp"
+        applicationId "io.github.lordraydenmk.themoviedbapp"
         minSdkVersion 26
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        if (project.hasProperty("marvel_public_api_key")) {
-            def marvelPublicKey = '"' + project.property("marvel_public_api_key") + '"'
-            def marvelPrivateKey = '"' + project.property("marvel_private_api_key") + '"'
-            buildConfigField("String", "MARVEL_PUBLIC_API_KEY", marvelPublicKey)
-            buildConfigField("String", "MARVEL_PRIVATE_API_KEY", marvelPrivateKey)
+        def baseUrl = '"' + project.property("tmdb_base_url") + '"'
+        buildConfigField("String", "TMDB_BASE_URL", baseUrl)
+
+        if (project.hasProperty("tmdb_api_key")) {
+            def tmbdApiKey = '"' + project.property("tmdb_api_key") + '"'
+            buildConfigField("String", "TMDB_API_KEY", tmbdApiKey)
         } else {
-            // the app needs `marvel_public_api_key` and `marvel_private_api_key`
-            // as gradle properties to run
-            // to get one visit: https://developer.marvel.com/account
-            throw new GradleException("Please provide the Marvel API keys as gradle properties")
+            // the app needs a `tmdb_api_key as a gradle property to run
+            // to get one visit: https://developer.themoviedb.org/reference/intro/getting-started
+            throw new GradleException("Please provide the TMDB API key as a gradle property")
         }
     }
 
@@ -42,14 +42,9 @@ android {
         test.java.srcDirs += "src/paparazzi/kotlin"
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
-    }
-    // For Kotlin projects
-    kotlinOptions {
-        jvmTarget = "21"
-    }
+   kotlin {
+       jvmToolchain(21)
+   }
 
     testOptions {
         unitTests.all {
@@ -71,54 +66,50 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
+    def coroutines_version = "1.10.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
-    implementation 'androidx.core:core-ktx:1.16.0'
+    implementation 'androidx.core:core-ktx:1.17.0'
     implementation 'androidx.appcompat:appcompat:1.7.1'
-    implementation 'androidx.activity:activity-compose:1.10.1'
-    def compose = "1.8.3"
-    implementation "androidx.compose.ui:ui:$compose"
-    implementation "androidx.compose.foundation:foundation:1.8.3"
-    implementation "androidx.compose.material:material:1.8.3"
+    implementation 'androidx.activity:activity-compose:1.12.0'
+    def composeBom = platform('androidx.compose:compose-bom:2025.11.01')
+    implementation composeBom
+    implementation "androidx.compose.ui:ui"
+    implementation "androidx.compose.foundation:foundation"
+    implementation "androidx.compose.material3:material3"
     implementation "androidx.compose.material:material-icons-core:1.7.8"
-    implementation "androidx.compose.ui:ui-tooling:$compose"
+    implementation "androidx.compose.ui:ui-tooling"
 
     implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation 'com.google.android.material:material:1.13.0'
-    def lifecycle = "2.9.1"
+    def lifecycle = "2.10.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"
     implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle"
-    implementation 'androidx.fragment:fragment-ktx:1.8.8'
-    def nav_version = "2.9.0"
+    implementation 'androidx.fragment:fragment-ktx:1.8.9'
+    def nav_version = "2.9.6"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
     implementation 'com.jakewharton.timber:timber:5.0.1'
 
-    def coil_version = "2.7.0"
-    implementation "io.coil-kt:coil-compose:$coil_version"
+    def coil_version = "3.3.0"
+    implementation "io.coil-kt.coil3:coil-compose:$coil_version"
+    implementation "io.coil-kt.coil3:coil-network-okhttp:$coil_version"
 
+    implementation(platform("com.squareup.okhttp3:okhttp-bom:5.3.2"))
+    implementation("com.squareup.okhttp3:okhttp")
+    implementation("com.squareup.okhttp3:logging-interceptor")
     def retrofit = "3.0.0"
-    def okhttp = "4.12.0"
     implementation "com.squareup.retrofit2:retrofit:$retrofit"
     implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:$okhttp"
 
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose"
+    testImplementation composeBom
+    debugImplementation "androidx.compose.ui:ui-test-manifest"
 
-    def kotest = "5.9.1"
-    testImplementation "io.kotest:kotest-runner-junit5-jvm:$kotest"
-    testImplementation "io.kotest:kotest-assertions-core-jvm:$kotest"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
+    testImplementation "io.kotest:kotest-assertions-core-jvm:6.0.7"
     testImplementation 'app.cash.turbine:turbine:1.2.1'
-    testImplementation 'org.junit.vintage:junit-vintage-engine:5.14.0'
-    testImplementation "io.coil-kt:coil-test:$coil_version"
-
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    def espresso = "3.6.1"
-    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso"
-    androidTestImplementation "androidx.test.espresso:espresso-contrib:$espresso"
-    androidTestImplementation "com.squareup.okhttp3:mockwebserver:$okhttp"
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose"
-
+    testImplementation 'org.junit.vintage:junit-vintage-engine:6.0.1'
+    testImplementation "io.coil-kt.coil3:coil-test:$coil_version"
 }

app/proguard-rules.pro

@@ -23,11 +23,11 @@
 # region KotlinX
 -keepattributes *Annotation*, InnerClasses
 -dontnote kotlinx.serialization.SerializationKt
--keep,includedescriptorclasses class io.github.lordraydenmk.superheroesapp.**$$serializer { *; }
--keepclassmembers class io.github.lordraydenmk.superheroesapp.** {
+-keep,includedescriptorclasses class io.github.lordraydenmk.themoviedbapp.**$$serializer { *; }
+-keepclassmembers class io.github.lordraydenmk.themoviedbapp.** {
     *** Companion;
 }
--keepclasseswithmembers class io.github.lordraydenmk.superheroesapp.** {
+-keepclasseswithmembers class io.github.lordraydenmk.themoviedbapp.** {
     kotlinx.serialization.KSerializer serializer(...);
 }
 # endregion