.gitignore

@@ -6,3 +6,5 @@ local.properties
 .gradle
 build/
 captures/
+output-metadata.json
+*.apk

README.md

@@ -1,86 +1,83 @@
-<h1 align="center">Jellyfin Android TV</h1>
-<h3 align="center">Part of the <a href="https://jellyfin.org">Jellyfin Project</a></h3>
 
----
-
-<p align="center">
-<img alt="Logo banner" src="https://raw.githubusercontent.com/jellyfin/jellyfin-ux/master/branding/SVG/banner-logo-solid.svg?sanitize=true"/>
-<br/><br/>
-<a href="https://github.com/jellyfin/jellyfin-androidtv">
-<img alt="GPL 2.0 License" src="https://img.shields.io/github/license/jellyfin/jellyfin-androidtv.svg"/>
-</a>
-<a href="https://github.com/jellyfin/jellyfin-androidtv/releases">
-<img alt="Current Release" src="https://img.shields.io/github/release/jellyfin/jellyfin-androidtv.svg"/>
-</a>
-<a href="https://translate.jellyfin.org/projects/jellyfin-android/jellyfin-androidtv/">
-<img alt="Translation Status" src="https://translate.jellyfin.org/widgets/jellyfin-android/-/jellyfin-androidtv/svg-badge.svg"/>
-</a>
-<br/>
-<a href="https://opencollective.com/jellyfin">
-<img alt="Donate" src="https://img.shields.io/opencollective/all/jellyfin.svg?label=backers"/>
-</a>
-<a href="https://features.jellyfin.org">
-<img alt="Feature Requests" src="https://img.shields.io/badge/fider-vote%20on%20features-success.svg"/>
-</a>
-<a href="https://matrix.to/#/+jellyfin:matrix.org">
-<img alt="Chat on Matrix" src="https://img.shields.io/matrix/jellyfin:matrix.org.svg?logo=matrix"/>
-</a>
-<a href="https://www.reddit.com/r/jellyfin">
-<img alt="Join our Subreddit" src="https://img.shields.io/badge/reddit-r%2Fjellyfin-%23FF5700.svg"/>
-</a>
-<br/>
-<a href="https://play.google.com/store/apps/details?id=org.jellyfin.androidtv">
-<img width="153" alt="Jellyfin on Google Play" src="https://jellyfin.org/images/store-icons/google-play.png"/>
-</a>
-<a href="https://www.amazon.com/gp/aw/d/B07TX7Z725">
-<img width="153" alt="Jellyfin on Amazon Appstore" src="https://jellyfin.org/images/store-icons/amazon.png"/>
-</a>
-<br/>
-<a href="https://repo.jellyfin.org/releases/client/androidtv/">Download archive</a>
-</p>
-
-Jellyfin Android TV is a Jellyfin client for Android TV, Nvidia Shield, and Amazon Fire TV devices.
-We welcome all contributions and pull requests! If you have a larger feature in mind please open an
-issue so we can discuss the implementation before you start. 
-
-## Translating
-
-Translations can be improved very easily from our
-[Weblate](https://translate.jellyfin.org/projects/jellyfin-android/jellyfin-androidtv) instance.
-Look through the following graphic to see if your native language could use some work!
-
-<a href="https://translate.jellyfin.org/engage/jellyfin-android/">
-<img alt="Detailed Translation Status" src="https://translate.jellyfin.org/widgets/jellyfin-android/-/jellyfin-androidtv/multi-auto.svg"/>
-</a>
-
-## Build Process
-
-### Dependencies
-
-- Android Studio
-
-### Build
-
-1. Clone or download this repository
-
-   ```sh
-   git clone https://github.com/jellyfin/jellyfin-androidtv.git
-   cd jellyfin-androidtv
-   ```
-
-2. Open the project in Android Studio and run it from there or build an APK directly through Gradle:
-
-   ```sh
-   ./gradlew assembleDebug
-   ```
-
-   Add the Android SDK to your PATH environment variable or create the ANDROID_SDK_ROOT variable for
-   this to work.
-
-### Deploy to device/emulator
-
-   ```sh
-   ./gradlew installDebug
-   ```
-
-*You can also replace the "Debug" with "Release" to get an optimized release binary.*
+<h1 align="center">a Jellyfin TV Client, optimized for Zidoo media players aka "Zidoo Edition"</h1>  
+<h3 align="center">based on the <a href="https://github.com/jellyfin/jellyfin-androidtv">official Jellyfin TV Client</a></h3>  
+
+---  
+
+<p align="center">  
+<a href="https://github.com/jellyfin/jellyfin-androidtv">  
+<img alt="GPL 2.0 License" src="https://img.shields.io/github/license/jellyfin/jellyfin-androidtv.svg"/>  
+</a>  
+<a href="https://opencollective.com/jellyfin">  
+<img alt="Donate" src="https://img.shields.io/opencollective/all/jellyfin.svg?label=backers"/>  
+</a>  
+<a href="https://features.jellyfin.org">  
+<img alt="Feature Requests" src="https://img.shields.io/badge/fider-vote%20on%20features-success.svg"/>  
+</a>  
+<a href="https://matrix.to/#/+jellyfin:matrix.org">  
+<img alt="Chat on Matrix" src="https://img.shields.io/matrix/jellyfin:matrix.org.svg?logo=matrix"/>  
+</a>  
+<a href="https://www.reddit.com/r/jellyfin">  
+<img alt="Join our Subreddit" src="https://img.shields.io/badge/reddit-r%2Fjellyfin-%23FF5700.svg"/>  
+</a>  
+
+<h1 align="center">Update: Development of this fork has stopped!</h1>
+
+### I moved to CoreElec + Amlogic + Jellyfin for Kodi plugin
+- main issue is time to merge all the upstream changes and motivation to work on the fork while not using Zidoo devices anymore
+- there are issues/bug's that also will probably never fixed by Zidoo via there API
+    - seeking for transcodes (multisegmented http stream issue)
+    - proper enabled subtitles on play (always need to seek-back at least once until ASS show-up)
+- so far everything still works with JF 10.9.11
+    - need to edit/add path data to \jellyfin\root\default\options.xml for new direct-path libs, since the Ui option was removed, yet direct-path still works
+
+---  
+"Zidoo-Edition" is a unofficial community fork, based on the official Jellyfin Android TV client, adapted to better run on [Zidoo media players](https://www.zidoo.tv).
+### Release [downloads here](https://github.com/Andy2244/jellyfin-androidtv-zidoo/releases)
+TIP: you can directly install from your browser via `http://zidoo_ip:18888` web interface
+### App ONLY works with latest 10.8.1+ JF server's.
+### Firmware 6.(4/7).40+ is also recommended, but not required.
+- feature roadmap
+    - ~add smart "original language" audio selection logic based on tmdb id's~ _done_
+    - ~add better transcoding support and fallback's for unsupported codecs~ _done_
+    - ~add more audio-only transcoding options (DD only, PCM 5.1 -> DD5.1)~ _done_
+    - seekable transcode playback (not possible, wont be fixed by Zidoo)
+    - ~improve layouts~ _done_
+    - ~small useability improvements _(smart screen views)_~ _done
+      - ~focus selection border~ _done_
+      - ~add missing vertical-grid features _(genre)_~ _done_
+    - ~use new Android API from latest beta FW~ _done_
+    - script hotkey action's _(xml kodi compatible)_
+    - ~fix all NFS mount cases~ _done_
+### Added Features/Fixes:
+ - Playback integration with the internal Zidoo player
+   - working resume, seek, watched states and server playback reporting 
+   - http streaming support
+   - smb, nfs support via `Direct Path` option
+   - "smart" audio/subtitle selection logic
+   - working tarnscoding for unsupported formats/codec's
+ - UI layout fixes, changes
+	 - cutoff grids, ui scaling fixed
+### How to use with "Direct Path" option (smb/nfs):
+- setup your Jellyfin server [library's](https://jellyfin.org/docs/general/server/libraries.html) with network paths or path substitution via `Shared network folder:` option
+	- Formats
+		- `smb://smb_user:smb_password@server_ip/share/folder`
+		- `smb://smb_user@server_ip/share/folder`
+		- `nfs://server_ip/nfs_export/:`
+		- `nfs://server_ip/nfs_export/:/tv`
+			- nfs needs the `/:` special marker right after the actual nfs export name/path portion!
+	- Examples: 
+		- `smb://andy:123456@192.168.1.101/htpc-share/series`
+		- `smb://andy@192.168.1.101/htpc-share/series`
+		- `nfs://192.168.1.101/mnt/media/movies/:` -> with nfs export `/mnt/media/movies`
+ 		- `nfs://192.168.1.101/mnt/media/:/movies` -> with nfs export `/mnt/media`
+![setting](https://user-images.githubusercontent.com/5340247/174437861-c1db621a-d4b2-4696-b33c-5152c0c67fb6.png)
+- enable the `Direct Path` option in the JellyfinTv client
+### NOTE: starting with firmware 6.(4/7).30+ you dont need the special `/:` NFS root-marker anymore!
+### Community
+- **for major bugs/issues regarding the Zidoo-Edition, please open a github issue**
+- for questions, suggestions or help use the [Zidoo forum](http://forum.zidoo.tv/index.php)
+	- [Support Post](http://forum.zidoo.tv/index.php?threads/jellyfintv-zidoo-edition-support-post.93902/) for JellyfinTv Zidoo-Edition
+- german Community [Zidoo forum](https://www.android-mediaplayer.de/forum/index.php?board/82-zidoo-player-x6-pro-x8-x9s-z9s-z9x-x10-z10-z10pro-x20-x20pro-z1000-z1000pro-uhd2/)
+- AVS forum [Zidoo Post](https://www.avsforum.com/threads/zidoo-z9x-rtd1619-thread.3140924/page-999)
+- Zidoo Community software site www.mcbluna.net

app/build.gradle.kts

@@ -1,48 +1,89 @@
+import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+import org.jetbrains.kotlin.cli.common.toBooleanLenient
+
 plugins {
 	id("com.android.application")
 	kotlin("android")
-	kotlin("kapt")
+	alias(libs.plugins.kotlin.ksp)
 	alias(libs.plugins.kotlin.serialization)
 	alias(libs.plugins.aboutlibraries)
 }
 
 android {
 	namespace = "org.jellyfin.androidtv"
-	compileSdk = 32
+	compileSdk = gradleLocalProperties(rootDir).getProperty("COMPILE_SDK_NR", "32").toInt()
+	ndkVersion = "26.1.10909125"
 
 	defaultConfig {
-		minSdk = 21
-		targetSdk = 32
+		minSdk = gradleLocalProperties(rootDir).getProperty("MIN_SDK_NR", "23").toInt()
+		targetSdk = gradleLocalProperties(rootDir).getProperty("TARGET_SDK_NR", "32").toInt()
 
 		// Release version
 		applicationId = namespace
 		versionName = project.getVersionName()
 		versionCode = getVersionCode(versionName!!)
 		setProperty("archivesBaseName", "jellyfin-androidtv-v$versionName")
+
+		ndk.abiFilters.addAll(setOf("armeabi-v7a","x86"))
 	}
 
 	sourceSets["main"].java.srcDirs("src/main/kotlin")
 	sourceSets["test"].java.srcDirs("src/test/kotlin")
 
 	buildFeatures {
-		viewBinding = true
+		viewBinding = gradleLocalProperties(rootDir).getProperty("BUILD_VIEW_BINDING", "true").toBooleanLenient()
+		dataBinding = gradleLocalProperties(rootDir).getProperty("BUILD_DATA_BINDING", "false").toBooleanLenient()
+		mlModelBinding = gradleLocalProperties(rootDir).getProperty("BUILD_MODEL_BINDING", "false").toBooleanLenient()
 	}
 
 	compileOptions {
 		isCoreLibraryDesugaringEnabled = true
+        sourceCompatibility = JavaVersion.valueOf(gradleLocalProperties(rootDir).getProperty("JAVA_VERSION", "VERSION_1_8"))
+        targetCompatibility = JavaVersion.valueOf(gradleLocalProperties(rootDir).getProperty("JAVA_VERSION", "VERSION_1_8"))
+    }
+
+	kotlinOptions {
+		jvmTarget = gradleLocalProperties(rootDir).getProperty("KOTLIN_JVM_TARGET", "1.8")
+	}
+
+	kotlin {
+		jvmToolchain {
+			(this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(gradleLocalProperties(rootDir).getProperty("JAVA_VERSION_NR", "8")))
+		}
+	}
+
+//	bundle {
+//		abi {
+//			enableSplit = true
+//		}
+//	}
+
+	signingConfigs {
+		create("release") {
+			storeFile = file(gradleLocalProperties(rootDir).getProperty("STOREFILE"))
+			keyAlias = gradleLocalProperties(rootDir).getProperty("KEYALIAS")
+			keyPassword = gradleLocalProperties(rootDir).getProperty("KEYPASSWORD")
+			storePassword = gradleLocalProperties(rootDir).getProperty("STOREPASSWORD")
+		}
 	}
 
 	buildTypes {
+		getByName("release") {
+			matchingFallbacks += listOf()
+			signingConfig = signingConfigs.getByName("release")
+		}
+
 		val release by getting {
 			isMinifyEnabled = false
-
+			isShrinkResources = false
+//			isJniDebuggable = false
 			// Set package names used in various XML files
 			resValue("string", "app_id", namespace!!)
 			resValue("string", "app_search_suggest_authority", "${namespace}.content")
 			resValue("string", "app_search_suggest_intent_data", "content://${namespace}.content/intent")
 
 			// Set flavored application name
-			resValue("string", "app_name", "@string/app_name_release")
+			resValue("string", "app_name", "Jellyfin")
 
 			buildConfigField("boolean", "DEVELOPMENT", "false")
 		}
@@ -57,7 +98,7 @@ android {
 			resValue("string", "app_search_suggest_intent_data", "content://${namespace + applicationIdSuffix}.content/intent")
 
 			// Set flavored application name
-			resValue("string", "app_name", "@string/app_name_debug")
+			resValue("string", "app_name", "Jellyfin Debug")
 
 			buildConfigField("boolean", "DEVELOPMENT", (defaultConfig.versionCode!! < 100).toString())
 		}
@@ -125,6 +166,7 @@ dependencies {
 	implementation(libs.androidx.window)
 	implementation(libs.androidx.cardview)
 	implementation(libs.androidx.startup)
+	implementation(libs.androidx.compose.ui)
 
 	// Dependency Injection
 	implementation(libs.bundles.koin)
@@ -137,12 +179,19 @@ dependencies {
 	implementation(libs.jellyfin.exoplayer.ffmpegextension)
 	implementation(libs.libvlc)
 
+	// Apfloat
+	implementation(libs.apfloat)
+
+	// kotlin-extensions
+	implementation(libs.carleslc)
+
 	// Markdown
 	implementation(libs.bundles.markwon)
 
 	// Image utility
+	implementation(libs.blurhash)
 	implementation(libs.glide.core)
-	kapt(libs.glide.compiler)
+	ksp(libs.glide.ksp)
 	implementation(libs.kenburnsview)
 
 	// Crash Reporting

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.jellyfin.androidtv"
     android:installLocation="auto">
 
     <!-- Android TV Integration -->
@@ -21,22 +20,22 @@
     <!-- Generic permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission
-        android:name="android.permission.ACCESS_WIFI_STATE"
-        tools:ignore="LeanbackUsesWifi" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <!-- Device feature requirements -->
     <uses-feature
         android:name="android.software.leanback"
         android:required="false" />
-
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false" />
     <uses-feature
         android:name="android.hardware.microphone"
         android:required="false" />
+    <uses-feature
+        android:name="android.hardware.wifi"
+        android:required="false" />
 
     <application
         android:name=".JellyfinApplication"
@@ -103,12 +102,16 @@
 
         <activity
             android:name=".ui.browsing.MainActivity"
+            android:clearTaskOnLaunch="true"
+            android:launchMode="singleTask"
             android:screenOrientation="landscape" />
 
         <activity
             android:name=".ui.startup.StartupActivity"
             android:exported="true"
             android:noHistory="true"
+            android:clearTaskOnLaunch="true"
+            android:launchMode="singleTask"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustNothing">
             <intent-filter>
@@ -150,6 +153,8 @@
 
         <activity
             android:name=".ui.preference.PreferencesActivity"
+            android:clearTaskOnLaunch="true"
+            android:launchMode="singleTask"
             android:theme="@style/Theme.Jellyfin.Preferences" />
 
         <activity