Update fastlane metadata AoD -> Crunchyroll

7.1.0 -> 7.1.2

README.md

@@ -1,41 +1,29 @@
-# teapod
+# Teapod
 
-A unoffical App for Anime-on-Demand.
+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
-* acces all media in the library
-* search the library
-* play movies/tv shows via integrated exoplayer
-* add movies/tv shows to you list, for easier access
-
-### Missing Features
-* a alternative/secondary stream is currently not supported (for dub titles the subtitle version is missing)
+* Watch all animes from Crunchyroll on your Android device
+* Native Player based on ExoPayer
+* Prefer the OmU version via the app settings
 
 ## Screenshots
-[<img src="https://www.mosad.xyz/images/Teapod/Teapod_Home_200px.png" width=180>](https://www.mosad.xyz/images/Teapod/Teapod_Home.png)
-[<img src="https://www.mosad.xyz/images/Teapod/Teapod_Library_200px.png" width=180>](https://www.mosad.xyz/images/Teapod/Teapod_Library.png)
-[<img src="https://www.mosad.xyz/images/Teapod/Teapod_Media_200px.png" width=180>](https://www.mosad.xyz/images/Teapod/Teapod_Media.png)
-[<img src="https://www.mosad.xyz/images/Teapod/Teapod_Search_200px.png" width=180>](https://www.mosad.xyz/images/Teapod/Teapod_Search.png)
+[<img src="https://www.mosad.xyz/images/Teapod/Teapod_Home.webp" width=180>](https://www.mosad.xyz/images/Teapod/Teapod_Home.webp)
+[<img src="https://www.mosad.xyz/images/Teapod/Teapod_Library.webp" width=180>](https://www.mosad.xyz/images/Teapod/Teapod_Library.webp)
+[<img src="https://www.mosad.xyz/images/Teapod/Teapod_Media.webp" width=180>](https://www.mosad.xyz/images/Teapod/Teapod_Media.webp)
+[<img src="https://www.mosad.xyz/images/Teapod/Teapod_Search.webp" width=180>](https://www.mosad.xyz/images/Teapod/Teapod_Search.webp)
 
 ### License
-This App is licensed under the terms and conditions of GPL 3. This Project is not associated with Anime-on-Demand in any way.
+Teapod is licensed under the terms and conditions of GPL 3. This Project is not associated with Crunchyroll in any way.
 
-### Known Issues
-If a tv show is selected, the first episode will be marked as already watched. This is due to the difficulties of parsing. The Parser is designed to be as easy to maintain and fail safe as possible.
+### Contributing
+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.
 
-### Used Libraries
-* AndroidX: https://developer.android.com/jetpack/androidx
-* Material Components for Android: https://github.com/material-components/material-components-android
-* ExoPlayer: https://github.com/google/ExoPlayer
-* Gson: https://github.com/google/gson
-* Material design icons: https://github.com/google/material-design-icons
-* Material Dialogs: https://github.com/afollestad/material-dialogs
-* Jsoup: https://jsoup.org
-* kotlinx.coroutines: https://github.com/Kotlin/kotlinx.coroutines
-* Glide: https://github.com/bumptech/glide
-* Glide Transformations: https://github.com/wasabeef/glide-transformations
+### [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 [@Seil0](https://git.mosad.xyz/Seil0)
+Teapod © 2020-2022 [@Seil0](https://git.mosad.xyz/Seil0)

app/build.gradle

@@ -1,23 +1,30 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlin_version"
+}
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "org.mosad.teapod"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 1000 //00.01.0000
-        versionName "0.1.0"
+        versionCode 9000 //00.09.000
+        versionName "1.0.0-beta1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resValue "string", "build_time", buildTime()
         setProperty("archivesBaseName", "teapod-$versionName")
     }
 
+    buildFeatures {
+        viewBinding true
+    }
+
     buildTypes {
         release {
             minifyEnabled true
@@ -25,6 +32,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -36,34 +44,40 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1'
 
-    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.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.1'
-    implementation 'androidx.security:security-crypto:1.1.0-alpha02'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
+    implementation 'androidx.security:security-crypto:1.1.0-alpha03'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
 
-    implementation 'com.google.android.material:material:1.3.0-alpha03'
-    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.12.1'
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.12.1'
-    implementation 'com.google.android.exoplayer:exoplayer-dash:2.12.1'
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.12.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.code.gson:gson:2.8.8' // TODO remove, still used by metadb
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.15.0'
+    implementation 'com.google.android.exoplayer:exoplayer-hls:2.15.0'
+    implementation 'com.google.android.exoplayer:exoplayer-dash:2.15.0'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.15.0'
+    implementation 'com.google.android.exoplayer:extension-mediasession:2.15.0'
 
-    implementation 'org.jsoup:jsoup:1.13.1'
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
     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'
-    implementation 'de.psdev.licensesdialog:licensesdialog:2.1.0'
+    implementation 'com.afollestad.material-dialogs:core:3.3.0' // TODO remove once unused
+    implementation 'com.afollestad.material-dialogs:bottomsheets:3.3.0' // TODO remove once unused
 
-    testImplementation 'junit:junit:4.12'
-    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-serialization:$ktor_version"
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
 }
 

app/proguard-rules.pro

@@ -22,10 +22,40 @@
 #-renamesourcefileattribute SourceFile
 -keep class org.mosad.teapod.util.** { <fields>; }
 
+-keep class org.json.** { *; }
+
 #Gson
 -keepattributes Signature
 -dontwarn sun.misc.**
 
+# 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
+
 #misc
 -dontwarn java.lang.instrument.ClassFileTransformer
 -dontwarn java.lang.ClassValue

app/src/main/AndroidManifest.xml

@@ -1,5 +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">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -10,9 +11,9 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme.Dark">
         <activity
-            android:name=".SplashActivity"
+            android:name="org.mosad.teapod.ui.activity.SplashActivity"
             android:label="@string/app_name"
             android:theme="@style/SplashTheme"
             android:screenOrientation="portrait">
@@ -22,15 +23,28 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".PlayerActivity"
+            android:name="org.mosad.teapod.ui.activity.onboarding.OnboardingActivity"
             android:label="@string/app_name"
-            android:theme="@style/PlayerTheme"
-            android:configChanges="orientation|screenSize|layoutDirection" />
+            android:screenOrientation="portrait"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustPan">
+        </activity>
         <activity
-            android:name=".MainActivity"
+            android:name="org.mosad.teapod.ui.activity.main.MainActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait">
         </activity>
+        <activity
+            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"
+            android:taskAffinity=".player.PlayerActivity"
+            android:theme="@style/PlayerTheme"
+            tools:targetApi="n" />
     </application>
 
 </manifest>

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

@@ -1,174 +0,0 @@
-/**
- * Teapod
- *
- * Copyright 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
-
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.commit
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import org.mosad.teapod.parser.AoDParser
-import org.mosad.teapod.preferences.EncryptedPreferences
-import org.mosad.teapod.preferences.Preferences
-import org.mosad.teapod.ui.components.LoginDialog
-import org.mosad.teapod.ui.fragments.*
-import org.mosad.teapod.util.StorageController
-import org.mosad.teapod.util.TMDBApiController
-import kotlin.system.measureTimeMillis
-
-class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemSelectedListener {
-
-    private var activeBaseFragment: Fragment = HomeFragment() // the currently active fragment, home at the start
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        nav_view.setOnNavigationItemSelectedListener(this)
-
-        load()
-
-        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) {
-                nav_view.selectedItemId = R.id.navigation_home
-            } else {
-                super.onBackPressed()
-            }
-        }
-    }
-
-    override fun onNavigationItemSelected(item: MenuItem): Boolean {
-        if (supportFragmentManager.backStackEntryCount > 0) {
-            supportFragmentManager.popBackStack()
-        }
-
-        val ret = when (item.itemId) {
-            R.id.navigation_home -> {
-                activeBaseFragment = HomeFragment()
-                true
-            }
-            R.id.navigation_library -> {
-                activeBaseFragment = LibraryFragment()
-                true
-            }
-            R.id.navigation_search -> {
-                activeBaseFragment = SearchFragment()
-                true
-            }
-            R.id.navigation_account -> {
-                activeBaseFragment = AccountFragment()
-                true
-            }
-            else -> false
-        }
-
-        supportFragmentManager.commit {
-            replace(R.id.nav_host_fragment, activeBaseFragment, activeBaseFragment.javaClass.simpleName)
-        }
-
-        return ret
-    }
-
-    private fun load() {
-        // running login and list in parallel does not bring any speed improvements
-        val time = measureTimeMillis {
-            Preferences.load(this)
-
-            // make sure credentials are set
-            EncryptedPreferences.readCredentials(this)
-            if (EncryptedPreferences.password.isEmpty()) {
-                showLoginDialog(true)
-            } else {
-                // try to login in, as most sites can only bee loaded once loged in
-                if (!AoDParser.login()) showLoginDialog(false)
-            }
-
-            StorageController.load(this)
-            AoDParser.initialLoading()
-        }
-        Log.i(javaClass.name, "login and list in $time ms")
-    }
-
-    /**
-     * Show the media fragment for the selected media.
-     * While loading show the loading fragment.
-     * The loading and media fragment are not stored in activeBaseFragment,
-     * as the don't replace a fragment but are added on top of one.
-     */
-    fun showMediaFragment(mediaId: Int) = GlobalScope.launch {
-        val loadingFragment = LoadingFragment()
-        supportFragmentManager.commit {
-            add(R.id.nav_host_fragment, loadingFragment, "MediaFragment")
-            show(loadingFragment)
-        }
-
-        // load the streams for the selected media
-        val media = AoDParser.getMediaById(mediaId)
-        val tmdb = TMDBApiController().search(media.info.title, media.type)
-
-        val mediaFragment = MediaFragment(media, tmdb)
-        supportFragmentManager.commit {
-            add(R.id.nav_host_fragment, mediaFragment, "MediaFragment")
-            addToBackStack(null)
-            show(mediaFragment)
-        }
-
-        supportFragmentManager.commit {
-            remove(loadingFragment)
-        }
-    }
-
-    fun startPlayer(streamUrl: String) {
-        val intent = Intent(this, PlayerActivity::class.java).apply {
-            putExtra(getString(R.string.intent_stream_url), streamUrl)
-        }
-        startActivity(intent)
-    }
-
-    private fun showLoginDialog(firstTry: Boolean) {
-        LoginDialog(this, firstTry).positiveButton {
-            EncryptedPreferences.saveCredentials(login, password, context)
-
-            if (!AoDParser.login()) {
-                showLoginDialog(false)
-                Log.w(javaClass.name, "Login failed, please try again.")
-            }
-        }.negativeButton {
-            Log.i(javaClass.name, "Login canceled, exiting.")
-            finish()
-        }.show()
-    }
-}

app/src/main/java/org/mosad/teapod/PlayerActivity.kt

@@ -1,153 +0,0 @@
-package org.mosad.teapod
-
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.util.Log
-import android.view.View
-import android.view.WindowInsets
-import android.view.WindowInsetsController
-import androidx.appcompat.app.AppCompatActivity
-import com.google.android.exoplayer2.ExoPlayer
-import com.google.android.exoplayer2.MediaItem
-import com.google.android.exoplayer2.Player
-import com.google.android.exoplayer2.SimpleExoPlayer
-import com.google.android.exoplayer2.source.hls.HlsMediaSource
-import com.google.android.exoplayer2.upstream.DataSource
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
-import com.google.android.exoplayer2.util.Util
-import kotlinx.android.synthetic.main.activity_player.*
-
-
-class PlayerActivity : AppCompatActivity() {
-
-    private lateinit var player: SimpleExoPlayer
-    private lateinit var dataSourceFactory: DataSource.Factory
-
-    private var streamUrl = ""
-
-    private var playWhenReady = true
-    private var currentWindow = 0
-    private var playbackPosition: Long = 0
-
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_player)
-        hideBars() // Initial hide the bars
-
-        savedInstanceState?.let {
-            currentWindow = it.getInt(getString(R.string.state_resume_window))
-            playbackPosition = it.getLong(getString(R.string.state_resume_position))
-            playWhenReady = it.getBoolean(getString(R.string.state_is_playing))
-        }
-
-        streamUrl = intent.getStringExtra(getString(R.string.intent_stream_url)).toString()
-    }
-
-
-    override fun onStart() {
-        super.onStart()
-        if (Util.SDK_INT > 23) {
-            initPlayer()
-            if (video_view != null) video_view.onResume()
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        if (Util.SDK_INT <= 23) {
-            initPlayer()
-            if (video_view != null) video_view.onResume()
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        if (Util.SDK_INT <= 23) {
-            if (video_view != null) video_view.onPause()
-            releasePlayer()
-        }
-    }
-
-    override fun onStop() {
-        super.onStop()
-        if (Util.SDK_INT > 23) {
-            if (video_view != null) video_view.onPause()
-            releasePlayer()
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putInt(getString(R.string.state_resume_window), currentWindow)
-        outState.putLong(getString(R.string.state_resume_position), playbackPosition)
-        outState.putBoolean(getString(R.string.state_is_playing), playWhenReady)
-        super.onSaveInstanceState(outState)
-    }
-
-    private fun initPlayer() {
-        if (streamUrl.isEmpty()) {
-            Log.e(javaClass.name, "No stream url was set.")
-            return
-        }
-
-        player = SimpleExoPlayer.Builder(this).build()
-        dataSourceFactory = DefaultDataSourceFactory(this, Util.getUserAgent(this, "Teapod"))
-
-        val mediaSource = HlsMediaSource.Factory(dataSourceFactory)
-            .createMediaSource(MediaItem.fromUri(Uri.parse(streamUrl)))
-
-        player.playWhenReady = playWhenReady
-        player.setMediaSource(mediaSource)
-        player.seekTo(playbackPosition)
-        player.prepare()
-
-
-        player.addListener(object : Player.EventListener {
-            override fun onPlaybackStateChanged(state: Int) {
-                super.onPlaybackStateChanged(state)
-
-                loading.visibility = when (state) {
-                    ExoPlayer.STATE_READY -> View.GONE
-                    ExoPlayer.STATE_BUFFERING -> View.VISIBLE
-                    else -> View.GONE
-                }
-            }
-        })
-
-        // when the player controls get hidden, hide the bars too
-        video_view.setControllerVisibilityListener {
-            if (it == View.GONE) hideBars()
-        }
-
-        video_view.player = player
-    }
-
-    private fun releasePlayer(){
-        playbackPosition = player.currentPosition
-        currentWindow = player.currentWindowIndex
-        playWhenReady = player.playWhenReady
-        player.release()
-    }
-
-    /**
-     * hide the status and navigation bar
-     */
-    private fun hideBars() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            window.setDecorFitsSystemWindows(false)
-            window.insetsController?.apply {
-                hide(WindowInsets.Type.statusBars() or WindowInsets.Type.navigationBars())
-                systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_BARS_BY_SWIPE
-            }
-        } else {
-            @Suppress("deprecation")
-            window.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)
-        }
-    }
-}

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

@@ -1,370 +0,0 @@
-/**
- * Teapod
- *
- * Copyright 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.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.util.*
-
-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:80.0) Gecko/20100101 Firefox/80.0"
-
-    private var sessionCookies = mutableMapOf<String, String>()
-    private var csrfToken: String = ""
-    private var loginSuccess = false
-
-    private val mediaList = arrayListOf<Media>()
-    val itemMediaList = arrayListOf<ItemMedia>()
-    val newEpisodesList = arrayListOf<ItemMedia>()
-
-    fun login(): Boolean = runBlocking {
-
-        withContext(Dispatchers.Default) {
-            // 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)
-                .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
-     * -> blocking
-     */
-    fun initialLoading() = runBlocking {
-        val newEPJob = GlobalScope.async {
-            listNewEpisodes()
-        }
-
-        val listJob = GlobalScope.async {
-            listAnimes()
-        }
-
-        newEPJob.await()
-        listJob.await()
-    }
-
-    /**
-     * get a media by it's ID (int)
-     * @return Media
-     */
-    fun getMediaById(mediaId: Int): Media {
-        val media = mediaList.first { it.id == mediaId }
-
-        if (media.episodes.isEmpty()) {
-            loadStreams(media)
-        }
-
-        return media
-    }
-
-    // TODO don't use jsoup here
-    fun sendCallback(callbackPath: String) = GlobalScope.launch {
-        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 {
-            withContext(Dispatchers.IO) {
-                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()  = runBlocking {
-        if (sessionCookies.isEmpty()) login()
-
-        withContext(Dispatchers.Default) {
-            val resAnimes = Jsoup.connect(baseUrl + libraryPath)
-                .cookies(sessionCookies)
-                .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 all new episodes from AoD into newEpisodesList
-     */
-    private fun listNewEpisodes() = runBlocking {
-        if (sessionCookies.isEmpty()) login()
-
-        withContext(Dispatchers.Default) {
-            val resHome = Jsoup.connect(baseUrl)
-                .cookies(sessionCookies)
-                .get()
-
-            newEpisodesList.clear()
-            resHome.select("div.jcarousel-container-new").select("li").forEach {
-                if (it.select("span").hasClass("neweps")) {
-                    val mediaId = it.select("a.thumbs").attr("href")
-                        .substringAfterLast("/").toInt()
-                    val mediaImage = it.select("a.thumbs > img").attr("src")
-                    val mediaTitle = "${it.select("a").text()} - ${it.select("span.neweps").text()}"
-
-                    newEpisodesList.add(ItemMedia(mediaId, mediaTitle, mediaImage))
-                }
-            }
-
-        }
-    }
-
-    /**
-     * load streams for the media path, movies have one episode
-     * @param media is used as call ba reference
-     */
-    private fun loadStreams(media: Media) = runBlocking {
-        if (sessionCookies.isEmpty()) login()
-
-        if (!loginSuccess) {
-            Log.w(javaClass.name, "Login, was not successful.")
-            return@runBlocking
-        }
-
-        withContext(Dispatchers.Default) {
-
-            // 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 pl = res.select("input.streamstarter_html5").first()
-            val primary = pl.attr("data-playlist")
-            val secondary = pl.attr("data-otherplaylist")
-            val secondaryIsOmU = secondary.contains("OmU", true)
-
-            // load primary and secondary playlist
-            val primaryPlaylist = parsePlaylistAsync(primary)
-            val secondaryPlaylist = parsePlaylistAsync(secondary)
-
-            primaryPlaylist.await().playlist.forEach { ep ->
-                val epNumber = if (media.type == MediaType.TVSHOW) {
-                    ep.title.substringAfter(", Ep. ").toInt()
-                } else {
-                    0
-                }
-
-                media.episodes.add(
-                    Episode(
-                        id = ep.mediaid,
-                        priStreamUrl = ep.sources.first().file,
-                        posterUrl = ep.image,
-                        title = ep.title,
-                        description = ep.description,
-                        number = epNumber
-                    )
-                )
-            }
-            Log.i(javaClass.name, "Loading primary playlist finished")
-
-            secondaryPlaylist.await().playlist.forEach { ep ->
-                val episode = media.episodes.firstOrNull { it.id == ep.mediaid }
-
-                if (episode != null) {
-                    episode.secStreamUrl = ep.sources.first().file
-                    episode.secStreamOmU = secondaryIsOmU
-                } else {
-                    val epNumber = if (media.type == MediaType.TVSHOW) {
-                        ep.title.substringAfter(", Ep. ").toInt()
-                    } else {
-                        0
-                    }
-
-                    media.episodes.add(
-                        Episode(
-                            id = ep.mediaid,
-                            secStreamUrl = ep.sources.first().file,
-                            secStreamOmU = secondaryIsOmU,
-                            posterUrl = ep.image,
-                            title = ep.title,
-                            description = ep.description,
-                            number = epNumber
-                        )
-                    )
-                }
-            }
-            Log.i(javaClass.name, "Loading secondary plalyist finished")
-
-            // parse 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()
-                    }
-                }
-            }
-
-            // parse additional information for tv shows
-            if (media.type == MediaType.TVSHOW) {
-                res.select("div.three-box-container > div.episodebox").forEach { episodebox ->
-                    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
-                    }
-                }
-            }
-
-        }
-    }
-
-    /**
-     * don't use Gson().fromJson() as we don't have any control over the api and it may change
-     */
-    private fun parsePlaylistAsync(playlistPath: String): Deferred<AoDObject> {
-        if (playlistPath == "[]") {
-            return CompletableDeferred(AoDObject(listOf()))
-        }
-
-        return GlobalScope.async {
-            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)
-                .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
-                    )
-                })
-        }
-    }
-
-}

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

@@ -0,0 +1,588 @@
+/**
+ * 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.features.json.*
+import io.ktor.client.features.json.serializer.*
+import io.ktor.client.request.*
+import io.ktor.client.request.forms.*
+import io.ktor.client.statement.*
+import io.ktor.http.*
+import kotlinx.coroutines.*
+import kotlinx.serialization.SerializationException
+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
+import org.mosad.teapod.util.concatenate
+
+private val json = Json { ignoreUnknownKeys = true }
+
+object Crunchyroll {
+    private val TAG = javaClass.name
+
+    private val client = HttpClient {
+        install(JsonFeature) {
+            serializer = KotlinxSerializer(json)
+        }
+    }
+    private const val baseUrl = "https://beta-api.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
+
+    private var accountID = ""
+
+    private var policy = ""
+    private var signature = ""
+    private var keyPairID = ""
+
+    private val browsingCache = arrayListOf<Item>()
+
+    /**
+     * 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(basicApiTokenUrl) as HttpResponse).readText()
+            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) {
+            // TODO handle exceptions
+            val response: HttpResponse = client.submitForm("$baseUrl$tokenEndpoint", formParameters = formData) {
+                header("Authorization", "Basic $basicApiToken")
+            }
+            token = response.receive()
+            tokenValidUntil = System.currentTimeMillis() + (token.expiresIn * 1000)
+
+            Log.i(TAG, "login complete with code ${response.status}")
+            success = (response.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 {
+        if (System.currentTimeMillis() > tokenValidUntil) refreshToken()
+
+        return@coroutineScope (Dispatchers.IO) {
+            val response: T = 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) {
+                    body = bodyObject
+                    contentType(ContentType.Application.Json)
+                }
+            }
+
+            response
+        }
+    }
+
+    private suspend inline fun <reified T> requestGet(
+        endpoint: String,
+        params: List<Pair<String, Any?>> = listOf(),
+        url: String = ""
+    ): T {
+        val path = url.ifEmpty { "$baseUrl$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: index, account
+     * Needed for other functions to work properly!
+     */
+
+    /**
+     * Retrieve the identifiers necessary for streaming. If the identifiers are
+     * retrieved, set the corresponding global var. The identifiers are valid for 24h.
+     */
+    suspend fun index() {
+        val indexEndpoint = "/index/v2"
+
+        val index: Index = requestGet(indexEndpoint)
+        policy = index.cms.policy
+        signature = index.cms.signature
+        keyPairID = index.cms.keyPairId
+
+        Log.i(TAG, "Policy : $policy")
+        Log.i(TAG, "Signature : $signature")
+        Log.i(TAG, "Key Pair ID : $keyPairID")
+    }
+
+    /**
+     * 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: SerializationException) {
+            Log.e(TAG, "SerializationException in account(). This is bad!", ex)
+            NoneAccount
+        }
+
+        accountID = account.accountId
+    }
+
+    /**
+     * General element/media functions: browse, search, objects, season_list
+     */
+
+    // TODO categories
+    /**
+     * Browse the media available on crunchyroll.
+     *
+     * @param sortBy
+     * @param n Number of items to return, defaults to 10
+     *
+     * @return A **[BrowseResult]** object is returned.
+     */
+    suspend fun browse(
+        sortBy: SortBy = SortBy.ALPHABETICAL,
+        seasonTag: String = "",
+        start: Int = 0,
+        n: Int = 10
+    ): BrowseResult {
+        val browseEndpoint = "/content/v1/browse"
+        val noneOptParams = listOf(
+            "locale" to Preferences.preferredLocale.toLanguageTag(),
+            "sort_by" to sortBy.str,
+            "start" to start,
+            "n" to n
+        )
+
+        // if a season tag is present add it to the parameters
+        val parameters = if (seasonTag.isNotEmpty()) {
+            concatenate(noneOptParams, listOf("season_tag" to seasonTag))
+        } else {
+            noneOptParams
+        }
+
+        val browseResult: BrowseResult = try {
+            requestGet(browseEndpoint, parameters)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException in browse().", ex)
+            NoneBrowseResult
+        }
+
+        // add results to cache TODO improve
+        browsingCache.clear()
+        browsingCache.addAll(browseResult.items)
+
+        return browseResult
+    }
+
+    /**
+     * TODO
+     */
+    suspend fun search(query: String, n: Int = 10): SearchResult {
+        val searchEndpoint = "/content/v1/search"
+        val parameters = listOf(
+            "locale" to Preferences.preferredLocale.toLanguageTag(),
+            "q" to query,
+            "n" to n,
+            "type" to "series"
+        )
+
+        // 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: SerializationException) {
+            Log.e(TAG, "SerializationException 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
+     * @return A **[Collection]** of Panels
+     */
+    suspend fun objects(objects: List<String>): Collection<Item> {
+        val episodesEndpoint = "/cms/v2/DE/M3/crunchyroll/objects/${objects.joinToString(",")}"
+        val parameters = listOf(
+            "locale" to Preferences.preferredLocale.toLanguageTag(),
+            "Signature" to signature,
+            "Policy" to policy,
+            "Key-Pair-Id" to keyPairID
+        )
+
+        return try {
+            requestGet(episodesEndpoint, parameters)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException in objects().", ex)
+            NoneCollection
+        }
+    }
+
+    /**
+     * List all available seasons as **[SeasonListItem]**.
+     */
+    @Suppress("unused")
+    suspend fun seasonList(): DiscSeasonList {
+        val seasonListEndpoint = "/content/v1/season_list"
+        val parameters = listOf("locale" to Preferences.preferredLocale.toLanguageTag())
+
+        return try {
+            requestGet(seasonListEndpoint, parameters)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException in seasonList().", ex)
+            NoneDiscSeasonList
+        }
+    }
+
+    /**
+     * Main media functions: series, season, episodes, playback
+     */
+
+    /**
+     * series id == crunchyroll id?
+     */
+    suspend fun series(seriesId: String): Series {
+        val seriesEndpoint = "/cms/v2/${token.country}/M3/crunchyroll/series/$seriesId"
+        val parameters = listOf(
+            "locale" to Preferences.preferredLocale.toLanguageTag(),
+            "Signature" to signature,
+            "Policy" to policy,
+            "Key-Pair-Id" to keyPairID
+        )
+
+        return try {
+            requestGet(seriesEndpoint, parameters)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException in series().", ex)
+            NoneSeries
+        }
+    }
+
+    /**
+     * TODO
+     */
+    suspend fun upNextSeries(seriesId: String): UpNextSeriesItem {
+        val upNextSeriesEndpoint = "/content/v1/up_next_series"
+        val parameters = listOf(
+            "series_id" to seriesId,
+            "locale" to Preferences.preferredLocale.toLanguageTag()
+        )
+
+        return try {
+            requestGet(upNextSeriesEndpoint, parameters)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException in upNextSeries().", ex)
+            NoneUpNextSeriesItem
+        }
+    }
+
+    suspend fun seasons(seriesId: String): Seasons {
+        val seasonsEndpoint = "/cms/v2/${token.country}/M3/crunchyroll/seasons"
+        val parameters = listOf(
+            "series_id" to seriesId,
+            "locale" to Preferences.preferredLocale.toLanguageTag(),
+            "Signature" to signature,
+            "Policy" to policy,
+            "Key-Pair-Id" to keyPairID
+        )
+
+        return try {
+            requestGet(seasonsEndpoint, parameters)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException in seasons().", ex)
+            NoneSeasons
+        }
+    }
+
+    suspend fun episodes(seasonId: String): Episodes {
+        val episodesEndpoint = "/cms/v2/${token.country}/M3/crunchyroll/episodes"
+        val parameters = listOf(
+            "season_id" to seasonId,
+            "locale" to Preferences.preferredLocale.toLanguageTag(),
+            "Signature" to signature,
+            "Policy" to policy,
+            "Key-Pair-Id" to keyPairID
+        )
+
+        return try {
+            requestGet(episodesEndpoint, parameters)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException in episodes().", ex)
+            NoneEpisodes
+        }
+    }
+
+    suspend fun playback(url: String): Playback {
+        return try {
+            requestGet("", url = url)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException in playback(), with url = $url.", ex)
+            NonePlayback
+        }
+    }
+
+    /**
+     * Additional media functions: watchlist (series), playhead
+     */
+
+    /**
+     * 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/v1/watchlist/$accountID/$seriesId"
+        val parameters = listOf("locale" to Preferences.preferredLocale.toLanguageTag())
+
+        return try {
+            (requestGet(watchlistSeriesEndpoint, parameters) as JsonObject)
+                .containsKey(seriesId)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException 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/v1/watchlist/$accountID"
+        val parameters = listOf("locale" to Preferences.preferredLocale.toLanguageTag())
+
+        val json = buildJsonObject {
+            put("content_id", seriesId)
+        }
+
+        requestPost(watchlistPostEndpoint, parameters, json)
+    }
+
+    /**
+     * 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/v1/watchlist/$accountID/$seriesId"
+        val parameters = listOf("locale" to Preferences.preferredLocale.toLanguageTag())
+
+        requestDelete(watchlistDeleteEndpoint, parameters)
+    }
+
+    /**
+     * 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>): PlayheadsMap {
+        val playheadsEndpoint = "/content/v1/playheads/$accountID/${episodeIDs.joinToString(",")}"
+        val parameters = listOf("locale" to Preferences.preferredLocale.toLanguageTag())
+
+        return try {
+            requestGet(playheadsEndpoint, parameters)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException in upNextSeries().", ex)
+            emptyMap()
+        }
+    }
+
+    suspend fun postPlayheads(episodeId: String, playhead: Int) {
+        val playheadsEndpoint = "/content/v1/playheads/$accountID"
+        val parameters = listOf("locale" to Preferences.preferredLocale.toLanguageTag())
+
+        val json = buildJsonObject {
+            put("content_id", episodeId)
+            put("playhead", playhead)
+        }
+
+        requestPost(playheadsEndpoint, parameters, json)
+    }
+
+    /**
+     * 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 **[Watchlist]** containing up to n **[Item]**.
+     */
+    suspend fun watchlist(n: Int = 20): Watchlist {
+        val watchlistEndpoint = "/content/v1/$accountID/watchlist"
+        val parameters = listOf(
+            "locale" to Preferences.preferredLocale.toLanguageTag(),
+            "n" to n
+        )
+
+        val list: ContinueWatchingList = try {
+            requestGet(watchlistEndpoint, parameters)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException in watchlist().", ex)
+            NoneContinueWatchingList
+        }
+
+        val objects = list.items.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, defaults to 20.
+     * @return A **[ContinueWatchingList]** containing up to n **[ContinueWatchingItem]**.
+     */
+    suspend fun upNextAccount(n: Int = 20): ContinueWatchingList {
+        val watchlistEndpoint = "/content/v1/$accountID/up_next_account"
+        val parameters = listOf(
+            "locale" to Preferences.preferredLocale.toLanguageTag(),
+            "n" to n
+        )
+
+        return try {
+            requestGet(watchlistEndpoint, parameters)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException in upNextAccount().", ex)
+            NoneContinueWatchingList
+        }
+    }
+
+    /**
+     * Account/Profile functions
+     */
+
+    suspend fun profile(): Profile {
+        val profileEndpoint = "/accounts/v1/me/profile"
+
+        return try {
+            requestGet(profileEndpoint)
+        }catch (ex: SerializationException) {
+            Log.e(TAG, "SerializationException in profile().", ex)
+            NoneProfile
+        }
+    }
+
+    suspend fun postPrefSubLanguage(languageTag: String) {
+        val profileEndpoint = "/accounts/v1/me/profile"
+        val json = buildJsonObject {
+            put("preferred_content_subtitle_language", languageTag)
+        }
+
+        requestPatch(profileEndpoint, bodyObject = json)
+    }
+
+}

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

@@ -0,0 +1,379 @@
+/**
+ * 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.*
+
+val supportedLocals = listOf(
+    Locale.forLanguageTag("ar-SA"),
+    Locale.forLanguageTag("de-DE"),
+    Locale.forLanguageTag("en-US"),
+    Locale.forLanguageTag("es-419"),
+    Locale.forLanguageTag("es-ES"),
+    Locale.forLanguageTag("fr-FR"),
+    Locale.forLanguageTag("it-IT"),
+    Locale.forLanguageTag("pt-BR"),
+    Locale.forLanguageTag("pt-PT"),
+    Locale.forLanguageTag("ru-RU"),
+    Locale.ROOT
+)
+
+/**
+ * data classes for browse
+ * TODO make class names more clear/possibly overlapping for now
+ */
+enum class SortBy(val str: String) {
+    ALPHABETICAL("alphabetical"),
+    NEWLY_ADDED("newly_added"),
+    POPULARITY("popularity")
+}
+
+/**
+ * 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 Collection<T>(
+    @SerialName("total") val total: Int,
+    @SerialName("items") val items: List<T>
+)
+
+typealias SearchResult = Collection<SearchCollection>
+typealias SearchCollection = Collection<Item>
+typealias BrowseResult = Collection<Item>
+typealias DiscSeasonList = Collection<SeasonListItem>
+typealias Watchlist = Collection<Item>
+typealias ContinueWatchingList = Collection<ContinueWatchingItem>
+
+@Serializable
+data class UpNextSeriesItem(
+    @SerialName("playhead") val playhead: Int,
+    @SerialName("fully_watched") val fullyWatched: Boolean,
+    @SerialName("never_watched") val neverWatched: Boolean,
+    @SerialName("panel") val panel: EpisodePanel,
+)
+
+/**
+ * panel data classes
+ */
+
+// the data class Item is used in browse and search
+// 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.
+)
+
+@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)
+
+/**
+ * season list data classes
+ */
+@Serializable
+data class SeasonListItem(
+    @SerialName("id") val id: String,
+    @SerialName("localization") val localization: SeasonListLocalization
+)
+
+@Serializable
+data class SeasonListLocalization(
+    @SerialName("title") val title: String,
+    @SerialName("description") val description: String,
+)
+
+/**
+ * continue_watching_item data classes
+ */
+@Serializable
+data class ContinueWatchingItem(
+    @SerialName("panel") val panel: EpisodePanel,
+    @SerialName("new") val new: Boolean,
+    @SerialName("new_content") val newContent: Boolean,
+    // not present in up_next_account -> continue_watching_item
+//    @SerialName("is_favorite") val isFavorite: Boolean,
+//    @SerialName("never_watched") val neverWatched: Boolean,
+//    @SerialName("completion_status") val completionStatus: Boolean,
+    @SerialName("playhead") val playhead: Int,
+    // not present in watchlist -> continue_watching_item
+    @SerialName("fully_watched") val fullyWatched: Boolean = false,
+)
+
+// EpisodePanel is used in ContinueWatchingItem
+@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("playback") val playback: String,
+)
+
+@Serializable
+data class EpisodeMetadata(
+    @SerialName("duration_ms") val durationMs: Int,
+    @SerialName("season_id") val seasonId: String,
+    @SerialName("series_id") val seriesId: String,
+    @SerialName("series_title") val seriesTitle: String,
+)
+
+val NoneItem = Item("", "", "", "", "", Images(emptyList(), emptyList()))
+val NoneEpisodeMetadata = EpisodeMetadata(0, "", "", "")
+val NoneEpisodePanel = EpisodePanel("", "", "", "", "", NoneEpisodeMetadata, Thumbnail(listOf()), "")
+
+val NoneCollection = Collection<Item>(0, emptyList())
+val NoneSearchResult = SearchResult(0, emptyList())
+val NoneBrowseResult = BrowseResult(0, emptyList())
+val NoneDiscSeasonList = DiscSeasonList(0, emptyList())
+val NoneContinueWatchingList = ContinueWatchingList(0, emptyList())
+
+val NoneUpNextSeriesItem = UpNextSeriesItem(0, false, false, NoneEpisodePanel)
+
+/**
+ * Series data type
+ */
+@Serializable
+data class Series(
+    @SerialName("id") val id: String,
+    @SerialName("title") val title: String,
+    @SerialName("description") val description: String,
+    @SerialName("images") val images: Images,
+    @SerialName("maturity_ratings") val maturityRatings: List<String>
+)
+val NoneSeries = Series("", "", "", Images(emptyList(), emptyList()), emptyList())
+
+/**
+ * Seasons data type
+ */
+@Serializable
+data class Seasons(
+    @SerialName("total") val total: Int,
+    @SerialName("items") val items: List<Season>
+) {
+    fun getPreferredSeason(local: Locale): Season {
+        return items.firstOrNull { season ->
+            // try to get the the first seasons which matches the preferred local
+            season.slugTitle.endsWith("${local.getDisplayLanguage(Locale.ENGLISH)}-dub", true)
+        } ?: items.firstOrNull { season ->
+            // if there is no season with the preferred local, try to find a subbed season
+            season.isSubbed
+        } ?: items.first() // if no preferred language and no sub, use the first 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 type
+ */
+@Serializable
+data class Episodes(
+    @SerialName("total") val total: Int,
+    @SerialName("items") val items: 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("playback") val playback: String,
+)
+
+@Serializable
+data class Thumbnail(
+    @SerialName("thumbnail") val thumbnail: List<List<Poster>>
+)
+
+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,
+    playback = ""
+)
+
+typealias PlayheadsMap = Map<String, 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,
+)
+
+/**
+ * Playback/stream data type
+ */
+@Serializable
+data class Playback(
+    @SerialName("audio_locale") val audioLocale: String,
+    @SerialName("subtitles") val subtitles: Map<String, Subtitle>,
+    @SerialName("streams") val streams: Streams,
+)
+
+@Serializable
+data class Subtitle(
+    @SerialName("locale") val locale: String,
+    @SerialName("url") val url: String,
+    @SerialName("format") val format: String,
+)
+
+@Serializable
+data class Streams(
+    @SerialName("adaptive_dash") val adaptive_dash: Map<String, Stream>,
+    @SerialName("adaptive_hls") val adaptive_hls: Map<String, Stream>,
+    @SerialName("download_hls") val download_hls: Map<String, Stream>,
+    @SerialName("drm_adaptive_dash") val drm_adaptive_dash: Map<String, Stream>,
+    @SerialName("drm_adaptive_hls") val drm_adaptive_hls: Map<String, Stream>,
+    @SerialName("drm_download_hls") val drm_download_hls: Map<String, Stream>,
+    @SerialName("trailer_dash") val trailer_dash: Map<String, Stream>,
+    @SerialName("trailer_hls") val trailer_hls: 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,
+    @SerialName("url") val url: String,
+    @SerialName("vcodec") val vcodec: String,
+)
+
+val NonePlayback = Playback(
+    "",
+    mapOf(),
+    Streams(
+        mapOf(), mapOf(), mapOf(), mapOf(), mapOf(), mapOf(),
+        mapOf(), mapOf(), mapOf(), mapOf(), mapOf(), mapOf(),
+    )
+)
+
+@Serializable
+data class Profile(
+    @SerialName("avatar") val avatar: String,
+    @SerialName("email") val email: String,
+    @SerialName("maturity_rating") val maturityRating: String,
+    @SerialName("preferred_content_subtitle_language") val preferredContentSubtitleLanguage: String,
+    @SerialName("username") val username: String,
+)
+val NoneProfile = Profile(
+    avatar = "",
+    email = "",
+    maturityRating = "",
+    preferredContentSubtitleLanguage = "",
+    username = ""
+)

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

@@ -1,39 +1,101 @@
 package org.mosad.teapod.preferences
 
 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 preferredLocale: Locale = Locale.forLanguageTag("en-US") // TODO this should be saved (potential offline usage) but fetched on start
+        internal set
+    var preferSubbed = false
+        internal set
+    var autoplay = true
+        internal set
+    var devSettings = false
+        internal set
+    var theme = DataTypes.Theme.DARK
         internal set
 
-    fun savePreferSecondary(context: Context, preferSecondary: Boolean) {
-        val sharedPref = context.getSharedPreferences(
+    private fun getSharedPref(context: Context): SharedPreferences {
+        return context.getSharedPreferences(
             context.getString(R.string.preference_file_key),
             Context.MODE_PRIVATE
         )
+    }
 
-        with(sharedPref.edit()) {
-            putBoolean(context.getString(R.string.save_key_prefer_secondary), preferSecondary)
+    fun savePreferredLocal(context: Context, preferredLocale: Locale) {
+        with(getSharedPref(context).edit()) {
+            putString(context.getString(R.string.save_key_preferred_local), preferredLocale.toLanguageTag())
             apply()
         }
 
-        this.preferSecondary = preferSecondary
+        this.preferredLocale = preferredLocale
+    }
+
+    fun savePreferSecondary(context: Context, preferSubbed: Boolean) {
+        with(getSharedPref(context).edit()) {
+            putBoolean(context.getString(R.string.save_key_prefer_secondary), preferSubbed)
+            apply()
+        }
+
+        this.preferSubbed = preferSubbed
+    }
+
+    fun saveAutoplay(context: Context, autoplay: Boolean) {
+        with(getSharedPref(context).edit()) {
+            putBoolean(context.getString(R.string.save_key_autoplay), autoplay)
+            apply()
+        }
+
+        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())
+            apply()
+        }
+
+        this.theme = theme
     }
 
     /**
      * initially load the stored values
      */
     fun load(context: Context) {
-        val sharedPref = context.getSharedPreferences(
-            context.getString(R.string.preference_file_key),
-            Context.MODE_PRIVATE
-        )
+        val sharedPref = getSharedPref(context)
 
-        preferSecondary = sharedPref.getBoolean(
+        preferredLocale = Locale.forLanguageTag(
+            sharedPref.getString(
+                context.getString(R.string.save_key_preferred_local), "en-US"
+            ) ?: "en-US"
+        )
+        preferSubbed = sharedPref.getBoolean(
             context.getString(R.string.save_key_prefer_secondary), false
         )
+        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()
+        )
     }
 
 

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

@@ -1,8 +1,9 @@
-package org.mosad.teapod
+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() {

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

@@ -0,0 +1,215 @@
+/**
+ * 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
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
+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.crunchyroll.Crunchyroll
+import org.mosad.teapod.preferences.EncryptedPreferences
+import org.mosad.teapod.preferences.Preferences
+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.LibraryFragment
+import org.mosad.teapod.ui.activity.main.fragments.SearchFragment
+import org.mosad.teapod.ui.activity.onboarding.OnboardingActivity
+import org.mosad.teapod.ui.activity.player.PlayerActivity
+import org.mosad.teapod.ui.components.LoginDialog
+import org.mosad.teapod.util.DataTypes
+import java.util.*
+import kotlin.system.measureTimeMillis
+
+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 {
+        lateinit var instance: MainActivity
+    }
+
+    init {
+        instance = this
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        load() // start the initial loading
+        theme.applyStyle(getThemeResource(), true)
+
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        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
+            } else {
+                super.onBackPressed()
+            }
+        }
+    }
+
+    override fun onNavigationItemSelected(item: MenuItem): Boolean {
+        if (supportFragmentManager.backStackEntryCount > 0) {
+            supportFragmentManager.popBackStack()
+        }
+
+        val ret = when (item.itemId) {
+            R.id.navigation_home -> {
+                activeBaseFragment = HomeFragment()
+                true
+            }
+            R.id.navigation_library -> {
+                activeBaseFragment = LibraryFragment()
+                true
+            }
+            R.id.navigation_search -> {
+                activeBaseFragment = SearchFragment()
+                true
+            }
+            R.id.navigation_account -> {
+                activeBaseFragment = AccountFragment()
+                true
+            }
+            else -> false
+        }
+
+        supportFragmentManager.commit {
+            replace(R.id.nav_host_fragment, activeBaseFragment, activeBaseFragment.javaClass.simpleName)
+        }
+
+        return ret
+    }
+
+    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
+     * any login cookies
+     */
+    private fun load() {
+        val time = measureTimeMillis {
+            // load all saved stuff here
+            Preferences.load(this)
+            EncryptedPreferences.readCredentials(this)
+
+            // 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 {
+                runBlocking { initCrunchyroll().joinAll() }
+            }
+        }
+        Log.i(classTag, "loading in $time ms")
+    }
+
+    private fun initCrunchyroll(): List<Job> {
+        val scope = CoroutineScope(Dispatchers.IO + CoroutineName("InitialLoadingScope"))
+        return listOf(
+            scope.launch { Crunchyroll.index() },
+            scope.launch { Crunchyroll.account() },
+            scope.launch {
+                // update the local preferred content language, since it may have changed
+                val locale = Locale.forLanguageTag(Crunchyroll.profile().preferredContentSubtitleLanguage)
+                Preferences.savePreferredLocal(this@MainActivity, locale)
+
+            }
+        )
+    }
+
+    private fun showLoginDialog() {
+        LoginDialog(this, false).positiveButton {
+            EncryptedPreferences.saveCredentials(login, password, context)
+
+            // TODO
+//            if (!AoDParser.login()) {
+//                showLoginDialog()
+//                Log.w(javaClass.name, "Login failed, please try again.")
+//            }
+        }.negativeButton {
+            Log.i(classTag, "Login canceled, exiting.")
+            finish()
+        }.show()
+    }
+
+    /**
+     * start the onboarding activity and finish the main activity
+     */
+    private fun showOnboarding() {
+        startActivity(Intent(this, OnboardingActivity::class.java))
+        finish()
+    }
+
+    /**
+     * start the player as new activity
+     */
+    fun startPlayer(seasonId: String, episodeId: String) {
+        val intent = Intent(this, PlayerActivity::class.java).apply {
+            putExtra(getString(R.string.intent_season_id), seasonId)
+            putExtra(getString(R.string.intent_episode_id), episodeId)
+        }
+        startActivity(intent)
+    }
+
+    /**
+     * use custom restart instead of recreate(), since it has animations
+     */
+    fun restart() {
+        val restartIntent = intent
+        restartIntent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
+        finish()
+        startActivity(restartIntent)
+    }
+
+}

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

@@ -0,0 +1,155 @@
+package org.mosad.teapod.ui.activity.main.fragments
+
+import android.content.Intent
+import android.net.Uri
+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.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 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
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.textVersionDesc.text = getString(R.string.version_desc, BuildConfig.VERSION_NAME, getString(R.string.build_time))
+
+        getThirdPartyComponents().forEach { thirdParty ->
+            val componentBinding = ItemComponentBinding.inflate(layoutInflater) //(R.layout.item_component, container, false)
+            componentBinding.textComponentTitle.text = thirdParty.name
+            componentBinding.textComponentDesc.text = getString(
+                R.string.third_party_component_desc,
+                thirdParty.year,
+                thirdParty.copyrightOwner,
+                thirdParty.license.short
+            )
+            componentBinding.linearComponent.setOnClickListener {
+                showLicense(thirdParty.license)
+            }
+
+            binding.linearThirdParty.addView(componentBinding.root)
+        }
+
+        initActions()
+    }
+
+    private fun initActions() {
+        binding.imageAppIcon.setOnClickListener {
+            checkDevSettings()
+        }
+
+        binding.linearSource.setOnClickListener {
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(teapodRepoUrl)))
+        }
+
+        binding.linearLicense.setOnClickListener {
+            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",
+                "https://developer.android.com/jetpack/androidx", License.APACHE2),
+            ThirdPartyComponent("Material Components for Android", "2020", "The Android Open Source Project",
+                "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("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("Glide", "2014", "Google Inc.",
+                "https://github.com/bumptech/glide", License.BSD2),
+            ThirdPartyComponent("Glide Transformations", "2020", "Wasabeef",
+                "https://github.com/wasabeef/glide-transformations", License.APACHE2)
+        )
+    }
+
+    private fun showLicense(license: License) {
+        val licenseText = when(license) {
+            License.APACHE2 -> parseLicense(R.raw.al_20_full)
+            License.BSD2 -> parseLicense(R.raw.bsd_2_full)
+            License.GPL3 -> parseLicense(R.raw.gpl_3_full)
+            License.MIT -> parseLicense(R.raw.mit_full)
+        }
+
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(license.long)
+            .setMessage(licenseText)
+            .show()
+    }
+
+    private fun parseLicense(@RawRes id: Int): String {
+        val sb = StringBuilder()
+
+        resources.openRawResource(id).bufferedReader().forEachLine {
+            if (it.isEmpty()) {
+                sb.appendLine(" ")
+            } else {
+                sb.append(it.trim() + " ")
+            }
+        }
+
+        return sb.toString()
+    }
+
+}

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

@@ -0,0 +1,229 @@
+package org.mosad.teapod.ui.activity.main.fragments
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import org.mosad.teapod.BuildConfig
+import org.mosad.teapod.R
+import org.mosad.teapod.databinding.FragmentAccountBinding
+import org.mosad.teapod.parser.crunchyroll.Crunchyroll
+import org.mosad.teapod.parser.crunchyroll.Profile
+import org.mosad.teapod.parser.crunchyroll.supportedLocals
+import org.mosad.teapod.preferences.EncryptedPreferences
+import org.mosad.teapod.preferences.Preferences
+import org.mosad.teapod.ui.activity.main.MainActivity
+import org.mosad.teapod.ui.components.LoginDialog
+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 val getUriExport = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        if (result.resultCode == Activity.RESULT_OK) {
+            result.data?.data?.also { uri ->
+                //StorageController.exportMyList(requireContext(), uri)
+            }
+        }
+    }
+
+    private val getUriImport = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        if (result.resultCode == Activity.RESULT_OK) {
+            result.data?.data?.also { uri ->
+//                val success = StorageController.importMyList(requireContext(), uri)
+//                if (success == 0) {
+//                    Toast.makeText(
+//                        context, getString(R.string.import_data_success),
+//                        Toast.LENGTH_SHORT
+//                    ).show()
+//                }
+            }
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        binding = FragmentAccountBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.textAccountLogin.text = EncryptedPreferences.login
+
+        // TODO reimplement for cr, if possible (maybe account status would be better? (premium))
+        // load subscription (async) info before anything else
+        binding.textAccountSubscription.text = getString(R.string.account_subscription, getString(R.string.loading))
+        lifecycleScope.launch {
+            binding.textAccountSubscription.text = getString(
+                R.string.account_subscription,
+                "TODO"
+            )
+        }
+
+        // add preferred subtitles
+        lifecycleScope.launch {
+            binding.textSettingsContentLanguageDesc.text = Locale.forLanguageTag(
+                profile.await().preferredContentSubtitleLanguage
+            ).displayLanguage
+        }
+        binding.switchSecondary.isChecked = Preferences.preferSubbed
+        binding.switchAutoplay.isChecked = Preferences.autoplay
+        binding.textThemeSelected.text = when (Preferences.theme) {
+            Theme.DARK -> getString(R.string.theme_dark)
+            else -> getString(R.string.theme_light)
+        }
+
+        binding.linearDevSettings.isVisible = Preferences.devSettings
+
+        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)
+        }
+
+        binding.linearAccountSubscription.setOnClickListener {
+            // TODO
+            //startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(AoDParser.getSubscriptionUrl())))
+        }
+
+
+        binding.linearSettingsContentLanguage.setOnClickListener {
+            showContentLanguageSelection()
+        }
+
+        binding.switchSecondary.setOnClickListener {
+            Preferences.savePreferSecondary(requireContext(), binding.switchSecondary.isChecked)
+        }
+
+        binding.switchAutoplay.setOnClickListener {
+            Preferences.saveAutoplay(requireContext(), binding.switchAutoplay.isChecked)
+        }
+
+        binding.linearTheme.setOnClickListener {
+            showThemeDialog()
+        }
+
+        binding.linearInfo.setOnClickListener {
+            activity?.showFragment(AboutFragment())
+        }
+
+        binding.linearExportData.setOnClickListener {
+            val i = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
+                addCategory(Intent.CATEGORY_OPENABLE)
+                type = "text/json"
+                putExtra(Intent.EXTRA_TITLE, "my-list.json")
+            }
+            getUriExport.launch(i)
+        }
+
+        binding.linearImportData.setOnClickListener {
+            val i = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+                addCategory(Intent.CATEGORY_OPENABLE)
+                type = "*/*"
+            }
+            getUriImport.launch(i)
+        }
+    }
+
+    private fun showLoginDialog(firstTry: Boolean) {
+        LoginDialog(requireContext(), firstTry).positiveButton {
+            EncryptedPreferences.saveCredentials(login, password, context)
+
+            // TODO
+//            if (!AoDParser.login()) {
+//                showLoginDialog(false)
+//                Log.w(javaClass.name, "Login failed, please try again.")
+//            }
+        }.show {
+            login = EncryptedPreferences.login
+            password = ""
+        }
+    }
+
+    private fun showContentLanguageSelection() {
+        // we should be able to use the index of supportedLocals for language selection, items is GUI only
+        val items = supportedLocals.map {
+            it.toDisplayString(getString(R.string.settings_content_language_none))
+        }.toTypedArray()
+
+        var initialSelection: Int
+        // profile should be completed here, therefore blocking
+        runBlocking {
+            initialSelection = supportedLocals.indexOf(Locale.forLanguageTag(
+                profile.await().preferredContentSubtitleLanguage))
+            if (initialSelection < 0) initialSelection = supportedLocals.lastIndex
+        }
+
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.settings_content_language)
+            .setSingleChoiceItems(items, initialSelection){ dialog, which ->
+                updatePrefContentLanguage(supportedLocals[which])
+                dialog.dismiss()
+            }
+            .show()
+    }
+
+    @kotlinx.coroutines.ExperimentalCoroutinesApi
+    private fun updatePrefContentLanguage(preferredLocale: Locale) {
+        lifecycleScope.launch {
+            Crunchyroll.postPrefSubLanguage(preferredLocale.toLanguageTag())
+
+        }.invokeOnCompletion {
+            // update the local preferred content language
+            Preferences.savePreferredLocal(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.textSettingsContentLanguageDesc.text = Locale.forLanguageTag(
+                    profile.getCompleted().preferredContentSubtitleLanguage
+                ).displayLanguage
+            }
+        }
+    }
+
+    private fun showThemeDialog() {
+        val items = arrayOf(
+            resources.getString(R.string.theme_light),
+            resources.getString(R.string.theme_dark)
+        )
+
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.settings_content_language)
+            .setSingleChoiceItems(items, Preferences.theme.ordinal){ _, which ->
+                when(which) {
+                    0 -> Preferences.saveTheme(requireContext(), Theme.LIGHT)
+                    1 -> Preferences.saveTheme(requireContext(), Theme.DARK)
+                    else -> Preferences.saveTheme(requireContext(), Theme.DARK)
+                }
+
+                (activity as MainActivity).restart()
+            }
+            .show()
+    }
+
+}

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

@@ -0,0 +1,162 @@
+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 androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import com.bumptech.glide.Glide
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
+import org.mosad.teapod.databinding.FragmentHomeBinding
+import org.mosad.teapod.parser.crunchyroll.Crunchyroll
+import org.mosad.teapod.parser.crunchyroll.Item
+import org.mosad.teapod.parser.crunchyroll.SortBy
+import org.mosad.teapod.util.adapter.MediaItemAdapter
+import org.mosad.teapod.util.decoration.MediaItemDecoration
+import org.mosad.teapod.util.showFragment
+import org.mosad.teapod.util.toItemMediaList
+import kotlin.random.Random
+
+class HomeFragment : Fragment() {
+
+    private lateinit var binding: FragmentHomeBinding
+    private lateinit var adapterUpNext: MediaItemAdapter
+    private lateinit var adapterWatchlist: MediaItemAdapter
+    private lateinit var adapterNewTitles: MediaItemAdapter
+    private lateinit var adapterTopTen: MediaItemAdapter
+
+    private lateinit var highlightMedia: Item
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        binding = FragmentHomeBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        lifecycleScope.launch {
+            context?.let {
+                initHighlight()
+                initRecyclerViews()
+                initActions()
+            }
+        }
+    }
+
+    private fun initHighlight() {
+        lifecycleScope.launch {
+            val newTitles = Crunchyroll.browse(sortBy = SortBy.NEWLY_ADDED, n = 10)
+            // FIXME crashes on newTitles.items.size == 0
+            highlightMedia =  newTitles.items[Random.nextInt(newTitles.items.size)]
+
+            // add media item to gui
+            binding.textHighlightTitle.text = highlightMedia.title
+            Glide.with(requireContext()).load(highlightMedia.images.poster_wide[0][3].source)
+                .into(binding.imageHighlight)
+
+            // TODO watchlist indicator
+//            if (StorageController.myList.contains(0)) {
+//                binding.textHighlightMyList.setDrawableTop(R.drawable.ic_baseline_check_24)
+//            } else {
+//                binding.textHighlightMyList.setDrawableTop(R.drawable.ic_baseline_add_24)
+//            }
+        }
+    }
+
+    /**
+     * Suspend, since adapters need to be initialized before we can initialize the actions.
+     */
+    private suspend fun initRecyclerViews() {
+        binding.recyclerWatchlist.addItemDecoration(MediaItemDecoration(9))
+        binding.recyclerNewEpisodes.addItemDecoration(MediaItemDecoration(9))
+        binding.recyclerNewTitles.addItemDecoration(MediaItemDecoration(9))
+        binding.recyclerTopTen.addItemDecoration(MediaItemDecoration(9))
+
+        val asyncJobList = arrayListOf<Job>()
+
+        // continue watching
+        val upNextJob = lifecycleScope.launch {
+            // TODO create EpisodeItemAdapter, which will start the playback of the selected episode immediately
+            adapterUpNext = MediaItemAdapter(Crunchyroll.upNextAccount().items
+                .filter { !it.fullyWatched }.toItemMediaList())
+            binding.recyclerNewEpisodes.adapter = adapterUpNext
+        }
+        asyncJobList.add(upNextJob)
+
+        // watchlist
+        val watchlistJob = lifecycleScope.launch {
+            adapterWatchlist = MediaItemAdapter(Crunchyroll.watchlist(50).toItemMediaList())
+            binding.recyclerWatchlist.adapter = adapterWatchlist
+        }
+        asyncJobList.add(watchlistJob)
+
+        // new simulcasts
+        val simulcastsJob = lifecycleScope.launch {
+            // val latestSeasonTag = Crunchyroll.seasonList().items.first().id
+            // val newSimulcasts = Crunchyroll.browse(seasonTag = latestSeasonTag, n = 50)
+            val newSimulcasts = Crunchyroll.browse(sortBy = SortBy.NEWLY_ADDED, n = 50)
+
+            adapterNewTitles = MediaItemAdapter(newSimulcasts.toItemMediaList())
+            binding.recyclerNewTitles.adapter = adapterNewTitles
+        }
+        asyncJobList.add(simulcastsJob)
+
+        // newly added / top ten
+        val newlyAddedJob = lifecycleScope.launch {
+            adapterTopTen = MediaItemAdapter(Crunchyroll.browse(sortBy = SortBy.POPULARITY, n = 10).toItemMediaList())
+            binding.recyclerTopTen.adapter = adapterTopTen
+        }
+        asyncJobList.add(newlyAddedJob)
+
+        asyncJobList.joinAll()
+    }
+
+    private fun initActions() {
+        binding.buttonPlayHighlight.setOnClickListener {
+            // TODO implement
+            lifecycleScope.launch {
+                //val media = AoDParser.getMediaById(0)
+
+                // Log.d(javaClass.name, "Starting Player with  mediaId: ${media.aodId}")
+                //(activity as MainActivity).startPlayer(media.aodId, media.playlist.first().mediaId)
+            }
+        }
+
+        binding.textHighlightMyList.setOnClickListener {
+            // TODO implement
+//            if (StorageController.myList.contains(0)) {
+//                StorageController.myList.remove(0)
+//                binding.textHighlightMyList.setDrawableTop(R.drawable.ic_baseline_add_24)
+//            } else {
+//                StorageController.myList.add(0)
+//                binding.textHighlightMyList.setDrawableTop(R.drawable.ic_baseline_check_24)
+//            }
+//            StorageController.saveMyList(requireContext())
+        }
+
+        binding.textHighlightInfo.setOnClickListener {
+            activity?.showFragment(MediaFragment(highlightMedia.id))
+        }
+
+        adapterUpNext.onItemClick = { id, _ ->
+            activity?.showFragment(MediaFragment(id))
+        }
+
+        adapterWatchlist.onItemClick = { id, _ ->
+            activity?.showFragment(MediaFragment(id))
+        }
+
+        adapterNewTitles.onItemClick = { id, _ ->
+            activity?.showFragment(MediaFragment(id))
+        }
+
+        adapterTopTen.onItemClick = { id, _ ->
+            activity?.showFragment(MediaFragment(id)) //(mediaId))
+        }
+    }
+
+}

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

@@ -0,0 +1,89 @@
+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 androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.coroutines.launch
+import org.mosad.teapod.databinding.FragmentLibraryBinding
+import org.mosad.teapod.parser.crunchyroll.Crunchyroll
+import org.mosad.teapod.util.ItemMedia
+import org.mosad.teapod.util.adapter.MediaItemAdapter
+import org.mosad.teapod.util.decoration.MediaItemDecoration
+import org.mosad.teapod.util.showFragment
+
+class LibraryFragment : Fragment() {
+
+    private lateinit var binding: FragmentLibraryBinding
+    private lateinit var adapter: MediaItemAdapter
+
+    private val itemList = arrayListOf<ItemMedia>()
+    private val pageSize = 30
+    private var nextItemIndex = 0
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        binding = FragmentLibraryBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // init async
+        lifecycleScope.launch {
+            // create and set the adapter, needs context
+            context?.let {
+                val initialResults = Crunchyroll.browse(n = pageSize)
+                itemList.addAll(initialResults.items.map { item ->
+                    ItemMedia(item.id, item.title, item.images.poster_wide[0][0].source)
+                })
+                nextItemIndex += pageSize
+
+                adapter = MediaItemAdapter(itemList)
+                adapter.onItemClick = { mediaIdStr, _ ->
+                    activity?.showFragment(MediaFragment(mediaIdStr))
+                }
+
+                binding.recyclerMediaLibrary.adapter = adapter
+                binding.recyclerMediaLibrary.addItemDecoration(MediaItemDecoration(9))
+                // TODO replace with pagination3
+                // https://medium.com/swlh/paging3-recyclerview-pagination-made-easy-333c7dfa8797
+                binding.recyclerMediaLibrary.addOnScrollListener(PaginationScrollListener())
+            }
+
+        }
+    }
+
+    inner class PaginationScrollListener: RecyclerView.OnScrollListener() {
+        private var isLoading = false
+
+        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+            super.onScrolled(recyclerView, dx, dy)
+            val layoutManager = recyclerView.layoutManager as GridLayoutManager?
+
+            if (!isLoading) layoutManager?.let {
+                // itemList.size - 5 to start loading a bit earlier than the actual end
+                if (layoutManager.findLastCompletelyVisibleItemPosition() >= (itemList.size - 5)) {
+                    // load new browse results async
+                    isLoading = true
+                    lifecycleScope.launch {
+                        val firstNewItemIndex = itemList.lastIndex + 1
+                        val results = Crunchyroll.browse(start = nextItemIndex, n = pageSize)
+                        itemList.addAll(results.items.map { item ->
+                            ItemMedia(item.id, item.title, item.images.poster_wide[0][0].source)
+                        })
+                        nextItemIndex += pageSize
+
+                        adapter.notifyItemRangeInserted(firstNewItemIndex, pageSize)
+                        isLoading = false
+                    }
+                }
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,234 @@
+package org.mosad.teapod.ui.activity.main.fragments
+
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+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.FragmentActivity
+import androidx.fragment.app.activityViewModels
+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.launch
+import org.mosad.teapod.R
+import org.mosad.teapod.databinding.FragmentMediaBinding
+import org.mosad.teapod.parser.crunchyroll.NoneUpNextSeriesItem
+import org.mosad.teapod.ui.activity.main.MainActivity
+import org.mosad.teapod.ui.activity.main.viewmodel.MediaFragmentViewModel
+import org.mosad.teapod.util.tmdb.TMDBApiController
+import org.mosad.teapod.util.tmdb.TMDBMovie
+import org.mosad.teapod.util.tmdb.TMDBTVShow
+
+/**
+ * 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 mediaIdStr: String) : Fragment() {
+
+    private lateinit var binding: FragmentMediaBinding
+    private lateinit var pagerAdapter: FragmentStateAdapter
+
+    private val model: MediaFragmentViewModel by activityViewModels()
+
+    private val fragments = arrayListOf<Fragment>()
+    private var watchlistJobRunning = false
+    private var runOnResume = false
+
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        binding = FragmentMediaBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.frameLoading.visibility = View.VISIBLE
+
+        // tab layout and pager
+        pagerAdapter = ScreenSlidePagerAdapter(requireActivity())
+        // 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 = when(position) {
+                0 -> getString(R.string.episodes)
+                1 -> getString(R.string.similar_titles)
+                else -> ""
+            }
+        }.attach()
+
+        lifecycleScope.launch {
+            model.loadCrunchy(mediaIdStr)
+
+            updateGUI()
+            initActions()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        if (runOnResume) {
+            lifecycleScope.launch {
+                model.updateOnResume()
+
+                if (model.upNextSeries != NoneUpNextSeriesItem) {
+                    binding.textTitle.text = model.upNextSeries.panel.title
+                }
+
+                // needs to be called after model.updateOnResume()
+                if (fragments.elementAtOrNull(0) is MediaFragmentEpisodes) {
+                    (fragments[0] as MediaFragmentEpisodes).updateWatchedState()
+                }
+            }
+        } else {
+            runOnResume = true
+        }
+    }
+
+    /**
+     * if tmdb data is present, use it, else use the aod data
+     */
+    private fun updateGUI() = with(model) {
+        // generic gui
+        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)
+            .into(binding.imagePoster)
+        Glide.with(requireContext()).load(backdropUrl)
+            .apply(RequestOptions.placeholderOf(ColorDrawable(Color.DKGRAY)))
+            .apply(RequestOptions.bitmapTransform(BlurTransformation(20, 3)))
+            .into(binding.imageBackdrop)
+
+        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()
+
+        binding.textTitle.text = if (upNextSeries != NoneUpNextSeriesItem) {
+            upNextSeries.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)
+        val fragmentsSize = if (fragments.lastIndex < 0) 0 else fragments.lastIndex
+        fragments.clear()
+        pagerAdapter.notifyItemRangeRemoved(0, fragmentsSize)
+
+        // add the episodes fragment (as tab). Note: Movies are tv shows!
+        MediaFragmentEpisodes().also {
+            fragments.add(it)
+            pagerAdapter.notifyItemInserted(fragments.indexOf(it))
+        }
+
+        // specific gui (via tmdb)
+        when (tmdbResult) {
+            is TMDBTVShow -> {
+                // episodes count
+                binding.textEpisodesOrRuntime.text = resources.getQuantityString(
+                    R.plurals.text_episodes_count,
+                    episodesCrunchy.total,
+                    episodesCrunchy.total
+                )
+            }
+            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
+            }
+        }
+
+        // if has similar titles
+        // TODO reimplement
+//        if (media.similar.isNotEmpty()) {
+//            MediaFragmentSimilar().also {
+//                fragments.add(it)
+//                pagerAdapter.notifyItemInserted(fragments.indexOf(it))
+//            }
+//        }
+
+        // disable scrolling on appbar, if no tabs where added
+        if(fragments.isEmpty()) {
+            val params = binding.linearMedia.layoutParams as AppBarLayout.LayoutParams
+            params.scrollFlags = 0 // clear all scroll flags
+        }
+
+        binding.frameLoading.visibility = View.GONE // hide loading indicator
+    }
+
+    private fun initActions() = with(model) {
+        binding.buttonPlay.setOnClickListener {
+            if (upNextSeries != NoneUpNextSeriesItem) {
+                playEpisode(upNextSeries.panel.episodeMetadata.seasonId, upNextSeries.panel.id)
+            }
+        }
+
+        // add or remove media from myList
+        binding.linearMyListAction.setOnClickListener {
+            // don't allow parallel execution
+            if (!watchlistJobRunning) {
+                watchlistJobRunning = true
+                lifecycleScope.launch {
+                    setWatchlist()
+
+                    // 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(seasonId: String, episodeId: String) {
+        (activity as MainActivity).startPlayer(seasonId, episodeId)
+        Log.d(javaClass.name, "Started Player with  episodeId: $episodeId")
+
+        //model.updateNextEpisode(episodeId) // set the correct next episode
+    }
+
+    /**
+     * A simple pager adapter
+     */
+    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
+        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

@@ -0,0 +1,115 @@
+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 androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
+import org.mosad.teapod.R
+import org.mosad.teapod.databinding.FragmentMediaEpisodesBinding
+import org.mosad.teapod.ui.activity.main.MainActivity
+import org.mosad.teapod.ui.activity.main.viewmodel.MediaFragmentViewModel
+import org.mosad.teapod.util.adapter.EpisodeItemAdapter
+
+class MediaFragmentEpisodes : Fragment() {
+
+    private lateinit var binding: FragmentMediaEpisodesBinding
+    private lateinit var adapterRecEpisodes: EpisodeItemAdapter
+
+    private val model: MediaFragmentViewModel by activityViewModels()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        binding = FragmentMediaEpisodesBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        adapterRecEpisodes = EpisodeItemAdapter(
+            model.currentEpisodesCrunchy,
+            model.tmdbTVSeason.episodes,
+            model.currentPlayheads
+        )
+        binding.recyclerEpisodes.adapter = adapterRecEpisodes
+
+        // set onItemClick, adapter is initialized
+        adapterRecEpisodes.onImageClick = { seasonId, episodeId ->
+            playEpisode(seasonId, episodeId)
+        }
+
+        // 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)
+            }
+        }
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun updateWatchedState() {
+        // model.currentPlayheads is a val mutable map -> notify dataset changed
+        adapterRecEpisodes.notifyDataSetChanged()
+    }
+
+    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.items.forEach { season ->
+            popup.menu.add(getString(
+                    R.string.season_number_title,
+                    season.seasonNumber,
+                    season.title
+                )
+            ).also {
+                it.setOnMenuItemClickListener {
+                    onSeasonSelected(season.id)
+                    false
+                }
+            }
+        }
+
+        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()
+        }
+    }
+
+    private fun playEpisode(seasonId: String, episodeId: String) {
+        (activity as MainActivity).startPlayer(seasonId, episodeId)
+        Log.d(javaClass.name, "Started Player with  episodeId: $episodeId")
+
+        //model.updateNextEpisode(episodeId) // set the correct next episode
+    }
+
+}

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

@@ -0,0 +1,41 @@
+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 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.showFragment
+
+class MediaFragmentSimilar : 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)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        adapterSimilar = MediaItemAdapter(emptyList()) //(model.media.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))
+            }
+        }
+    }
+}

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

@@ -0,0 +1,118 @@
+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 androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+import org.mosad.teapod.databinding.FragmentSearchBinding
+import org.mosad.teapod.parser.crunchyroll.Crunchyroll
+import org.mosad.teapod.util.ItemMedia
+import org.mosad.teapod.util.adapter.MediaItemAdapter
+import org.mosad.teapod.util.decoration.MediaItemDecoration
+import org.mosad.teapod.util.showFragment
+
+class SearchFragment : Fragment() {
+
+    private lateinit var binding: FragmentSearchBinding
+    private lateinit var adapter: MediaItemAdapter
+
+    private val itemList = arrayListOf<ItemMedia>()
+    private var searchJob: Job? = null
+    private var oldSearchQuery = ""
+
+    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)
+
+        lifecycleScope.launch {
+            // create and set the adapter, needs context
+                context?.let {
+                    adapter = MediaItemAdapter(itemList)
+                    adapter.onItemClick = { mediaIdStr, _ ->
+                        binding.searchText.clearFocus()
+                        activity?.showFragment(MediaFragment(mediaIdStr))
+                    }
+
+                    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 {
+                query?.let { search(it) }
+                return false
+            }
+
+            override fun onQueryTextChange(newText: String?): Boolean {
+                newText?.let { search(it) }
+                return false
+            }
+        })
+    }
+
+    private fun search(query: String) {
+        // if the query hasn't changed since the last successful search, return
+        if (query == oldSearchQuery) return
+
+        // cancel search job if one is already running
+        if (searchJob?.isActive == true) searchJob?.cancel()
+
+        searchJob = lifecycleScope.async {
+            // TODO maybe wait a few ms (500ms?) before searching, if the user inputs any other chars
+            val results = Crunchyroll.search(query, 50)
+
+            itemList.clear() // TODO needs clean up
+
+            // TODO add top results first heading
+            itemList.addAll(results.items[0].items.map { item ->
+                ItemMedia(item.id, item.title, item.images.poster_wide[0][0].source)
+            })
+
+            // TODO currently only tv shows are supported, hence only the first items array
+            //  should be always present
+
+//            // TODO add tv shows heading
+//            if (results.items.size >= 2) {
+//                itemList.addAll(results.items[1].items.map { item ->
+//                    ItemMedia(item.id, item.title, item.images.poster_wide[0][0].source)
+//                })
+//            }
+//
+//            // TODO add movies heading
+//            if (results.items.size >= 3) {
+//                itemList.addAll(results.items[2].items.map { item ->
+//                    ItemMedia(item.id, item.title, item.images.poster_wide[0][0].source)
+//                })
+//            }
+//
+//            // TODO add episodes heading
+//            if (results.items.size >= 4) {
+//                itemList.addAll(results.items[3].items.map { item ->
+//                    ItemMedia(item.id, item.title, item.images.poster_wide[0][0].source)
+//                })
+//            }
+
+            adapter.notifyDataSetChanged()
+            //adapter.notifyItemRangeInserted(0, itemList.size)
+
+            // after successfully searching the query term, add it as old query, to make sure we
+            // don't search again if the query hasn't changed
+            oldSearchQuery = query
+        }
+    }
+}

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

@@ -0,0 +1,177 @@
+package org.mosad.teapod.ui.activity.main.viewmodel
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
+import org.mosad.teapod.parser.crunchyroll.*
+import org.mosad.teapod.preferences.Preferences
+import org.mosad.teapod.util.DataTypes.MediaType
+import org.mosad.teapod.util.Meta
+import org.mosad.teapod.util.tmdb.*
+
+/**
+ * handle media, next ep and tmdb
+ * TODO this lives in activity, is this correct?
+ */
+class MediaFragmentViewModel(application: Application) : AndroidViewModel(application) {
+
+//    var mediaCrunchy = NoneItem
+//        internal set
+    var seriesCrunchy = NoneSeries // movies are also series
+        internal set
+    var seasonsCrunchy = NoneSeasons
+        internal set
+    var currentSeasonCrunchy = NoneSeason
+        internal set
+    var episodesCrunchy = NoneEpisodes
+        internal set
+    val currentEpisodesCrunchy = arrayListOf<Episode>() // used for EpisodeItemAdapter (easier updates)
+
+    // additional media info
+    val currentPlayheads: MutableMap<String, PlayheadObject> = mutableMapOf()
+    var isWatchlist = false
+        internal set
+    var upNextSeries = NoneUpNextSeriesItem
+
+    // TMDB stuff
+    var mediaType = MediaType.OTHER
+        internal set
+    var tmdbResult: TMDBResult = NoneTMDB // TODO rename
+        internal set
+    var tmdbTVSeason: TMDBTVSeason = NoneTMDBTVSeason
+        internal set
+    var mediaMeta: Meta? = null
+        internal set
+
+    /**
+     * @param crunchyId the crunchyroll series id
+     */
+
+    suspend fun loadCrunchy(crunchyId: String) {
+        // load series and seasons info in parallel
+        listOf(
+            viewModelScope.launch { seriesCrunchy = Crunchyroll.series(crunchyId) },
+            viewModelScope.launch { seasonsCrunchy = Crunchyroll.seasons(crunchyId) },
+            viewModelScope.launch { isWatchlist = Crunchyroll.isWatchlist(crunchyId) },
+            viewModelScope.launch { upNextSeries = Crunchyroll.upNextSeries(crunchyId) }
+        ).joinAll()
+//        println("series: $seriesCrunchy")
+//        println("seasons: $seasonsCrunchy")
+        println(upNextSeries)
+
+        // load the preferred season (preferred language, language per season, not per stream)
+        currentSeasonCrunchy = seasonsCrunchy.getPreferredSeason(Preferences.preferredLocale)
+
+        // load episodes and metaDB in parallel (tmdb needs mediaType, which is set via episodes)
+        listOf(
+            viewModelScope.launch { episodesCrunchy = Crunchyroll.episodes(currentSeasonCrunchy.id) },
+            viewModelScope.launch { mediaMeta = null }, // TODO metaDB
+        ).joinAll()
+//        println("episodes: $episodesCrunchy")
+
+        currentEpisodesCrunchy.clear()
+        currentEpisodesCrunchy.addAll(episodesCrunchy.items)
+
+        // set media type
+        mediaType = episodesCrunchy.items.firstOrNull()?.let {
+            if (it.episodeNumber != null) MediaType.TVSHOW else MediaType.MOVIE
+        } ?: MediaType.OTHER
+
+        // load playheads and tmdb in parallel
+        listOf(
+            viewModelScope.launch {
+                // get playheads (including fully watched state)
+                val episodeIDs = episodesCrunchy.items.map { it.id }
+                currentPlayheads.clear()
+                currentPlayheads.putAll(Crunchyroll.playheads(episodeIDs))
+            },
+            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
+        }
+        println(tmdbSearchResult)
+
+        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
+
+        println(tmdbResult)
+
+        // currently not used
+//        tmdbTVSeason = if (tmdbResult is TMDBTVShow) {
+//            tmdbApiController.getTVSeasonDetails(tmdbResult.id, 0)
+//        } else NoneTMDBTVSeason
+    }
+
+    /**
+     * 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.items.firstOrNull {
+            it.id == seasonId
+        } ?: currentSeasonCrunchy
+
+        episodesCrunchy = Crunchyroll.episodes(currentSeasonCrunchy.id)
+        currentEpisodesCrunchy.clear()
+        currentEpisodesCrunchy.addAll(episodesCrunchy.items)
+    }
+
+    suspend fun setWatchlist() {
+        isWatchlist = if (isWatchlist) {
+            Crunchyroll.deleteWatchlist(seriesCrunchy.id)
+            false
+        } else {
+            Crunchyroll.postWatchlist(seriesCrunchy.id)
+            true
+        }
+    }
+
+    suspend fun updateOnResume() {
+        joinAll(
+            viewModelScope.launch {
+                val episodeIDs = episodesCrunchy.items.map { it.id }
+                currentPlayheads.clear()
+                currentPlayheads.putAll(Crunchyroll.playheads(episodeIDs))
+            },
+            viewModelScope.launch { upNextSeries = Crunchyroll.upNextSeries(seriesCrunchy.id) }
+        )
+    }
+
+    /**
+     * get the next episode based on episodeId
+     * if no matching is found, use first episode
+     */
+    fun updateNextEpisode(episodeId: Int) {
+        // TODO reimplement if needed
+//        if (media.type == MediaType.MOVIE) return // return if movie
+//
+//        nextEpisodeId = media.playlist.firstOrNull { it.index > media.getEpisodeById(episodeId).index }?.mediaId
+//            ?: media.playlist.first().mediaId
+    }
+
+}

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

@@ -0,0 +1,71 @@
+package org.mosad.teapod.ui.activity.onboarding
+
+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.crunchyroll.Crunchyroll
+import org.mosad.teapod.preferences.EncryptedPreferences
+
+class OnLoginFragment: Fragment() {
+
+    private lateinit var binding: FragmentOnLoginBinding
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        binding = FragmentOnLoginBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initActions()
+    }
+
+    private fun initActions() {
+        binding.buttonLogin.setOnClickListener {
+            onLogin()
+        }
+
+        binding.editTextPassword.setOnEditorActionListener { _, actionId, _ ->
+            return@setOnEditorActionListener when (actionId) {
+                EditorInfo.IME_ACTION_DONE -> {
+                    onLogin()
+                    false // false will hide the keyboards
+                }
+                else -> false
+            }
+        }
+
+    }
+
+    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/OnWelcomeFragment.kt

@@ -0,0 +1,31 @@
+package org.mosad.teapod.ui.activity.onboarding
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import org.mosad.teapod.databinding.FragmentOnWelcomeBinding
+
+class OnWelcomeFragment: Fragment() {
+
+    private lateinit var binding: FragmentOnWelcomeBinding
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        binding = FragmentOnWelcomeBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initActions()
+    }
+
+    private fun initActions() {
+        binding.buttonGetStarted.setOnClickListener {
+            if (activity is OnboardingActivity) {
+                (activity as OnboardingActivity).nextFragment()
+            }
+        }
+    }
+}

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

@@ -0,0 +1,79 @@
+package org.mosad.teapod.ui.activity.onboarding
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+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
+
+class OnboardingActivity : AppCompatActivity() {
+
+    private lateinit var binding: ActivityOnboardingBinding
+    private lateinit var pagerAdapter: FragmentStateAdapter
+
+    private val fragments = arrayOf(OnWelcomeFragment(), OnLoginFragment())
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityOnboardingBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        pagerAdapter = ScreenSlidePagerAdapter(this)
+        binding.viewPager.adapter = pagerAdapter
+        TabLayoutMediator(binding.tabLayout, binding.viewPager) { _, _ -> }.attach()
+
+        // we don't use the skip button, instead we use the start button to skip the last fragment
+        binding.buttonSkip.visibility = View.GONE
+
+        // hide tab layout if only one tab is displayed
+        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
+        }
+    }
+
+    fun nextFragment() {
+        if (binding.viewPager.currentItem < fragments.size - 1) {
+            binding.viewPager.currentItem++
+        } else {
+            launchMainActivity()
+        }
+    }
+
+    fun btnNextClick(@Suppress("UNUSED_PARAMETER")v: View) {
+        //nextFragment() // currently not used in Teapod
+    }
+
+    fun btnSkipClick(@Suppress("UNUSED_PARAMETER")v: View) {
+        //launchMainActivity() // currently not used in Teapod
+    }
+
+    fun launchMainActivity() {
+        startActivity(Intent(this, MainActivity::class.java))
+        finish()
+    }
+
+    /**
+     * A simple pager adapter
+     */
+    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
+        override fun getItemCount(): Int = fragments.size
+
+        override fun createFragment(position: Int): Fragment = fragments[position]
+    }
+
+
+}

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

@@ -0,0 +1,548 @@
+/**
+ * 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
+import android.animation.AnimatorListenerAdapter
+import android.annotation.SuppressLint
+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
+import android.util.Rational
+import android.view.GestureDetector
+import android.view.MotionEvent
+import android.view.View
+import androidx.activity.viewModels
+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.util.Util
+import kotlinx.android.synthetic.main.activity_player.*
+import kotlinx.android.synthetic.main.player_controls.*
+import kotlinx.coroutines.launch
+import org.mosad.teapod.R
+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.*
+import java.util.*
+import java.util.concurrent.TimeUnit
+import kotlin.concurrent.scheduleAtFixedRate
+
+class PlayerActivity : AppCompatActivity() {
+
+    private val model: PlayerViewModel by viewModels()
+
+    private lateinit var controller: StyledPlayerControlView
+    private lateinit var gestureDetector: GestureDetectorCompat
+    private lateinit var timerUpdates: TimerTask
+
+    private var wasInPiP = false
+    private var remainingTime: Long = 0
+
+    private val rwdTime: Long = 10000.unaryMinus()
+    private val fwdTime: Long = 10000
+    private val defaultShowTimeoutMs = 5000
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_player)
+        hideBars() // Initial hide the bars
+
+        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.isAnimationEnabled = false // disable controls (time-bar) animation
+
+        initExoPlayer() // call in onCreate, exoplayer lives in view model
+        initGUI()
+        initActions()
+    }
+
+    /**
+     * once minimum is android 7.0 this can be simplified
+     * only onStart and onStop should be needed then
+     * see: https://developer.android.com/guide/topics/ui/picture-in-picture#continuing_playback
+     */
+    override fun onStart() {
+        super.onStart()
+        if (Util.SDK_INT > 23) {
+            initPlayer()
+            video_view?.onResume()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (isInPiPMode()) { return }
+
+        if (Util.SDK_INT <= 23) {
+            initPlayer()
+            video_view?.onResume()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+
+        if (isInPiPMode()) { return }
+        if (Util.SDK_INT <= 23) { onPauseOnStop() }
+    }
+
+    override fun onStop() {
+        super.onStop()
+
+        if (Util.SDK_INT > 23) { onPauseOnStop() }
+        // if the player was in pip, it's on a different task
+        if (wasInPiP) { navToLauncherTask() }
+        // if the player is in pip, remove the task, else we'll get a zombie
+        if (isInPiPMode()) { finishAndRemoveTask() }
+    }
+
+    /**
+     * used, when the player is in pip and the user selects a new media
+     */
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+
+        // when the intent changed, load the new media and play it
+        intent?.let {
+            model.loadMediaAsync(
+                it.getStringExtra(getString(R.string.intent_season_id)) ?: "",
+                it.getStringExtra(getString(R.string.intent_episode_id)) ?: ""
+            )
+            model.playCurrentMedia()
+        }
+    }
+
+    /**
+     * previous to android n, don't override
+     */
+    @RequiresApi(Build.VERSION_CODES.N)
+    override fun onUserLeaveHint() {
+        super.onUserLeaveHint()
+
+        // start pip mode, if supported
+        if (packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+                @Suppress("deprecation")
+                enterPictureInPictureMode()
+            } else {
+                val width = model.player.videoFormat?.width ?: 0
+                val height = model.player.videoFormat?.height ?: 0
+                val contentFrame: View = video_view.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)
+            }
+
+            wasInPiP = isInPiPMode()
+        }
+    }
+
+    override fun onPictureInPictureModeChanged(
+        isInPictureInPictureMode: Boolean,
+        newConfig: Configuration?
+    ) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
+
+        // Hide the full-screen UI (controls, etc.) while in picture-in-picture mode.
+        video_view.useController = !isInPictureInPictureMode
+    }
+
+    private fun initPlayer() {
+        initVideoView()
+        initTimeUpdates()
+
+        // if the player is ready or buffering we can simply play the file again, else do nothing
+        val playbackState = model.player.playbackState
+        if ((playbackState == ExoPlayer.STATE_READY || playbackState == ExoPlayer.STATE_BUFFERING)) {
+            model.player.play()
+        }
+    }
+
+    /**
+     * set play when ready and listeners
+     */
+    private fun initExoPlayer() {
+        model.player.addListener(object : Player.Listener {
+            override fun onPlaybackStateChanged(state: Int) {
+                super.onPlaybackStateChanged(state)
+
+                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
+                }
+
+                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.playCurrentMedia(model.currentPlayhead)
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private fun initVideoView() {
+        video_view.player = model.player
+
+        // when the player controls get hidden, hide the bars too
+        video_view.setControllerVisibilityListener {
+            when (it) {
+                View.GONE -> {
+                    hideBars()
+                    // TODO also hide the skip op button
+                }
+                View.VISIBLE -> updateControls()
+            }
+        }
+
+        video_view.setOnTouchListener { _, event ->
+            gestureDetector.onTouchEvent(event)
+            true
+        }
+    }
+
+    private fun initActions() {
+        exo_close_player.setOnClickListener {
+            this.finish()
+        }
+        rwd_10.setOnButtonClickListener { rewind() }
+        ffwd_10.setOnButtonClickListener { fastForward() }
+        button_next_ep.setOnClickListener { playNextEpisode() }
+        button_skip_op.setOnClickListener { skipOpening() }
+        button_language.setOnClickListener { showLanguageSettings() }
+        button_episodes.setOnClickListener { showEpisodesList() }
+        button_next_ep_c.setOnClickListener { playNextEpisode() }
+    }
+
+    private fun initGUI() {
+        // 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()
+        }
+
+        timerUpdates = Timer().scheduleAtFixedRate(0, 500) {
+            lifecycleScope.launch {
+                val currentPosition = model.player.currentPosition
+                val btnNextEpIsVisible = button_next_ep.isVisible
+                val 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
+                }
+
+                // TODO add metaDB ending_start support
+                // if remaining time < 20 sec, a next ep is set, autoplay is enabled and not in pip:
+                // show next ep button
+                if (remainingTime in 1..20000) {
+                    if (!btnNextEpIsVisible && hasNextEpisode() && Preferences.autoplay && !isInPiPMode()) {
+                        showButtonNextEp()
+                    }
+                } else if (btnNextEpIsVisible) {
+                    hideButtonNextEp()
+                }
+
+                // if meta data is present and opening_start & opening_duration are valid, show skip opening
+                model.currentEpisodeMeta?.let {
+                    if (it.openingDuration > 0 &&
+                        currentPosition in it.openingStart..(it.openingStart + 10000) &&
+                        !button_skip_op.isVisible
+                    ) {
+                        showButtonSkipOp()
+                    } else if (button_skip_op.isVisible && currentPosition !in it.openingStart..(it.openingStart + 10000)) {
+                        // the button should only be visible, if currentEpisodeMeta != null
+                        hideButtonSkipOp()
+                    }
+                }
+
+                // if controls are visible, update them
+                if (controlsVisible) {
+                    updateControls()
+                }
+            }
+        }
+    }
+
+    private fun onPauseOnStop() {
+        video_view?.onPause()
+        model.player.pause()
+        timerUpdates.cancel()
+    }
+
+    /**
+     * update the custom controls
+     */
+    private fun updateControls() {
+        // update remaining time label
+        val hours =  TimeUnit.MILLISECONDS.toHours(remainingTime) % 24
+        val minutes = TimeUnit.MILLISECONDS.toMinutes(remainingTime) % 60
+        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) {
+            getString(R.string.time_min_sec, minutes, seconds)
+        } else {
+            getString(R.string.time_hour_min_sec, hours, minutes, seconds)
+        }
+    }
+
+    /**
+     * 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() {
+        if (model.currentEpisode == NoneEpisode) {
+            Log.e(javaClass.name, "No media was set.")
+            this.finish()
+        }
+
+        exo_text_title.text = model.getMediaTitle()
+
+        // hide the next episode button, if there is none
+        button_next_ep_c.visibility = if (hasNextEpisode()) View.VISIBLE else View.GONE
+    }
+
+    /**
+     * 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())
+    }
+
+    /**
+     * TODO set position of rewind/fast forward indicators programmatically
+     */
+
+    private fun rewind() {
+        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
+
+        rwd_10_indicator.onAnimationEndCallback = {
+            exo_double_tap_indicator.visibility = View.GONE
+            ffwd_10_indicator.visibility = View.VISIBLE
+            rwd_10.visibility = View.VISIBLE
+        }
+
+        // run animation
+        rwd_10_indicator.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
+
+        ffwd_10_indicator.onAnimationEndCallback = {
+            exo_double_tap_indicator.visibility = View.GONE
+            rwd_10_indicator.visibility = View.VISIBLE
+            ffwd_10.visibility = View.VISIBLE
+        }
+
+        // run animation
+        ffwd_10_indicator.runOnClickAnimation()
+    }
+
+    private fun playNextEpisode() {
+        model.playNextEpisode()
+        hideButtonNextEp()
+    }
+
+    private fun skipOpening() {
+        // calculate the seek time
+        model.currentEpisodeMeta?.let {
+            val seekTime = (it.openingStart + it.openingDuration) - model.player.currentPosition
+            model.seekToOffset(seekTime)
+        }
+
+    }
+
+    /**
+     * show the next episode button
+     * TODO improve the show animation
+     */
+    private fun showButtonNextEp() {
+        button_next_ep.isVisible = true
+        button_next_ep.alpha = 0.0f
+
+        button_next_ep.animate()
+            .alpha(1.0f)
+            .setListener(null)
+    }
+
+    /**
+     * hide the next episode button
+     * TODO improve the hide animation
+     */
+    private fun hideButtonNextEp() {
+        button_next_ep.animate()
+            .alpha(0.0f)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator?) {
+                    super.onAnimationEnd(animation)
+                    button_next_ep.isVisible = false
+                }
+            })
+
+    }
+
+    private fun showButtonSkipOp() {
+        button_skip_op.isVisible = true
+        button_skip_op.alpha = 0.0f
+
+        button_skip_op.animate()
+            .alpha(1.0f)
+            .setListener(null)
+    }
+
+    private fun hideButtonSkipOp() {
+        button_skip_op.animate()
+            .alpha(0.0f)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator?) {
+                    super.onAnimationEnd(animation)
+                    button_skip_op.isVisible = false
+                }
+            })
+
+    }
+
+    private fun showEpisodesList() {
+        val episodesList = EpisodesListPlayer(this, model = model).apply {
+            onViewRemovedAction = { model.player.play() }
+        }
+        player_layout.addView(episodesList)
+        pauseAndHideControls()
+    }
+
+    private fun showLanguageSettings() {
+        val languageSettings = LanguageSettingsPlayer(this, model = model).apply {
+            onViewRemovedAction = { model.player.play() }
+        }
+        player_layout.addView(languageSettings)
+        pauseAndHideControls()
+    }
+
+    /**
+     * pause playback and hide controls
+     */
+    private fun pauseAndHideControls() {
+        model.player.pause() // showTimeoutMs is set to 0 when calling pause, but why
+        controller.showTimeoutMs = defaultShowTimeoutMs // fix showTimeoutMs set to 0
+        controller.hide()
+    }
+
+    inner class PlayerGestureListener : GestureDetector.SimpleOnGestureListener() {
+
+        /**
+         * on single tap hide or show the controls
+         */
+        override fun onSingleTapConfirmed(e: MotionEvent?): Boolean {
+            if (!isInPiPMode()) {
+                if (controller.isVisible) controller.hide() else controller.show()
+            }
+
+            return true
+        }
+
+        /**
+         * on double tap rewind or forward
+         */
+        override fun onDoubleTap(e: MotionEvent?): Boolean {
+            val eventPosX = e?.x?.toInt() ?: 0
+            val viewCenterX = video_view.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()
+
+            return true
+        }
+
+        /**
+         * not used
+         */
+        override fun onDoubleTapEvent(e: MotionEvent?): Boolean {
+            return true
+        }
+
+        /**
+         * on long press toggle pause/play
+         */
+        override fun onLongPress(e: MotionEvent?) {
+            model.togglePausePlay()
+        }
+
+    }
+
+}

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

@@ -0,0 +1,301 @@
+/**
+ * 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 androidx.lifecycle.viewModelScope
+import com.google.android.exoplayer2.ExoPlayer
+import com.google.android.exoplayer2.MediaItem
+import com.google.android.exoplayer2.Player
+import com.google.android.exoplayer2.SimpleExoPlayer
+import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
+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.Dispatchers
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import org.mosad.teapod.R
+import org.mosad.teapod.parser.crunchyroll.Crunchyroll
+import org.mosad.teapod.parser.crunchyroll.NoneEpisode
+import org.mosad.teapod.parser.crunchyroll.NoneEpisodes
+import org.mosad.teapod.parser.crunchyroll.NonePlayback
+import org.mosad.teapod.preferences.Preferences
+import org.mosad.teapod.util.EpisodeMeta
+import org.mosad.teapod.util.tmdb.TMDBTVSeason
+import java.util.*
+
+/**
+ * PlayerViewModel handles all stuff related to media/episodes.
+ * When currentEpisode is changed the player will start playing it (not initial media),
+ * the next episode will be update and the callback is handled.
+ */
+class PlayerViewModel(application: Application) : AndroidViewModel(application) {
+
+    val player = SimpleExoPlayer.Builder(application).build()
+    private val dataSourceFactory = DefaultDataSourceFactory(application, Util.getUserAgent(application, "Teapod"))
+    private val mediaSession = MediaSessionCompat(application, "TEAPOD_PLAYER_SESSION")
+
+    val currentEpisodeChangedListener = ArrayList<() -> Unit>()
+    private var currentPlayhead: Long = 0
+
+    // tmdb/meta data
+    // TODO meta data currently not implemented for cr
+//    var mediaMeta: Meta? = null
+//        internal set
+    var tmdbTVSeason: TMDBTVSeason? =null
+        internal set
+    var currentEpisodeMeta: EpisodeMeta? = null
+        internal set
+
+    // crunchyroll episodes/playback
+    var episodes = NoneEpisodes
+        internal set
+    var currentEpisode = NoneEpisode
+        internal set
+    var currentPlayback = NonePlayback
+
+    // current playback settings
+    var currentLanguage: Locale = Preferences.preferredLocale
+        internal set
+
+    init {
+        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()
+            }
+        })
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+
+        mediaSession.release()
+        player.release()
+
+        Log.d(javaClass.name, "Released player")
+    }
+
+    /**
+     * 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)
+
+        setCurrentEpisode(episodeId)
+        playCurrentMedia(currentPlayhead)
+
+        // TODO reimplement for cr
+        // run async as it should be loaded by the time the episodes a
+//        viewModelScope.launch {
+//            // get tmdb season info, if metaDB knows the tv show
+//            if (media.type == DataTypes.MediaType.TVSHOW && mediaMeta != null) {
+//                val tvShowMeta = mediaMeta as TVShowMeta
+//                tmdbTVSeason = TMDBApiController().getTVSeasonDetails(tvShowMeta.tmdbId, tvShowMeta.tmdbSeasonNumber)
+//            }
+//        }
+//
+//        currentEpisodeMeta = getEpisodeMetaByAoDMediaId(currentEpisodeAoD.mediaId)
+//        currentLanguage = currentEpisodeAoD.getPreferredStream(preferredLanguage).language
+    }
+
+    fun setLanguage(language: Locale) {
+        currentLanguage = language
+        playCurrentMedia(player.currentPosition)
+    }
+
+    // player actions
+
+    fun seekToOffset(offset: Long) {
+        player.seekTo(player.currentPosition + offset)
+    }
+
+    fun togglePausePlay() {
+        if (player.isPlaying) player.pause() else player.play()
+    }
+
+    /**
+     * play the next episode, if nextEpisodeId is not null
+     */
+    fun playNextEpisode() = currentEpisode.nextEpisodeId?.let { nextEpisodeId ->
+        updatePlayhead() // update playhead before switching to new episode
+        setCurrentEpisode(nextEpisodeId, startPlayback = true)
+    }
+
+    /**
+     * Set currentEpisodeCr to the episode of the given ID
+     * @param episodeId The ID of the episode you want to set currentEpisodeCr to
+     */
+    fun setCurrentEpisode(episodeId: String, startPlayback: Boolean = false) {
+        currentEpisode = episodes.items.find { episode ->
+            episode.id == episodeId
+        } ?: NoneEpisode
+
+        // 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()
+        runBlocking {
+            joinAll(
+                viewModelScope.launch(Dispatchers.IO) {
+                    currentPlayback = Crunchyroll.playback(currentEpisode.playback)
+                },
+                viewModelScope.launch(Dispatchers.IO) {
+                    Crunchyroll.playheads(listOf(currentEpisode.id))[currentEpisode.id]?.let {
+                        // if the episode was fully watched, start at the beginning
+                        currentPlayhead = if (it.fullyWatched) {
+                            0
+                        } else {
+                            (it.playhead.times(1000)).toLong()
+                        }
+                    }
+                }
+            )
+        }
+        println("loaded playback ${currentEpisode.playback}")
+
+        // TODO update metadata and language (it should not be needed to update the language here!)
+
+        if (startPlayback) {
+            playCurrentMedia()
+        }
+    }
+
+    /**
+     * Play the current media from currentPlaybackCr.
+     *
+     * @param seekPosition The seek position for the episode (default = 0).
+     */
+    fun playCurrentMedia(seekPosition: Long = 0) {
+        // get preferred stream url, set current language if it differs from the preferred one
+        val preferredLocale = currentLanguage
+        val fallbackLocal = Locale.US
+        val url = when {
+            currentPlayback.streams.adaptive_hls.containsKey(preferredLocale.toLanguageTag()) -> {
+                currentPlayback.streams.adaptive_hls[preferredLocale.toLanguageTag()]?.url
+            }
+            currentPlayback.streams.adaptive_hls.containsKey(fallbackLocal.toLanguageTag()) -> {
+                currentLanguage = fallbackLocal
+                currentPlayback.streams.adaptive_hls[fallbackLocal.toLanguageTag()]?.url
+            }
+            else -> {
+                // if no language tag is present use the first entry
+                currentLanguage = Locale.ROOT
+                currentPlayback.streams.adaptive_hls.entries.first().value.url
+            }
+        }
+        println("stream url: $url")
+
+        // create the media source object
+        val mediaSource = HlsMediaSource.Factory(dataSourceFactory).createMediaSource(
+            MediaItem.fromUri(Uri.parse(url))
+        )
+
+        // the actual player playback code
+        player.setMediaSource(mediaSource)
+        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 {
+        // 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.episode,
+                currentEpisode.title
+            )
+        } else {
+            currentEpisode.title
+        }
+    }
+
+    /**
+     * Check if the current episode is the last in the episodes list.
+     *
+     * @return Boolean: true if it is the last, else false.
+     */
+    fun currentEpisodeIsLastEpisode(): Boolean {
+        return episodes.items.lastOrNull()?.id == currentEpisode.id
+    }
+
+    // TODO reimplement for cr
+//    fun getEpisodeMetaByAoDMediaId(aodMediaId: Int): EpisodeMeta? {
+//        val meta = mediaMeta
+//        return if (meta is TVShowMeta) {
+//            meta.episodes.firstOrNull { it.aodMediaId == aodMediaId }
+//        } else {
+//            null
+//        }
+//    }
+//
+//    private suspend fun loadMediaMeta(aodId: Int): Meta? {
+//        return if (media.type == DataTypes.MediaType.TVSHOW) {
+//            MetaDBController().getTVShowMetadata(aodId)
+//        } else {
+//            null
+//        }
+//
+//        return null
+//    }
+
+    /**
+     * Update the playhead of the current episode, if currentPosition > 1000ms.
+     */
+    private fun updatePlayhead() {
+        val playhead = (player.currentPosition / 1000)
+
+        if (playhead > 0) {
+            viewModelScope.launch { Crunchyroll.postPlayheads(currentEpisode.id, playhead.toInt()) }
+            Log.i(javaClass.name, "Set playhead for episode ${currentEpisode.id} to $playhead sec.")
+        }
+    }
+
+}

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

@@ -0,0 +1,44 @@
+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.episodes, model.tmdbTVSeason?.episodes)
+            adapterRecEpisodes.onImageClick = {_, episodeId ->
+                (this.parent as ViewGroup).removeView(this)
+                model.setCurrentEpisode(episodeId, startPlayback = true)
+            }
+            // episodeNumber starts at 1, we need the episode index -> - 1
+            adapterRecEpisodes.currentSelected = model.currentEpisode.episodeNumber?.minus(1) ?: 0
+
+            binding.recyclerEpisodesPlayer.adapter = adapterRecEpisodes
+            binding.recyclerEpisodesPlayer.scrollToPosition(adapterRecEpisodes.currentSelected)
+        }
+    }
+
+}

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

@@ -0,0 +1,70 @@
+package org.mosad.teapod.ui.components
+
+import android.animation.Animator
+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 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
+
+    var onAnimationEndCallback: (() -> Unit)? = null
+
+    init {
+        addView(binding.root)
+
+        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?) {
+                    binding.imageButton.isEnabled = false // disable button
+                    binding.imageButton.setBackgroundResource(R.drawable.ic_baseline_forward_24)
+                }
+            })
+        }
+
+        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?) {
+                    binding.imageButton.isEnabled = true // enable button
+                    binding.imageButton.setBackgroundResource(R.drawable.ic_baseline_forward_10_24)
+
+                    binding.textView.visibility = View.GONE
+                    binding.textView.animate().translationX(0f)
+
+                    onAnimationEndCallback?.invoke()
+                }
+            })
+        }
+    }
+
+    fun setOnButtonClickListener(func: FastForwardButton.() -> Unit) {
+        binding.imageButton.setOnClickListener {
+            func()
+        }
+    }
+
+    fun runOnClickAnimation() {
+        // run button animation
+        buttonAnimation.start()
+
+        // run lbl animation
+        binding.textView.visibility = View.VISIBLE
+        labelAnimation.start()
+    }
+
+}

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

@@ -0,0 +1,105 @@
+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.*
+
+// TODO port to DialogFragment
+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
+
+    private var selectedLocale = model?.currentLanguage ?: Locale.ROOT
+
+    init {
+        model?.let { m ->
+            m.currentPlayback.streams.adaptive_hls.keys.forEach { languageTag ->
+                val locale = Locale.forLanguageTag(languageTag)
+                addLanguage(locale, locale == m.currentLanguage) { v ->
+                    selectedLocale = locale
+                    updateSelectedLanguage(v as TextView)
+                }
+            }
+        }
+
+        binding.buttonCloseLanguageSettings.setOnClickListener { close() }
+        binding.buttonCancel.setOnClickListener { close() }
+        binding.buttonSelect.setOnClickListener {
+            model?.setLanguage(selectedLocale)
+            close()
+        }
+    }
+
+    private fun addLanguage(locale: Locale, isSelected: Boolean, onClick: OnClickListener) {
+        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)
+
+            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

@@ -31,6 +31,7 @@ import com.afollestad.materialdialogs.customview.customView
 import com.afollestad.materialdialogs.customview.getCustomView
 import org.mosad.teapod.R
 
+// TODO rework and port away from MaterialDialog
 class LoginDialog(val context: Context, firstTry: Boolean) {
 
     private val dialog = MaterialDialog(context, BottomSheet())

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

@@ -0,0 +1,69 @@
+package org.mosad.teapod.ui.components
+
+import android.animation.Animator
+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 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
+
+    var onAnimationEndCallback: (() -> Unit)? = null
+
+    init {
+        addView(binding.root)
+
+        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?) {
+                    binding.imageButton.isEnabled = false // disable button
+                    binding.imageButton.setBackgroundResource(R.drawable.ic_baseline_rewind_24)
+                }
+            })
+        }
+
+        labelAnimation = ObjectAnimator.ofFloat(binding.textView, View.TRANSLATION_X, -35f).apply {
+            duration = animationDuration
+            addListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator?) {
+                    binding.imageButton.isEnabled = true // enable button
+                    binding.imageButton.setBackgroundResource(R.drawable.ic_baseline_rewind_10_24)
+
+                    binding.textView.visibility = View.GONE
+                    binding.textView.animate().translationX(0f)
+
+                    onAnimationEndCallback?.invoke()
+                }
+            })
+        }
+    }
+
+    fun setOnButtonClickListener(func: RewindButton.() -> Unit) {
+        binding.imageButton.setOnClickListener {
+            func()
+        }
+    }
+
+    fun runOnClickAnimation() {
+        // run button animation
+        buttonAnimation.start()
+
+        // run lbl animation
+        binding.textView.visibility = View.VISIBLE
+        labelAnimation.start()
+    }
+
+}

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

@@ -1,75 +0,0 @@
-package org.mosad.teapod.ui.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 com.afollestad.materialdialogs.MaterialDialog
-import de.psdev.licensesdialog.LicensesDialog
-import kotlinx.android.synthetic.main.fragment_account.*
-import org.mosad.teapod.BuildConfig
-import org.mosad.teapod.R
-import org.mosad.teapod.parser.AoDParser
-import org.mosad.teapod.preferences.EncryptedPreferences
-import org.mosad.teapod.preferences.Preferences
-import org.mosad.teapod.ui.components.LoginDialog
-
-class AccountFragment : Fragment() {
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_account, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        text_account_login.text = EncryptedPreferences.login
-        text_info_about_desc.text = getString(R.string.info_about_desc, BuildConfig.VERSION_NAME, getString(R.string.build_time))
-        switch_secondary.isChecked = Preferences.preferSecondary
-
-        initActions()
-    }
-
-    private fun initActions() {
-        linear_account_login.setOnClickListener {
-            showLoginDialog(true)
-        }
-
-        linear_about.setOnClickListener {
-            MaterialDialog(requireContext())
-                .title(R.string.info_about)
-                .message(R.string.info_about_dialog)
-                .show()
-        }
-
-        text_licenses.setOnClickListener {
-            LicensesDialog.Builder(requireContext())
-                .setNotices(R.raw.notices)
-                .setTitle(R.string.licenses)
-                .setIncludeOwnLicense(true)
-                .setThemeResourceId(R.style.AppTheme)
-                .build()
-                .show()
-        }
-
-        switch_secondary.setOnClickListener {
-            Preferences.savePreferSecondary(requireContext(), switch_secondary.isChecked)
-        }
-    }
-
-    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 {
-            login = EncryptedPreferences.login
-            password = ""
-        }
-    }
-}

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

@@ -1,70 +0,0 @@
-package org.mosad.teapod.ui.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.mosad.teapod.MainActivity
-import org.mosad.teapod.R
-import org.mosad.teapod.parser.AoDParser
-import org.mosad.teapod.util.StorageController
-import org.mosad.teapod.util.adapter.MediaItemAdapter
-import org.mosad.teapod.util.decoration.MediaItemDecoration
-
-class HomeFragment : Fragment() {
-
-    private lateinit var adapterMyList: MediaItemAdapter
-    private lateinit var adapterNewEpisodes: MediaItemAdapter
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_home, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        GlobalScope.launch {
-            withContext(Dispatchers.Main) {
-                context?.let {
-                    recycler_my_list.addItemDecoration(MediaItemDecoration(9))
-
-                    updateMyListMedia()
-
-                    adapterNewEpisodes = MediaItemAdapter(AoDParser.newEpisodesList)
-                    recycler_new_episodes.adapter = adapterNewEpisodes
-                    recycler_new_episodes.addItemDecoration(MediaItemDecoration(9))
-
-                    initActions()
-                }
-            }
-        }
-    }
-
-    // TODO recreating the adapter on list change is not a good solution
-    fun updateMyListMedia() {
-        val myListMedia = StorageController.myList.map { elementId ->
-            AoDParser.itemMediaList.first {
-                elementId == it.id
-            }
-        }
-
-        adapterMyList = MediaItemAdapter(myListMedia)
-        adapterMyList.onItemClick = { mediaId, _ ->
-            (activity as MainActivity).showMediaFragment(mediaId)
-        }
-
-        recycler_my_list.adapter = adapterMyList
-    }
-
-    private fun initActions() {
-        adapterNewEpisodes.onItemClick = { mediaId, _ ->
-            (activity as MainActivity).showMediaFragment(mediaId)
-        }
-    }
-}

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

@@ -1,44 +0,0 @@
-package org.mosad.teapod.ui.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import kotlinx.android.synthetic.main.fragment_library.*
-import kotlinx.coroutines.*
-import org.mosad.teapod.MainActivity
-import org.mosad.teapod.R
-import org.mosad.teapod.parser.AoDParser
-import org.mosad.teapod.util.decoration.MediaItemDecoration
-import org.mosad.teapod.util.adapter.MediaItemAdapter
-
-class LibraryFragment : Fragment() {
-
-    private lateinit var adapter: MediaItemAdapter
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_library, container, false)
-    }
-
-    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 as MainActivity).showMediaFragment(mediaId)
-                    }
-
-                    recycler_media_library.adapter = adapter
-                    recycler_media_library.addItemDecoration(MediaItemDecoration(9))
-                }
-            }
-
-        }
-    }
-}

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

@@ -1,16 +0,0 @@
-package org.mosad.teapod.ui.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import org.mosad.teapod.R
-
-class LoadingFragment : Fragment() {
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_loading, container, false)
-    }
-
-}

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

@@ -1,148 +0,0 @@
-package org.mosad.teapod.ui.fragments
-
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-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.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
-import jp.wasabeef.glide.transformations.BlurTransformation
-import kotlinx.android.synthetic.main.fragment_media.*
-import org.mosad.teapod.MainActivity
-import org.mosad.teapod.R
-import org.mosad.teapod.parser.AoDParser
-import org.mosad.teapod.preferences.Preferences
-import org.mosad.teapod.util.DataTypes.MediaType
-import org.mosad.teapod.util.Episode
-import org.mosad.teapod.util.Media
-import org.mosad.teapod.util.StorageController
-import org.mosad.teapod.util.TMDBResponse
-import org.mosad.teapod.util.adapter.EpisodeItemAdapter
-
-class MediaFragment(private val media: Media, private val tmdb: TMDBResponse) : Fragment() {
-
-    private lateinit var adapterRecEpisodes: EpisodeItemAdapter
-    private lateinit var viewManager: RecyclerView.LayoutManager
-
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_media, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        initGUI()
-        initActions()
-    }
-
-    /**
-     * if tmdb data is present, use it, else use the aod data
-     */
-    private fun initGUI() {
-        // 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
-
-        Glide.with(requireContext()).load(backdropUrl)
-            .apply(RequestOptions.placeholderOf(ColorDrawable(Color.DKGRAY)))
-            .apply(RequestOptions.bitmapTransform(BlurTransformation(20, 3)))
-            .into(image_backdrop)
-
-        Glide.with(requireContext()).load(posterUrl)
-            .into(image_poster)
-
-        text_title.text = media.info.title
-        text_year.text = media.info.year.toString()
-        text_age.text = media.info.age.toString()
-        text_overview.text = media.info.shortDesc
-        if (StorageController.myList.contains(media.id)) {
-            Glide.with(requireContext()).load(R.drawable.ic_baseline_check_24).into(image_my_list_action)
-        } else {
-            Glide.with(requireContext()).load(R.drawable.ic_baseline_add_24).into(image_my_list_action)
-        }
-
-        // specific gui
-        if (media.type == MediaType.TVSHOW) {
-            adapterRecEpisodes = EpisodeItemAdapter(media.episodes)
-            viewManager = LinearLayoutManager(context)
-            recycler_episodes.layoutManager = viewManager
-            recycler_episodes.adapter = adapterRecEpisodes
-
-            text_episodes_or_runtime.text = getString(R.string.text_episodes_count, media.info.episodesCount)
-        } else if (media.type == MediaType.MOVIE) {
-            recycler_episodes.visibility = View.GONE
-
-            if (tmdb.runtime > 0) {
-                text_episodes_or_runtime.text = getString(R.string.text_runtime, tmdb.runtime)
-            } else {
-                text_episodes_or_runtime.visibility = View.GONE
-            }
-        }
-    }
-
-    private fun initActions() {
-        button_play.setOnClickListener {
-            when (media.type) {
-                MediaType.MOVIE -> playStream(media.episodes.first())
-                MediaType.TVSHOW -> playStream(media.episodes.first())
-                else -> Log.e(javaClass.name, "Wrong Type: $media.type")
-            }
-        }
-
-        // add or remove media from myList
-        linear_my_list_action.setOnClickListener {
-            if (StorageController.myList.contains(media.id)) {
-                StorageController.myList.remove(media.id)
-                Glide.with(requireContext()).load(R.drawable.ic_baseline_add_24).into(image_my_list_action)
-            } else {
-                StorageController.myList.add(media.id)
-                Glide.with(requireContext()).load(R.drawable.ic_baseline_check_24).into(image_my_list_action)
-            }
-            StorageController.saveMyList(requireContext())
-
-            // notify home fragment on change
-            parentFragmentManager.findFragmentByTag("HomeFragment")?.let {
-                (it as HomeFragment).updateMyListMedia()
-            }
-        }
-
-        // set onItemClick only in adapter is initialized
-        if (this::adapterRecEpisodes.isInitialized) {
-            adapterRecEpisodes.onImageClick = { _, position ->
-                playStream(media.episodes[position])
-
-                // update watched state
-                AoDParser.sendCallback(media.episodes[position].watchedCallback)
-                adapterRecEpisodes.updateWatchedState(true, position)
-                adapterRecEpisodes.notifyDataSetChanged()
-            }
-        }
-    }
-
-    /**
-     * Play the media's stream
-     * If prefer secondary or primary is empty and secondary is present (secStreamOmU),
-     * use the secondary stream. Else, if the primary stream is set use the primary stream.
-     */
-    private fun playStream(ep: Episode) {
-        val streamUrl = if ((Preferences.preferSecondary || ep.priStreamUrl.isEmpty()) && ep.secStreamOmU) {
-            ep.secStreamUrl
-        } else if (ep.priStreamUrl.isNotEmpty()) {
-            ep.priStreamUrl
-        } else {
-            Log.e(javaClass.name, "No stream url set.")
-            ""
-        }
-
-        Log.d(javaClass.name, "Playing stream: $streamUrl")
-        (activity as MainActivity).startPlayer(streamUrl)
-    }
-
-}

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

@@ -1,62 +0,0 @@
-package org.mosad.teapod.ui.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.android.synthetic.main.fragment_search.*
-import kotlinx.coroutines.*
-import org.mosad.teapod.MainActivity
-import org.mosad.teapod.R
-import org.mosad.teapod.parser.AoDParser
-import org.mosad.teapod.util.decoration.MediaItemDecoration
-import org.mosad.teapod.util.adapter.MediaItemAdapter
-
-class SearchFragment : Fragment() {
-
-    private var adapter : MediaItemAdapter? = null
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_search, container, false)
-    }
-
-    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, _ ->
-                        search_text.clearFocus()
-                        (activity as MainActivity).showMediaFragment(mediaId)
-                    }
-
-                    recycler_media_search.adapter = adapter
-                    recycler_media_search.addItemDecoration(MediaItemDecoration(9))
-                }
-            }
-        }
-
-        initActions()
-    }
-
-    private fun initActions() {
-        search_text.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/util/ActivityUtils.kt

@@ -0,0 +1,82 @@
+package org.mosad.teapod.util
+
+import android.app.Activity
+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
+import org.mosad.teapod.R
+import kotlin.system.exitProcess
+
+/**
+ * Show a fragment on top of the current fragment.
+ * The current fragment is replaced and the new one is added
+ * to the back stack.
+ */
+fun FragmentActivity.showFragment(fragment: Fragment) {
+    supportFragmentManager.commit {
+        replace(R.id.nav_host_fragment, fragment, fragment.javaClass.simpleName)
+        addToBackStack(fragment.javaClass.name)
+        show(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)
+        }
+    }
+}
+
+fun Activity.isInPiPMode(): Boolean {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        isInPictureInPictureMode
+    } else {
+        false // pip mode not supported
+    }
+}
+
+/**
+ * Bring up launcher task to front
+ */
+fun Activity.navToLauncherTask() {
+    val activityManager = (getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager)
+    activityManager.appTasks.forEach { task ->
+        val baseIntent = task.taskInfo.baseIntent
+        val categories = baseIntent.categories
+        if (categories != null && categories.contains(Intent.CATEGORY_LAUNCHER)) {
+            task.moveToFront()
+            return
+        }
+    }
+}
+
+/**
+ * exit and remove the app from tasks
+ */
+fun Activity.exitAndRemoveTask() {
+    finishAndRemoveTask()
+    exitProcess(0)
+}

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

@@ -1,73 +1,129 @@
 package org.mosad.teapod.util
 
+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) {
+        LIGHT("Light"),
+        DARK("Dark")
+    }
+
+    enum class License(val short: String, val long: String) {
+        APACHE2("AL 2.0", "Apache License Version 2.0"),
+        MIT("MIT", "MIT License"),
+        GPL3("GPL 3", "GNU General Public License Version 3"),
+        BSD2("BSD 2", "BSD 2-Clause License")
     }
 }
 
+data class ThirdPartyComponent(
+    val name: String,
+    val year: String,
+    val copyrightOwner: String,
+    val link: String,
+    val license: DataTypes.License
+)
+
 /**
  * this class is used to represent the item media
  * 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(),
-    var 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 getEpisodeById(mediaId: Int) = playlist.firstOrNull { it.mediaId == mediaId }
+        ?: AoDEpisodeNone
+}
+
+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 }
+
+    /**
+     * get the preferred stream
+     * @return the preferred stream, if not present use the first stream
+     */
+    fun getPreferredStream(language: Locale) = streams.firstOrNull { it.language == language }
+        ?: Stream("", Locale.ROOT)
+}
+
+data class Stream(
+    val url: String,
+    val language : Locale
 )
 
-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
+// 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()
 )
 
 /**
- * if secStreamOmU == true, then a secondary stream is present
+ * this class is used to represent the aod json API?
  */
-data class Episode(
-    val id: Int = 0,
-    var title: String = "",
-    var priStreamUrl: String = "",
-    var secStreamUrl: String = "",
-    var secStreamOmU: Boolean = false,
-    var posterUrl: String = "",
-    var description: String = "",
-    var shortDesc: String = "",
-    var number: Int = 0,
-    var watched: Boolean = false,
-    var watchedCallback: String = ""
+data class AoDPlaylist(
+    val list: List<Playlist>,
+    val language: Locale
 )
 
-data class TMDBResponse(
-    val id: Int = 0,
-    val title: String = "",
-    val overview: String = "",
-    val posterUrl: String = "",
-    val backdropUrl: String = "",
-    var runtime: Int = 0
-)
-
-data class AoDObject(val playlist: List<Playlist>)
-
 data class Playlist(
     val sources: List<Source>,
     val image: String,

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

@@ -0,0 +1,159 @@
+/**
+ * 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
+
+import android.util.Log
+import com.google.gson.Gson
+import com.google.gson.annotations.SerializedName
+import kotlinx.coroutines.*
+import java.io.FileNotFoundException
+import java.net.URL
+
+/**
+ * TODO remove gson usage
+ */
+class MetaDBController {
+
+    companion object {
+        private const val repoUrl = "https://gitlab.com/Seil0/teapodmetadb/-/raw/main/aod/"
+
+        var mediaList = MediaList(listOf())
+        private var metaCacheList = arrayListOf<Meta>()
+
+        @Suppress("BlockingMethodInNonBlockingContext")
+        suspend fun list() = withContext(Dispatchers.IO) {
+            val url = URL("$repoUrl/list.json")
+            val json = url.readText()
+
+            mediaList = Gson().fromJson(json, MediaList::class.java)
+        }
+    }
+
+    /**
+     * Get the meta data for a movie from MetaDB
+     * @param aodId The AoD id of the media
+     * @return A meta movie object, or null if not found
+     */
+    suspend fun getMovieMetadata(aodId: Int): MovieMeta? {
+        return metaCacheList.firstOrNull {
+            it.aodId == aodId
+        } as MovieMeta? ?: getMovieMetadataFromDB(aodId)
+    }
+
+    /**
+     * Get the meta data for a tv show from MetaDB
+     * @param aodId The AoD id of the media
+     * @return A meta tv show object, or null if not found
+     */
+    suspend fun getTVShowMetadata(aodId: Int): TVShowMeta? {
+        return metaCacheList.firstOrNull {
+            it.aodId == aodId
+        } as TVShowMeta? ?: getTVShowMetadataFromDB(aodId)
+    }
+
+    @Suppress("BlockingMethodInNonBlockingContext")
+    private suspend fun getMovieMetadataFromDB(aodId: Int): MovieMeta? = withContext(Dispatchers.IO) {
+        val url = URL("$repoUrl/movie/$aodId/media.json")
+        return@withContext try {
+            val json = url.readText()
+            val meta = Gson().fromJson(json, MovieMeta::class.java)
+            metaCacheList.add(meta)
+
+            meta
+        } catch (ex: FileNotFoundException) {
+            Log.w(javaClass.name, "Waring: The requested file was not found. Requested ID: $aodId", ex)
+            null
+        }
+    }
+
+    @Suppress("BlockingMethodInNonBlockingContext")
+    private suspend fun getTVShowMetadataFromDB(aodId: Int): TVShowMeta? = withContext(Dispatchers.IO) {
+        val url = URL("$repoUrl/tv/$aodId/media.json")
+        return@withContext try {
+            val json = url.readText()
+            val meta = Gson().fromJson(json, TVShowMeta::class.java)
+            metaCacheList.add(meta)
+
+            meta
+        } catch (ex: FileNotFoundException) {
+            Log.w(javaClass.name, "Waring: The requested file was not found. Requested ID: $aodId", ex)
+            null
+        }
+    }
+
+}
+
+// class representing the media list json object
+data class MediaList(
+    val media: List<Int>
+)
+
+// abstract class used for meta data objects (tv, movie)
+abstract class Meta {
+    abstract val id: Int
+    abstract val aodId: Int
+    abstract val tmdbId: Int
+}
+
+// class representing the movie json object
+data class MovieMeta(
+    override val id: Int,
+    @SerializedName("aod_id")
+    override val aodId: Int,
+    @SerializedName("tmdb_id")
+    override val tmdbId: Int
+): Meta()
+
+// class representing the tv show json object
+data class TVShowMeta(
+    override val id: Int,
+    @SerializedName("aod_id")
+    override val aodId: Int,
+    @SerializedName("tmdb_id")
+    override val tmdbId: Int,
+    @SerializedName("tmdb_season_id")
+    val tmdbSeasonId: Int,
+    @SerializedName("tmdb_season_number")
+    val tmdbSeasonNumber: Int,
+    @SerializedName("episodes")
+    val episodes: List<EpisodeMeta>
+): Meta()
+
+// class used in TVShowMeta, part of the tv show json object
+data class EpisodeMeta(
+    val id: Int,
+    @SerializedName("aod_media_id")
+    val aodMediaId: Int,
+    @SerializedName("tmdb_id")
+    val tmdbId: Int,
+    @SerializedName("tmdb_number")
+    val tmdbNumber: Int,
+    @SerializedName("opening_start")
+    val openingStart: Long,
+    @SerializedName("opening_duration")
+    val openingDuration: Long,
+    @SerializedName("ending_start")
+    val endingStart: Long,
+    @SerializedName("ending_duration")
+    val endingDuration: Long
+)

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

@@ -1,38 +0,0 @@
-package org.mosad.teapod.util
-
-import android.content.Context
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import kotlinx.coroutines.*
-import java.io.File
-
-/**
- * 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() }
-
-        myList.clear()
-        myList.addAll(
-            GsonBuilder().create().fromJson(file.readText(), ArrayList<Int>().javaClass)
-        )
-    }
-
-    fun saveMyList(context: Context): Job {
-        val file = File(context.filesDir, fileNameMyList)
-
-        return GlobalScope.launch(Dispatchers.IO) {
-            file.writeText(Gson().toJson(myList))
-        }
-    }
-
-}

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

@@ -1,120 +0,0 @@
-package org.mosad.teapod.util
-
-import android.util.Log
-import com.google.gson.JsonObject
-import com.google.gson.JsonParser
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.async
-import kotlinx.coroutines.runBlocking
-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"
-
-    fun search(title: String, type: MediaType): TMDBResponse {
-        val searchTerm = title.replace("(Sub)", "").trim()
-
-        return when (type) {
-            MediaType.MOVIE -> searchMovie(searchTerm)
-            MediaType.TVSHOW -> searchTVShow(searchTerm)
-            else -> {
-                Log.e(javaClass.name, "Wrong Type: $type")
-                TMDBResponse()
-            }
-        }
-
-    }
-
-    fun searchTVShow(title: String) = runBlocking {
-        val url = URL("$searchTVUrl$preparedParameters&query=${URLEncoder.encode(title, "UTF-8")}")
-
-        GlobalScope.async {
-            val response = JsonParser.parseString(url.readText()).asJsonObject
-            //println(response)
-
-            return@async 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()
-            }
-        }.await()
-
-    }
-
-    fun searchMovie(title: String) = runBlocking {
-        val url = URL("$searchMovieUrl$preparedParameters&query=${URLEncoder.encode(title, "UTF-8")}")
-
-        GlobalScope.async {
-            val response = JsonParser.parseString(url.readText()).asJsonObject
-            //println(response)
-
-            return@async 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()
-            }
-
-
-        }.await()
-    }
-
-    /**
-     * 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

@@ -0,0 +1,45 @@
+package org.mosad.teapod.util
+
+import android.widget.TextView
+import org.mosad.teapod.parser.crunchyroll.Collection
+import org.mosad.teapod.parser.crunchyroll.ContinueWatchingItem
+import org.mosad.teapod.parser.crunchyroll.Item
+import java.util.*
+
+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 Collection<Item>.toItemMediaList(): List<ItemMedia> {
+    return this.items.map {
+        ItemMedia(it.id, it.title, it.images.poster_wide[0][0].source)
+    }
+}
+
+@JvmName("toItemMediaListContinueWatchingItem")
+fun Collection<ContinueWatchingItem>.toItemMediaList(): List<ItemMedia> {
+    return items.map {
+        ItemMedia(it.panel.episodeMetadata.seriesId, it.panel.title, it.panel.images.thumbnail[0][0].source)
+    }
+}
+
+fun List<ContinueWatchingItem>.toItemMediaList(): List<ItemMedia> {
+    return this.map {
+        ItemMedia(it.panel.episodeMetadata.seriesId, it.panel.title, it.panel.images.thumbnail[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
+    }
+}

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

@@ -1,54 +1,72 @@
 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
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation
-import kotlinx.android.synthetic.main.item_episode.view.*
 import org.mosad.teapod.R
-import org.mosad.teapod.util.Episode
+import org.mosad.teapod.databinding.ItemEpisodeBinding
+import org.mosad.teapod.parser.crunchyroll.Episode
+import org.mosad.teapod.parser.crunchyroll.PlayheadsMap
+import org.mosad.teapod.util.tmdb.TMDBTVEpisode
 
-class EpisodeItemAdapter(private val episodes: List<Episode>) : RecyclerView.Adapter<EpisodeItemAdapter.MyViewHolder>() {
+class EpisodeItemAdapter(
+    private val episodes: List<Episode>,
+    private val tmdbEpisodes: List<TMDBTVEpisode>?,
+    private val playheads: PlayheadsMap
+) : RecyclerView.Adapter<EpisodeItemAdapter.EpisodeViewHolder>() {
 
-    var onItemClick: ((String, Int) -> Unit)? = null
-    var onImageClick: ((String, Int) -> Unit)? = null
+    var onImageClick: ((seasonId: String, episodeId: String) -> Unit)? = null
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.item_episode, parent, false)
-
-        return MyViewHolder(view)
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EpisodeViewHolder {
+        return EpisodeViewHolder(ItemEpisodeBinding.inflate(LayoutInflater.from(parent.context), parent, false))
     }
 
-    override fun onBindViewHolder(holder: MyViewHolder, position: Int) {
-        val context = holder.view.context
+    override fun onBindViewHolder(holder: EpisodeViewHolder, position: Int) {
+        val context = holder.binding.root.context
         val ep = episodes[position]
 
-        val titleText = if (ep.priStreamUrl.isEmpty() && ep.secStreamOmU) {
-            context.getString(R.string.component_episode_title_sub, ep.number, ep.description)
+        val titleText = if (ep.episodeNumber != null) {
+            // for tv shows add ep prefix and episode number
+            if (ep.isDubbed) {
+                context.getString(R.string.component_episode_title, ep.episode, ep.title)
+            } else {
+                context.getString(R.string.component_episode_title_sub, ep.episode, ep.title)
+            }
         } else {
-            context.getString(R.string.component_episode_title, ep.number, ep.description)
+            ep.title
         }
 
-        holder.view.text_episode_title.text = titleText
-        holder.view.text_episode_desc.text = ep.shortDesc
+        holder.binding.textEpisodeTitle.text = titleText
+        holder.binding.textEpisodeDesc.text = if (ep.description.isNotEmpty()) {
+            ep.description
+        } else if (tmdbEpisodes != null && position < tmdbEpisodes.size){
+            tmdbEpisodes[position].overview
+        } else {
+            ""
+        }
 
-        if (episodes[position].posterUrl.isNotEmpty()) {
-            Glide.with(context).load(ep.posterUrl)
+        // TODO is isNotEmpty() needed? also in PlayerEpisodeItemAdapter
+        if (ep.images.thumbnail[0][0].source.isNotEmpty()) {
+            Glide.with(context).load(ep.images.thumbnail[0][0].source)
+                .apply(RequestOptions.placeholderOf(ColorDrawable(Color.DKGRAY)))
                 .apply(RequestOptions.bitmapTransform(RoundedCornersTransformation(10, 0)))
-                .into(holder.view.image_episode)
+                .into(holder.binding.imageEpisode)
         }
 
-        if (ep.watched) {
-            holder.view.image_watched.setImageDrawable(
-                ContextCompat.getDrawable(context, R.drawable.ic_baseline_check_circle_24)
-            )
+        // add watched icon to episode, if the episode id is present in playheads and fullyWatched
+        val watchedImage: Drawable? = if (playheads[ep.id]?.fullyWatched == true) {
+            ContextCompat.getDrawable(context, R.drawable.ic_baseline_check_circle_24)
         } else {
-            holder.view.image_watched.setImageDrawable(null)
+            null
         }
+        holder.binding.imageWatched.setImageDrawable(watchedImage)
     }
 
     override fun getItemCount(): Int {
@@ -56,17 +74,21 @@ class EpisodeItemAdapter(private val episodes: List<Episode>) : RecyclerView.Ada
     }
 
     fun updateWatchedState(watched: Boolean, position: Int) {
-        episodes[position].watched = watched
+        // use getOrNull as there could be a index out of bound when running this in onResume()
+
+        // TODO
+        //episodes.getOrNull(position)?.watched = watched
     }
 
-    inner class MyViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
+    inner class EpisodeViewHolder(val binding: ItemEpisodeBinding) :
+        RecyclerView.ViewHolder(binding.root) {
         init {
-            view.setOnClickListener {
-                onItemClick?.invoke(episodes[adapterPosition].title, adapterPosition)
-            }
-
-            view.image_episode.setOnClickListener {
-                onImageClick?.invoke(episodes[adapterPosition].title, adapterPosition)
+            // on image click return the episode id and index (within the adapter)
+            binding.imageEpisode.setOnClickListener {
+                onImageClick?.invoke(
+                    episodes[bindingAdapterPosition].seasonId,
+                    episodes[bindingAdapterPosition].id
+                )
             }
         }
     }

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

@@ -1,79 +1,41 @@
 package org.mosad.teapod.util.adapter
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.Filter
-import android.widget.Filterable
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import kotlinx.android.synthetic.main.item_media.view.*
-import org.mosad.teapod.R
+import org.mosad.teapod.databinding.ItemMediaBinding
 import org.mosad.teapod.util.ItemMedia
-import java.util.*
 
-class MediaItemAdapter(private val media: List<ItemMedia>) : RecyclerView.Adapter<MediaItemAdapter.ViewHolder>(), Filterable {
+class MediaItemAdapter(private val items: List<ItemMedia>) : RecyclerView.Adapter<MediaItemAdapter.MediaViewHolder>() {
 
-    var onItemClick: ((Int, Int) -> Unit)? = null
-    private val filter = MediaFilter()
-    private var filteredMedia = media.map { it.copy() }
+    var onItemClick: ((id: String, position: Int) -> Unit)? = null
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MediaItemAdapter.ViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.item_media, parent, false)
-
-        return ViewHolder(view)
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MediaItemAdapter.MediaViewHolder {
+        return MediaViewHolder(ItemMediaBinding.inflate(LayoutInflater.from(parent.context), parent, false))
     }
 
-    override fun onBindViewHolder(holder: MediaItemAdapter.ViewHolder, position: Int) {
-        holder.view.apply {
-            text_title.text = filteredMedia[position].title
-            Glide.with(context).load(filteredMedia[position].posterUrl).into(image_poster)
+    override fun onBindViewHolder(holder: MediaItemAdapter.MediaViewHolder, position: Int) {
+        holder.binding.root.apply {
+            holder.binding.textTitle.text = items[position].title
+            Glide.with(context).load(items[position].posterUrl).into(holder.binding.imagePoster)
         }
     }
 
     override fun getItemCount(): Int {
-        return filteredMedia.size
+        return items.size
     }
 
-    override fun getFilter(): Filter {
-        return filter
-    }
-
-    inner class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
+    inner class MediaViewHolder(val binding: ItemMediaBinding) :
+        RecyclerView.ViewHolder(binding.root) {
         init {
-            view.setOnClickListener {
-                onItemClick?.invoke(filteredMedia[adapterPosition].id, adapterPosition)
+            binding.root.setOnClickListener {
+                onItemClick?.invoke(
+                    items[bindingAdapterPosition].id,
+                    bindingAdapterPosition
+                )
             }
         }
     }
 
-    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()) {
-                media
-            } else {
-                media.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/PlayerEpisodeItemAdapter.kt

@@ -0,0 +1,79 @@
+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.parser.crunchyroll.Episodes
+import org.mosad.teapod.util.tmdb.TMDBTVEpisode
+
+class PlayerEpisodeItemAdapter(private val episodes: Episodes, private val tmdbEpisodes: List<TMDBTVEpisode>?) : RecyclerView.Adapter<PlayerEpisodeItemAdapter.EpisodeViewHolder>() {
+
+    var onImageClick: ((seasonId: String, episodeId: String) -> 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.items[position]
+
+        val titleText = if (ep.episodeNumber != null) {
+            // for tv shows add ep prefix and episode number
+            if (ep.isDubbed) {
+                context.getString(R.string.component_episode_title, ep.episode, ep.title)
+            } else {
+                context.getString(R.string.component_episode_title_sub, ep.episode, ep.title)
+            }
+        } else {
+            ep.title
+        }
+
+        holder.binding.textEpisodeTitle2.text = titleText
+        holder.binding.textEpisodeDesc2.text = if (ep.description.isNotEmpty()) {
+            ep.description
+        } else if (tmdbEpisodes != null && position < tmdbEpisodes.size){
+            tmdbEpisodes[position].overview
+        } else {
+            ""
+        }
+
+        if (ep.images.thumbnail[0][0].source.isNotEmpty()) {
+            Glide.with(context).load(ep.images.thumbnail[0][0].source)
+                .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.items.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 != bindingAdapterPosition) {
+                    onImageClick?.invoke(
+                        episodes.items[bindingAdapterPosition].seasonId,
+                        episodes.items[bindingAdapterPosition].id
+                    )
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,174 @@
+/**
+ * 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.features.json.*
+import io.ktor.client.features.json.serializer.*
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+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 json = Json { ignoreUnknownKeys = true }
+    private val client = HttpClient {
+        install(JsonFeature) {
+            serializer = KotlinxSerializer(json)
+        }
+    }
+
+    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.preferredLocale.language),
+            parameters
+        )
+
+        // TODO handle FileNotFoundException
+        return@coroutineScope (Dispatchers.IO) {
+            val response: HttpResponse = client.get(path) {
+                params.forEach {
+                    parameter(it.first, it.second)
+                }
+            }
+
+            response.receive<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/multi"
+        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
+    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 generes
+) : 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 generes
+) : 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

@@ -0,0 +1,5 @@
+<?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/dot_default.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:innerRadius="0dp"
+            android:shape="ring"
+            android:thickness="4dp"
+            android:useLevel="false">
+            <solid android:color="?iconColor"/>
+        </shape>
+    </item>
+</layer-list>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:innerRadius="0dp"
+            android:shape="ring"
+            android:thickness="4dp"
+            android:useLevel="false">
+            <solid android:color="@color/colorAccent" />
+        </shape>
+    </item>
+</layer-list>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/dot_selected"
+        android:state_selected="true"/>
+    <item android:drawable="@drawable/dot_default"/>
+</selector>

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

@@ -0,0 +1,6 @@
+<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.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_arrow_back_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="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</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_autorenew_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,6v3l4,-4 -4,-4v3c-4.42,0 -8,3.58 -8,8 0,1.57 0.46,3.03 1.24,4.26L6.7,14.8c-0.45,-0.83 -0.7,-1.79 -0.7,-2.8 0,-3.31 2.69,-6 6,-6zM18.76,7.74L17.3,9.2c0.44,0.84 0.7,1.79 0.7,2.8 0,3.31 -2.69,6 -6,6v-3l-4,4 4,4v-3c4.42,0 8,-3.58 8,-8 0,-1.57 -0.46,-3.03 -1.24,-4.26z" />
+</vector>

app/src/main/res/drawable/ic_baseline_code_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="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

@@ -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="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_forward_10_24.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M18,13c0,3.31 -2.69,6 -6,6s-6,-2.69 -6,-6s2.69,-6 6,-6v4l5,-5l-5,-5v4c-4.42,0 -8,3.58 -8,8c0,4.42 3.58,8 8,8s8,-3.58 8,-8H18z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10.86,15.94l0,-4.27l-0.09,0l-1.77,0.63l0,0.69l1.01,-0.31l0,3.26z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12.25,13.44v0.74c0,1.9 1.31,1.82 1.44,1.82c0.14,0 1.44,0.09 1.44,-1.82v-0.74c0,-1.9 -1.31,-1.82 -1.44,-1.82C13.55,11.62 12.25,11.53 12.25,13.44zM14.29,13.32v0.97c0,0.77 -0.21,1.03 -0.59,1.03c-0.38,0 -0.6,-0.26 -0.6,-1.03v-0.97c0,-0.75 0.22,-1.01 0.59,-1.01C14.07,12.3 14.29,12.57 14.29,13.32z"/>
+</vector>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,13c0,3.31 -2.69,6 -6,6s-6,-2.69 -6,-6s2.69,-6 6,-6v4l5,-5l-5,-5v4c-4.42,0 -8,3.58 -8,8c0,4.42 3.58,8 8,8c4.42,0 8,-3.58 8,-8H18z" />
+</vector>

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

@@ -1,10 +0,0 @@
-<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,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
-</vector>

app/src/main/res/drawable/ic_baseline_language_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="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

@@ -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="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_rewind_10_24.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.99,5V1l-5,5l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6s-6,-2.69 -6,-6h-2c0,4.42 3.58,8 8,8s8,-3.58 8,-8S16.41,5 11.99,5z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10.89,16h-0.85v-3.26l-1.01,0.31v-0.69l1.77,-0.63h0.09V16z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.17,14.24c0,0.32 -0.03,0.6 -0.1,0.82s-0.17,0.42 -0.29,0.57s-0.28,0.26 -0.45,0.33s-0.37,0.1 -0.59,0.1s-0.41,-0.03 -0.59,-0.1s-0.33,-0.18 -0.46,-0.33s-0.23,-0.34 -0.3,-0.57s-0.11,-0.5 -0.11,-0.82V13.5c0,-0.32 0.03,-0.6 0.1,-0.82s0.17,-0.42 0.29,-0.57s0.28,-0.26 0.45,-0.33s0.37,-0.1 0.59,-0.1s0.41,0.03 0.59,0.1c0.18,0.07 0.33,0.18 0.46,0.33s0.23,0.34 0.3,0.57s0.11,0.5 0.11,0.82V14.24zM14.32,13.38c0,-0.19 -0.01,-0.35 -0.04,-0.48s-0.07,-0.23 -0.12,-0.31s-0.11,-0.14 -0.19,-0.17s-0.16,-0.05 -0.25,-0.05s-0.18,0.02 -0.25,0.05s-0.14,0.09 -0.19,0.17s-0.09,0.18 -0.12,0.31s-0.04,0.29 -0.04,0.48v0.97c0,0.19 0.01,0.35 0.04,0.48s0.07,0.24 0.12,0.32s0.11,0.14 0.19,0.17s0.16,0.05 0.25,0.05s0.18,-0.02 0.25,-0.05s0.14,-0.09 0.19,-0.17s0.09,-0.19 0.11,-0.32s0.04,-0.29 0.04,-0.48V13.38z"/>
+</vector>

app/src/main/res/drawable/ic_baseline_rewind_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="M12,5V1L7,6l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6 -6,-2.69 -6,-6H4c0,4.42 3.58,8 8,8s8,-3.58 8,-8 -3.58,-8 -8,-8z"/>
+</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/colorControlNormal">
+    android:tint="?attr/iconColor">
   <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_skip_next_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="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+</vector>

app/src/main/res/drawable/ic_baseline_style_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="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_baseline_video_library_24.xml

@@ -1,10 +1,5 @@
-<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="M4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM12,14.5v-9l6,4.5 -6,4.5z"/>
+<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="M4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM12,14.5v-9l6,4.5 -6,4.5z"/>
 </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

@@ -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="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/ripple_background.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight" />

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="#B0B0B0"/>
+    <solid android:color="?attr/shapeTextBackground"/>
     <corners android:radius="3dp"/>
 </shape>

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

@@ -9,9 +9,8 @@
         android:id="@+id/nav_view"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
-        android:background="?android:attr/windowBackground"
+        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_onboarding.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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">
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </androidx.viewpager2.widget.ViewPager2>
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tab_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="0dp"
+        android:background="@android:color/transparent"
+        app:tabBackground="@drawable/dot_tab_selector"
+        app:tabGravity="center"
+        app:tabIndicatorHeight="0dp"
+        app:tabPaddingStart="6dp"
+        app:tabPaddingEnd="6dp"/>
+
+    <Button
+        android:id="@+id/button_next"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:background="@null"
+        android:onClick="btnNextClick"
+        android:text="@string/next"
+        android:visibility="gone" />
+
+    <Button
+        android:id="@+id/button_skip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentBottom="true"
+        android:background="@null"
+        android:onClick="btnSkipClick"
+        android:text="@string/skip"
+        tools:visibility="gone" />
+
+</RelativeLayout>

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

@@ -2,27 +2,105 @@
 <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:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:keepScreenOn="true"
     android:background="#000000"
-    tools:context=".PlayerActivity">
+    android:keepScreenOn="true"
+    tools:context=".ui.activity.player.PlayerActivity">
 
-    <com.google.android.exoplayer2.ui.PlayerView
+    <com.google.android.exoplayer2.ui.StyledPlayerView
         android:id="@+id/video_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
-        app:fastforward_increment="10000"
-        app:rewind_increment="10000" />
-    <!--    app:controller_layout_id="@layout/player_custom_control"/>-->
+        android:animateLayoutChanges="true"
+        android:foreground="@drawable/ripple_background"
+        app:controller_layout_id="@layout/player_controls" />
 
-    <com.google.android.material.progressindicator.ProgressIndicator
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/loading"
-        style="@style/Widget.MaterialComponents.ProgressIndicator.Circular.Indeterminate"
         android:layout_width="70dp"
         android:layout_height="70dp"
         android:layout_gravity="center"
+        android:indeterminate="true"
+        app:indicatorColor="@color/exo_white"
         tools:visibility="visible" />
 
+    <LinearLayout
+        android:id="@+id/exo_double_tap_indicator"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:visibility="gone">
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <org.mosad.teapod.ui.components.RewindButton
+            android:id="@+id/rwd_10_indicator"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <Space
+            android:layout_width="60dp"
+            android:layout_height="1dp" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <org.mosad.teapod.ui.components.FastForwardButton
+            android:id="@+id/ffwd_10_indicator"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+    </LinearLayout>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/button_next_ep"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="70dp"
+        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: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="70dp"
+        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/exo_white"
+        app:iconGravity="textStart" />
+
 </FrameLayout>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageButton
+        android:id="@+id/imageButton"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_alignParentStart="true"
+        android:background="@drawable/ic_baseline_forward_10_24"
+        android:contentDescription="@string/forward_10" />
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_centerInParent="true"
+        android:layout_marginStart="42dp"
+        android:text="@string/fwd_10_s"
+        android:textColor="@color/exo_white"
+        android:visibility="gone" />
+</RelativeLayout>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentEnd="true">
+
+    <ImageButton
+        android:id="@+id/imageButton"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_alignParentEnd="true"
+        android:background="@drawable/ic_baseline_rewind_10_24"
+        android:contentDescription="@string/rewind_10" />
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_centerInParent="true"
+        android:layout_marginEnd="42dp"
+        android:text="@string/rwd_10_s"
+        android:textColor="@color/exo_white"
+        android:visibility="gone" />
+
+
+</RelativeLayout>

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

@@ -0,0 +1,274 @@
+<?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"
+    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
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/image_app_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="17dp"
+                android:contentDescription="@string/app_name"
+                android:src="@mipmap/ic_launcher_round" />
+
+            <TextView
+                android:id="@+id/text_app_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="5dp"
+                android:text="@string/app_name"
+                android:textAlignment="center"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/text_about_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="7dp"
+                android:layout_marginEnd="5dp"
+                android:layout_marginBottom="12dp"
+                android:text="@string/about_info" />
+
+            <LinearLayout
+                android:id="@+id/linear_version"
+                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/image_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/version"
+                    android:minWidth="48dp"
+                    android:minHeight="48dp"
+                    android:padding="9dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_outline_info_24"
+                    app:tint="?iconColor" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="12dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/text_version"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/version"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/text_version_desc"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/version_desc"
+                        android:textColor="?textSecondary" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/linear_authors"
+                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/image_authors"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/authors"
+                    android:minWidth="48dp"
+                    android:minHeight="48dp"
+                    android:padding="9dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_baseline_people_24"
+                    app:tint="?iconColor" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="12dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/text_authors"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/authors"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/text_authors_desc"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/author_desc"
+                        android:textColor="?textSecondary" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/linear_source"
+                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/image_source"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/source"
+                    android:minWidth="48dp"
+                    android:minHeight="48dp"
+                    android:padding="9dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_baseline_code_24"
+                    app:tint="?iconColor" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="12dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/text_source"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/source"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/text_source_desc"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/teapod_repo"
+                        android:textColor="?textSecondary" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/linear_license"
+                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/image_license"
+                    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_description_24"
+                    app:tint="?iconColor" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="12dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/text_license"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/license"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/text_license_desc"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/license_desc"
+                        android:textColor="?textSecondary" />
+                </LinearLayout>
+            </LinearLayout>
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:paddingBottom="5dp">
+
+            <TextView
+                android:id="@+id/text_third_party"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="17dp"
+                android:layout_marginEnd="5dp"
+                android:text="@string/third_party_heading"
+                android:textSize="17sp"
+                android:textStyle="bold" />
+
+            <LinearLayout
+                android:id="@+id/linear_third_party"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="7dp"
+                android:orientation="vertical" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/text_tmdb_notice"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="7dp"
+            android:layout_marginTop="7dp"
+            android:layout_marginEnd="7dp"
+            android:paddingBottom="5dp"
+            android:text="@string/tmdb_notice"
+            android:textAlignment="center"
+            android:textColor="?textSecondary" />
+
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>

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

@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#f5f5f5"
-    tools:context=".ui.fragments.AccountFragment">
+    android:background="?themePrimary"
+    tools:context=".ui.activity.main.fragments.AccountFragment">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -14,14 +14,17 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:clipToPadding="false"
+            android:orientation="vertical"
+            android:paddingBottom="12dp">
 
             <LinearLayout
                 android:id="@+id/linear_account"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
-                android:background="#ffffff"
+                android:background="?themeSecondary"
+                android:elevation="5dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -31,7 +34,6 @@
                     android:paddingStart="7dp"
                     android:paddingEnd="7dp"
                     android:text="@string/account"
-                    android:textColor="@android:color/primary_text_light"
                     android:textSize="16sp"
                     android:textStyle="bold" />
 
@@ -39,9 +41,10 @@
                     android:id="@+id/linear_account_login"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_margin="7dp"
+                    android:foreground="?android:selectableItemBackground"
                     android:gravity="center"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:padding="7dp">
 
                     <ImageView
                         android:id="@+id/imageView"
@@ -50,10 +53,10 @@
                         android:contentDescription="@string/account"
                         android:minWidth="48dp"
                         android:minHeight="48dp"
-                        android:padding="5dp"
+                        android:padding="9dp"
                         android:scaleType="fitXY"
                         android:src="@drawable/ic_baseline_account_box_24"
-                        app:srcCompat="@drawable/ic_baseline_account_box_24" />
+                        app:tint="?iconColor" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -66,7 +69,6 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:text="@string/account_login_ex"
-                            android:textColor="@android:color/primary_text_light"
                             android:textSize="16sp" />
 
                         <TextView
@@ -75,18 +77,63 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:text="@string/account_login_desc"
-                            android:textColor="@android:color/secondary_text_light" />
+                            android:textColor="?textSecondary" />
                     </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"
+                        app:tint="?iconColor" />
+
+                    <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/account_subscription"
+                            android:textSize="16sp" />
+
+                        <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_subscription_desc"
+                            android:textColor="?textSecondary" />
+                    </LinearLayout>
+                </LinearLayout>
+
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/linear_settings"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
-                android:background="#ffffff"
+                android:background="?themeSecondary"
+                android:elevation="5dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -96,28 +143,68 @@
                     android:paddingStart="7dp"
                     android:paddingEnd="7dp"
                     android:text="@string/settings"
-                    android:textColor="@android:color/primary_text_light"
                     android:textSize="16sp"
                     android:textStyle="bold" />
 
+                <LinearLayout
+                    android:id="@+id/linear_settings_content_language"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
+                    android:padding="7dp">
+
+                    <ImageView
+                        android:id="@+id/imageView4"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/settings_content_language"
+                        android:minWidth="48dp"
+                        android:minHeight="48dp"
+                        android:padding="9dp"
+                        android:scaleType="fitXY"
+                        android:src="@drawable/ic_baseline_language_24"
+                        app:tint="?iconColor" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/text_settings_content_language"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/settings_content_language"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/text_settings_content_language_desc"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/settings_content_language_desc"
+                            android:textColor="?textSecondary" />
+                    </LinearLayout>
+                </LinearLayout>
+
                 <LinearLayout
                     android:id="@+id/linear_settings_secondary"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_margin="7dp"
                     android:gravity="center"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:padding="7dp">
 
                     <ImageView
                         android:id="@+id/imageView3"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:contentDescription="@string/account"
+                        android:contentDescription="@string/settings_prefer_subbed"
                         android:minWidth="48dp"
                         android:minHeight="48dp"
-                        android:padding="5dp"
+                        android:padding="9dp"
                         android:scaleType="fitXY"
-                        android:src="@drawable/ic_baseline_subtitles_24" />
+                        android:src="@drawable/ic_baseline_subtitles_24"
+                        app:tint="?iconColor" />
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
@@ -138,8 +225,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
-                                android:text="@string/settings_secondary"
-                                android:textColor="@android:color/primary_text_light"
+                                android:text="@string/settings_prefer_subbed"
                                 android:textSize="16sp" />
 
                             <TextView
@@ -148,8 +234,8 @@
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
                                 android:maxLines="2"
-                                android:text="@string/settings_secondary_desc"
-                                android:textColor="@android:color/secondary_text_light" />
+                                android:text="@string/settings_prefer_subbed_desc"
+                                android:textColor="?textSecondary" />
                         </LinearLayout>
 
                         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -164,14 +250,234 @@
 
 
                 </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/linear_settings_autoplay"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:padding="7dp">
+
+                    <ImageView
+                        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" />
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <LinearLayout
+                            android:id="@+id/linearLayout2"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toStartOf="@+id/switch_autoplay"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent">
+
+                            <TextView
+                                android:id="@+id/text_settings_auoplay"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:text="@string/settings_autoplay"
+                                android:textSize="16sp" />
+
+                            <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" />
+                        </LinearLayout>
+
+                        <com.google.android.material.switchmaterial.SwitchMaterial
+                            android:id="@+id/switch_autoplay"
+                            android:layout_width="wrap_content"
+                            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>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/linear_theme"
+                    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/image_theme"
+                        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_style_24"
+                        app:tint="?iconColor" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/text_theme"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/theme"
+                            android:textSize="16sp" />
+
+                        <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" />
+                    </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:background="?themeSecondary"
+                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:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <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">
+
+                    <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"
+                        app:tint="?iconColor" />
+
+                    <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"
+                            android:textColor="?textSecondary" />
+                    </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">
+
+                    <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"
+                        app:tint="?iconColor" />
+
+                    <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"
+                            android:textColor="?textSecondary" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/linear_info"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
-                android:background="#ffffff"
+                android:background="?themeSecondary"
+                android:clipToPadding="false"
+                android:elevation="5dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -181,7 +487,6 @@
                     android:paddingStart="7dp"
                     android:paddingEnd="7dp"
                     android:text="@string/info"
-                    android:textColor="@android:color/primary_text_light"
                     android:textSize="16sp"
                     android:textStyle="bold" />
 
@@ -189,9 +494,10 @@
                     android:id="@+id/linear_about"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_margin="7dp"
+                    android:foreground="?android:selectableItemBackground"
                     android:gravity="center"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:padding="7dp">
 
                     <ImageView
                         android:id="@+id/imageView2"
@@ -200,9 +506,10 @@
                         android:contentDescription="@string/info"
                         android:minWidth="48dp"
                         android:minHeight="48dp"
-                        android:padding="5dp"
+                        android:padding="9dp"
                         android:scaleType="fitXY"
-                        app:srcCompat="@drawable/ic_baseline_info_24" />
+                        app:srcCompat="@drawable/ic_outline_info_24"
+                        app:tint="?iconColor" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -215,7 +522,6 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:text="@string/info_about"
-                            android:textColor="@android:color/primary_text_light"
                             android:textSize="16sp" />
 
                         <TextView
@@ -224,27 +530,11 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:text="@string/info_about_desc"
-                            android:textColor="@android:color/secondary_text_light" />
+                            android:textColor="?textSecondary" />
                     </LinearLayout>
 
                 </LinearLayout>
 
-                <View
-                    android:id="@+id/divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?android:attr/listDivider" />
-
-                <TextView
-                    android:id="@+id/text_licenses"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="7dp"
-                    android:paddingStart="48dp"
-                    android:paddingEnd="48dp"
-                    android:text="@string/licenses"
-                    android:textColor="@android:color/primary_text_light"
-                    android:textSize="16sp" />
             </LinearLayout>
 
         </LinearLayout>

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

@@ -2,10 +2,11 @@
 <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:id="@+id/ff_test"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#f5f5f5"
-    tools:context=".ui.fragments.HomeFragment">
+    android:background="?themePrimary"
+    tools:context=".ui.activity.main.fragments.HomeFragment">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -14,36 +15,100 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <LinearLayout
+                android:id="@+id/linear_highlight"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
                 android:paddingBottom="7dp">
 
-                <TextView
-                    android:id="@+id/text_my_list"
+                <ImageView
+                    android:id="@+id/image_highlight"
                     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/my_list"
-                    android:textSize="16sp"
-                    android:textStyle="bold" />
+                    android:contentDescription="@string/highlight_media"
+                    app:layout_constraintDimensionRatio="H,16:9"
+                    tools:src="@drawable/ic_launcher_background" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recycler_my_list"
+                <TextView
+                    android:id="@+id/text_highlight_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="7dp"
+                    android:text="@string/text_title_ex"
+                    android:textAlignment="center"
+                    android:textSize="16sp" />
+
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                    tools:listitem="@layout/item_media" />
+                    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/text_highlight_my_list"
+                        android:layout_width="64dp"
+                        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
+                        android:layout_width="0dp"
+                        android:layout_height="1dp"
+                        android:layout_weight="1" />
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/button_play_highlight"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        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" />
+
+                    <Space
+                        android:layout_width="0dp"
+                        android:layout_height="1dp"
+                        android:layout_weight="1" />
+
+                    <TextView
+                        android:id="@+id/text_highlight_info"
+                        android:layout_width="64dp"
+                        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
+                        android:layout_width="0dp"
+                        android:layout_height="1dp"
+                        android:layout_weight="1" />
+
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/linear_up_next"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
@@ -57,7 +122,7 @@
                     android:paddingTop="15dp"
                     android:paddingEnd="5dp"
                     android:paddingBottom="5dp"
-                    android:text="@string/new_episodes"
+                    android:text="@string/up_next"
                     android:textSize="16sp"
                     android:textStyle="bold" />
 
@@ -70,6 +135,90 @@
                     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"
+                android:paddingBottom="7dp">
+
+                <TextView
+                    android:id="@+id/text_watchlist"
+                    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/my_list"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_watchlist"
+                    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>
+
+            <LinearLayout
+                android:id="@+id/linear_new_titles"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingBottom="7dp">
+
+                <TextView
+                    android:id="@+id/text_new_titles"
+                    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_titles"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_new_titles"
+                    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>
+
+            <LinearLayout
+                android:id="@+id/linear_top_ten"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingBottom="7dp">
+
+                <TextView
+                    android:id="@+id/text_top_ten"
+                    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/top_ten"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_top_ten"
+                    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>
+
         </LinearLayout>
     </ScrollView>
 

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

@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#f5f5f5"
-    tools:context=".ui.fragments.LibraryFragment">
+    android:background="?themePrimary"
+    tools:context=".ui.activity.main.fragments.LibraryFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_media_library"

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

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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="#f5f5f5"
-    android:clickable="true"
-    android:focusable="true">
-
-    <com.google.android.material.progressindicator.ProgressIndicator
-        android:id="@+id/progressBar2"
-        style="@style/Widget.MaterialComponents.ProgressIndicator.Circular.Indeterminate"
-        android:layout_width="70dp"
-        android:layout_height="70dp"
-        android:layout_gravity="center"
-        tools:visibility="visible" />
-</FrameLayout>

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

@@ -1,159 +1,210 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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="#f5f5f5"
-    tools:context=".ui.fragments.MediaFragment">
+    android:background="?themePrimary"
+    tools:context=".ui.activity.main.fragments.MediaFragment">
 
-    <androidx.core.widget.NestedScrollView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
+        android:layout_height="match_parent">
 
-        <LinearLayout
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:background="?themePrimary">
 
-            <FrameLayout
+            <LinearLayout
+                android:id="@+id/linear_media"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_scrollFlags="scroll">
 
-                <ImageView
-                    android:id="@+id/image_backdrop"
+                <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:adjustViewBounds="false"
-                    android:maxHeight="231dp"
-                    android:minHeight="220dp"
-                    android:scaleType="centerCrop" />
-
-                <com.google.android.material.imageview.ShapeableImageView
-                    android:id="@+id/image_poster"
-                    android:layout_width="wrap_content"
-                    android:layout_height="200dp"
-                    android:layout_gravity="center"
-                    app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster"
-                    app:srcCompat="@drawable/ic_launcher_background" />
-
-            </FrameLayout>
-
-            <LinearLayout
-                android:id="@+id/linear_media_info"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/text_year"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:padding="2dp"
-                    android:text="@string/text_year_ex" />
-
-                <TextView
-                    android:id="@+id/text_age"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="7dp"
-                    android:background="@drawable/shape_rounden_corner"
-                    android:paddingStart="3dp"
-                    android:paddingTop="2dp"
-                    android:paddingEnd="3dp"
-                    android:paddingBottom="2dp"
-                    android:text="@string/text_age_ex" />
-
-                <TextView
-                    android:id="@+id/text_episodes_or_runtime"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="7dp"
-                    android:padding="2dp"
-                    android:text="@string/text_episodes_count" />
-            </LinearLayout>
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/button_play"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="7dp"
-                android:layout_marginTop="6dp"
-                android:layout_marginEnd="7dp"
-                android:gravity="center"
-                android:text="@string/button_play"
-                android:textAllCaps="false"
-                android:textColor="@android:color/primary_text_dark"
-                android:textSize="16sp"
-                app:backgroundTint="#4A4141"
-                app:icon="@drawable/ic_baseline_play_arrow_24"
-                app:iconGravity="textStart" />
-
-            <TextView
-                android:id="@+id/text_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="7dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="7dp"
-                android:text="@string/text_title_ex"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/text_overview"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="7dp"
-                android:layout_marginEnd="12dp"
-                android:text="@string/text_overview_ex" />
-
-            <LinearLayout
-                android:id="@+id/linear_actions"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="7dp"
-                android:layout_marginEnd="12dp"
-                android:orientation="horizontal">
-
-                <LinearLayout
-                    android:id="@+id/linear_my_list_action"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:orientation="vertical">
+                    android:layout_height="wrap_content">
 
                     <ImageView
-                        android:id="@+id/image_my_list_action"
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:src="@drawable/ic_baseline_add_24"
-                        app:tint="#4A4141" />
+                        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" />
+
+                    <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" />
+
+                </RelativeLayout>
+
+                <LinearLayout
+                    android:id="@+id/linear_media_info"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center"
+                    android:orientation="horizontal">
 
                     <TextView
-                        android:id="@+id/text_my_list_action"
+                        android:id="@+id/text_year"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/my_list" />
+                        android:padding="2dp"
+                        android:text="@string/text_year_ex" />
+
+                    <TextView
+                        android:id="@+id/text_age"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="7dp"
+                        android:background="@drawable/shape_rounded_corner"
+                        android:paddingStart="3dp"
+                        android:paddingTop="2dp"
+                        android:paddingEnd="3dp"
+                        android:paddingBottom="2dp"
+                        android:text="@string/text_age_ex" />
+
+                    <TextView
+                        android:id="@+id/text_episodes_or_runtime"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="7dp"
+                        android:padding="2dp"
+                        android:text="@string/text_episodes_count" />
+
                 </LinearLayout>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/button_play"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="7dp"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginEnd="7dp"
+                    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" />
+
+                <TextView
+                    android:id="@+id/text_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="7dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="7dp"
+                    android:text="@string/text_title_ex"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/text_overview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="7dp"
+                    android:layout_marginEnd="12dp"
+                    android:text="@string/text_overview_ex" />
+
+                <LinearLayout
+                    android:id="@+id/linear_actions"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginEnd="12dp"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        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="48dp"
+                            android:layout_height="48dp"
+                            android:contentDescription="@string/my_list"
+                            android:paddingStart="11dp"
+                            android:paddingTop="11dp"
+                            android:paddingEnd="11dp"
+                            android:paddingBottom="7dp"
+                            android:src="@drawable/ic_baseline_add_24"
+                            app:tint="?buttonBackground" />
+
+                        <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>
+                </LinearLayout>
+
+                <com.google.android.material.tabs.TabLayout
+                    android:id="@+id/tab_episodes_similar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="7dp"
+                    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" />
+
             </LinearLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_episodes"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="7dp"
-                android:layout_marginTop="17dp"
-                android:layout_marginEnd="7dp"
-                tools:layout_editor_absoluteY="298dp"
-                tools:listitem="@layout/item_episode" />
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/pager_episodes_similar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_anchor="@id/app_layout"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            android:layout_gravity="bottom"/>
 
-</FrameLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <FrameLayout
+        android:id="@+id/frame_loading"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?themePrimary"
+        android:visibility="gone">
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/loadingIndicator"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_gravity="center"
+            android:indeterminate="true"
+            app:indicatorColor="?colorPrimary"
+            tools:visibility="visible" />
+    </FrameLayout>
+
+</RelativeLayout>

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

@@ -0,0 +1,33 @@
+<?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:layout_width="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"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="7dp"
+        android:paddingEnd="7dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:layout_editor_absoluteY="298dp"
+        tools:listitem="@layout/item_episode" />
+
+</LinearLayout>

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

@@ -0,0 +1,22 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_media_similar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingStart="3dp"
+        android:paddingTop="6dp"
+        android:paddingEnd="3dp"
+        android:paddingBottom="3dp"
+        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+        app:spanCount="2"
+        tools:listitem="@layout/item_media" />
+
+</FrameLayout>

app/src/main/res/layout/fragment_on_login.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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?themePrimary">
+
+    <ImageView
+        android:id="@+id/image_login"
+        android:layout_width="128dp"
+        android:layout_height="128dp"
+        android:contentDescription="@string/app_name"
+        android:scaleType="fitCenter"
+        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" />
+
+    <LinearLayout
+        android:id="@+id/linear_login"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:padding="10dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/image_login">
+
+        <TextView
+            android:id="@+id/text_login_heading"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/on_login_heading"
+            android:textAlignment="center"
+            android:textSize="26sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/text_login_desc"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="7dp"
+            android:text="@string/on_login_desc"
+            android:textAlignment="center"
+            android:textSize="18sp" />
+
+        <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:imeOptions="actionDone"
+            android:importantForAutofill="no"
+            android:inputType="textPassword" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/button_login"
+            style="@style/Widget.AppCompat.Button.Colored"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="7dp"
+            android:layout_marginTop="7dp"
+            android:layout_marginEnd="7dp"
+            android:text="@string/login"
+            android:textAllCaps="false"
+            android:textColor="#FFFFFFFF"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_on_welcome.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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?themePrimary">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/image_logo"
+            android:layout_width="128dp"
+            android:layout_height="128dp"
+            android:contentDescription="@string/app_name"
+            android:scaleType="fitCenter"
+            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" />
+
+        <LinearLayout
+            android:id="@+id/linearLayout3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="10dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/image_logo">
+
+            <TextView
+                android:id="@+id/text_app_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/on_welcome_heading"
+                android:textAlignment="center"
+                android:textSize="26sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/text_welcome"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="7dp"
+                android:text="@string/on_welcome"
+                android:textAlignment="center"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/button_get_started"
+            style="@style/Widget.AppCompat.Button.Colored"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="40dp"
+            android:text="@string/on_get_started"
+            android:textAllCaps="false"
+            android:textColor="#FFFFFFFF"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>

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

@@ -4,18 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#f5f5f5"
-    tools:context=".ui.fragments.SearchFragment">
+    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="#FFFFFF"
+        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">
@@ -27,13 +28,13 @@
         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_toBottomOf="@+id/search_text"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         app:spanCount="2"
         tools:listitem="@layout/item_media">
 

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear_component"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:selectableItemBackground"
+    android:orientation="vertical"
+    android:paddingStart="12dp"
+    android:paddingTop="7dp"
+    android:paddingEnd="12dp"
+    android:paddingBottom="7dp">
+
+    <TextView
+        android:id="@+id/text_component_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/app_name"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/text_component_desc"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/third_party_component_desc" />
+</LinearLayout>

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

@@ -44,6 +44,7 @@
             android:layout_marginStart="7dp"
             android:layout_weight="1"
             android:text="@string/component_episode_title"
+            android:textColor="?textPrimary"
             android:textSize="16sp" />
 
         <ImageView
@@ -52,13 +53,15 @@
             android:layout_height="30dp"
             android:layout_margin="2dp"
             android:contentDescription="@string/component_watched_desc"
-            app:srcCompat="@drawable/ic_baseline_check_circle_24" />
+            app:srcCompat="@drawable/ic_baseline_check_circle_24"
+            app:tint="?iconColor" />
     </LinearLayout>
 
     <TextView
         android:id="@+id/text_episode_desc"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:maxLines="2"
-        android:ellipsize="end"/>
+        android:ellipsize="end"
+        android:maxLines="3"
+        android:textColor="?textSecondary" />
 </LinearLayout>

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

@@ -0,0 +1,58 @@
+<?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:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="7dp">
+
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/image_episode"
+            android:layout_width="192dp"
+            android:layout_height="108dp"
+            android:contentDescription="@string/component_poster_desc"
+            app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster"
+            app:srcCompat="@color/md_disabled_text_dark_theme" />
+
+        <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" />
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/text_episode_title2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="7dp"
+        android:text="@string/component_episode_title"
+        android:textColor="@color/textPrimaryDark"
+        android:textSize="16sp" />
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        android:background="@color/textSecondaryDark" />
+
+    <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" />
+
+</LinearLayout>

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

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView 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="#FFFFFF"
+    android:backgroundTint="?themeSecondary"
     android:visibility="visible"
     app:cardCornerRadius="7dp"
     app:cardElevation="4dp">
@@ -23,7 +24,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@color/md_disabled_text_dark_theme" />
+            tools:srcCompat="@color/md_disabled_text_dark_theme" />
 
         <TextView
             android:id="@+id/text_title"

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

@@ -0,0 +1,162 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#73000000">
+
+    <LinearLayout
+        android:id="@+id/exo_top_controls"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="7dp"
+        android:layout_marginEnd="12dp"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <ImageButton
+            android:id="@+id/exo_close_player"
+            android:background="@android:color/transparent"
+            android:scaleType="fitXY"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
+            android:contentDescription="@string/close_player"
+            android:padding="10dp"
+            app:srcCompat="@drawable/ic_baseline_arrow_back_24" />
+
+        <TextView
+            android:id="@+id/exo_text_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="44dp"
+            android:text="@string/text_title_ex"
+            android:textAlignment="center"
+            android:textColor="@color/exo_white"
+            android:textSize="16sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/exo_main_controls"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <org.mosad.teapod.ui.components.RewindButton
+            android:id="@+id/rwd_10"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <ImageButton
+            android:id="@+id/exo_play_pause"
+            style="@style/ExoStyledControls.Button.Center.PlayPause"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_gravity="center"
+            android:contentDescription="@string/play_pause" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <org.mosad.teapod.ui.components.FastForwardButton
+            android:id="@+id/ffwd_10"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+    </LinearLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/exo_time_controls"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="@dimen/exo_styled_progress_margin_bottom">
+
+        <View
+            android:id="@+id/exo_progress_placeholder"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/exo_styled_progress_layout_height"
+            android:layout_marginBottom="2dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/exo_remaining"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/exo_remaining"
+            style="@style/ExoStyledControls.TimeText.Position"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/exo_bottom_controls"
+        android:layout_width="match_parent"
+        android:layout_height="42dp"
+        android:layout_gravity="bottom"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="7dp">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/button_language"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="7dp"
+            android:text="@string/subtitles"
+            android:textAllCaps="false"
+            app:icon="@drawable/ic_baseline_subtitles_24"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/button_episodes"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/button_episodes"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="7dp"
+            android:text="@string/episodes"
+            android:textAllCaps="false"
+            app:icon="@drawable/ic_baseline_video_library_24"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/button_next_ep_c"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/button_next_ep_c"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/episode"
+            android:textAllCaps="false"
+            app:icon="@drawable/ic_baseline_skip_next_24"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</FrameLayout>

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

@@ -0,0 +1,46 @@
+<?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"
+    android:clickable="true"
+    android:focusable="true">
+
+    <LinearLayout
+        android:id="@+id/linearLayout3"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="7dp"
+        android:layout_marginEnd="12dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageButton
+            android:id="@+id/button_close_episodes_list"
+            android:background="@android:color/transparent"
+            android:scaleType="fitXY"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
+            android:contentDescription="@string/close_player"
+            android:padding="10dp"
+            app:srcCompat="@drawable/ic_baseline_arrow_back_24" />
+    </LinearLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_episodes_player"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout3"
+        tools:listitem="@layout/item_episode_player" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,99 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#73000000"
+    android:clickable="true"
+    android:focusable="true">
+
+    <LinearLayout
+        android:id="@+id/linear_top"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="7dp"
+        android:layout_marginEnd="12dp"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageButton
+            android:id="@+id/button_close_language_settings"
+            android:background="@android:color/transparent"
+            android:scaleType="fitXY"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
+            android:contentDescription="@string/close_player"
+            android:padding="10dp"
+            app:srcCompat="@drawable/ic_baseline_arrow_back_24" />
+
+        <TextView
+            android:id="@+id/exo_text_language"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="44dp"
+            android:text="@string/subtitles"
+            android:textAlignment="center"
+            android:textColor="@color/exo_white"
+            android:textSize="16sp"
+            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"
+        app:layout_constraintBottom_toTopOf="@+id/linear_bottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linear_top" />
+
+    <LinearLayout
+        android:id="@+id/linear_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="7dp"
+        android:gravity="end"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/button_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="7dp"
+            android:text="@string/cancel"
+            android:textAllCaps="false"
+            android:textColor="@color/exo_white"
+            android:textSize="16sp"
+            app:backgroundTint="@color/buttonBackgroundLight"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/button_select"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/apply"
+            android:textAllCaps="false"
+            android:textColor="@color/themePrimaryDark"
+            android:textSize="16sp"
+            app:backgroundTint="@color/buttonBackgroundDark"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/navigation/mobile_navigation.xml

@@ -7,25 +7,25 @@
 
     <fragment
         android:id="@+id/navigation_home"
-        android:name="org.mosad.teapod.ui.fragments.HomeFragment"
+        android:name="org.mosad.teapod.ui.activity.main.fragments.HomeFragment"
         android:label="@string/title_home"
         tools:layout="@layout/fragment_home" />
 
     <fragment
         android:id="@+id/navigation_library"
-        android:name="org.mosad.teapod.ui.fragments.LibraryFragment"
+        android:name="org.mosad.teapod.ui.activity.main.fragments.LibraryFragment"
         android:label="@string/title_library"
         tools:layout="@layout/fragment_library" />
 
     <fragment
         android:id="@+id/navigation_search"
-        android:name="org.mosad.teapod.ui.fragments.SearchFragment"
+        android:name="org.mosad.teapod.ui.activity.main.fragments.SearchFragment"
         android:label="@string/title_search"
         tools:layout="@layout/fragment_search" />
 
     <fragment
         android:id="@+id/navigation_account"
-        android:name="org.mosad.teapod.ui.fragments.AccountFragment"
+        android:name="org.mosad.teapod.ui.activity.main.fragments.AccountFragment"
         android:label="@string/title_account"
         tools:layout="@layout/fragment_account" />
 

app/src/main/res/raw/al_20_full.txt

@@ -0,0 +1,235 @@
+                                 Apache License
+
+                           Version 2.0, January 2004
+
+                        http://www.apache.org/licenses/
+
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+
+   1. Definitions.
+
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+
+   END OF TERMS AND CONDITIONS
+
+
+   APPENDIX: How to apply the Apache License to your work.
+
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+
+   Copyright [yyyy] [name of copyright owner]
+
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.