Revert "Merge branch 'jarnedemeulemeester:main' into feature/chapter-…

…selector"

This reverts commit 90099b7, reversing
changes made to 34a84ab.

README.md

@@ -1,12 +1,6 @@
 ![Findroid banner](images/findroid-banner.png)
 
 # Findroid
-![GitHub release (with filter)](https://img.shields.io/github/v/release/jarnedemeulemeester/findroid?style=for-the-badge)
-![GitHub repo stars](https://img.shields.io/github/stars/jarnedemeulemeester/findroid?style=for-the-badge)
-![GitHub issues](https://img.shields.io/github/issues/jarnedemeulemeester/findroid?style=for-the-badge)
-![GitHub pull requests](https://img.shields.io/github/issues-pr/jarnedemeulemeester/findroid?style=for-the-badge)
-![GitHub all releases](https://img.shields.io/github/downloads/jarnedemeulemeester/findroid/total?style=for-the-badge)
-![GitHub](https://img.shields.io/github/license/jarnedemeulemeester/findroid?style=for-the-badge)
 
 Findroid is third-party Android application for Jellyfin that provides a native user interface to browse and play movies and series.
 

app/phone/build.gradle.kts

@@ -78,11 +78,11 @@ ktlint {
 }
 
 dependencies {
-    implementation(projects.core)
-    implementation(projects.data)
-    implementation(projects.preferences)
-    implementation(projects.player.core)
-    implementation(projects.player.video)
+    implementation(project(":core"))
+    implementation(project(":data"))
+    implementation(project(":preferences"))
+    implementation(project(":player:core"))
+    implementation(project(":player:video"))
     implementation(libs.aboutlibraries.core)
     implementation(libs.aboutlibraries)
     implementation(libs.androidx.activity)

app/tv/build.gradle.kts

@@ -82,11 +82,11 @@ ktlint {
 }
 
 dependencies {
-    implementation(projects.core)
-    implementation(projects.data)
-    implementation(projects.preferences)
-    implementation(projects.player.core)
-    implementation(projects.player.video)
+    implementation(project(":core"))
+    implementation(project(":data"))
+    implementation(project(":preferences"))
+    implementation(project(":player:core"))
+    implementation(project(":player:video"))
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.compose.material3)

buildSrc/src/main/kotlin/Versions.kt

@@ -11,6 +11,6 @@ object Versions {
 
     val java = JavaVersion.VERSION_17
 
-    const val composeCompiler = "1.5.8"
+    const val composeCompiler = "1.5.7"
     const val ktlint = "0.50.0"
 }

core/build.gradle.kts

@@ -53,9 +53,9 @@ ktlint {
 }
 
 dependencies {
-    implementation(projects.data)
-    implementation(projects.preferences)
-    implementation(projects.player.core)
+    implementation(project(":data"))
+    implementation(project(":preferences"))
+    implementation(project(":player:core"))
     implementation(libs.androidx.activity)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.compose.ui)

core/src/main/res/values-hu/strings.xml

@@ -175,14 +175,4 @@
     <string name="picture_in_picture">Kép a képben</string>
     <string name="picture_in_picture_gesture">Kép a képben otthoni gesztus</string>
     <string name="picture_in_picture_gesture_summary">A home gomb vagy a gesztus használatával lépjen be a kép-a-képbe a videó lejátszása közben</string>
-    <string name="no_users_found">Nincs felhasználó</string>
-    <string name="select_user">Válassz felhasználót</string>
-    <string name="no_servers_found">Nem található szerver</string>
-    <string name="unmark_as_played">Megjelölés nem megtekintettként</string>
-    <string name="add_to_favorites">Hozzáadás kedvencekhez</string>
-    <string name="remove_from_favorites">Eltávolítás kedvencekből</string>
-    <string name="mark_as_played">Jelölés megtekintettként</string>
-    <string name="live_tv">Élő TV</string>
-    <string name="play">Lejátszás</string>
-    <string name="watch_trailer">Előzetes megtekintése</string>
 </resources>

core/src/main/res/values-ko/strings.xml

@@ -168,21 +168,11 @@
     <string name="stop_download">다운로드 중지</string>
     <string name="privacy_policy_notice">Findroid를 사용하면, 데이터를 수집하지 않는다는 <a href="https://raw.githubusercontent.com/jarnedemeulemeester/findroid/main/PRIVACY">개인 정보 보호 정책</a>에 동의합니다</string>
     <string name="remove_server_address_dialog_text">서버 주소 %1$s를 제거하는것이 확실합니까\?</string>
-    <string name="downloaded_indicator">다운로드 표시기</string>
+    <string name="downloaded_indicator">다운로드된 표시기</string>
     <string name="remove_server_address">서버 주소 제</string>
     <string name="temp">임시</string>
     <string name="subtitle_chip_text">CC</string>
     <string name="picture_in_picture_gesture">Picture-in-picture 홈 제스쳐</string>
     <string name="picture_in_picture_gesture_summary">영상 재생 중 홈 버튼 또는 제스쳐를 이용해 picture-in-picture 변경</string>
     <string name="picture_in_picture">Picture-in-picture 기능</string>
-    <string name="no_servers_found">서버가 발견되지 않았습니다</string>
-    <string name="no_users_found">사용자가 발견되지 않았습니다</string>
-    <string name="select_user">사용자를 선택하세요</string>
-    <string name="play">재생</string>
-    <string name="live_tv">라이브 TV</string>
-    <string name="watch_trailer">예고편 보기</string>
-    <string name="mark_as_played">시청함으로 표시</string>
-    <string name="remove_from_favorites">즐겨찾기에서 제거</string>
-    <string name="unmark_as_played">시청함으로 표시하지 않기</string>
-    <string name="add_to_favorites">즐겨찾기에 추가</string>
 </resources>

data/build.gradle.kts

@@ -51,7 +51,7 @@ ktlint {
 }
 
 dependencies {
-    implementation(projects.preferences)
+    implementation(project(":preferences"))
     implementation(libs.androidx.paging)
     implementation(libs.androidx.room.runtime)
     ksp(libs.androidx.room.compiler)

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-aboutlibraries = "10.10.0"
-android-plugin = "8.2.1"
+aboutlibraries = "10.9.2"
+android-plugin = "8.2.0"
 androidx-activity = "1.8.2"
 androidx-appcompat = "1.6.1"
 androidx-compose-material3 = "1.2.0-alpha09"
@@ -20,13 +20,13 @@ androidx-tv = "1.0.0-alpha10"
 androidx-work = "2.9.0"
 coil = "2.5.0"
 hilt = "2.50"
-compose-destinations = "1.9.62"
+compose-destinations = "1.9.56"
 jellyfin = "1.4.6"
-kotlin = "1.9.22"
+kotlin = "1.9.21"
 kotlinx-serialization = "1.6.2"
-ksp = "1.9.22-1.0.16"
-ktlint = "12.1.0"
-libmpv = "0.1.4"
+ksp = "1.9.21-1.0.15"
+ktlint = "11.6.1"
+libmpv = "0.1.3"
 material = "1.11.0"
 timber = "5.0.1"
 

player/core/build.gradle.kts

@@ -36,8 +36,8 @@ ktlint {
 }
 
 dependencies {
-    implementation(projects.data)
-    implementation(projects.preferences)
+    implementation(project(":data"))
+    implementation(project(":preferences"))
     implementation(libs.androidx.core)
     implementation(libs.androidx.preference)
     implementation(libs.jellyfin.core)

player/video/build.gradle.kts

@@ -38,9 +38,9 @@ ktlint {
 }
 
 dependencies {
-    implementation(projects.player.core)
-    implementation(projects.data)
-    implementation(projects.preferences)
+    implementation(project(":player:core"))
+    implementation(project(":data"))
+    implementation(project(":preferences"))
     implementation(libs.androidx.core)
     implementation(libs.androidx.lifecycle.runtime)
     implementation(libs.androidx.lifecycle.viewmodel)

settings.gradle.kts

@@ -1,5 +1,3 @@
-enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
-
 include(":app:phone")
 include(":app:tv")
 include(":core")