update gradle wrapper, agp, kotlin and libraries

* agp 8.1.2 -> 8.1.3
* ktor 2.3.4 -> 2.3.6
* androidx.core 1.10.1 -> 1.12.0
* androidx.navigation 2.6.0 -> 2.7.5
* androidx.lifecycle 2.6.1 -> 2.6.1
* com.google.android.material 1.9.0 -> 1.10.0
* gradle wrapper 8.2.1 -> 8.4

README.md

@@ -1,14 +1,13 @@
 # Teapod
 
-Teapod is a unofficial App for Anime on Demand (AoD). It allows you to watch all your favourite animes from AoD on your android device. To use Teapod you need to have a subscription to AoD.
+Teapod is a unofficial App for Crunchyroll. It allows you to watch all your favourite animes from Crunchyroll on your android device. To use Teapod you need to have a account at Crunchyroll.
 
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="75">](https://f-droid.org/de/packages/org.mosad.teapod/)
 
 ## Features
-* Watch all animes from AoD on your Android device
+* Watch all animes from Crunchyroll on your Android device
 * Native Player based on ExoPayer
 * Prefer the OmU version via the app settings
-* Save your favorite animes to "My List"
 
 ## Screenshots
 [<img src="https://www.mosad.xyz/images/Teapod/Teapod_Home.webp" width=180>](https://www.mosad.xyz/images/Teapod/Teapod_Home.webp)
@@ -17,14 +16,14 @@ Teapod is a unofficial App for Anime on Demand (AoD). It allows you to watch all
 [<img src="https://www.mosad.xyz/images/Teapod/Teapod_Search.webp" width=180>](https://www.mosad.xyz/images/Teapod/Teapod_Search.webp)
 
 ### License
-Teapod is licensed under the terms and conditions of GPL 3. This Project is not associated with Anime on Demand in any way. But they allow open source apps for their service.
+Teapod is licensed under the terms and conditions of GPL 3. This Project is not associated with Crunchyroll in any way.
 
 ### Contributing
-Currentl you need to have an AoD account to contrtibut to Teapod. Contributing without on is kind of impossible.If you want to contribute to Teapod and need an account on this gitea instance, please write me an email.
+Currently you need to have an Crunchyroll account to contribute to Teapod. Contributing without one is impossible.If you want to contribute to Teapod and need an account on this gitea instance, please write an email.
 
 ### [FAQ](https://git.mosad.xyz/Seil0/teapod/wiki#hilfe)
 
 #### Why is it called Teapod?
 Teapod is a Acronym for "The ultimate anime app on demand", hence this project is called Teapod and not Teapot.
 
-Teapod © 2020-2021 [@Seil0](https://git.mosad.xyz/Seil0)
+Teapod © 2020-2023 [@Seil0](https://git.mosad.xyz/Seil0)

app/build.gradle

@@ -1,17 +1,26 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlin_version"
+}
+
+kotlin {
+    jvmToolchain 11
+    sourceSets.configureEach {
+        languageSettings.optIn("kotlin.RequiresOptIn")
+    }
+}
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdk 34
+    buildToolsVersion = '34.0.0'
 
     defaultConfig {
         applicationId "org.mosad.teapod"
-        minSdkVersion 23
-        targetSdkVersion 30
-        versionCode 4100 //00.04.100
-        versionName "0.4.1"
+        minSdk 23
+        targetSdk 33
+        versionCode 100992 //01.00.000
+        versionName "1.1.0-beta3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resValue "string", "build_time", buildTime()
@@ -20,6 +29,7 @@ android {
 
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
 
     buildTypes {
@@ -29,47 +39,51 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
+
+    namespace 'org.mosad.teapod'
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0'
 
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.4'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.4'
-    implementation 'androidx.security:security-crypto:1.1.0-alpha03'
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-splashscreen:1.0.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
+    implementation 'androidx.security:security-crypto:1.1.0-alpha06'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
+    implementation "androidx.paging:paging-runtime-ktx:3.2.1"
 
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.13.2'
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.13.2'
-    implementation 'com.google.android.exoplayer:exoplayer-dash:2.13.2'
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.13.2'
+    implementation 'com.google.android.material:material:1.11.0'
+    implementation "com.google.android.exoplayer:exoplayer-core:$exo_version"
+    implementation "com.google.android.exoplayer:exoplayer-hls:$exo_version"
+    implementation "com.google.android.exoplayer:exoplayer-dash:$exo_version"
+    implementation "com.google.android.exoplayer:exoplayer-ui:$exo_version"
+    implementation "com.google.android.exoplayer:extension-mediasession:$exo_version"
 
-    implementation 'org.jsoup:jsoup:1.13.1'
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    implementation 'com.facebook.shimmer:shimmer:0.5.0'
+
+    implementation 'com.github.bumptech.glide:glide:4.15.1'
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
-    implementation 'com.afollestad.material-dialogs:core:3.3.0'
-    implementation 'com.afollestad.material-dialogs:bottomsheets:3.3.0'
 
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation "io.ktor:ktor-client-core:$ktor_version"
+    implementation "io.ktor:ktor-client-android:$ktor_version"
+    implementation "io.ktor:ktor-client-content-negotiation:$ktor_version"
+    implementation "io.ktor:ktor-serialization-kotlinx-json:$ktor_version"
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
 }
 
 static def buildTime() {
     return new Date().format("yyyy-MM-dd", TimeZone.getTimeZone("UTC"))
-}
+}

app/proguard-rules.pro

@@ -22,9 +22,38 @@
 #-renamesourcefileattribute SourceFile
 -keep class org.mosad.teapod.util.** { <fields>; }
 
-#Gson
--keepattributes Signature
--dontwarn sun.misc.**
+-keep class org.json.** { *; }
+
+# kotlinx.serialization
+# Keep `Companion` object fields of serializable classes.
+# This avoids serializer lookup through `getDeclaredClasses` as done for named companion objects.
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
+}
+
+# Keep `serializer()` on companion objects (both default and named) of serializable classes.
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <1>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# Keep `INSTANCE.serializer()` of serializable objects.
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
+
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn org.slf4j.impl.StaticLoggerBinder
 
 #misc
 -dontwarn java.lang.instrument.ClassFileTransformer

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="org.mosad.teapod">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -11,34 +10,29 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.Dark">
+        android:theme="@style/AppTheme">
         <activity
-            android:name="org.mosad.teapod.ui.activity.SplashActivity"
-            android:label="@string/app_name"
-            android:theme="@style/SplashTheme"
-            android:screenOrientation="portrait">
+            android:exported="true"
+            android:name="org.mosad.teapod.ui.activity.main.MainActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.App.Starting">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
+            android:exported="false"
             android:name="org.mosad.teapod.ui.activity.onboarding.OnboardingActivity"
-            android:label="@string/app_name"
             android:screenOrientation="portrait"
             android:launchMode="singleTop"
             android:windowSoftInputMode="adjustPan">
         </activity>
         <activity
-            android:name="org.mosad.teapod.ui.activity.main.MainActivity"
-            android:label="@string/app_name"
-            android:screenOrientation="portrait">
-        </activity>
-        <activity
+            android:exported="false"
             android:name="org.mosad.teapod.ui.activity.player.PlayerActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|layoutDirection"
             android:autoRemoveFromRecents="true"
-            android:label="@string/app_name"
             android:launchMode="singleTask"
             android:parentActivityName="org.mosad.teapod.ui.activity.main.MainActivity"
             android:supportsPictureInPicture="true"

app/src/main/java/org/mosad/teapod/parser/AoDParser.kt

@@ -1,438 +0,0 @@
-/**
- * Teapod
- *
- * Copyright 2020-2021  <seil0@mosad.xyz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-
-package org.mosad.teapod.parser
-
-import android.util.Log
-import com.google.gson.JsonParser
-import kotlinx.coroutines.*
-import org.jsoup.Connection
-import org.jsoup.Jsoup
-import org.mosad.teapod.preferences.EncryptedPreferences
-import org.mosad.teapod.util.*
-import org.mosad.teapod.util.DataTypes.MediaType
-import java.io.IOException
-import java.lang.NumberFormatException
-import java.util.*
-import kotlin.random.Random
-
-object AoDParser {
-
-    private const val baseUrl = "https://www.anime-on-demand.de"
-    private const val loginPath = "/users/sign_in"
-    private const val libraryPath = "/animes"
-
-    private const val userAgent = "Mozilla/5.0 (X11; Linux x86_64; rv:84.0) Gecko/20100101 Firefox/84.0"
-
-    private var sessionCookies = mutableMapOf<String, String>()
-    private var csrfToken: String = ""
-    private var loginSuccess = false
-
-    private val mediaList = arrayListOf<Media>() // actual media (data)
-    val itemMediaList = arrayListOf<ItemMedia>() // gui media
-    val highlightsList = arrayListOf<ItemMedia>()
-    val newEpisodesList = arrayListOf<ItemMedia>()
-    val newSimulcastsList = arrayListOf<ItemMedia>()
-    val newTitlesList = arrayListOf<ItemMedia>()
-    val topTenList = arrayListOf<ItemMedia>()
-
-    fun login(): Boolean = runBlocking {
-
-        withContext(Dispatchers.IO) {
-            // get the authenticity token
-            val resAuth = Jsoup.connect(baseUrl + loginPath)
-                .header("User-Agent", userAgent)
-                .execute()
-
-            val authenticityToken = resAuth.parse().select("meta[name=csrf-token]").attr("content")
-            val authCookies = resAuth.cookies()
-
-            //Log.d(javaClass.name, "Received authenticity token: $authenticityToken")
-            //Log.d(javaClass.name, "Received authenticity cookies: $authCookies")
-
-            val data = mapOf(
-                Pair("user[login]", EncryptedPreferences.login),
-                Pair("user[password]", EncryptedPreferences.password),
-                Pair("user[remember_me]", "1"),
-                Pair("commit", "Einloggen"),
-                Pair("authenticity_token", authenticityToken)
-            )
-
-            val resLogin = Jsoup.connect(baseUrl + loginPath)
-                .method(Connection.Method.POST)
-                .timeout(60000) // login can take some time default is 60000 (60 sec)
-                .data(data)
-                .postDataCharset("UTF-8")
-                .cookies(authCookies)
-                .execute()
-
-            //println(resLogin.body())
-
-            sessionCookies = resLogin.cookies()
-            loginSuccess = resLogin.body().contains("Hallo, du bist jetzt angemeldet.")
-            Log.i(javaClass.name, "Status: ${resLogin.statusCode()} (${resLogin.statusMessage()}), login successful: $loginSuccess")
-
-            loginSuccess
-        }
-    }
-
-    /**
-     * initially load all media and home screen data
-     */
-    fun initialLoading() = listOf(
-            loadHome(),
-            listAnimes()
-    )
-
-    /**
-     * get a media by it's ID (int)
-     * @return Media
-     */
-    suspend fun getMediaById(mediaId: Int): Media {
-        val media = mediaList.first { it.id == mediaId }
-
-        if (media.episodes.isEmpty()) {
-            loadStreams(media).join()
-        }
-
-        return media
-    }
-
-    fun markAsWatched(mediaId: Int, episodeId: Int) = GlobalScope.launch {
-        val episode = getMediaById(mediaId).getEpisodeById(episodeId)
-        episode.watched = true
-        sendCallback(episode.watchedCallback)
-
-        Log.d(javaClass.name, "Marked episode ${episode.id} as watched")
-    }
-
-    // TODO don't use jsoup here
-    private fun sendCallback(callbackPath: String) = GlobalScope.launch(Dispatchers.IO) {
-        val headers = mutableMapOf(
-            Pair("Accept", "application/json, text/javascript, */*; q=0.01"),
-            Pair("Accept-Language", "de,en-US;q=0.7,en;q=0.3"),
-            Pair("Accept-Encoding", "gzip, deflate, br"),
-            Pair("X-CSRF-Token", csrfToken),
-            Pair("X-Requested-With", "XMLHttpRequest"),
-        )
-
-        try {
-            Jsoup.connect(baseUrl + callbackPath)
-                .ignoreContentType(true)
-                .cookies(sessionCookies)
-                .headers(headers)
-                .execute()
-        } catch (ex: IOException) {
-            Log.e(javaClass.name, "Callback for $callbackPath failed.", ex)
-        }
-
-    }
-
-    /**
-     * load all media from aod into itemMediaList and mediaList
-     */
-    private fun listAnimes() = GlobalScope.launch(Dispatchers.IO) {
-        val resAnimes = Jsoup.connect(baseUrl + libraryPath).get()
-        //println(resAnimes)
-
-        itemMediaList.clear()
-        mediaList.clear()
-        resAnimes.select("div.animebox").forEach {
-            val type = if (it.select("p.animebox-link").select("a").text().toLowerCase(Locale.ROOT) == "zur serie") {
-                MediaType.TVSHOW
-            } else {
-                MediaType.MOVIE
-            }
-            val mediaTitle = it.select("h3.animebox-title").text()
-            val mediaLink = it.select("p.animebox-link").select("a").attr("href")
-            val mediaImage = it.select("p.animebox-image").select("img").attr("src")
-            val mediaShortText = it.select("p.animebox-shorttext").text()
-            val mediaId = mediaLink.substringAfterLast("/").toInt()
-
-            itemMediaList.add(ItemMedia(mediaId, mediaTitle, mediaImage))
-            mediaList.add(Media(mediaId, mediaLink, type).apply {
-                info.title = mediaTitle
-                info.posterUrl = mediaImage
-                info.shortDesc = mediaShortText
-            })
-        }
-
-        Log.i(javaClass.name, "Total library size is: ${mediaList.size}")
-    }
-
-    /**
-     * load new episodes, titles and highlights
-     */
-    private fun loadHome() = GlobalScope.launch(Dispatchers.IO) {
-         val resHome = Jsoup.connect(baseUrl).get()
-
-        // get highlights from AoD
-        highlightsList.clear()
-        resHome.select("#aod-highlights").select("div.news-item").forEach {
-            val mediaId = it.select("div.news-item-text").select("a.serienlink")
-                .attr("href").substringAfterLast("/").toIntOrNull()
-            val mediaTitle = it.select("div.news-title").select("h2").text()
-            val mediaImage = it.select("img").attr("src")
-
-            if (mediaId != null) {
-                highlightsList.add(ItemMedia(mediaId, mediaTitle, mediaImage))
-            }
-        }
-
-        // get all new episodes from AoD
-        newEpisodesList.clear()
-        resHome.select("h2:contains(Neue Episoden)").next().select("li").forEach {
-            val mediaId = it.select("a.thumbs").attr("href")
-                .substringAfterLast("/").toIntOrNull()
-            val mediaImage = it.select("a.thumbs > img").attr("src")
-            val mediaTitle = "${it.select("a").text()} - ${it.select("span.neweps").text()}"
-
-            if (mediaId != null) {
-                newEpisodesList.add(ItemMedia(mediaId, mediaTitle, mediaImage))
-            }
-        }
-
-        // get new simulcasts from AoD
-        newSimulcastsList.clear()
-        resHome.select("h2:contains(Neue Simulcasts)").next().select("li").forEach {
-            val mediaId = it.select("a.thumbs").attr("href")
-                .substringAfterLast("/").toIntOrNull()
-            val mediaImage = it.select("a.thumbs > img").attr("src")
-            val mediaTitle = it.select("a").text()
-
-            if (mediaId != null) {
-                newSimulcastsList.add(ItemMedia(mediaId, mediaTitle, mediaImage))
-            }
-        }
-
-        // get new titles from AoD
-        newTitlesList.clear()
-        resHome.select("h2:contains(Neue Anime-Titel)").next().select("li").forEach {
-            val mediaId = it.select("a.thumbs").attr("href")
-                .substringAfterLast("/").toIntOrNull()
-            val mediaImage = it.select("a.thumbs > img").attr("src")
-            val mediaTitle = it.select("a").text()
-
-            if (mediaId != null) {
-                newTitlesList.add(ItemMedia(mediaId, mediaTitle, mediaImage))
-            }
-        }
-
-        // get top ten from AoD
-        topTenList.clear()
-        resHome.select("h2:contains(Anime Top 10)").next().select("li").forEach {
-            val mediaId = it.select("a.thumbs").attr("href")
-                .substringAfterLast("/").toIntOrNull()
-            val mediaImage = it.select("a.thumbs > img").attr("src")
-            val mediaTitle = it.select("a").text()
-
-            if (mediaId != null) {
-                topTenList.add(ItemMedia(mediaId, mediaTitle, mediaImage))
-            }
-        }
-
-        // if highlights is empty, add a random new title
-        if (highlightsList.isEmpty()) {
-            if (newTitlesList.isNotEmpty()) {
-                highlightsList.add(newTitlesList[Random.nextInt(0, newTitlesList.size)])
-            } else {
-                highlightsList.add(ItemMedia(0,"", ""))
-            }
-        }
-    }
-
-    /**
-     * load streams for the media path, movies have one episode
-     * @param media is used as call ba reference
-     */
-    private fun loadStreams(media: Media) = GlobalScope.launch(Dispatchers.IO) {
-        if (sessionCookies.isEmpty()) login()
-
-        if (!loginSuccess) {
-            Log.w(javaClass.name, "Login, was not successful.")
-            return@launch
-        }
-
-        // get the media page
-        val res = Jsoup.connect(baseUrl + media.link)
-            .cookies(sessionCookies)
-            .get()
-
-        //println(res)
-
-        if (csrfToken.isEmpty()) {
-            csrfToken = res.select("meta[name=csrf-token]").attr("content")
-            //Log.i(javaClass.name, "New csrf token is $csrfToken")
-        }
-
-        val besides = res.select("div.besides").first()
-        val playlists = besides.select("input.streamstarter_html5").map { streamstarter ->
-            parsePlaylistAsync(
-                streamstarter.attr("data-playlist"),
-                streamstarter.attr("data-lang")
-            )
-        }.awaitAll()
-
-        playlists.forEach { aod ->
-            // TODO improve language handling
-            val locale = when (aod.extLanguage) {
-                "ger" -> Locale.GERMAN
-                "jap" -> Locale.JAPANESE
-                else -> Locale.ROOT
-            }
-
-            aod.playlist.forEach { ep ->
-                try {
-                    if (media.hasEpisode(ep.mediaid)) {
-                        media.getEpisodeById(ep.mediaid).streams.add(
-                            Stream(ep.sources.first().file, locale)
-                        )
-                    } else {
-                        media.episodes.add(Episode(
-                            id = ep.mediaid,
-                            streams = mutableListOf(Stream(ep.sources.first().file, locale)),
-                            posterUrl = ep.image,
-                            title = ep.title,
-                            description = ep.description,
-                            number = getNumberFromTitle(ep.title, media.type)
-                        ))
-                    }
-                } catch (ex: Exception) {
-                    Log.w(javaClass.name, "Could not parse episode information.", ex)
-                }
-            }
-        }
-        Log.i(javaClass.name, "Loaded playlists successfully")
-
-        // additional info from the media page
-        res.select("table.vertical-table").select("tr").forEach { row ->
-            when (row.select("th").text().toLowerCase(Locale.ROOT)) {
-                "produktionsjahr" -> media.info.year = row.select("td").text().toInt()
-                "fsk" -> media.info.age = row.select("td").text().toInt()
-                "episodenanzahl" -> {
-                    media.info.episodesCount = row.select("td").text()
-                        .substringBefore("/")
-                        .filter { it.isDigit() }
-                        .toInt()
-                }
-            }
-        }
-
-        // similar titles from media page
-        media.info.similar = res.select("h2:contains(Ähnliche Animes)").next().select("li").mapNotNull {
-            val mediaId = it.select("a.thumbs").attr("href")
-                .substringAfterLast("/").toIntOrNull()
-            val mediaImage = it.select("a.thumbs > img").attr("src")
-            val mediaTitle = it.select("a").text()
-
-            if (mediaId != null) {
-                ItemMedia(mediaId, mediaTitle, mediaImage)
-            } else {
-                null
-            }
-        }
-
-        // additional information for tv shows the episode title (description) is loaded from the "api"
-        if (media.type == MediaType.TVSHOW) {
-            res.select("div.three-box-container > div.episodebox").forEach { episodebox ->
-                // make sure the episode has a streaming link
-                if (episodebox.select("input.streamstarter_html5").isNotEmpty()) {
-                    val episodeId = episodebox.select("div.flip-front").attr("id").substringAfter("-").toInt()
-                    val episodeShortDesc = episodebox.select("p.episodebox-shorttext").text()
-                    val episodeWatched = episodebox.select("div.episodebox-icons > div").hasClass("status-icon-orange")
-                    val episodeWatchedCallback = episodebox.select("input.streamstarter_html5").eachAttr("data-playlist").first()
-
-                    media.episodes.firstOrNull { it.id == episodeId }?.apply {
-                        shortDesc = episodeShortDesc
-                        watched = episodeWatched
-                        watchedCallback = episodeWatchedCallback
-                    }
-                }
-            }
-        }
-        Log.i(javaClass.name, "media loaded successfully")
-    }
-
-    /**
-     * don't use Gson().fromJson() as we don't have any control over the api and it may change
-     */
-    private fun parsePlaylistAsync(playlistPath: String, language: String): Deferred<AoDObject> {
-        if (playlistPath == "[]") {
-            return CompletableDeferred(AoDObject(listOf(), language))
-        }
-
-        return GlobalScope.async(Dispatchers.IO) {
-            val headers = mutableMapOf(
-                Pair("Accept", "application/json, text/javascript, */*; q=0.01"),
-                Pair("Accept-Language", "de,en-US;q=0.7,en;q=0.3"),
-                Pair("Accept-Encoding", "gzip, deflate, br"),
-                Pair("X-CSRF-Token", csrfToken),
-                Pair("X-Requested-With", "XMLHttpRequest"),
-            )
-
-            //println("loading streaminfo with cstf: $csrfToken")
-
-            val res = Jsoup.connect(baseUrl + playlistPath)
-                .ignoreContentType(true)
-                .cookies(sessionCookies)
-                .headers(headers)
-                .timeout(120000) // loading the playlist can take some time
-                .execute()
-
-            //Gson().fromJson(res.body(), AoDObject::class.java)
-
-            return@async AoDObject(JsonParser.parseString(res.body()).asJsonObject
-                .get("playlist").asJsonArray.map {
-                    Playlist(
-                        sources = it.asJsonObject.get("sources").asJsonArray.map { source ->
-                            Source(source.asJsonObject.get("file").asString)
-                        },
-                        image = it.asJsonObject.get("image").asString,
-                        title = it.asJsonObject.get("title").asString,
-                        description = it.asJsonObject.get("description").asString,
-                        mediaid = it.asJsonObject.get("mediaid").asInt
-                    )
-                },
-                language
-            )
-        }
-    }
-
-    /**
-     * get the episode number from the title
-     * @param title the episode title, containing a number after "Ep."
-     * @param type the media type, if not TVSHOW, return 0
-     * @return the episode number, on NumberFormatException return 0
-     */
-    private fun getNumberFromTitle(title: String, type: MediaType): Int {
-        return if (type == MediaType.TVSHOW) {
-            try {
-                title.substringAfter(", Ep. ").toInt()
-            } catch (nex: NumberFormatException) {
-                0
-            }
-        } else {
-            0
-        }
-    }
-
-}

app/src/main/java/org/mosad/teapod/parser/crunchyroll/Crunchyroll.kt

@@ -0,0 +1,778 @@
+/**
+ * Teapod
+ *
+ * Copyright 2020-2022  <seil0@mosad.xyz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.teapod.parser.crunchyroll
+
+import android.util.Log
+import io.ktor.client.*
+import io.ktor.client.call.*
+import io.ktor.client.plugins.*
+import io.ktor.client.plugins.contentnegotiation.*
+import io.ktor.client.request.*
+import io.ktor.client.request.forms.*
+import io.ktor.client.statement.*
+import io.ktor.http.*
+import io.ktor.serialization.*
+import io.ktor.serialization.kotlinx.json.*
+import kotlinx.coroutines.*
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
+import org.mosad.teapod.preferences.EncryptedPreferences
+import org.mosad.teapod.preferences.Preferences
+
+object Crunchyroll {
+    private val TAG = javaClass.name
+
+    private val client = HttpClient {
+        install(ContentNegotiation) {
+            json(Json {
+                ignoreUnknownKeys = true
+            })
+        }
+    }
+    private const val baseUrl = "https://beta-api.crunchyroll.com"
+    private const val staticUrl = "https://static.crunchyroll.com"
+    private const val basicApiTokenUrl = "https://gitlab.com/-/snippets/2274956/raw/main/snippetfile1.txt"
+    private var basicApiToken: String = ""
+
+    private lateinit var token: Token
+    private var tokenValidUntil: Long = 0
+    @OptIn(DelicateCoroutinesApi::class, ExperimentalCoroutinesApi::class)
+    private val tokenRefreshContext = newSingleThreadContext("TokenRefreshContext")
+
+    private var accountID = ""
+    private var externalID = ""
+
+    private val browsingCache = hashMapOf<String, BrowseResult>()
+
+    /**
+     * Load the pai token, see:
+     * https://git.mosad.xyz/mosad/NonePublicIssues/issues/1
+     *
+     * TODO handle empty file
+     */
+    fun initBasicApiToken() = runBlocking {
+        withContext(Dispatchers.IO) {
+            basicApiToken = client.get { url(basicApiTokenUrl) }.bodyAsText()
+            Log.i(TAG, "basic auth token: $basicApiToken")
+        }
+    }
+
+    /**
+     * Login to the crunchyroll API.
+     *
+     * @param username The Username/Email of the user to log in
+     * @param password The Accounts Password
+     *
+     * @return Boolean: True if login was successful, else false
+     */
+    fun login(username: String, password: String): Boolean = runBlocking {
+        val tokenEndpoint = "/auth/v1/token"
+        val formData = Parameters.build {
+            append("username", username)
+            append("password", password)
+            append("grant_type", "password")
+            append("scope", "offline_access")
+        }
+
+        var success = false// is false
+        withContext(Dispatchers.IO) {
+            Log.i(TAG, "getting token ...")
+
+            val status = try {
+                val response: HttpResponse = client.submitForm("$baseUrl$tokenEndpoint", formParameters = formData) {
+                    header("Authorization", "Basic $basicApiToken")
+                }
+                token = response.body()
+                tokenValidUntil = System.currentTimeMillis() + (token.expiresIn * 1000)
+                response.status
+            } catch (ex: ClientRequestException) {
+                val status = ex.response.status
+                if (status == HttpStatusCode.Unauthorized) {
+                    Log.e(TAG, "Could not complete login: " +
+                            "${status.value} ${status.description}. " +
+                            "Probably wrong username or password")
+                }
+
+                status
+            }
+            Log.i(TAG, "Login complete with code $status")
+            success = (status == HttpStatusCode.OK)
+        }
+
+        return@runBlocking success
+    }
+
+    private fun refreshToken() {
+        login(EncryptedPreferences.login, EncryptedPreferences.password)
+    }
+
+    /**
+     * Requests: get, post, delete
+     */
+
+    private suspend inline fun <reified T> request(
+        url: String,
+        httpMethod: HttpMethod,
+        params: List<Pair<String, Any?>> = listOf(),
+        bodyObject: Any = Any()
+    ): T = coroutineScope {
+        withContext(tokenRefreshContext) {
+            if (System.currentTimeMillis() > tokenValidUntil) refreshToken()
+        }
+
+        return@coroutineScope (Dispatchers.IO) {
+            val response = client.request(url) {
+                method = httpMethod
+                header("Authorization", "${token.tokenType} ${token.accessToken}")
+                params.forEach {
+                    parameter(it.first, it.second)
+                }
+
+                // for json set body and content type
+                if (bodyObject is JsonObject) {
+                    setBody(bodyObject)
+                    contentType(ContentType.Application.Json)
+                }
+            }
+
+            response.body<T>()
+        }
+    }
+
+    /**
+     * Send a HTTP GET request with [params] to the [endpoint] at [url], if url is empty use baseUrl
+     */
+    private suspend inline fun <reified T> requestGet(
+        endpoint: String,
+        params: List<Pair<String, Any?>> = listOf(),
+        url: String = ""
+    ): T {
+        val path = url.ifEmpty { baseUrl }.plus(endpoint)
+
+        return request(path, HttpMethod.Get, params)
+    }
+
+    private suspend fun requestPost(
+        endpoint: String,
+        params: List<Pair<String, Any?>> = listOf(),
+        bodyObject: JsonObject
+    ) {
+        val path = "$baseUrl$endpoint"
+
+        val response: HttpResponse = request(path, HttpMethod.Post, params, bodyObject)
+        Log.i(TAG, "Response: $response")
+    }
+
+    private suspend fun requestPatch(
+        endpoint: String,
+        params: List<Pair<String, Any?>> = listOf(),
+        bodyObject: JsonObject
+    ) {
+        val path = "$baseUrl$endpoint"
+
+        val response: HttpResponse = request(path, HttpMethod.Patch, params, bodyObject)
+        Log.i(TAG, "Response: $response")
+    }
+
+    private suspend fun requestDelete(
+        endpoint: String,
+        params: List<Pair<String, Any?>> = listOf(),
+        url: String = ""
+    ) = coroutineScope {
+        val path = url.ifEmpty { "$baseUrl$endpoint" }
+
+        val response: HttpResponse = request(path, HttpMethod.Delete, params)
+        Log.i(TAG, "Response: $response")
+    }
+
+    /**
+     * Basic functions: account
+     * Needed for other functions to work properly!
+     */
+
+    /**
+     * Retrieve the account id and set the corresponding global var.
+     * The account id is needed for other calls.
+     *
+     * This must be execute on every start for teapod to work properly!
+     */
+    suspend fun account() {
+        val indexEndpoint = "/accounts/v1/me"
+
+        val account: Account = try {
+            requestGet(indexEndpoint)
+        } catch (ex: Exception) {
+            Log.e(TAG, "SerializationException in account(). This is bad!", ex)
+            NoneAccount
+        }
+
+        accountID = account.accountId
+        externalID = account.externalId
+    }
+
+    /**
+     * General element/media functions: browse, search, objects, season_list
+     */
+
+    /**
+     * Browse the media available on crunchyroll.
+     *
+     * @param start start of the item list, used for pagination, default = 0
+     * @param n number of items to return, default = 10
+     * @param sortBy the sort order, see **[SortBy]**
+     * @param ratings add user rating to the objects, default = false
+     * @param seasonTag filter by season tag, if present
+     * @param categories filter by category, if present
+     * @return A **[BrowseResult]** object is returned.
+     */
+    suspend fun browse(
+        start: Int = 0,
+        n: Int = 10,
+        sortBy: SortBy = SortBy.ALPHABETICAL,
+        ratings: Boolean = false,
+        seasonTag: String = "",
+        categories: List<Categories> = emptyList()
+    ): BrowseResult {
+        val browseEndpoint = "/content/v2/discover/browse"
+        val parameters = mutableListOf(
+            "start" to start,
+            "n" to n,
+            "sort_by" to sortBy.str,
+            "ratings" to ratings,
+            "preferred_audio_language" to Preferences.preferredSubtitleLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
+        )
+
+        // if a season tag is present add it to the parameters
+        if (seasonTag.isNotEmpty()) {
+            parameters.add("season_tag" to seasonTag)
+        }
+
+        // if a season tag is present add it to the parameters
+        if (categories.isNotEmpty()) {
+            parameters.add("categories" to categories.joinToString(",") { it.str })
+        }
+
+        // fetch result if not already cached
+        if (browsingCache.contains(parameters.toString())) {
+            Log.d(TAG, "browse result cached: $parameters")
+        } else {
+            Log.d(TAG, "browse result not cached, fetching: $parameters")
+            val browseResult: BrowseResult = try {
+                requestGet(browseEndpoint, parameters)
+            }catch (ex: Exception) {
+                Log.e(TAG, "SerializationException in browse().", ex)
+                NoneBrowseResult
+            }
+
+
+
+            // if the cache has more than 10 entries clear it, so it doesn't become a memory problem
+            // Note: this value is totally guessed and should be replaced by a properly researched value
+            if (browsingCache.size > 10) {
+                browsingCache.clear()
+            }
+
+            // add results to cache
+            browsingCache[parameters.toString()] = browseResult
+        }
+
+        return browsingCache[parameters.toString()] ?: NoneBrowseResult
+    }
+
+    /**
+     * Search fo a query term.
+     * Note: currently this function only supports series/tv shows.
+     *
+     * @param query The query term as String
+     * @param n The maximum number of results to return, default = 10
+     * @param ratings add user rating to the objects, default = false
+     * @return A **[SearchResult]** object
+     */
+    suspend fun search(query: String, n: Int = 10, ratings: Boolean = false): SearchResult {
+        val searchEndpoint = "/content/v2/discover/search"
+        val parameters = listOf(
+            "q" to query,
+            "n" to n,
+            "type" to "series",
+            "ratings" to ratings,
+            "preferred_audio_language" to Preferences.preferredSubtitleLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
+        )
+
+        // TODO episodes have thumbnails as image, and not poster_tall/poster_tall,
+        // to work around this, for now only tv shows are supported
+
+        return try {
+            requestGet(searchEndpoint, parameters)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in search(), with query = \"$query\".", ex)
+            NoneSearchResult
+        }
+    }
+
+    /**
+     * Get a collection of series objects.
+     * Note: episode objects are currently not supported
+     *
+     * @param objects The object IDs as list of Strings
+     * @param ratings add user rating to the objects
+     * @return A **[Collection]** of Panels
+     */
+    suspend fun objects(objects: List<String>, ratings: Boolean = false): CollectionV2<Item> {
+        val episodesEndpoint = "/content/v2/cms/objects/${objects.joinToString(",")}"
+        val parameters = listOf(
+            "ratings" to ratings,
+            "preferred_audio_language" to Preferences.preferredAudioLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
+        )
+
+        return try {
+            requestGet(episodesEndpoint, parameters)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in objects().", ex)
+            NoneCollectionV2
+        }
+    }
+
+    /**
+     * Main media functions: series, season, episodes, playback
+     */
+
+    /**
+     * series id == crunchyroll id?
+     */
+    suspend fun series(seriesId: String): Series {
+        val seriesEndpoint = "/content/v2/cms/series/$seriesId"
+        val parameters = listOf(
+            "preferred_audio_language" to Preferences.preferredAudioLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
+        )
+
+        return try {
+            requestGet(seriesEndpoint, parameters)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in series() for id $seriesId.", ex)
+            NoneSeries
+        }
+    }
+
+    /**
+     * Get the next episode for a series.
+     *
+     * FIXME up_next returns no content if the is no next episode
+     *
+     * @param seriesId The series id for which to call up next
+     * @return A **[UpNextSeriesItem]** with a Panel representing the up next episode
+     */
+    suspend fun upNextSeries(seriesId: String): UpNextSeriesList {
+        val upNextSeriesEndpoint = "/content/v2/discover/up_next/$seriesId"
+        val parameters = listOf(
+            "preferred_audio_language" to Preferences.preferredAudioLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
+        )
+
+        return try {
+            requestGet(upNextSeriesEndpoint, parameters)
+        } catch (ex: NoTransformationFoundException) {
+            // should be 204 No Content
+            NoneUpNextSeriesList
+        } catch (ex: JsonConvertException) {
+            Log.e(TAG, "JsonConvertException in upNextSeries() with seriesId=$seriesId", ex)
+            NoneUpNextSeriesList
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in upNextSeries() for seriesId $seriesId.", ex)
+            NoneUpNextSeriesList
+        }
+    }
+
+    /**
+     * Get all available seasons for a series.
+     *
+     * @param seriesId The series id for which to get the seasons
+     * @return A **[Seasons]** object with a list of **[Season]**
+     */
+    suspend fun seasons(seriesId: String): Seasons {
+        val seasonsEndpoint = "/content/v2/cms/series/$seriesId/seasons"
+        val parameters = listOf(
+            "preferred_audio_language" to Preferences.preferredSubtitleLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
+        )
+
+        return try {
+            requestGet(seasonsEndpoint, parameters)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in seasons() for seriesId $seriesId.", ex)
+            NoneSeasons
+        }
+    }
+
+    /**
+     * Get all available episodes for a season.
+     *
+     * @param seasonId The season id for which to get the episodes
+     * @return A **[Episodes]** object with a list of **[Episode]**
+     */
+    suspend fun episodes(seasonId: String): Episodes {
+        val episodesEndpoint = "/content/v2/cms/seasons/$seasonId/episodes"
+        val parameters = listOf(
+            "preferred_audio_language" to Preferences.preferredSubtitleLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
+        )
+
+        return try {
+            requestGet(episodesEndpoint, parameters)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in episodes() for seasonId $seasonId.", ex)
+            NoneEpisodes
+        }
+    }
+
+    /**
+     * Get all available subtitles and streams of a episode.
+     *
+     * @param url The streams url of a episode
+     * @return A **[Streams]** object
+     */
+    suspend fun streams(url: String): Streams {
+        val parameters = listOf(
+            "preferred_audio_language" to Preferences.preferredSubtitleLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
+        )
+
+        return try {
+            requestGet(url, parameters)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in streams() with url $url.", ex)
+            NoneStreams
+        }
+    }
+
+    suspend fun streamsFromMediaGUID(mediaGUID: String): Streams {
+        val streamsEndpoint = "/content/v2/cms/videos/$mediaGUID/streams"
+        return streams(streamsEndpoint)
+    }
+
+    /**
+     * Additional media functions: watchlist (series), playhead, similar to
+     */
+
+    /**
+     * Check if a media is in the user's watchlist.
+     *
+     * @param seriesId The crunchyroll series id of the media to check
+     * @return **[Boolean]**: ture if it was found, else false
+     */
+    suspend fun isWatchlist(seriesId: String): Boolean {
+        val watchlistSeriesEndpoint = "/content/v2/$accountID/watchlist"
+        val parameters = listOf(
+            "content_ids" to seriesId,
+            "preferred_audio_language" to Preferences.preferredAudioLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
+        )
+
+        return try {
+            (requestGet(watchlistSeriesEndpoint, parameters) as CollectionV2<IsWatchlistItem>)
+                .total == 1
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in isWatchlist() with seriesId $seriesId", ex)
+            false
+        }
+    }
+
+    /**
+     * Add a media to the user's watchlist.
+     *
+     * @param seriesId The crunchyroll series id of the media to check
+     */
+    suspend fun postWatchlist(seriesId: String) {
+        val watchlistPostEndpoint = "/content/v2/$accountID/watchlist"
+        val parameters = listOf(
+            "preferred_audio_language" to Preferences.preferredAudioLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
+        )
+
+        val json = buildJsonObject {
+            put("content_id", seriesId)
+        }
+
+        try {
+            requestPost(watchlistPostEndpoint, parameters, json)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in postWatchlist() with seriesId $seriesId", ex)
+        }
+    }
+
+    /**
+     * Remove a media from the user's watchlist.
+     *
+     * @param seriesId The crunchyroll series id of the media to check
+     */
+    suspend fun deleteWatchlist(seriesId: String) {
+        val watchlistDeleteEndpoint = "/content/v2/$accountID/watchlist/$seriesId"
+        val parameters = listOf(
+            "preferred_audio_language" to Preferences.preferredAudioLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
+        )
+
+        try {
+            requestDelete(watchlistDeleteEndpoint, parameters)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in deleteWatchlist() with seriesId $seriesId", ex)
+        }
+    }
+
+    /**
+     * Get playhead information for all episodes in episodeIDs.
+     * The Information returned contains the playhead position, watched state
+     * and last modified date.
+     *
+     * @param episodeIDs A **[List]** of episodes IDs as strings.
+     * @return A **[Map]**<String, **[PlayheadObject]**> containing playback info.
+     */
+    suspend fun playheads(episodeIDs: List<String>): Playheads {
+        val playheadsEndpoint = "/content/v2/$accountID/playheads"
+        val parameters = listOf(
+            "content_ids" to episodeIDs.joinToString(","),
+            "preferred_audio_language" to Preferences.preferredAudioLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag()
+        )
+
+        return try {
+            requestGet(playheadsEndpoint, parameters)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in playheads().", ex.cause)
+            NonePlayheads
+        }
+    }
+
+    /**
+     * Post the playhead to crunchy (playhead position,watched state)
+     *
+     * @param episodeId A episode ID as strings.
+     * @param playhead The episodes playhead in seconds.
+     */
+    suspend fun postPlayheads(episodeId: String, playhead: Int) {
+        val playheadsEndpoint = "/content/v1/playheads/$accountID"
+        val parameters = listOf("locale" to Preferences.preferredSubtitleLocale.toLanguageTag())
+
+        val json = buildJsonObject {
+            put("content_id", episodeId)
+            put("playhead", playhead)
+        }
+
+        try {
+            requestPost(playheadsEndpoint, parameters, json)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in postPlayheads()", ex.cause)
+        }
+    }
+
+    /**
+     * Get the intro meta data including start, end and duration of the intro.
+     *
+     * @param episodeId A episode ID as strings.
+     */
+    suspend fun datalabIntro(episodeId: String): DatalabIntro {
+        val datalabIntroEndpoint = "/datalab-intro-v2/$episodeId.json"
+
+        /*
+         * wtf crunchyroll, why do you return an xml error message when some data is missing,
+         * this is a json endpoint. For fucks sake, return at least a valid json message.
+         */
+        return try {
+            val response: HttpResponse = requestGet(datalabIntroEndpoint, url = staticUrl)
+            Json.decodeFromString(response.bodyAsText())
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in datalabIntro(). EpisodeId=$episodeId", ex)
+            NoneDatalabIntro
+        }
+    }
+
+    /**
+     * Get similar media for a show/movie.
+     *
+     * @param seriesId The crunchyroll series id of the media
+     * @param n The maximum number of results to return, default = 10
+     * @param ratings add user rating to the objects
+     * @return A **[SimilarToResult]** object
+     */
+    suspend fun similarTo(seriesId: String, n: Int = 10, ratings: Boolean = false): SimilarToResult {
+        val similarToEndpoint = "/content/v2/discover/$accountID/similar_to/$seriesId"
+        val parameters = listOf(
+            "n" to n,
+            "ratings" to ratings,
+            "preferred_audio_language" to Preferences.preferredSubtitleLocale.toLanguageTag(),
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
+        )
+
+        return try {
+            requestGet(similarToEndpoint, parameters)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in similarTo().", ex)
+            NoneSimilarToResult
+        }
+    }
+
+    /**
+     * Listing functions: watchlist (list), up_next_account
+     */
+
+    /**
+     * List items present in the watchlist.
+     *
+     * @param n Number of items to return, defaults to 20.
+     * @return A **[Collection]** containing up to n **[Item]**.
+     */
+    suspend fun watchlist(n: Int = 20): CollectionV2<Item> {
+        val watchlistEndpoint = "/content/v2/discover/$accountID/watchlist"
+        val parameters = listOf(
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
+            "n" to n,
+            "preferred_audio_language" to Preferences.preferredAudioLocale.toLanguageTag()
+        )
+
+        val list: Watchlist = try {
+            requestGet(watchlistEndpoint, parameters)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in watchlist().", ex)
+            NoneWatchlist
+        }
+
+        val objects = list.data.map{ it.panel.episodeMetadata.seriesId }
+        return objects(objects)
+    }
+
+    /**
+     * List the next up episodes for the logged in account.
+     *
+     * @param n Number of items to return, default = 20
+     * @return A **[HistoryList]** containing up to n **[UpNextAccountItem]**.
+     */
+    suspend fun upNextAccount(n: Int = 10): HistoryList {
+        val watchlistEndpoint = "/content/v2/discover/$accountID/history"
+        val parameters = listOf(
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
+            "n" to n
+        )
+
+        return try {
+            requestGet(watchlistEndpoint, parameters)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in upNextAccount().", ex)
+            NoneHistoryList
+        }
+    }
+
+    /**
+     * Returns a collection of recommendations for the currently logged in account.
+     *
+     * @param start start of the item list, used for pagination, default = 0
+     * @param n number of items to return, default = 10
+     * @param ratings add user rating to the objects, default = false
+     * @return A **[RecommendationsList]** containing up to n **[Item]**.
+     */
+    suspend fun recommendations(start: Int = 0, n: Int = 10, ratings: Boolean = false): RecommendationsList {
+        val recommendationsEndpoint = "/content/v2/discover/$accountID/recommendations"
+        val parameters = listOf(
+            "start" to start,
+            "n" to n,
+            "ratings" to ratings,
+            "locale" to Preferences.preferredSubtitleLocale.toLanguageTag(),
+        )
+
+        return try {
+            requestGet(recommendationsEndpoint, parameters)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in recommendations().", ex)
+            NoneRecommendationsList
+        }
+    }
+
+    /**
+     * Account/Profile functions
+     */
+
+    /**
+     * Get profile information for the currently logged in account.
+     *
+     * @return A **[Profile]** object
+     */
+    suspend fun profile(): Profile {
+        val profileEndpoint = "/accounts/v1/me/profile"
+
+        return try {
+            requestGet(profileEndpoint)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in profile().", ex)
+            NoneProfile
+        }
+    }
+
+    /**
+     * Post the preferred content subtitle language.
+     *
+     * @param languageTag the preferred language as language tag
+     */
+    suspend fun setPreferredSubtitleLanguage(languageTag: String) {
+        val profileEndpoint = "/accounts/v1/me/profile"
+        val json = buildJsonObject {
+            put("preferred_content_subtitle_language", languageTag)
+        }
+
+        requestPatch(profileEndpoint, bodyObject = json)
+    }
+
+    /**
+     * Patch the preferred content audio language.
+     *
+     * @param languageTag the preferred language as language tag
+     */
+    suspend fun setPreferredAudioLanguage(languageTag: String) {
+        val profileEndpoint = "/accounts/v1/me/profile"
+        val json = buildJsonObject {
+            put("preferred_content_audio_language", languageTag)
+        }
+
+        requestPatch(profileEndpoint, bodyObject = json)
+    }
+
+    /**
+     * Get additional profile (benefits) information for the currently logged in account.
+     *
+     * * @return A **[Profile]** object
+     */
+    suspend fun benefits(): Benefits {
+        val profileEndpoint = "/subs/v1/subscriptions/$externalID/benefits"
+
+        return try {
+            requestGet(profileEndpoint)
+        } catch (ex: Exception) {
+            Log.e(TAG, "Exception in benefits().", ex)
+            NoneBenefits
+        }
+    }
+
+}

app/src/main/java/org/mosad/teapod/parser/crunchyroll/DataTypes.kt

@@ -0,0 +1,497 @@
+/**
+ * Teapod
+ *
+ * Copyright 2020-2022  <seil0@mosad.xyz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.teapod.parser.crunchyroll
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import java.util.Locale
+
+val supportedAudioLocals = listOf(
+    Locale.forLanguageTag("ar-SA"),
+    Locale.forLanguageTag("ca-ES"),
+    Locale.forLanguageTag("de-DE"),
+    Locale.forLanguageTag("en-US"),
+    Locale.forLanguageTag("en-IN"),
+    Locale.forLanguageTag("es-419"),
+    Locale.forLanguageTag("es-ES"),
+    Locale.forLanguageTag("fr-FR"),
+    Locale.forLanguageTag("hi-IN"),
+    Locale.forLanguageTag("it-IT"),
+    Locale.forLanguageTag("ko-KR"),
+    Locale.forLanguageTag("pl-PL"),
+    Locale.forLanguageTag("pt-BR"),
+    Locale.forLanguageTag("pt-PT"),
+    Locale.forLanguageTag("ru-RU"),
+    Locale.forLanguageTag("ta-IN"),
+    Locale.forLanguageTag("th-TH"),
+    Locale.forLanguageTag("zh-CN"),
+    Locale.forLanguageTag("zh-TW"),
+    Locale.ROOT
+)
+
+val supportedSubtitleLocals = listOf(
+    Locale.forLanguageTag("ar-SA"),
+    Locale.forLanguageTag("ca-ES"),
+    Locale.forLanguageTag("de-DE"),
+    Locale.forLanguageTag("en-US"),
+    Locale.forLanguageTag("es-419"),
+    Locale.forLanguageTag("es-ES"),
+    Locale.forLanguageTag("fr-FR"),
+    Locale.forLanguageTag("hi-IN"),
+    Locale.forLanguageTag("it-IT"),
+    Locale.forLanguageTag("ms-MY"),
+    Locale.forLanguageTag("pl-PL"),
+    Locale.forLanguageTag("pt-BR"),
+    Locale.forLanguageTag("pt-PT"),
+    Locale.forLanguageTag("ru-RU"),
+    Locale.forLanguageTag("tr-TR"),
+    Locale.ROOT
+)
+
+/**
+ * data classes for browse
+ * TODO make class names more clear/possibly overlapping for now
+ */
+
+/**
+ * Enum of all supported sorting orders.
+ */
+enum class SortBy(val str: String) {
+    ALPHABETICAL("alphabetical"),
+    NEWLY_ADDED("newly_added"),
+    POPULARITY("popularity")
+}
+
+@Suppress("unused")
+enum class Categories(val str: String) {
+    ACTION("action"),
+    ADVENTURE("adventure"),
+    COMEDY("comedy"),
+    DRAMA("drama"),
+    FANTASY("fantasy"),
+    MUSIC("music"),
+    ROMANCE("romance"),
+    SCI_FI("sci-fi"),
+    SEINEN("seinen"),
+    SHOJO("shojo"),
+    SHONEN("shonen"),
+    SLICE_OF_LIFE("slice+of+life"),
+    SPORTS("sports"),
+    SUPERNATURAL("supernatural"),
+    THRILLER("thriller")
+}
+
+/**
+ * token, index, account. This must pe present for the app to work!
+ */
+@Serializable
+data class Token(
+    @SerialName("access_token") val accessToken: String,
+    @SerialName("refresh_token") val refreshToken: String,
+    @SerialName("expires_in") val expiresIn: Int,
+    @SerialName("token_type") val tokenType: String,
+    @SerialName("scope") val scope: String,
+    @SerialName("country") val country: String,
+    @SerialName("account_id") val accountId: String,
+)
+
+@Serializable
+data class Index(
+    @SerialName("cms") val cms: CMS,
+    @SerialName("service_available") val serviceAvailable: Boolean,
+)
+
+@Serializable
+data class CMS(
+    @SerialName("bucket") val bucket: String,
+    @SerialName("policy") val policy: String,
+    @SerialName("signature") val signature: String,
+    @SerialName("key_pair_id") val keyPairId: String,
+    @SerialName("expires") val expires: String,
+)
+
+@Serializable
+data class Account(
+    @SerialName("account_id") val accountId: String,
+    @SerialName("external_id") val externalId: String,
+    @SerialName("email_verified") val emailVerified: Boolean,
+    @SerialName("created") val created: String,
+)
+val NoneAccount = Account("", "", false, "")
+
+/**
+ * search, browse, DiscSeasonList, Watchlist, ContinueWatchingList data types all use Collection
+ */
+
+@Serializable
+data class CollectionV1<T>(
+    @SerialName("total") val total: Int,
+    @SerialName("items") val items: List<T>
+)
+
+@Serializable
+data class CollectionV2<T>(
+    @SerialName("total") val total: Int,
+    @SerialName("data") val data: List<T>
+)
+
+typealias SearchResult = CollectionV2<SearchTypedList<Item>>
+typealias BrowseResult = CollectionV2<Item>
+typealias SimilarToResult = CollectionV2<Item>
+typealias RecommendationsList = CollectionV2<Item>
+typealias Benefits = CollectionV1<Benefit>
+
+/**
+ * panel data classes
+ */
+
+// the data class Item is used in browse, search, watchlist and similar to
+// TODO rename to MediaPanel
+@Serializable
+data class Item(
+    val id: String,
+    val title: String,
+    val type: String,
+    val channel_id: String,
+    val description: String,
+    val images: Images
+    // TODO series_metadata etc.
+    // TODO add slug_title if present in search, browse, similar to
+)
+
+@Serializable
+data class Images(val poster_tall: List<List<Poster>>, val poster_wide: List<List<Poster>>)
+// crunchyroll why?
+
+@Serializable
+data class Poster(val height: Int, val width: Int, val source: String, val type: String)
+
+/**
+ * up next & watchlist data classes
+ */
+
+typealias Watchlist = CollectionV2<WatchlistItem>
+typealias HistoryList = CollectionV2<UpNextAccountItem>
+typealias UpNextSeriesList = CollectionV2<UpNextSeriesItem>
+
+@Serializable
+data class WatchlistItem(
+    @SerialName("panel") val panel: EpisodePanel,
+    @SerialName("new") val new: Boolean,
+    @SerialName("playhead") val playhead: Int,
+    @SerialName("fully_watched") val fullyWatched: Boolean = false,
+    @SerialName("never_watched") val neverWatched: Boolean = false,
+    @SerialName("is_favorite") val isFavorite: Boolean,
+)
+
+@Serializable
+data class IsWatchlistItem(
+    @SerialName("id") val id: String,
+    @SerialName("is_favorite") val isFavorite: Boolean,
+    @SerialName("date_added") val dateAdded: String
+)
+
+@Serializable
+data class UpNextAccountItem(
+    @SerialName("panel") val panel: EpisodePanel,
+    @SerialName("new") val new: Boolean,
+    @SerialName("playhead") val playhead: Int,
+    @SerialName("fully_watched") val fullyWatched: Boolean = false,
+)
+
+@Serializable
+data class UpNextSeriesItem(
+    @SerialName("panel") val panel: EpisodePanel,
+    @SerialName("playhead") val playhead: Int,
+    @SerialName("fully_watched") val fullyWatched: Boolean,
+    @SerialName("never_watched") val neverWatched: Boolean,
+
+)
+
+// EpisodePanel is used in ContinueWatchingItem and UpNextSeriesItem
+@Serializable
+data class EpisodePanel(
+    @SerialName("id") val id: String,
+    @SerialName("title") val title: String,
+    @SerialName("type") val type: String,
+    @SerialName("channel_id") val channelId: String,
+    @SerialName("description") val description: String,
+    @SerialName("episode_metadata") val episodeMetadata: EpisodeMetadata,
+    @SerialName("images") val images: Thumbnail,
+//    @SerialName("streams_link") val streamsLink: String,
+)
+
+@Serializable
+data class EpisodeMetadata(
+    @SerialName("duration_ms") val durationMs: Int,
+    @SerialName("episode_number") val episodeNumber: Int? = null, // default/nullable value since optional
+    @SerialName("season_id") val seasonId: String,
+    @SerialName("season_number") val seasonNumber: Int,
+    @SerialName("season_title") val seasonTitle: String,
+    @SerialName("series_id") val seriesId: String,
+    @SerialName("series_title") val seriesTitle: String,
+)
+
+val NoneCollectionV2 = CollectionV2<Item>(0, emptyList())
+val NoneSearchResult = SearchResult(0, emptyList())
+val NoneBrowseResult = BrowseResult(0, emptyList())
+val NoneSimilarToResult = SimilarToResult(0, emptyList())
+val NoneWatchlist = Watchlist(0, emptyList())
+val NoneHistoryList = HistoryList(0, emptyList())
+val NoneUpNextSeriesList = UpNextSeriesList(0, emptyList())
+val NoneRecommendationsList = RecommendationsList(0, emptyList())
+val NoneBenefits = Benefits(0, emptyList())
+
+/**
+ * series data class
+ */
+
+typealias Series = CollectionV2<SeriesItem>
+
+@Serializable
+data class SeriesItem(
+    @SerialName("id") val id: String,
+    @SerialName("title") val title: String,
+    @SerialName("description") val description: String,
+    @SerialName("images") val images: Images,
+    @SerialName("is_simulcast") val isSimulcast: Boolean,
+    @SerialName("maturity_ratings") val maturityRatings: List<String>,
+    @SerialName("audio_locales") val audioLocales: List<String>,
+    @SerialName("episode_count") val episodeCount: Int
+)
+
+val NoneSeriesItem = SeriesItem("", "", "", Images(emptyList(), emptyList()), false, emptyList(), emptyList(), 0)
+val NoneSeries = Series(1, listOf(NoneSeriesItem))
+
+/**
+ * Seasons data classes
+ */
+@Serializable
+data class Seasons(
+    @SerialName("total") val total: Int,
+    @SerialName("data") val data: List<Season>
+)
+
+@Serializable
+data class Season(
+    @SerialName("id") val id: String,
+    @SerialName("title") val title: String,
+    @SerialName("slug_title") val slugTitle: String,
+    @SerialName("series_id") val seriesId: String,
+    @SerialName("season_number") val seasonNumber: Int,
+    @SerialName("is_subbed") val isSubbed: Boolean,
+    @SerialName("is_dubbed") val isDubbed: Boolean,
+)
+
+val NoneSeasons = Seasons(0, emptyList())
+val NoneSeason = Season("", "", "", "", 0, isSubbed = false, isDubbed = false)
+
+
+/**
+ * Episodes data classes
+ */
+@Serializable
+data class Episodes(
+    @SerialName("total") val total: Int,
+    @SerialName("data") val data: List<Episode>
+)
+
+@Serializable
+data class Episode(
+    @SerialName("id") val id: String,
+    @SerialName("title") val title: String,
+    @SerialName("series_id") val seriesId: String,
+    @SerialName("season_title") val seasonTitle: String,
+    @SerialName("season_id") val seasonId: String,
+    @SerialName("season_number") val seasonNumber: Int,
+    @SerialName("episode") val episode: String,
+    @SerialName("episode_number") val episodeNumber: Int? = null,
+    @SerialName("description") val description: String,
+    @SerialName("next_episode_id") val nextEpisodeId: String? = null, // default/nullable value since optional
+    @SerialName("next_episode_title") val nextEpisodeTitle: String? = null, // default/nullable value since optional
+    @SerialName("is_subbed") val isSubbed: Boolean,
+    @SerialName("is_dubbed") val isDubbed: Boolean,
+    @SerialName("images") val images: Thumbnail,
+    @SerialName("duration_ms") val durationMs: Int,
+    @SerialName("versions") val versions: List<Version>? = null,
+    @SerialName("streams_link") val streamsLink: String,
+)
+
+@Serializable
+data class Thumbnail(
+    @SerialName("thumbnail") val thumbnail: List<List<Poster>>
+)
+
+@Serializable
+data class Version(
+    @SerialName("audio_locale") val audioLocale: String,
+    @SerialName("guid") val guid: String,
+    @SerialName("is_premium_only") val isPremiumOnly: Boolean,
+    @SerialName("media_guid") val mediaGUID: String,
+    @SerialName("original") val original: Boolean,
+    @SerialName("season_guid") val seasonGUID: String,
+    @SerialName("variant") val variant: String,
+)
+
+val NoneEpisodes = Episodes(0, listOf())
+val NoneEpisode = Episode(
+    id = "",
+    title = "",
+    seriesId = "",
+    seasonId = "",
+    seasonTitle = "",
+    seasonNumber = 0,
+    episode = "",
+    episodeNumber = 0,
+    description = "",
+    nextEpisodeId = "",
+    nextEpisodeTitle = "",
+    isSubbed = false,
+    isDubbed = false,
+    images = Thumbnail(listOf()),
+    durationMs = 0,
+    versions = emptyList(),
+    streamsLink = ""
+)
+
+val NoneVersion = Version(
+    audioLocale = "",
+    guid = "",
+    isPremiumOnly = false,
+    mediaGUID = "",
+    original = true,
+    seasonGUID = "",
+    variant = ""
+)
+
+typealias Playheads = CollectionV2<PlayheadObject>
+
+@Serializable
+data class PlayheadObject(
+    @SerialName("playhead") val playhead: Int,
+    @SerialName("content_id") val contentId: String,
+    @SerialName("fully_watched") val fullyWatched: Boolean,
+    @SerialName("last_modified") val lastModified: String,
+)
+
+val NonePlayheads = Playheads(0, emptyList())
+
+/**
+ * Meta data for a episode intro. All time values are in seconds.
+ */
+@Serializable
+data class DatalabIntro(
+    @SerialName("media_id") val mediaId: String,
+    @SerialName("startTime") val startTime: Float,
+    @SerialName("endTime") val endTime: Float,
+    @SerialName("duration") val duration: Float,
+    @SerialName("comparedWith") val comparedWith: String,
+    @SerialName("ordering") val ordering: String,
+    @SerialName("last_updated") val lastUpdated: String,
+)
+
+val NoneDatalabIntro = DatalabIntro("", 0f, 0f, 0f, "", "", "")
+
+/**
+ * playback/stream data classes
+ */
+@Serializable
+data class Streams(
+    @SerialName("total") val total: Int,
+    @SerialName("data") val data: List<StreamList>,
+)
+
+@Serializable
+data class StreamList(
+    @SerialName("adaptive_dash") val adaptive_dash: Map<String, Stream>,
+    @SerialName("adaptive_hls") val adaptive_hls: Map<String, Stream>,
+    @SerialName("download_dash") val downloadDash: Map<String, Stream>,
+    @SerialName("download_hls") val download_hls: Map<String, Stream>,
+//    @SerialName("drm_adaptive_dash") val drmAdaptiveDash: Map<String, Stream>,
+//    @SerialName("drm_adaptive_hls") val drmAdaptiveHls: Map<String, Stream>,
+//    @SerialName("drm_download_dash") val drmDownloadDash: Map<String, Stream>,
+//    @SerialName("drm_download_hls") val drmDownloadHls: Map<String, Stream>,
+//    @SerialName("vo_adaptive_dash") val vo_adaptive_dash: Map<String, Stream>,
+//    @SerialName("vo_adaptive_hls") val vo_adaptive_hls: Map<String, Stream>,
+//    @SerialName("vo_drm_adaptive_dash") val vo_drm_adaptive_dash: Map<String, Stream>,
+//    @SerialName("vo_drm_adaptive_hls") val vo_drm_adaptive_hls: Map<String, Stream>,
+)
+
+@Serializable
+data class Stream(
+    @SerialName("hardsub_locale") val hardsubLocale: String = "", // default/nullable value since might be optional
+    @SerialName("url") val url: String = "", // default/nullable value since optional
+    @SerialName("vcodec") val vcodec: String = "", // default/nullable value since optional
+)
+
+val NoneStreams = Streams(
+    0,
+    arrayListOf(StreamList(
+        mapOf(), mapOf(), mapOf(), mapOf()
+    ))
+)
+
+/**
+ * profile data class
+ */
+@Serializable
+data class Profile(
+    @SerialName("avatar") val avatar: String,
+    @SerialName("email") val email: String,
+    @SerialName("maturity_rating") val maturityRating: String,
+    @SerialName("preferred_content_audio_language") val preferredContentAudioLanguage: String,
+    @SerialName("preferred_content_subtitle_language") val preferredContentSubtitleLanguage: String,
+    @SerialName("username") val username: String,
+)
+val NoneProfile = Profile(
+    avatar = "",
+    email = "",
+    maturityRating = "",
+    preferredContentAudioLanguage = "",
+    preferredContentSubtitleLanguage = "",
+    username = ""
+)
+
+/**
+ * benefit data class
+ */
+@Serializable
+data class Benefit(
+    @SerialName("benefit") val benefit: String,
+    @SerialName("source") val source: String,
+)
+@Suppress("unused")
+val NoneBenefit = Benefit(
+    benefit = "",
+    source = ""
+)
+
+/**
+ * search result typed list data class
+ */
+@Serializable
+data class SearchTypedList<T>(
+    @SerialName("type") val type: String,
+    @SerialName("count") val count: Int,
+    @SerialName("items") val items: List<T>
+)

app/src/main/java/org/mosad/teapod/preferences/Preferences.kt

@@ -4,14 +4,23 @@ import android.content.Context
 import android.content.SharedPreferences
 import org.mosad.teapod.R
 import org.mosad.teapod.util.DataTypes
+import java.util.*
 
 object Preferences {
 
-    var preferSecondary = false
+    var preferredAudioLocale: Locale = Locale.forLanguageTag("en-US")
+        internal set
+    var preferredSubtitleLocale: Locale = Locale.forLanguageTag("en-US")
         internal set
     var autoplay = true
         internal set
-    var theme = DataTypes.Theme.DARK
+    var devSettings = false
+        internal set
+    var theme = DataTypes.Theme.SYSTEM
+        internal set
+
+    // dev settings
+    var updatePlayhead = true
         internal set
 
     private fun getSharedPref(context: Context): SharedPreferences {
@@ -21,13 +30,22 @@ object Preferences {
         )
     }
 
-    fun savePreferSecondary(context: Context, preferSecondary: Boolean) {
+    fun savePreferredAudioLocal(context: Context, preferredLocale: Locale) {
         with(getSharedPref(context).edit()) {
-            putBoolean(context.getString(R.string.save_key_prefer_secondary), preferSecondary)
+            putString(context.getString(R.string.save_key_preferred_local), preferredLocale.toLanguageTag())
             apply()
         }
 
-        this.preferSecondary = preferSecondary
+        this.preferredAudioLocale = preferredLocale
+    }
+
+    fun savePreferredSubtitleLocal(context: Context, preferredLocale: Locale) {
+        with(getSharedPref(context).edit()) {
+            putString(context.getString(R.string.save_key_preferred_local), preferredLocale.toLanguageTag())
+            apply()
+        }
+
+        this.preferredSubtitleLocale = preferredLocale
     }
 
     fun saveAutoplay(context: Context, autoplay: Boolean) {
@@ -39,6 +57,15 @@ object Preferences {
         this.autoplay = autoplay
     }
 
+    fun saveDevSettings(context: Context, devSettings: Boolean) {
+        with(getSharedPref(context).edit()) {
+            putBoolean(context.getString(R.string.save_key_dev_settings), devSettings)
+            apply()
+        }
+
+        this.devSettings = devSettings
+    }
+
     fun saveTheme(context: Context, theme: DataTypes.Theme) {
         with(getSharedPref(context).edit()) {
             putString(context.getString(R.string.save_key_theme), theme.toString())
@@ -48,22 +75,46 @@ object Preferences {
         this.theme = theme
     }
 
+    fun saveUpdatePlayhead(context: Context, updatePlayhead: Boolean) {
+        with(getSharedPref(context).edit()) {
+            putBoolean(context.getString(R.string.save_key_update_playhead), updatePlayhead)
+            apply()
+        }
+
+        this.updatePlayhead = updatePlayhead
+    }
+
     /**
      * initially load the stored values
      */
     fun load(context: Context) {
         val sharedPref = getSharedPref(context)
 
-        preferSecondary = sharedPref.getBoolean(
-            context.getString(R.string.save_key_prefer_secondary), false
+        preferredAudioLocale = Locale.forLanguageTag(
+            sharedPref.getString(
+                context.getString(R.string.save_key_preferred_audio_local), "en-US"
+            ) ?: "en-US"
+        )
+        preferredSubtitleLocale = Locale.forLanguageTag(
+            sharedPref.getString(
+                context.getString(R.string.save_key_preferred_local), "en-US"
+            ) ?: "en-US"
         )
         autoplay = sharedPref.getBoolean(
             context.getString(R.string.save_key_autoplay), true
         )
+        devSettings = sharedPref.getBoolean(
+            context.getString(R.string.save_key_dev_settings), false
+        )
         theme = DataTypes.Theme.valueOf(
             sharedPref.getString(
-                context.getString(R.string.save_key_theme), DataTypes.Theme.DARK.toString()
-            ) ?:  DataTypes.Theme.DARK.toString()
+                context.getString(R.string.save_key_theme), DataTypes.Theme.SYSTEM.toString()
+            ) ?:  DataTypes.Theme.SYSTEM.toString()
+        )
+
+        // dev settings
+        updatePlayhead = sharedPref.getBoolean(
+            context.getString(R.string.save_key_update_playhead), true
         )
     }
 

app/src/main/java/org/mosad/teapod/ui/activity/SplashActivity.kt

@@ -1,18 +0,0 @@
-package org.mosad.teapod.ui.activity
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import org.mosad.teapod.ui.activity.main.MainActivity
-
-
-class SplashActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val intent = Intent(this, MainActivity::class.java)
-        startActivity(intent)
-        finish()
-    }
-}

app/src/main/java/org/mosad/teapod/ui/activity/main/MainActivity.kt

@@ -1,7 +1,7 @@
 /**
  * Teapod
  *
- * Copyright 2020-2021  <seil0@mosad.xyz>
+ * Copyright 2020-2022  <seil0@mosad.xyz>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,39 +26,36 @@ import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.MenuItem
+import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.callbacks.onDismiss
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import kotlinx.coroutines.joinAll
-import kotlinx.coroutines.runBlocking
+import com.google.android.material.navigation.NavigationBarView
+import kotlinx.coroutines.*
 import org.mosad.teapod.R
 import org.mosad.teapod.databinding.ActivityMainBinding
-import org.mosad.teapod.parser.AoDParser
-import org.mosad.teapod.ui.activity.player.PlayerActivity
+import org.mosad.teapod.parser.crunchyroll.Crunchyroll
 import org.mosad.teapod.preferences.EncryptedPreferences
 import org.mosad.teapod.preferences.Preferences
-import org.mosad.teapod.ui.components.LoginDialog
 import org.mosad.teapod.ui.activity.main.fragments.AccountFragment
 import org.mosad.teapod.ui.activity.main.fragments.HomeFragment
+import org.mosad.teapod.ui.activity.main.fragments.MyListsFragment
 import org.mosad.teapod.ui.activity.main.fragments.LibraryFragment
-import org.mosad.teapod.ui.activity.main.fragments.SearchFragment
 import org.mosad.teapod.ui.activity.onboarding.OnboardingActivity
 import org.mosad.teapod.util.DataTypes
-import org.mosad.teapod.util.StorageController
-import org.mosad.teapod.util.exitAndRemoveTask
-import java.net.SocketTimeoutException
+import org.mosad.teapod.util.metadb.MetaDBController
+import java.util.*
 import kotlin.system.measureTimeMillis
 
-class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemSelectedListener {
+class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListener {
+    private val classTag = javaClass.name
 
     private lateinit var binding: ActivityMainBinding
     private var activeBaseFragment: Fragment = HomeFragment() // the currently active fragment, home at the start
 
     companion object {
-        var wasInitialized = false
         lateinit var instance: MainActivity
     }
 
@@ -67,28 +64,36 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        // Handle the splash screen transition.
+        installSplashScreen()
+
         super.onCreate(savedInstanceState)
 
-        if (!wasInitialized) { load() }
-        theme.applyStyle(getThemeResource(), true)
+        load() // start the initial loading
+
+        // theming
+        val mode = when (Preferences.theme) {
+            DataTypes.Theme.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
+            DataTypes.Theme.DARK -> AppCompatDelegate.MODE_NIGHT_YES
+            else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+        }
+        AppCompatDelegate.setDefaultNightMode(mode)
 
         binding = ActivityMainBinding.inflate(layoutInflater)
-        binding.navView.setOnNavigationItemSelectedListener(this)
+        binding.navView.setOnItemSelectedListener(this)
         setContentView(binding.root)
 
         supportFragmentManager.commit {
             replace(R.id.nav_host_fragment, activeBaseFragment, activeBaseFragment.javaClass.simpleName)
         }
-    }
 
-    override fun onBackPressed() {
-        if (supportFragmentManager.backStackEntryCount > 0) {
-            supportFragmentManager.popBackStack()
-        } else {
-            if (activeBaseFragment !is HomeFragment) {
-                binding.navView.selectedItemId = R.id.navigation_home
+        onBackPressedDispatcher.addCallback {
+            if (supportFragmentManager.backStackEntryCount > 0) {
+                supportFragmentManager.popBackStack()
             } else {
-                super.onBackPressed()
+                if (activeBaseFragment !is HomeFragment) {
+                    binding.navView.selectedItemId = R.id.navigation_home
+                }
             }
         }
     }
@@ -103,12 +108,12 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
                 activeBaseFragment = HomeFragment()
                 true
             }
-            R.id.navigation_library -> {
-                activeBaseFragment = LibraryFragment()
+            R.id.navigation_my_lists -> {
+                activeBaseFragment = MyListsFragment()
                 true
             }
-            R.id.navigation_search -> {
-                activeBaseFragment = SearchFragment()
+            R.id.navigation_library -> {
+                activeBaseFragment = LibraryFragment()
                 true
             }
             R.id.navigation_account -> {
@@ -125,12 +130,12 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
         return ret
     }
 
-    private fun getThemeResource(): Int {
-        return when (Preferences.theme) {
-            DataTypes.Theme.LIGHT -> R.style.AppTheme_Light
-            else -> R.style.AppTheme_Dark
-        }
-    }
+//    private fun getThemeResource(): Int {
+//        return when (Preferences.theme) {
+//            DataTypes.Theme.LIGHT -> R.style.AppTheme_Light
+//            else -> R.style.AppTheme_Dark
+//        }
+//    }
 
     /**
      * initial loading and login are run in parallel, as initial loading doesn't require
@@ -138,52 +143,52 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
      */
     private fun load() {
         val time = measureTimeMillis {
-            val loadingJob = AoDParser.initialLoading() // start the initial loading
-
             // load all saved stuff here
             Preferences.load(this)
             EncryptedPreferences.readCredentials(this)
-            StorageController.load(this)
 
-            // show onbaording
-            if (EncryptedPreferences.password.isEmpty()) {
+            // load meta db at the start, it doesn't depend on any third party
+            val metaJob = initMetaDB()
+
+            // always initialize the api token
+            Crunchyroll.initBasicApiToken()
+
+            // show onboarding if no password is set, or login fails
+            if (EncryptedPreferences.password.isEmpty() || !Crunchyroll.login(
+                    EncryptedPreferences.login,
+                    EncryptedPreferences.password
+                )
+            ) {
                 showOnboarding()
             } else {
-                try {
-                    if (!AoDParser.login()) {
-                        showLoginDialog()
-                    }
-                } catch (ex: SocketTimeoutException) {
-                    Log.w(javaClass.name, "Timeout during login!")
-
-                    // show waring dialog before finishing
-                    MaterialDialog(this).show {
-                        title(R.string.dialog_timeout_head)
-                        message(R.string.dialog_timeout_desc)
-                        onDismiss { exitAndRemoveTask() }
-                    }
+                runBlocking {
+                    initCrunchyroll().joinAll()
+                    metaJob.join() // meta loading should be done here
                 }
             }
-
-            runBlocking { loadingJob.joinAll() } // wait for initial loading to finish
         }
-        Log.i(javaClass.name, "loading and login in $time ms")
-
-        wasInitialized = true
+        Log.i(classTag, "loading in $time ms")
     }
 
-    private fun showLoginDialog() {
-        LoginDialog(this, false).positiveButton {
-            EncryptedPreferences.saveCredentials(login, password, context)
+    private fun initCrunchyroll(): List<Job> {
+        val scope = CoroutineScope(Dispatchers.IO + CoroutineName("InitialCrunchyLoading"))
+        return listOf(
+            scope.launch { Crunchyroll.account() },
+            scope.launch {
+                // update the local preferred content language, since it may have changed
+                val profile = Crunchyroll.profile()
 
-            if (!AoDParser.login()) {
-                showLoginDialog()
-                Log.w(javaClass.name, "Login failed, please try again.")
+                val audioLocale = Locale.forLanguageTag(profile.preferredContentAudioLanguage)
+                val subtitleLocale = Locale.forLanguageTag(profile.preferredContentSubtitleLanguage)
+                Preferences.savePreferredAudioLocal(this@MainActivity, audioLocale)
+                Preferences.savePreferredSubtitleLocal(this@MainActivity, subtitleLocale)
             }
-        }.negativeButton {
-            Log.i(javaClass.name, "Login canceled, exiting.")
-            finish()
-        }.show()
+        )
+    }
+
+    private fun initMetaDB(): Job {
+        val scope = CoroutineScope(Dispatchers.IO + CoroutineName("InitialMetaDBLoading"))
+        return scope.launch { MetaDBController.list() }
     }
 
     /**
@@ -194,17 +199,6 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
         finish()
     }
 
-    /**
-     * start the player as new activity
-     */
-    fun startPlayer(mediaId: Int, episodeId: Int) {
-        val intent = Intent(this, PlayerActivity::class.java).apply {
-            putExtra(getString(R.string.intent_media_id), mediaId)
-            putExtra(getString(R.string.intent_episode_id), episodeId)
-        }
-        startActivity(intent)
-    }
-
     /**
      * use custom restart instead of recreate(), since it has animations
      */

app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/AboutFragment.kt

@@ -6,22 +6,29 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.annotation.RawRes
 import androidx.fragment.app.Fragment
-import com.afollestad.materialdialogs.MaterialDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.mosad.teapod.BuildConfig
 import org.mosad.teapod.R
 import org.mosad.teapod.databinding.FragmentAboutBinding
 import org.mosad.teapod.databinding.ItemComponentBinding
+import org.mosad.teapod.preferences.Preferences
 import org.mosad.teapod.util.DataTypes.License
 import org.mosad.teapod.util.ThirdPartyComponent
 import java.lang.StringBuilder
+import java.util.Timer
+import kotlin.concurrent.schedule
 
 class AboutFragment : Fragment() {
 
-    private val teapodRepoUrl = "https://git.mosad.xyz/Seil0/teapod"
     private lateinit var binding: FragmentAboutBinding
 
+    private val teapodRepoUrl = "https://git.mosad.xyz/Seil0/teapod"
+    private val devClickMax = 5
+    private var devClickCount = 0
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = FragmentAboutBinding.inflate(inflater, container, false)
         return binding.root
@@ -52,18 +59,46 @@ class AboutFragment : Fragment() {
     }
 
     private fun initActions() {
+        binding.imageAppIcon.setOnClickListener {
+            checkDevSettings()
+        }
+
         binding.linearSource.setOnClickListener {
             startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(teapodRepoUrl)))
         }
 
         binding.linearLicense.setOnClickListener {
-            MaterialDialog(requireContext())
-                .title(text = License.GPL3.long)
-                .message(text = parseLicense(R.raw.gpl_3_full))
+            MaterialAlertDialogBuilder(requireContext())
+                .setTitle(License.GPL3.long)
+                .setMessage(parseLicense(R.raw.gpl_3_full))
                 .show()
         }
     }
 
+    /**
+     * check if dev settings shall be enabled
+     */
+    private fun checkDevSettings() {
+        // if the dev settings are already enabled show a toast
+        if (Preferences.devSettings) {
+            Toast.makeText(context, getString(R.string.dev_settings_already), Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        // reset dev settings count after 5 seconds
+        if (devClickCount == 0) {
+            Timer("", false).schedule(5000) {
+                devClickCount = 0
+            }
+        }
+        devClickCount++
+
+        if (devClickCount == devClickMax) {
+            Preferences.saveDevSettings(requireContext(), true)
+            Toast.makeText(context, getString(R.string.dev_settings_enabled), Toast.LENGTH_SHORT).show()
+        }
+    }
+
     private fun getThirdPartyComponents(): List<ThirdPartyComponent> {
         return listOf(
             ThirdPartyComponent("AndroidX", "", "The Android Open Source Project",
@@ -72,16 +107,14 @@ class AboutFragment : Fragment() {
                 "https://github.com/material-components/material-components-android", License.APACHE2),
             ThirdPartyComponent("ExoPlayer", "2014 - 2020", "The Android Open Source Project",
                 "https://github.com/google/ExoPlayer", License.APACHE2),
-            ThirdPartyComponent("Gson", "2008", "Google Inc.",
-                "https://github.com/google/gson", License.APACHE2),
             ThirdPartyComponent("Material design icons", "2020", "Google Inc.",
                 "https://github.com/google/material-design-icons", License.APACHE2),
-            ThirdPartyComponent("Material Dialogs", "", "Aidan Follestad",
-                "https://github.com/afollestad/material-dialogs", License.APACHE2),
-            ThirdPartyComponent("Jsoup", "2009 - 2020", "Jonathan Hedley",
-                "https://jsoup.org/", License.MIT),
-            ThirdPartyComponent("kotlinx.coroutines", "2016 - 2019", "JetBrains",
+            ThirdPartyComponent("Ktor", "2014-2021", "JetBrains s.r.o and contributors",
+                "https://ktor.io/", License.APACHE2),
+            ThirdPartyComponent("kotlinx.coroutines", "2016-2021", "JetBrains s.r.o",
                 "https://github.com/Kotlin/kotlinx.coroutines", License.APACHE2),
+            ThirdPartyComponent(" kotlinx.serialization", "2017-2021", "JetBrains s.r.o",
+                "https://github.com/Kotlin/kotlinx.serialization", License.APACHE2),
             ThirdPartyComponent("Glide", "2014", "Google Inc.",
                 "https://github.com/bumptech/glide", License.BSD2),
             ThirdPartyComponent("Glide Transformations", "2020", "Wasabeef",
@@ -97,9 +130,9 @@ class AboutFragment : Fragment() {
             License.MIT -> parseLicense(R.raw.mit_full)
         }
 
-        MaterialDialog(requireContext())
-            .title(text = license.long)
-            .message(text = licenseText)
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(license.long)
+            .setMessage(licenseText)
             .show()
     }
 
@@ -117,4 +150,4 @@ class AboutFragment : Fragment() {
         return sb.toString()
     }
 
-}
+}

app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/AccountFragment.kt

@@ -1,27 +1,40 @@
 package org.mosad.teapod.ui.activity.main.fragments
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.list.listItemsSingleChoice
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.*
 import org.mosad.teapod.BuildConfig
-import org.mosad.teapod.ui.activity.main.MainActivity
 import org.mosad.teapod.R
 import org.mosad.teapod.databinding.FragmentAccountBinding
-import org.mosad.teapod.parser.AoDParser
+import org.mosad.teapod.parser.crunchyroll.Benefits
+import org.mosad.teapod.parser.crunchyroll.Crunchyroll
+import org.mosad.teapod.parser.crunchyroll.Profile
+import org.mosad.teapod.parser.crunchyroll.supportedAudioLocals
+import org.mosad.teapod.parser.crunchyroll.supportedSubtitleLocals
 import org.mosad.teapod.preferences.EncryptedPreferences
 import org.mosad.teapod.preferences.Preferences
-import org.mosad.teapod.ui.components.LoginDialog
+import org.mosad.teapod.ui.activity.main.MainActivity
+import org.mosad.teapod.ui.components.LoginModalBottomSheet
 import org.mosad.teapod.util.DataTypes.Theme
 import org.mosad.teapod.util.showFragment
+import org.mosad.teapod.util.toDisplayString
+import java.util.*
 
 class AccountFragment : Fragment() {
 
     private lateinit var binding: FragmentAccountBinding
+    private var profile: Deferred<Profile> = lifecycleScope.async {
+        Crunchyroll.profile()
+    }
+    private var benefits: Deferred<Benefits> = lifecycleScope.async {
+        Crunchyroll.benefits()
+    }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = FragmentAccountBinding.inflate(inflater, container, false)
@@ -32,21 +45,60 @@ class AccountFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         binding.textAccountLogin.text = EncryptedPreferences.login
-        binding.textInfoAboutDesc.text = getString(R.string.info_about_desc, BuildConfig.VERSION_NAME, getString(R.string.build_time))
-        binding.textThemeSelected.text = when (Preferences.theme) {
-            Theme.DARK -> getString(R.string.theme_dark)
-            else -> getString(R.string.theme_light)
+
+        // load account status and tier (async) info before anything else
+        lifecycleScope.launch {
+            benefits.await().apply {
+                this.items.firstOrNull { it.benefit == "cr_premium" }?.let {
+                    binding.textAccountSubscription.text = getString(R.string.account_premium)
+                }
+
+                this.items.firstOrNull { it.benefit == "cr_fan_pack" }?.let {
+                    binding.textAccountSubscriptionDesc.text =
+                        getString(R.string.account_tier, getString(R.string.account_tier_mega_fan))
+                }
+            }
         }
 
-        binding.switchSecondary.isChecked = Preferences.preferSecondary
+        // add preferred subtitles
+        lifecycleScope.launch {
+            binding.textSettingsAudioLanguageDesc.text = Locale.forLanguageTag(
+                profile.await().preferredContentAudioLanguage
+            ).displayLanguage
+            binding.textSettingsSubtitleLanguageDesc.text = Locale.forLanguageTag(
+                profile.await().preferredContentSubtitleLanguage
+            ).displayLanguage
+        }
         binding.switchAutoplay.isChecked = Preferences.autoplay
+        binding.textThemeSelected.text = when (Preferences.theme) {
+            Theme.SYSTEM -> getString(R.string.theme_system)
+            Theme.LIGHT -> getString(R.string.theme_light)
+            Theme.DARK -> getString(R.string.theme_dark)
+        }
+
+        binding.linearDevSettings.isVisible = Preferences.devSettings
+        binding.switchUpdatePlayhead.isChecked = Preferences.updatePlayhead
+
+        binding.textInfoAboutDesc.text = getString(R.string.info_about_desc, BuildConfig.VERSION_NAME, getString(R.string.build_time))
 
         initActions()
     }
 
     private fun initActions() {
         binding.linearAccountLogin.setOnClickListener {
-            showLoginDialog(true)
+            showLoginDialog()
+        }
+
+        binding.linearSettingsAudioLanguage.setOnClickListener {
+            showAudioLanguageSelection()
+        }
+
+        binding.linearSettingsSubtitleLanguage.setOnClickListener {
+            showSubtitleLanguageSelection()
+        }
+
+        binding.switchAutoplay.setOnClickListener {
+            Preferences.saveAutoplay(requireContext(), binding.switchAutoplay.isChecked)
         }
 
         binding.linearTheme.setOnClickListener {
@@ -57,46 +109,142 @@ class AccountFragment : Fragment() {
             activity?.showFragment(AboutFragment())
         }
 
-        binding.switchSecondary.setOnClickListener {
-            Preferences.savePreferSecondary(requireContext(), binding.switchSecondary.isChecked)
+        binding.switchUpdatePlayhead.setOnClickListener {
+            Preferences.saveUpdatePlayhead(requireContext(), binding.switchUpdatePlayhead.isChecked)
         }
 
-        binding.switchAutoplay.setOnClickListener {
-            Preferences.saveAutoplay(requireContext(), binding.switchAutoplay.isChecked)
+        binding.linearExportData.setOnClickListener {
+            // unused
+        }
+
+        binding.linearImportData.setOnClickListener {
+            // unused
         }
     }
 
-    private fun showLoginDialog(firstTry: Boolean) {
-        LoginDialog(requireContext(), firstTry).positiveButton {
-            EncryptedPreferences.saveCredentials(login, password, context)
-
-            if (!AoDParser.login()) {
-                showLoginDialog(false)
-                Log.w(javaClass.name, "Login failed, please try again.")
-            }
-        }.show {
+    private fun showLoginDialog() {
+        val loginModal = LoginModalBottomSheet().apply {
             login = EncryptedPreferences.login
             password = ""
+            positiveAction = {
+                EncryptedPreferences.saveCredentials(login, password, requireContext())
+
+                // TODO only dismiss if login was successful
+                this.dismiss()
+            }
+            negativeAction = {
+                this.dismiss()
+            }
+        }
+        activity?.let { loginModal.show(it.supportFragmentManager, LoginModalBottomSheet.TAG) }
+    }
+
+    private fun showAudioLanguageSelection() {
+        // we should be able to use the index of supportedLocals for language selection, items is GUI only
+        val items = supportedAudioLocals.map {
+            it.toDisplayString(getString(R.string.settings_content_language_none))
+        }.toTypedArray()
+
+        var initialSelection: Int
+        // profile should be completed here, therefore blocking
+        runBlocking {
+            initialSelection = supportedAudioLocals.indexOf(Locale.forLanguageTag(
+                profile.await().preferredContentAudioLanguage))
+            if (initialSelection < 0) initialSelection = supportedAudioLocals.lastIndex
+        }
+
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.settings_audio_language)
+            .setSingleChoiceItems(items, initialSelection){ dialog, which ->
+                updateAudioLanguage(supportedAudioLocals[which])
+                dialog.dismiss()
+            }
+            .show()
+    }
+
+    private fun showSubtitleLanguageSelection() {
+        // we should be able to use the index of supportedLocals for language selection, items is GUI only
+        val items = supportedSubtitleLocals.map {
+            it.toDisplayString(getString(R.string.settings_content_language_none))
+        }.toTypedArray()
+
+        var initialSelection: Int
+        // profile should be completed here, therefore blocking
+        runBlocking {
+            initialSelection = supportedSubtitleLocals.indexOf(Locale.forLanguageTag(
+                profile.await().preferredContentSubtitleLanguage))
+            if (initialSelection < 0) initialSelection = supportedSubtitleLocals.lastIndex
+        }
+
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.settings_audio_language)
+            .setSingleChoiceItems(items, initialSelection){ dialog, which ->
+                updateSubtitleLanguage(supportedSubtitleLocals[which])
+                dialog.dismiss()
+            }
+            .show()
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private fun updateAudioLanguage(preferredLocale: Locale) {
+        lifecycleScope.launch {
+            Crunchyroll.setPreferredAudioLanguage(preferredLocale.toLanguageTag())
+
+        }.invokeOnCompletion {
+            // update the local preferred audio language
+            Preferences.savePreferredAudioLocal(requireContext(), preferredLocale)
+
+            // update profile since the language selection might have changed
+            profile = lifecycleScope.async { Crunchyroll.profile() }
+            profile.invokeOnCompletion {
+                // update language once loading profile is completed
+                binding.textSettingsAudioLanguageDesc.text = Locale.forLanguageTag(
+                    profile.getCompleted().preferredContentAudioLanguage
+                ).displayLanguage
+            }
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private fun updateSubtitleLanguage(preferredLocal: Locale) {
+        lifecycleScope.launch {
+            Crunchyroll.setPreferredSubtitleLanguage(preferredLocal.toLanguageTag())
+
+        }.invokeOnCompletion {
+            // update the local preferred subtitle language
+            Preferences.savePreferredSubtitleLocal(requireContext(), preferredLocal)
+
+            // update profile since the language selection might have changed
+            profile = lifecycleScope.async { Crunchyroll.profile() }
+            profile.invokeOnCompletion {
+                // update language once loading profile is completed
+                binding.textSettingsAudioLanguageDesc.text = Locale.forLanguageTag(
+                    profile.getCompleted().preferredContentSubtitleLanguage
+                ).displayLanguage
+            }
         }
     }
 
     private fun showThemeDialog() {
-        val themes = listOf(
+        val items = arrayOf(
+            resources.getString(R.string.theme_system),
             resources.getString(R.string.theme_light),
             resources.getString(R.string.theme_dark)
         )
 
-        MaterialDialog(requireContext()).show {
-            title(R.string.theme)
-            listItemsSingleChoice(items = themes, initialSelection = Preferences.theme.ordinal) { _, index, _ ->
-                when(index) {
-                    0 -> Preferences.saveTheme(context, Theme.LIGHT)
-                    1 -> Preferences.saveTheme(context, Theme.DARK)
-                    else -> Preferences.saveTheme(context, Theme.LIGHT)
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.theme)
+            .setSingleChoiceItems(items, Preferences.theme.ordinal){ _, which ->
+                when(which) {
+                    0 -> Preferences.saveTheme(requireContext(), Theme.SYSTEM)
+                    1 -> Preferences.saveTheme(requireContext(), Theme.LIGHT)
+                    2 -> Preferences.saveTheme(requireContext(), Theme.DARK)
+                    else -> Preferences.saveTheme(requireContext(), Theme.SYSTEM)
                 }
 
                 (activity as MainActivity).restart()
             }
-        }
+            .show()
     }
+
 }

app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/HomeFragment.kt

@@ -1,3 +1,25 @@
+/**
+ * Teapod
+ *
+ * Copyright 2020-2022  <seil0@mosad.xyz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
 package org.mosad.teapod.ui.activity.main.fragments
 
 import android.os.Bundle
@@ -5,32 +27,39 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.LinearLayout
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.view.children
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import com.bumptech.glide.Glide
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
+import com.facebook.shimmer.ShimmerFrameLayout
 import kotlinx.coroutines.launch
 import org.mosad.teapod.R
-import org.mosad.teapod.ui.activity.main.MainActivity
 import org.mosad.teapod.databinding.FragmentHomeBinding
-import org.mosad.teapod.parser.AoDParser
-import org.mosad.teapod.util.ItemMedia
-import org.mosad.teapod.util.StorageController
-import org.mosad.teapod.util.adapter.MediaItemAdapter
-import org.mosad.teapod.util.decoration.MediaItemDecoration
+import org.mosad.teapod.ui.activity.main.viewmodel.HomeViewModel
+import org.mosad.teapod.util.adapter.MediaEpisodeListAdapter
+import org.mosad.teapod.util.adapter.MediaItemListAdapter
+import org.mosad.teapod.util.playerIntent
 import org.mosad.teapod.util.setDrawableTop
 import org.mosad.teapod.util.showFragment
+import org.mosad.teapod.util.toItemMediaList
 
 class HomeFragment : Fragment() {
 
+    private val classTag = javaClass.name
+    private val model: HomeViewModel by viewModels()
     private lateinit var binding: FragmentHomeBinding
-    private lateinit var adapterMyList: MediaItemAdapter
-    private lateinit var adapterNewEpisodes: MediaItemAdapter
-    private lateinit var adapterNewSimulcasts: MediaItemAdapter
-    private lateinit var adapterNewTitles: MediaItemAdapter
-    private lateinit var adapterTopTen: MediaItemAdapter
 
-    private lateinit var highlightMedia: ItemMedia
+    private val itemOffset = 21
+
+    private val playerResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        model.updateUpNextItems()
+    }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = FragmentHomeBinding.inflate(inflater, container, false)
@@ -40,128 +69,166 @@ class HomeFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        GlobalScope.launch(Dispatchers.Main) {
-            context?.let {
-                initHighlight()
-                initRecyclerViews()
-                initActions()
-            }
-        }
-    }
+        binding.recyclerUpNext.adapter = MediaEpisodeListAdapter(
+            MediaEpisodeListAdapter.OnClickListener {
+                playerResult.launch(playerIntent(it.panel.episodeMetadata.seasonId, it.panel.id))
+            },
+            itemOffset
+        )
 
-    private fun initHighlight() {
-        if (AoDParser.highlightsList.isNotEmpty()) {
-            highlightMedia =  AoDParser.highlightsList[0]
+        binding.recyclerWatchlist.adapter = MediaItemListAdapter(
+            MediaItemListAdapter.OnClickListener {
+                activity?.showFragment(MediaFragment(it.id))
+            },
+            itemOffset
+        )
 
-            binding.textHighlightTitle.text = highlightMedia.title
-            Glide.with(requireContext()).load(highlightMedia.posterUrl)
-                .into(binding.imageHighlight)
+        binding.recyclerRecommendations.adapter = MediaItemListAdapter(
+            MediaItemListAdapter.OnClickListener {
+                activity?.showFragment(MediaFragment(it.id))
+            },
+            itemOffset
+        )
 
-            if (StorageController.myList.contains(highlightMedia.id)) {
-                binding.textHighlightMyList.setDrawableTop(R.drawable.ic_baseline_check_24)
-            } else {
-                binding.textHighlightMyList.setDrawableTop(R.drawable.ic_baseline_add_24)
-            }
-        }
-    }
+        binding.recyclerNewTitles.adapter = MediaItemListAdapter(
+            MediaItemListAdapter.OnClickListener {
+                activity?.showFragment(MediaFragment(it.id))
+            },
+            itemOffset
+        )
 
-    private fun initRecyclerViews() {
-        binding.recyclerMyList.addItemDecoration(MediaItemDecoration(9))
-        binding.recyclerNewEpisodes.addItemDecoration(MediaItemDecoration(9))
-        binding.recyclerNewSimulcasts.addItemDecoration(MediaItemDecoration(9))
-        binding.recyclerNewTitles.addItemDecoration(MediaItemDecoration(9))
-        binding.recyclerTopTen.addItemDecoration(MediaItemDecoration(9))
-
-        // my list
-        val myListMedia = StorageController.myList.map { elementId ->
-            AoDParser.itemMediaList.first {
-                elementId == it.id
-            }
-        }
-        adapterMyList = MediaItemAdapter(myListMedia)
-        binding.recyclerMyList.adapter = adapterMyList
-
-        // new episodes
-        adapterNewEpisodes = MediaItemAdapter(AoDParser.newEpisodesList)
-        binding.recyclerNewEpisodes.adapter = adapterNewEpisodes
-
-        // new simulcasts
-        adapterNewSimulcasts = MediaItemAdapter(AoDParser.newSimulcastsList)
-        binding.recyclerNewSimulcasts.adapter = adapterNewSimulcasts
-
-        // new titles
-        adapterNewTitles = MediaItemAdapter(AoDParser.newTitlesList)
-        binding.recyclerNewTitles.adapter = adapterNewTitles
-
-        // top ten
-        adapterTopTen = MediaItemAdapter(AoDParser.topTenList)
-        binding.recyclerTopTen.adapter = adapterTopTen
-    }
-
-    private fun initActions() {
-        binding.buttonPlayHighlight.setOnClickListener {
-            // TODO get next episode
-            GlobalScope.launch {
-                val media = AoDParser.getMediaById(highlightMedia.id)
-
-                Log.d(javaClass.name, "Starting Player with  mediaId: ${media.id}")
-                (activity as MainActivity).startPlayer(media.id, media.episodes.first().id)
-            }
-        }
+        binding.recyclerTopTen.adapter = MediaItemListAdapter(
+            MediaItemListAdapter.OnClickListener {
+                activity?.showFragment(MediaFragment(it.id))
+            },
+            itemOffset
+        )
 
         binding.textHighlightMyList.setOnClickListener {
-            if (StorageController.myList.contains(highlightMedia.id)) {
-                StorageController.myList.remove(highlightMedia.id)
-                binding.textHighlightMyList.setDrawableTop(R.drawable.ic_baseline_add_24)
-            } else {
-                StorageController.myList.add(highlightMedia.id)
-                binding.textHighlightMyList.setDrawableTop(R.drawable.ic_baseline_check_24)
-            }
-            StorageController.saveMyList(requireContext())
+            model.toggleHighlightWatchlist()
 
-            updateMyListMedia() // update my list, since it has changed
+            // disable the watchlist button until the result has been loaded
+            binding.textHighlightMyList.isClickable = false
+            // TODO since this might take a few seconds show a loading animation for the watchlist button
         }
 
+        // set the shimmer items size as it's depending on the screen size
+        setShimmerLayoutItemSize(binding.shimmerLayoutUpNext)
+        setShimmerLayoutItemSize(binding.shimmerLayoutWatchlist)
+        setShimmerLayoutItemSize(binding.shimmerLayoutRecommendations)
+        setShimmerLayoutItemSize(binding.shimmerLayoutNewTitles)
+        setShimmerLayoutItemSize(binding.shimmerLayoutTopTen)
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                model.onUiState(viewLifecycleOwner.lifecycleScope) { uiState ->
+                    when (uiState) {
+                        is HomeViewModel.UiState.Normal -> bindUiStateNormal(uiState)
+                        is HomeViewModel.UiState.Loading -> bindUiStateLoading()
+                        is HomeViewModel.UiState.Error -> bindUiStateError(uiState)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun bindUiStateNormal(uiState: HomeViewModel.UiState.Normal) {
+        val adapterUpNext = binding.recyclerUpNext.adapter as MediaEpisodeListAdapter
+        adapterUpNext.submitList(uiState.upNextItems.filter { !it.fullyWatched })
+
+        val adapterWatchlist = binding.recyclerWatchlist.adapter as MediaItemListAdapter
+        adapterWatchlist.submitList(uiState.watchlistItems.toItemMediaList())
+
+        val adapterRecommendations = binding.recyclerRecommendations.adapter as MediaItemListAdapter
+        adapterRecommendations.submitList(uiState.recommendationsItems.toItemMediaList())
+
+        val adapterNewTitles = binding.recyclerNewTitles.adapter as MediaItemListAdapter
+        adapterNewTitles.submitList(uiState.recentlyAddedItems.toItemMediaList())
+
+        val adapterTopTen = binding.recyclerTopTen.adapter as MediaItemListAdapter
+        adapterTopTen.submitList(uiState.topTenItems.toItemMediaList())
+
+        // highlight item
+        binding.textHighlightTitle.text = uiState.highlightItem.title
+        Glide.with(requireContext()).load(uiState.highlightItem.images.poster_wide[0][3].source)
+            .into(binding.imageHighlight)
+
+        val iconHighlightWatchlist = if (uiState.highlightIsWatchlist) {
+            R.drawable.ic_baseline_check_24
+        } else {
+            R.drawable.ic_baseline_add_24
+        }
+        binding.textHighlightMyList.setDrawableTop(iconHighlightWatchlist)
+        binding.textHighlightMyList.isClickable = true
+
         binding.textHighlightInfo.setOnClickListener {
-            activity?.showFragment(MediaFragment(highlightMedia.id))
+            activity?.showFragment(MediaFragment(uiState.highlightItem.id))
         }
 
-        adapterMyList.onItemClick = { mediaId, _ ->
-            activity?.showFragment(MediaFragment(mediaId))
+        binding.buttonPlayHighlight.setOnClickListener {
+            val panel = uiState.highlightItemUpNext.panel
+            playerResult.launch(playerIntent(panel.episodeMetadata.seasonId, panel.id))
         }
 
-        adapterNewEpisodes.onItemClick = { mediaId, _ ->
-            activity?.showFragment(MediaFragment(mediaId))
-        }
+        // disable the shimmer effect
+        disableShimmer()
 
-        adapterNewSimulcasts.onItemClick = { mediaId, _ ->
-            activity?.showFragment(MediaFragment(mediaId))
-        }
+        // make highlights layout visible again
+        binding.linearHighlight.isVisible = true
+    }
 
-        adapterNewTitles.onItemClick = { mediaId, _ ->
-            activity?.showFragment(MediaFragment(mediaId))
-        }
+    private fun bindUiStateLoading() {
+        // hide highlights layout
+        binding.linearHighlight.isVisible = false
 
-        adapterTopTen.onItemClick = { mediaId, _ ->
-            activity?.showFragment(MediaFragment(mediaId))
+        binding.shimmerLayoutUpNext.startShimmer()
+        binding.shimmerLayoutWatchlist.startShimmer()
+        binding.shimmerLayoutRecommendations.startShimmer()
+        binding.shimmerLayoutNewTitles.startShimmer()
+        binding.shimmerLayoutTopTen.startShimmer()
+    }
+
+    private fun setShimmerLayoutItemSize(shimmerLayout: ShimmerFrameLayout) {
+        (shimmerLayout.children.first() as? LinearLayout)?.children?.forEach { child ->
+            child.layoutParams.apply {
+                width = (resources.displayMetrics.widthPixels / requireContext().resources.getInteger(R.integer.item_media_columns)) - itemOffset
+            }
         }
     }
 
+    private fun bindUiStateError(uiState: HomeViewModel.UiState.Error) {
+        // currently not used
+        Log.e(classTag, "A error occurred while loading a UiState: ${uiState.message}")
+    }
+
     /**
-     * update my media list
-     * TODO
-     *  * auto call when StorageController.myList is changed
-     *  * only update actual change and not all data (performance)
+     * Disable the shimmer effect for all shimmer layouts and hide them.
      */
-    fun updateMyListMedia() {
-        val myListMedia = StorageController.myList.map { elementId ->
-            AoDParser.itemMediaList.first {
-                elementId == it.id
-            }
+    private fun disableShimmer() {
+        binding.shimmerLayoutHighlight.apply {
+            stopShimmer()
+            isVisible = false
+        }
+        binding.shimmerLayoutUpNext.apply {
+            stopShimmer()
+            isVisible = false
+        }
+        binding.shimmerLayoutWatchlist.apply {
+            stopShimmer()
+            isVisible = false
+        }
+        binding.shimmerLayoutRecommendations.apply {
+            stopShimmer()
+            isVisible = false
+        }
+        binding.shimmerLayoutNewTitles.apply {
+            stopShimmer()
+            isVisible = false
+        }
+        binding.shimmerLayoutTopTen.apply {
+            stopShimmer()
+            isVisible = false
         }
-
-        adapterMyList.updateMediaList(myListMedia)
-        adapterMyList.notifyDataSetChanged()
     }
 
-}
+}

app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/LibraryFragment.kt

@@ -1,24 +1,30 @@
 package org.mosad.teapod.ui.activity.main.fragments
 
+import android.annotation.SuppressLint
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.Fragment
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.mosad.teapod.databinding.FragmentLibraryBinding
-import org.mosad.teapod.parser.AoDParser
-import org.mosad.teapod.util.adapter.MediaItemAdapter
-import org.mosad.teapod.util.decoration.MediaItemDecoration
+import org.mosad.teapod.ui.activity.main.viewmodel.LibraryFragmentViewModel
+import org.mosad.teapod.util.adapter.MediaItemListAdapter
 import org.mosad.teapod.util.showFragment
 
 class LibraryFragment : Fragment() {
 
     private lateinit var binding: FragmentLibraryBinding
-    private lateinit var adapter: MediaItemAdapter
+    private lateinit var adapter: MediaItemListAdapter
+    private val model: LibraryFragmentViewModel by viewModels()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = FragmentLibraryBinding.inflate(inflater, container, false)
@@ -28,21 +34,79 @@ class LibraryFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        // init async
-        GlobalScope.launch {
-            // create and set the adapter, needs context
-            withContext(Dispatchers.Main) {
-                context?.let {
-                    adapter = MediaItemAdapter(AoDParser.itemMediaList)
-                    adapter.onItemClick = { mediaId, _ ->
-                        activity?.showFragment(MediaFragment(mediaId))
-                    }
+        // TODO replace with pagination3
+        // https://medium.com/swlh/paging3-recyclerview-pagination-made-easy-333c7dfa8797
+        binding.recyclerMediaSearch.addOnScrollListener(PaginationScrollListener())
 
-                    binding.recyclerMediaLibrary.adapter = adapter
-                    binding.recyclerMediaLibrary.addItemDecoration(MediaItemDecoration(9))
-                }
+        adapter = MediaItemListAdapter(MediaItemListAdapter.OnClickListener {
+            binding.searchText.clearFocus()
+            activity?.showFragment(MediaFragment(it.id))
+        })
+        binding.recyclerMediaSearch.adapter = adapter
+
+        binding.searchText.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(query: String?): Boolean {
+                query?.let { model.search(it) }
+                return false // return false to dismiss the keyboard
             }
 
+            override fun onQueryTextChange(newText: String?): Boolean {
+                newText?.let { model.search(it) }
+                return false // return false to dismiss the keyboard
+            }
+        })
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                model.onUiState(viewLifecycleOwner.lifecycleScope) { uiState ->
+                    when (uiState) {
+                        is LibraryFragmentViewModel.UiState.Browse -> bindUiStateBrowse(uiState)
+                        is LibraryFragmentViewModel.UiState.Search -> bindUiStateSearch(uiState)
+                        is LibraryFragmentViewModel.UiState.Loading -> bindUiStateLoading()
+                        is LibraryFragmentViewModel.UiState.Error -> bindUiStateError(uiState)
+                    }
+                }
+            }
         }
     }
-}
+
+    private fun bindUiStateBrowse(uiState: LibraryFragmentViewModel.UiState.Browse) {
+        adapter.submitList(uiState.itemList)
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    private fun bindUiStateSearch(uiState: LibraryFragmentViewModel.UiState.Search) {
+        adapter.submitList(uiState.itemList)
+        adapter.notifyDataSetChanged() // this is needed, else the adapter will not update
+    }
+
+    private fun bindUiStateLoading() {
+        // currently not used
+    }
+
+    private fun bindUiStateError(uiState: LibraryFragmentViewModel.UiState.Error) {
+        // currently not used
+        Log.e(javaClass.name, "A error occurred while loading a UiState: ${uiState.message}")
+    }
+
+    inner class PaginationScrollListener: RecyclerView.OnScrollListener() {
+
+        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+            super.onScrolled(recyclerView, dx, dy)
+
+            if (!model.isLazyLoading) {
+                val layoutManager = recyclerView.layoutManager as? GridLayoutManager
+                layoutManager?.let {
+                    // adapter.itemCount - 10 to start loading a bit earlier than the actual end
+                    if (layoutManager.findLastCompletelyVisibleItemPosition() >= (adapter.itemCount - 10)) {
+                        model.onLazyLoad().invokeOnCompletion {
+                            adapter.notifyItemRangeInserted(adapter.itemCount, model.PAGESIZE)
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+
+}

app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/MediaFragment.kt

@@ -7,37 +7,45 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import jp.wasabeef.glide.transformations.BlurTransformation
-import kotlinx.coroutines.*
+import kotlinx.coroutines.launch
 import org.mosad.teapod.R
 import org.mosad.teapod.databinding.FragmentMediaBinding
-import org.mosad.teapod.ui.activity.main.MainActivity
+import org.mosad.teapod.parser.crunchyroll.NoneUpNextSeriesList
 import org.mosad.teapod.ui.activity.main.viewmodel.MediaFragmentViewModel
-import org.mosad.teapod.util.*
-import org.mosad.teapod.util.DataTypes.MediaType
-
+import org.mosad.teapod.util.playerIntent
+import org.mosad.teapod.util.tmdb.TMDBApiController
+import org.mosad.teapod.util.tmdb.TMDBMovie
+import org.mosad.teapod.util.tmdb.TMDBTVShow
+import org.mosad.teapod.util.toItemMediaList
 
 /**
  * The media detail fragment.
  * Note: the fragment is created only once, when selecting a similar title etc.
  * therefore fragments may be not empty and model may be the old one
  */
-class MediaFragment(private val mediaId: Int) : Fragment() {
+class MediaFragment(private val mediaIdStr: String) : Fragment() {
 
     private lateinit var binding: FragmentMediaBinding
     private lateinit var pagerAdapter: FragmentStateAdapter
 
-    private val fragments = arrayListOf<Fragment>()
+    private val model: MediaFragmentViewModel by viewModels()
 
-    private val model: MediaFragmentViewModel by activityViewModels()
+    private val fragments = arrayListOf<Fragment>()
+    private var watchlistJobRunning = false
+
+    private val playerResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        playerFinishedCallback()
+    }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = FragmentMediaBinding.inflate(inflater, container, false)
@@ -49,34 +57,24 @@ class MediaFragment(private val mediaId: Int) : Fragment() {
         binding.frameLoading.visibility = View.VISIBLE
 
         // tab layout and pager
-        pagerAdapter = ScreenSlidePagerAdapter(requireActivity())
+        pagerAdapter = ScreenSlidePagerAdapter(this)
         // fix material components issue #1878, if more tabs are added increase
         binding.pagerEpisodesSimilar.offscreenPageLimit = 2
         binding.pagerEpisodesSimilar.adapter = pagerAdapter
+        // TODO is position 0 always episodes? (and 1 always similar titles)
         TabLayoutMediator(binding.tabEpisodesSimilar, binding.pagerEpisodesSimilar) { tab, position ->
-            tab.text = if (model.media.type == MediaType.TVSHOW && position == 0) {
-                getString(R.string.episodes)
-            } else {
-                getString(R.string.similar_titles)
+            tab.text = when(position) {
+                0 -> getString(R.string.episodes)
+                1 -> getString(R.string.similar_titles)
+                else -> ""
             }
         }.attach()
 
-        GlobalScope.launch(Dispatchers.Main) {
-            model.load(mediaId) // load the streams and tmdb for the selected media
+        lifecycleScope.launch {
+            model.loadCrunchy(mediaIdStr)
 
-            if (this@MediaFragment.isAdded) {
-                updateGUI()
-                initActions()
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        // update the next ep text if there is one, since it may have changed
-        if (model.nextEpisode.title.isNotEmpty()) {
-            binding.textTitle.text = model.nextEpisode.title
+            updateGUI()
+            initActions()
         }
     }
 
@@ -85,70 +83,56 @@ class MediaFragment(private val mediaId: Int) : Fragment() {
      */
     private fun updateGUI() = with(model) {
         // generic gui
-        val backdropUrl = if (tmdb.backdropUrl.isNotEmpty()) tmdb.backdropUrl else media.info.posterUrl
-        val posterUrl = if (tmdb.posterUrl.isNotEmpty()) tmdb.posterUrl else media.info.posterUrl
+        val backdropUrl = tmdbResult.backdropPath?.let { TMDBApiController.imageUrl + it }
+            ?: seriesCrunchy.images.poster_wide[0][2].source
+        val posterUrl = tmdbResult.posterPath?.let { TMDBApiController.imageUrl + it }
+            ?: seriesCrunchy.images.poster_tall[0][2].source
 
+        // load poster and backdrop
+        Glide.with(requireContext()).load(posterUrl)
+            .apply(RequestOptions.placeholderOf(ColorDrawable(Color.DKGRAY)))
+            .into(binding.imagePoster)
         Glide.with(requireContext()).load(backdropUrl)
             .apply(RequestOptions.placeholderOf(ColorDrawable(Color.DKGRAY)))
             .apply(RequestOptions.bitmapTransform(BlurTransformation(20, 3)))
             .into(binding.imageBackdrop)
 
-        Glide.with(requireContext()).load(posterUrl)
-            .into(binding.imagePoster)
-
-        binding.textTitle.text = media.info.title
-        binding.textYear.text = media.info.year.toString()
-        binding.textAge.text = media.info.age.toString()
-        binding.textOverview.text = media.info.shortDesc
-        if (StorageController.myList.contains(media.id)) {
-            Glide.with(requireContext()).load(R.drawable.ic_baseline_check_24).into(binding.imageMyListAction)
-        } else {
-            Glide.with(requireContext()).load(R.drawable.ic_baseline_add_24).into(binding.imageMyListAction)
+        binding.textYear.text = when(tmdbResult) {
+            is TMDBTVShow -> (tmdbResult as TMDBTVShow).firstAirDate?.substring(0, 4)
+            is TMDBMovie -> (tmdbResult as TMDBMovie).releaseDate.substring(0, 4)
+            else -> ""
         }
+        binding.textAge.text = seriesCrunchy.maturityRatings.firstOrNull()
 
-        // clear fragments, since it lives in onCreate scope (don't do this in onPause/onStop -> FragmentManager transaction)
+        binding.textTitle.text = if (upNextSeries != NoneUpNextSeriesList) {
+            upNextSeries.data.first().panel.title
+        } else seriesCrunchy.title
+        binding.textOverview.text = seriesCrunchy.description
+
+        // set "watchlist" indicator
+        val watchlistIcon = if (isWatchlist) R.drawable.ic_baseline_check_24 else R.drawable.ic_baseline_add_24
+        Glide.with(requireContext()).load(watchlistIcon).into(binding.imageMyListAction)
+
+        /**
+         * clear fragments, since it lives in onCreate scope,
+         * don't do this in onPause/onStop -> FragmentManager transaction
+         * (will be called on similar -> new MediaFragment -> onBackPressed)
+         */
+        val fragmentsSize = fragments.size
         fragments.clear()
-        pagerAdapter.notifyDataSetChanged()
+        pagerAdapter.notifyItemRangeRemoved(0, fragmentsSize)
 
-        // specific gui
-        if (media.type == MediaType.TVSHOW) {
-            // get next episode
-            nextEpisode = if (media.episodes.firstOrNull{ !it.watched } != null) {
-                media.episodes.first{ !it.watched }
-            } else {
-                media.episodes.first()
-            }
-
-            // title is the next episodes title
-            binding.textTitle.text = nextEpisode.title
-
-            // episodes count
-            binding.textEpisodesOrRuntime.text = resources.getQuantityString(
-                R.plurals.text_episodes_count,
-                media.info.episodesCount,
-                media.info.episodesCount
-            )
-
-            // episodes
-            fragments.add(MediaFragmentEpisodes())
-            pagerAdapter.notifyDataSetChanged()
-        } else if (media.type == MediaType.MOVIE) {
-
-            if (tmdb.runtime > 0) {
-                binding.textEpisodesOrRuntime.text = resources.getQuantityString(
-                    R.plurals.text_runtime,
-                    tmdb.runtime,
-                    tmdb.runtime
-                )
-            } else {
-                binding.textEpisodesOrRuntime.visibility = View.GONE
-            }
+        MediaFragmentEpisodes().also {
+            fragments.add(it)
+            pagerAdapter.notifyItemInserted(fragments.indexOf(it))
         }
 
         // if has similar titles
-        if (media.info.similar.isNotEmpty()) {
-            fragments.add(MediaFragmentSimilar())
-            pagerAdapter.notifyDataSetChanged()
+        if (model.similarTo.total > 0) {
+            MediaFragmentSimilar(model.similarTo.toItemMediaList()).also {
+                fragments.add(it)
+                pagerAdapter.notifyItemInserted(fragments.indexOf(it))
+            }
         }
 
         // disable scrolling on appbar, if no tabs where added
@@ -157,51 +141,87 @@ class MediaFragment(private val mediaId: Int) : Fragment() {
             params.scrollFlags = 0 // clear all scroll flags
         }
 
+        // specific gui (via tmdb)
+        when (tmdbResult) {
+            is TMDBTVShow -> {
+                // episodes count
+                binding.textEpisodesOrRuntime.text = resources.getQuantityString(
+                    R.plurals.text_episodes_count,
+                    seriesCrunchy.episodeCount,
+                    seriesCrunchy.episodeCount
+                )
+            }
+            is TMDBMovie -> {
+                val tmdbMovie = tmdbResult as TMDBMovie
+
+                if (tmdbMovie.runtime != null) {
+                    binding.textEpisodesOrRuntime.text = resources.getQuantityString(
+                        R.plurals.text_runtime,
+                        tmdbMovie.runtime,
+                        tmdbMovie.runtime
+                    )
+                } else {
+                    binding.textEpisodesOrRuntime.visibility = View.GONE
+                }
+            }
+            else -> {
+                binding.textEpisodesOrRuntime.visibility = View.GONE
+            }
+        }
+
         binding.frameLoading.visibility = View.GONE // hide loading indicator
     }
 
     private fun initActions() = with(model) {
         binding.buttonPlay.setOnClickListener {
-            when (media.type) {
-                MediaType.MOVIE -> playEpisode(media.episodes.first())
-                MediaType.TVSHOW -> playEpisode(nextEpisode)
-                else -> Log.e(javaClass.name, "Wrong Type: $media.type")
+            if (upNextSeries != NoneUpNextSeriesList) {
+                val panel = upNextSeries.data.first().panel
+                playEpisode(panel.episodeMetadata.seasonId, panel.id)
             }
         }
 
         // add or remove media from myList
         binding.linearMyListAction.setOnClickListener {
-            if (StorageController.myList.contains(media.id)) {
-                StorageController.myList.remove(media.id)
-                Glide.with(requireContext()).load(R.drawable.ic_baseline_add_24).into(binding.imageMyListAction)
-            } else {
-                StorageController.myList.add(media.id)
-                Glide.with(requireContext()).load(R.drawable.ic_baseline_check_24).into(binding.imageMyListAction)
-            }
-            StorageController.saveMyList(requireContext())
+            // don't allow parallel execution
+            if (!watchlistJobRunning) {
+                watchlistJobRunning = true
+                lifecycleScope.launch {
+                    setWatchlist()
 
-            // notify home fragment on change
-            parentFragmentManager.findFragmentByTag("HomeFragment")?.let {
-                (it as HomeFragment).updateMyListMedia()
+                    // update "watchlist" indicator
+                    val watchlistIcon = if (isWatchlist) R.drawable.ic_baseline_check_24 else R.drawable.ic_baseline_add_24
+                    Glide.with(requireContext()).load(watchlistIcon).into(binding.imageMyListAction)
+                    watchlistJobRunning = false
+                }
             }
         }
     }
 
-    /**
-     * play the current episode
-     * TODO this is also used in MediaFragmentEpisode, we should only have on implementation
-     */
-    private fun playEpisode(ep: Episode) {
-        (activity as MainActivity).startPlayer(model.media.id, ep.id)
-        Log.d(javaClass.name, "Started Player with  episodeId: ${ep.id}")
+    private fun playerFinishedCallback() = lifecycleScope.launch {
+        model.updateOnResume()
 
-        model.updateNextEpisode(ep) // set the correct next episode
+        if (model.upNextSeries != NoneUpNextSeriesList) {
+            binding.textTitle.text = model.upNextSeries.data.first().panel.title
+        }
+
+        // needs to be called after model.updateOnResume()
+        (fragments.elementAtOrNull(0) as? MediaFragmentEpisodes)?.updateWatchedState()
+
+        Log.d(javaClass.name, "Updated model and gui after player closed")
+    }
+
+    /**
+     * play a episode, also runs callback on player result return
+     */
+    fun playEpisode(seasonId: String, episodeId: String) {
+        playerResult.launch(playerIntent(seasonId, episodeId))
+        Log.d(javaClass.name, "Started Player with  episodeId: $episodeId")
     }
 
     /**
      * A simple pager adapter
      */
-    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
+    private inner class ScreenSlidePagerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
         override fun getItemCount(): Int = fragments.size
 
         override fun createFragment(position: Int): Fragment = fragments[position]

app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/MediaFragmentEpisodes.kt

@@ -1,16 +1,18 @@
 package org.mosad.teapod.ui.activity.main.fragments
 
+import android.annotation.SuppressLint
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.widget.PopupMenu
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import org.mosad.teapod.ui.activity.main.MainActivity
-import org.mosad.teapod.ui.activity.main.viewmodel.MediaFragmentViewModel
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
+import org.mosad.teapod.R
 import org.mosad.teapod.databinding.FragmentMediaEpisodesBinding
-import org.mosad.teapod.util.Episode
+import org.mosad.teapod.ui.activity.main.viewmodel.MediaFragmentViewModel
 import org.mosad.teapod.util.adapter.EpisodeItemAdapter
 
 class MediaFragmentEpisodes : Fragment() {
@@ -18,7 +20,7 @@ class MediaFragmentEpisodes : Fragment() {
     private lateinit var binding: FragmentMediaEpisodesBinding
     private lateinit var adapterRecEpisodes: EpisodeItemAdapter
 
-    private val model: MediaFragmentViewModel by activityViewModels()
+    private val model: MediaFragmentViewModel by viewModels({requireParentFragment()})
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = FragmentMediaEpisodesBinding.inflate(inflater, container, false)
@@ -28,34 +30,78 @@ class MediaFragmentEpisodes : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        adapterRecEpisodes = EpisodeItemAdapter(model.media.episodes)
+        adapterRecEpisodes = EpisodeItemAdapter(
+            model.currentEpisodesCrunchy,
+            model.tmdbTVSeason.episodes,
+            model.currentPlayheads,
+            EpisodeItemAdapter.OnClickListener { episode ->
+                (requireParentFragment() as? MediaFragment)?.playEpisode(episode.seasonId, episode.id)
+            },
+            EpisodeItemAdapter.ViewType.MEDIA_FRAGMENT
+        )
         binding.recyclerEpisodes.adapter = adapterRecEpisodes
 
-        // set onItemClick only in adapter is initialized
-        if (this::adapterRecEpisodes.isInitialized) {
-            adapterRecEpisodes.onImageClick = { _, position ->
-                playEpisode(model.media.episodes[position])
+        // don't show season selection if only one season is present
+        if (model.seasonsCrunchy.total < 2) {
+            binding.buttonSeasonSelection.visibility = View.GONE
+        } else {
+            binding.buttonSeasonSelection.text = getString(
+                R.string.season_number_title,
+                model.currentSeasonCrunchy.seasonNumber,
+                model.currentSeasonCrunchy.title
+            )
+            binding.buttonSeasonSelection.setOnClickListener { v ->
+                showSeasonSelection(v)
             }
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-
-        // if adapterRecEpisodes is initialized, update the watched state for the episodes
+    @SuppressLint("NotifyDataSetChanged")
+    fun updateWatchedState() {
+        // model.currentPlayheads is a val mutable map -> notify dataset changed
         if (this::adapterRecEpisodes.isInitialized) {
-            model.media.episodes.forEachIndexed { index, episode ->
-                adapterRecEpisodes.updateWatchedState(episode.watched, index)
-            }
             adapterRecEpisodes.notifyDataSetChanged()
         }
     }
 
-    private fun playEpisode(ep: Episode) {
-        (activity as MainActivity).startPlayer(model.media.id, ep.id)
-        Log.d(javaClass.name, "Started Player with  episodeId: ${ep.id}")
+    private fun showSeasonSelection(v: View) {
+        // TODO replace with Exposed dropdown menu: https://material.io/components/menus/android#exposed-dropdown-menus
+        val popup = PopupMenu(requireContext(), v)
+        model.seasonsCrunchy.data.forEach { season ->
+            popup.menu.add(getString(
+                    R.string.season_number_title,
+                    season.seasonNumber,
+                    season.title
+                )
+            ).also {
+                it.setOnMenuItemClickListener {
+                    onSeasonSelected(season.id)
+                    false
+                }
+            }
+        }
 
-        model.updateNextEpisode(ep) // set the correct next episode
+        popup.show()
+    }
+
+    /**
+     * Call model to load a new season.
+     * Once loaded update buttonSeasonSelection text and adapterRecEpisodes.
+     *
+     * Suppress waring since invalid.
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    private fun onSeasonSelected(seasonId: String) {
+        // load the new season
+        lifecycleScope.launch {
+            model.setCurrentSeason(seasonId)
+            binding.buttonSeasonSelection.text = getString(
+                R.string.season_number_title,
+                model.currentSeasonCrunchy.seasonNumber,
+                model.currentSeasonCrunchy.title
+            )
+            adapterRecEpisodes.notifyDataSetChanged()
+        }
     }
 
 }

app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/MediaFragmentSimilar.kt

@@ -1,3 +1,25 @@
+/**
+ * Teapod
+ *
+ * Copyright 2020-2022  <seil0@mosad.xyz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
 package org.mosad.teapod.ui.activity.main.fragments
 
 import android.os.Bundle
@@ -5,19 +27,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
 import org.mosad.teapod.databinding.FragmentMediaSimilarBinding
-import org.mosad.teapod.ui.activity.main.viewmodel.MediaFragmentViewModel
-import org.mosad.teapod.util.adapter.MediaItemAdapter
-import org.mosad.teapod.util.decoration.MediaItemDecoration
+import org.mosad.teapod.util.ItemMedia
+import org.mosad.teapod.util.adapter.MediaItemListAdapter
 import org.mosad.teapod.util.showFragment
 
-class MediaFragmentSimilar : Fragment()  {
+class MediaFragmentSimilar(val items: List<ItemMedia>) : Fragment()  {
 
     private lateinit var binding: FragmentMediaSimilarBinding
-    private val model: MediaFragmentViewModel by activityViewModels()
-
-    private lateinit var adapterSimilar: MediaItemAdapter
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = FragmentMediaSimilarBinding.inflate(inflater, container, false)
@@ -27,15 +44,13 @@ class MediaFragmentSimilar : Fragment()  {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        adapterSimilar = MediaItemAdapter(model.media.info.similar)
-        binding.recyclerMediaSimilar.adapter = adapterSimilar
-        binding.recyclerMediaSimilar.addItemDecoration(MediaItemDecoration(9))
-
-        // set onItemClick only in adapter is initialized
-        if (this::adapterSimilar.isInitialized) {
-            adapterSimilar.onItemClick = { mediaId, _ ->
-                activity?.showFragment(MediaFragment(mediaId))
+        binding.recyclerMediaSimilar.adapter = MediaItemListAdapter(
+            MediaItemListAdapter.OnClickListener {
+                activity?.showFragment(MediaFragment(it.id))
             }
-        }
+        )
+
+        val adapterSimilar = binding.recyclerMediaSimilar.adapter as MediaItemListAdapter
+        adapterSimilar.submitList(items)
     }
 }

app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/MyListsFragment.kt

@@ -0,0 +1,90 @@
+package org.mosad.teapod.ui.activity.main.fragments
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.google.android.material.tabs.TabLayoutMediator
+import kotlinx.coroutines.launch
+import org.mosad.teapod.R
+import org.mosad.teapod.databinding.FragmentMyListsBinding
+import org.mosad.teapod.ui.activity.main.viewmodel.MyListsFragmentViewModel
+import org.mosad.teapod.util.toItemMediaList
+
+class MyListsFragment : Fragment() {
+
+    private lateinit var binding: FragmentMyListsBinding
+    private lateinit var pagerAdapter: FragmentStateAdapter
+
+    private val model: MyListsFragmentViewModel by viewModels()
+
+    private val fragments = arrayListOf<Fragment>()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        binding = FragmentMyListsBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // tab layout and pager
+        pagerAdapter = ScreenSlidePagerAdapter(this)
+        binding.pagerMyLists.adapter = pagerAdapter
+
+        TabLayoutMediator(binding.tabMyLists, binding.pagerMyLists) { tab, position ->
+            tab.text = when(position) {
+                0 -> getString(R.string.my_list)
+                1 -> getString(R.string.crunchylists)
+                2 -> getString(R.string.downloads)
+                else -> ""
+            }
+        }.attach()
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                model.onUiState(viewLifecycleOwner.lifecycleScope) { uiState ->
+                    when (uiState) {
+                        is MyListsFragmentViewModel.UiState.Normal -> bindUiStateNormal(uiState)
+                        is MyListsFragmentViewModel.UiState.Loading -> bindUiStateLoading()
+                        is MyListsFragmentViewModel.UiState.Error -> bindUiStateError(uiState)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun bindUiStateNormal(uiState: MyListsFragmentViewModel.UiState.Normal) {
+        MediaFragmentSimilar(uiState.watchlistItems.toItemMediaList()).also {
+            fragments.add(it)
+            pagerAdapter.notifyItemInserted(fragments.indexOf(it))
+        }
+    }
+
+    private fun bindUiStateLoading() {
+        // currently not used
+    }
+
+    private fun bindUiStateError(uiState: MyListsFragmentViewModel.UiState.Error) {
+        // currently not used
+        Log.e(javaClass.name, "A error occurred while loading a UiState: ${uiState.message}")
+    }
+
+    /**
+     * A simple pager adapter
+     * TODO also present in MediaFragment
+     */
+    private inner class ScreenSlidePagerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
+        override fun getItemCount(): Int = fragments.size
+
+        override fun createFragment(position: Int): Fragment = fragments[position]
+    }
+
+}

app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/SearchFragment.kt

@@ -1,63 +0,0 @@
-package org.mosad.teapod.ui.activity.main.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.SearchView
-import androidx.fragment.app.Fragment
-import kotlinx.coroutines.*
-import org.mosad.teapod.databinding.FragmentSearchBinding
-import org.mosad.teapod.parser.AoDParser
-import org.mosad.teapod.util.decoration.MediaItemDecoration
-import org.mosad.teapod.util.adapter.MediaItemAdapter
-import org.mosad.teapod.util.showFragment
-
-class SearchFragment : Fragment() {
-
-    private lateinit var binding: FragmentSearchBinding
-    private var adapter : MediaItemAdapter? = null
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        binding = FragmentSearchBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        GlobalScope.launch {
-            // create and set the adapter, needs context
-            withContext(Dispatchers.Main) {
-                context?.let {
-                    adapter = MediaItemAdapter(AoDParser.itemMediaList)
-                    adapter!!.onItemClick = { mediaId, _ ->
-                        binding.searchText.clearFocus()
-                        activity?.showFragment(MediaFragment(mediaId))
-                    }
-
-                    binding.recyclerMediaSearch.adapter = adapter
-                    binding.recyclerMediaSearch.addItemDecoration(MediaItemDecoration(9))
-                }
-            }
-        }
-
-        initActions()
-    }
-
-    private fun initActions() {
-        binding.searchText.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-            override fun onQueryTextSubmit(query: String?): Boolean {
-                adapter?.filter?.filter(query)
-                adapter?.notifyDataSetChanged()
-                return false
-            }
-
-            override fun onQueryTextChange(newText: String?): Boolean {
-                adapter?.filter?.filter(newText)
-                adapter?.notifyDataSetChanged()
-                return false
-            }
-        })
-    }
-}

app/src/main/java/org/mosad/teapod/ui/activity/main/viewmodel/HomeViewModel.kt

@@ -0,0 +1,145 @@
+/**
+ * Teapod
+ *
+ * Copyright 2020-2022  <seil0@mosad.xyz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.teapod.ui.activity.main.viewmodel
+
+import androidx.lifecycle.LifecycleCoroutineScope
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import org.mosad.teapod.parser.crunchyroll.*
+import kotlin.random.Random
+
+class HomeViewModel : ViewModel() {
+
+    private val WATCHLIST_LENGTH = 50
+
+    private val uiState = MutableStateFlow<UiState>(UiState.Loading)
+
+    sealed class UiState {
+        object Loading : UiState()
+        data class Normal(
+            val upNextItems: List<UpNextAccountItem>,
+            val watchlistItems: List<Item>,
+            val recommendationsItems: List<Item>,
+            val recentlyAddedItems: List<Item>,
+            val topTenItems: List<Item>,
+            val highlightItem: Item,
+            val highlightItemUpNext: UpNextSeriesItem,
+            val highlightIsWatchlist:Boolean
+        ) : UiState()
+        data class Error(val message: String?) : UiState()
+    }
+
+    init {
+        load()
+    }
+
+    fun onUiState(scope: LifecycleCoroutineScope, collector: (UiState) -> Unit) {
+        scope.launch { uiState.collect { collector(it) } }
+    }
+
+    fun load() {
+        viewModelScope.launch {
+            uiState.emit(UiState.Loading)
+            try {
+                // run the loading in parallel to speed up the process
+                val upNextJob = viewModelScope.async { Crunchyroll.upNextAccount(n = 20).data }
+                val watchlistJob = viewModelScope.async { Crunchyroll.watchlist(WATCHLIST_LENGTH).data }
+                val recommendationsJob = viewModelScope.async {
+                    Crunchyroll.recommendations(n = 20).data
+                }
+                val recentlyAddedJob = viewModelScope.async {
+                    Crunchyroll.browse(sortBy = SortBy.NEWLY_ADDED, n = 50).data
+                }
+                val topTenJob = viewModelScope.async {
+                    Crunchyroll.browse(sortBy = SortBy.POPULARITY, n = 10).data
+                }
+
+                val recentlyAddedItems = recentlyAddedJob.await()
+                // FIXME crashes on newTitles.items.size == 0
+                val highlightItem = recentlyAddedItems[Random.nextInt(recentlyAddedItems.size)]
+                val highlightItemUpNextJob = viewModelScope.async {
+                    Crunchyroll.upNextSeries(highlightItem.id).data.first()
+                }
+                val highlightItemIsWatchlistJob = viewModelScope.async {
+                    Crunchyroll.isWatchlist(highlightItem.id)
+                }
+
+                uiState.emit(UiState.Normal(
+                    upNextJob.await(), watchlistJob.await(), recommendationsJob.await(),
+                    recentlyAddedJob.await(), topTenJob.await(), highlightItem,
+                    highlightItemUpNextJob.await(), highlightItemIsWatchlistJob.await()
+                ))
+            } catch (e: Exception) {
+                uiState.emit(UiState.Error(e.message))
+            }
+        }
+
+    }
+
+    /**
+     * Toggle the watchlist state of the highlight media.
+     */
+    fun toggleHighlightWatchlist() {
+        viewModelScope.launch {
+            uiState.update { currentUiState ->
+                if (currentUiState is UiState.Normal) {
+                    if (currentUiState.highlightIsWatchlist) {
+                        Crunchyroll.deleteWatchlist(currentUiState.highlightItem.id)
+                    } else {
+                        Crunchyroll.postWatchlist(currentUiState.highlightItem.id)
+                    }
+
+                    // update the watchlist after a item has been added/removed
+                    val watchlistItems = Crunchyroll.watchlist(WATCHLIST_LENGTH).data
+
+                    currentUiState.copy(
+                        watchlistItems = watchlistItems,
+                        highlightIsWatchlist = !currentUiState.highlightIsWatchlist)
+                } else {
+                    currentUiState
+                }
+            }
+        }
+    }
+
+    /**
+     * Update the up next list. To be used on player result callbacks.
+     */
+    fun updateUpNextItems() {
+        viewModelScope.launch {
+            uiState.update { currentUiState ->
+                if (currentUiState is UiState.Normal) {
+                    val upNextItems = Crunchyroll.upNextAccount(n = 20).data
+                    currentUiState.copy(upNextItems = upNextItems)
+                } else {
+                    currentUiState
+                }
+            }
+        }
+    }
+
+}

app/src/main/java/org/mosad/teapod/ui/activity/main/viewmodel/LibraryFragmentViewModel.kt

@@ -0,0 +1,131 @@
+package org.mosad.teapod.ui.activity.main.viewmodel
+
+import androidx.lifecycle.LifecycleCoroutineScope
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import org.mosad.teapod.parser.crunchyroll.Crunchyroll
+import org.mosad.teapod.util.ItemMedia
+import org.mosad.teapod.util.toItemMediaList
+
+class LibraryFragmentViewModel : ViewModel() {
+
+    val PAGESIZE = 50
+
+    private val uiState = MutableStateFlow<UiState>(UiState.Loading)
+    private var oldSearchQuery = ""
+    private var searchJob: Job? = null
+    var isLazyLoading = false
+        internal set
+
+    sealed class UiState {
+        object Loading : UiState()
+        data class Browse(
+            val itemList: MutableList<ItemMedia>
+        ) : UiState()
+        data class Search(
+            val itemList: List<ItemMedia>
+        ) : UiState()
+        data class Error(val message: String?) : UiState()
+    }
+
+    init {
+        load()
+    }
+
+    fun onUiState(scope: LifecycleCoroutineScope, collector: (UiState) -> Unit) {
+        scope.launch { uiState.collect { collector(it) } }
+    }
+
+    /**
+     * initially load the first n browsing items
+     */
+    private fun load() {
+        viewModelScope.launch {
+            uiState.emit(UiState.Loading)
+
+            try {
+                initBrowse()
+            } catch (ex: Exception) {
+                uiState.emit(UiState.Error(ex.message))
+            }
+        }
+    }
+
+    /**
+     * Search for a query string at Crunchyroll and emit the new ui state.
+     */
+    fun search(query: String) {
+        // return if nothing has changed
+        if (query == oldSearchQuery) return
+
+        // update the old query since it has changed
+        oldSearchQuery = query
+
+        viewModelScope.launch {
+
+            // always cancel a running search job
+            if (searchJob?.isActive == true) searchJob?.cancel()
+
+            // handle state change: browse <-> search
+            if (query.isEmpty()) {
+                // if the query is empty change back to browse state
+                initBrowse()
+            } else {
+                // TODO handle errors
+
+                // if the current ui state is not search, clear the recyclerview
+                if (uiState.value !is UiState.Search) {
+                    uiState.emit(UiState.Search(emptyList()))
+                }
+
+                // create a new search job
+                searchJob = viewModelScope.async {
+                    // wait for a few ms: if the user is typing the task will get canceled
+                    delay(250)
+
+                    val results = Crunchyroll.search(query, 50)
+                        .data.firstOrNull()?.items?.toItemMediaList()
+                        ?: listOf()
+                    uiState.emit(UiState.Search(results))
+                }
+            }
+        }
+    }
+
+    fun onLazyLoad() = viewModelScope.launch {
+        isLazyLoading = true
+
+        try {
+            uiState.update { currentUiState ->
+                if (currentUiState is UiState.Browse) {
+                    val newBrowseItems = Crunchyroll.browse(start = currentUiState.itemList.size, n = PAGESIZE)
+                        .toItemMediaList()
+                    currentUiState.itemList.addAll(newBrowseItems)
+                }
+                currentUiState
+            }
+        } catch (ex: Exception) {
+            uiState.emit(UiState.Error(ex.message))
+        }
+
+        isLazyLoading = false
+    }
+
+    private suspend fun initBrowse() {
+        try {
+            val initialBrowseItems = Crunchyroll.browse(n = PAGESIZE)
+                .toItemMediaList()
+                .toMutableList()
+            uiState.emit(UiState.Browse(initialBrowseItems))
+        } catch (ex: Exception) {
+            uiState.emit(UiState.Error(ex.message))
+        }
+    }
+
+}

app/src/main/java/org/mosad/teapod/ui/activity/main/viewmodel/MediaFragmentViewModel.kt

@@ -2,47 +2,167 @@ package org.mosad.teapod.ui.activity.main.viewmodel
 
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
-import org.mosad.teapod.parser.AoDParser
-import org.mosad.teapod.util.*
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
+import org.mosad.teapod.parser.crunchyroll.*
 import org.mosad.teapod.util.DataTypes.MediaType
+import org.mosad.teapod.util.tmdb.*
+import org.mosad.teapod.util.toPlayheadsMap
 
 /**
  * handle media, next ep and tmdb
+ * TODO this lives in activity, is this correct?
  */
 class MediaFragmentViewModel(application: Application) : AndroidViewModel(application) {
 
-    var media = Media(-1, "", MediaType.OTHER)
+    var seriesCrunchy = NoneSeriesItem // movies are also series
         internal set
-    var nextEpisode = Episode()
+    var seasonsCrunchy = NoneSeasons
         internal set
-    var tmdb = TMDBResponse()
+    var currentSeasonCrunchy = NoneSeason
+        internal set
+    var episodesCrunchy = NoneEpisodes
+        internal set
+    val currentEpisodesCrunchy = arrayListOf<Episode>() // used for EpisodeItemAdapter (easier updates)
+
+    // additional media info, might change during during user interaction
+    // use a map to update the episode adapter values
+    val currentPlayheads: MutableMap<String, PlayheadObject> = mutableMapOf()
+    var isWatchlist = false
+        internal set
+    var upNextSeries = NoneUpNextSeriesList
+        internal set
+    var similarTo = NoneSimilarToResult
+        internal set
+
+    // TMDB stuff
+    var mediaType = MediaType.OTHER
+        internal set
+    var tmdbResult: TMDBResult = NoneTMDB // TODO rename
+        internal set
+    var tmdbTVSeason: TMDBTVSeason = NoneTMDBTVSeason
         internal set
 
     /**
-     * set media, tmdb and nextEpisode
+     * @param crunchyId the crunchyroll series id
      */
-    suspend fun load(mediaId: Int) {
-        media = AoDParser.getMediaById(mediaId)
-        tmdb = TMDBApiController().search(media.info.title, media.type)
 
-        if (media.type == MediaType.TVSHOW) {
-            nextEpisode = if (media.episodes.firstOrNull{ !it.watched } != null) {
-                media.episodes.first{ !it.watched }
-            } else {
-                media.episodes.first()
+    suspend fun loadCrunchy(crunchyId: String) {
+        // load series and seasons info in parallel
+        listOf(
+            viewModelScope.launch { seriesCrunchy = Crunchyroll.series(crunchyId).data.first() },
+            viewModelScope.launch { seasonsCrunchy = Crunchyroll.seasons(crunchyId) },
+            viewModelScope.launch { isWatchlist = Crunchyroll.isWatchlist(crunchyId) },
+            viewModelScope.launch { upNextSeries = Crunchyroll.upNextSeries(crunchyId) },
+            viewModelScope.launch { similarTo = Crunchyroll.similarTo(crunchyId) }
+        ).joinAll()
+
+        // load the preferred season:
+        // next episode > first season
+        currentSeasonCrunchy = if (upNextSeries != NoneUpNextSeriesList) {
+            seasonsCrunchy.data.firstOrNull{ season ->
+                season.id == upNextSeries.data.first().panel.episodeMetadata.seasonId
+            } ?: seasonsCrunchy.data.first()
+        } else {
+            seasonsCrunchy.data.first()
+        }
+
+        // Note: if we need to query metaDB, do it now
+
+        // load episodes and metaDB in parallel (tmdb needs mediaType, which is set via episodes)
+        viewModelScope.launch { episodesCrunchy = Crunchyroll.episodes(currentSeasonCrunchy.id) }.join()
+        currentEpisodesCrunchy.clear()
+        currentEpisodesCrunchy.addAll(episodesCrunchy.data)
+
+        // set media type, for movies the episode field is empty
+        mediaType = episodesCrunchy.data.firstOrNull()?.let {
+            if (it.episode.isNotEmpty()) MediaType.TVSHOW else MediaType.MOVIE
+        } ?: MediaType.OTHER
+
+        // load playheads and tmdb in parallel
+        listOf(
+            updatePlayheadsAsync(),
+            viewModelScope.launch { loadTmdbInfo() } // use tmdb search to get media info
+        ).joinAll()
+    }
+
+    /**
+     * Load the tmdb info for the selected media.
+     * The TMDB search return a media type, use this to get the details (movie/tv show and season)
+     */
+    private suspend fun loadTmdbInfo() {
+        val tmdbApiController = TMDBApiController()
+
+        val tmdbSearchResult = when(mediaType) {
+            MediaType.MOVIE -> tmdbApiController.searchMovie(seriesCrunchy.title)
+            MediaType.TVSHOW -> tmdbApiController.searchTVShow(seriesCrunchy.title)
+            else -> NoneTMDBSearch
+        }
+
+        tmdbResult = if (tmdbSearchResult.results.isNotEmpty()) {
+            when (val result = tmdbSearchResult.results.first()) {
+                is TMDBSearchResultMovie -> tmdbApiController.getMovieDetails(result.id)
+                is TMDBSearchResultTVShow -> tmdbApiController.getTVShowDetails(result.id)
+                else -> NoneTMDB
             }
+        } else NoneTMDB
+
+        // currently not used
+//        tmdbTVSeason = if (tmdbResult is TMDBTVShow) {
+//            tmdbApiController.getTVSeasonDetails(tmdbResult.id, 0)
+//        } else NoneTMDBTVSeason
+    }
+
+    /**
+     * Get current playheads for all episodes
+     */
+    private fun updatePlayheadsAsync() = viewModelScope.async {
+        currentPlayheads.clear()
+        currentPlayheads.putAll(
+            Crunchyroll.playheads(episodesCrunchy.data.map { it.id }).toPlayheadsMap()
+        )
+    }
+
+    /**
+     * Set currentSeasonCrunchy based on the season id. Also set the new seasons episodes.
+     *
+     * @param seasonId the id of the season to set
+     */
+    suspend fun setCurrentSeason(seasonId: String) {
+        // return if the id hasn't changed (performance)
+        if (currentSeasonCrunchy.id == seasonId) return
+
+        // set currentSeasonCrunchy to the new season with id == seasonId, if the id isn't found,
+        // don't change the current season (this should/can never happen)
+        currentSeasonCrunchy = seasonsCrunchy.data.firstOrNull {
+            it.id == seasonId
+        } ?: currentSeasonCrunchy
+
+        episodesCrunchy = Crunchyroll.episodes(currentSeasonCrunchy.id)
+        currentEpisodesCrunchy.clear()
+        currentEpisodesCrunchy.addAll(episodesCrunchy.data)
+
+        // update playheads playheads (including fully watched state)
+        updatePlayheadsAsync().await()
+    }
+
+    suspend fun setWatchlist() {
+        isWatchlist = if (isWatchlist) {
+            Crunchyroll.deleteWatchlist(seriesCrunchy.id)
+            false
+        } else {
+            Crunchyroll.postWatchlist(seriesCrunchy.id)
+            true
         }
     }
 
-    /**
-     * get the next episode based on episode number (the true next episode)
-     * if no matching is found, use first episode
-     */
-    fun updateNextEpisode(currentEp: Episode) {
-        if (media.type == MediaType.MOVIE) return // return if movie
-
-        nextEpisode = media.episodes.firstOrNull{ it.number > currentEp.number }
-            ?: media.episodes.first()
+    suspend fun updateOnResume() {
+        joinAll(
+            updatePlayheadsAsync(),
+            viewModelScope.launch { upNextSeries = Crunchyroll.upNextSeries(seriesCrunchy.id) }
+        )
     }
 
-}
+}

app/src/main/java/org/mosad/teapod/ui/activity/main/viewmodel/MyListsFragmentViewModel.kt

@@ -0,0 +1,50 @@
+package org.mosad.teapod.ui.activity.main.viewmodel
+
+import androidx.lifecycle.LifecycleCoroutineScope
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
+import org.mosad.teapod.parser.crunchyroll.Crunchyroll
+import org.mosad.teapod.parser.crunchyroll.Item
+
+class MyListsFragmentViewModel : ViewModel() {
+
+    private val WATCHLIST_LENGTH = 50
+
+    private val uiState = MutableStateFlow<UiState>(UiState.Loading)
+
+    sealed class UiState {
+        object Loading : UiState()
+        data class Normal(
+            val watchlistItems: List<Item>
+        ) : UiState()
+        data class Error(val message: String?) : UiState()
+    }
+
+    init {
+        load()
+    }
+
+    fun onUiState(scope: LifecycleCoroutineScope, collector: (UiState) -> Unit) {
+        scope.launch { uiState.collect { collector(it) } }
+    }
+
+    fun load() {
+        viewModelScope.launch {
+            uiState.emit(UiState.Loading)
+            try {
+                // run the loading in parallel to speed up the process
+                val watchlistJob = viewModelScope.async { Crunchyroll.watchlist(WATCHLIST_LENGTH).data }
+                uiState.emit(
+                    UiState.Normal(watchlistJob.await())
+                )
+            } catch (e: Exception) {
+                uiState.emit(UiState.Error(e.message))
+            }
+        }
+
+    }
+
+}

app/src/main/java/org/mosad/teapod/ui/activity/onboarding/OnLoginFragment.kt

@@ -4,17 +4,18 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.*
 import org.mosad.teapod.R
 import org.mosad.teapod.databinding.FragmentOnLoginBinding
-import org.mosad.teapod.parser.AoDParser
+import org.mosad.teapod.parser.crunchyroll.Crunchyroll
 import org.mosad.teapod.preferences.EncryptedPreferences
 
 class OnLoginFragment: Fragment() {
 
     private lateinit var binding: FragmentOnLoginBinding
-    private var loginJob: Job? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = FragmentOnLoginBinding.inflate(inflater, container, false)
@@ -28,24 +29,40 @@ class OnLoginFragment: Fragment() {
 
     private fun initActions() {
         binding.buttonLogin.setOnClickListener {
-            // get login credentials from gui
-            val email = binding.editTextLogin.text.toString()
-            val password = binding.editTextPassword.text.toString()
+            onLogin()
+        }
 
-            EncryptedPreferences.saveCredentials(email, password, requireContext()) // save the credentials
+        binding.editTextPassword.setOnEditorActionListener { _, actionId, _ ->
+            return@setOnEditorActionListener when (actionId) {
+                EditorInfo.IME_ACTION_DONE -> {
+                    onLogin()
+                    false // false will hide the keyboards
+                }
+                else -> false
+            }
+        }
 
-            binding.buttonLogin.isClickable = false
-            loginJob = GlobalScope.launch {
-                if (AoDParser.login()) {
-                    // if login was successful, switch to main
-                    if (activity is OnboardingActivity) {
-                            (activity as OnboardingActivity).launchMainActivity()
-                    }
-                } else {
-                    withContext(Dispatchers.Main) {
-                        binding.textLoginDesc.text = getString(R.string.on_login_failed)
-                        binding.buttonLogin.isClickable = true
-                    }
+    }
+
+    private fun onLogin() {
+        // get login credentials from gui
+        val email = binding.editTextLogin.text.toString()
+        val password = binding.editTextPassword.text.toString()
+
+        binding.buttonLogin.isClickable = false
+        // FIXME, this seems to run blocking
+        lifecycleScope.launch {
+            // try login credentials
+            val login = Crunchyroll.login(email, password)
+
+            if (login) {
+                // save the credentials and show the main activity
+                EncryptedPreferences.saveCredentials(email, password, requireContext())
+                if (activity is OnboardingActivity) (activity as OnboardingActivity).launchMainActivity()
+            } else {
+                withContext(Dispatchers.Main) {
+                    binding.textLoginDesc.text = getString(R.string.on_login_failed)
+                    binding.buttonLogin.isClickable = true
                 }
             }
         }

app/src/main/java/org/mosad/teapod/ui/activity/onboarding/OnboardingActivity.kt

@@ -3,20 +3,21 @@ package org.mosad.teapod.ui.activity.onboarding
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.google.android.material.tabs.TabLayoutMediator
-import org.mosad.teapod.ui.activity.main.MainActivity
 import org.mosad.teapod.databinding.ActivityOnboardingBinding
+import org.mosad.teapod.ui.activity.main.MainActivity
 
 class OnboardingActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityOnboardingBinding
     private lateinit var pagerAdapter: FragmentStateAdapter
 
-    private val fragments = arrayOf(OnLoginFragment())
+    private val fragments = arrayOf(OnWelcomeFragment(), OnLoginFragment())
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -35,13 +36,11 @@ class OnboardingActivity : AppCompatActivity() {
         if (fragments.size <= 1) {
             binding.tabLayout.visibility = View.GONE
         }
-    }
 
-    override fun onBackPressed() {
-        if (binding.viewPager.currentItem == 0) {
-            super.onBackPressed()
-        } else {
-            binding.viewPager.currentItem = binding.viewPager.currentItem - 1
+        onBackPressedDispatcher.addCallback {
+            if (binding.viewPager.currentItem != 0) {
+                binding.viewPager.currentItem = binding.viewPager.currentItem - 1
+            }
         }
     }
 

app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerActivity.kt

@@ -1,3 +1,25 @@
+/**
+ * Teapod
+ *
+ * Copyright 2020-2022  <seil0@mosad.xyz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
 package org.mosad.teapod.ui.activity.player
 
 import android.animation.Animator
@@ -7,6 +29,7 @@ import android.app.PictureInPictureParams
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.Configuration
+import android.graphics.Rect
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
@@ -19,21 +42,20 @@ import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GestureDetectorCompat
 import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.ui.StyledPlayerControlView
+import com.google.android.exoplayer2.ui.StyledPlayerView
 import com.google.android.exoplayer2.util.Util
-import kotlinx.android.synthetic.main.activity_player.*
-import kotlinx.android.synthetic.main.player_controls.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.mosad.teapod.R
+import org.mosad.teapod.databinding.ActivityPlayerBinding
+import org.mosad.teapod.databinding.PlayerControlsBinding
+import org.mosad.teapod.parser.crunchyroll.NoneEpisode
 import org.mosad.teapod.preferences.Preferences
-import org.mosad.teapod.ui.components.EpisodesListPlayer
-import org.mosad.teapod.ui.components.LanguageSettingsPlayer
-import org.mosad.teapod.util.DataTypes
+import org.mosad.teapod.ui.activity.player.fragment.EpisodeListDialogFragment
+import org.mosad.teapod.ui.activity.player.fragment.LanguageSettingsDialogFragment
 import org.mosad.teapod.util.hideBars
 import org.mosad.teapod.util.isInPiPMode
 import org.mosad.teapod.util.navToLauncherTask
@@ -44,10 +66,12 @@ import kotlin.concurrent.scheduleAtFixedRate
 class PlayerActivity : AppCompatActivity() {
 
     private val model: PlayerViewModel by viewModels()
+    private lateinit var playerBinding: ActivityPlayerBinding
+    private lateinit var controlsBinding: PlayerControlsBinding
 
     private lateinit var controller: StyledPlayerControlView
     private lateinit var gestureDetector: GestureDetectorCompat
-    private lateinit var timerUpdates: TimerTask
+    private lateinit var controlsUpdates: TimerTask
 
     private var wasInPiP = false
     private var remainingTime: Long = 0
@@ -61,14 +85,17 @@ class PlayerActivity : AppCompatActivity() {
         setContentView(R.layout.activity_player)
         hideBars() // Initial hide the bars
 
-        model.loadMedia(
-            intent.getIntExtra(getString(R.string.intent_media_id), 0),
-            intent.getIntExtra(getString(R.string.intent_episode_id), 0)
+        playerBinding = ActivityPlayerBinding.bind(findViewById(R.id.player_root))
+        controlsBinding = PlayerControlsBinding.bind(findViewById(R.id.player_controls_root))
+
+        model.loadMediaAsync(
+            intent.getStringExtra(getString(R.string.intent_season_id)) ?: "",
+            intent.getStringExtra(getString(R.string.intent_episode_id)) ?: ""
         )
         model.currentEpisodeChangedListener.add { onMediaChanged() }
         gestureDetector = GestureDetectorCompat(this, PlayerGestureListener())
 
-        controller = video_view.findViewById(R.id.exo_controller)
+        controller = playerBinding.videoView.findViewById(R.id.exo_controller)
         controller.isAnimationEnabled = false // disable controls (time-bar) animation
 
         initExoPlayer() // call in onCreate, exoplayer lives in view model
@@ -85,7 +112,7 @@ class PlayerActivity : AppCompatActivity() {
         super.onStart()
         if (Util.SDK_INT > 23) {
             initPlayer()
-            video_view?.onResume()
+            playerBinding.videoView.onResume()
         }
     }
 
@@ -95,7 +122,7 @@ class PlayerActivity : AppCompatActivity() {
 
         if (Util.SDK_INT <= 23) {
             initPlayer()
-            video_view?.onResume()
+            playerBinding.videoView.onResume()
         }
     }
 
@@ -122,13 +149,13 @@ class PlayerActivity : AppCompatActivity() {
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
 
-        // when the intent changed, lead the new media and play it
+        // when the intent changed, load the new media and play it
         intent?.let {
-            model.loadMedia(
-                it.getIntExtra(getString(R.string.intent_media_id), 0),
-                it.getIntExtra(getString(R.string.intent_episode_id), 0)
+            model.loadMediaAsync(
+                it.getStringExtra(getString(R.string.intent_season_id)) ?: "",
+                it.getStringExtra(getString(R.string.intent_episode_id)) ?: ""
             )
-            model.playEpisode(model.currentEpisode, replace = true)
+            model.playCurrentMedia()
         }
     }
 
@@ -147,8 +174,15 @@ class PlayerActivity : AppCompatActivity() {
             } else {
                 val width = model.player.videoFormat?.width ?: 0
                 val height = model.player.videoFormat?.height ?: 0
+                val contentFrame: View = playerBinding.videoView.findViewById(R.id.exo_content_frame)
+                val contentRect = with(contentFrame) {
+                    val (x, y) = intArrayOf(0, 0).also(::getLocationInWindow)
+                    Rect(x, y, x + width, y + height)
+                }
+
                 val params = PictureInPictureParams.Builder()
                     .setAspectRatio(Rational(width, height))
+                    .setSourceRectHint(contentRect)
                     .build()
                 enterPictureInPictureMode(params)
             }
@@ -159,20 +193,19 @@ class PlayerActivity : AppCompatActivity() {
 
     override fun onPictureInPictureModeChanged(
         isInPictureInPictureMode: Boolean,
-        newConfig: Configuration?
+        newConfig: Configuration
     ) {
-        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
+        }
 
         // Hide the full-screen UI (controls, etc.) while in picture-in-picture mode.
-        video_view.useController = !isInPictureInPictureMode
+        playerBinding.videoView.useController = !isInPictureInPictureMode
+
+        // TODO also hide language settings/episodes list
     }
 
     private fun initPlayer() {
-        if (model.media.id < 0) {
-            Log.e(javaClass.name, "No media was set.")
-            this.finish()
-        }
-
         initVideoView()
         initTimeUpdates()
 
@@ -187,108 +220,130 @@ class PlayerActivity : AppCompatActivity() {
      * set play when ready and listeners
      */
     private fun initExoPlayer() {
-        model.player.addListener(object : Player.EventListener {
+        model.player.addListener(object : Player.Listener {
             override fun onPlaybackStateChanged(state: Int) {
                 super.onPlaybackStateChanged(state)
 
-                loading.visibility = when (state) {
+                playerBinding.loading.visibility = when (state) {
                     ExoPlayer.STATE_READY -> View.GONE
                     ExoPlayer.STATE_BUFFERING -> View.VISIBLE
                     else -> View.GONE
                 }
 
-                exo_play_pause.visibility = when (loading.visibility) {
-                    View.GONE -> View.VISIBLE
-                    View.VISIBLE -> View.INVISIBLE
-                    else -> View.VISIBLE
+                // don't use isVisible to hide exoPlayPause, as it will set the visibility to GONE
+                controlsBinding.exoPlayPause.visibility = when(playerBinding.loading.isVisible) {
+                    true -> View.INVISIBLE
+                    false -> View.VISIBLE
                 }
 
-                if (state == ExoPlayer.STATE_ENDED && model.nextEpisode != null && Preferences.autoplay) {
+                if (state == ExoPlayer.STATE_ENDED && hasNextEpisode() && Preferences.autoplay) {
                     playNextEpisode()
                 }
             }
         })
 
+        // revert back to the old behaviour (blocking init) in case there are any issues with async init
         // start playing the current episode, after all needed player components have been initialized
-        model.playEpisode(model.currentEpisode, true)
+        //model.playCurrentMedia(model.currentPlayhead)
     }
 
     @SuppressLint("ClickableViewAccessibility")
     private fun initVideoView() {
-        video_view.player = model.player
+        playerBinding.videoView.player = model.player
 
         // when the player controls get hidden, hide the bars too
-        video_view.setControllerVisibilityListener {
+        playerBinding.videoView.setControllerVisibilityListener(StyledPlayerView.ControllerVisibilityListener {
             when (it) {
-                View.GONE -> hideBars()
+                View.GONE -> {
+                    hideBars()
+                    // TODO also hide the skip op button
+                }
                 View.VISIBLE -> updateControls()
             }
-        }
+        })
 
-        video_view.setOnTouchListener { _, event ->
+        playerBinding.videoView.setOnTouchListener { _, event ->
             gestureDetector.onTouchEvent(event)
             true
         }
     }
 
     private fun initActions() {
-        exo_close_player.setOnClickListener {
+        controlsBinding.exoClosePlayer.setOnClickListener {
             this.finish()
         }
-        rwd_10.setOnButtonClickListener { rewind() }
-        ffwd_10.setOnButtonClickListener { fastForward() }
-        button_next_ep.setOnClickListener { playNextEpisode() }
-        button_language.setOnClickListener { showLanguageSettings() }
-        button_episodes.setOnClickListener { showEpisodesList() }
-        button_next_ep_c.setOnClickListener { playNextEpisode() }
+        controlsBinding.rwd10.setOnButtonClickListener { rewind() }
+        controlsBinding.ffwd10.setOnButtonClickListener { fastForward() }
+        playerBinding.buttonNextEp.setOnClickListener { playNextEpisode() }
+        playerBinding.buttonSkipOp.setOnClickListener { skipOpening() }
+        controlsBinding.buttonLanguage.setOnClickListener { showLanguageSettings() }
+        controlsBinding.buttonEpisodes.setOnClickListener { showEpisodesList() }
+        controlsBinding.buttonNextEpC.setOnClickListener { playNextEpisode() }
     }
 
     private fun initGUI() {
-        if (model.media.type == DataTypes.MediaType.MOVIE) {
-            button_episodes.visibility = View.GONE
-        }
+        // TODO reimplement for cr
+//        if (model.media.type == DataTypes.MediaType.MOVIE) {
+//            button_episodes.visibility = View.GONE
+//        }
     }
 
     private fun initTimeUpdates() {
-        if (this::timerUpdates.isInitialized) {
-            timerUpdates.cancel()
+        if (this::controlsUpdates.isInitialized) {
+            controlsUpdates.cancel()
         }
 
-        timerUpdates = Timer().scheduleAtFixedRate(0, 500) {
-            GlobalScope.launch {
-                var btnNextEpIsVisible: Boolean
-                var controlsVisible: Boolean
+        controlsUpdates = Timer().scheduleAtFixedRate(0, 500) {
+            lifecycleScope.launch {
+                val currentPosition = model.player.currentPosition
+                val btnNextEpIsVisible = playerBinding.buttonNextEp.isVisible
+                val controlsVisible = controller.isVisible
 
-                withContext(Dispatchers.Main) {
-                    if (model.player.duration > 0) {
-                        remainingTime = model.player.duration - model.player.currentPosition
-                        remainingTime = if (remainingTime < 0) 0 else remainingTime
-                    }
-                    btnNextEpIsVisible = button_next_ep.isVisible
-                    controlsVisible = controller.isVisible
+                // make sure remaining time is > 0
+                if (model.player.duration > 0) {
+                    remainingTime = model.player.duration - currentPosition
+                    remainingTime = if (remainingTime < 0) 0 else remainingTime
+                } else {
+                    remainingTime = 0
                 }
 
-                if (remainingTime in 1..20000) {
-                    // if the next ep button is not visible, make it visible. Don't show in pip mode
-                    if (!btnNextEpIsVisible && model.nextEpisode != null && Preferences.autoplay && !isInPiPMode()) {
-                        withContext(Dispatchers.Main) { showButtonNextEp() }
+                // TODO add metaDB ending_start support
+                // if remaining time > 1 and < 20 sec, a next ep is set, autoplay is enabled
+                // and not in pip: show next ep button
+                if (remainingTime in 1000..20000) {
+                    if (!btnNextEpIsVisible && hasNextEpisode() && Preferences.autoplay && !isInPiPMode()) {
+                        showButtonNextEp()
                     }
                 } else if (btnNextEpIsVisible) {
-                    withContext(Dispatchers.Main) { hideButtonNextEp() }
+                    hideButtonNextEp()
+                }
+
+                // into metadata is present and we can show the skip button
+                if (model.currentIntroMetadata.duration >= 10) {
+                    val startTime = model.currentIntroMetadata.startTime.toInt() * 1000
+                    if (currentPosition in startTime..(startTime + 10000) && !playerBinding.buttonSkipOp.isVisible) {
+                        showButtonSkipOp()
+                    } else if (playerBinding.buttonSkipOp.isVisible &&
+                        currentPosition !in startTime..(startTime + 10000)
+                    ) {
+                        // the button should only be visible if currentEpisodeMeta != null
+                        hideButtonSkipOp()
+                    }
+
                 }
 
                 // if controls are visible, update them
                 if (controlsVisible) {
-                    withContext(Dispatchers.Main) { updateControls() }
+                    updateControls()
                 }
             }
         }
     }
 
     private fun onPauseOnStop() {
-        video_view?.onPause()
+        playerBinding.videoView.onPause()
         model.player.pause()
-        timerUpdates.cancel()
+        controlsUpdates.cancel()
     }
 
     /**
@@ -301,7 +356,7 @@ class PlayerActivity : AppCompatActivity() {
         val seconds = TimeUnit.MILLISECONDS.toSeconds(remainingTime) % 60
 
         // if remaining time is below 60 minutes, don't show hours
-        exo_remaining.text = if (TimeUnit.MILLISECONDS.toMinutes(remainingTime) < 60) {
+        controlsBinding.exoRemaining.text = if (TimeUnit.MILLISECONDS.toMinutes(remainingTime) < 60) {
             getString(R.string.time_min_sec, minutes, seconds)
         } else {
             getString(R.string.time_hour_min_sec, hours, minutes, seconds)
@@ -309,24 +364,29 @@ class PlayerActivity : AppCompatActivity() {
     }
 
     /**
-     * update title text and next ep button visibility, set ignoreNextStateEnded
+     * This methode is called, if the current episode has changed.
+     * Update title text and next ep button visibility.
+     * If the currentEpisode changed to NoneEpisode, exit the activity.
      */
     private fun onMediaChanged() {
-        exo_text_title.text = model.getMediaTitle()
-
-        // hide the next ep button, if there is none
-        button_next_ep_c.visibility = if (model.nextEpisode == null) {
-            View.GONE
-        } else {
-            View.VISIBLE
+        if (model.currentEpisode == NoneEpisode) {
+            Log.e(javaClass.name, "No media was set.")
+            this.finish()
         }
 
-        // hide the episodes button, if the media type changed
-        button_episodes.visibility = if (model.media.type == DataTypes.MediaType.MOVIE) {
-            View.GONE
-        } else {
-            View.VISIBLE
-        }
+        controlsBinding.exoTextTitle.text = model.getMediaTitle()
+
+        // hide the next episode button, if there is none
+        controlsBinding.buttonNextEpC.isVisible = hasNextEpisode()
+    }
+
+    /**
+     * Check if the current episode has a next episode.
+     *
+     * @return Boolean: true if there is a next episode, else false.
+     */
+    private fun hasNextEpisode(): Boolean {
+        return (model.currentEpisode.nextEpisodeId != null && !model.currentEpisodeIsLastEpisode())
     }
 
     /**
@@ -337,41 +397,58 @@ class PlayerActivity : AppCompatActivity() {
         model.seekToOffset(rwdTime)
 
         // hide/show needed components
-        exo_double_tap_indicator.visibility = View.VISIBLE
-        ffwd_10_indicator.visibility = View.INVISIBLE
-        rwd_10.visibility = View.INVISIBLE
+        playerBinding.exoDoubleTapIndicator.visibility = View.VISIBLE
+        playerBinding.ffwd10Indicator.visibility = View.INVISIBLE
+        controlsBinding.rwd10.visibility = View.INVISIBLE
 
-        rwd_10_indicator.onAnimationEndCallback = {
-            exo_double_tap_indicator.visibility = View.GONE
-            ffwd_10_indicator.visibility = View.VISIBLE
-            rwd_10.visibility = View.VISIBLE
+        playerBinding.rwd10Indicator.onAnimationEndCallback = {
+            playerBinding.exoDoubleTapIndicator.visibility = View.GONE
+            playerBinding.ffwd10Indicator.visibility = View.VISIBLE
+            controlsBinding.rwd10.visibility = View.VISIBLE
         }
 
         // run animation
-        rwd_10_indicator.runOnClickAnimation()
+        playerBinding.rwd10Indicator.runOnClickAnimation()
     }
 
     private fun fastForward() {
         model.seekToOffset(fwdTime)
 
         // hide/show needed components
-        exo_double_tap_indicator.visibility = View.VISIBLE
-        rwd_10_indicator.visibility = View.INVISIBLE
-        ffwd_10.visibility = View.INVISIBLE
+        playerBinding.exoDoubleTapIndicator.visibility = View.VISIBLE
+        playerBinding.rwd10Indicator.visibility = View.INVISIBLE
+        controlsBinding.ffwd10.visibility = View.INVISIBLE
 
-        ffwd_10_indicator.onAnimationEndCallback = {
-            exo_double_tap_indicator.visibility = View.GONE
-            rwd_10_indicator.visibility = View.VISIBLE
-            ffwd_10.visibility = View.VISIBLE
+        playerBinding.ffwd10Indicator.onAnimationEndCallback = {
+            playerBinding.exoDoubleTapIndicator.visibility = View.GONE
+            playerBinding.rwd10Indicator.visibility = View.VISIBLE
+            controlsBinding.ffwd10.visibility = View.VISIBLE
         }
 
         // run animation
-        ffwd_10_indicator.runOnClickAnimation()
+        playerBinding.ffwd10Indicator.runOnClickAnimation()
     }
 
     private fun playNextEpisode() {
-        model.playNextEpisode()
+        // disable the next episode buttons, so a user can't double click it
+        playerBinding.buttonNextEp.isClickable = false
+        controlsBinding.buttonNextEpC.isClickable = false
+
         hideButtonNextEp()
+        model.playNextEpisode()
+
+        // enable the next episode buttons when playNextEpisode() has returned
+        playerBinding.buttonNextEp.isClickable = true
+        controlsBinding.buttonNextEpC.isClickable = true
+    }
+
+    private fun skipOpening() {
+        // calculate the seek time
+        if (model.currentIntroMetadata.duration > 10) {
+            val endTime = model.currentIntroMetadata.endTime.toInt() * 1000
+            val seekTime = endTime - model.player.currentPosition
+            model.seekToOffset(seekTime)
+        }
     }
 
     /**
@@ -379,10 +456,10 @@ class PlayerActivity : AppCompatActivity() {
      * TODO improve the show animation
      */
     private fun showButtonNextEp() {
-        button_next_ep.visibility = View.VISIBLE
-        button_next_ep.alpha = 0.0f
+        playerBinding.buttonNextEp.isVisible = true
+        playerBinding.buttonNextEp.alpha = 0.0f
 
-        button_next_ep.animate()
+        playerBinding.buttonNextEp.animate()
             .alpha(1.0f)
             .setListener(null)
     }
@@ -392,31 +469,45 @@ class PlayerActivity : AppCompatActivity() {
      * TODO improve the hide animation
      */
     private fun hideButtonNextEp() {
-        button_next_ep.animate()
+        playerBinding.buttonNextEp.animate()
             .alpha(0.0f)
             .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator?) {
+                override fun onAnimationEnd(animation: Animator) {
                     super.onAnimationEnd(animation)
-                    button_next_ep.visibility = View.GONE
+                    playerBinding.buttonNextEp.isVisible = false
+                }
+            })
+    }
+
+    private fun showButtonSkipOp() {
+        playerBinding.buttonSkipOp.isVisible = true
+        playerBinding.buttonSkipOp.alpha = 0.0f
+
+        playerBinding.buttonSkipOp.animate()
+            .alpha(1.0f)
+            .setListener(null)
+    }
+
+    private fun hideButtonSkipOp() {
+        playerBinding.buttonSkipOp.animate()
+            .alpha(0.0f)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    super.onAnimationEnd(animation)
+                    playerBinding.buttonSkipOp.isVisible = false
                 }
             })
 
     }
 
     private fun showEpisodesList() {
-        val episodesList = EpisodesListPlayer(this, model = model).apply {
-            onViewRemovedAction = { model.player.play() }
-        }
-        player_layout.addView(episodesList)
         pauseAndHideControls()
+        EpisodeListDialogFragment().show(supportFragmentManager, EpisodeListDialogFragment.TAG)
     }
 
     private fun showLanguageSettings() {
-        val languageSettings = LanguageSettingsPlayer(this, model = model).apply {
-            onViewRemovedAction = { model.player.play() }
-        }
-        player_layout.addView(languageSettings)
         pauseAndHideControls()
+        LanguageSettingsDialogFragment().show(supportFragmentManager, LanguageSettingsDialogFragment.TAG)
     }
 
     /**
@@ -433,9 +524,9 @@ class PlayerActivity : AppCompatActivity() {
         /**
          * on single tap hide or show the controls
          */
-        override fun onSingleTapConfirmed(e: MotionEvent?): Boolean {
+        override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
             if (!isInPiPMode()) {
-                if (controller.isVisible) controller.hide() else  controller.show()
+                if (controller.isVisible) controller.hide() else controller.show()
             }
 
             return true
@@ -444,9 +535,9 @@ class PlayerActivity : AppCompatActivity() {
         /**
          * on double tap rewind or forward
          */
-        override fun onDoubleTap(e: MotionEvent?): Boolean {
-            val eventPosX = e?.x?.toInt() ?: 0
-            val viewCenterX = video_view.measuredWidth / 2
+        override fun onDoubleTap(e: MotionEvent): Boolean {
+            val eventPosX = e.x.toInt()
+            val viewCenterX = playerBinding.videoView.measuredWidth / 2
 
             // if the event position is on the left side rewind, if it's on the right forward
             if (eventPosX < viewCenterX) rewind() else fastForward()
@@ -457,14 +548,14 @@ class PlayerActivity : AppCompatActivity() {
         /**
          * not used
          */
-        override fun onDoubleTapEvent(e: MotionEvent?): Boolean {
+        override fun onDoubleTapEvent(e: MotionEvent): Boolean {
             return true
         }
 
         /**
          * on long press toggle pause/play
          */
-        override fun onLongPress(e: MotionEvent?) {
+        override fun onLongPress(e: MotionEvent) {
             model.togglePausePlay()
         }
 

app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerViewModel.kt

@@ -1,25 +1,48 @@
+/**
+ * Teapod
+ *
+ * Copyright 2020-2022  <seil0@mosad.xyz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
 package org.mosad.teapod.ui.activity.player
 
 import android.app.Application
 import android.net.Uri
+import android.support.v4.media.session.MediaSessionCompat
 import android.util.Log
 import androidx.lifecycle.AndroidViewModel
-import com.google.android.exoplayer2.C
+import androidx.lifecycle.viewModelScope
+import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
-import com.google.android.exoplayer2.SimpleExoPlayer
-import com.google.android.exoplayer2.source.MediaSource
-import com.google.android.exoplayer2.source.hls.HlsMediaSource
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
-import com.google.android.exoplayer2.util.Util
-import kotlinx.coroutines.runBlocking
+import com.google.android.exoplayer2.Player
+import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
+import kotlinx.coroutines.*
 import org.mosad.teapod.R
-import org.mosad.teapod.parser.AoDParser
+import org.mosad.teapod.parser.crunchyroll.*
 import org.mosad.teapod.preferences.Preferences
-import org.mosad.teapod.util.DataTypes
-import org.mosad.teapod.util.Episode
-import org.mosad.teapod.util.Media
+import org.mosad.teapod.util.metadb.EpisodeMeta
+import org.mosad.teapod.util.metadb.Meta
+import org.mosad.teapod.util.metadb.MetaDBController
+import org.mosad.teapod.util.metadb.TVShowMeta
+import org.mosad.teapod.util.toPlayheadsMap
 import java.util.*
-import kotlin.collections.ArrayList
+import kotlin.concurrent.scheduleAtFixedRate
 
 /**
  * PlayerViewModel handles all stuff related to media/episodes.
@@ -27,51 +50,137 @@ import kotlin.collections.ArrayList
  * the next episode will be update and the callback is handled.
  */
 class PlayerViewModel(application: Application) : AndroidViewModel(application) {
+    private val classTag = javaClass.name
 
-    val player = SimpleExoPlayer.Builder(application).build()
-    val dataSourceFactory = DefaultDataSourceFactory(application, Util.getUserAgent(application, "Teapod"))
+    val player = ExoPlayer.Builder(application).build()
+    private val mediaSession = MediaSessionCompat(application, "TEAPOD_PLAYER_SESSION")
+    private val playheadAutoUpdate: TimerTask
 
     val currentEpisodeChangedListener = ArrayList<() -> Unit>()
-    val preferredLanguage = if (Preferences.preferSecondary) Locale.JAPANESE else Locale.GERMAN
+    private var currentPlayhead: Long = 0
 
-    var media: Media = Media(-1, "", DataTypes.MediaType.OTHER)
+    // tmdb/meta data
+    var mediaMeta: Meta? = null
         internal set
-    var currentEpisode = Episode()
+    var currentEpisodeMeta: EpisodeMeta? = null
         internal set
-    var nextEpisode: Episode? = null
+    var currentPlayheads = mapOf<String, PlayheadObject>()
         internal set
-    var currentLanguage: Locale = Locale.ROOT
+    var currentIntroMetadata: DatalabIntro = NoneDatalabIntro
         internal set
+//    var tmdbTVSeason: TMDBTVSeason? =null
+//        internal set
+
+    // crunchyroll episodes/playback
+    var episodes = NoneEpisodes
+        internal set
+    var currentEpisode = NoneEpisode
+        internal set
+    var currentVersion = NoneVersion
+        internal set
+    var currentStreams = NoneStreams
+        internal set
+
+    // current playback settings
+    var currentAudioLocale: Locale = Preferences.preferredAudioLocale
+        internal set
+    var currentSubtitleLocale: Locale = Preferences.preferredSubtitleLocale
+        internal set
+
+    init {
+        // disable platform diagnostics since they might be shared with google
+        ExoPlayer.Builder(application).setUsePlatformDiagnostics(false)
+
+        initMediaSession()
+
+        player.addListener(object : Player.Listener {
+            override fun onPlaybackStateChanged(state: Int) {
+                super.onPlaybackStateChanged(state)
+
+                if (state == ExoPlayer.STATE_ENDED) updatePlayhead()
+            }
+
+            override fun onIsPlayingChanged(isPlaying: Boolean) {
+                super.onIsPlayingChanged(isPlaying)
+
+                if (!isPlaying) updatePlayhead()
+            }
+        })
+
+        playheadAutoUpdate = Timer().scheduleAtFixedRate(0, 30000) {
+            viewModelScope.launch {
+                if (player.isPlaying){
+                    updatePlayhead()
+                }
+            }
+        }
+    }
 
     override fun onCleared() {
         super.onCleared()
+
+        mediaSession.release()
         player.release()
 
-        Log.d(javaClass.name, "Released player")
+        Log.d(classTag, "Released player")
     }
 
-    fun loadMedia(mediaId: Int, episodeId: Int) {
-        runBlocking {
-            media = AoDParser.getMediaById(mediaId)
+    /**
+     * set the media session to active
+     * create a media session connector to set title and description
+     */
+    private fun initMediaSession() {
+        val mediaSessionConnector = MediaSessionConnector(mediaSession)
+        mediaSessionConnector.setPlayer(player)
+
+        mediaSession.isActive = true
+    }
+
+    fun loadMediaAsync(seasonId: String, episodeId: String) = viewModelScope.launch {
+        episodes = Crunchyroll.episodes(seasonId)
+
+        listOf(
+            viewModelScope.launch { mediaMeta = loadMediaMeta(episodes.data.first().seriesId) },
+            viewModelScope.launch {
+                val episodeIDs = episodes.data.map { it.id }
+                currentPlayheads = Crunchyroll.playheads(episodeIDs).toPlayheadsMap()
+            }
+        ).joinAll()
+        Log.d(classTag, "meta: $mediaMeta")
+
+        setCurrentEpisode(episodeId)
+        playCurrentMedia(currentPlayhead)
+    }
+
+    fun setLanguage(newAudioLocale: Locale, newSubtitleLocale: Locale) {
+        // TODO if the audio locale has changes update the streams, if only the subtitle locale has changed load the new stream
+        if (newAudioLocale != currentAudioLocale) {
+            currentAudioLocale = newAudioLocale
+
+            currentVersion = currentEpisode.versions?.firstOrNull {
+                it.audioLocale == currentAudioLocale.toLanguageTag()
+            } ?: currentEpisode.versions?.first() ?: NoneVersion
+
+            viewModelScope.launch {
+                currentStreams = Crunchyroll.streamsFromMediaGUID(currentVersion.mediaGUID)
+                Log.d(classTag, currentVersion.toString())
+
+                playCurrentMedia(player.currentPosition)
+            }
+        } else if (newSubtitleLocale != currentSubtitleLocale) {
+            currentSubtitleLocale = newSubtitleLocale
+            playCurrentMedia(player.currentPosition)
         }
 
-        currentEpisode = media.getEpisodeById(episodeId)
-        nextEpisode = selectNextEpisode()
-        currentLanguage = currentEpisode.getPreferredStream(preferredLanguage).language
-    }
-
-    fun setLanguage(language: Locale) {
-        currentLanguage = language
-
-        val seekTime = player.currentPosition
-        val mediaSource = HlsMediaSource.Factory(dataSourceFactory).createMediaSource(
-            MediaItem.fromUri(Uri.parse(currentEpisode.getPreferredStream(language).url))
-        )
-        playMedia(mediaSource, true, seekTime)
+        // else nothing has changed so no need do do anything
     }
 
     // player actions
 
+    /**
+     * Seeks to a offset position specified in milliseconds in the current MediaItem.
+     * @param offset The offset position in the current MediaItem.
+     */
     fun seekToOffset(offset: Long) {
         player.seekTo(player.currentPosition + offset)
     }
@@ -81,51 +190,117 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
     }
 
     /**
-     * play the next episode, if nextEpisode is not null
+     * play the next episode, if nextEpisodeId is not null
      */
-    fun playNextEpisode() = nextEpisode?.let { it ->
-        playEpisode(it, replace = true)
+    fun playNextEpisode() = currentEpisode.nextEpisodeId?.let { nextEpisodeId ->
+        updatePlayhead() // update playhead before switching to new episode
+        viewModelScope.launch { setCurrentEpisode(nextEpisodeId, startPlayback = true) }
     }
 
     /**
-     * set currentEpisode to the param episode and start playing it
-     * update nextEpisode to reflect the change
-     *
-     * updateWatchedState for the next (now current) episode
+     * Set currentEpisodeCr to the episode of the given ID
+     * @param episodeId The ID of the episode you want to set currentEpisodeCr to
      */
-    fun playEpisode(episode: Episode, replace: Boolean = false, seekPosition: Long = 0) {
-        val preferredStream = episode.getPreferredStream(currentLanguage)
-        currentLanguage = preferredStream.language // update current language, since it may have changed
-        currentEpisode = episode
-        nextEpisode = selectNextEpisode()
-        currentEpisodeChangedListener.forEach { it() } // update player gui (title)
+    suspend fun setCurrentEpisode(episodeId: String, startPlayback: Boolean = false) {
+        currentEpisode = episodes.data.find { episode ->
+            episode.id == episodeId
+        } ?: NoneEpisode
 
-        val mediaSource = HlsMediaSource.Factory(dataSourceFactory).createMediaSource(
-            MediaItem.fromUri(Uri.parse(preferredStream.url))
+        // TODO improve handling of none present seasons/episodes
+        // update current episode meta
+        currentEpisodeMeta = if (mediaMeta is TVShowMeta && currentEpisode.episodeNumber != null) {
+            (mediaMeta as TVShowMeta)
+                .seasons.getOrNull(currentEpisode.seasonNumber - 1)
+                ?.episodes?.getOrNull(currentEpisode.episodeNumber!! - 1)
+        } else {
+            null
+        }
+
+        // update player gui (title, next ep button) after currentEpisode has changed
+        currentEpisodeChangedListener.forEach { it() }
+
+        // needs to be blocking, currentPlayback must be present when calling playCurrentMedia()
+        joinAll(
+            viewModelScope.launch(Dispatchers.IO) {
+                currentVersion = currentEpisode.versions?.firstOrNull {
+                    it.audioLocale == currentAudioLocale.toLanguageTag()
+                } ?: currentEpisode.versions?.first() ?: NoneVersion
+
+                // get the current streams object, if no version is set, use streamsLink
+                currentStreams = if (currentVersion != NoneVersion) {
+                    Crunchyroll.streamsFromMediaGUID(currentVersion.mediaGUID)
+                } else {
+                    Crunchyroll.streams(currentEpisode.streamsLink)
+                }
+                Log.d(classTag, currentVersion.toString())
+            },
+            viewModelScope.launch(Dispatchers.IO) {
+                Crunchyroll.playheads(listOf(currentEpisode.id)).data.firstOrNull {
+                    it.contentId == currentEpisode.id
+                }?.let {
+                    // if the episode was fully watched, start at the beginning
+                    currentPlayhead = if (it.fullyWatched) {
+                        0
+                    } else {
+                        (it.playhead.times(1000)).toLong()
+                    }
+                }
+            },
+            viewModelScope.launch(Dispatchers.IO) {
+                currentIntroMetadata = Crunchyroll.datalabIntro(currentEpisode.id)
+            }
         )
-        playMedia(mediaSource, replace, seekPosition)
+        Log.d(classTag, "streams: ${currentEpisode.streamsLink}")
 
-        // if episodes has not been watched, mark as watched
-        if (!episode.watched) {
-            AoDParser.markAsWatched(media.id, episode.id)
+        if (startPlayback) {
+            playCurrentMedia()
         }
     }
 
-    fun playMedia(source: MediaSource, replace: Boolean = false, seekPosition: Long = 0) {
-        if (replace || player.contentDuration == C.TIME_UNSET) {
-            player.setMediaSource(source)
-            player.prepare()
-            if (seekPosition > 0) player.seekTo(seekPosition)
-            player.playWhenReady = true
+    /**
+     * Play the current media from currentStreams.
+     *
+     * @param seekPosition The seek position for the media (default = 0).
+     */
+    fun playCurrentMedia(seekPosition: Long = 0) {
+        // get preferred stream url, set current language if it differs from the preferred one
+        val preferredLocale = currentSubtitleLocale
+        val fallbackLocal = Locale.US
+        val url = when {
+            currentStreams.data[0].adaptive_hls.containsKey(preferredLocale.toLanguageTag()) -> {
+                currentStreams.data[0].adaptive_hls[preferredLocale.toLanguageTag()]?.url
+            }
+            currentStreams.data[0].adaptive_hls.containsKey(fallbackLocal.toLanguageTag()) -> {
+                currentSubtitleLocale = fallbackLocal
+                currentStreams.data[0].adaptive_hls[fallbackLocal.toLanguageTag()]?.url
+            }
+            else -> {
+                // if no language tag is present use the first entry
+                currentSubtitleLocale = Locale.ROOT
+                currentStreams.data[0].adaptive_hls.entries.first().value.url
+            }
         }
+        Log.i(classTag, "stream url: $url")
+
+        // create the media item
+        val mediaItem = MediaItem.fromUri(Uri.parse(url))
+        player.setMediaItem(mediaItem)
+        player.prepare()
+
+        if (seekPosition > 0) player.seekTo(seekPosition)
+        player.playWhenReady = true
     }
 
+    /**
+     * Returns the current episode title (with episode number, if it's a tv show)
+     */
     fun getMediaTitle(): String {
-        return if (media.type == DataTypes.MediaType.TVSHOW) {
+        // currentEpisode.episodeNumber defines the media type (tv show = none null, movie = null)
+        return if (currentEpisode.episodeNumber != null) {
             getApplication<Application>().getString(
                 R.string.component_episode_title,
-                currentEpisode.number,
-                currentEpisode.description
+                currentEpisode.episode,
+                currentEpisode.title
             )
         } else {
             currentEpisode.title
@@ -133,16 +308,34 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
     }
 
     /**
-     * Based on the current episodeId, get the next episode. If there is no next
-     * episode, return null
+     * Check if the current episode is the last in the episodes list.
+     *
+     * @return Boolean: true if it is the last, else false.
      */
-    private fun selectNextEpisode(): Episode? {
-        val nextEpIndex = media.episodes.indexOfFirst { it.id == currentEpisode.id } + 1
-        return if (nextEpIndex < media.episodes.size) {
-            media.episodes[nextEpIndex]
-        } else {
-            null
+    fun currentEpisodeIsLastEpisode(): Boolean {
+        return episodes.data.lastOrNull()?.id == currentEpisode.id
+    }
+
+    private suspend fun loadMediaMeta(crSeriesId: String): Meta? {
+        return MetaDBController.getTVShowMetadata(crSeriesId)
+    }
+
+    /**
+     * Update the playhead of the current episode, if currentPosition > 1000ms.
+     */
+    private fun updatePlayhead() {
+        val playhead = (player.currentPosition / 1000)
+
+        if (playhead > 0 && Preferences.updatePlayhead) {
+            // don't use viewModelScope here. This task may needs to finish, when ViewModel will be cleared
+            CoroutineScope(Dispatchers.IO).launch { Crunchyroll.postPlayheads(currentEpisode.id, playhead.toInt()) }
+            Log.i(javaClass.name, "Set playhead for episode ${currentEpisode.id} to $playhead sec.")
+        }
+
+        viewModelScope.launch {
+            val episodeIDs = episodes.data.map { it.id }
+            currentPlayheads = Crunchyroll.playheads(episodeIDs).toPlayheadsMap()
         }
     }
 
-}
+}

app/src/main/java/org/mosad/teapod/ui/activity/player/fragment/EpisodeListDialogFragment.kt

@@ -0,0 +1,72 @@
+package org.mosad.teapod.ui.activity.player.fragment
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.ViewModelProvider
+import kotlinx.coroutines.runBlocking
+import org.mosad.teapod.R
+import org.mosad.teapod.databinding.PlayerEpisodesListBinding
+import org.mosad.teapod.ui.activity.player.PlayerViewModel
+import org.mosad.teapod.util.adapter.EpisodeItemAdapter
+import org.mosad.teapod.util.hideBars
+
+class EpisodeListDialogFragment : DialogFragment()  {
+
+    private lateinit var model: PlayerViewModel
+    private lateinit var binding: PlayerEpisodesListBinding
+
+    companion object {
+        const val TAG = "LanguageSettingsDialogFragment"
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, R.style.FullScreenDialogStyle)
+        model = ViewModelProvider(requireActivity())[PlayerViewModel::class.java]
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        binding = PlayerEpisodesListBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.buttonCloseEpisodesList.setOnClickListener {
+            dismiss()
+        }
+
+        val adapterRecEpisodes = EpisodeItemAdapter(
+            model.episodes.data,
+            null,
+            model.currentPlayheads,
+            EpisodeItemAdapter.OnClickListener { episode ->
+                dismiss()
+                // TODO make this none blocking, if necessary?
+                runBlocking {
+                    model.setCurrentEpisode(episode.id, startPlayback = true)
+                }
+            },
+            EpisodeItemAdapter.ViewType.PLAYER
+        )
+
+        // get the position/index of the currently playing episode
+        adapterRecEpisodes.currentSelected = model.episodes.data.indexOfFirst { it.id == model.currentEpisode.id }
+
+        binding.recyclerEpisodesPlayer.adapter = adapterRecEpisodes
+        binding.recyclerEpisodesPlayer.scrollToPosition(adapterRecEpisodes.currentSelected)
+
+        // initially hide the status and navigation bar
+        hideBars(requireDialog().window, binding.root)
+    }
+
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
+        model.player.play()
+    }
+}

app/src/main/java/org/mosad/teapod/ui/activity/player/fragment/LanguageSettingsDialogFragment.kt

@@ -0,0 +1,152 @@
+package org.mosad.teapod.ui.activity.player.fragment
+
+import android.content.DialogInterface
+import android.graphics.Color
+import android.graphics.Typeface
+import android.os.Bundle
+import android.util.TypedValue
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.view.children
+import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.ViewModelProvider
+import org.mosad.teapod.R
+import org.mosad.teapod.databinding.PlayerLanguageSettingsBinding
+import org.mosad.teapod.ui.activity.player.PlayerViewModel
+import org.mosad.teapod.util.hideBars
+import java.util.*
+
+class LanguageSettingsDialogFragment : DialogFragment() {
+
+    private lateinit var model: PlayerViewModel
+    private lateinit var binding: PlayerLanguageSettingsBinding
+
+    private var selectedSubtitleLocale = Locale.ROOT
+    private var selectedAudioLocale = Locale.ROOT
+
+    companion object {
+        const val TAG = "LanguageSettingsDialogFragment"
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, R.style.FullScreenDialogStyle)
+        model = ViewModelProvider(requireActivity())[PlayerViewModel::class.java]
+        selectedSubtitleLocale = model.currentSubtitleLocale
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        binding = PlayerLanguageSettingsBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        var selectedSubtitleView: TextView? = null
+        model.currentStreams.data[0].adaptive_hls.keys.forEach { languageTag ->
+            val locale = Locale.forLanguageTag(languageTag)
+            val subtitleView = addLanguage(binding.linearSubtitleLanguages, locale) { v ->
+                selectedSubtitleLocale = locale
+                updateSelectedLanguage(binding.linearSubtitleLanguages, v as TextView)
+            }
+
+            // if the view is the currently selected one, highlight it
+            if (locale == model.currentSubtitleLocale) {
+                selectedSubtitleView = subtitleView
+                updateSelectedLanguage(binding.linearSubtitleLanguages, subtitleView)
+            }
+        }
+
+        val currentAudioLocal = Locale.forLanguageTag(model.currentVersion.audioLocale)
+        var selectedAudioView: TextView? = null
+        model.currentEpisode.versions?.forEach { version ->
+            val locale = Locale.forLanguageTag(version.audioLocale)
+            val audioView = addLanguage(binding.linearAudioLanguages, locale) { v ->
+                selectedAudioLocale = locale
+                updateSelectedLanguage(binding.linearAudioLanguages, v as TextView)
+            }
+
+            // if the view is the currently selected one, highlight it
+            if (locale == currentAudioLocal) {
+                selectedAudioView = audioView
+                updateSelectedLanguage(binding.linearAudioLanguages, audioView)
+            }
+        }
+
+        binding.buttonCloseLanguageSettings.setOnClickListener { dismiss() }
+        binding.buttonCancel.setOnClickListener { dismiss() }
+        binding.buttonSelect.setOnClickListener {
+            model.setLanguage(selectedAudioLocale, selectedSubtitleLocale)
+            dismiss()
+        }
+
+        // initially hide the status and navigation bar
+        hideBars(requireDialog().window, binding.root)
+
+        // scroll to the position of the view, if it's the selected language
+        binding.scrollSubtitleLanguages.post {
+            binding.scrollSubtitleLanguages.scrollTo(0, selectedSubtitleView?.top ?: 0)
+        }
+
+        binding.scrollAudioLanguages.post {
+            binding.scrollSubtitleLanguages.scrollTo(0, selectedAudioView?.top ?: 0)
+        }
+    }
+
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
+        model.player.play()
+    }
+
+    private fun addLanguage(linear: LinearLayout, locale: Locale, onClick: View.OnClickListener): TextView {
+        val text = TextView(context).apply {
+            height = 96
+            gravity = Gravity.CENTER_VERTICAL
+            text = if (locale == Locale.ROOT) context.getString(R.string.no_subtitles) else locale.displayLanguage
+            setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f)
+            setTextColor(context.resources.getColor(R.color.player_text, context.theme))
+            setPadding(75, 0, 0, 0)
+
+            setOnClickListener(onClick)
+        }
+
+        linear.addView(text)
+
+        return text
+    }
+
+    /**
+     * Highlights the selected audio/subtitle language
+     *
+     * @param languageLayout The audio/subtitle Layout to update
+     * @param selected The newly selected language TextView
+     */
+    private fun updateSelectedLanguage(languageLayout: LinearLayout, selected: TextView) {
+        // rest all tf to not selected style
+        languageLayout.children.forEach { child ->
+            if (child is TextView) {
+                child.apply {
+                    setTextColor(context.resources.getColor(R.color.player_text, context.theme))
+                    setTypeface(null, Typeface.NORMAL)
+                    setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
+                    setPadding(75, 0, 0, 0)
+                }
+            }
+        }
+
+        // set selected to selected style
+        selected.apply {
+            setTextColor(context.resources.getColor(R.color.player_white, context.theme))
+            setTypeface(null, Typeface.BOLD)
+            setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_baseline_check_24, 0, 0, 0)
+            setPadding(0, 0, 0, 0)
+            compoundDrawablesRelative.getOrNull(0)?.setTint(Color.WHITE)
+            compoundDrawablePadding = 12
+        }
+    }
+}

app/src/main/java/org/mosad/teapod/ui/components/EmptySubmitSearchView.kt

@@ -0,0 +1,31 @@
+package org.mosad.teapod.ui.components
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.KeyEvent
+import android.widget.TextView
+import androidx.appcompat.R
+import androidx.appcompat.widget.SearchView
+
+// see https://stackoverflow.com/questions/30046201/android-searchview-empty-query-doesnt-work
+class EmptySubmitSearchView : SearchView {
+
+    constructor(context: Context) : super(context)
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+
+    override fun setOnQueryTextListener(listener: OnQueryTextListener?) {
+        super.setOnQueryTextListener(listener)
+
+        findViewById<SearchAutoComplete?>(R.id.search_src_text).setOnEditorActionListener { _: TextView?, _: Int, event: KeyEvent? ->
+            if (event != null && event.keyCode == KeyEvent.KEYCODE_ENTER) {
+                listener?.onQueryTextSubmit(query.toString())
+            } else {
+                listener?.onQueryTextSubmit(query.toString())
+            }
+
+            false
+        }
+    }
+
+}

app/src/main/java/org/mosad/teapod/ui/components/EpisodesListPlayer.kt

@@ -1,44 +0,0 @@
-package org.mosad.teapod.ui.components
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import org.mosad.teapod.databinding.PlayerEpisodesListBinding
-import org.mosad.teapod.ui.activity.player.PlayerViewModel
-import org.mosad.teapod.util.adapter.PlayerEpisodeItemAdapter
-
-class EpisodesListPlayer @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-    model: PlayerViewModel? = null
-) : LinearLayout(context, attrs, defStyleAttr) {
-
-    private val binding = PlayerEpisodesListBinding.inflate(LayoutInflater.from(context), this, true)
-    private lateinit var adapterRecEpisodes: PlayerEpisodeItemAdapter
-
-    var onViewRemovedAction: (() -> Unit)? = null // TODO find a better solution for this
-
-    init {
-        binding.buttonCloseEpisodesList.setOnClickListener {
-            (this.parent as ViewGroup).removeView(this)
-            onViewRemovedAction?.invoke()
-        }
-
-        model?.let {
-            adapterRecEpisodes = PlayerEpisodeItemAdapter(model.media.episodes)
-
-            adapterRecEpisodes.onImageClick = { _, position ->
-                (this.parent as ViewGroup).removeView(this)
-                model.playEpisode(model.media.episodes[position], replace = true)
-            }
-            adapterRecEpisodes.currentSelected = model.currentEpisode.number - 1
-
-            binding.recyclerEpisodesPlayer.adapter = adapterRecEpisodes
-            binding.recyclerEpisodesPlayer.scrollToPosition(model.currentEpisode.number - 1) // number != index
-        }
-    }
-
-}

app/src/main/java/org/mosad/teapod/ui/components/FastForwardButton.kt

@@ -5,13 +5,15 @@ import android.animation.AnimatorListenerAdapter
 import android.animation.ObjectAnimator
 import android.content.Context
 import android.util.AttributeSet
+import android.view.LayoutInflater
 import android.view.View
 import android.widget.FrameLayout
-import kotlinx.android.synthetic.main.button_fast_forward.view.*
 import org.mosad.teapod.R
+import org.mosad.teapod.databinding.ButtonFastForwardBinding
 
 class FastForwardButton(context: Context, attrs: AttributeSet?): FrameLayout(context, attrs) {
 
+    private val binding = ButtonFastForwardBinding.inflate(LayoutInflater.from(context))
     private val animationDuration: Long = 800
     private val buttonAnimation: ObjectAnimator
     private val labelAnimation: ObjectAnimator
@@ -19,30 +21,30 @@ class FastForwardButton(context: Context, attrs: AttributeSet?): FrameLayout(con
     var onAnimationEndCallback: (() -> Unit)? = null
 
     init {
-        inflate(context, R.layout.button_fast_forward, this)
+        addView(binding.root)
 
-        buttonAnimation = ObjectAnimator.ofFloat(imageButton, View.ROTATION, 0f, 50f).apply {
+        buttonAnimation = ObjectAnimator.ofFloat(binding.imageButton, View.ROTATION, 0f, 50f).apply {
             duration = animationDuration / 4
             repeatCount = 1
             repeatMode = ObjectAnimator.REVERSE
             addListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationStart(animation: Animator?) {
-                    imageButton.isEnabled = false // disable button
-                    imageButton.setBackgroundResource(R.drawable.ic_baseline_forward_24)
+                override fun onAnimationStart(animation: Animator) {
+                    binding.imageButton.isEnabled = false // disable button
+                    binding.imageButton.setBackgroundResource(R.drawable.ic_baseline_forward_24)
                 }
             })
         }
 
-        labelAnimation = ObjectAnimator.ofFloat(textView, View.TRANSLATION_X, 35f).apply {
+        labelAnimation = ObjectAnimator.ofFloat(binding.textView, View.TRANSLATION_X, 35f).apply {
             duration = animationDuration
             addListener(object : AnimatorListenerAdapter() {
                 // the label animation takes longer then the button animation, reset stuff in here
-                override fun onAnimationEnd(animation: Animator?) {
-                    imageButton.isEnabled = true // enable button
-                    imageButton.setBackgroundResource(R.drawable.ic_baseline_forward_10_24)
+                override fun onAnimationEnd(animation: Animator) {
+                    binding.imageButton.isEnabled = true // enable button
+                    binding.imageButton.setBackgroundResource(R.drawable.ic_baseline_forward_10_24)
 
-                    textView.visibility = View.GONE
-                    textView.animate().translationX(0f)
+                    binding.textView.visibility = View.GONE
+                    binding.textView.animate().translationX(0f)
 
                     onAnimationEndCallback?.invoke()
                 }
@@ -51,7 +53,7 @@ class FastForwardButton(context: Context, attrs: AttributeSet?): FrameLayout(con
     }
 
     fun setOnButtonClickListener(func: FastForwardButton.() -> Unit) {
-        imageButton.setOnClickListener {
+        binding.imageButton.setOnClickListener {
             func()
         }
     }
@@ -61,7 +63,7 @@ class FastForwardButton(context: Context, attrs: AttributeSet?): FrameLayout(con
         buttonAnimation.start()
 
         // run lbl animation
-        textView.visibility = View.VISIBLE
+        binding.textView.visibility = View.VISIBLE
         labelAnimation.start()
     }
 

app/src/main/java/org/mosad/teapod/ui/components/LanguageSettingsPlayer.kt

@@ -1,103 +0,0 @@
-package org.mosad.teapod.ui.components
-
-import android.content.Context
-import android.graphics.Color
-import android.graphics.Typeface
-import android.util.AttributeSet
-import android.util.TypedValue
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.view.children
-import org.mosad.teapod.R
-import org.mosad.teapod.databinding.PlayerLanguageSettingsBinding
-import org.mosad.teapod.ui.activity.player.PlayerViewModel
-import java.util.*
-
-class LanguageSettingsPlayer @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-    model: PlayerViewModel? = null
-) : LinearLayout(context, attrs, defStyleAttr) {
-
-    private val binding = PlayerLanguageSettingsBinding.inflate(LayoutInflater.from(context), this, true)
-    var onViewRemovedAction: (() -> Unit)? = null // TODO find a better solution for this
-
-    private var currentLanguage = model?.currentLanguage ?: Locale.ROOT
-
-    init {
-        model?.let {
-            model.currentEpisode.streams.forEach { stream ->
-                addLanguage(stream.language.displayName, stream.language == currentLanguage) {
-                    currentLanguage = stream.language
-                    updateSelectedLanguage(it as TextView)
-                }
-            }
-        }
-
-        binding.buttonCloseLanguageSettings.setOnClickListener { close() }
-        binding.buttonCancel.setOnClickListener { close() }
-        binding.buttonSelect.setOnClickListener {
-            model?.setLanguage(currentLanguage)
-            close()
-        }
-    }
-
-    private fun addLanguage(str: String, isSelected: Boolean, onClick: OnClickListener) {
-        val text = TextView(context).apply {
-            height = 96
-            gravity = Gravity.CENTER_VERTICAL
-            text = str
-            setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f)
-
-            if (isSelected) {
-                setTextColor(context.resources.getColor(R.color.exo_white, context.theme))
-                setTypeface(null, Typeface.BOLD)
-                setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_baseline_check_24, 0, 0, 0)
-                compoundDrawablesRelative.getOrNull(0)?.setTint(Color.WHITE)
-                compoundDrawablePadding = 12
-            } else {
-                setTextColor(context.resources.getColor(R.color.textPrimaryDark, context.theme))
-                setPadding(75, 0, 0, 0)
-            }
-
-            setOnClickListener(onClick)
-        }
-
-        binding.linearLanguages.addView(text)
-    }
-
-    private fun updateSelectedLanguage(selected: TextView) {
-        // rest all tf to not selected style
-        binding.linearLanguages.children.forEach { child ->
-            if (child is TextView) {
-                child.apply {
-                    setTextColor(context.resources.getColor(R.color.textPrimaryDark, context.theme))
-                    setTypeface(null, Typeface.NORMAL)
-                    setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
-                    setPadding(75, 0, 0, 0)
-                }
-            }
-
-        }
-
-        // set selected to selected style
-        selected.apply {
-            setTextColor(context.resources.getColor(R.color.exo_white, context.theme))
-            setTypeface(null, Typeface.BOLD)
-            setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_baseline_check_24, 0, 0, 0)
-            setPadding(0, 0, 0, 0)
-            compoundDrawablesRelative.getOrNull(0)?.setTint(Color.WHITE)
-            compoundDrawablePadding = 12
-        }
-    }
-
-    private fun close() {
-        (this.parent as ViewGroup).removeView(this)
-        onViewRemovedAction?.invoke()
-    }
-
-}

app/src/main/java/org/mosad/teapod/ui/components/LoginDialog.kt

@@ -1,93 +0,0 @@
-/**
- * ProjectLaogai
- *
- * Copyright 2019-2020  <seil0@mosad.xyz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-
-package org.mosad.teapod.ui.components
-
-import android.content.Context
-import android.widget.EditText
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.bottomsheets.BottomSheet
-import com.afollestad.materialdialogs.bottomsheets.setPeekHeight
-import com.afollestad.materialdialogs.customview.customView
-import com.afollestad.materialdialogs.customview.getCustomView
-import org.mosad.teapod.R
-
-class LoginDialog(val context: Context, firstTry: Boolean) {
-
-    private val dialog = MaterialDialog(context, BottomSheet())
-
-    private val editTextLogin: EditText
-    private val editTextPassword: EditText
-
-    var login = ""
-    var password = ""
-
-    init {
-        dialog.title(R.string.login)
-            .message(if (firstTry) R.string.login_desc else R.string.login_failed_desc)
-            .customView(R.layout.dialog_login)
-            .positiveButton(R.string.save)
-            .negativeButton(R.string.cancel)
-            .setPeekHeight(900)
-
-        editTextLogin = dialog.getCustomView().findViewById(R.id.edit_text_login)
-        editTextPassword = dialog.getCustomView().findViewById(R.id.edit_text_password)
-
-        // fix not working accent color
-        //dialog.getActionButton(WhichButton.POSITIVE).updateTextColor(Preferences.colorAccent)
-        //dialog.getActionButton(WhichButton.NEGATIVE).updateTextColor(Preferences.colorAccent)
-    }
-
-    fun positiveButton(func: LoginDialog.() -> Unit): LoginDialog = apply {
-        dialog.positiveButton {
-            login = editTextLogin.text.toString()
-            password = editTextPassword.text.toString()
-
-            func()
-        }
-    }
-
-    fun negativeButton(func: LoginDialog.() -> Unit): LoginDialog = apply {
-        dialog.negativeButton {
-            func()
-        }
-    }
-
-    fun show() {
-        dialog.show()
-    }
-
-    fun show(func: LoginDialog.() -> Unit): LoginDialog = apply {
-        func()
-
-        editTextLogin.setText(login)
-        editTextPassword.setText(password)
-
-        show()
-    }
-
-    @Suppress("unused")
-    fun dismiss() {
-        dialog.dismiss()
-    }
-
-}

app/src/main/java/org/mosad/teapod/ui/components/LoginModalBottomSheet.kt

@@ -0,0 +1,54 @@
+package org.mosad.teapod.ui.components
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import org.mosad.teapod.databinding.ModalBottomSheetLoginBinding
+
+/**
+ * A bottom sheet with login credential input fields.
+ *
+ * To initialize login or password values, use apply.
+ */
+class LoginModalBottomSheet : BottomSheetDialogFragment() {
+
+    private lateinit var binding: ModalBottomSheetLoginBinding
+
+    var login = ""
+    var password = ""
+
+    lateinit var positiveAction: LoginModalBottomSheet.() -> Unit
+    lateinit var negativeAction: LoginModalBottomSheet.() -> Unit
+
+    companion object {
+        const val TAG = "LoginModalBottomSheet"
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = ModalBottomSheetLoginBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.editTextLogin.setText(login)
+        binding.editTextPassword.setText(password)
+
+        binding.positiveButton.setOnClickListener {
+            login = binding.editTextLogin.text.toString()
+            password = binding.editTextPassword.text.toString()
+
+            positiveAction.invoke(this)
+        }
+        binding.negativeButton.setOnClickListener {
+            negativeAction.invoke(this)
+        }
+    }
+}

app/src/main/java/org/mosad/teapod/ui/components/RewindButton.kt

@@ -5,13 +5,15 @@ import android.animation.AnimatorListenerAdapter
 import android.animation.ObjectAnimator
 import android.content.Context
 import android.util.AttributeSet
+import android.view.LayoutInflater
 import android.view.View
 import android.widget.FrameLayout
-import kotlinx.android.synthetic.main.button_rewind.view.*
 import org.mosad.teapod.R
+import org.mosad.teapod.databinding.ButtonRewindBinding
 
 class RewindButton(context: Context, attrs: AttributeSet): FrameLayout(context, attrs) {
 
+    private val binding = ButtonRewindBinding.inflate(LayoutInflater.from(context))
     private val animationDuration: Long = 800
     private val buttonAnimation: ObjectAnimator
     private val labelAnimation: ObjectAnimator
@@ -19,29 +21,29 @@ class RewindButton(context: Context, attrs: AttributeSet): FrameLayout(context,
     var onAnimationEndCallback: (() -> Unit)? = null
 
     init {
-        inflate(context, R.layout.button_rewind, this)
+        addView(binding.root)
 
-        buttonAnimation = ObjectAnimator.ofFloat(imageButton, View.ROTATION, 0f, -50f).apply {
+        buttonAnimation = ObjectAnimator.ofFloat(binding.imageButton, View.ROTATION, 0f, -50f).apply {
             duration = animationDuration / 4
             repeatCount = 1
             repeatMode = ObjectAnimator.REVERSE
             addListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationStart(animation: Animator?) {
-                    imageButton.isEnabled = false // disable button
-                    imageButton.setBackgroundResource(R.drawable.ic_baseline_rewind_24)
+                override fun onAnimationStart(animation: Animator) {
+                    binding.imageButton.isEnabled = false // disable button
+                    binding.imageButton.setBackgroundResource(R.drawable.ic_baseline_rewind_24)
                 }
             })
         }
 
-        labelAnimation = ObjectAnimator.ofFloat(textView, View.TRANSLATION_X, -35f).apply {
+        labelAnimation = ObjectAnimator.ofFloat(binding.textView, View.TRANSLATION_X, -35f).apply {
             duration = animationDuration
             addListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator?) {
-                    imageButton.isEnabled = true // enable button
-                    imageButton.setBackgroundResource(R.drawable.ic_baseline_rewind_10_24)
+                override fun onAnimationEnd(animation: Animator) {
+                    binding.imageButton.isEnabled = true // enable button
+                    binding.imageButton.setBackgroundResource(R.drawable.ic_baseline_rewind_10_24)
 
-                    textView.visibility = View.GONE
-                    textView.animate().translationX(0f)
+                    binding.textView.visibility = View.GONE
+                    binding.textView.animate().translationX(0f)
 
                     onAnimationEndCallback?.invoke()
                 }
@@ -50,7 +52,7 @@ class RewindButton(context: Context, attrs: AttributeSet): FrameLayout(context,
     }
 
     fun setOnButtonClickListener(func: RewindButton.() -> Unit) {
-        imageButton.setOnClickListener {
+        binding.imageButton.setOnClickListener {
             func()
         }
     }
@@ -60,7 +62,7 @@ class RewindButton(context: Context, attrs: AttributeSet): FrameLayout(context,
         buttonAnimation.start()
 
         // run lbl animation
-        textView.visibility = View.VISIBLE
+        binding.textView.visibility = View.VISIBLE
         labelAnimation.start()
     }
 

app/src/main/java/org/mosad/teapod/util/ActivityUtils.kt

@@ -5,9 +5,6 @@ import android.app.ActivityManager
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.view.View
-import android.view.WindowInsets
-import android.view.WindowInsetsController
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.commit
@@ -31,23 +28,7 @@ fun FragmentActivity.showFragment(fragment: Fragment) {
  * hide the status and navigation bar
  */
 fun Activity.hideBars() {
-    window.apply {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            setDecorFitsSystemWindows(false)
-            insetsController?.apply {
-                hide(WindowInsets.Type.statusBars() or WindowInsets.Type.navigationBars())
-                systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_BARS_BY_SWIPE
-            }
-        } else {
-            @Suppress("deprecation")
-            decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE
-                    or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                    or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                    or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                    or View.SYSTEM_UI_FLAG_FULLSCREEN)
-        }
-    }
+    hideBars(window, window.decorView.rootView)
 }
 
 fun Activity.isInPiPMode(): Boolean {

app/src/main/java/org/mosad/teapod/util/DataTypes.kt

@@ -1,16 +1,16 @@
 package org.mosad.teapod.util
 
-import java.util.*
-import kotlin.collections.ArrayList
+import java.util.Locale
 
 class DataTypes {
-    enum class MediaType {
-        OTHER,
-        MOVIE,
-        TVSHOW
+    enum class MediaType(val str: String) {
+        OTHER("other"),
+        MOVIE("movie"), // TODO
+        TVSHOW("series")
     }
 
     enum class Theme(val str: String) {
+        SYSTEM("System"),
         LIGHT("Light"),
         DARK("Dark")
     }
@@ -36,61 +36,47 @@ data class ThirdPartyComponent(
  * it is uses in the ItemMediaAdapter (RecyclerView)
  */
 data class ItemMedia(
-    val id: Int,
+    val id: String,
     val title: String,
-    val posterUrl: String
+    val posterUrl: String,
 )
 
-/**
- * TODO the episodes workflow could use a clean up/rework
- */
-data class Media(
-    val id: Int,
-    val link: String,
+// TODO replace playlist: List<AoDEpisode> with a map?
+data class AoDMedia(
+    val aodId: Int,
     val type: DataTypes.MediaType,
-    val info: Info = Info(),
-    val episodes: ArrayList<Episode> = arrayListOf()
+    val title: String,
+    val shortText: String,
+    val posterURL: String,
+    var year: Int,
+    var age: Int,
+    val similar: List<ItemMedia>,
+    val playlist: List<AoDEpisode>,
 ) {
-    fun hasEpisode(id: Int) = episodes.any { it.id == id }
-    fun getEpisodeById(id: Int) = episodes.first { it.id == id }
+    fun getEpisodeById(mediaId: Int) = playlist.firstOrNull { it.mediaId == mediaId }
+        ?: AoDEpisodeNone
 }
 
-/**
- * uses var, since the values are written in different steps
- */
-data class Info(
-    var title: String = "",
-    var posterUrl: String = "",
-    var shortDesc: String = "",
-    var description: String = "",
-    var year: Int = 0,
-    var age: Int = 0,
-    var episodesCount: Int = 0,
-    var similar: List<ItemMedia> = listOf()
-)
+data class AoDEpisode(
+    val mediaId: Int,
+    val title: String,
+    val description: String,
+    val shortDesc: String,
+    val imageURL: String,
+    val numberStr: String,
+    val index: Int,
+    var watched: Boolean,
+    val watchedCallback: String,
+    val streams: MutableList<Stream>,
+){
+    fun hasDub() = streams.any { it.language == Locale.GERMAN }
 
-/**
- * number = episode number (0..n)
- */
-data class Episode(
-    val id: Int = -1,
-    val streams: MutableList<Stream> = mutableListOf(),
-    val title: String = "",
-    val posterUrl: String = "",
-    val description: String = "",
-    var shortDesc: String = "",
-    val number: Int = 0,
-    var watched: Boolean = false,
-    var watchedCallback: String = ""
-) {
     /**
      * get the preferred stream
      * @return the preferred stream, if not present use the first stream
      */
-    fun getPreferredStream(language: Locale) =
-        streams.firstOrNull { it.language == language } ?: streams.first()
-
-    fun hasDub() = streams.any { it.language == Locale.GERMAN }
+    fun getPreferredStream(language: Locale) = streams.firstOrNull { it.language == language }
+        ?: Stream("", Locale.ROOT)
 }
 
 data class Stream(
@@ -98,24 +84,45 @@ data class Stream(
     val language : Locale
 )
 
-/**
- * this class is used for tmdb responses
- */
-data class TMDBResponse(
-    val id: Int = 0,
-    val title: String = "",
-    val overview: String = "",
-    val posterUrl: String = "",
-    val backdropUrl: String = "",
-    val runtime: Int = 0
+// TODO will be watched info (state and callback) -> remove description and number
+data class AoDEpisodeInfo(
+    val aodMediaId: Int,
+    val shortDesc: String,
+    var watched: Boolean,
+    val watchedCallback: String,
+)
+
+val AoDMediaNone = AoDMedia(
+    -1,
+    DataTypes.MediaType.OTHER,
+    "",
+    "",
+    "",
+    -1,
+    -1,
+    listOf(),
+    listOf()
+)
+
+val AoDEpisodeNone = AoDEpisode(
+    -1,
+    "",
+    "",
+    "",
+    "",
+    "",
+    -1,
+    true,
+    "",
+    mutableListOf()
 )
 
 /**
  * this class is used to represent the aod json API?
  */
-data class AoDObject(
-    val playlist: List<Playlist>,
-    val extLanguage: String
+data class AoDPlaylist(
+    val list: List<Playlist>,
+    val language: Locale
 )
 
 data class Playlist(

app/src/main/java/org/mosad/teapod/util/StorageController.kt

@@ -1,44 +0,0 @@
-package org.mosad.teapod.util
-
-import android.content.Context
-import android.util.Log
-import com.google.gson.Gson
-import com.google.gson.JsonParser
-import kotlinx.coroutines.*
-import java.io.File
-import java.lang.Exception
-
-/**
- * This controller contains the logic for permanently saved data.
- * On load, it loads the saved files into the variables
- */
-object StorageController {
-
-    private const val fileNameMyList = "my_list.json"
-
-    val myList = ArrayList<Int>() // a list of saved mediaIds
-
-    fun load(context: Context) {
-        val file = File(context.filesDir, fileNameMyList)
-
-        if (!file.exists()) runBlocking { saveMyList(context).join() }
-
-        try {
-            myList.clear()
-            myList.addAll(JsonParser.parseString(file.readText()).asJsonArray.map { it.asInt }.distinct())
-        } catch (ex: Exception) {
-            myList.clear()
-            Log.e(javaClass.name, "Parsing of My-List failed.")
-        }
-
-    }
-
-    fun saveMyList(context: Context): Job {
-        val file = File(context.filesDir, fileNameMyList)
-
-        return GlobalScope.launch(Dispatchers.IO) {
-            file.writeText(Gson().toJson(myList.distinct()))
-        }
-    }
-
-}

app/src/main/java/org/mosad/teapod/util/TMDBApiController.kt

@@ -1,115 +0,0 @@
-package org.mosad.teapod.util
-
-import android.util.Log
-import com.google.gson.JsonObject
-import com.google.gson.JsonParser
-import kotlinx.coroutines.*
-import java.net.URL
-import java.net.URLEncoder
-import org.mosad.teapod.util.DataTypes.MediaType
-
-class TMDBApiController {
-
-    private val apiUrl = "https://api.themoviedb.org/3"
-    private val searchMovieUrl = "$apiUrl/search/movie"
-    private val searchTVUrl = "$apiUrl/search/tv"
-    private val getMovieUrl = "$apiUrl/movie"
-    private val apiKey = "de959cf9c07a08b5ca7cb51cda9a40c2"
-    private val language = "de"
-    private val preparedParameters = "?api_key=$apiKey&language=$language"
-
-    private val imageUrl = "https://image.tmdb.org/t/p/w500"
-
-    suspend fun search(title: String, type: MediaType): TMDBResponse {
-        val searchTerm = title.replace("(Sub)", "").trim()
-
-        return when (type) {
-            MediaType.MOVIE -> searchMovie(searchTerm).await()
-            MediaType.TVSHOW -> searchTVShow(searchTerm).await()
-            else -> {
-                Log.e(javaClass.name, "Wrong Type: $type")
-                TMDBResponse()
-            }
-        }
-
-    }
-
-    fun searchTVShow(title: String): Deferred<TMDBResponse> {
-        val url = URL("$searchTVUrl$preparedParameters&query=${URLEncoder.encode(title, "UTF-8")}")
-
-        return GlobalScope.async {
-            val response = JsonParser.parseString(url.readText()).asJsonObject
-            //println(response)
-
-            if (response.get("total_results").asInt > 0) {
-                response.get("results").asJsonArray.first().asJsonObject.let {
-                    val id = getStringNotNull(it, "id").toInt()
-                    val overview = getStringNotNull(it, "overview")
-                    val posterPath = getStringNotNullPrefix(it, "poster_path", imageUrl)
-                    val backdropPath = getStringNotNullPrefix(it, "backdrop_path", imageUrl)
-
-                    TMDBResponse(id, "", overview, posterPath, backdropPath)
-                }
-            } else {
-                TMDBResponse()
-            }
-        }
-    }
-
-    fun searchMovie(title: String): Deferred<TMDBResponse> {
-        val url = URL("$searchMovieUrl$preparedParameters&query=${URLEncoder.encode(title, "UTF-8")}")
-
-        return GlobalScope.async {
-            val response = JsonParser.parseString(url.readText()).asJsonObject
-            //println(response)
-
-            if (response.get("total_results").asInt > 0) {
-                response.get("results").asJsonArray.first().asJsonObject.let {
-                    val id = getStringNotNull(it,"id").toInt()
-                    val overview = getStringNotNull(it,"overview")
-                    val posterPath = getStringNotNullPrefix(it, "poster_path", imageUrl)
-                    val backdropPath = getStringNotNullPrefix(it, "backdrop_path", imageUrl)
-                    val runtime = getMovieRuntime(id)
-
-                    TMDBResponse(id, "", overview, posterPath, backdropPath, runtime)
-                }
-            } else {
-                TMDBResponse()
-            }
-        }
-    }
-
-    /**
-     * currently only used for runtime, need a rework
-     */
-    fun getMovieRuntime(id: Int): Int = runBlocking {
-        val url = URL("$getMovieUrl/$id?api_key=$apiKey&language=$language")
-
-        GlobalScope.async {
-            val response = JsonParser.parseString(url.readText()).asJsonObject
-
-            return@async getStringNotNull(response,"runtime").toInt()
-        }.await()
-    }
-
-    /**
-     * return memberName as string if it's not JsonNull,
-     * else return an empty string
-     */
-    private fun getStringNotNull(jsonObject: JsonObject, memberName: String): String {
-        return getStringNotNullPrefix(jsonObject, memberName, "")
-    }
-
-    /**
-     * return memberName as string with a prefix if it's not JsonNull,
-     * else return an empty string
-     */
-    private fun getStringNotNullPrefix(jsonObject: JsonObject, memberName: String, prefix: String): String {
-        return if (!jsonObject.get(memberName).isJsonNull) {
-            prefix + jsonObject.get(memberName).asString
-        } else {
-            ""
-        }
-    }
-
-}

app/src/main/java/org/mosad/teapod/util/Utils.kt

@@ -1,7 +1,73 @@
 package org.mosad.teapod.util
 
+import android.content.Intent
+import android.view.View
+import android.view.Window
 import android.widget.TextView
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.fragment.app.Fragment
+import org.mosad.teapod.R
+import org.mosad.teapod.parser.crunchyroll.CollectionV2
+import org.mosad.teapod.parser.crunchyroll.Item
+import org.mosad.teapod.parser.crunchyroll.PlayheadObject
+import org.mosad.teapod.ui.activity.player.PlayerActivity
+import java.util.Locale
+
+/**
+ * Create a Intent for PlayerActivity with season and episode id.
+ *
+ * @param seasonId The ID of the season the episode to be played is in
+ * @param episodeId The ID of the episode to play
+ */
+fun Fragment.playerIntent(seasonId: String, episodeId: String) = Intent(context, PlayerActivity::class.java).apply {
+    putExtra(getString(R.string.intent_season_id), seasonId)
+    putExtra(getString(R.string.intent_episode_id), episodeId)
+}
 
 fun TextView.setDrawableTop(drawable: Int) {
     this.setCompoundDrawablesWithIntrinsicBounds(0, drawable, 0, 0)
 }
+
+fun <T> concatenate(vararg lists: List<T>): List<T> {
+    return listOf(*lists).flatten()
+}
+
+// TODO move to correct location
+fun CollectionV2<Item>.toItemMediaList(): List<ItemMedia> {
+    return this.data.map {
+        ItemMedia(it.id, it.title, it.images.poster_wide[0][0].source)
+    }
+}
+
+@JvmName("toItemMediaListItem")
+fun List<Item>.toItemMediaList(): List<ItemMedia> {
+    return this.map {
+        ItemMedia(it.id, it.title, it.images.poster_wide[0][0].source)
+    }
+}
+
+fun Locale.toDisplayString(fallback: String): String {
+    return if (this.displayLanguage.isNotEmpty() && this.displayCountry.isNotEmpty()) {
+        "${this.displayLanguage} (${this.displayCountry})"
+    } else if (this.displayCountry.isNotEmpty()) {
+        this.displayLanguage
+    } else {
+        fallback
+    }
+}
+
+fun CollectionV2<PlayheadObject>.toPlayheadsMap(): Map<String, PlayheadObject> {
+    return this.data.associateBy { it.contentId }
+}
+
+fun hideBars(window: Window?, root: View) {
+    if (window != null) {
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        WindowInsetsControllerCompat(window, root).let { controller ->
+            controller.hide(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.navigationBars())
+            controller.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        }
+    }
+}

app/src/main/java/org/mosad/teapod/util/adapter/EpisodeItemAdapter.kt

@@ -2,7 +2,9 @@ package org.mosad.teapod.util.adapter
 
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
@@ -11,42 +13,52 @@ import com.bumptech.glide.request.RequestOptions
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation
 import org.mosad.teapod.R
 import org.mosad.teapod.databinding.ItemEpisodeBinding
-import org.mosad.teapod.util.Episode
+import org.mosad.teapod.databinding.ItemEpisodePlayerBinding
+import org.mosad.teapod.parser.crunchyroll.Episode
+import org.mosad.teapod.parser.crunchyroll.PlayheadObject
+import org.mosad.teapod.util.tmdb.TMDBTVEpisode
 
-class EpisodeItemAdapter(private val episodes: List<Episode>) : RecyclerView.Adapter<EpisodeItemAdapter.EpisodeViewHolder>() {
+class EpisodeItemAdapter(
+    private val episodes: List<Episode>,
+    private val tmdbEpisodes: List<TMDBTVEpisode>?,
+    private val playheads: Map<String, PlayheadObject>,
+    private val onClickListener: OnClickListener,
+    private val viewType: ViewType
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    var onImageClick: ((String, Int) -> Unit)? = null
+    var currentSelected: Int = -1 // -1, since position should never be < 0
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EpisodeViewHolder {
-        return EpisodeViewHolder(ItemEpisodeBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return when (viewType) {
+            ViewType.PLAYER.ordinal -> {
+                PlayerEpisodeViewHolder((ItemEpisodePlayerBinding.inflate(LayoutInflater.from(parent.context), parent, false)))
+            }
+            else -> {
+                // media fragment episode list is default
+                EpisodeViewHolder(ItemEpisodeBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+            }
+        }
     }
 
-    override fun onBindViewHolder(holder: EpisodeViewHolder, position: Int) {
-        val context = holder.binding.root.context
-        val ep = episodes[position]
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        val episode = episodes[position]
+        val playhead = playheads[episode.id]
+        val tmdbEpisode = tmdbEpisodes?.getOrNull(position)
 
-        val titleText = if (ep.hasDub()) {
-            context.getString(R.string.component_episode_title, ep.number, ep.description)
-        } else {
-            context.getString(R.string.component_episode_title_sub, ep.number, ep.description)
+        when (holder.itemViewType) {
+            ViewType.MEDIA_FRAGMENT.ordinal -> {
+                (holder as EpisodeViewHolder).bind(episode, playhead, tmdbEpisode)
+            }
+            ViewType.PLAYER.ordinal -> {
+                (holder as PlayerEpisodeViewHolder).bind(episode, playhead, currentSelected)
+            }
         }
+    }
 
-        holder.binding.textEpisodeTitle.text = titleText
-        holder.binding.textEpisodeDesc.text = ep.shortDesc
-
-        if (episodes[position].posterUrl.isNotEmpty()) {
-            Glide.with(context).load(ep.posterUrl)
-                .apply(RequestOptions.placeholderOf(ColorDrawable(Color.DKGRAY)))
-                .apply(RequestOptions.bitmapTransform(RoundedCornersTransformation(10, 0)))
-                .into(holder.binding.imageEpisode)
-        }
-
-        if (ep.watched) {
-            holder.binding.imageWatched.setImageDrawable(
-                ContextCompat.getDrawable(context, R.drawable.ic_baseline_check_circle_24)
-            )
-        } else {
-            holder.binding.imageWatched.setImageDrawable(null)
+    override fun getItemViewType(position: Int): Int {
+        return when (viewType) {
+            ViewType.MEDIA_FRAGMENT -> ViewType.MEDIA_FRAGMENT.ordinal
+            ViewType.PLAYER -> ViewType.PLAYER.ordinal
         }
     }
 
@@ -54,16 +66,113 @@ class EpisodeItemAdapter(private val episodes: List<Episode>) : RecyclerView.Ada
         return episodes.size
     }
 
-    fun updateWatchedState(watched: Boolean, position: Int) {
-        // use getOrNull as there could be a index out of bound when running this in onResume()
-        episodes.getOrNull(position)?.watched = watched
-    }
+    inner class EpisodeViewHolder(val binding: ItemEpisodeBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(episode: Episode, playhead: PlayheadObject?, tmdbEpisode: TMDBTVEpisode?) {
+            val context = binding.root.context
+
+            val titleText = if (episode.episodeNumber != null) {
+                // for tv shows add ep prefix and episode number
+                if (episode.isDubbed) {
+                    context.getString(R.string.component_episode_title, episode.episode, episode.title)
+                } else {
+                    context.getString(R.string.component_episode_title_sub, episode.episode, episode.title)
+                }
+            } else {
+                episode.title
+            }
+
+            binding.textEpisodeTitle.text = titleText
+            binding.textEpisodeDesc.text = episode.description.ifEmpty {
+                tmdbEpisode?.overview ?: ""
+            }
+
+            if (episode.images.thumbnail[0][0].source.isNotEmpty()) {
+                Glide.with(context).load(episode.images.thumbnail[0][0].source)
+                    .apply(RequestOptions.placeholderOf(ColorDrawable(Color.DKGRAY)))
+                    .apply(RequestOptions.bitmapTransform(RoundedCornersTransformation(10, 0)))
+                    .into(binding.imageEpisode)
+            }
+
+            // add watched progress
+            val playheadProgress = playhead?.playhead?.let {
+                ((it.toFloat() / (episode.durationMs / 1000)) * 100).toInt()
+            } ?: 0
+            binding.progressPlayhead.setProgressCompat(playheadProgress, false)
+            binding.progressPlayhead.visibility = if (playheadProgress <= 0)
+                View.GONE  else View.VISIBLE
+
+            // add watched icon to episode, if the episode id is present in playheads and fullyWatched
+            val watchedImage: Drawable? = if (playhead?.fullyWatched == true) {
+                ContextCompat.getDrawable(context, R.drawable.ic_baseline_check_circle_24)
+            } else {
+                null
+            }
+            binding.imageWatched.setImageDrawable(watchedImage)
 
-    inner class EpisodeViewHolder(val binding: ItemEpisodeBinding) : RecyclerView.ViewHolder(binding.root) {
-        init {
             binding.imageEpisode.setOnClickListener {
-                onImageClick?.invoke(episodes[adapterPosition].title, adapterPosition)
+                onClickListener.onClick(episode)
             }
         }
     }
+
+    inner class PlayerEpisodeViewHolder(val binding: ItemEpisodePlayerBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        // -1, since position should never be < 0
+        fun bind(episode: Episode, playhead: PlayheadObject?, currentSelected: Int) {
+            val context = binding.root.context
+
+            val titleText = if (episode.episodeNumber != null) {
+                // for tv shows add ep prefix and episode number
+                if (episode.isDubbed) {
+                    context.getString(R.string.component_episode_title, episode.episode, episode.title)
+                } else {
+                    context.getString(R.string.component_episode_title_sub, episode.episode, episode.title)
+                }
+            } else {
+                episode.title
+            }
+
+            binding.textEpisodeTitle2.text = titleText
+            binding.textEpisodeDesc2.text = episode.description.ifEmpty { "" }
+
+            if (episode.images.thumbnail[0][0].source.isNotEmpty()) {
+                Glide.with(context).load(episode.images.thumbnail[0][0].source)
+                    .apply(RequestOptions.bitmapTransform(RoundedCornersTransformation(10, 0)))
+                    .into(binding.imageEpisode)
+            }
+
+            // add watched progress
+            val playheadProgress = playhead?.playhead?.let {
+                ((it.toFloat() / (episode.durationMs / 1000)) * 100).toInt()
+            } ?: 0
+            binding.progressPlayhead.setProgressCompat(playheadProgress, false)
+            binding.progressPlayhead.visibility = if (playheadProgress <= 0)
+                View.GONE  else View.VISIBLE
+
+            // hide the play icon, if it's the current episode
+            binding.imageEpisodePlay.visibility = if (currentSelected == bindingAdapterPosition) {
+                View.GONE
+            } else {
+                View.VISIBLE
+            }
+
+            if (currentSelected != bindingAdapterPosition) {
+                binding.imageEpisode.setOnClickListener {
+                    onClickListener.onClick(episode)
+                }
+            }
+        }
+    }
+
+    class OnClickListener(val clickListener: (episode: Episode) -> Unit) {
+        fun onClick(episode: Episode) = clickListener(episode)
+    }
+
+    enum class ViewType {
+        MEDIA_FRAGMENT,
+        PLAYER
+    }
 }

app/src/main/java/org/mosad/teapod/util/adapter/MediaEpisodeListAdapter.kt

@@ -0,0 +1,73 @@
+package org.mosad.teapod.util.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import org.mosad.teapod.R
+import org.mosad.teapod.databinding.ItemMediaBinding
+import org.mosad.teapod.parser.crunchyroll.UpNextAccountItem
+
+class MediaEpisodeListAdapter(private val onClickListener: OnClickListener, private val itemOffset: Int = 0) : ListAdapter<UpNextAccountItem, MediaEpisodeListAdapter.MediaViewHolder>(DiffCallback) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MediaViewHolder {
+        val binding = ItemMediaBinding.inflate(
+            LayoutInflater.from(parent.context),
+            parent,
+            false
+        )
+        binding.root.layoutParams.apply {
+            width = (parent.measuredWidth / parent.context.resources.getInteger(R.integer.item_media_columns)) - itemOffset
+        }
+
+        return MediaViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: MediaViewHolder, position: Int) {
+        val item = getItem(position)
+        holder.binding.root.setOnClickListener {
+            onClickListener.onClick(item)
+        }
+        holder.bind(item)
+    }
+
+    inner class MediaViewHolder(val binding: ItemMediaBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(item: UpNextAccountItem) {
+            val metadata = item.panel.episodeMetadata
+
+            binding.textTitle.text = binding.root.context.getString(R.string.season_episode_title,
+                metadata.seasonNumber, metadata.episodeNumber, metadata.seriesTitle
+            )
+
+            Glide.with(binding.imagePoster)
+                .load(item.panel.images.thumbnail[0][0].source)
+                .into(binding.imagePoster)
+
+            // add watched progress
+            val playheadProgress = ((item.playhead.toFloat() / (metadata.durationMs / 1000)) * 100)
+                .toInt()
+            binding.progressPlayhead.setProgressCompat(playheadProgress, false)
+            binding.progressPlayhead.visibility = if (playheadProgress <= 0)
+                View.GONE else View.VISIBLE
+        }
+    }
+
+    companion object DiffCallback : DiffUtil.ItemCallback<UpNextAccountItem>() {
+        override fun areItemsTheSame(oldItem: UpNextAccountItem, newItem: UpNextAccountItem): Boolean {
+            return oldItem.panel.id == newItem.panel.id
+        }
+
+        override fun areContentsTheSame(oldItem: UpNextAccountItem, newItem: UpNextAccountItem): Boolean {
+            return oldItem == newItem
+        }
+    }
+
+    class OnClickListener(val clickListener: (item: UpNextAccountItem) -> Unit) {
+        fun onClick(item: UpNextAccountItem) = clickListener(item)
+    }
+}

app/src/main/java/org/mosad/teapod/util/adapter/MediaItemAdapter.kt

@@ -1,79 +0,0 @@
-package org.mosad.teapod.util.adapter
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.widget.Filter
-import android.widget.Filterable
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import org.mosad.teapod.databinding.ItemMediaBinding
-import org.mosad.teapod.util.ItemMedia
-import java.util.*
-
-class MediaItemAdapter(private val initMedia: List<ItemMedia>) : RecyclerView.Adapter<MediaItemAdapter.MediaViewHolder>(), Filterable {
-
-    var onItemClick: ((Int, Int) -> Unit)? = null
-    private val filter = MediaFilter()
-    private var filteredMedia = initMedia.map { it.copy() }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MediaItemAdapter.MediaViewHolder {
-        return MediaViewHolder(ItemMediaBinding.inflate(LayoutInflater.from(parent.context), parent, false))
-    }
-
-    override fun onBindViewHolder(holder: MediaItemAdapter.MediaViewHolder, position: Int) {
-        holder.binding.root.apply {
-            holder.binding.textTitle.text = filteredMedia[position].title
-            Glide.with(context).load(filteredMedia[position].posterUrl).into(holder.binding.imagePoster)
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return filteredMedia.size
-    }
-
-    override fun getFilter(): Filter {
-        return filter
-    }
-
-    fun updateMediaList(mediaList: List<ItemMedia>) {
-        filteredMedia = mediaList
-    }
-
-    inner class MediaViewHolder(val binding: ItemMediaBinding) : RecyclerView.ViewHolder(binding.root) {
-        init {
-            binding.root.setOnClickListener {
-                onItemClick?.invoke(filteredMedia[adapterPosition].id, adapterPosition)
-            }
-        }
-    }
-
-    inner class MediaFilter : Filter() {
-        override fun performFiltering(constraint: CharSequence?): FilterResults {
-            val filterTerm = constraint.toString().toLowerCase(Locale.ROOT)
-            val results = FilterResults()
-
-            val filteredList = if (filterTerm.isEmpty()) {
-                initMedia
-            } else {
-                initMedia.filter {
-                    it.title.toLowerCase(Locale.ROOT).contains(filterTerm)
-                }
-            }
-
-            results.values = filteredList
-            results.count = filteredList.size
-
-            return results
-        }
-
-        @Suppress("unchecked_cast")
-        /**
-         * suppressing unchecked cast is safe, since we only use Media
-         */
-        override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
-            filteredMedia = results?.values as List<ItemMedia>
-            notifyDataSetChanged()
-        }
-    }
-
-}

app/src/main/java/org/mosad/teapod/util/adapter/MediaItemListAdapter.kt

@@ -0,0 +1,65 @@
+package org.mosad.teapod.util.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import org.mosad.teapod.R
+import org.mosad.teapod.databinding.ItemMediaBinding
+import org.mosad.teapod.util.ItemMedia
+
+class MediaItemListAdapter(private val onClickListener: OnClickListener, private val itemOffset: Int = 0) : ListAdapter<ItemMedia, MediaItemListAdapter.MediaViewHolder>(DiffCallback) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MediaViewHolder {
+        val binding = ItemMediaBinding.inflate(
+            LayoutInflater.from(parent.context),
+            parent,
+            false
+        )
+        binding.root.layoutParams.apply {
+            width = (parent.measuredWidth / parent.context.resources.getInteger(R.integer.item_media_columns)) - itemOffset
+        }
+
+        return MediaViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: MediaViewHolder, position: Int) {
+        val item = getItem(position)
+        holder.binding.root.setOnClickListener {
+            onClickListener.onClick(item)
+        }
+        holder.bind(item)
+    }
+
+    inner class MediaViewHolder(val binding: ItemMediaBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(item: ItemMedia) {
+            binding.textTitle.text = item.title
+
+            Glide.with(binding.root.context)
+                .load(item.posterUrl)
+                .into(binding.imagePoster)
+
+            binding.imageEpisodePlay.isVisible = false
+            binding.progressPlayhead.isVisible = false
+        }
+    }
+
+    companion object DiffCallback : DiffUtil.ItemCallback<ItemMedia>() {
+        override fun areItemsTheSame(oldItem: ItemMedia, newItem: ItemMedia): Boolean {
+            return oldItem.id == newItem.id
+        }
+
+        override fun areContentsTheSame(oldItem: ItemMedia, newItem: ItemMedia): Boolean {
+            return oldItem == newItem
+        }
+    }
+
+    class OnClickListener(val clickListener: (item: ItemMedia) -> Unit) {
+        fun onClick(item: ItemMedia) = clickListener(item)
+    }
+}

app/src/main/java/org/mosad/teapod/util/adapter/PlayerEpisodeItemAdapter.kt

@@ -1,64 +0,0 @@
-package org.mosad.teapod.util.adapter
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
-import jp.wasabeef.glide.transformations.RoundedCornersTransformation
-import org.mosad.teapod.R
-import org.mosad.teapod.databinding.ItemEpisodePlayerBinding
-import org.mosad.teapod.util.Episode
-
-class PlayerEpisodeItemAdapter(private val episodes: List<Episode>) : RecyclerView.Adapter<PlayerEpisodeItemAdapter.EpisodeViewHolder>() {
-
-    var onImageClick: ((String, Int) -> Unit)? = null
-    var currentSelected: Int = -1 // -1, since position should never be < 0
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EpisodeViewHolder {
-        return EpisodeViewHolder(ItemEpisodePlayerBinding.inflate(LayoutInflater.from(parent.context), parent, false))
-    }
-
-    override fun onBindViewHolder(holder: EpisodeViewHolder, position: Int) {
-        val context = holder.binding.root.context
-        val ep = episodes[position]
-
-        val titleText = if (ep.hasDub()) {
-            context.getString(R.string.component_episode_title, ep.number, ep.description)
-        } else {
-            context.getString(R.string.component_episode_title_sub, ep.number, ep.description)
-        }
-
-        holder.binding.textEpisodeTitle2.text = titleText
-        holder.binding.textEpisodeDesc2.text = ep.shortDesc
-
-        if (episodes[position].posterUrl.isNotEmpty()) {
-            Glide.with(context).load(ep.posterUrl)
-                .apply(RequestOptions.bitmapTransform(RoundedCornersTransformation(10, 0)))
-                .into(holder.binding.imageEpisode)
-        }
-
-        // hide the play icon, if it's the current episode
-        holder.binding.imageEpisodePlay.visibility = if (currentSelected == position) {
-            View.GONE
-        } else {
-            View.VISIBLE
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return episodes.size
-    }
-
-    inner class EpisodeViewHolder(val binding: ItemEpisodePlayerBinding) : RecyclerView.ViewHolder(binding.root) {
-        init {
-            binding.imageEpisode.setOnClickListener {
-                // don't execute, if it's the current episode
-                if (currentSelected != adapterPosition) {
-                    onImageClick?.invoke(episodes[adapterPosition].title, adapterPosition)
-                }
-            }
-        }
-    }
-}

app/src/main/java/org/mosad/teapod/util/metadb/DatTypes.kt

@@ -0,0 +1,57 @@
+package org.mosad.teapod.util.metadb
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+// class representing the media list json object
+@Serializable
+data class MediaList(
+    @SerialName("media") val media: List<String>
+)
+
+// abstract class used for meta data objects (tv, movie)
+abstract class Meta {
+    abstract val id: Int
+    abstract val tmdbId: Int
+    abstract val crSeriesId: String
+}
+
+// class representing the movie json object
+@Serializable
+data class MovieMeta(
+    @SerialName("id") override val id: Int,
+    @SerialName("tmdb_id") override val tmdbId: Int,
+    @SerialName("cr_series_id") override val crSeriesId: String,
+): Meta()
+
+// class representing the tv show json object
+@Serializable
+data class TVShowMeta(
+    @SerialName("id") override val id: Int,
+    @SerialName("tmdb_id") override val tmdbId: Int,
+    @SerialName("cr_series_id") override val crSeriesId: String,
+    @SerialName("seasons") val seasons: List<SeasonMeta>,
+): Meta()
+
+// class used in TVShowMeta, part of the tv show json object
+@Serializable
+data class SeasonMeta(
+    @SerialName("id") val id: Int,
+    @SerialName("tmdb_season_id") val tmdbSeasonId: Int,
+    @SerialName("tmdb_season_number") val tmdbSeasonNumber: Int,
+    @SerialName("cr_season_ids") val crSeasonIds: List<String>,
+    @SerialName("episodes") val episodes: List<EpisodeMeta>,
+)
+
+// class used in TVShowMeta, part of the tv show json object
+@Serializable
+data class EpisodeMeta(
+    @SerialName("id") val id: Int,
+    @SerialName("tmdb_episode_id") val tmdbEpisodeId: Int,
+    @SerialName("tmdb_episode_number") val tmdbEpisodeNumber: Int,
+    @SerialName("cr_episode_ids") val crEpisodeIds: List<String>,
+    @SerialName("opening_start") val openingStart: Long,
+    @SerialName("opening_duration") val openingDuration: Long,
+    @SerialName("ending_start") val endingStart: Long,
+    @SerialName("ending_duration") val endingDuration: Long
+)

app/src/main/java/org/mosad/teapod/util/metadb/MetaDBController.kt

@@ -0,0 +1,89 @@
+/**
+ * Teapod
+ *
+ * Copyright 2020-2022  <seil0@mosad.xyz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.teapod.util.metadb
+
+import android.util.Log
+import io.ktor.client.*
+import io.ktor.client.call.*
+import io.ktor.client.plugins.*
+import io.ktor.client.plugins.contentnegotiation.*
+import io.ktor.client.request.*
+import io.ktor.http.*
+import io.ktor.serialization.kotlinx.json.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+
+object MetaDBController {
+    private val TAG = javaClass.name
+
+    private const val repoUrl = "https://gitlab.com/Seil0/teapodmetadb/-/raw/main/crunchy/"
+
+    private val client = HttpClient {
+        install(ContentNegotiation) {
+            json()
+        }
+    }
+
+    private var mediaList = MediaList(listOf())
+    private var metaCacheList = arrayListOf<Meta>()
+
+    suspend fun list() = withContext(Dispatchers.IO) {
+        val raw: String = client.get("$repoUrl/list.json").body()
+        mediaList = Json.decodeFromString(raw)
+    }
+
+    /**
+     * Get the meta data for a movie from MetaDB
+     * @param crSeriesId The crunchyroll media id
+     * @return A meta object, or null if not found
+     */
+    suspend fun getTVShowMetadata(crSeriesId: String): TVShowMeta? {
+        return if (mediaList.media.contains(crSeriesId)) {
+            metaCacheList.firstOrNull {
+                it.crSeriesId == crSeriesId
+            } as TVShowMeta? ?: getTVShowMetadataFromDB(crSeriesId)
+        } else {
+            null
+        }
+    }
+
+    private suspend fun getTVShowMetadataFromDB(crSeriesId: String): TVShowMeta? = withContext(Dispatchers.IO) {
+        return@withContext try {
+            val raw: String = client.get("$repoUrl/tv/$crSeriesId/media.json").body()
+            val meta: TVShowMeta = Json.decodeFromString(raw)
+            metaCacheList.add(meta)
+
+            meta
+        } catch (ex: ClientRequestException) {
+            when (ex.response.status) {
+                HttpStatusCode.NotFound -> Log.w(TAG, "The requested file was not found. Series ID: $crSeriesId", ex)
+                else -> Log.e(TAG, "Error while requesting meta data. Series ID: $crSeriesId", ex)
+            }
+
+            null // todo return none object
+        }
+    }
+
+}

app/src/main/java/org/mosad/teapod/util/tmdb/TMDBApiController.kt

@@ -0,0 +1,175 @@
+/**
+ * Teapod
+ *
+ * Copyright 2020-2022  <seil0@mosad.xyz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.teapod.util.tmdb
+
+import android.util.Log
+import io.ktor.client.*
+import io.ktor.client.call.*
+import io.ktor.client.plugins.contentnegotiation.*
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.ktor.serialization.kotlinx.json.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.invoke
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.json.Json
+import org.mosad.teapod.preferences.Preferences
+import org.mosad.teapod.util.concatenate
+
+/**
+ * Controller for tmdb api integration.
+ * Data types are in TMDBDataTypes. For the type definitions see:
+ * https://developers.themoviedb.org/3/getting-started/introduction
+ *
+ */
+class TMDBApiController {
+    private val classTag = javaClass.name
+
+    private val client = HttpClient {
+        install(ContentNegotiation) {
+            json(Json {
+                ignoreUnknownKeys = true
+            })
+        }
+    }
+
+    private val apiUrl = "https://api.themoviedb.org/3"
+    private val apiKey = "de959cf9c07a08b5ca7cb51cda9a40c2"
+
+    companion object{
+        const val imageUrl = "https://image.tmdb.org/t/p/w500"
+    }
+
+    private suspend inline fun <reified T> request(
+        endpoint: String,
+        parameters: List<Pair<String, Any?>> = emptyList()
+    ): T = coroutineScope {
+        val path = "$apiUrl$endpoint"
+        val params = concatenate(
+            listOf("api_key" to apiKey, "language" to Preferences.preferredSubtitleLocale.toLanguageTag()),
+            parameters
+        )
+
+        // TODO handle FileNotFoundException
+        return@coroutineScope (Dispatchers.IO) {
+            val response: HttpResponse = client.get(path) {
+                params.forEach {
+                    parameter(it.first, it.second)
+                }
+            }
+
+            response.body<T>()
+        }
+    }
+
+    /**
+     * Search for a movie in tmdb
+     * @param query The query text (movie title)
+     * @return A TMDBSearch<TMDBSearchResultMovie> object, or
+     * NoneTMDBSearchMovie if nothing was found
+     */
+    suspend fun searchMovie(query: String): TMDBSearch<TMDBSearchResultMovie> {
+        val searchEndpoint = "/search/movie"
+        val parameters = listOf("query" to query, "include_adult" to false)
+
+        return try {
+            request(searchEndpoint, parameters)
+        }catch (ex: SerializationException) {
+            Log.e(classTag, "SerializationException in searchMovie(), with query = $query.", ex)
+            NoneTMDBSearchMovie
+        }
+    }
+
+    /**
+     * Search for a tv show in tmdb
+     * @param query The query text (tv show title)
+     * @return A TMDBSearch<TMDBSearchResultTVShow> object, or
+     * NoneTMDBSearchTVShow if nothing was found
+     */
+    suspend fun searchTVShow(query: String): TMDBSearch<TMDBSearchResultTVShow> {
+        val searchEndpoint = "/search/tv"
+        val parameters = listOf("query" to query, "include_adult" to false)
+
+        return try {
+            request(searchEndpoint, parameters)
+        }catch (ex: SerializationException) {
+            Log.e(classTag, "SerializationException in searchTVShow(), with query = $query.", ex)
+            NoneTMDBSearchTVShow
+        }
+    }
+
+    /**
+     * Get details for a movie from tmdb
+     * @param movieId The tmdb ID of the movie
+     * @return A TMDBMovie object, or NoneTMDBMovie if not found
+     */
+    suspend fun getMovieDetails(movieId: Int): TMDBMovie {
+        val movieEndpoint = "/movie/$movieId"
+
+        // TODO is FileNotFoundException handling needed?
+        return try {
+            request(movieEndpoint)
+        }catch (ex: SerializationException) {
+            Log.e(classTag, "SerializationException in getMovieDetails(), with movieId = $movieId.", ex)
+            NoneTMDBMovie
+        }
+    }
+
+    /**
+     * Get details for a tv show from tmdb
+     * @param tvId The tmdb ID of the tv show
+     * @return A TMDBTVShow object, or NoneTMDBTVShow if not found
+     */
+    suspend fun getTVShowDetails(tvId: Int): TMDBTVShow {
+        val tvShowEndpoint = "/tv/$tvId"
+
+        // TODO is FileNotFoundException handling needed?
+        return try {
+            request(tvShowEndpoint)
+        }catch (ex: SerializationException) {
+            Log.e(classTag, "SerializationException in getTVShowDetails(), with tvId = $tvId.", ex)
+            NoneTMDBTVShow
+        }
+    }
+
+    @Suppress("unused")
+    /**
+     * Get details for a tv show season from tmdb
+     * @param tvId The tmdb ID of the tv show
+     * @param seasonNumber The tmdb season number
+     * @return A TMDBTVSeason object, or NoneTMDBTVSeason if not found
+     */
+    suspend fun getTVSeasonDetails(tvId: Int, seasonNumber: Int): TMDBTVSeason {
+        val tvShowSeasonEndpoint = "/tv/$tvId/season/$seasonNumber"
+
+        // TODO is FileNotFoundException handling needed?
+        return try {
+            request(tvShowSeasonEndpoint)
+        }catch (ex: SerializationException) {
+            Log.e(classTag, "SerializationException in getTVSeasonDetails(), with tvId = $tvId, seasonNumber = $seasonNumber.", ex)
+            NoneTMDBTVSeason
+        }
+    }
+
+}

app/src/main/java/org/mosad/teapod/util/tmdb/TMDBDataTypes.kt

@@ -0,0 +1,137 @@
+/**
+ * Teapod
+ *
+ * Copyright 2020-2022  <seil0@mosad.xyz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.teapod.util.tmdb
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/**
+ * These data classes represent the tmdb api json objects.
+ * Fields which are nullable in the tmdb api are also nullable here.
+ */
+
+interface TMDBResult {
+    val id: Int
+    val name: String? // for movies tmdb return string or null
+    val overview: String? // for movies tmdb return string or null
+    val posterPath: String?
+    val backdropPath: String?
+}
+
+data class TMDBBase(
+    override val id: Int,
+    override val name: String?,
+    override val overview: String?,
+    override val posterPath: String?,
+    override val backdropPath: String?
+) : TMDBResult
+
+/**
+ * search results for movie and tv show
+ */
+
+@Serializable
+data class TMDBSearch<T>(
+    val page: Int,
+    val results: List<T>
+)
+
+@Serializable
+data class TMDBSearchResultMovie(
+    @SerialName("id") override val id: Int,
+    @SerialName("title") override val name: String?,
+    @SerialName("overview") override val overview: String?,
+    @SerialName("poster_path") override val posterPath: String?,
+    @SerialName("backdrop_path") override val backdropPath: String?,
+) : TMDBResult
+
+@Serializable
+data class TMDBSearchResultTVShow(
+    @SerialName("id") override val id: Int,
+    @SerialName("name") override val name: String?,
+    @SerialName("overview") override val overview: String?,
+    @SerialName("poster_path") override val posterPath: String?,
+    @SerialName("backdrop_path") override val backdropPath: String?,
+) : TMDBResult
+
+val NoneTMDBSearch = TMDBSearch<TMDBBase>(0, emptyList())
+val NoneTMDBSearchMovie = TMDBSearch<TMDBSearchResultMovie>(0, emptyList())
+val NoneTMDBSearchTVShow = TMDBSearch<TMDBSearchResultTVShow>(0, emptyList())
+
+/**
+ * detail return data types
+ */
+
+@Serializable
+data class TMDBMovie(
+    @SerialName("id") override val id: Int,
+    @SerialName("title") override val name: String, // for movies the name is in the field title
+    @SerialName("overview") override val overview: String?,
+    @SerialName("poster_path") override val posterPath: String?,
+    @SerialName("backdrop_path") override val backdropPath: String?,
+    @SerialName("release_date") val releaseDate: String,
+    @SerialName("runtime") val runtime: Int?,
+    @SerialName("status") val status: String,
+    // TODO genres
+) : TMDBResult
+
+@Serializable
+data class TMDBTVShow(
+    @SerialName("id")override val id: Int,
+    @SerialName("name")override val name: String,
+    @SerialName("overview")override val overview: String,
+    @SerialName("poster_path") override val posterPath: String?,
+    @SerialName("backdrop_path") override val backdropPath: String?,
+    @SerialName("first_air_date") val firstAirDate: String?,
+    @SerialName("last_air_date") val lastAirDate: String?,
+    @SerialName("status") val status: String?,
+    // TODO genres
+) : TMDBResult
+
+// use null for nullable types, the gui needs to handle/implement a fallback for null values
+val NoneTMDB = TMDBBase(0, "", "", null, null)
+val NoneTMDBMovie = TMDBMovie(0, "", "", null, null, "1970-01-01", null, "")
+val NoneTMDBTVShow = TMDBTVShow(0, "", "", null, null, "1970-01-01", "1970-01-01", "")
+
+@Serializable
+data class TMDBTVSeason(
+    @SerialName("id") val id: Int,
+    @SerialName("name") val name: String,
+    @SerialName("overview") val overview: String,
+    @SerialName("poster_path") val posterPath: String?,
+    @SerialName("air_date") val airDate: String,
+    @SerialName("episodes") val episodes: List<TMDBTVEpisode>,
+    @SerialName("season_number") val seasonNumber: Int
+)
+
+@Serializable
+data class TMDBTVEpisode(
+    @SerialName("id") val id: Int,
+    @SerialName("name") val name: String,
+    @SerialName("overview") val overview: String,
+    @SerialName("air_date") val airDate: String,
+    @SerialName("episode_number") val episodeNumber: Int
+)
+
+// use null for nullable types, the gui needs to handle/implement a fallback for null values
+val NoneTMDBTVSeason = TMDBTVSeason(0, "", "", null, "", emptyList(), 0)

app/src/main/res/color/bottom_nav_item_tint.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorPrimary" android:state_checked="true"/>
-    <item android:color="?attr/iconColor"/>
-</selector>

app/src/main/res/drawable/bg_splash.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@android:color/black"/>
-
-    <item android:gravity="center" android:width="144dp" android:height="144dp">
-        <bitmap
-            android:gravity="fill_horizontal|fill_vertical"
-            android:src="@drawable/ic_splash_logo"/>
-    </item>
-
-</layer-list>

app/src/main/res/drawable/dot_default.xml

@@ -6,7 +6,7 @@
             android:shape="ring"
             android:thickness="4dp"
             android:useLevel="false">
-            <solid android:color="?iconColor"/>
+            <solid android:color="?colorOutline"/>
         </shape>
     </item>
 </layer-list>

app/src/main/res/drawable/dot_selected.xml

@@ -6,7 +6,7 @@
             android:shape="ring"
             android:thickness="4dp"
             android:useLevel="false">
-            <solid android:color="@color/colorAccent" />
+            <solid android:color="?colorSecondary" />
         </shape>
     </item>
 </layer-list>

app/src/main/res/drawable/ic_baseline_access_time_24.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
+</vector>

app/src/main/res/drawable/ic_baseline_add_24.xml

@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>

app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M7,10l5,5 5,-5z"/>
+</vector>

app/src/main/res/drawable/ic_baseline_audiotrack_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,3v9.28c-0.47,-0.17 -0.97,-0.28 -1.5,-0.28C8.01,12 6,14.01 6,16.5S8.01,21 10.5,21c2.31,0 4.2,-1.75 4.45,-4H15V6h4V3h-7z"/>
+</vector>

app/src/main/res/drawable/ic_baseline_bookmark_border_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z"/>
+</vector>

app/src/main/res/drawable/ic_baseline_code_24.xml

@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
 </vector>

app/src/main/res/drawable/ic_baseline_description_24.xml

@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
 </vector>

app/src/main/res/drawable/ic_baseline_language_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+</vector>

app/src/main/res/drawable/ic_baseline_people_24.xml

@@ -1,5 +1,8 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path android:fillColor="@android:color/white" android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
 </vector>

app/src/main/res/drawable/ic_baseline_search_24.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/iconColor">
+    android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>

app/src/main/res/drawable/ic_baseline_style_24.xml

@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z"/>
 </vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -3,17 +3,18 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="0.051679686"
-      android:scaleY="0.051679686"
-      android:translateX="27.54"
-      android:translateY="38.90954">
-    <path
-        android:pathData="m850.19,372.71c87.88,-11.01 119.04,-84.97 123.1,-99.87 4.06,-14.89 24.91,-80.57 11.92,-129.36 -12.99,-48.79 -34.36,-72.36 -58.62,-77.25 -24.25,-4.9 -50.59,10.51 -65,32.81 -14.41,22.3 -14.68,45.14 -14.78,55.29 -0.11,10.15 0.76,23.2 -3.37,33.29 -4.13,10.09 3.23,25.71 6.04,35.23 2.81,9.52 9.67,82.62 5.78,115.57 -3.89,32.95 -5.07,34.29 -5.07,34.29zM0.4,23.58C55.81,77.29 56.45,120.86 56.08,132.92c-0.36,12.06 4.77,130.59 11.47,150.76 4.42,13.3 12.11,50.16 41.78,74.48 25.51,20.91 58.65,31.38 58.65,31.38 0,0 36.42,78.46 78.83,108.64 31.56,22.46 39.61,23.74 46.5,35.55 6.18,10.6 93.56,62.62 275.1,47.23 127.29,-10.79 138.56,-44.3 138.56,-44.3 0,0 49.41,-21.9 101.15,-80.43 12.87,-14.56 4.41,-13.21 28.57,-17.79 24.16,-4.58 138.01,-45.58 170.66,-154.36C1039.99,175.32 1017.81,96.01 994.52,69.12 971.23,42.22 931.6,24.18 912.25,24.93c-18.47,0.71 -44.78,4.24 -80.21,46.87 -35.43,42.62 -28.94,37.4 -39.36,41.73 -6.82,2.83 -5.68,3.91 -26.75,-11.65 -20.23,-14.93 -28.9,-21.24 -43.38,-27.24 -7.96,-3.3 2.05,-5.55 2.59,-19.48 0.54,-13.93 2.4,-23.51 -17.32,-23.77 -19.72,-0.26 -408.02,0.21 -408.02,0.21 0,0 -18.8,-1.29 -7.79,24.82 4.2,9.94 -1.45,6.43 -33.27,25.85 -31.82,19.42 -55.58,34.4 -72.28,66.09 -8.43,16 -22.91,23.02 -27.97,8.05C153.44,141.43 125.2,48.96 105.17,23.22 85.56,-1.97 77.8,0.26 77.8,0.26Z"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.41878"
-        android:fillColor="#000000"
-        android:strokeColor="#000000"
-        android:fillType="evenOdd"
-        android:strokeLineCap="butt"/>
-  </group>
+    <group
+        android:scaleX="0.051679686"
+        android:scaleY="0.051679686"
+        android:translateX="27.54"
+        android:translateY="38.90954">
+        <path
+            android:fillColor="#000000"
+            android:fillType="evenOdd"
+            android:pathData="m850.19,372.71c87.88,-11.01 119.04,-84.97 123.1,-99.87 4.06,-14.89 24.91,-80.57 11.92,-129.36 -12.99,-48.79 -34.36,-72.36 -58.62,-77.25 -24.25,-4.9 -50.59,10.51 -65,32.81 -14.41,22.3 -14.68,45.14 -14.78,55.29 -0.11,10.15 0.76,23.2 -3.37,33.29 -4.13,10.09 3.23,25.71 6.04,35.23 2.81,9.52 9.67,82.62 5.78,115.57 -3.89,32.95 -5.07,34.29 -5.07,34.29zM0.4,23.58C55.81,77.29 56.45,120.86 56.08,132.92c-0.36,12.06 4.77,130.59 11.47,150.76 4.42,13.3 12.11,50.16 41.78,74.48 25.51,20.91 58.65,31.38 58.65,31.38 0,0 36.42,78.46 78.83,108.64 31.56,22.46 39.61,23.74 46.5,35.55 6.18,10.6 93.56,62.62 275.1,47.23 127.29,-10.79 138.56,-44.3 138.56,-44.3 0,0 49.41,-21.9 101.15,-80.43 12.87,-14.56 4.41,-13.21 28.57,-17.79 24.16,-4.58 138.01,-45.58 170.66,-154.36C1039.99,175.32 1017.81,96.01 994.52,69.12 971.23,42.22 931.6,24.18 912.25,24.93c-18.47,0.71 -44.78,4.24 -80.21,46.87 -35.43,42.62 -28.94,37.4 -39.36,41.73 -6.82,2.83 -5.68,3.91 -26.75,-11.65 -20.23,-14.93 -28.9,-21.24 -43.38,-27.24 -7.96,-3.3 2.05,-5.55 2.59,-19.48 0.54,-13.93 2.4,-23.51 -17.32,-23.77 -19.72,-0.26 -408.02,0.21 -408.02,0.21 0,0 -18.8,-1.29 -7.79,24.82 4.2,9.94 -1.45,6.43 -33.27,25.85 -31.82,19.42 -55.58,34.4 -72.28,66.09 -8.43,16 -22.91,23.02 -27.97,8.05C153.44,141.43 125.2,48.96 105.17,23.22 85.56,-1.97 77.8,0.26 77.8,0.26Z"
+            android:strokeWidth="0.41878"
+            android:strokeColor="#000000"
+            android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" />
+    </group>
 </vector>

app/src/main/res/drawable/ic_outline_download_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,15v3H6v-3H4v3c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-3H18zM17,11l-1.41,-1.41L13,12.17V4h-2v8.17L8.41,9.59L7,11l5,5L17,11z" />
+</vector>

app/src/main/res/drawable/ic_outline_info_24.xml

@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
 </vector>

app/src/main/res/drawable/ic_outline_upload_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,15v3H6v-3H4v3c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-3H18zM7,9l1.41,1.41L11,7.83V16h2V7.83l2.59,2.58L17,9l-5,-5L7,9z" />
+</vector>

app/src/main/res/drawable/ic_splash_foreground.xml

@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.03158203"
+      android:scaleY="0.03158203"
+      android:translateX="37.83"
+      android:translateY="44.778053">
+    <path
+        android:pathData="m850.19,372.71c87.88,-11.01 119.04,-84.97 123.1,-99.87 4.06,-14.89 24.91,-80.57 11.92,-129.36 -12.99,-48.79 -34.36,-72.36 -58.62,-77.25 -24.25,-4.9 -50.59,10.51 -65,32.81 -14.41,22.3 -14.68,45.14 -14.78,55.29 -0.11,10.15 0.76,23.2 -3.37,33.29 -4.13,10.09 3.23,25.71 6.04,35.23 2.81,9.52 9.67,82.62 5.78,115.57 -3.89,32.95 -5.07,34.29 -5.07,34.29zM0.4,23.58C55.81,77.29 56.45,120.86 56.08,132.92c-0.36,12.06 4.77,130.59 11.47,150.76 4.42,13.3 12.11,50.16 41.78,74.48 25.51,20.91 58.65,31.38 58.65,31.38 0,0 36.42,78.46 78.83,108.64 31.56,22.46 39.61,23.74 46.5,35.55 6.18,10.6 93.56,62.62 275.1,47.23 127.29,-10.79 138.56,-44.3 138.56,-44.3 0,0 49.41,-21.9 101.15,-80.43 12.87,-14.56 4.41,-13.21 28.57,-17.79 24.16,-4.58 138.01,-45.58 170.66,-154.36C1039.99,175.32 1017.81,96.01 994.52,69.12 971.23,42.22 931.6,24.18 912.25,24.93c-18.47,0.71 -44.78,4.24 -80.21,46.87 -35.43,42.62 -28.94,37.4 -39.36,41.73 -6.82,2.83 -5.68,3.91 -26.75,-11.65 -20.23,-14.93 -28.9,-21.24 -43.38,-27.24 -7.96,-3.3 2.05,-5.55 2.59,-19.48 0.54,-13.93 2.4,-23.51 -17.32,-23.77 -19.72,-0.26 -408.02,0.21 -408.02,0.21 0,0 -18.8,-1.29 -7.79,24.82 4.2,9.94 -1.45,6.43 -33.27,25.85 -31.82,19.42 -55.58,34.4 -72.28,66.09 -8.43,16 -22.91,23.02 -27.97,8.05C153.44,141.43 125.2,48.96 105.17,23.22 85.56,-1.97 77.8,0.26 77.8,0.26Z"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="0.41878"
+        android:fillColor="#000000"
+        android:strokeColor="#000000"
+        android:fillType="evenOdd"
+        android:strokeLineCap="butt"/>
+  </group>
+</vector>

app/src/main/res/drawable/placeholder_image.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?colorSurfaceVariant"/>
+    <size
+        android:width="1920px"
+        android:height="1080px"/>
+</shape>

app/src/main/res/drawable/placeholder_image_2_3.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?colorSurfaceVariant"/>
+    <size
+        android:width="400px"
+        android:height="600px"/>
+</shape>

app/src/main/res/drawable/shape_rounded_corner.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?textBackground"/>
+    <solid android:color="?colorSurfaceVariant"/>
     <corners android:radius="3dp"/>
 </shape>

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

@@ -9,8 +9,6 @@
         android:id="@+id/nav_view"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="?themeSecondary"
-        app:itemIconTint="@color/bottom_nav_item_tint"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"

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

@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/player_layout"
+    android:id="@+id/player_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#000000"
@@ -16,9 +16,7 @@
         android:layout_gravity="center"
         android:animateLayoutChanges="true"
         android:foreground="@drawable/ripple_background"
-        app:controller_layout_id="@layout/player_controls"
-        app:fastforward_increment="10000"
-        app:rewind_increment="10000" />
+        app:controller_layout_id="@layout/player_controls" />
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/loading"
@@ -26,7 +24,7 @@
         android:layout_height="70dp"
         android:layout_gravity="center"
         android:indeterminate="true"
-        app:indicatorColor="@color/exo_white"
+        app:indicatorColor="@color/player_white"
         tools:visibility="visible" />
 
     <LinearLayout
@@ -79,14 +77,30 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="12dp"
-        android:layout_marginBottom="70dp"
+        android:layout_marginBottom="72dp"
         android:gravity="center"
         android:text="@string/next_episode"
         android:textAllCaps="false"
         android:textColor="@android:color/primary_text_light"
         android:textSize="16sp"
         android:visibility="gone"
-        app:backgroundTint="@color/exo_white"
+        app:backgroundTint="@color/player_white"
+        app:iconGravity="textStart" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/button_skip_op"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="72dp"
+        android:gravity="center"
+        android:text="@string/skip_opening"
+        android:textAllCaps="false"
+        android:textColor="@android:color/primary_text_light"
+        android:textSize="16sp"
+        android:visibility="gone"
+        app:backgroundTint="@color/player_white"
         app:iconGravity="textStart" />
 
 </FrameLayout>

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

@@ -19,6 +19,6 @@
         android:layout_centerInParent="true"
         android:layout_marginStart="42dp"
         android:text="@string/fwd_10_s"
-        android:textColor="@color/exo_white"
+        android:textColor="@color/player_white"
         android:visibility="gone" />
 </RelativeLayout>

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

@@ -20,7 +20,7 @@
         android:layout_centerInParent="true"
         android:layout_marginEnd="42dp"
         android:text="@string/rwd_10_s"
-        android:textColor="@color/exo_white"
+        android:textColor="@color/player_white"
         android:visibility="gone" />
 
 

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

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linLayout_login"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="24dp"
-    android:paddingEnd="24dp">
-
-    <EditText
-        android:id="@+id/edit_text_login"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="7dp"
-        android:ems="10"
-        android:hint="@string/login"
-        android:importantForAutofill="no"
-        android:inputType="textEmailAddress" />
-
-    <EditText
-        android:id="@+id/edit_text_password"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="7dp"
-        android:ems="10"
-        android:hint="@string/password"
-        android:importantForAutofill="no"
-        android:inputType="textPassword" />
-
-</LinearLayout>

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

@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?themePrimary"
     tools:context=".ui.activity.main.fragments.AboutFragment">
 
     <LinearLayout
@@ -67,8 +64,7 @@
                     android:minHeight="48dp"
                     android:padding="9dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/ic_outline_info_24"
-                    app:tint="?iconColor" />
+                    android:src="@drawable/ic_outline_info_24" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -89,8 +85,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="@string/version_desc"
-                        android:textColor="?textSecondary" />
+                        android:text="@string/version_desc" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -112,8 +107,7 @@
                     android:minHeight="48dp"
                     android:padding="9dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/ic_baseline_people_24"
-                    app:tint="?iconColor" />
+                    android:src="@drawable/ic_baseline_people_24" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -134,8 +128,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="@string/author_desc"
-                        android:textColor="?textSecondary" />
+                        android:text="@string/author_desc" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -157,8 +150,7 @@
                     android:minHeight="48dp"
                     android:padding="9dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/ic_baseline_code_24"
-                    app:tint="?iconColor" />
+                    android:src="@drawable/ic_baseline_code_24" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -179,8 +171,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="@string/teapod_repo"
-                        android:textColor="?textSecondary" />
+                        android:text="@string/teapod_repo" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -202,8 +193,7 @@
                     android:minHeight="48dp"
                     android:padding="9dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/ic_baseline_description_24"
-                    app:tint="?iconColor" />
+                    android:src="@drawable/ic_baseline_description_24" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -224,8 +214,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="@string/license_desc"
-                        android:textColor="?textSecondary" />
+                        android:text="@string/license_desc" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -267,8 +256,7 @@
             android:layout_marginEnd="7dp"
             android:paddingBottom="5dp"
             android:text="@string/tmdb_notice"
-            android:textAlignment="center"
-            android:textColor="?textSecondary" />
+            android:textAlignment="center" />
 
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>

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

@@ -4,12 +4,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?themePrimary"
     tools:context=".ui.activity.main.fragments.AccountFragment">
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:scrollbars="none">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -23,7 +23,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
-                android:background="?themeSecondary"
                 android:elevation="5dp"
                 android:orientation="vertical">
 
@@ -34,7 +33,7 @@
                     android:paddingStart="7dp"
                     android:paddingEnd="7dp"
                     android:text="@string/account"
-                    android:textSize="16sp"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                     android:textStyle="bold" />
 
                 <LinearLayout
@@ -55,8 +54,7 @@
                         android:minHeight="48dp"
                         android:padding="9dp"
                         android:scaleType="fitXY"
-                        android:src="@drawable/ic_baseline_account_box_24"
-                        app:tint="?iconColor" />
+                        android:src="@drawable/ic_baseline_account_box_24" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -69,18 +67,59 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:text="@string/account_login_ex"
-                            android:textSize="16sp" />
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
 
                         <TextView
                             android:id="@+id/text_account_login_desc"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
-                            android:text="@string/account_login_desc"
-                            android:textColor="?textSecondary" />
+                            android:text="@string/account_login_desc" />
                     </LinearLayout>
-
                 </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/linear_account_subscription"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:foreground="?android:selectableItemBackground"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:padding="7dp">
+
+                    <ImageView
+                        android:id="@+id/imageView6"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/account"
+                        android:minWidth="48dp"
+                        android:minHeight="48dp"
+                        android:padding="9dp"
+                        android:scaleType="fitXY"
+                        android:src="@drawable/ic_baseline_access_time_24" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/text_account_subscription"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/loading"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
+
+                        <TextView
+                            android:id="@+id/text_account_subscription_desc"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/account_tier" />
+                    </LinearLayout>
+                </LinearLayout>
+
             </LinearLayout>
 
             <LinearLayout
@@ -88,7 +127,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
-                android:background="?themeSecondary"
                 android:elevation="5dp"
                 android:orientation="vertical">
 
@@ -99,72 +137,83 @@
                     android:paddingStart="7dp"
                     android:paddingEnd="7dp"
                     android:text="@string/settings"
-                    android:textSize="16sp"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                     android:textStyle="bold" />
 
                 <LinearLayout
-                    android:id="@+id/linear_settings_secondary"
+                    android:id="@+id/linear_settings_audio_language"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:gravity="center"
                     android:orientation="horizontal"
                     android:padding="7dp">
 
                     <ImageView
-                        android:id="@+id/imageView3"
+                        android:id="@+id/imageView4"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:contentDescription="@string/settings_secondary"
+                        android:contentDescription="@string/settings_audio_language"
                         android:minWidth="48dp"
                         android:minHeight="48dp"
                         android:padding="9dp"
                         android:scaleType="fitXY"
-                        android:src="@drawable/ic_baseline_subtitles_24"
-                        app:tint="?iconColor" />
+                        android:src="@drawable/ic_baseline_audiotrack_24" />
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
+                    <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
 
-                        <LinearLayout
-                            android:id="@+id/linearLayout"
-                            android:layout_width="0dp"
+                        <TextView
+                            android:id="@+id/text_settings_content_language"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toStartOf="@+id/switch_secondary"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent">
+                            android:text="@string/settings_audio_language"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
 
-                            <TextView
-                                android:id="@+id/text_settings_secondary"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:text="@string/settings_secondary"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:id="@+id/text_settings_secondary_desc"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:maxLines="2"
-                                android:text="@string/settings_secondary_desc"
-                                android:textColor="?textSecondary" />
-                        </LinearLayout>
-
-                        <com.google.android.material.switchmaterial.SwitchMaterial
-                            android:id="@+id/switch_secondary"
-                            android:layout_width="wrap_content"
+                        <TextView
+                            android:id="@+id/text_settings_audio_language_desc"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:checked="true"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
+                            android:text="@string/settings_content_language_desc" />
+                    </LinearLayout>
+                </LinearLayout>
 
+                <LinearLayout
+                    android:id="@+id/linear_settings_subtitle_language"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
+                    android:padding="7dp">
 
+                    <ImageView
+                        android:id="@+id/imageView7"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/settings_subtitle_language"
+                        android:minWidth="48dp"
+                        android:minHeight="48dp"
+                        android:padding="9dp"
+                        android:scaleType="fitXY"
+                        android:src="@drawable/ic_baseline_subtitles_24" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/text_settings_subtitle_language"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/settings_subtitle_language"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
+
+                        <TextView
+                            android:id="@+id/text_settings_subtitle_language_desc"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/settings_content_language_desc" />
+                    </LinearLayout>
                 </LinearLayout>
 
                 <LinearLayout
@@ -176,15 +225,14 @@
                     android:padding="7dp">
 
                     <ImageView
-                        android:id="@+id/imageView4"
+                        android:id="@+id/image_autoplay"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:contentDescription="@string/settings_autoplay"
                         android:minWidth="48dp"
                         android:minHeight="48dp"
                         android:padding="9dp"
-                        android:src="@drawable/ic_baseline_autorenew_24"
-                        app:tint="?iconColor" />
+                        android:src="@drawable/ic_baseline_autorenew_24" />
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
@@ -205,14 +253,13 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:text="@string/settings_autoplay"
-                                android:textSize="16sp" />
+                                android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
 
                             <TextView
                                 android:id="@+id/text_settings_auoplay_desc"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:text="@string/settings_autoplay_desc"
-                                android:textColor="?textSecondary" />
+                                android:text="@string/settings_autoplay_desc" />
                         </LinearLayout>
 
                         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -220,6 +267,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:checked="true"
+                            android:contentDescription="@string/settings_autoplay"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
@@ -237,7 +285,7 @@
                     android:padding="7dp">
 
                     <ImageView
-                        android:id="@+id/imageViewTheme"
+                        android:id="@+id/image_theme"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:contentDescription="@string/account"
@@ -245,8 +293,7 @@
                         android:minHeight="48dp"
                         android:padding="9dp"
                         android:scaleType="fitXY"
-                        android:src="@drawable/ic_baseline_style_24"
-                        app:tint="?iconColor" />
+                        android:src="@drawable/ic_baseline_style_24" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -259,15 +306,184 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:text="@string/theme"
-                            android:textSize="16sp" />
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
 
                         <TextView
                             android:id="@+id/text_theme_selected"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
-                            android:text="@string/theme_light"
-                            android:textColor="?textSecondary" />
+                            android:text="@string/theme_light" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/linear_dev_settings"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:clipToPadding="false"
+                android:elevation="5dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/text_dev_settings"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="7dp"
+                    android:paddingEnd="7dp"
+                    android:text="@string/dev_settings"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:id="@+id/linear_update_playhead"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:padding="7dp">
+
+                    <ImageView
+                        android:id="@+id/imageView5"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/update_playhead"
+                        android:minWidth="48dp"
+                        android:minHeight="48dp"
+                        android:padding="9dp"
+                        android:scaleType="fitXY"
+                        android:src="@drawable/ic_baseline_access_time_24" />
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <LinearLayout
+                            android:id="@+id/linearLayout4"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:orientation="vertical"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toStartOf="@+id/switch_update_playhead"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent">
+
+                            <TextView
+                                android:id="@+id/text_update_playhead"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:text="@string/update_playhead"
+                                android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
+
+                            <TextView
+                                android:id="@+id/text_update_playhead_desc"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:text="@string/update_playhead_desc" />
+                        </LinearLayout>
+
+                        <com.google.android.material.switchmaterial.SwitchMaterial
+                            android:id="@+id/switch_update_playhead"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:checked="true"
+                            android:contentDescription="@string/update_playhead"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/linear_export_data"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:foreground="?android:selectableItemBackground"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:padding="7dp"
+                    android:visibility="gone">
+
+                    <ImageView
+                        android:id="@+id/image_export_data"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/info"
+                        android:minWidth="48dp"
+                        android:minHeight="48dp"
+                        android:padding="9dp"
+                        android:scaleType="fitXY"
+                        app:srcCompat="@drawable/ic_outline_upload_24" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/text_export_data"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/export_data"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/text_export_data_desc"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/export_data_desc" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/linear_import_data"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:foreground="?android:selectableItemBackground"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:padding="7dp"
+                    android:visibility="gone">
+
+                    <ImageView
+                        android:id="@+id/image_import_data"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/info"
+                        android:minWidth="48dp"
+                        android:minHeight="48dp"
+                        android:padding="9dp"
+                        android:scaleType="fitXY"
+                        app:srcCompat="@drawable/ic_outline_download_24" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/text_import_data"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/import_data"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/text_import_data_desc"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/import_data_desc" />
                     </LinearLayout>
 
                 </LinearLayout>
@@ -279,7 +495,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
-                android:background="?themeSecondary"
                 android:clipToPadding="false"
                 android:elevation="5dp"
                 android:orientation="vertical">
@@ -291,7 +506,7 @@
                     android:paddingStart="7dp"
                     android:paddingEnd="7dp"
                     android:text="@string/info"
-                    android:textSize="16sp"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                     android:textStyle="bold" />
 
                 <LinearLayout
@@ -312,8 +527,7 @@
                         android:minHeight="48dp"
                         android:padding="9dp"
                         android:scaleType="fitXY"
-                        app:srcCompat="@drawable/ic_outline_info_24"
-                        app:tint="?iconColor" />
+                        app:srcCompat="@drawable/ic_outline_info_24" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -326,15 +540,14 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:text="@string/info_about"
-                            android:textSize="16sp" />
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
 
                         <TextView
                             android:id="@+id/text_info_about_desc"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
-                            android:text="@string/info_about_desc"
-                            android:textColor="?textSecondary" />
+                            android:text="@string/info_about_desc" />
                     </LinearLayout>
 
                 </LinearLayout>

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

@@ -5,18 +5,29 @@
     android:id="@+id/ff_test"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?themePrimary"
     tools:context=".ui.activity.main.fragments.HomeFragment">
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:scrollbars="none">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="7dp"
             android:orientation="vertical">
 
+            <com.facebook.shimmer.ShimmerFrameLayout
+                android:id="@+id/shimmer_layout_highlight"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:visibility="gone">
+
+                <include layout="@layout/item_highlight_shimmer" />
+
+            </com.facebook.shimmer.ShimmerFrameLayout>
+
             <LinearLayout
                 android:id="@+id/linear_highlight"
                 android:layout_width="match_parent"
@@ -59,9 +70,7 @@
                         android:layout_height="wrap_content"
                         android:gravity="center"
                         android:text="@string/my_list"
-                        android:textColor="?textSecondary"
                         android:textSize="12sp"
-                        app:drawableTint="?buttonBackground"
                         app:drawableTopCompat="@drawable/ic_baseline_add_24" />
 
                     <Space
@@ -76,12 +85,9 @@
                         android:gravity="center"
                         android:text="@string/button_play"
                         android:textAllCaps="false"
-                        android:textColor="?themePrimary"
                         android:textSize="16sp"
-                        app:backgroundTint="?buttonBackground"
                         app:icon="@drawable/ic_baseline_play_arrow_24"
-                        app:iconGravity="textStart"
-                        app:iconTint="?themePrimary" />
+                        app:iconGravity="textStart" />
 
                     <Space
                         android:layout_width="0dp"
@@ -94,9 +100,7 @@
                         android:layout_height="wrap_content"
                         android:gravity="center"
                         android:text="@string/info"
-                        android:textColor="?textSecondary"
                         android:textSize="12sp"
-                        app:drawableTint="?buttonBackground"
                         app:drawableTopCompat="@drawable/ic_outline_info_24" />
 
                     <Space
@@ -108,14 +112,60 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/linear_my_list"
+                android:id="@+id/linear_up_next"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:paddingBottom="7dp">
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
                 <TextView
-                    android:id="@+id/text_my_list"
+                    android:id="@+id/text_up_next"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="10dp"
+                    android:paddingTop="15dp"
+                    android:paddingEnd="5dp"
+                    android:paddingBottom="5dp"
+                    android:text="@string/up_next"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <com.facebook.shimmer.ShimmerFrameLayout
+                    android:id="@+id/shimmer_layout_up_next"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:visibility="gone">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                    </LinearLayout>
+
+                </com.facebook.shimmer.ShimmerFrameLayout>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_up_next"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:listitem="@layout/item_media" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/linear_watchlist"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/text_watchlist"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="10dp"
@@ -126,64 +176,76 @@
                     android:textSize="16sp"
                     android:textStyle="bold" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recycler_my_list"
+                <com.facebook.shimmer.ShimmerFrameLayout
+                    android:id="@+id/shimmer_layout_watchlist"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    tools:visibility="gone">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                    </LinearLayout>
+
+                </com.facebook.shimmer.ShimmerFrameLayout>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_watchlist"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     tools:listitem="@layout/item_media" />
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/linear_new_episodes"
+                android:id="@+id/linear_recommendations"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
                 android:paddingBottom="7dp">
 
                 <TextView
-                    android:id="@+id/text_new_episodes"
+                    android:id="@+id/text_recommendations"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="10dp"
                     android:paddingTop="15dp"
                     android:paddingEnd="5dp"
                     android:paddingBottom="5dp"
-                    android:text="@string/new_episodes"
+                    android:text="@string/recommendations"
                     android:textSize="16sp"
                     android:textStyle="bold" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recycler_new_episodes"
+                <com.facebook.shimmer.ShimmerFrameLayout
+                    android:id="@+id/shimmer_layout_recommendations"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                    tools:listitem="@layout/item_media" />
-            </LinearLayout>
+                    tools:visibility="gone">
 
-            <LinearLayout
-                android:id="@+id/linear_new_simulcasts"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:paddingBottom="7dp">
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                    </LinearLayout>
 
-                <TextView
-                    android:id="@+id/text_new_simulcasts"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="10dp"
-                    android:paddingTop="15dp"
-                    android:paddingEnd="5dp"
-                    android:paddingBottom="5dp"
-                    android:text="@string/new_simulcasts"
-                    android:textSize="16sp"
-                    android:textStyle="bold" />
+                </com.facebook.shimmer.ShimmerFrameLayout>
 
                 <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recycler_new_simulcasts"
+                    android:id="@+id/recycler_recommendations"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:orientation="horizontal"
@@ -195,8 +257,7 @@
                 android:id="@+id/linear_new_titles"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:paddingBottom="7dp">
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/text_new_titles"
@@ -210,6 +271,26 @@
                     android:textSize="16sp"
                     android:textStyle="bold" />
 
+                <com.facebook.shimmer.ShimmerFrameLayout
+                    android:id="@+id/shimmer_layout_new_titles"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    tools:visibility="gone">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                    </LinearLayout>
+
+                </com.facebook.shimmer.ShimmerFrameLayout>
+
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler_new_titles"
                     android:layout_width="match_parent"
@@ -223,8 +304,7 @@
                 android:id="@+id/linear_top_ten"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:paddingBottom="7dp">
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/text_top_ten"
@@ -238,6 +318,26 @@
                     android:textSize="16sp"
                     android:textStyle="bold" />
 
+                <com.facebook.shimmer.ShimmerFrameLayout
+                    android:id="@+id/shimmer_layout_top_ten"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    tools:visibility="gone">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                        <include layout="@layout/item_media_shimmer" />
+                    </LinearLayout>
+
+                </com.facebook.shimmer.ShimmerFrameLayout>
+
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler_top_ten"
                     android:layout_width="match_parent"

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

@@ -4,22 +4,35 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?themePrimary"
     tools:context=".ui.activity.main.fragments.LibraryFragment">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_media_library"
+    <org.mosad.teapod.ui.components.EmptySubmitSearchView
+        android:id="@+id/search_text"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
+        android:elevation="8dp"
+        android:iconifiedByDefault="false"
+        android:paddingBottom="5dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+    </org.mosad.teapod.ui.components.EmptySubmitSearchView>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_media_search"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
         android:clipToPadding="false"
-        android:padding="3dp"
         android:orientation="vertical"
+        android:padding="3dp"
+        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        app:spanCount="2"
-        tools:listitem="@layout/item_media" />
+        app:layout_constraintTop_toBottomOf="@+id/search_text"
+        app:spanCount="@integer/item_media_columns"
+        tools:listitem="@layout/item_media">
+
+    </androidx.recyclerview.widget.RecyclerView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?themePrimary"
     tools:context=".ui.activity.main.fragments.MediaFragment">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -14,8 +13,7 @@
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?themePrimary">
+            android:layout_height="wrap_content">
 
             <LinearLayout
                 android:id="@+id/linear_media"
@@ -24,29 +22,42 @@
                 android:orientation="vertical"
                 app:layout_scrollFlags="scroll">
 
-                <RelativeLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <ImageView
-                        android:id="@+id/image_backdrop"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:adjustViewBounds="false"
-                        android:contentDescription="@string/media_poster_backdrop_desc"
-                        android:maxHeight="231dp"
-                        android:minHeight="220dp"
-                        android:scaleType="centerCrop" />
+                    <FrameLayout
+                        android:id="@+id/frame_image_progress"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintDimensionRatio="H,16:9"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
 
-                    <com.google.android.material.imageview.ShapeableImageView
-                        android:id="@+id/image_poster"
-                        android:layout_width="wrap_content"
-                        android:layout_height="200dp"
-                        android:layout_centerInParent="true"
-                        app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster"
-                        tools:src="@drawable/ic_launcher_background" />
+                        <ImageView
+                            android:id="@+id/image_backdrop"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:contentDescription="@string/media_poster_backdrop_desc"
+                            android:scaleType="fitCenter"
+                            tools:srcCompat="@android:color/darker_gray" />
 
-                </RelativeLayout>
+                        <com.google.android.material.imageview.ShapeableImageView
+                            android:id="@+id/image_poster"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="7dp"
+                            android:layout_marginBottom="7dp"
+                            android:scaleType="fitCenter"
+                            app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster"
+                            tools:src="@drawable/placeholder_image_2_3" />
+
+                    </FrameLayout>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <LinearLayout
                     android:id="@+id/linear_media_info"
@@ -95,12 +106,9 @@
                     android:gravity="center"
                     android:text="@string/button_play"
                     android:textAllCaps="false"
-                    android:textColor="?themePrimary"
                     android:textSize="16sp"
-                    app:backgroundTint="?buttonBackground"
                     app:icon="@drawable/ic_baseline_play_arrow_24"
-                    app:iconGravity="textStart"
-                    app:iconTint="?themePrimary" />
+                    app:iconGravity="textStart" />
 
                 <TextView
                     android:id="@+id/text_title"
@@ -111,6 +119,7 @@
                     android:layout_marginTop="12dp"
                     android:layout_marginEnd="7dp"
                     android:text="@string/text_title_ex"
+                    android:textSize="16sp"
                     android:textStyle="bold" />
 
                 <TextView
@@ -128,7 +137,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginStart="12dp"
-                    android:layout_marginTop="7dp"
+                    android:layout_marginTop="5dp"
                     android:layout_marginEnd="12dp"
                     android:orientation="horizontal">
 
@@ -136,24 +145,26 @@
                         android:id="@+id/linear_my_list_action"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:foreground="?android:selectableItemBackground"
                         android:gravity="center_horizontal"
                         android:orientation="vertical">
 
                         <ImageView
                             android:id="@+id/image_my_list_action"
-                            android:layout_width="36dp"
-                            android:layout_height="36dp"
+                            android:layout_width="48dp"
+                            android:layout_height="48dp"
                             android:contentDescription="@string/my_list"
-                            android:padding="5dp"
-                            android:src="@drawable/ic_baseline_add_24"
-                            app:tint="?buttonBackground" />
+                            android:paddingStart="11dp"
+                            android:paddingTop="11dp"
+                            android:paddingEnd="11dp"
+                            android:paddingBottom="7dp"
+                            android:src="@drawable/ic_baseline_add_24" />
 
                         <TextView
                             android:id="@+id/text_my_list_action"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/my_list"
-                            android:textColor="?textSecondary"
                             android:textSize="12sp" />
 
                     </LinearLayout>
@@ -164,13 +175,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="7dp"
-                    android:layout_marginTop="12dp"
+                    android:layout_marginTop="7dp"
                     android:layout_marginEnd="7dp"
                     android:background="@android:color/transparent"
                     app:tabGravity="start"
-                    app:tabMode="scrollable"
-                    app:tabSelectedTextColor="?textPrimary"
-                    app:tabTextColor="?textSecondary" />
+                    app:tabMode="scrollable" />
 
             </LinearLayout>
         </com.google.android.material.appbar.AppBarLayout>
@@ -189,7 +198,7 @@
         android:id="@+id/frame_loading"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?themePrimary"
+        android:background="?android:colorBackground"
         android:visibility="gone">
 
         <com.google.android.material.progressindicator.CircularProgressIndicator

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

@@ -1,10 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/linear_episodes"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/button_season_selection"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="7dp"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="7dp"
+        android:layout_marginBottom="6dp"
+        android:singleLine="true"
+        android:text="@string/text_title_ex"
+        app:icon="@drawable/ic_baseline_arrow_drop_down_24"
+        app:iconGravity="end" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_episodes"
@@ -16,4 +30,4 @@
         tools:layout_editor_absoluteY="298dp"
         tools:listitem="@layout/item_episode" />
 
-</FrameLayout>
+</LinearLayout>

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

@@ -16,7 +16,7 @@
         android:paddingEnd="3dp"
         android:paddingBottom="3dp"
         app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        app:spanCount="2"
+        app:spanCount="@integer/item_media_columns"
         tools:listitem="@layout/item_media" />
 
 </FrameLayout>

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.activity.main.fragments.MyListsFragment">
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tab_my_lists"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tabMode="fixed">
+        <!-- TODO app:tabTextColor="?colorOnPrimary" -->
+
+        <com.google.android.material.tabs.TabItem
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/my_list" />
+
+        <com.google.android.material.tabs.TabItem
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/crunchylists" />
+
+        <com.google.android.material.tabs.TabItem
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/downloads" />
+    </com.google.android.material.tabs.TabLayout>
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/pager_my_lists"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tab_my_lists" />
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,8 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?themePrimary">
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/image_login"
@@ -11,12 +10,12 @@
         android:layout_height="128dp"
         android:contentDescription="@string/app_name"
         android:scaleType="fitCenter"
+        android:tint="?colorTeapodIcon"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_launcher_foreground"
-        app:tint="?buttonBackground" />
+        app:srcCompat="@drawable/ic_launcher_foreground" />
 
     <LinearLayout
         android:id="@+id/linear_login"
@@ -65,6 +64,7 @@
             android:layout_margin="7dp"
             android:ems="10"
             android:hint="@string/password"
+            android:imeOptions="actionDone"
             android:importantForAutofill="no"
             android:inputType="textPassword" />
 

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

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?themePrimary">
+    android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -17,12 +15,12 @@
             android:layout_height="128dp"
             android:contentDescription="@string/app_name"
             android:scaleType="fitCenter"
+            android:tint="?colorTeapodIcon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_launcher_foreground"
-            app:tint="?buttonBackground" />
+            app:srcCompat="@drawable/ic_launcher_foreground" />
 
         <LinearLayout
             android:id="@+id/linearLayout3"
@@ -38,7 +36,7 @@
                 android:id="@+id/text_app_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/app_name"
+                android:text="@string/on_welcome_heading"
                 android:textAlignment="center"
                 android:textSize="26sp"
                 android:textStyle="bold" />

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

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?themePrimary"
-    tools:context=".ui.activity.main.fragments.SearchFragment">
-
-    <SearchView
-        android:id="@+id/search_text"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:background="?themeSecondary"
-        android:elevation="8dp"
-        android:iconifiedByDefault="false"
-        android:paddingBottom="5dp"
-        android:queryHint="@string/search_hint"
-        android:searchIcon="@drawable/ic_baseline_search_24"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-    </SearchView>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_media_search"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:clipToPadding="false"
-        android:orientation="vertical"
-        android:padding="3dp"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/search_text"
-        app:spanCount="2"
-        tools:listitem="@layout/item_media">
-
-    </androidx.recyclerview.widget.RecyclerView>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -10,21 +10,22 @@
     android:paddingBottom="7dp">
 
     <LinearLayout
+        android:id="@+id/linear_episode"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
         <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_width="128dp"
+            android:layout_height="72dp">
 
             <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/image_episode"
-                android:layout_width="128dp"
-                android:layout_height="72dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:contentDescription="@string/component_poster_desc"
-                app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster"
-                app:srcCompat="@color/md_disabled_text_dark_theme" />
+                android:src="@drawable/placeholder_image"
+                app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster" />
 
             <ImageView
                 android:id="@+id/image_episode_play"
@@ -35,6 +36,15 @@
                 android:contentDescription="@string/button_play"
                 app:srcCompat="@drawable/ic_baseline_play_arrow_24"
                 app:tint="#FFFFFF" />
+
+            <com.google.android.material.progressindicator.LinearProgressIndicator
+                android:id="@+id/progress_playhead"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:max="100"
+                app:trackColor="#00FFFFFF"
+                app:trackThickness="2dp" />
         </FrameLayout>
 
         <TextView
@@ -43,8 +53,9 @@
             android:layout_height="match_parent"
             android:layout_marginStart="7dp"
             android:layout_weight="1"
+            android:ellipsize="end"
+            android:maxLines="3"
             android:text="@string/component_episode_title"
-            android:textColor="?textPrimary"
             android:textSize="16sp" />
 
         <ImageView
@@ -53,8 +64,7 @@
             android:layout_height="30dp"
             android:layout_margin="2dp"
             android:contentDescription="@string/component_watched_desc"
-            app:srcCompat="@drawable/ic_baseline_check_circle_24"
-            app:tint="?iconColor" />
+            app:srcCompat="@drawable/ic_baseline_check_circle_24" />
     </LinearLayout>
 
     <TextView
@@ -62,6 +72,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:maxLines="3"
-        android:textColor="?textSecondary" />
+        android:maxLines="3" />
+    <!-- TODO android:textColor="?textSecondary" -->
 </LinearLayout>

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

@@ -7,16 +7,16 @@
     android:padding="7dp">
 
     <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_width="192dp"
+        android:layout_height="108dp">
 
         <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/image_episode"
-            android:layout_width="192dp"
-            android:layout_height="108dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:contentDescription="@string/component_poster_desc"
-            app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster"
-            app:srcCompat="@color/md_disabled_text_dark_theme" />
+            android:src="@drawable/placeholder_image"
+            app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster" />
 
         <ImageView
             android:id="@+id/image_episode_play"
@@ -26,7 +26,16 @@
             android:background="@drawable/bg_circle__black_transparent_24dp"
             android:contentDescription="@string/button_play"
             app:srcCompat="@drawable/ic_baseline_play_arrow_24"
-            app:tint="#FFFFFF" />
+            app:tint="@color/player_white" />
+
+        <com.google.android.material.progressindicator.LinearProgressIndicator
+            android:id="@+id/progress_playhead"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:max="100"
+            app:trackColor="#00FFFFFF"
+            app:trackThickness="2dp" />
     </FrameLayout>
 
     <TextView
@@ -35,7 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="7dp"
         android:text="@string/component_episode_title"
-        android:textColor="@color/textPrimaryDark"
+        android:textColor="@color/player_text"
         android:textSize="16sp" />
 
     <View
@@ -44,14 +53,15 @@
         android:layout_height="1dp"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
-        android:background="@color/textSecondaryDark" />
+        android:background="@color/player_text_secondary" />
 
     <TextView
         android:id="@+id/text_episode_desc2"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="5dp"
+        android:maxLines="10"
         android:text="@string/text_overview_ex"
-        android:textColor="@color/textPrimaryDark"/>
+        android:textColor="@color/player_text" />
 
 </LinearLayout>

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

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/shimmer_image_highlight"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:src="@drawable/placeholder_image"
+        app:layout_constraintDimensionRatio="H,16:9"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription" />
+
+    <LinearLayout
+        android:id="@+id/shimmer_linear_highlight"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="7dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/shimmer_image_highlight">
+
+        <ImageView
+            android:id="@+id/image_dummy_text"
+            android:layout_width="128dp"
+            android:layout_height="21dp"
+            android:layout_marginTop="7dp"
+            android:layout_gravity="center"
+            app:srcCompat="@drawable/shape_rounded_corner"
+            tools:ignore="ContentDescription" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="7dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/shimmer_text_highlight_my_list"
+                android:layout_width="64dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textSize="12sp"
+                app:drawableTopCompat="@drawable/ic_baseline_add_24" />
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/shimmer_button_play_highlight"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textSize="16sp" />
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/shimmer_text_highlight_info"
+                android:layout_width="64dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                app:drawableTopCompat="@drawable/ic_outline_info_24" />
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,43 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="195dp"
-    android:layout_height="wrap_content"
-    android:backgroundTint="?themeSecondary"
-    android:visibility="visible"
-    app:cardCornerRadius="7dp"
-    app:cardElevation="4dp">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        app:cardCornerRadius="7dp"
+        app:cardElevation="4dp"
+        app:cardUseCompatPadding="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <ImageView
-            android:id="@+id/image_poster"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:contentDescription="@string/media_poster_desc"
-            android:scaleType="centerCrop"
-            app:layout_constraintBottom_toTopOf="@+id/text_title"
-            app:layout_constraintDimensionRatio="H,16:9"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:srcCompat="@color/md_disabled_text_dark_theme" />
-
-        <TextView
-            android:id="@+id/text_title"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:lines="2"
-            android:maxLines="2"
-            android:padding="3dp"
-            android:text="@string/text_title_ex"
-            android:textAlignment="center"
-            android:textSize="15sp"
-            app:layout_constraintTop_toBottomOf="@+id/image_poster" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            android:layout_height="wrap_content">
 
-</com.google.android.material.card.MaterialCardView>
+            <FrameLayout
+                android:id="@+id/frame_image_progress"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                app:layout_constraintBottom_toTopOf="@+id/text_title"
+                app:layout_constraintDimensionRatio="H,16:9"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:id="@+id/image_poster"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/media_poster_desc"
+                    android:scaleType="fitCenter"
+                    tools:srcCompat="@drawable/placeholder_image" />
+
+                <ImageView
+                    android:id="@+id/image_episode_play"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:background="@drawable/bg_circle__black_transparent_24dp"
+                    android:contentDescription="@string/button_play"
+                    app:srcCompat="@drawable/ic_baseline_play_arrow_24"
+                    app:tint="#FFFFFF" />
+
+                <com.google.android.material.progressindicator.LinearProgressIndicator
+                    android:id="@+id/progress_playhead"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:max="100"
+                    app:trackColor="#00FFFFFF"
+                    app:trackThickness="2dp" />
+            </FrameLayout>
+
+            <TextView
+                android:id="@+id/text_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:lines="2"
+                android:maxLines="2"
+                android:padding="3dp"
+                android:text="@string/text_title_ex"
+                android:textAlignment="center"
+                android:textSize="15sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/frame_image_progress" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardCornerRadius="7dp"
+        app:cardElevation="4dp"
+        app:cardUseCompatPadding="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintWidth_max="195dp">
+
+            <FrameLayout
+                android:id="@+id/frame_image_progress"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                app:layout_constraintDimensionRatio="H,16:9"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:id="@+id/image_poster"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    tools:ignore="ContentDescription" />
+
+            </FrameLayout>
+
+            <ImageView
+                android:id="@+id/image_dummy_text"
+                android:layout_width="128dp"
+                android:layout_height="19dp"
+                android:layout_margin="11dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/frame_image_progress"
+                app:srcCompat="@drawable/shape_rounded_corner"
+                tools:ignore="ContentDescription" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/standard_bottom_sheet"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingTop="24dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+        <TextView
+            android:id="@+id/text_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="7dp"
+            android:text="@string/edit_login_credentials"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/text_supporting_desc"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="5dp"
+            android:text="@string/edit_login_credentials_desc" />
+
+        <EditText
+            android:id="@+id/edit_text_login"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="7dp"
+            android:ems="10"
+            android:hint="@string/login"
+            android:importantForAutofill="no"
+            android:inputType="textEmailAddress"
+            android:minHeight="48dp" />
+
+        <EditText
+            android:id="@+id/edit_text_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="7dp"
+            android:ems="10"
+            android:hint="@string/password"
+            android:importantForAutofill="no"
+            android:inputType="textPassword"
+            android:minHeight="48dp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/negative_button"
+                    style="@android:style/Widget.Material.Button.Borderless.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="24dp"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/positive_button"
+                    style="@android:style/Widget.Material.Button.Borderless.Small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="24dp"
+                    android:text="@string/save" />
+        </LinearLayout>
+
+</LinearLayout>

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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/player_controls_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#73000000">
@@ -17,12 +19,12 @@
 
         <ImageButton
             android:id="@+id/exo_close_player"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:background="@android:color/transparent"
-            android:scaleType="fitXY"
-            android:layout_width="44dp"
-            android:layout_height="44dp"
             android:contentDescription="@string/close_player"
             android:padding="10dp"
+            android:scaleType="fitXY"
             app:srcCompat="@drawable/ic_baseline_arrow_back_24" />
 
         <TextView
@@ -32,8 +34,9 @@
             android:layout_marginEnd="44dp"
             android:text="@string/text_title_ex"
             android:textAlignment="center"
-            android:textColor="@color/exo_white"
-            android:textSize="16sp" />
+            android:textColor="@color/player_white"
+            android:textSize="16sp"
+            tools:ignore="TextContrastCheck" />
     </LinearLayout>
 
     <LinearLayout
@@ -90,13 +93,15 @@
         android:layout_gravity="bottom"
         android:layout_marginStart="12dp"
         android:layout_marginEnd="12dp"
-        android:layout_marginBottom="@dimen/exo_styled_progress_margin_bottom">
+        android:layout_marginBottom="@dimen/player_styled_progress_margin_bottom">
 
-        <View
-            android:id="@+id/exo_progress_placeholder"
+        <com.google.android.exoplayer2.ui.DefaultTimeBar
+            android:id="@id/exo_progress"
             android:layout_width="0dp"
-            android:layout_height="@dimen/exo_styled_progress_layout_height"
-            android:layout_marginBottom="2dp"
+            android:layout_height="@dimen/player_styled_progress_layout_height"
+            android:contentDescription="@string/desc_time_bar"
+            app:bar_height="3dp"
+            app:touch_target_height="@dimen/player_styled_progress_layout_height"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/exo_remaining"
             app:layout_constraintStart_toStartOf="parent"
@@ -105,9 +110,10 @@
         <TextView
             android:id="@+id/exo_remaining"
             style="@style/ExoStyledControls.TimeText.Position"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout

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

@@ -22,12 +22,12 @@
 
         <ImageButton
             android:id="@+id/button_close_episodes_list"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:background="@android:color/transparent"
-            android:scaleType="fitXY"
-            android:layout_width="44dp"
-            android:layout_height="44dp"
             android:contentDescription="@string/close_player"
             android:padding="10dp"
+            android:scaleType="fitXY"
             app:srcCompat="@drawable/ic_baseline_arrow_back_24" />
     </LinearLayout>
 

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#73000000"
@@ -22,12 +23,12 @@
 
         <ImageButton
             android:id="@+id/button_close_language_settings"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:background="@android:color/transparent"
-            android:scaleType="fitXY"
-            android:layout_width="44dp"
-            android:layout_height="44dp"
             android:contentDescription="@string/close_player"
             android:padding="10dp"
+            android:scaleType="fitXY"
             app:srcCompat="@drawable/ic_baseline_arrow_back_24" />
 
         <TextView
@@ -35,25 +36,87 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="44dp"
-            android:text="@string/language"
             android:textAlignment="center"
-            android:textColor="@color/exo_white"
-            android:textSize="16sp"
+            android:textColor="@color/player_white"
+            android:textSize="18sp"
             android:textStyle="bold" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/linear_languages"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginStart="56dp"
-        android:layout_marginEnd="56dp"
-        android:orientation="vertical"
+        android:orientation="horizontal"
         app:layout_constraintBottom_toTopOf="@+id/linear_bottom"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linear_top" />
+        app:layout_constraintTop_toBottomOf="@+id/linear_top">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/text_audio"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/audio"
+                android:textAlignment="center"
+                android:textColor="@color/player_white"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+            <ScrollView
+                android:id="@+id/scroll_audio_languages"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/audio">
+
+                <LinearLayout
+                    android:id="@+id/linear_audio_languages"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="56dp"
+                    android:layout_marginEnd="56dp"
+                    android:orientation="vertical" />
+            </ScrollView>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/text_subtitles"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/subtitles"
+                android:textAlignment="center"
+                android:textColor="@color/player_white"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+            <ScrollView
+                android:id="@+id/scroll_subtitle_languages"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/subtitles">
+
+                <LinearLayout
+                    android:id="@+id/linear_subtitle_languages"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="56dp"
+                    android:layout_marginEnd="56dp"
+                    android:orientation="vertical" />
+            </ScrollView>
+        </LinearLayout>
+
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/linear_bottom"
@@ -75,9 +138,9 @@
             android:layout_marginEnd="7dp"
             android:text="@string/cancel"
             android:textAllCaps="false"
-            android:textColor="@color/exo_white"
+            android:textColor="@color/button_text_color_light"
             android:textSize="16sp"
-            app:backgroundTint="@color/buttonBackgroundLight"
+            app:backgroundTint="@color/button_background_light"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -86,14 +149,15 @@
             android:id="@+id/button_select"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/save"
+            android:text="@string/apply"
             android:textAllCaps="false"
-            android:textColor="@color/themePrimaryDark"
+            android:textColor="@color/button_text_color_dark"
             android:textSize="16sp"
-            app:backgroundTint="@color/buttonBackgroundDark"
+            app:backgroundTint="@color/button_background_dark"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="TextContrastCheck" />
 
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/bottom_nav_menu.xml

@@ -6,15 +6,15 @@
         android:icon="@drawable/ic_home_black_24dp"
         android:title="@string/title_home" />
 
+    <item
+        android:id="@+id/navigation_my_lists"
+        android:icon="@drawable/ic_baseline_bookmark_border_24"
+        android:title="@string/title_my_lists" />
+
     <item
         android:id="@+id/navigation_library"
         android:icon="@drawable/ic_baseline_video_library_24"
         android:title="@string/title_library" />
-
-    <item
-        android:id="@+id/navigation_search"
-        android:icon="@drawable/ic_baseline_search_24"
-        android:title="@string/title_search" />
     <item
         android:id="@+id/navigation_account"
         android:icon="@drawable/ic_baseline_account_box_24"