diff --git a/PRIVACY b/PRIVACY index b821307b..9aea0885 100644 --- a/PRIVACY +++ b/PRIVACY @@ -1,7 +1,6 @@ -This privacy policy pertains the Findroid app. +This privacy policy pertains the Ananas app. -Findroid does not collect or access any personal information. No identifying information or user data of any kind is made available to third-parties. +Ananas does not collect or access any personal information. No identifying information or user data of any kind is made available to third-parties. -This Privacy Policy is effective as of Feb 8th, 2023 and will remain in effect except with respect to any changes in its provisions in the future, which will be in effect immediately after being posted on this page. We reserve the right to update or change our Privacy Policy at any time and you should check this Privacy Policy periodically. Your continued use of the Service after we post any modifications to the Privacy Policy on this page will constitute your acknowledgment of the modifications and your consent to abide and be bound by the modified Privacy Policy. +This Privacy Policy is effective as of Jun 24th, 2024 and will remain in effect except with respect to any changes in its provisions in the future, which will be in effect immediately after being posted on this page. We reserve the right to update or change our Privacy Policy at any time and you should check this Privacy Policy periodically. Your continued use of the Service after we post any modifications to the Privacy Policy on this page will constitute your acknowledgment of the modifications and your consent to abide and be bound by the modified Privacy Policy. -Findroid is published by Jarne Demeulemeester. Inquiries can be submitted to jarnedemeulemeester@gmail.com. diff --git a/README.md b/README.md index 10842fa3..1c06560e 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ I am developing this application in my spare time. **This project is in its early stages so expect bugs.** -Get it on Google PlayAvailable at Amazon AppstoreGet it on IzzyOnDroid +Get it on Google PlayAvailable at Amazon AppstoreGet it on IzzyOnDroid ## Screenshots | Home | Library | Movie | Season | Episode | diff --git a/app/phone/build.gradle.kts b/app/phone/build.gradle.kts index 9aa095ae..f483dd8c 100644 --- a/app/phone/build.gradle.kts +++ b/app/phone/build.gradle.kts @@ -10,19 +10,19 @@ plugins { } android { - namespace = "dev.jdtech.jellyfin" + namespace = "org.askartv.phone" compileSdk = Versions.compileSdk buildToolsVersion = Versions.buildTools defaultConfig { - applicationId = "dev.jdtech.jellyfin" + applicationId = "org.askartv.phone" minSdk = Versions.minSdk targetSdk = Versions.targetSdk versionCode = Versions.appCode versionName = Versions.appName - testInstrumentationRunner = "dev.jdtech.jellyfin.HiltTestRunner" + testInstrumentationRunner = "org.askartv.phone.HiltTestRunner" } applicationVariants.all { diff --git a/app/phone/proguard-rules.pro b/app/phone/proguard-rules.pro index 9a366cd5..f1dc601b 100644 --- a/app/phone/proguard-rules.pro +++ b/app/phone/proguard-rules.pro @@ -20,16 +20,16 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile --keepnames class dev.jdtech.jellyfin.models.PlayerItem +-keepnames class org.askartv.phone.models.PlayerItem # ProGuard thinks all SettingsFragments are unused --keep class dev.jdtech.jellyfin.fragments.SettingsLanguageFragment --keep class dev.jdtech.jellyfin.fragments.SettingsAppearanceFragment --keep class dev.jdtech.jellyfin.fragments.SettingsDownloadsFragment --keep class dev.jdtech.jellyfin.fragments.SettingsPlayerFragment --keep class dev.jdtech.jellyfin.fragments.SettingsDeviceFragment --keep class dev.jdtech.jellyfin.fragments.SettingsCacheFragment --keep class dev.jdtech.jellyfin.fragments.SettingsNetworkFragment +-keep class org.askartv.phone.fragments.SettingsLanguageFragment +-keep class org.askartv.phone.fragments.SettingsAppearanceFragment +-keep class org.askartv.phone.fragments.SettingsDownloadsFragment +-keep class org.askartv.phone.fragments.SettingsPlayerFragment +-keep class org.askartv.phone.fragments.SettingsDeviceFragment +-keep class org.askartv.phone.fragments.SettingsCacheFragment +-keep class org.askartv.phone.fragments.SettingsNetworkFragment # These classes are from okhttp and are not used in Android -dontwarn org.bouncycastle.jsse.BCSSLSocket diff --git a/app/phone/src/androidTest/kotlin/dev/jdtech/jellyfin/HiltTestRunner.kt b/app/phone/src/androidTest/kotlin/org/askartv/phone/HiltTestRunner.kt similarity index 94% rename from app/phone/src/androidTest/kotlin/dev/jdtech/jellyfin/HiltTestRunner.kt rename to app/phone/src/androidTest/kotlin/org/askartv/phone/HiltTestRunner.kt index e7f52dcb..4b537324 100644 --- a/app/phone/src/androidTest/kotlin/dev/jdtech/jellyfin/HiltTestRunner.kt +++ b/app/phone/src/androidTest/kotlin/org/askartv/phone/HiltTestRunner.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin +package org.askartv.phone import android.app.Application import android.content.Context diff --git a/app/phone/src/androidTest/kotlin/dev/jdtech/jellyfin/MainActivityTest.kt b/app/phone/src/androidTest/kotlin/org/askartv/phone/MainActivityTest.kt similarity index 98% rename from app/phone/src/androidTest/kotlin/dev/jdtech/jellyfin/MainActivityTest.kt rename to app/phone/src/androidTest/kotlin/org/askartv/phone/MainActivityTest.kt index 486b6759..b914a0b3 100644 --- a/app/phone/src/androidTest/kotlin/dev/jdtech/jellyfin/MainActivityTest.kt +++ b/app/phone/src/androidTest/kotlin/org/askartv/phone/MainActivityTest.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin +package org.askartv.phone import android.util.Log import androidx.hilt.work.HiltWorkerFactory @@ -19,7 +19,7 @@ import androidx.work.testing.WorkManagerTestInitHelper import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import dagger.hilt.android.testing.UninstallModules -import dev.jdtech.jellyfin.di.DatabaseModule +import org.askartv.phone.di.DatabaseModule import org.hamcrest.CoreMatchers.allOf import org.hamcrest.CoreMatchers.not import org.junit.Before diff --git a/app/phone/src/androidTest/kotlin/dev/jdtech/jellyfin/ViewPropertyChangeCallback.kt b/app/phone/src/androidTest/kotlin/org/askartv/phone/ViewPropertyChangeCallback.kt similarity index 98% rename from app/phone/src/androidTest/kotlin/dev/jdtech/jellyfin/ViewPropertyChangeCallback.kt rename to app/phone/src/androidTest/kotlin/org/askartv/phone/ViewPropertyChangeCallback.kt index a3a0c8b1..af69fa29 100644 --- a/app/phone/src/androidTest/kotlin/dev/jdtech/jellyfin/ViewPropertyChangeCallback.kt +++ b/app/phone/src/androidTest/kotlin/org/askartv/phone/ViewPropertyChangeCallback.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin +package org.askartv.phone import android.view.View import android.view.ViewTreeObserver diff --git a/app/phone/src/androidTest/kotlin/dev/jdtech/jellyfin/di/DatabaseTestModule.kt b/app/phone/src/androidTest/kotlin/org/askartv/phone/di/DatabaseTestModule.kt similarity index 84% rename from app/phone/src/androidTest/kotlin/dev/jdtech/jellyfin/di/DatabaseTestModule.kt rename to app/phone/src/androidTest/kotlin/org/askartv/phone/di/DatabaseTestModule.kt index e5a367b1..10008909 100644 --- a/app/phone/src/androidTest/kotlin/dev/jdtech/jellyfin/di/DatabaseTestModule.kt +++ b/app/phone/src/androidTest/kotlin/org/askartv/phone/di/DatabaseTestModule.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.di +package org.askartv.phone.di import android.content.Context import androidx.room.Room @@ -7,8 +7,8 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import dev.jdtech.jellyfin.database.ServerDatabase -import dev.jdtech.jellyfin.database.ServerDatabaseDao +import org.askartv.phone.database.ServerDatabase +import org.askartv.phone.database.ServerDatabaseDao import javax.inject.Singleton @Module diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/BaseApplication.kt b/app/phone/src/main/java/org/askartv/phone/BaseApplication.kt similarity index 96% rename from app/phone/src/main/java/dev/jdtech/jellyfin/BaseApplication.kt rename to app/phone/src/main/java/org/askartv/phone/BaseApplication.kt index 721e8f5e..7aedf409 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/BaseApplication.kt +++ b/app/phone/src/main/java/org/askartv/phone/BaseApplication.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin +package org.askartv.phone import android.app.Application import androidx.appcompat.app.AppCompatDelegate @@ -14,7 +14,7 @@ import com.google.android.material.color.DynamicColorsOptions import dagger.hilt.android.HiltAndroidApp import timber.log.Timber import javax.inject.Inject -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @HiltAndroidApp class BaseApplication : Application(), Configuration.Provider, ImageLoaderFactory { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/BasePlayerActivity.kt b/app/phone/src/main/java/org/askartv/phone/BasePlayerActivity.kt similarity index 96% rename from app/phone/src/main/java/dev/jdtech/jellyfin/BasePlayerActivity.kt rename to app/phone/src/main/java/org/askartv/phone/BasePlayerActivity.kt index 989988ca..8f26c53a 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/BasePlayerActivity.kt +++ b/app/phone/src/main/java/org/askartv/phone/BasePlayerActivity.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin +package org.askartv.phone import android.os.Bundle import android.view.View @@ -9,7 +9,7 @@ import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat import androidx.core.view.updatePadding import androidx.media3.session.MediaSession -import dev.jdtech.jellyfin.viewmodels.PlayerActivityViewModel +import org.askartv.phone.viewmodels.PlayerActivityViewModel abstract class BasePlayerActivity : AppCompatActivity() { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt b/app/phone/src/main/java/org/askartv/phone/BindingAdapters.kt similarity index 90% rename from app/phone/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt rename to app/phone/src/main/java/org/askartv/phone/BindingAdapters.kt index 16d4f463..5d8446dc 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt +++ b/app/phone/src/main/java/org/askartv/phone/BindingAdapters.kt @@ -1,20 +1,20 @@ -package dev.jdtech.jellyfin +package org.askartv.phone import android.view.View import android.widget.ImageView import androidx.annotation.DrawableRes import coil.load -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.User +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.User import org.jellyfin.sdk.model.api.BaseItemDto import org.jellyfin.sdk.model.api.BaseItemKind import org.jellyfin.sdk.model.api.BaseItemPerson import org.jellyfin.sdk.model.api.ImageType import java.util.UUID -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR fun bindItemImage(imageView: ImageView, item: BaseItemDto) { val itemId = diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/MainActivity.kt b/app/phone/src/main/java/org/askartv/phone/MainActivity.kt similarity index 95% rename from app/phone/src/main/java/dev/jdtech/jellyfin/MainActivity.kt rename to app/phone/src/main/java/org/askartv/phone/MainActivity.kt index 163bc80c..694fc90f 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/MainActivity.kt +++ b/app/phone/src/main/java/org/askartv/phone/MainActivity.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin +package org.askartv.phone import android.os.Bundle import android.view.View @@ -18,12 +18,12 @@ import androidx.work.OneTimeWorkRequestBuilder import androidx.work.WorkManager import com.google.android.material.navigation.NavigationBarView import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.databinding.ActivityMainBinding -import dev.jdtech.jellyfin.viewmodels.MainViewModel -import dev.jdtech.jellyfin.work.SyncWorker +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.databinding.ActivityMainBinding +import org.askartv.phone.viewmodels.MainViewModel +import org.askartv.phone.work.SyncWorker import javax.inject.Inject -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @AndroidEntryPoint class MainActivity : AppCompatActivity() { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt b/app/phone/src/main/java/org/askartv/phone/PlayerActivity.kt similarity index 96% rename from app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt rename to app/phone/src/main/java/org/askartv/phone/PlayerActivity.kt index e21c79b3..21217771 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt +++ b/app/phone/src/main/java/org/askartv/phone/PlayerActivity.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin +package org.askartv.phone import android.app.AppOpsManager import android.app.PictureInPictureParams @@ -34,14 +34,14 @@ import androidx.media3.ui.PlayerControlView import androidx.media3.ui.PlayerView import androidx.navigation.navArgs import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.databinding.ActivityPlayerBinding -import dev.jdtech.jellyfin.dialogs.SpeedSelectionDialogFragment -import dev.jdtech.jellyfin.dialogs.TrackSelectionDialogFragment -import dev.jdtech.jellyfin.utils.PlayerGestureHelper -import dev.jdtech.jellyfin.utils.PreviewScrubListener -import dev.jdtech.jellyfin.viewmodels.PlayerActivityViewModel -import dev.jdtech.jellyfin.viewmodels.PlayerEvents +import org.askartv.phone.databinding.ActivityPlayerBinding +import org.askartv.phone.dialogs.SpeedSelectionDialogFragment +import org.askartv.phone.dialogs.TrackSelectionDialogFragment +import org.askartv.phone.viewmodels.PlayerActivityViewModel +import org.askartv.phone.viewmodels.PlayerEvents import kotlinx.coroutines.launch +import org.askartv.phone.utils.PlayerGestureHelper +import org.askartv.phone.utils.PreviewScrubListener import timber.log.Timber import javax.inject.Inject @@ -106,7 +106,7 @@ class PlayerActivity : BasePlayerActivity() { appPreferences, this, binding.playerView, - getSystemService(Context.AUDIO_SERVICE) as AudioManager, + getSystemService(AUDIO_SERVICE) as AudioManager, ) } diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/CollectionListAdapter.kt b/app/phone/src/main/java/org/askartv/phone/adapters/CollectionListAdapter.kt similarity index 89% rename from app/phone/src/main/java/dev/jdtech/jellyfin/adapters/CollectionListAdapter.kt rename to app/phone/src/main/java/org/askartv/phone/adapters/CollectionListAdapter.kt index 2075e314..9cb78d5a 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/CollectionListAdapter.kt +++ b/app/phone/src/main/java/org/askartv/phone/adapters/CollectionListAdapter.kt @@ -1,13 +1,13 @@ -package dev.jdtech.jellyfin.adapters +package org.askartv.phone.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import dev.jdtech.jellyfin.bindCardItemImage -import dev.jdtech.jellyfin.databinding.CollectionItemBinding -import dev.jdtech.jellyfin.models.FindroidCollection +import org.askartv.phone.bindCardItemImage +import org.askartv.phone.databinding.CollectionItemBinding +import org.askartv.phone.models.FindroidCollection class CollectionListAdapter( private val onClickListener: (collection: FindroidCollection) -> Unit, @@ -47,4 +47,4 @@ class CollectionListAdapter( } holder.bind(collection) } -} +} \ No newline at end of file diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/DiscoveredServerListAdapter.kt b/app/phone/src/main/java/org/askartv/phone/adapters/DiscoveredServerListAdapter.kt similarity index 91% rename from app/phone/src/main/java/dev/jdtech/jellyfin/adapters/DiscoveredServerListAdapter.kt rename to app/phone/src/main/java/org/askartv/phone/adapters/DiscoveredServerListAdapter.kt index 06c2d31b..0d02e46e 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/DiscoveredServerListAdapter.kt +++ b/app/phone/src/main/java/org/askartv/phone/adapters/DiscoveredServerListAdapter.kt @@ -1,12 +1,12 @@ -package dev.jdtech.jellyfin.adapters +package org.askartv.phone.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import dev.jdtech.jellyfin.databinding.DiscoveredServerItemBinding -import dev.jdtech.jellyfin.models.DiscoveredServer +import org.askartv.phone.databinding.DiscoveredServerItemBinding +import org.askartv.phone.models.DiscoveredServer class DiscoveredServerListAdapter( private val clickListener: (server: DiscoveredServer) -> Unit, @@ -55,4 +55,4 @@ class DiscoveredServerListAdapter( holder.itemView.setOnClickListener { clickListener(server) } holder.bind(server) } -} +} \ No newline at end of file diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/EpisodeListAdapter.kt b/app/phone/src/main/java/org/askartv/phone/adapters/EpisodeListAdapter.kt similarity index 90% rename from app/phone/src/main/java/dev/jdtech/jellyfin/adapters/EpisodeListAdapter.kt rename to app/phone/src/main/java/org/askartv/phone/adapters/EpisodeListAdapter.kt index bddb8781..a33c02d1 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/EpisodeListAdapter.kt +++ b/app/phone/src/main/java/org/askartv/phone/adapters/EpisodeListAdapter.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.adapters +package org.askartv.phone.adapters import android.text.Html.fromHtml import android.util.TypedValue @@ -9,15 +9,15 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import dev.jdtech.jellyfin.bindCardItemImage -import dev.jdtech.jellyfin.bindItemBackdropById -import dev.jdtech.jellyfin.bindSeasonPoster -import dev.jdtech.jellyfin.databinding.EpisodeItemBinding -import dev.jdtech.jellyfin.databinding.SeasonHeaderBinding -import dev.jdtech.jellyfin.models.EpisodeItem -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.isDownloaded -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.bindCardItemImage +import org.askartv.phone.bindItemBackdropById +import org.askartv.phone.bindSeasonPoster +import org.askartv.phone.databinding.EpisodeItemBinding +import org.askartv.phone.databinding.SeasonHeaderBinding +import org.askartv.phone.models.EpisodeItem +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.isDownloaded +import org.askartv.phone.core.R as CoreR private const val ITEM_VIEW_TYPE_HEADER = 0 private const val ITEM_VIEW_TYPE_EPISODE = 1 @@ -123,4 +123,4 @@ class EpisodeListAdapter( is EpisodeItem.Episode -> ITEM_VIEW_TYPE_EPISODE } } -} +} \ No newline at end of file diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/FavoritesListAdapter.kt b/app/phone/src/main/java/org/askartv/phone/adapters/FavoritesListAdapter.kt similarity index 90% rename from app/phone/src/main/java/dev/jdtech/jellyfin/adapters/FavoritesListAdapter.kt rename to app/phone/src/main/java/org/askartv/phone/adapters/FavoritesListAdapter.kt index 75a67579..cf381de2 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/FavoritesListAdapter.kt +++ b/app/phone/src/main/java/org/askartv/phone/adapters/FavoritesListAdapter.kt @@ -1,14 +1,14 @@ -package dev.jdtech.jellyfin.adapters +package org.askartv.phone.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import dev.jdtech.jellyfin.Constants -import dev.jdtech.jellyfin.databinding.FavoriteSectionBinding -import dev.jdtech.jellyfin.models.FavoriteSection -import dev.jdtech.jellyfin.models.FindroidItem +import org.askartv.phone.Constants +import org.askartv.phone.databinding.FavoriteSectionBinding +import org.askartv.phone.models.FavoriteSection +import org.askartv.phone.models.FindroidItem class FavoritesListAdapter( private val onItemClickListener: (item: FindroidItem) -> Unit, @@ -59,4 +59,4 @@ class FavoritesListAdapter( val collection = getItem(position) holder.bind(collection, onItemClickListener) } -} +} \ No newline at end of file diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/HomeEpisodeListAdapter.kt b/app/phone/src/main/java/org/askartv/phone/adapters/HomeEpisodeListAdapter.kt similarity index 79% rename from app/phone/src/main/java/dev/jdtech/jellyfin/adapters/HomeEpisodeListAdapter.kt rename to app/phone/src/main/java/org/askartv/phone/adapters/HomeEpisodeListAdapter.kt index 70cbe365..509f7f63 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/HomeEpisodeListAdapter.kt +++ b/app/phone/src/main/java/org/askartv/phone/adapters/HomeEpisodeListAdapter.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.adapters +package org.askartv.phone.adapters import android.util.TypedValue import android.view.LayoutInflater @@ -8,13 +8,13 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import dev.jdtech.jellyfin.bindCardItemImage -import dev.jdtech.jellyfin.databinding.HomeEpisodeItemBinding -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.isDownloaded -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.bindCardItemImage +import org.askartv.phone.core.R +import org.askartv.phone.databinding.HomeEpisodeItemBinding +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.isDownloaded class HomeEpisodeListAdapter(private val onClickListener: (item: FindroidItem) -> Unit) : ListAdapter(DiffCallback) { class EpisodeViewHolder( @@ -42,9 +42,9 @@ class HomeEpisodeListAdapter(private val onClickListener: (item: FindroidItem) - is FindroidEpisode -> { binding.primaryName.text = item.seriesName binding.secondaryName.text = if (item.indexNumberEnd == null) { - parent.resources.getString(CoreR.string.episode_name_extended, item.parentIndexNumber, item.indexNumber, item.name) + parent.resources.getString(R.string.episode_name_extended, item.parentIndexNumber, item.indexNumber, item.name) } else { - parent.resources.getString(CoreR.string.episode_name_extended_with_end, item.parentIndexNumber, item.indexNumber, item.indexNumberEnd, item.name) + parent.resources.getString(R.string.episode_name_extended_with_end, item.parentIndexNumber, item.indexNumber, item.indexNumberEnd, item.name) } } } @@ -81,4 +81,4 @@ class HomeEpisodeListAdapter(private val onClickListener: (item: FindroidItem) - } holder.bind(item) } -} +} \ No newline at end of file diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/PersonListAdapter.kt b/app/phone/src/main/java/org/askartv/phone/adapters/PersonListAdapter.kt similarity index 92% rename from app/phone/src/main/java/dev/jdtech/jellyfin/adapters/PersonListAdapter.kt rename to app/phone/src/main/java/org/askartv/phone/adapters/PersonListAdapter.kt index 8cbc5571..e03dfb4c 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/PersonListAdapter.kt +++ b/app/phone/src/main/java/org/askartv/phone/adapters/PersonListAdapter.kt @@ -1,12 +1,12 @@ -package dev.jdtech.jellyfin.adapters +package org.askartv.phone.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import dev.jdtech.jellyfin.bindPersonImage -import dev.jdtech.jellyfin.databinding.PersonItemBinding +import org.askartv.phone.bindPersonImage +import org.askartv.phone.databinding.PersonItemBinding import org.jellyfin.sdk.model.api.BaseItemPerson class PersonListAdapter(private val clickListener: (item: BaseItemPerson) -> Unit) : ListAdapter(DiffCallback) { @@ -45,4 +45,4 @@ class PersonListAdapter(private val clickListener: (item: BaseItemPerson) -> Uni holder.bind(item) holder.itemView.setOnClickListener { clickListener(item) } } -} +} \ No newline at end of file diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ServerAddressAdapter.kt b/app/phone/src/main/java/org/askartv/phone/adapters/ServerAddressAdapter.kt similarity index 91% rename from app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ServerAddressAdapter.kt rename to app/phone/src/main/java/org/askartv/phone/adapters/ServerAddressAdapter.kt index e4e93884..fda933de 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ServerAddressAdapter.kt +++ b/app/phone/src/main/java/org/askartv/phone/adapters/ServerAddressAdapter.kt @@ -1,12 +1,12 @@ -package dev.jdtech.jellyfin.adapters +package org.askartv.phone.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import dev.jdtech.jellyfin.databinding.ServerAddressListItemBinding -import dev.jdtech.jellyfin.models.ServerAddress +import org.askartv.phone.databinding.ServerAddressListItemBinding +import org.askartv.phone.models.ServerAddress class ServerAddressAdapter( private val clickListener: (address: ServerAddress) -> Unit, @@ -48,4 +48,4 @@ class ServerAddressAdapter( holder.itemView.setOnLongClickListener { longClickListener(address) } holder.bind(address) } -} +} \ No newline at end of file diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ServerGridAdapter.kt b/app/phone/src/main/java/org/askartv/phone/adapters/ServerGridAdapter.kt similarity index 91% rename from app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ServerGridAdapter.kt rename to app/phone/src/main/java/org/askartv/phone/adapters/ServerGridAdapter.kt index 53f5c9af..a2e2a872 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ServerGridAdapter.kt +++ b/app/phone/src/main/java/org/askartv/phone/adapters/ServerGridAdapter.kt @@ -1,12 +1,12 @@ -package dev.jdtech.jellyfin.adapters +package org.askartv.phone.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import dev.jdtech.jellyfin.databinding.ServerItemBinding -import dev.jdtech.jellyfin.models.Server +import org.askartv.phone.databinding.ServerItemBinding +import org.askartv.phone.models.Server class ServerGridAdapter( private val onClickListener: (server: Server) -> Unit, @@ -46,4 +46,4 @@ class ServerGridAdapter( } holder.bind(server) } -} +} \ No newline at end of file diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserListAdapter.kt b/app/phone/src/main/java/org/askartv/phone/adapters/UserListAdapter.kt similarity index 90% rename from app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserListAdapter.kt rename to app/phone/src/main/java/org/askartv/phone/adapters/UserListAdapter.kt index 5b69d055..942fa0c0 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserListAdapter.kt +++ b/app/phone/src/main/java/org/askartv/phone/adapters/UserListAdapter.kt @@ -1,13 +1,13 @@ -package dev.jdtech.jellyfin.adapters +package org.askartv.phone.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import dev.jdtech.jellyfin.bindUserImage -import dev.jdtech.jellyfin.databinding.UserListItemBinding -import dev.jdtech.jellyfin.models.User +import org.askartv.phone.bindUserImage +import org.askartv.phone.databinding.UserListItemBinding +import org.askartv.phone.models.User class UserListAdapter( private val clickListener: (user: User) -> Unit, @@ -50,4 +50,4 @@ class UserListAdapter( holder.itemView.setOnLongClickListener { longClickListener(user) } holder.bind(user) } -} +} \ No newline at end of file diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserLoginListAdapter.kt b/app/phone/src/main/java/org/askartv/phone/adapters/UserLoginListAdapter.kt similarity index 89% rename from app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserLoginListAdapter.kt rename to app/phone/src/main/java/org/askartv/phone/adapters/UserLoginListAdapter.kt index 957dc113..6c40db33 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserLoginListAdapter.kt +++ b/app/phone/src/main/java/org/askartv/phone/adapters/UserLoginListAdapter.kt @@ -1,13 +1,13 @@ -package dev.jdtech.jellyfin.adapters +package org.askartv.phone.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import dev.jdtech.jellyfin.bindUserImage -import dev.jdtech.jellyfin.databinding.UserItemBinding -import dev.jdtech.jellyfin.models.User +import org.askartv.phone.bindUserImage +import org.askartv.phone.databinding.UserItemBinding +import org.askartv.phone.models.User class UserLoginListAdapter( private val clickListener: (user: User) -> Unit, @@ -48,4 +48,4 @@ class UserLoginListAdapter( holder.itemView.setOnClickListener { clickListener(user) } holder.bind(user) } -} +} \ No newline at end of file diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemListAdapter.kt b/app/phone/src/main/java/org/askartv/phone/adapters/ViewItemListAdapter.kt similarity index 84% rename from app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemListAdapter.kt rename to app/phone/src/main/java/org/askartv/phone/adapters/ViewItemListAdapter.kt index 95970a4d..98a9d641 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemListAdapter.kt +++ b/app/phone/src/main/java/org/askartv/phone/adapters/ViewItemListAdapter.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.adapters +package org.askartv.phone.adapters import android.view.LayoutInflater import android.view.View @@ -7,12 +7,12 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import dev.jdtech.jellyfin.bindItemImage -import dev.jdtech.jellyfin.databinding.BaseItemBinding -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.isDownloaded -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.bindItemImage +import org.askartv.phone.core.R +import org.askartv.phone.databinding.BaseItemBinding +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.isDownloaded class ViewItemListAdapter( private val onClickListener: (item: FindroidItem) -> Unit, @@ -27,7 +27,7 @@ class ViewItemListAdapter( if (item.unplayedItemCount != null && item.unplayedItemCount!! > 0) View.VISIBLE else View.GONE if (fixedWidth) { binding.itemLayout.layoutParams.width = - parent.resources.getDimension(CoreR.dimen.overview_media_width).toInt() + parent.resources.getDimension(R.dimen.overview_media_width).toInt() (binding.itemLayout.layoutParams as ViewGroup.MarginLayoutParams).bottomMargin = 0 } @@ -67,4 +67,4 @@ class ViewItemListAdapter( } holder.bind(item, fixedWidth) } -} +} \ No newline at end of file diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemPagingAdapter.kt b/app/phone/src/main/java/org/askartv/phone/adapters/ViewItemPagingAdapter.kt similarity index 85% rename from app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemPagingAdapter.kt rename to app/phone/src/main/java/org/askartv/phone/adapters/ViewItemPagingAdapter.kt index 3d566276..653e1d86 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemPagingAdapter.kt +++ b/app/phone/src/main/java/org/askartv/phone/adapters/ViewItemPagingAdapter.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.adapters +package org.askartv.phone.adapters import android.view.LayoutInflater import android.view.View @@ -7,12 +7,12 @@ import androidx.core.view.isVisible import androidx.paging.PagingDataAdapter import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import dev.jdtech.jellyfin.bindItemImage -import dev.jdtech.jellyfin.databinding.BaseItemBinding -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.isDownloaded -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.bindItemImage +import org.askartv.phone.core.R +import org.askartv.phone.databinding.BaseItemBinding +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.isDownloaded class ViewItemPagingAdapter( private val onClickListener: (item: FindroidItem) -> Unit, @@ -28,7 +28,7 @@ class ViewItemPagingAdapter( if (item.unplayedItemCount != null && item.unplayedItemCount!! > 0) View.VISIBLE else View.GONE if (fixedWidth) { binding.itemLayout.layoutParams.width = - parent.resources.getDimension(CoreR.dimen.overview_media_width).toInt() + parent.resources.getDimension(R.dimen.overview_media_width).toInt() (binding.itemLayout.layoutParams as ViewGroup.MarginLayoutParams).bottomMargin = 0 } @@ -70,4 +70,4 @@ class ViewItemPagingAdapter( holder.bind(item, fixedWidth) } } -} +} \ No newline at end of file diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewListAdapter.kt b/app/phone/src/main/java/org/askartv/phone/adapters/ViewListAdapter.kt similarity index 92% rename from app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewListAdapter.kt rename to app/phone/src/main/java/org/askartv/phone/adapters/ViewListAdapter.kt index f5417015..ebaf52a7 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewListAdapter.kt +++ b/app/phone/src/main/java/org/askartv/phone/adapters/ViewListAdapter.kt @@ -1,17 +1,17 @@ -package dev.jdtech.jellyfin.adapters +package org.askartv.phone.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import dev.jdtech.jellyfin.databinding.CardOfflineBinding -import dev.jdtech.jellyfin.databinding.NextUpSectionBinding -import dev.jdtech.jellyfin.databinding.ViewItemBinding -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.HomeItem -import dev.jdtech.jellyfin.models.View -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.databinding.CardOfflineBinding +import org.askartv.phone.databinding.NextUpSectionBinding +import org.askartv.phone.databinding.ViewItemBinding +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.HomeItem +import org.askartv.phone.models.View +import org.askartv.phone.core.R as CoreR private const val ITEM_VIEW_TYPE_NEXT_UP = 0 private const val ITEM_VIEW_TYPE_VIEW = 1 @@ -125,4 +125,4 @@ class ViewListAdapter( is HomeItem.ViewItem -> ITEM_VIEW_TYPE_VIEW } } -} +} \ No newline at end of file diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/di/AppModule.kt b/app/phone/src/main/java/org/askartv/phone/di/AppModule.kt similarity index 86% rename from app/phone/src/main/java/dev/jdtech/jellyfin/di/AppModule.kt rename to app/phone/src/main/java/org/askartv/phone/di/AppModule.kt index ddc05851..bff4c9e5 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/di/AppModule.kt +++ b/app/phone/src/main/java/org/askartv/phone/di/AppModule.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.di +package org.askartv.phone.di import android.content.Context import dagger.Module @@ -6,7 +6,7 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import dev.jdtech.jellyfin.BaseApplication +import org.askartv.phone.BaseApplication import javax.inject.Singleton @Module diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/dialogs/StorageSelectionDialog.kt b/app/phone/src/main/java/org/askartv/phone/dialogs/StorageSelectionDialog.kt similarity index 92% rename from app/phone/src/main/java/dev/jdtech/jellyfin/dialogs/StorageSelectionDialog.kt rename to app/phone/src/main/java/org/askartv/phone/dialogs/StorageSelectionDialog.kt index aad2dcc0..74237dc9 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/dialogs/StorageSelectionDialog.kt +++ b/app/phone/src/main/java/org/askartv/phone/dialogs/StorageSelectionDialog.kt @@ -1,11 +1,11 @@ -package dev.jdtech.jellyfin.dialogs +package org.askartv.phone.dialogs import android.content.Context import android.os.Environment import android.os.StatFs import androidx.appcompat.app.AlertDialog import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR fun getStorageSelectionDialog( context: Context, diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/AddServerFragment.kt similarity index 94% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/AddServerFragment.kt index ef1dab39..61b4d5b5 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/AddServerFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.text.method.LinkMovementMethod @@ -15,10 +15,10 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.adapters.DiscoveredServerListAdapter -import dev.jdtech.jellyfin.databinding.FragmentAddServerBinding -import dev.jdtech.jellyfin.viewmodels.AddServerEvent -import dev.jdtech.jellyfin.viewmodels.AddServerViewModel +import org.askartv.phone.adapters.DiscoveredServerListAdapter +import org.askartv.phone.databinding.FragmentAddServerBinding +import org.askartv.phone.viewmodels.AddServerEvent +import org.askartv.phone.viewmodels.AddServerViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/CollectionFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/CollectionFragment.kt similarity index 88% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/CollectionFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/CollectionFragment.kt index c8bc3bda..bc59f5d9 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/CollectionFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/CollectionFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.view.LayoutInflater @@ -13,18 +13,18 @@ import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.adapters.FavoritesListAdapter -import dev.jdtech.jellyfin.databinding.FragmentFavoriteBinding -import dev.jdtech.jellyfin.dialogs.ErrorDialogFragment -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.utils.checkIfLoginRequired -import dev.jdtech.jellyfin.viewmodels.CollectionViewModel +import org.askartv.phone.adapters.FavoritesListAdapter +import org.askartv.phone.databinding.FragmentFavoriteBinding +import org.askartv.phone.dialogs.ErrorDialogFragment +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.utils.checkIfLoginRequired +import org.askartv.phone.viewmodels.CollectionViewModel import kotlinx.coroutines.launch import timber.log.Timber -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @AndroidEntryPoint class CollectionFragment : Fragment() { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/DownloadsFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/DownloadsFragment.kt similarity index 88% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/DownloadsFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/DownloadsFragment.kt index 1f154cef..2a758f26 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/DownloadsFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/DownloadsFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.view.LayoutInflater @@ -13,19 +13,19 @@ import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import com.google.android.material.snackbar.Snackbar import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.adapters.FavoritesListAdapter -import dev.jdtech.jellyfin.databinding.FragmentDownloadsBinding -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.utils.restart -import dev.jdtech.jellyfin.viewmodels.DownloadsEvent -import dev.jdtech.jellyfin.viewmodels.DownloadsViewModel +import org.askartv.phone.AppPreferences +import org.askartv.phone.adapters.FavoritesListAdapter +import org.askartv.phone.databinding.FragmentDownloadsBinding +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.utils.restart +import org.askartv.phone.viewmodels.DownloadsEvent +import org.askartv.phone.viewmodels.DownloadsViewModel import kotlinx.coroutines.launch import timber.log.Timber import javax.inject.Inject -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @AndroidEntryPoint class DownloadsFragment : Fragment() { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/EpisodeBottomSheetFragment.kt similarity index 94% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/EpisodeBottomSheetFragment.kt index 17c61caf..a958b88f 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/EpisodeBottomSheetFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.app.DownloadManager import android.os.Bundle @@ -21,23 +21,23 @@ import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.R -import dev.jdtech.jellyfin.bindCardItemImage -import dev.jdtech.jellyfin.databinding.EpisodeBottomSheetBinding -import dev.jdtech.jellyfin.dialogs.ErrorDialogFragment -import dev.jdtech.jellyfin.dialogs.getStorageSelectionDialog -import dev.jdtech.jellyfin.dialogs.getVideoVersionDialog -import dev.jdtech.jellyfin.models.FindroidSourceType -import dev.jdtech.jellyfin.models.PlayerItem -import dev.jdtech.jellyfin.models.UiText -import dev.jdtech.jellyfin.models.isDownloaded -import dev.jdtech.jellyfin.models.isDownloading -import dev.jdtech.jellyfin.utils.setIconTintColorAttribute -import dev.jdtech.jellyfin.viewmodels.EpisodeBottomSheetEvent -import dev.jdtech.jellyfin.viewmodels.EpisodeBottomSheetViewModel -import dev.jdtech.jellyfin.viewmodels.PlayerItemsEvent -import dev.jdtech.jellyfin.viewmodels.PlayerViewModel +import org.askartv.phone.AppPreferences +import org.askartv.phone.R +import org.askartv.phone.bindCardItemImage +import org.askartv.phone.databinding.EpisodeBottomSheetBinding +import org.askartv.phone.dialogs.ErrorDialogFragment +import org.askartv.phone.dialogs.getStorageSelectionDialog +import org.askartv.phone.dialogs.getVideoVersionDialog +import org.askartv.phone.models.FindroidSourceType +import org.askartv.phone.models.PlayerItem +import org.askartv.phone.models.UiText +import org.askartv.phone.models.isDownloaded +import org.askartv.phone.models.isDownloading +import org.askartv.phone.utils.setIconTintColorAttribute +import org.askartv.phone.viewmodels.EpisodeBottomSheetEvent +import org.askartv.phone.viewmodels.EpisodeBottomSheetViewModel +import org.askartv.phone.viewmodels.PlayerItemsEvent +import org.askartv.phone.viewmodels.PlayerViewModel import kotlinx.coroutines.launch import org.jellyfin.sdk.model.DateTime import timber.log.Timber @@ -48,7 +48,7 @@ import java.util.UUID import javax.inject.Inject import android.R as AndroidR import com.google.android.material.R as MaterialR -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @AndroidEntryPoint class EpisodeBottomSheetFragment : BottomSheetDialogFragment() { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/FavoriteFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/FavoriteFragment.kt similarity index 88% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/FavoriteFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/FavoriteFragment.kt index d8512c36..1ba9dea4 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/FavoriteFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/FavoriteFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.view.LayoutInflater @@ -12,15 +12,15 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.adapters.FavoritesListAdapter -import dev.jdtech.jellyfin.databinding.FragmentFavoriteBinding -import dev.jdtech.jellyfin.dialogs.ErrorDialogFragment -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.utils.checkIfLoginRequired -import dev.jdtech.jellyfin.viewmodels.FavoriteViewModel +import org.askartv.phone.adapters.FavoritesListAdapter +import org.askartv.phone.databinding.FragmentFavoriteBinding +import org.askartv.phone.dialogs.ErrorDialogFragment +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.utils.checkIfLoginRequired +import org.askartv.phone.viewmodels.FavoriteViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/HomeFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/HomeFragment.kt similarity index 92% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/HomeFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/HomeFragment.kt index 471f7409..ff422f6f 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/HomeFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/HomeFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.view.LayoutInflater @@ -19,21 +19,21 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.adapters.ViewListAdapter -import dev.jdtech.jellyfin.databinding.FragmentHomeBinding -import dev.jdtech.jellyfin.dialogs.ErrorDialogFragment -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.utils.checkIfLoginRequired -import dev.jdtech.jellyfin.utils.restart -import dev.jdtech.jellyfin.viewmodels.HomeViewModel +import org.askartv.phone.AppPreferences +import org.askartv.phone.adapters.ViewListAdapter +import org.askartv.phone.databinding.FragmentHomeBinding +import org.askartv.phone.dialogs.ErrorDialogFragment +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.utils.checkIfLoginRequired +import org.askartv.phone.utils.restart +import org.askartv.phone.viewmodels.HomeViewModel import kotlinx.coroutines.launch import timber.log.Timber import javax.inject.Inject -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @AndroidEntryPoint class HomeFragment : Fragment() { @@ -202,7 +202,7 @@ class HomeFragment : Fragment() { checkIfLoginRequired(uiState.error.message) } - private fun navigateToLibraryFragment(view: dev.jdtech.jellyfin.models.View) { + private fun navigateToLibraryFragment(view: org.askartv.phone.models.View) { findNavController().navigate( HomeFragmentDirections.actionNavigationHomeToLibraryFragment( libraryId = view.id, diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LibraryFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/LibraryFragment.kt similarity index 91% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LibraryFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/LibraryFragment.kt index 71223f7e..4cde01e0 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LibraryFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/LibraryFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.view.LayoutInflater @@ -19,24 +19,24 @@ import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import androidx.paging.LoadState import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.adapters.ViewItemPagingAdapter -import dev.jdtech.jellyfin.databinding.FragmentLibraryBinding -import dev.jdtech.jellyfin.dialogs.ErrorDialogFragment -import dev.jdtech.jellyfin.dialogs.SortDialogFragment -import dev.jdtech.jellyfin.models.FindroidBoxSet -import dev.jdtech.jellyfin.models.FindroidFolder -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.models.SortBy -import dev.jdtech.jellyfin.utils.checkIfLoginRequired -import dev.jdtech.jellyfin.viewmodels.LibraryViewModel +import org.askartv.phone.AppPreferences +import org.askartv.phone.adapters.ViewItemPagingAdapter +import org.askartv.phone.databinding.FragmentLibraryBinding +import org.askartv.phone.dialogs.ErrorDialogFragment +import org.askartv.phone.dialogs.SortDialogFragment +import org.askartv.phone.models.FindroidBoxSet +import org.askartv.phone.models.FindroidFolder +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.models.SortBy +import org.askartv.phone.utils.checkIfLoginRequired +import org.askartv.phone.viewmodels.LibraryViewModel import kotlinx.coroutines.launch import org.jellyfin.sdk.model.api.SortOrder import java.lang.IllegalArgumentException import javax.inject.Inject -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @AndroidEntryPoint class LibraryFragment : Fragment() { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/LoginFragment.kt similarity index 94% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/LoginFragment.kt index 813196ff..0bef03d9 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/LoginFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.text.Html.fromHtml @@ -16,16 +16,16 @@ import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.adapters.UserLoginListAdapter -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.databinding.FragmentLoginBinding -import dev.jdtech.jellyfin.viewmodels.LoginEvent -import dev.jdtech.jellyfin.viewmodels.LoginViewModel +import org.askartv.phone.AppPreferences +import org.askartv.phone.adapters.UserLoginListAdapter +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.databinding.FragmentLoginBinding +import org.askartv.phone.viewmodels.LoginEvent +import org.askartv.phone.viewmodels.LoginViewModel import kotlinx.coroutines.launch import timber.log.Timber import javax.inject.Inject -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @AndroidEntryPoint class LoginFragment : Fragment() { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/MediaFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/MediaFragment.kt similarity index 93% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/MediaFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/MediaFragment.kt index 3586d90f..91526fb5 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/MediaFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/MediaFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.view.LayoutInflater @@ -19,15 +19,15 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.adapters.CollectionListAdapter -import dev.jdtech.jellyfin.databinding.FragmentMediaBinding -import dev.jdtech.jellyfin.dialogs.ErrorDialogFragment -import dev.jdtech.jellyfin.models.FindroidCollection -import dev.jdtech.jellyfin.utils.checkIfLoginRequired -import dev.jdtech.jellyfin.viewmodels.MediaViewModel +import org.askartv.phone.adapters.CollectionListAdapter +import org.askartv.phone.databinding.FragmentMediaBinding +import org.askartv.phone.dialogs.ErrorDialogFragment +import org.askartv.phone.models.FindroidCollection +import org.askartv.phone.utils.checkIfLoginRequired +import org.askartv.phone.viewmodels.MediaViewModel import kotlinx.coroutines.launch import timber.log.Timber -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @AndroidEntryPoint class MediaFragment : Fragment() { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/MovieFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/MovieFragment.kt similarity index 94% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/MovieFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/MovieFragment.kt index ed6b8894..43dc9ca1 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/MovieFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/MovieFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.app.DownloadManager import android.content.Intent @@ -21,32 +21,32 @@ import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.R -import dev.jdtech.jellyfin.adapters.PersonListAdapter -import dev.jdtech.jellyfin.bindItemBackdropImage -import dev.jdtech.jellyfin.databinding.FragmentMovieBinding -import dev.jdtech.jellyfin.dialogs.ErrorDialogFragment -import dev.jdtech.jellyfin.dialogs.getStorageSelectionDialog -import dev.jdtech.jellyfin.dialogs.getVideoVersionDialog -import dev.jdtech.jellyfin.models.AudioCodec -import dev.jdtech.jellyfin.models.DisplayProfile -import dev.jdtech.jellyfin.models.FindroidSourceType -import dev.jdtech.jellyfin.models.PlayerItem -import dev.jdtech.jellyfin.models.UiText -import dev.jdtech.jellyfin.models.isDownloaded -import dev.jdtech.jellyfin.models.isDownloading -import dev.jdtech.jellyfin.utils.checkIfLoginRequired -import dev.jdtech.jellyfin.utils.setIconTintColorAttribute -import dev.jdtech.jellyfin.viewmodels.MovieEvent -import dev.jdtech.jellyfin.viewmodels.MovieViewModel -import dev.jdtech.jellyfin.viewmodels.PlayerItemsEvent -import dev.jdtech.jellyfin.viewmodels.PlayerViewModel +import org.askartv.phone.AppPreferences +import org.askartv.phone.R +import org.askartv.phone.adapters.PersonListAdapter +import org.askartv.phone.bindItemBackdropImage +import org.askartv.phone.databinding.FragmentMovieBinding +import org.askartv.phone.dialogs.ErrorDialogFragment +import org.askartv.phone.dialogs.getStorageSelectionDialog +import org.askartv.phone.dialogs.getVideoVersionDialog +import org.askartv.phone.models.AudioCodec +import org.askartv.phone.models.DisplayProfile +import org.askartv.phone.models.FindroidSourceType +import org.askartv.phone.models.PlayerItem +import org.askartv.phone.models.UiText +import org.askartv.phone.models.isDownloaded +import org.askartv.phone.models.isDownloading +import org.askartv.phone.utils.checkIfLoginRequired +import org.askartv.phone.utils.setIconTintColorAttribute +import org.askartv.phone.viewmodels.MovieEvent +import org.askartv.phone.viewmodels.MovieViewModel +import org.askartv.phone.viewmodels.PlayerItemsEvent +import org.askartv.phone.viewmodels.PlayerViewModel import kotlinx.coroutines.launch import timber.log.Timber import java.util.UUID import javax.inject.Inject -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @AndroidEntryPoint class MovieFragment : Fragment() { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/PersonDetailFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/PersonDetailFragment.kt similarity index 91% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/PersonDetailFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/PersonDetailFragment.kt index 222da60f..808a1da5 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/PersonDetailFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/PersonDetailFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.view.LayoutInflater @@ -15,18 +15,18 @@ import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.adapters.ViewItemListAdapter -import dev.jdtech.jellyfin.bindItemImage -import dev.jdtech.jellyfin.databinding.FragmentPersonDetailBinding -import dev.jdtech.jellyfin.dialogs.ErrorDialogFragment -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.utils.checkIfLoginRequired -import dev.jdtech.jellyfin.viewmodels.PersonDetailViewModel +import org.askartv.phone.adapters.ViewItemListAdapter +import org.askartv.phone.bindItemImage +import org.askartv.phone.databinding.FragmentPersonDetailBinding +import org.askartv.phone.dialogs.ErrorDialogFragment +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.utils.checkIfLoginRequired +import org.askartv.phone.viewmodels.PersonDetailViewModel import kotlinx.coroutines.launch import timber.log.Timber -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @AndroidEntryPoint internal class PersonDetailFragment : Fragment() { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SearchResultFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/SearchResultFragment.kt similarity index 89% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SearchResultFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/SearchResultFragment.kt index 4e385a0a..9aa6b6bb 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SearchResultFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/SearchResultFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.view.LayoutInflater @@ -13,15 +13,15 @@ import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.adapters.FavoritesListAdapter -import dev.jdtech.jellyfin.databinding.FragmentSearchResultBinding -import dev.jdtech.jellyfin.dialogs.ErrorDialogFragment -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.utils.checkIfLoginRequired -import dev.jdtech.jellyfin.viewmodels.SearchResultViewModel +import org.askartv.phone.adapters.FavoritesListAdapter +import org.askartv.phone.databinding.FragmentSearchResultBinding +import org.askartv.phone.dialogs.ErrorDialogFragment +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.utils.checkIfLoginRequired +import org.askartv.phone.viewmodels.SearchResultViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SeasonFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/SeasonFragment.kt similarity index 90% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SeasonFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/SeasonFragment.kt index 8bc559f8..97558b45 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SeasonFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/SeasonFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.view.LayoutInflater @@ -13,13 +13,13 @@ import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.adapters.EpisodeListAdapter -import dev.jdtech.jellyfin.databinding.FragmentSeasonBinding -import dev.jdtech.jellyfin.dialogs.ErrorDialogFragment -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.utils.checkIfLoginRequired -import dev.jdtech.jellyfin.viewmodels.SeasonEvent -import dev.jdtech.jellyfin.viewmodels.SeasonViewModel +import org.askartv.phone.adapters.EpisodeListAdapter +import org.askartv.phone.databinding.FragmentSeasonBinding +import org.askartv.phone.dialogs.ErrorDialogFragment +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.utils.checkIfLoginRequired +import org.askartv.phone.viewmodels.SeasonEvent +import org.askartv.phone.viewmodels.SeasonViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/ServerAddressesFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/ServerAddressesFragment.kt similarity index 88% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/ServerAddressesFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/ServerAddressesFragment.kt index 02b19b1a..f11b45ad 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/ServerAddressesFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/ServerAddressesFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.view.LayoutInflater @@ -12,12 +12,12 @@ import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.adapters.ServerAddressAdapter -import dev.jdtech.jellyfin.databinding.FragmentServerAddressesBinding -import dev.jdtech.jellyfin.dialogs.AddServerAddressDialog -import dev.jdtech.jellyfin.dialogs.DeleteServerAddressDialog -import dev.jdtech.jellyfin.viewmodels.ServerAddressesEvent -import dev.jdtech.jellyfin.viewmodels.ServerAddressesViewModel +import org.askartv.phone.adapters.ServerAddressAdapter +import org.askartv.phone.databinding.FragmentServerAddressesBinding +import org.askartv.phone.dialogs.AddServerAddressDialog +import org.askartv.phone.dialogs.DeleteServerAddressDialog +import org.askartv.phone.viewmodels.ServerAddressesEvent +import org.askartv.phone.viewmodels.ServerAddressesViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/ServerSelectFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/ServerSelectFragment.kt similarity index 90% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/ServerSelectFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/ServerSelectFragment.kt index a9a7fc07..f60834d6 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/ServerSelectFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/ServerSelectFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.view.LayoutInflater @@ -11,11 +11,11 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.adapters.ServerGridAdapter -import dev.jdtech.jellyfin.databinding.FragmentServerSelectBinding -import dev.jdtech.jellyfin.dialogs.DeleteServerDialogFragment -import dev.jdtech.jellyfin.viewmodels.ServerSelectEvent -import dev.jdtech.jellyfin.viewmodels.ServerSelectViewModel +import org.askartv.phone.adapters.ServerGridAdapter +import org.askartv.phone.databinding.FragmentServerSelectBinding +import org.askartv.phone.dialogs.DeleteServerDialogFragment +import org.askartv.phone.viewmodels.ServerSelectEvent +import org.askartv.phone.viewmodels.ServerSelectViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsAppearanceFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsAppearanceFragment.kt similarity index 93% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsAppearanceFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/SettingsAppearanceFragment.kt index 75c28a60..cf22964c 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsAppearanceFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsAppearanceFragment.kt @@ -1,11 +1,11 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import androidx.appcompat.app.AppCompatDelegate import androidx.preference.ListPreference import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreferenceCompat -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR class SettingsAppearanceFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsCacheFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsCacheFragment.kt similarity index 87% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsCacheFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/SettingsCacheFragment.kt index 5158ea80..745b1f88 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsCacheFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsCacheFragment.kt @@ -1,10 +1,10 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.text.InputType import androidx.preference.EditTextPreference import androidx.preference.PreferenceFragmentCompat -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR class SettingsCacheFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsDeviceFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsDeviceFragment.kt similarity index 83% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsDeviceFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/SettingsDeviceFragment.kt index 20a18dc9..9382596d 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsDeviceFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsDeviceFragment.kt @@ -1,12 +1,12 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import androidx.fragment.app.viewModels import androidx.preference.EditTextPreference import androidx.preference.PreferenceFragmentCompat import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.viewmodels.SettingsDeviceViewModel -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.viewmodels.SettingsDeviceViewModel +import org.askartv.phone.core.R as CoreR @AndroidEntryPoint class SettingsDeviceFragment : PreferenceFragmentCompat() { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsDownloadsFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsDownloadsFragment.kt similarity index 79% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsDownloadsFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/SettingsDownloadsFragment.kt index 94c8a977..7232cc09 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsDownloadsFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsDownloadsFragment.kt @@ -1,8 +1,8 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import androidx.preference.PreferenceFragmentCompat -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR class SettingsDownloadsFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsFragment.kt similarity index 92% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/SettingsFragment.kt index 9e334ae7..af4866a1 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.content.Intent import android.net.Uri @@ -7,10 +7,10 @@ import androidx.navigation.fragment.findNavController import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.utils.restart +import org.askartv.phone.AppPreferences +import org.askartv.phone.utils.restart import javax.inject.Inject -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @AndroidEntryPoint class SettingsFragment : PreferenceFragmentCompat() { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsLanguageFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsLanguageFragment.kt similarity index 92% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsLanguageFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/SettingsLanguageFragment.kt index 5ac5408b..a45f8322 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsLanguageFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsLanguageFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.content.Intent import android.net.Uri @@ -7,7 +7,7 @@ import android.os.Bundle import android.provider.Settings import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR class SettingsLanguageFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsNetworkFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsNetworkFragment.kt similarity index 83% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsNetworkFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/SettingsNetworkFragment.kt index abf91682..42529919 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsNetworkFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsNetworkFragment.kt @@ -1,11 +1,11 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.text.InputType import androidx.preference.EditTextPreference import androidx.preference.PreferenceFragmentCompat -import dev.jdtech.jellyfin.Constants -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.Constants +import org.askartv.phone.core.R as CoreR class SettingsNetworkFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsPlayerFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsPlayerFragment.kt similarity index 92% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsPlayerFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/SettingsPlayerFragment.kt index 4580452b..8402a54e 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/SettingsPlayerFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/SettingsPlayerFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.content.Intent import android.os.Bundle @@ -7,7 +7,7 @@ import android.text.InputType import androidx.preference.EditTextPreference import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR class SettingsPlayerFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/ShowFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/ShowFragment.kt similarity index 92% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/ShowFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/ShowFragment.kt index 242f4c60..e60aa768 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/ShowFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/ShowFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.content.Intent import android.net.Uri @@ -18,29 +18,29 @@ import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import com.google.android.material.R import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.adapters.PersonListAdapter -import dev.jdtech.jellyfin.adapters.ViewItemListAdapter -import dev.jdtech.jellyfin.bindCardItemImage -import dev.jdtech.jellyfin.bindItemBackdropImage -import dev.jdtech.jellyfin.databinding.FragmentShowBinding -import dev.jdtech.jellyfin.dialogs.ErrorDialogFragment -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidSeason -import dev.jdtech.jellyfin.models.FindroidSourceType -import dev.jdtech.jellyfin.models.PlayerItem -import dev.jdtech.jellyfin.models.isDownloaded -import dev.jdtech.jellyfin.utils.checkIfLoginRequired -import dev.jdtech.jellyfin.utils.setIconTintColorAttribute -import dev.jdtech.jellyfin.viewmodels.PlayerItemsEvent -import dev.jdtech.jellyfin.viewmodels.PlayerViewModel -import dev.jdtech.jellyfin.viewmodels.ShowEvent -import dev.jdtech.jellyfin.viewmodels.ShowViewModel +import org.askartv.phone.AppPreferences +import org.askartv.phone.adapters.PersonListAdapter +import org.askartv.phone.adapters.ViewItemListAdapter +import org.askartv.phone.bindCardItemImage +import org.askartv.phone.bindItemBackdropImage +import org.askartv.phone.databinding.FragmentShowBinding +import org.askartv.phone.dialogs.ErrorDialogFragment +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidSeason +import org.askartv.phone.models.FindroidSourceType +import org.askartv.phone.models.PlayerItem +import org.askartv.phone.models.isDownloaded +import org.askartv.phone.utils.checkIfLoginRequired +import org.askartv.phone.utils.setIconTintColorAttribute +import org.askartv.phone.viewmodels.PlayerItemsEvent +import org.askartv.phone.viewmodels.PlayerViewModel +import org.askartv.phone.viewmodels.ShowEvent +import org.askartv.phone.viewmodels.ShowViewModel import kotlinx.coroutines.launch import timber.log.Timber import java.util.UUID import javax.inject.Inject -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @AndroidEntryPoint class ShowFragment : Fragment() { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/TwoPaneSettingsFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/TwoPaneSettingsFragment.kt similarity index 88% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/TwoPaneSettingsFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/TwoPaneSettingsFragment.kt index ec5fef40..c949f242 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/TwoPaneSettingsFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/TwoPaneSettingsFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceHeaderFragmentCompat diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/UsersFragment.kt b/app/phone/src/main/java/org/askartv/phone/fragments/UsersFragment.kt similarity index 89% rename from app/phone/src/main/java/dev/jdtech/jellyfin/fragments/UsersFragment.kt rename to app/phone/src/main/java/org/askartv/phone/fragments/UsersFragment.kt index 52fa5773..2fe21404 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/UsersFragment.kt +++ b/app/phone/src/main/java/org/askartv/phone/fragments/UsersFragment.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.fragments +package org.askartv.phone.fragments import android.os.Bundle import android.view.LayoutInflater @@ -12,12 +12,12 @@ import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.AppNavigationDirections -import dev.jdtech.jellyfin.adapters.UserListAdapter -import dev.jdtech.jellyfin.databinding.FragmentUsersBinding -import dev.jdtech.jellyfin.dialogs.DeleteUserDialogFragment -import dev.jdtech.jellyfin.viewmodels.UsersEvent -import dev.jdtech.jellyfin.viewmodels.UsersViewModel +import org.askartv.phone.AppNavigationDirections +import org.askartv.phone.adapters.UserListAdapter +import org.askartv.phone.databinding.FragmentUsersBinding +import org.askartv.phone.dialogs.DeleteUserDialogFragment +import org.askartv.phone.viewmodels.UsersEvent +import org.askartv.phone.viewmodels.UsersViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/Extensions.kt b/app/phone/src/main/java/org/askartv/phone/utils/Extensions.kt similarity index 82% rename from app/phone/src/main/java/dev/jdtech/jellyfin/utils/Extensions.kt rename to app/phone/src/main/java/org/askartv/phone/utils/Extensions.kt index 63d08994..a09b98a3 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/Extensions.kt +++ b/app/phone/src/main/java/org/askartv/phone/utils/Extensions.kt @@ -1,8 +1,8 @@ -package dev.jdtech.jellyfin.utils +package org.askartv.phone.utils import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController -import dev.jdtech.jellyfin.AppNavigationDirections +import org.askartv.phone.AppNavigationDirections import timber.log.Timber fun Fragment.checkIfLoginRequired(error: String?) { diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt b/app/phone/src/main/java/org/askartv/phone/utils/PlayerGestureHelper.kt similarity index 98% rename from app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt rename to app/phone/src/main/java/org/askartv/phone/utils/PlayerGestureHelper.kt index c3a39513..44c0d8d7 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt +++ b/app/phone/src/main/java/org/askartv/phone/utils/PlayerGestureHelper.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.utils +package org.askartv.phone.utils import android.annotation.SuppressLint import android.content.res.Resources @@ -19,12 +19,12 @@ import android.view.animation.DecelerateInterpolator import android.widget.ImageView import androidx.media3.ui.AspectRatioFrameLayout import androidx.media3.ui.PlayerView -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.Constants -import dev.jdtech.jellyfin.PlayerActivity -import dev.jdtech.jellyfin.isControlsLocked -import dev.jdtech.jellyfin.models.PlayerChapter -import dev.jdtech.jellyfin.mpv.MPVPlayer +import org.askartv.phone.AppPreferences +import org.askartv.phone.Constants +import org.askartv.phone.PlayerActivity +import org.askartv.phone.isControlsLocked +import org.askartv.phone.models.PlayerChapter +import org.askartv.phone.mpv.MPVPlayer import timber.log.Timber import kotlin.math.abs diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PreviewScrubListener.kt b/app/phone/src/main/java/org/askartv/phone/utils/PreviewScrubListener.kt similarity index 96% rename from app/phone/src/main/java/dev/jdtech/jellyfin/utils/PreviewScrubListener.kt rename to app/phone/src/main/java/org/askartv/phone/utils/PreviewScrubListener.kt index 153f528b..2c784e0f 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PreviewScrubListener.kt +++ b/app/phone/src/main/java/org/askartv/phone/utils/PreviewScrubListener.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.utils +package org.askartv.phone.utils import android.graphics.Bitmap import android.view.View @@ -8,7 +8,7 @@ import androidx.media3.common.Player import androidx.media3.ui.TimeBar import coil.load import coil.transform.RoundedCornersTransformation -import dev.jdtech.jellyfin.models.Trickplay +import org.askartv.phone.models.Trickplay import kotlinx.coroutines.Dispatchers import timber.log.Timber diff --git a/app/phone/src/main/res/navigation/app_navigation.xml b/app/phone/src/main/res/navigation/app_navigation.xml index 6051dec7..e4cc1839 100644 --- a/app/phone/src/main/res/navigation/app_navigation.xml +++ b/app/phone/src/main/res/navigation/app_navigation.xml @@ -7,7 +7,7 @@ + android:name="org.askartv.phone.fragments.SettingsFragment" /> + app:argType="org.askartv.phone.models.CollectionType" /> @@ -342,12 +342,12 @@ + app:argType="org.askartv.phone.models.PlayerItem[]" /> @@ -357,7 +357,7 @@ , diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/AddServerScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/AddServerScreen.kt index acdacdce..b5fbc13d 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/AddServerScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/AddServerScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -38,13 +38,13 @@ import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator -import dev.jdtech.jellyfin.destinations.LoginScreenDestination -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.utils.ObserveAsEvents -import dev.jdtech.jellyfin.viewmodels.AddServerEvent -import dev.jdtech.jellyfin.viewmodels.AddServerViewModel -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.destinations.LoginScreenDestination +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.utils.ObserveAsEvents +import org.askartv.phone.viewmodels.AddServerEvent +import org.askartv.phone.viewmodels.AddServerViewModel +import org.askartv.phone.core.R as CoreR @Destination @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/HomeScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/HomeScreen.kt index 4515a414..8ed596e0 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/HomeScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/HomeScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues @@ -26,24 +26,24 @@ import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator -import dev.jdtech.jellyfin.destinations.MovieScreenDestination -import dev.jdtech.jellyfin.destinations.PlayerActivityDestination -import dev.jdtech.jellyfin.destinations.ShowScreenDestination -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.models.HomeItem -import dev.jdtech.jellyfin.ui.components.Direction -import dev.jdtech.jellyfin.ui.components.ItemCard -import dev.jdtech.jellyfin.ui.dummy.dummyHomeItems -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.utils.ObserveAsEvents -import dev.jdtech.jellyfin.viewmodels.HomeViewModel -import dev.jdtech.jellyfin.viewmodels.PlayerItemsEvent -import dev.jdtech.jellyfin.viewmodels.PlayerViewModel -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.destinations.MovieScreenDestination +import org.askartv.phone.destinations.PlayerActivityDestination +import org.askartv.phone.destinations.ShowScreenDestination +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.models.HomeItem +import org.askartv.phone.ui.components.Direction +import org.askartv.phone.ui.components.ItemCard +import org.askartv.phone.ui.dummy.dummyHomeItems +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.utils.ObserveAsEvents +import org.askartv.phone.viewmodels.HomeViewModel +import org.askartv.phone.viewmodels.PlayerItemsEvent +import org.askartv.phone.viewmodels.PlayerViewModel +import org.askartv.phone.core.R as CoreR @Destination @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt index 07e042fc..e85b0b2b 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibrariesScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues @@ -20,15 +20,15 @@ import androidx.tv.foundation.lazy.grid.items import androidx.tv.material3.MaterialTheme import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator -import dev.jdtech.jellyfin.destinations.LibraryScreenDestination -import dev.jdtech.jellyfin.models.CollectionType -import dev.jdtech.jellyfin.models.FindroidCollection -import dev.jdtech.jellyfin.ui.components.Direction -import dev.jdtech.jellyfin.ui.components.ItemCard -import dev.jdtech.jellyfin.ui.dummy.dummyCollections -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.viewmodels.MediaViewModel +import org.askartv.phone.destinations.LibraryScreenDestination +import org.askartv.phone.models.CollectionType +import org.askartv.phone.models.FindroidCollection +import org.askartv.phone.ui.components.Direction +import org.askartv.phone.ui.components.ItemCard +import org.askartv.phone.ui.dummy.dummyCollections +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.viewmodels.MediaViewModel import java.util.UUID @Destination diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt index 6b18565f..9f36b530 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LibraryScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues @@ -22,20 +22,20 @@ import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator -import dev.jdtech.jellyfin.destinations.LibraryScreenDestination -import dev.jdtech.jellyfin.destinations.MovieScreenDestination -import dev.jdtech.jellyfin.destinations.ShowScreenDestination -import dev.jdtech.jellyfin.models.CollectionType -import dev.jdtech.jellyfin.models.FindroidFolder -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.ui.components.Direction -import dev.jdtech.jellyfin.ui.components.ItemCard -import dev.jdtech.jellyfin.ui.dummy.dummyMovies -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.viewmodels.LibraryViewModel +import org.askartv.phone.destinations.LibraryScreenDestination +import org.askartv.phone.destinations.MovieScreenDestination +import org.askartv.phone.destinations.ShowScreenDestination +import org.askartv.phone.models.CollectionType +import org.askartv.phone.models.FindroidFolder +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.ui.components.Direction +import org.askartv.phone.ui.components.ItemCard +import org.askartv.phone.ui.dummy.dummyMovies +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.viewmodels.LibraryViewModel import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf import java.util.UUID diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LoginScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LoginScreen.kt index 6cbc210c..89acaaa6 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LoginScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/LoginScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -41,15 +41,15 @@ import androidx.tv.material3.Text import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator import com.ramcosta.composedestinations.navigation.popUpTo -import dev.jdtech.jellyfin.NavGraphs -import dev.jdtech.jellyfin.destinations.MainScreenDestination -import dev.jdtech.jellyfin.models.UiText -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.utils.ObserveAsEvents -import dev.jdtech.jellyfin.viewmodels.LoginEvent -import dev.jdtech.jellyfin.viewmodels.LoginViewModel -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.NavGraphs +import org.askartv.phone.destinations.MainScreenDestination +import org.askartv.phone.models.UiText +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.utils.ObserveAsEvents +import org.askartv.phone.viewmodels.LoginEvent +import org.askartv.phone.viewmodels.LoginViewModel +import org.askartv.phone.core.R as CoreR @Destination @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt index 3debc4d8..e4238cd2 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MainScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import androidx.annotation.DrawableRes import androidx.annotation.StringRes @@ -40,17 +40,17 @@ import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.navigation.DestinationsNavigator import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator -import dev.jdtech.jellyfin.destinations.SettingsScreenDestination -import dev.jdtech.jellyfin.models.User -import dev.jdtech.jellyfin.ui.components.LoadingIndicator -import dev.jdtech.jellyfin.ui.components.PillBorderIndicator -import dev.jdtech.jellyfin.ui.components.ProfileButton -import dev.jdtech.jellyfin.ui.dummy.dummyServer -import dev.jdtech.jellyfin.ui.dummy.dummyUser -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.viewmodels.MainViewModel -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.destinations.SettingsScreenDestination +import org.askartv.phone.models.User +import org.askartv.phone.ui.components.LoadingIndicator +import org.askartv.phone.ui.components.PillBorderIndicator +import org.askartv.phone.ui.components.ProfileButton +import org.askartv.phone.ui.dummy.dummyServer +import org.askartv.phone.ui.dummy.dummyUser +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.viewmodels.MainViewModel +import org.askartv.phone.core.R as CoreR @RootNavGraph(start = true) @Destination diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt index a0f05924..074635ee 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/MovieScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import android.content.Intent import android.net.Uri @@ -46,24 +46,24 @@ import androidx.tv.material3.Text import coil.compose.AsyncImage import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator -import dev.jdtech.jellyfin.destinations.PlayerActivityDestination -import dev.jdtech.jellyfin.models.AudioChannel -import dev.jdtech.jellyfin.models.AudioCodec -import dev.jdtech.jellyfin.models.DisplayProfile -import dev.jdtech.jellyfin.models.Resolution -import dev.jdtech.jellyfin.models.VideoMetadata -import dev.jdtech.jellyfin.ui.dummy.dummyMovie -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.Yellow -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.utils.ObserveAsEvents -import dev.jdtech.jellyfin.viewmodels.MovieViewModel -import dev.jdtech.jellyfin.viewmodels.PlayerItemsEvent -import dev.jdtech.jellyfin.viewmodels.PlayerViewModel +import org.askartv.phone.destinations.PlayerActivityDestination +import org.askartv.phone.models.AudioChannel +import org.askartv.phone.models.AudioCodec +import org.askartv.phone.models.DisplayProfile +import org.askartv.phone.models.Resolution +import org.askartv.phone.models.VideoMetadata +import org.askartv.phone.ui.dummy.dummyMovie +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.Yellow +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.utils.ObserveAsEvents +import org.askartv.phone.viewmodels.MovieViewModel +import org.askartv.phone.viewmodels.PlayerItemsEvent +import org.askartv.phone.viewmodels.PlayerViewModel import org.jellyfin.sdk.model.api.BaseItemPerson import org.jellyfin.sdk.model.api.PersonKind import java.util.UUID -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @Destination @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/PlayerScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/PlayerScreen.kt index 92cb0aae..efa7ce43 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/PlayerScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/PlayerScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import androidx.compose.foundation.focusable import androidx.compose.foundation.layout.Arrangement @@ -35,21 +35,21 @@ import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator import com.ramcosta.composedestinations.result.NavResult import com.ramcosta.composedestinations.result.ResultRecipient -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.destinations.VideoPlayerTrackSelectorDialogDestination -import dev.jdtech.jellyfin.models.PlayerItem -import dev.jdtech.jellyfin.models.Track -import dev.jdtech.jellyfin.ui.components.player.VideoPlayerControlsLayout -import dev.jdtech.jellyfin.ui.components.player.VideoPlayerMediaButton -import dev.jdtech.jellyfin.ui.components.player.VideoPlayerMediaTitle -import dev.jdtech.jellyfin.ui.components.player.VideoPlayerOverlay -import dev.jdtech.jellyfin.ui.components.player.VideoPlayerSeeker -import dev.jdtech.jellyfin.ui.components.player.VideoPlayerState -import dev.jdtech.jellyfin.ui.components.player.rememberVideoPlayerState -import dev.jdtech.jellyfin.ui.dialogs.VideoPlayerTrackSelectorDialogResult -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.utils.handleDPadKeyEvents -import dev.jdtech.jellyfin.viewmodels.PlayerActivityViewModel +import org.askartv.phone.core.R +import org.askartv.phone.destinations.VideoPlayerTrackSelectorDialogDestination +import org.askartv.phone.models.PlayerItem +import org.askartv.phone.models.Track +import org.askartv.phone.ui.components.player.VideoPlayerControlsLayout +import org.askartv.phone.ui.components.player.VideoPlayerMediaButton +import org.askartv.phone.ui.components.player.VideoPlayerMediaTitle +import org.askartv.phone.ui.components.player.VideoPlayerOverlay +import org.askartv.phone.ui.components.player.VideoPlayerSeeker +import org.askartv.phone.ui.components.player.VideoPlayerState +import org.askartv.phone.ui.components.player.rememberVideoPlayerState +import org.askartv.phone.ui.dialogs.VideoPlayerTrackSelectorDialogResult +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.utils.handleDPadKeyEvents +import org.askartv.phone.viewmodels.PlayerActivityViewModel import kotlinx.coroutines.delay import java.util.Locale import kotlin.time.Duration.Companion.milliseconds diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt index e54895e7..3efcadea 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SeasonScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -22,17 +22,17 @@ import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator -import dev.jdtech.jellyfin.destinations.PlayerActivityDestination -import dev.jdtech.jellyfin.models.EpisodeItem -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.ui.components.EpisodeCard -import dev.jdtech.jellyfin.ui.dummy.dummyEpisodeItems -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.utils.ObserveAsEvents -import dev.jdtech.jellyfin.viewmodels.PlayerItemsEvent -import dev.jdtech.jellyfin.viewmodels.PlayerViewModel -import dev.jdtech.jellyfin.viewmodels.SeasonViewModel +import org.askartv.phone.destinations.PlayerActivityDestination +import org.askartv.phone.models.EpisodeItem +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.ui.components.EpisodeCard +import org.askartv.phone.ui.dummy.dummyEpisodeItems +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.utils.ObserveAsEvents +import org.askartv.phone.viewmodels.PlayerItemsEvent +import org.askartv.phone.viewmodels.PlayerViewModel +import org.askartv.phone.viewmodels.SeasonViewModel import java.util.UUID @Destination diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ServerSelectScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ServerSelectScreen.kt index 4d3cc63c..cf6102c5 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ServerSelectScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ServerSelectScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Arrangement @@ -43,21 +43,21 @@ import androidx.tv.material3.Text import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator import com.ramcosta.composedestinations.navigation.popUpTo -import dev.jdtech.jellyfin.NavGraphs -import dev.jdtech.jellyfin.destinations.AddServerScreenDestination -import dev.jdtech.jellyfin.destinations.MainScreenDestination -import dev.jdtech.jellyfin.destinations.UserSelectScreenDestination -import dev.jdtech.jellyfin.models.DiscoveredServer -import dev.jdtech.jellyfin.models.Server -import dev.jdtech.jellyfin.ui.dummy.dummyDiscoveredServer -import dev.jdtech.jellyfin.ui.dummy.dummyDiscoveredServers -import dev.jdtech.jellyfin.ui.dummy.dummyServers -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.utils.ObserveAsEvents -import dev.jdtech.jellyfin.viewmodels.ServerSelectEvent -import dev.jdtech.jellyfin.viewmodels.ServerSelectViewModel -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.NavGraphs +import org.askartv.phone.destinations.AddServerScreenDestination +import org.askartv.phone.destinations.MainScreenDestination +import org.askartv.phone.destinations.UserSelectScreenDestination +import org.askartv.phone.models.DiscoveredServer +import org.askartv.phone.models.Server +import org.askartv.phone.ui.dummy.dummyDiscoveredServer +import org.askartv.phone.ui.dummy.dummyDiscoveredServers +import org.askartv.phone.ui.dummy.dummyServers +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.utils.ObserveAsEvents +import org.askartv.phone.viewmodels.ServerSelectEvent +import org.askartv.phone.viewmodels.ServerSelectViewModel +import org.askartv.phone.core.R as CoreR @Destination @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsScreen.kt index 9e5866c0..c514cae0 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues @@ -23,22 +23,22 @@ import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator -import dev.jdtech.jellyfin.destinations.ServerSelectScreenDestination -import dev.jdtech.jellyfin.destinations.SettingsSubScreenDestination -import dev.jdtech.jellyfin.destinations.UserSelectScreenDestination -import dev.jdtech.jellyfin.models.Preference -import dev.jdtech.jellyfin.models.PreferenceCategory -import dev.jdtech.jellyfin.models.PreferenceSelect -import dev.jdtech.jellyfin.models.PreferenceSwitch -import dev.jdtech.jellyfin.ui.components.SettingsCategoryCard -import dev.jdtech.jellyfin.ui.components.SettingsSelectCard -import dev.jdtech.jellyfin.ui.components.SettingsSwitchCard -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.utils.ObserveAsEvents -import dev.jdtech.jellyfin.viewmodels.SettingsEvent -import dev.jdtech.jellyfin.viewmodels.SettingsViewModel -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.destinations.ServerSelectScreenDestination +import org.askartv.phone.destinations.SettingsSubScreenDestination +import org.askartv.phone.destinations.UserSelectScreenDestination +import org.askartv.phone.models.Preference +import org.askartv.phone.models.PreferenceCategory +import org.askartv.phone.models.PreferenceSelect +import org.askartv.phone.models.PreferenceSwitch +import org.askartv.phone.ui.components.SettingsCategoryCard +import org.askartv.phone.ui.components.SettingsSelectCard +import org.askartv.phone.ui.components.SettingsSwitchCard +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.utils.ObserveAsEvents +import org.askartv.phone.viewmodels.SettingsEvent +import org.askartv.phone.viewmodels.SettingsViewModel +import org.askartv.phone.core.R as CoreR @Destination @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsSubScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsSubScreen.kt index eec271ef..3e49adc7 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsSubScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/SettingsSubScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import androidx.annotation.StringRes import androidx.compose.foundation.layout.Arrangement @@ -29,24 +29,24 @@ import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator -import dev.jdtech.jellyfin.Constants -import dev.jdtech.jellyfin.destinations.ServerSelectScreenDestination -import dev.jdtech.jellyfin.destinations.SettingsScreenDestination -import dev.jdtech.jellyfin.destinations.UserSelectScreenDestination -import dev.jdtech.jellyfin.models.Preference -import dev.jdtech.jellyfin.models.PreferenceCategory -import dev.jdtech.jellyfin.models.PreferenceSelect -import dev.jdtech.jellyfin.models.PreferenceSwitch -import dev.jdtech.jellyfin.ui.components.SettingsCategoryCard -import dev.jdtech.jellyfin.ui.components.SettingsDetailsCard -import dev.jdtech.jellyfin.ui.components.SettingsSelectCard -import dev.jdtech.jellyfin.ui.components.SettingsSwitchCard -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.utils.ObserveAsEvents -import dev.jdtech.jellyfin.viewmodels.SettingsEvent -import dev.jdtech.jellyfin.viewmodels.SettingsViewModel -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.Constants +import org.askartv.phone.destinations.ServerSelectScreenDestination +import org.askartv.phone.destinations.SettingsScreenDestination +import org.askartv.phone.destinations.UserSelectScreenDestination +import org.askartv.phone.models.Preference +import org.askartv.phone.models.PreferenceCategory +import org.askartv.phone.models.PreferenceSelect +import org.askartv.phone.models.PreferenceSwitch +import org.askartv.phone.ui.components.SettingsCategoryCard +import org.askartv.phone.ui.components.SettingsDetailsCard +import org.askartv.phone.ui.components.SettingsSelectCard +import org.askartv.phone.ui.components.SettingsSwitchCard +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.utils.ObserveAsEvents +import org.askartv.phone.viewmodels.SettingsEvent +import org.askartv.phone.viewmodels.SettingsViewModel +import org.askartv.phone.core.R as CoreR @Destination @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt index 77fb1464..f0d78e18 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/ShowScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import android.content.Intent import android.net.Uri @@ -56,21 +56,21 @@ import androidx.tv.material3.Text import coil.compose.AsyncImage import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator -import dev.jdtech.jellyfin.destinations.PlayerActivityDestination -import dev.jdtech.jellyfin.destinations.SeasonScreenDestination -import dev.jdtech.jellyfin.models.FindroidSeason -import dev.jdtech.jellyfin.ui.components.Direction -import dev.jdtech.jellyfin.ui.components.ItemCard -import dev.jdtech.jellyfin.ui.dummy.dummyShow -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.Yellow -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.utils.ObserveAsEvents -import dev.jdtech.jellyfin.viewmodels.PlayerItemsEvent -import dev.jdtech.jellyfin.viewmodels.PlayerViewModel -import dev.jdtech.jellyfin.viewmodels.ShowViewModel +import org.askartv.phone.destinations.PlayerActivityDestination +import org.askartv.phone.destinations.SeasonScreenDestination +import org.askartv.phone.models.FindroidSeason +import org.askartv.phone.ui.components.Direction +import org.askartv.phone.ui.components.ItemCard +import org.askartv.phone.ui.dummy.dummyShow +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.Yellow +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.utils.ObserveAsEvents +import org.askartv.phone.viewmodels.PlayerItemsEvent +import org.askartv.phone.viewmodels.PlayerViewModel +import org.askartv.phone.viewmodels.ShowViewModel import java.util.UUID -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @Destination @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/UserSelectScreen.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/UserSelectScreen.kt index ed1b6e92..8f305e82 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/UserSelectScreen.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/UserSelectScreen.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui +package org.askartv.phone.ui import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Arrangement @@ -43,22 +43,22 @@ import coil.request.ImageRequest import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator import com.ramcosta.composedestinations.navigation.popUpTo -import dev.jdtech.jellyfin.NavGraphs -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.destinations.LoginScreenDestination -import dev.jdtech.jellyfin.destinations.MainScreenDestination -import dev.jdtech.jellyfin.models.Server -import dev.jdtech.jellyfin.models.User -import dev.jdtech.jellyfin.ui.dummy.dummyServer -import dev.jdtech.jellyfin.ui.dummy.dummyUser -import dev.jdtech.jellyfin.ui.dummy.dummyUsers -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.utils.ObserveAsEvents -import dev.jdtech.jellyfin.viewmodels.UserSelectEvent -import dev.jdtech.jellyfin.viewmodels.UserSelectViewModel +import org.askartv.phone.NavGraphs +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.destinations.LoginScreenDestination +import org.askartv.phone.destinations.MainScreenDestination +import org.askartv.phone.models.Server +import org.askartv.phone.models.User +import org.askartv.phone.ui.dummy.dummyServer +import org.askartv.phone.ui.dummy.dummyUser +import org.askartv.phone.ui.dummy.dummyUsers +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.utils.ObserveAsEvents +import org.askartv.phone.viewmodels.UserSelectEvent +import org.askartv.phone.viewmodels.UserSelectViewModel import org.jellyfin.sdk.model.api.ImageType -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @Destination @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt index 9e1b4569..4a760594 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/EpisodeCard.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components +package org.askartv.phone.ui.components import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Box @@ -26,10 +26,10 @@ import androidx.tv.material3.ClickableSurfaceScale import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Surface import androidx.tv.material3.Text -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.ui.dummy.dummyEpisode -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.ui.dummy.dummyEpisode +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings @Composable fun EpisodeCard( @@ -76,7 +76,7 @@ fun EpisodeCard( Column { Text( text = stringResource( - id = dev.jdtech.jellyfin.core.R.string.episode_name, + id = org.askartv.phone.core.R.string.episode_name, episode.indexNumber, episode.name, ), diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt index b8bb0fc3..dafcb34b 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemCard.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components +package org.askartv.phone.ui.components import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background @@ -24,13 +24,13 @@ import androidx.tv.material3.ClickableSurfaceScale import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Surface import androidx.tv.material3.Text -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.ui.dummy.dummyEpisode -import dev.jdtech.jellyfin.ui.dummy.dummyMovie -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings +import org.askartv.phone.core.R +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.ui.dummy.dummyEpisode +import org.askartv.phone.ui.dummy.dummyMovie +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings @Composable fun ItemCard( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemPoster.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemPoster.kt index 041f7c0f..37e187d6 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemPoster.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ItemPoster.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components +package org.askartv.phone.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.aspectRatio @@ -8,9 +8,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.layout.ContentScale import androidx.tv.material3.MaterialTheme import coil.compose.AsyncImage -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie enum class Direction { HORIZONTAL, VERTICAL diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/LoadingIndicator.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/LoadingIndicator.kt index 1932c17c..529628c9 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/LoadingIndicator.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/LoadingIndicator.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components +package org.askartv.phone.ui.components import androidx.compose.foundation.layout.size import androidx.compose.material3.CircularProgressIndicator diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/PillBorderIndicator.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/PillBorderIndicator.kt index 47489184..38849949 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/PillBorderIndicator.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/PillBorderIndicator.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components +package org.askartv.phone.ui.components import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.animateDpAsState diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt index fa82acf2..8767712a 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProfileButton.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components +package org.askartv.phone.ui.components import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.aspectRatio @@ -21,11 +21,11 @@ import androidx.tv.material3.Icon import androidx.tv.material3.Surface import coil.compose.AsyncImage import coil.request.ImageRequest -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.models.User -import dev.jdtech.jellyfin.ui.dummy.dummyUser -import dev.jdtech.jellyfin.ui.theme.FindroidTheme +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.core.R +import org.askartv.phone.models.User +import org.askartv.phone.ui.dummy.dummyUser +import org.askartv.phone.ui.theme.FindroidTheme import org.jellyfin.sdk.model.api.ImageType @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt index b62db7a8..fd738154 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/ProgressBadge.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components +package org.askartv.phone.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -17,12 +17,12 @@ import androidx.compose.ui.unit.dp import androidx.tv.material3.Icon import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.ui.dummy.dummyEpisode -import dev.jdtech.jellyfin.ui.dummy.dummyShow -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.ui.dummy.dummyEpisode +import org.askartv.phone.ui.dummy.dummyShow +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.core.R as CoreR @Composable fun ProgressBadge( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsCategoryCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsCategoryCard.kt index 322f5358..55ce48dd 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsCategoryCard.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsCategoryCard.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components +package org.askartv.phone.ui.components import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Column @@ -25,10 +25,10 @@ import androidx.tv.material3.Icon import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Surface import androidx.tv.material3.Text -import dev.jdtech.jellyfin.models.PreferenceCategory -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.models.PreferenceCategory +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.core.R as CoreR @Composable fun SettingsCategoryCard( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsDetailsSelectCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsDetailsSelectCard.kt index 74d2b9ba..52b64046 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsDetailsSelectCard.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsDetailsSelectCard.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components +package org.askartv.phone.ui.components import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Arrangement @@ -26,11 +26,11 @@ import androidx.tv.material3.MaterialTheme import androidx.tv.material3.RadioButton import androidx.tv.material3.Surface import androidx.tv.material3.Text -import dev.jdtech.jellyfin.Constants -import dev.jdtech.jellyfin.models.PreferenceSelect -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.Constants +import org.askartv.phone.models.PreferenceSelect +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.core.R as CoreR @Composable fun SettingsDetailsCard( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSelectCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSelectCard.kt index d858832c..f487fd2f 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSelectCard.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSelectCard.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components +package org.askartv.phone.ui.components import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Column @@ -25,11 +25,11 @@ import androidx.tv.material3.Icon import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Surface import androidx.tv.material3.Text -import dev.jdtech.jellyfin.Constants -import dev.jdtech.jellyfin.models.PreferenceSelect -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.Constants +import org.askartv.phone.models.PreferenceSelect +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings +import org.askartv.phone.core.R as CoreR @Composable fun SettingsSelectCard( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSwitchCard.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSwitchCard.kt index d0b84f69..bd022aaa 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSwitchCard.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/SettingsSwitchCard.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components +package org.askartv.phone.ui.components import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Arrangement @@ -26,10 +26,10 @@ import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Surface import androidx.tv.material3.Switch import androidx.tv.material3.Text -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.models.PreferenceSwitch -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings +import org.askartv.phone.core.R +import org.askartv.phone.models.PreferenceSwitch +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings @Composable fun SettingsSwitchCard( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerControls.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerControls.kt index 61d0010c..51331b33 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerControls.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerControls.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components.player +package org.askartv.phone.ui.components.player import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -16,8 +16,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.tv.material3.MaterialTheme -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings @Composable fun VideoPlayerControlsLayout( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaButton.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaButton.kt index 54e15b22..f97786d2 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaButton.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaButton.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components.player +package org.askartv.phone.ui.components.player import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsFocusedAsState diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaTitle.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaTitle.kt index 4b55f2bd..a54b35fa 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaTitle.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerMediaTitle.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components.player +package org.askartv.phone.ui.components.player import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable @@ -6,7 +6,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text -import dev.jdtech.jellyfin.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.FindroidTheme @Composable fun VideoPlayerMediaTitle( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerOverlay.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerOverlay.kt index f0738e0d..3c2b2725 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerOverlay.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerOverlay.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components.player +package org.askartv.phone.ui.components.player import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn @@ -22,8 +22,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.tv.material3.MaterialTheme -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings @Composable fun VideoPlayerOverlay( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeekBar.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeekBar.kt index 43a79ab3..d46fb617 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeekBar.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeekBar.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components.player +package org.askartv.phone.ui.components.player import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.Canvas @@ -26,8 +26,8 @@ import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.tv.material3.MaterialTheme -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.utils.handleDPadKeyEvents +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.utils.handleDPadKeyEvents @OptIn(ExperimentalComposeUiApi::class) @Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeeker.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeeker.kt index 4700403b..45a8c2f2 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeeker.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerSeeker.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components.player +package org.askartv.phone.ui.components.player import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -19,10 +19,10 @@ import androidx.tv.material3.Icon import androidx.tv.material3.IconButton import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings import kotlin.time.Duration -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR @Composable fun VideoPlayerSeeker( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerState.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerState.kt index 332cb452..d05151ba 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerState.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/components/player/VideoPlayerState.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.components.player +package org.askartv.phone.ui.components.player import androidx.annotation.IntRange import androidx.compose.runtime.Composable diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dialogs/BaseDialogStyle.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dialogs/BaseDialogStyle.kt index 6c5f52fe..7cacba0c 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dialogs/BaseDialogStyle.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dialogs/BaseDialogStyle.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.dialogs +package org.askartv.phone.ui.dialogs import androidx.compose.ui.window.DialogProperties import com.ramcosta.composedestinations.spec.DestinationStyle diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dialogs/VideoPlayerTrackSelectorDialog.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dialogs/VideoPlayerTrackSelectorDialog.kt index 94176948..f774b678 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dialogs/VideoPlayerTrackSelectorDialog.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dialogs/VideoPlayerTrackSelectorDialog.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.dialogs +package org.askartv.phone.ui.dialogs import android.os.Parcelable import androidx.compose.foundation.BorderStroke @@ -31,12 +31,12 @@ import androidx.tv.material3.Text import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.result.EmptyResultBackNavigator import com.ramcosta.composedestinations.result.ResultBackNavigator -import dev.jdtech.jellyfin.models.Track -import dev.jdtech.jellyfin.ui.theme.FindroidTheme -import dev.jdtech.jellyfin.ui.theme.spacings +import org.askartv.phone.models.Track +import org.askartv.phone.ui.theme.FindroidTheme +import org.askartv.phone.ui.theme.spacings import kotlinx.parcelize.Parcelize -import dev.jdtech.jellyfin.core.R as CoreR -import dev.jdtech.jellyfin.player.video.R as PlayerVideoR +import org.askartv.phone.core.R as CoreR +import org.askartv.phone.player.video.R as PlayerVideoR @Parcelize data class VideoPlayerTrackSelectorDialogResult( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Collections.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Collections.kt index fb7c3f35..311b86ea 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Collections.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Collections.kt @@ -1,8 +1,8 @@ -package dev.jdtech.jellyfin.ui.dummy +package org.askartv.phone.ui.dummy -import dev.jdtech.jellyfin.models.CollectionType -import dev.jdtech.jellyfin.models.FindroidCollection -import dev.jdtech.jellyfin.models.FindroidImages +import org.askartv.phone.models.CollectionType +import org.askartv.phone.models.FindroidCollection +import org.askartv.phone.models.FindroidImages import java.util.UUID private val dummyMoviesCollection = FindroidCollection( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Episodes.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Episodes.kt index cd35d0a1..fd234642 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Episodes.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Episodes.kt @@ -1,11 +1,11 @@ -package dev.jdtech.jellyfin.ui.dummy +package org.askartv.phone.ui.dummy -import dev.jdtech.jellyfin.models.EpisodeItem -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidImages -import dev.jdtech.jellyfin.models.FindroidMediaStream -import dev.jdtech.jellyfin.models.FindroidSource -import dev.jdtech.jellyfin.models.FindroidSourceType +import org.askartv.phone.models.EpisodeItem +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidImages +import org.askartv.phone.models.FindroidMediaStream +import org.askartv.phone.models.FindroidSource +import org.askartv.phone.models.FindroidSourceType import org.jellyfin.sdk.model.api.MediaStreamType import java.time.LocalDateTime import java.util.UUID diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/HomeItems.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/HomeItems.kt index 9a335d4f..4d990254 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/HomeItems.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/HomeItems.kt @@ -1,10 +1,10 @@ -package dev.jdtech.jellyfin.ui.dummy +package org.askartv.phone.ui.dummy -import dev.jdtech.jellyfin.models.CollectionType -import dev.jdtech.jellyfin.models.HomeItem -import dev.jdtech.jellyfin.models.HomeSection -import dev.jdtech.jellyfin.models.UiText -import dev.jdtech.jellyfin.models.View +import org.askartv.phone.models.CollectionType +import org.askartv.phone.models.HomeItem +import org.askartv.phone.models.HomeSection +import org.askartv.phone.models.UiText +import org.askartv.phone.models.View import java.util.UUID val dummyHomeItems = listOf( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Movies.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Movies.kt index 4817b95b..0c2c786e 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Movies.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Movies.kt @@ -1,10 +1,10 @@ -package dev.jdtech.jellyfin.ui.dummy +package org.askartv.phone.ui.dummy -import dev.jdtech.jellyfin.models.FindroidImages -import dev.jdtech.jellyfin.models.FindroidMediaStream -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidSource -import dev.jdtech.jellyfin.models.FindroidSourceType +import org.askartv.phone.models.FindroidImages +import org.askartv.phone.models.FindroidMediaStream +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidSource +import org.askartv.phone.models.FindroidSourceType import org.jellyfin.sdk.model.api.MediaStreamType import java.time.LocalDateTime import java.util.UUID diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Servers.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Servers.kt index 2c8995b2..27186fb7 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Servers.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Servers.kt @@ -1,7 +1,7 @@ -package dev.jdtech.jellyfin.ui.dummy +package org.askartv.phone.ui.dummy -import dev.jdtech.jellyfin.models.DiscoveredServer -import dev.jdtech.jellyfin.models.Server +import org.askartv.phone.models.DiscoveredServer +import org.askartv.phone.models.Server import java.util.UUID val dummyDiscoveredServer = DiscoveredServer( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Show.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Show.kt index 00cfb073..b616be2d 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Show.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Show.kt @@ -1,7 +1,7 @@ -package dev.jdtech.jellyfin.ui.dummy +package org.askartv.phone.ui.dummy -import dev.jdtech.jellyfin.models.FindroidImages -import dev.jdtech.jellyfin.models.FindroidShow +import org.askartv.phone.models.FindroidImages +import org.askartv.phone.models.FindroidShow import java.time.LocalDateTime import java.util.UUID diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Users.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Users.kt index 868d0d57..6b5df969 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Users.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/dummy/Users.kt @@ -1,6 +1,6 @@ -package dev.jdtech.jellyfin.ui.dummy +package org.askartv.phone.ui.dummy -import dev.jdtech.jellyfin.models.User +import org.askartv.phone.models.User import java.util.UUID val dummyUser = User( diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Color.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Color.kt index 42520774..d5b1388b 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Color.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.theme +package org.askartv.phone.ui.theme import androidx.compose.material3.darkColorScheme import androidx.compose.ui.graphics.Color diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Shape.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Shape.kt index 487d3c18..bf720ec9 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Shape.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Shape.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.theme +package org.askartv.phone.ui.theme import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Shapes diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Spacing.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Spacing.kt index 884971f8..5d46ba69 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Spacing.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Spacing.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.theme +package org.askartv.phone.ui.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.compositionLocalOf diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Theme.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Theme.kt index 62ee40e1..2ed29127 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Theme.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.theme +package org.askartv.phone.ui.theme import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Type.kt b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Type.kt index acc53b68..a8d71b0e 100644 --- a/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Type.kt +++ b/app/tv/src/main/java/dev/jdtech/jellyfin/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.ui.theme +package org.askartv.phone.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 76bfe312..9ca3b848 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } android { - namespace = "dev.jdtech.jellyfin.core" + namespace = "org.askartv.phone.core" compileSdk = Versions.compileSdk buildToolsVersion = Versions.buildTools diff --git a/core/src/debug/res/values/strings.xml b/core/src/debug/res/values/strings.xml index 0d90aa9c..58b2b96e 100644 --- a/core/src/debug/res/values/strings.xml +++ b/core/src/debug/res/values/strings.xml @@ -1,4 +1,4 @@ - Findroid Debug + Alaskarfin Debug \ No newline at end of file diff --git a/core/src/main/java/dev/jdtech/jellyfin/di/ApiModule.kt b/core/src/main/java/org/askartv/phone/di/ApiModule.kt similarity index 88% rename from core/src/main/java/dev/jdtech/jellyfin/di/ApiModule.kt rename to core/src/main/java/org/askartv/phone/di/ApiModule.kt index 482b910b..6fe79f8c 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/di/ApiModule.kt +++ b/core/src/main/java/org/askartv/phone/di/ApiModule.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.di +package org.askartv.phone.di import android.content.Context import dagger.Module @@ -6,9 +6,9 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.database.ServerDatabaseDao +import org.askartv.phone.AppPreferences +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.database.ServerDatabaseDao import javax.inject.Singleton @Module diff --git a/core/src/main/java/dev/jdtech/jellyfin/di/AppPreferencesModule.kt b/core/src/main/java/org/askartv/phone/di/AppPreferencesModule.kt similarity index 84% rename from core/src/main/java/dev/jdtech/jellyfin/di/AppPreferencesModule.kt rename to core/src/main/java/org/askartv/phone/di/AppPreferencesModule.kt index 16db7eac..7585de99 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/di/AppPreferencesModule.kt +++ b/core/src/main/java/org/askartv/phone/di/AppPreferencesModule.kt @@ -1,11 +1,11 @@ -package dev.jdtech.jellyfin.di +package org.askartv.phone.di import android.content.SharedPreferences import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import dev.jdtech.jellyfin.AppPreferences +import org.askartv.phone.AppPreferences import javax.inject.Singleton @Module diff --git a/core/src/main/java/dev/jdtech/jellyfin/di/DatabaseModule.kt b/core/src/main/java/org/askartv/phone/di/DatabaseModule.kt similarity index 84% rename from core/src/main/java/dev/jdtech/jellyfin/di/DatabaseModule.kt rename to core/src/main/java/org/askartv/phone/di/DatabaseModule.kt index 6e811696..2d7063ea 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/di/DatabaseModule.kt +++ b/core/src/main/java/org/askartv/phone/di/DatabaseModule.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.di +package org.askartv.phone.di import android.content.Context import androidx.room.Room @@ -7,8 +7,8 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import dev.jdtech.jellyfin.database.ServerDatabase -import dev.jdtech.jellyfin.database.ServerDatabaseDao +import org.askartv.phone.database.ServerDatabase +import org.askartv.phone.database.ServerDatabaseDao import javax.inject.Singleton @Module diff --git a/core/src/main/java/dev/jdtech/jellyfin/di/DownloaderModule.kt b/core/src/main/java/org/askartv/phone/di/DownloaderModule.kt similarity index 68% rename from core/src/main/java/dev/jdtech/jellyfin/di/DownloaderModule.kt rename to core/src/main/java/org/askartv/phone/di/DownloaderModule.kt index 326860e2..dd8b4c52 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/di/DownloaderModule.kt +++ b/core/src/main/java/org/askartv/phone/di/DownloaderModule.kt @@ -1,15 +1,15 @@ -package dev.jdtech.jellyfin.di +package org.askartv.phone.di import android.app.Application import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.repository.JellyfinRepository -import dev.jdtech.jellyfin.utils.Downloader -import dev.jdtech.jellyfin.utils.DownloaderImpl +import org.askartv.phone.AppPreferences +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.repository.JellyfinRepository +import org.askartv.phone.utils.Downloader +import org.askartv.phone.utils.DownloaderImpl import javax.inject.Singleton @Module diff --git a/core/src/main/java/dev/jdtech/jellyfin/di/RepositoryModule.kt b/core/src/main/java/org/askartv/phone/di/RepositoryModule.kt similarity index 81% rename from core/src/main/java/dev/jdtech/jellyfin/di/RepositoryModule.kt rename to core/src/main/java/org/askartv/phone/di/RepositoryModule.kt index e6d3299c..a3c63a85 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/di/RepositoryModule.kt +++ b/core/src/main/java/org/askartv/phone/di/RepositoryModule.kt @@ -1,16 +1,16 @@ -package dev.jdtech.jellyfin.di +package org.askartv.phone.di import android.app.Application import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.repository.JellyfinRepository -import dev.jdtech.jellyfin.repository.JellyfinRepositoryImpl -import dev.jdtech.jellyfin.repository.JellyfinRepositoryOfflineImpl +import org.askartv.phone.AppPreferences +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.repository.JellyfinRepository +import org.askartv.phone.repository.JellyfinRepositoryImpl +import org.askartv.phone.repository.JellyfinRepositoryOfflineImpl import javax.inject.Singleton @Module diff --git a/core/src/main/java/dev/jdtech/jellyfin/di/SharedPreferencesModule.kt b/core/src/main/java/org/askartv/phone/di/SharedPreferencesModule.kt similarity index 95% rename from core/src/main/java/dev/jdtech/jellyfin/di/SharedPreferencesModule.kt rename to core/src/main/java/org/askartv/phone/di/SharedPreferencesModule.kt index 9fc159ed..c523eaa2 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/di/SharedPreferencesModule.kt +++ b/core/src/main/java/org/askartv/phone/di/SharedPreferencesModule.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.di +package org.askartv.phone.di import android.content.Context import android.content.SharedPreferences diff --git a/core/src/main/java/dev/jdtech/jellyfin/dialogs/AddServerAddressDialog.kt b/core/src/main/java/org/askartv/phone/dialogs/AddServerAddressDialog.kt similarity index 90% rename from core/src/main/java/dev/jdtech/jellyfin/dialogs/AddServerAddressDialog.kt rename to core/src/main/java/org/askartv/phone/dialogs/AddServerAddressDialog.kt index d6f6183c..6a715b06 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/dialogs/AddServerAddressDialog.kt +++ b/core/src/main/java/org/askartv/phone/dialogs/AddServerAddressDialog.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.dialogs +package org.askartv.phone.dialogs import android.app.Dialog import android.os.Bundle @@ -6,8 +6,8 @@ import android.text.InputType import android.widget.EditText import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.viewmodels.ServerAddressesViewModel +import org.askartv.phone.core.R +import org.askartv.phone.viewmodels.ServerAddressesViewModel import java.lang.IllegalStateException class AddServerAddressDialog( diff --git a/core/src/main/java/dev/jdtech/jellyfin/dialogs/DeleteServerAddressDialog.kt b/core/src/main/java/org/askartv/phone/dialogs/DeleteServerAddressDialog.kt similarity index 84% rename from core/src/main/java/dev/jdtech/jellyfin/dialogs/DeleteServerAddressDialog.kt rename to core/src/main/java/org/askartv/phone/dialogs/DeleteServerAddressDialog.kt index f927e5d5..99d9d462 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/dialogs/DeleteServerAddressDialog.kt +++ b/core/src/main/java/org/askartv/phone/dialogs/DeleteServerAddressDialog.kt @@ -1,12 +1,12 @@ -package dev.jdtech.jellyfin.dialogs +package org.askartv.phone.dialogs import android.app.Dialog import android.os.Bundle import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.models.ServerAddress -import dev.jdtech.jellyfin.viewmodels.ServerAddressesViewModel +import org.askartv.phone.core.R +import org.askartv.phone.models.ServerAddress +import org.askartv.phone.viewmodels.ServerAddressesViewModel import java.lang.IllegalStateException class DeleteServerAddressDialog( diff --git a/core/src/main/java/dev/jdtech/jellyfin/dialogs/DeleteServerDialogFragment.kt b/core/src/main/java/org/askartv/phone/dialogs/DeleteServerDialogFragment.kt similarity index 85% rename from core/src/main/java/dev/jdtech/jellyfin/dialogs/DeleteServerDialogFragment.kt rename to core/src/main/java/org/askartv/phone/dialogs/DeleteServerDialogFragment.kt index f8220060..1f4faaf6 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/dialogs/DeleteServerDialogFragment.kt +++ b/core/src/main/java/org/askartv/phone/dialogs/DeleteServerDialogFragment.kt @@ -1,12 +1,12 @@ -package dev.jdtech.jellyfin.dialogs +package org.askartv.phone.dialogs import android.app.Dialog import android.os.Bundle import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.models.Server -import dev.jdtech.jellyfin.viewmodels.ServerSelectViewModel +import org.askartv.phone.core.R +import org.askartv.phone.models.Server +import org.askartv.phone.viewmodels.ServerSelectViewModel import java.lang.IllegalStateException class DeleteServerDialogFragment(private val viewModel: ServerSelectViewModel, val server: Server) : DialogFragment() { diff --git a/core/src/main/java/dev/jdtech/jellyfin/dialogs/DeleteUserDialogFragment.kt b/core/src/main/java/org/askartv/phone/dialogs/DeleteUserDialogFragment.kt similarity index 85% rename from core/src/main/java/dev/jdtech/jellyfin/dialogs/DeleteUserDialogFragment.kt rename to core/src/main/java/org/askartv/phone/dialogs/DeleteUserDialogFragment.kt index e2e5e27f..09fcc7ad 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/dialogs/DeleteUserDialogFragment.kt +++ b/core/src/main/java/org/askartv/phone/dialogs/DeleteUserDialogFragment.kt @@ -1,12 +1,12 @@ -package dev.jdtech.jellyfin.dialogs +package org.askartv.phone.dialogs import android.app.Dialog import android.os.Bundle import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.models.User -import dev.jdtech.jellyfin.viewmodels.UsersViewModel +import org.askartv.phone.core.R +import org.askartv.phone.models.User +import org.askartv.phone.viewmodels.UsersViewModel import java.lang.IllegalStateException class DeleteUserDialogFragment(private val viewModel: UsersViewModel, val user: User) : DialogFragment() { diff --git a/core/src/main/java/dev/jdtech/jellyfin/dialogs/ErrorDialogFragment.kt b/core/src/main/java/org/askartv/phone/dialogs/ErrorDialogFragment.kt similarity index 93% rename from core/src/main/java/dev/jdtech/jellyfin/dialogs/ErrorDialogFragment.kt rename to core/src/main/java/org/askartv/phone/dialogs/ErrorDialogFragment.kt index 3e93f2af..1c08659a 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/dialogs/ErrorDialogFragment.kt +++ b/core/src/main/java/org/askartv/phone/dialogs/ErrorDialogFragment.kt @@ -1,12 +1,12 @@ -package dev.jdtech.jellyfin.dialogs +package org.askartv.phone.dialogs import android.app.Dialog import android.content.Intent import android.os.Bundle import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.utils.serializable +import org.askartv.phone.core.R +import org.askartv.phone.utils.serializable import java.io.Serializable import java.lang.IllegalStateException diff --git a/core/src/main/java/dev/jdtech/jellyfin/dialogs/SortDialogFragment.kt b/core/src/main/java/org/askartv/phone/dialogs/SortDialogFragment.kt similarity index 93% rename from core/src/main/java/dev/jdtech/jellyfin/dialogs/SortDialogFragment.kt rename to core/src/main/java/org/askartv/phone/dialogs/SortDialogFragment.kt index d5aa2e60..d46e651c 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/dialogs/SortDialogFragment.kt +++ b/core/src/main/java/org/askartv/phone/dialogs/SortDialogFragment.kt @@ -1,15 +1,15 @@ -package dev.jdtech.jellyfin.dialogs +package org.askartv.phone.dialogs import android.app.Dialog import android.os.Bundle import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.models.CollectionType -import dev.jdtech.jellyfin.models.SortBy -import dev.jdtech.jellyfin.viewmodels.LibraryViewModel +import org.askartv.phone.AppPreferences +import org.askartv.phone.core.R +import org.askartv.phone.models.CollectionType +import org.askartv.phone.models.SortBy +import org.askartv.phone.viewmodels.LibraryViewModel import org.jellyfin.sdk.model.api.SortOrder import java.lang.IllegalStateException import java.util.UUID diff --git a/core/src/main/java/dev/jdtech/jellyfin/models/DiscoveredServer.kt b/core/src/main/java/org/askartv/phone/models/DiscoveredServer.kt similarity index 73% rename from core/src/main/java/dev/jdtech/jellyfin/models/DiscoveredServer.kt rename to core/src/main/java/org/askartv/phone/models/DiscoveredServer.kt index 8ff29b32..07504fc1 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/models/DiscoveredServer.kt +++ b/core/src/main/java/org/askartv/phone/models/DiscoveredServer.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models data class DiscoveredServer( val id: String, diff --git a/core/src/main/java/dev/jdtech/jellyfin/models/EpisodeItem.kt b/core/src/main/java/org/askartv/phone/models/EpisodeItem.kt similarity index 92% rename from core/src/main/java/dev/jdtech/jellyfin/models/EpisodeItem.kt rename to core/src/main/java/org/askartv/phone/models/EpisodeItem.kt index 1ddba6cb..dff496c8 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/models/EpisodeItem.kt +++ b/core/src/main/java/org/askartv/phone/models/EpisodeItem.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import java.util.UUID diff --git a/core/src/main/java/dev/jdtech/jellyfin/models/ExceptionUiText.kt b/core/src/main/java/org/askartv/phone/models/ExceptionUiText.kt similarity index 81% rename from core/src/main/java/dev/jdtech/jellyfin/models/ExceptionUiText.kt rename to core/src/main/java/org/askartv/phone/models/ExceptionUiText.kt index 35a3d1eb..8d0f595f 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/models/ExceptionUiText.kt +++ b/core/src/main/java/org/askartv/phone/models/ExceptionUiText.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models data class ExceptionUiText( val uiText: UiText, diff --git a/core/src/main/java/dev/jdtech/jellyfin/models/FavoriteSection.kt b/core/src/main/java/org/askartv/phone/models/FavoriteSection.kt similarity index 75% rename from core/src/main/java/dev/jdtech/jellyfin/models/FavoriteSection.kt rename to core/src/main/java/org/askartv/phone/models/FavoriteSection.kt index ce2b31a2..b4de33a7 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/models/FavoriteSection.kt +++ b/core/src/main/java/org/askartv/phone/models/FavoriteSection.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models data class FavoriteSection( val id: Int, diff --git a/core/src/main/java/dev/jdtech/jellyfin/models/HomeItem.kt b/core/src/main/java/org/askartv/phone/models/HomeItem.kt similarity index 92% rename from core/src/main/java/dev/jdtech/jellyfin/models/HomeItem.kt rename to core/src/main/java/org/askartv/phone/models/HomeItem.kt index c47f72c1..a36c6a2c 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/models/HomeItem.kt +++ b/core/src/main/java/org/askartv/phone/models/HomeItem.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import java.util.UUID diff --git a/core/src/main/java/dev/jdtech/jellyfin/models/HomeSection.kt b/core/src/main/java/org/askartv/phone/models/HomeSection.kt similarity index 78% rename from core/src/main/java/dev/jdtech/jellyfin/models/HomeSection.kt rename to core/src/main/java/org/askartv/phone/models/HomeSection.kt index 8c2a9520..31bcecc3 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/models/HomeSection.kt +++ b/core/src/main/java/org/askartv/phone/models/HomeSection.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import java.util.UUID diff --git a/core/src/main/java/dev/jdtech/jellyfin/models/UiText.kt b/core/src/main/java/org/askartv/phone/models/UiText.kt similarity index 95% rename from core/src/main/java/dev/jdtech/jellyfin/models/UiText.kt rename to core/src/main/java/org/askartv/phone/models/UiText.kt index 37fe9b75..2f8f4d08 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/models/UiText.kt +++ b/core/src/main/java/org/askartv/phone/models/UiText.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import android.content.res.Resources import androidx.annotation.StringRes diff --git a/core/src/main/java/dev/jdtech/jellyfin/models/View.kt b/core/src/main/java/org/askartv/phone/models/View.kt similarity index 81% rename from core/src/main/java/dev/jdtech/jellyfin/models/View.kt rename to core/src/main/java/org/askartv/phone/models/View.kt index 8fd3b808..b861e945 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/models/View.kt +++ b/core/src/main/java/org/askartv/phone/models/View.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import java.util.UUID diff --git a/core/src/main/java/dev/jdtech/jellyfin/utils/ComposeUtils.kt b/core/src/main/java/org/askartv/phone/utils/ComposeUtils.kt similarity index 99% rename from core/src/main/java/dev/jdtech/jellyfin/utils/ComposeUtils.kt rename to core/src/main/java/org/askartv/phone/utils/ComposeUtils.kt index 00da8ca2..f73bd7b4 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/utils/ComposeUtils.kt +++ b/core/src/main/java/org/askartv/phone/utils/ComposeUtils.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.utils +package org.askartv.phone.utils import android.view.KeyEvent import androidx.compose.runtime.Composable diff --git a/core/src/main/java/dev/jdtech/jellyfin/utils/CoreExtensions.kt b/core/src/main/java/org/askartv/phone/utils/CoreExtensions.kt similarity index 92% rename from core/src/main/java/dev/jdtech/jellyfin/utils/CoreExtensions.kt rename to core/src/main/java/org/askartv/phone/utils/CoreExtensions.kt index 7f8503ce..31abcd0c 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/utils/CoreExtensions.kt +++ b/core/src/main/java/org/askartv/phone/utils/CoreExtensions.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.utils +package org.askartv.phone.utils import android.app.Activity import android.content.Intent @@ -9,8 +9,8 @@ import android.os.Bundle import android.util.TypedValue import androidx.annotation.AttrRes import com.google.android.material.button.MaterialButton -import dev.jdtech.jellyfin.models.CollectionType -import dev.jdtech.jellyfin.models.View +import org.askartv.phone.models.CollectionType +import org.askartv.phone.models.View import org.jellyfin.sdk.model.api.BaseItemDto import java.io.Serializable diff --git a/core/src/main/java/dev/jdtech/jellyfin/utils/DownloadReceiver.kt b/core/src/main/java/org/askartv/phone/utils/DownloadReceiver.kt similarity index 86% rename from core/src/main/java/dev/jdtech/jellyfin/utils/DownloadReceiver.kt rename to core/src/main/java/org/askartv/phone/utils/DownloadReceiver.kt index 659f12c2..65a649ef 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/utils/DownloadReceiver.kt +++ b/core/src/main/java/org/askartv/phone/utils/DownloadReceiver.kt @@ -1,18 +1,18 @@ -package dev.jdtech.jellyfin.utils +package org.askartv.phone.utils import android.app.DownloadManager import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import dagger.hilt.android.AndroidEntryPoint -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.toFindroidEpisode -import dev.jdtech.jellyfin.models.toFindroidMovie -import dev.jdtech.jellyfin.models.toFindroidSeason -import dev.jdtech.jellyfin.models.toFindroidShow -import dev.jdtech.jellyfin.models.toFindroidSource -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.toFindroidEpisode +import org.askartv.phone.models.toFindroidMovie +import org.askartv.phone.models.toFindroidSeason +import org.askartv.phone.models.toFindroidShow +import org.askartv.phone.models.toFindroidSource +import org.askartv.phone.repository.JellyfinRepository import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/core/src/main/java/dev/jdtech/jellyfin/utils/Downloader.kt b/core/src/main/java/org/askartv/phone/utils/Downloader.kt similarity index 69% rename from core/src/main/java/dev/jdtech/jellyfin/utils/Downloader.kt rename to core/src/main/java/org/askartv/phone/utils/Downloader.kt index 4aa82b27..bd849b2c 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/utils/Downloader.kt +++ b/core/src/main/java/org/askartv/phone/utils/Downloader.kt @@ -1,8 +1,8 @@ -package dev.jdtech.jellyfin.utils +package org.askartv.phone.utils -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidSource -import dev.jdtech.jellyfin.models.UiText +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidSource +import org.askartv.phone.models.UiText interface Downloader { suspend fun downloadItem( diff --git a/core/src/main/java/dev/jdtech/jellyfin/utils/DownloaderImpl.kt b/core/src/main/java/org/askartv/phone/utils/DownloaderImpl.kt similarity index 91% rename from core/src/main/java/dev/jdtech/jellyfin/utils/DownloaderImpl.kt rename to core/src/main/java/org/askartv/phone/utils/DownloaderImpl.kt index 9b0d2090..c148a5d0 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/utils/DownloaderImpl.kt +++ b/core/src/main/java/org/askartv/phone/utils/DownloaderImpl.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.utils +package org.askartv.phone.utils import android.app.DownloadManager import android.content.Context @@ -7,30 +7,30 @@ import android.os.Environment import android.os.StatFs import android.text.format.Formatter import androidx.core.net.toUri -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidSource -import dev.jdtech.jellyfin.models.FindroidSources -import dev.jdtech.jellyfin.models.FindroidTrickplayInfo -import dev.jdtech.jellyfin.models.UiText -import dev.jdtech.jellyfin.models.toFindroidEpisodeDto -import dev.jdtech.jellyfin.models.toFindroidMediaStreamDto -import dev.jdtech.jellyfin.models.toFindroidMovieDto -import dev.jdtech.jellyfin.models.toFindroidSeasonDto -import dev.jdtech.jellyfin.models.toFindroidShowDto -import dev.jdtech.jellyfin.models.toFindroidSourceDto -import dev.jdtech.jellyfin.models.toFindroidTrickplayInfoDto -import dev.jdtech.jellyfin.models.toFindroidUserDataDto -import dev.jdtech.jellyfin.models.toIntroDto -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.AppPreferences +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidSource +import org.askartv.phone.models.FindroidSources +import org.askartv.phone.models.FindroidTrickplayInfo +import org.askartv.phone.models.UiText +import org.askartv.phone.models.toFindroidEpisodeDto +import org.askartv.phone.models.toFindroidMediaStreamDto +import org.askartv.phone.models.toFindroidMovieDto +import org.askartv.phone.models.toFindroidSeasonDto +import org.askartv.phone.models.toFindroidShowDto +import org.askartv.phone.models.toFindroidSourceDto +import org.askartv.phone.models.toFindroidTrickplayInfoDto +import org.askartv.phone.models.toFindroidUserDataDto +import org.askartv.phone.models.toIntroDto +import org.askartv.phone.repository.JellyfinRepository import java.io.File import java.util.UUID import kotlin.Exception import kotlin.math.ceil -import dev.jdtech.jellyfin.core.R as CoreR +import org.askartv.phone.core.R as CoreR class DownloaderImpl( private val context: Context, diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/AddServerViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/AddServerViewModel.kt similarity index 95% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/AddServerViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/AddServerViewModel.kt index c483e4e3..e2bee284 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/AddServerViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/AddServerViewModel.kt @@ -1,18 +1,18 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.DiscoveredServer -import dev.jdtech.jellyfin.models.ExceptionUiText -import dev.jdtech.jellyfin.models.ExceptionUiTexts -import dev.jdtech.jellyfin.models.Server -import dev.jdtech.jellyfin.models.ServerAddress -import dev.jdtech.jellyfin.models.UiText +import org.askartv.phone.AppPreferences +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.core.R +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.DiscoveredServer +import org.askartv.phone.models.ExceptionUiText +import org.askartv.phone.models.ExceptionUiTexts +import org.askartv.phone.models.Server +import org.askartv.phone.models.ServerAddress +import org.askartv.phone.models.UiText import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/CollectionViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/CollectionViewModel.kt similarity index 87% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/CollectionViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/CollectionViewModel.kt index a858ba70..d3365fda 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/CollectionViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/CollectionViewModel.kt @@ -1,17 +1,17 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.Constants -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.models.FavoriteSection -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.models.SortBy -import dev.jdtech.jellyfin.models.UiText -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.Constants +import org.askartv.phone.core.R +import org.askartv.phone.models.FavoriteSection +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.models.SortBy +import org.askartv.phone.models.UiText +import org.askartv.phone.repository.JellyfinRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/DownloadsViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/DownloadsViewModel.kt similarity index 86% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/DownloadsViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/DownloadsViewModel.kt index a2ccb8a1..6aac43f2 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/DownloadsViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/DownloadsViewModel.kt @@ -1,16 +1,16 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.Constants -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.models.FavoriteSection -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.models.UiText -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.AppPreferences +import org.askartv.phone.Constants +import org.askartv.phone.core.R +import org.askartv.phone.models.FavoriteSection +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.models.UiText +import org.askartv.phone.repository.JellyfinRepository import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/EpisodeBottomSheetViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/EpisodeBottomSheetViewModel.kt similarity index 94% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/EpisodeBottomSheetViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/EpisodeBottomSheetViewModel.kt index aecfa8ec..4a4a0a61 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/EpisodeBottomSheetViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/EpisodeBottomSheetViewModel.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import android.app.DownloadManager import android.os.Handler @@ -6,13 +6,13 @@ import android.os.Looper import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidSourceType -import dev.jdtech.jellyfin.models.UiText -import dev.jdtech.jellyfin.models.isDownloading -import dev.jdtech.jellyfin.repository.JellyfinRepository -import dev.jdtech.jellyfin.utils.Downloader +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidSourceType +import org.askartv.phone.models.UiText +import org.askartv.phone.models.isDownloading +import org.askartv.phone.repository.JellyfinRepository +import org.askartv.phone.utils.Downloader import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/FavoriteViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/FavoriteViewModel.kt similarity index 87% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/FavoriteViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/FavoriteViewModel.kt index bf9035f9..9a7ad18b 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/FavoriteViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/FavoriteViewModel.kt @@ -1,16 +1,16 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.Constants -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.models.FavoriteSection -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.models.UiText -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.Constants +import org.askartv.phone.core.R +import org.askartv.phone.models.FavoriteSection +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.models.UiText +import org.askartv.phone.repository.JellyfinRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/HomeViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/HomeViewModel.kt similarity index 88% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/HomeViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/HomeViewModel.kt index 36a0ad17..ea70e8ff 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/HomeViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/HomeViewModel.kt @@ -1,16 +1,16 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.models.CollectionType -import dev.jdtech.jellyfin.models.HomeItem -import dev.jdtech.jellyfin.models.HomeSection -import dev.jdtech.jellyfin.models.UiText -import dev.jdtech.jellyfin.repository.JellyfinRepository -import dev.jdtech.jellyfin.utils.toView +import org.askartv.phone.AppPreferences +import org.askartv.phone.core.R +import org.askartv.phone.models.CollectionType +import org.askartv.phone.models.HomeItem +import org.askartv.phone.models.HomeSection +import org.askartv.phone.models.UiText +import org.askartv.phone.repository.JellyfinRepository +import org.askartv.phone.utils.toView import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/LibraryViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/LibraryViewModel.kt similarity index 91% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/LibraryViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/LibraryViewModel.kt index 5ec4e2f8..dd6e9301 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/LibraryViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/LibraryViewModel.kt @@ -1,14 +1,14 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.paging.PagingData import androidx.paging.cachedIn import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.models.CollectionType -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.SortBy -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.models.CollectionType +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.SortBy +import org.askartv.phone.repository.JellyfinRepository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/LoginViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/LoginViewModel.kt similarity index 96% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/LoginViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/LoginViewModel.kt index 43ad3e91..4a308dcb 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/LoginViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/LoginViewModel.kt @@ -1,14 +1,14 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.UiText -import dev.jdtech.jellyfin.models.User +import org.askartv.phone.AppPreferences +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.core.R +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.UiText +import org.askartv.phone.models.User import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.channels.Channel diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/MainViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/MainViewModel.kt similarity index 84% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/MainViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/MainViewModel.kt index ed95ccb8..4b611f4e 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/MainViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/MainViewModel.kt @@ -1,12 +1,12 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.Server -import dev.jdtech.jellyfin.models.User +import org.askartv.phone.AppPreferences +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.Server +import org.askartv.phone.models.User import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/MediaViewModel.kt similarity index 88% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/MediaViewModel.kt index 57c12ac1..6604dd32 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/MediaViewModel.kt @@ -1,10 +1,10 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.models.FindroidCollection -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.models.FindroidCollection +import org.askartv.phone.repository.JellyfinRepository import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/MovieViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/MovieViewModel.kt similarity index 95% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/MovieViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/MovieViewModel.kt index d4c077db..84285b7e 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/MovieViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/MovieViewModel.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import android.app.DownloadManager import android.os.Handler @@ -6,19 +6,19 @@ import android.os.Looper import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.AudioChannel -import dev.jdtech.jellyfin.models.AudioCodec -import dev.jdtech.jellyfin.models.DisplayProfile -import dev.jdtech.jellyfin.models.FindroidMediaStream -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidSourceType -import dev.jdtech.jellyfin.models.Resolution -import dev.jdtech.jellyfin.models.UiText -import dev.jdtech.jellyfin.models.VideoMetadata -import dev.jdtech.jellyfin.models.isDownloading -import dev.jdtech.jellyfin.repository.JellyfinRepository -import dev.jdtech.jellyfin.utils.Downloader +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.AudioChannel +import org.askartv.phone.models.AudioCodec +import org.askartv.phone.models.DisplayProfile +import org.askartv.phone.models.FindroidMediaStream +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidSourceType +import org.askartv.phone.models.Resolution +import org.askartv.phone.models.UiText +import org.askartv.phone.models.VideoMetadata +import org.askartv.phone.models.isDownloading +import org.askartv.phone.repository.JellyfinRepository +import org.askartv.phone.utils.Downloader import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Runnable import kotlinx.coroutines.channels.Channel diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/PersonDetailViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/PersonDetailViewModel.kt similarity index 91% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/PersonDetailViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/PersonDetailViewModel.kt index 0cd831da..c858c784 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/PersonDetailViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/PersonDetailViewModel.kt @@ -1,11 +1,11 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.repository.JellyfinRepository import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/SearchResultViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/SearchResultViewModel.kt similarity index 87% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/SearchResultViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/SearchResultViewModel.kt index f13b1922..e49e112c 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/SearchResultViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/SearchResultViewModel.kt @@ -1,16 +1,16 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.Constants -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.models.FavoriteSection -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.models.UiText -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.Constants +import org.askartv.phone.core.R +import org.askartv.phone.models.FavoriteSection +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.models.UiText +import org.askartv.phone.repository.JellyfinRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/SeasonViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/SeasonViewModel.kt similarity index 92% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/SeasonViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/SeasonViewModel.kt index ed270cad..06357f69 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/SeasonViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/SeasonViewModel.kt @@ -1,11 +1,11 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.models.EpisodeItem -import dev.jdtech.jellyfin.models.FindroidSeason -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.models.EpisodeItem +import org.askartv.phone.models.FindroidSeason +import org.askartv.phone.repository.JellyfinRepository import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/ServerAddressesViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/ServerAddressesViewModel.kt similarity index 94% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/ServerAddressesViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/ServerAddressesViewModel.kt index 6725b56d..2d10d531 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/ServerAddressesViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/ServerAddressesViewModel.kt @@ -1,12 +1,12 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import android.content.Context import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.ServerAddress +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.ServerAddress import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/ServerSelectViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/ServerSelectViewModel.kt similarity index 93% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/ServerSelectViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/ServerSelectViewModel.kt index e18a5d08..75b67ce2 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/ServerSelectViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/ServerSelectViewModel.kt @@ -1,14 +1,14 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.DiscoveredServer -import dev.jdtech.jellyfin.models.Server -import dev.jdtech.jellyfin.models.UiText +import org.askartv.phone.AppPreferences +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.DiscoveredServer +import org.askartv.phone.models.Server +import org.askartv.phone.models.UiText import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/SettingsDeviceViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/SettingsDeviceViewModel.kt similarity index 86% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/SettingsDeviceViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/SettingsDeviceViewModel.kt index 294921d3..b469497e 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/SettingsDeviceViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/SettingsDeviceViewModel.kt @@ -1,9 +1,9 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.repository.JellyfinRepository import kotlinx.coroutines.launch import timber.log.Timber import javax.inject.Inject diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/SettingsViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/SettingsViewModel.kt similarity index 95% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/SettingsViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/SettingsViewModel.kt index c9725050..98034dcd 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/SettingsViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/SettingsViewModel.kt @@ -1,15 +1,15 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.Constants -import dev.jdtech.jellyfin.core.R -import dev.jdtech.jellyfin.models.Preference -import dev.jdtech.jellyfin.models.PreferenceCategory -import dev.jdtech.jellyfin.models.PreferenceSelect -import dev.jdtech.jellyfin.models.PreferenceSwitch +import org.askartv.phone.AppPreferences +import org.askartv.phone.Constants +import org.askartv.phone.core.R +import org.askartv.phone.models.Preference +import org.askartv.phone.models.PreferenceCategory +import org.askartv.phone.models.PreferenceSelect +import org.askartv.phone.models.PreferenceSwitch import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/ShowViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/ShowViewModel.kt similarity index 96% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/ShowViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/ShowViewModel.kt index 9fe2fe28..abd6c015 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/ShowViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/ShowViewModel.kt @@ -1,12 +1,12 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidSeason -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidSeason +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.repository.JellyfinRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/UserSelectViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/UserSelectViewModel.kt similarity index 90% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/UserSelectViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/UserSelectViewModel.kt index 62cdd68e..97b9576f 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/UserSelectViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/UserSelectViewModel.kt @@ -1,13 +1,13 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.Server -import dev.jdtech.jellyfin.models.User +import org.askartv.phone.AppPreferences +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.Server +import org.askartv.phone.models.User import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/UsersViewModel.kt b/core/src/main/java/org/askartv/phone/viewmodels/UsersViewModel.kt similarity index 93% rename from core/src/main/java/dev/jdtech/jellyfin/viewmodels/UsersViewModel.kt rename to core/src/main/java/org/askartv/phone/viewmodels/UsersViewModel.kt index 43ce5e74..1d059bcf 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/UsersViewModel.kt +++ b/core/src/main/java/org/askartv/phone/viewmodels/UsersViewModel.kt @@ -1,11 +1,11 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.User +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.User import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/core/src/main/java/dev/jdtech/jellyfin/work/SyncWorker.kt b/core/src/main/java/org/askartv/phone/work/SyncWorker.kt similarity index 89% rename from core/src/main/java/dev/jdtech/jellyfin/work/SyncWorker.kt rename to core/src/main/java/org/askartv/phone/work/SyncWorker.kt index 1c43afd5..8201ac9b 100644 --- a/core/src/main/java/dev/jdtech/jellyfin/work/SyncWorker.kt +++ b/core/src/main/java/org/askartv/phone/work/SyncWorker.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.work +package org.askartv.phone.work import android.content.Context import androidx.hilt.work.HiltWorker @@ -6,13 +6,13 @@ import androidx.work.CoroutineWorker import androidx.work.WorkerParameters import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.User -import dev.jdtech.jellyfin.models.toFindroidEpisode -import dev.jdtech.jellyfin.models.toFindroidMovie +import org.askartv.phone.AppPreferences +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.User +import org.askartv.phone.models.toFindroidEpisode +import org.askartv.phone.models.toFindroidMovie import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/src/main/res/drawable/gradient.xml b/core/src/main/res/drawable/gradient.xml new file mode 100644 index 00000000..fdc15a14 --- /dev/null +++ b/core/src/main/res/drawable/gradient.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/core/src/main/res/drawable/ic_banner.xml b/core/src/main/res/drawable/ic_banner.xml index c7610be5..b41bfd1b 100644 --- a/core/src/main/res/drawable/ic_banner.xml +++ b/core/src/main/res/drawable/ic_banner.xml @@ -1,76 +1,591 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:width="1280dp" + android:height="207dp" + android:viewportWidth="1280" + android:viewportHeight="207"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/src/main/res/drawable/ic_banner_foreground.xml b/core/src/main/res/drawable/ic_banner_foreground.xml index 7e648f41..d0bb60b8 100644 --- a/core/src/main/res/drawable/ic_banner_foreground.xml +++ b/core/src/main/res/drawable/ic_banner_foreground.xml @@ -1,60 +1,601 @@ + android:viewportWidth="1280" + android:viewportHeight="207"> - - - - - - - - - - - - - - - - - - - - - - - - + android:translateX="213.33333" + android:translateY="34.5"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/src/main/res/drawable/ic_launcher_foreground.xml b/core/src/main/res/drawable/ic_launcher_foreground.xml index 30e2ed53..e8e8cba1 100644 --- a/core/src/main/res/drawable/ic_launcher_foreground.xml +++ b/core/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,27 +1,57 @@ - - - - - - - - - + android:width="200dp" + android:height="200dp" + android:viewportWidth="1024" + android:viewportHeight="1024"> + + + + + + + + + + + + + + + + + diff --git a/core/src/main/res/drawable/ic_launcher_foreground2.xml b/core/src/main/res/drawable/ic_launcher_foreground2.xml new file mode 100644 index 00000000..367847cd --- /dev/null +++ b/core/src/main/res/drawable/ic_launcher_foreground2.xml @@ -0,0 +1,444 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/src/main/res/drawable/ic_launcher_foreground_monochrome.xml b/core/src/main/res/drawable/ic_launcher_foreground_monochrome.xml new file mode 100644 index 00000000..ed0226ec --- /dev/null +++ b/core/src/main/res/drawable/ic_launcher_foreground_monochrome.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/core/src/main/res/drawable/ic_library.xml b/core/src/main/res/drawable/ic_library.xml index 003f3518..7d81aae2 100644 --- a/core/src/main/res/drawable/ic_library.xml +++ b/core/src/main/res/drawable/ic_library.xml @@ -1,35 +1,57 @@ - - - - + android:viewportWidth="512" + android:viewportHeight="512"> + + + + + + + + + + + + + + + + + + diff --git a/core/src/main/res/drawable/ic_library2.xml b/core/src/main/res/drawable/ic_library2.xml new file mode 100644 index 00000000..003f3518 --- /dev/null +++ b/core/src/main/res/drawable/ic_library2.xml @@ -0,0 +1,35 @@ + + + + + + diff --git a/core/src/main/res/drawable/ic_logo.xml b/core/src/main/res/drawable/ic_logo.xml index 33f37e05..1098a297 100644 --- a/core/src/main/res/drawable/ic_logo.xml +++ b/core/src/main/res/drawable/ic_logo.xml @@ -2,21 +2,51 @@ xmlns:aapt="http://schemas.android.com/aapt" android:width="100dp" android:height="100dp" - android:viewportWidth="100" - android:viewportHeight="100"> + android:viewportWidth="1024" + android:viewportHeight="1024"> - - - - - - - + android:pathData="M695.4,719.8c0,124.2 -68.9,224.9 -170.7,224.9s-184.3,-100.7 -184.3,-224.9S419.5,460 510.4,461.4c103.7,1.6 185,134.2 185,258.4z" + /> + + + + + + + + + + + + + + diff --git a/core/src/main/res/drawable/pineapple_svgrepo_com.xml b/core/src/main/res/drawable/pineapple_svgrepo_com.xml new file mode 100644 index 00000000..8826c7cb --- /dev/null +++ b/core/src/main/res/drawable/pineapple_svgrepo_com.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + diff --git a/core/src/main/res/mipmap-anydpi/ic_launcher.xml b/core/src/main/res/mipmap-anydpi/ic_launcher.xml index ef49c991..8479ff2a 100644 --- a/core/src/main/res/mipmap-anydpi/ic_launcher.xml +++ b/core/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index b00c4f89..d5a5baac 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -1,10 +1,10 @@ - Findroid - Third-party native Jellyfin app + Alaskarfin + AlaskarTV Phone version app Jellyfin banner Add server Server version outdated: %1$s. Please update your server - Not a Jellyfin server: %1$s + Not a valid server: %1$s Unsupported server version: %1$s. Please update your server Server is too slow to respond: %1$s Empty server address @@ -27,7 +27,7 @@ Remove Cancel Home - My media + Library Favorites Settings Downloads @@ -181,7 +181,7 @@ Cancel download Are you sure you want to cancel the download? Stop download - By using Findroid you agree with the Privacy Policy which states that we do not collect any data + By using AlaskarTV you agree with the Privacy Policy which states that we do not collect any data No servers found No users found Select user diff --git a/core/src/main/res/xml/fragment_settings.xml b/core/src/main/res/xml/fragment_settings.xml index 86cb96e3..80178dd2 100644 --- a/core/src/main/res/xml/fragment_settings.xml +++ b/core/src/main/res/xml/fragment_settings.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> @@ -23,32 +23,32 @@ app:title="@string/addresses" /> + + - diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 1cb0dfd0..f30ed5f1 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } android { - namespace = "dev.jdtech.jellyfin.data" + namespace = "org.askartv.phone.data" compileSdk = Versions.compileSdk buildToolsVersion = Versions.buildTools diff --git a/data/proguard-rules.pro b/data/proguard-rules.pro index 90173f3b..0175839f 100644 --- a/data/proguard-rules.pro +++ b/data/proguard-rules.pro @@ -39,4 +39,4 @@ # static <1>$$serializer INSTANCE; #} --keepnames class dev.jdtech.jellyfin.models.CollectionType +-keepnames class org.askartv.phone.models.CollectionType diff --git a/data/schemas/dev.jdtech.jellyfin.database.ServerDatabase/2.json b/data/schemas/org.askartv.phone.database.ServerDatabase/2.json similarity index 100% rename from data/schemas/dev.jdtech.jellyfin.database.ServerDatabase/2.json rename to data/schemas/org.askartv.phone.database.ServerDatabase/2.json diff --git a/data/schemas/dev.jdtech.jellyfin.database.ServerDatabase/3.json b/data/schemas/org.askartv.phone.database.ServerDatabase/3.json similarity index 100% rename from data/schemas/dev.jdtech.jellyfin.database.ServerDatabase/3.json rename to data/schemas/org.askartv.phone.database.ServerDatabase/3.json diff --git a/data/schemas/dev.jdtech.jellyfin.database.ServerDatabase/4.json b/data/schemas/org.askartv.phone.database.ServerDatabase/4.json similarity index 100% rename from data/schemas/dev.jdtech.jellyfin.database.ServerDatabase/4.json rename to data/schemas/org.askartv.phone.database.ServerDatabase/4.json diff --git a/data/schemas/dev.jdtech.jellyfin.database.ServerDatabase/5.json b/data/schemas/org.askartv.phone.database.ServerDatabase/5.json similarity index 100% rename from data/schemas/dev.jdtech.jellyfin.database.ServerDatabase/5.json rename to data/schemas/org.askartv.phone.database.ServerDatabase/5.json diff --git a/data/src/main/java/dev/jdtech/jellyfin/api/JellyfinApi.kt b/data/src/main/java/org/askartv/phone/api/JellyfinApi.kt similarity index 96% rename from data/src/main/java/dev/jdtech/jellyfin/api/JellyfinApi.kt rename to data/src/main/java/org/askartv/phone/api/JellyfinApi.kt index c8fc7c6c..3d518971 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/api/JellyfinApi.kt +++ b/data/src/main/java/org/askartv/phone/api/JellyfinApi.kt @@ -1,8 +1,8 @@ -package dev.jdtech.jellyfin.api +package org.askartv.phone.api import android.content.Context -import dev.jdtech.jellyfin.Constants -import dev.jdtech.jellyfin.data.BuildConfig +import org.askartv.phone.Constants +import org.askartv.phone.data.BuildConfig import org.jellyfin.sdk.api.client.HttpClientOptions import org.jellyfin.sdk.api.client.extensions.brandingApi import org.jellyfin.sdk.api.client.extensions.devicesApi diff --git a/data/src/main/java/dev/jdtech/jellyfin/database/Converters.kt b/data/src/main/java/org/askartv/phone/database/Converters.kt similarity index 92% rename from data/src/main/java/dev/jdtech/jellyfin/database/Converters.kt rename to data/src/main/java/org/askartv/phone/database/Converters.kt index 0d6c112e..98b737f8 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/database/Converters.kt +++ b/data/src/main/java/org/askartv/phone/database/Converters.kt @@ -1,7 +1,7 @@ -package dev.jdtech.jellyfin.database +package org.askartv.phone.database import androidx.room.TypeConverter -import dev.jdtech.jellyfin.models.FindroidChapter +import org.askartv.phone.models.FindroidChapter import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.jellyfin.sdk.model.DateTime diff --git a/data/src/main/java/dev/jdtech/jellyfin/database/ServerDatabase.kt b/data/src/main/java/org/askartv/phone/database/ServerDatabase.kt similarity index 61% rename from data/src/main/java/dev/jdtech/jellyfin/database/ServerDatabase.kt rename to data/src/main/java/org/askartv/phone/database/ServerDatabase.kt index ff6da8d6..60a0157c 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/database/ServerDatabase.kt +++ b/data/src/main/java/org/askartv/phone/database/ServerDatabase.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.database +package org.askartv.phone.database import androidx.room.AutoMigration import androidx.room.Database @@ -6,18 +6,18 @@ import androidx.room.DeleteTable import androidx.room.RoomDatabase import androidx.room.TypeConverters import androidx.room.migration.AutoMigrationSpec -import dev.jdtech.jellyfin.models.FindroidEpisodeDto -import dev.jdtech.jellyfin.models.FindroidMediaStreamDto -import dev.jdtech.jellyfin.models.FindroidMovieDto -import dev.jdtech.jellyfin.models.FindroidSeasonDto -import dev.jdtech.jellyfin.models.FindroidShowDto -import dev.jdtech.jellyfin.models.FindroidSourceDto -import dev.jdtech.jellyfin.models.FindroidTrickplayInfoDto -import dev.jdtech.jellyfin.models.FindroidUserDataDto -import dev.jdtech.jellyfin.models.IntroDto -import dev.jdtech.jellyfin.models.Server -import dev.jdtech.jellyfin.models.ServerAddress -import dev.jdtech.jellyfin.models.User +import org.askartv.phone.models.FindroidEpisodeDto +import org.askartv.phone.models.FindroidMediaStreamDto +import org.askartv.phone.models.FindroidMovieDto +import org.askartv.phone.models.FindroidSeasonDto +import org.askartv.phone.models.FindroidShowDto +import org.askartv.phone.models.FindroidSourceDto +import org.askartv.phone.models.FindroidTrickplayInfoDto +import org.askartv.phone.models.FindroidUserDataDto +import org.askartv.phone.models.IntroDto +import org.askartv.phone.models.Server +import org.askartv.phone.models.ServerAddress +import org.askartv.phone.models.User @Database( entities = [Server::class, ServerAddress::class, User::class, FindroidMovieDto::class, FindroidShowDto::class, FindroidSeasonDto::class, FindroidEpisodeDto::class, FindroidSourceDto::class, FindroidMediaStreamDto::class, IntroDto::class, FindroidUserDataDto::class, FindroidTrickplayInfoDto::class], diff --git a/data/src/main/java/dev/jdtech/jellyfin/database/ServerDatabaseDao.kt b/data/src/main/java/org/askartv/phone/database/ServerDatabaseDao.kt similarity index 92% rename from data/src/main/java/dev/jdtech/jellyfin/database/ServerDatabaseDao.kt rename to data/src/main/java/org/askartv/phone/database/ServerDatabaseDao.kt index 01f5f86f..7876cc36 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/database/ServerDatabaseDao.kt +++ b/data/src/main/java/org/askartv/phone/database/ServerDatabaseDao.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.database +package org.askartv.phone.database import androidx.room.Dao import androidx.room.Insert @@ -6,22 +6,22 @@ import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Transaction import androidx.room.Update -import dev.jdtech.jellyfin.models.FindroidEpisodeDto -import dev.jdtech.jellyfin.models.FindroidMediaStreamDto -import dev.jdtech.jellyfin.models.FindroidMovieDto -import dev.jdtech.jellyfin.models.FindroidSeasonDto -import dev.jdtech.jellyfin.models.FindroidShowDto -import dev.jdtech.jellyfin.models.FindroidSourceDto -import dev.jdtech.jellyfin.models.FindroidTrickplayInfoDto -import dev.jdtech.jellyfin.models.FindroidUserDataDto -import dev.jdtech.jellyfin.models.IntroDto -import dev.jdtech.jellyfin.models.Server -import dev.jdtech.jellyfin.models.ServerAddress -import dev.jdtech.jellyfin.models.ServerWithAddressAndUser -import dev.jdtech.jellyfin.models.ServerWithAddresses -import dev.jdtech.jellyfin.models.ServerWithAddressesAndUsers -import dev.jdtech.jellyfin.models.ServerWithUsers -import dev.jdtech.jellyfin.models.User +import org.askartv.phone.models.FindroidEpisodeDto +import org.askartv.phone.models.FindroidMediaStreamDto +import org.askartv.phone.models.FindroidMovieDto +import org.askartv.phone.models.FindroidSeasonDto +import org.askartv.phone.models.FindroidShowDto +import org.askartv.phone.models.FindroidSourceDto +import org.askartv.phone.models.FindroidTrickplayInfoDto +import org.askartv.phone.models.FindroidUserDataDto +import org.askartv.phone.models.IntroDto +import org.askartv.phone.models.Server +import org.askartv.phone.models.ServerAddress +import org.askartv.phone.models.ServerWithAddressAndUser +import org.askartv.phone.models.ServerWithAddresses +import org.askartv.phone.models.ServerWithAddressesAndUsers +import org.askartv.phone.models.ServerWithUsers +import org.askartv.phone.models.User import java.util.UUID @Dao diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/CollectionType.kt b/data/src/main/java/org/askartv/phone/models/CollectionType.kt similarity index 96% rename from data/src/main/java/dev/jdtech/jellyfin/models/CollectionType.kt rename to data/src/main/java/org/askartv/phone/models/CollectionType.kt index 8217fbdf..5f4c03a8 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/CollectionType.kt +++ b/data/src/main/java/org/askartv/phone/models/CollectionType.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models enum class CollectionType(val type: String) { Movies("movies"), diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidBoxSet.kt b/data/src/main/java/org/askartv/phone/models/FindroidBoxSet.kt similarity index 91% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidBoxSet.kt rename to data/src/main/java/org/askartv/phone/models/FindroidBoxSet.kt index 9b4446ac..4a87aec4 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidBoxSet.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidBoxSet.kt @@ -1,6 +1,6 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.repository.JellyfinRepository import org.jellyfin.sdk.model.api.BaseItemDto import java.util.UUID diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidChapter.kt b/data/src/main/java/org/askartv/phone/models/FindroidChapter.kt similarity index 93% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidChapter.kt rename to data/src/main/java/org/askartv/phone/models/FindroidChapter.kt index b48b3bdd..1f7a82d1 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidChapter.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidChapter.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import kotlinx.serialization.Serializable import org.jellyfin.sdk.model.api.BaseItemDto diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidCollection.kt b/data/src/main/java/org/askartv/phone/models/FindroidCollection.kt similarity index 92% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidCollection.kt rename to data/src/main/java/org/askartv/phone/models/FindroidCollection.kt index d73110e0..2c2f1f11 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidCollection.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidCollection.kt @@ -1,6 +1,6 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.repository.JellyfinRepository import org.jellyfin.sdk.model.api.BaseItemDto import java.util.UUID diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidEpisode.kt b/data/src/main/java/org/askartv/phone/models/FindroidEpisode.kt similarity index 96% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidEpisode.kt rename to data/src/main/java/org/askartv/phone/models/FindroidEpisode.kt index 2783e441..58960c6e 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidEpisode.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidEpisode.kt @@ -1,7 +1,7 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.repository.JellyfinRepository import org.jellyfin.sdk.model.DateTime import org.jellyfin.sdk.model.api.BaseItemDto import org.jellyfin.sdk.model.api.LocationType diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidEpisodeDto.kt b/data/src/main/java/org/askartv/phone/models/FindroidEpisodeDto.kt similarity index 98% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidEpisodeDto.kt rename to data/src/main/java/org/askartv/phone/models/FindroidEpisodeDto.kt index accea2c4..106c8890 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidEpisodeDto.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidEpisodeDto.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Entity import androidx.room.ForeignKey diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidFolder.kt b/data/src/main/java/org/askartv/phone/models/FindroidFolder.kt similarity index 92% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidFolder.kt rename to data/src/main/java/org/askartv/phone/models/FindroidFolder.kt index dc310a03..6f853885 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidFolder.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidFolder.kt @@ -1,6 +1,6 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.repository.JellyfinRepository import org.jellyfin.sdk.model.api.BaseItemDto import java.util.UUID diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidImages.kt b/data/src/main/java/org/askartv/phone/models/FindroidImages.kt similarity index 94% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidImages.kt rename to data/src/main/java/org/askartv/phone/models/FindroidImages.kt index 1980c1fd..b245809f 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidImages.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidImages.kt @@ -1,7 +1,7 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import android.net.Uri -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.repository.JellyfinRepository import org.jellyfin.sdk.model.api.BaseItemDto import org.jellyfin.sdk.model.api.ImageType diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidItem.kt b/data/src/main/java/org/askartv/phone/models/FindroidItem.kt similarity index 91% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidItem.kt rename to data/src/main/java/org/askartv/phone/models/FindroidItem.kt index 6ce0b867..55f5fb9f 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidItem.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidItem.kt @@ -1,7 +1,7 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.repository.JellyfinRepository import org.jellyfin.sdk.model.api.BaseItemDto import org.jellyfin.sdk.model.api.BaseItemKind import java.util.UUID diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidMediaStream.kt b/data/src/main/java/org/askartv/phone/models/FindroidMediaStream.kt similarity index 94% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidMediaStream.kt rename to data/src/main/java/org/askartv/phone/models/FindroidMediaStream.kt index 772aa84b..a7eec3bb 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidMediaStream.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidMediaStream.kt @@ -1,6 +1,6 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.repository.JellyfinRepository import org.jellyfin.sdk.model.api.MediaStream import org.jellyfin.sdk.model.api.MediaStreamType import org.jellyfin.sdk.model.api.VideoRangeType diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidMediaStreamDto.kt b/data/src/main/java/org/askartv/phone/models/FindroidMediaStreamDto.kt similarity index 97% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidMediaStreamDto.kt rename to data/src/main/java/org/askartv/phone/models/FindroidMediaStreamDto.kt index 5a24db18..9ecb2a05 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidMediaStreamDto.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidMediaStreamDto.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidMovie.kt b/data/src/main/java/org/askartv/phone/models/FindroidMovie.kt similarity index 96% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidMovie.kt rename to data/src/main/java/org/askartv/phone/models/FindroidMovie.kt index c28d9c1b..252aa360 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidMovie.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidMovie.kt @@ -1,7 +1,7 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.repository.JellyfinRepository import org.jellyfin.sdk.model.api.BaseItemDto import org.jellyfin.sdk.model.api.BaseItemPerson import org.jellyfin.sdk.model.api.PlayAccess diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidMovieDto.kt b/data/src/main/java/org/askartv/phone/models/FindroidMovieDto.kt similarity index 96% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidMovieDto.kt rename to data/src/main/java/org/askartv/phone/models/FindroidMovieDto.kt index 1667bff0..9467088b 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidMovieDto.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidMovieDto.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidSeason.kt b/data/src/main/java/org/askartv/phone/models/FindroidSeason.kt similarity index 93% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidSeason.kt rename to data/src/main/java/org/askartv/phone/models/FindroidSeason.kt index af1c98dd..a6e347eb 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidSeason.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidSeason.kt @@ -1,7 +1,7 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.repository.JellyfinRepository import org.jellyfin.sdk.model.api.BaseItemDto import org.jellyfin.sdk.model.api.PlayAccess import java.util.UUID diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidSeasonDto.kt b/data/src/main/java/org/askartv/phone/models/FindroidSeasonDto.kt similarity index 96% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidSeasonDto.kt rename to data/src/main/java/org/askartv/phone/models/FindroidSeasonDto.kt index 641c1c40..3441c1f5 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidSeasonDto.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidSeasonDto.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Entity import androidx.room.ForeignKey diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidShow.kt b/data/src/main/java/org/askartv/phone/models/FindroidShow.kt similarity index 95% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidShow.kt rename to data/src/main/java/org/askartv/phone/models/FindroidShow.kt index 79fbdcdc..2a5c5051 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidShow.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidShow.kt @@ -1,7 +1,7 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.repository.JellyfinRepository import org.jellyfin.sdk.model.DateTime import org.jellyfin.sdk.model.api.BaseItemDto import org.jellyfin.sdk.model.api.BaseItemPerson diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidShowDto.kt b/data/src/main/java/org/askartv/phone/models/FindroidShowDto.kt similarity index 96% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidShowDto.kt rename to data/src/main/java/org/askartv/phone/models/FindroidShowDto.kt index 9236697c..32bf4789 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidShowDto.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidShowDto.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidSource.kt b/data/src/main/java/org/askartv/phone/models/FindroidSource.kt similarity index 91% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidSource.kt rename to data/src/main/java/org/askartv/phone/models/FindroidSource.kt index 172242b2..fec86489 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidSource.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidSource.kt @@ -1,7 +1,7 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.repository.JellyfinRepository import org.jellyfin.sdk.model.api.MediaProtocol import org.jellyfin.sdk.model.api.MediaSourceInfo import java.io.File diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidSourceDto.kt b/data/src/main/java/org/askartv/phone/models/FindroidSourceDto.kt similarity index 94% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidSourceDto.kt rename to data/src/main/java/org/askartv/phone/models/FindroidSourceDto.kt index 691f1365..f573022c 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidSourceDto.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidSourceDto.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidSources.kt b/data/src/main/java/org/askartv/phone/models/FindroidSources.kt similarity index 81% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidSources.kt rename to data/src/main/java/org/askartv/phone/models/FindroidSources.kt index e013f670..d742f2bf 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidSources.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidSources.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models interface FindroidSources { val sources: List diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidTrickplayInfo.kt b/data/src/main/java/org/askartv/phone/models/FindroidTrickplayInfo.kt similarity index 96% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidTrickplayInfo.kt rename to data/src/main/java/org/askartv/phone/models/FindroidTrickplayInfo.kt index 326565b5..be051ffa 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidTrickplayInfo.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidTrickplayInfo.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import org.jellyfin.sdk.model.api.TrickplayInfo diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidTrickplayInfoDto.kt b/data/src/main/java/org/askartv/phone/models/FindroidTrickplayInfoDto.kt similarity index 96% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidTrickplayInfoDto.kt rename to data/src/main/java/org/askartv/phone/models/FindroidTrickplayInfoDto.kt index 50219908..43da2927 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidTrickplayInfoDto.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidTrickplayInfoDto.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Entity import androidx.room.ForeignKey diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidUserDataDto.kt b/data/src/main/java/org/askartv/phone/models/FindroidUserDataDto.kt similarity index 94% rename from data/src/main/java/dev/jdtech/jellyfin/models/FindroidUserDataDto.kt rename to data/src/main/java/org/askartv/phone/models/FindroidUserDataDto.kt index 76ecaba8..5e0af134 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/FindroidUserDataDto.kt +++ b/data/src/main/java/org/askartv/phone/models/FindroidUserDataDto.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Entity import java.util.UUID diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/Intro.kt b/data/src/main/java/org/askartv/phone/models/Intro.kt similarity index 94% rename from data/src/main/java/dev/jdtech/jellyfin/models/Intro.kt rename to data/src/main/java/org/askartv/phone/models/Intro.kt index 31193e73..7b8ccded 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/Intro.kt +++ b/data/src/main/java/org/askartv/phone/models/Intro.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/IntroDto.kt b/data/src/main/java/org/askartv/phone/models/IntroDto.kt similarity index 93% rename from data/src/main/java/dev/jdtech/jellyfin/models/IntroDto.kt rename to data/src/main/java/org/askartv/phone/models/IntroDto.kt index 735fabf4..0046a3c7 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/IntroDto.kt +++ b/data/src/main/java/org/askartv/phone/models/IntroDto.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/Server.kt b/data/src/main/java/org/askartv/phone/models/Server.kt similarity index 88% rename from data/src/main/java/dev/jdtech/jellyfin/models/Server.kt rename to data/src/main/java/org/askartv/phone/models/Server.kt index 0109d128..03f3d61e 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/Server.kt +++ b/data/src/main/java/org/askartv/phone/models/Server.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/ServerAddress.kt b/data/src/main/java/org/askartv/phone/models/ServerAddress.kt similarity index 94% rename from data/src/main/java/dev/jdtech/jellyfin/models/ServerAddress.kt rename to data/src/main/java/org/askartv/phone/models/ServerAddress.kt index f973d26a..cf38b551 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/ServerAddress.kt +++ b/data/src/main/java/org/askartv/phone/models/ServerAddress.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/ServerWithAddressAndUser.kt b/data/src/main/java/org/askartv/phone/models/ServerWithAddressAndUser.kt similarity index 91% rename from data/src/main/java/dev/jdtech/jellyfin/models/ServerWithAddressAndUser.kt rename to data/src/main/java/org/askartv/phone/models/ServerWithAddressAndUser.kt index c5549439..665b2a28 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/ServerWithAddressAndUser.kt +++ b/data/src/main/java/org/askartv/phone/models/ServerWithAddressAndUser.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Embedded import androidx.room.Relation diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/ServerWithAddresses.kt b/data/src/main/java/org/askartv/phone/models/ServerWithAddresses.kt similarity index 91% rename from data/src/main/java/dev/jdtech/jellyfin/models/ServerWithAddresses.kt rename to data/src/main/java/org/askartv/phone/models/ServerWithAddresses.kt index 62b55db1..a9c45015 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/ServerWithAddresses.kt +++ b/data/src/main/java/org/askartv/phone/models/ServerWithAddresses.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Embedded import androidx.room.Relation diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/ServerWithAddressesAndUsers.kt b/data/src/main/java/org/askartv/phone/models/ServerWithAddressesAndUsers.kt similarity index 91% rename from data/src/main/java/dev/jdtech/jellyfin/models/ServerWithAddressesAndUsers.kt rename to data/src/main/java/org/askartv/phone/models/ServerWithAddressesAndUsers.kt index 0b45d188..1e2e7847 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/ServerWithAddressesAndUsers.kt +++ b/data/src/main/java/org/askartv/phone/models/ServerWithAddressesAndUsers.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Embedded import androidx.room.Relation diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/ServerWithUsers.kt b/data/src/main/java/org/askartv/phone/models/ServerWithUsers.kt similarity index 87% rename from data/src/main/java/dev/jdtech/jellyfin/models/ServerWithUsers.kt rename to data/src/main/java/org/askartv/phone/models/ServerWithUsers.kt index f776ba91..c27a6d88 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/ServerWithUsers.kt +++ b/data/src/main/java/org/askartv/phone/models/ServerWithUsers.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.Embedded import androidx.room.Relation diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/SortBy.kt b/data/src/main/java/org/askartv/phone/models/SortBy.kt similarity index 94% rename from data/src/main/java/dev/jdtech/jellyfin/models/SortBy.kt rename to data/src/main/java/org/askartv/phone/models/SortBy.kt index 4d2f2161..d75dbf2a 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/SortBy.kt +++ b/data/src/main/java/org/askartv/phone/models/SortBy.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models enum class SortBy(val sortString: String) { NAME("SortName"), diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/User.kt b/data/src/main/java/org/askartv/phone/models/User.kt similarity index 94% rename from data/src/main/java/dev/jdtech/jellyfin/models/User.kt rename to data/src/main/java/org/askartv/phone/models/User.kt index 30e45167..e91e00f4 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/User.kt +++ b/data/src/main/java/org/askartv/phone/models/User.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/data/src/main/java/dev/jdtech/jellyfin/models/VideoMetadata.kt b/data/src/main/java/org/askartv/phone/models/VideoMetadata.kt similarity index 96% rename from data/src/main/java/dev/jdtech/jellyfin/models/VideoMetadata.kt rename to data/src/main/java/org/askartv/phone/models/VideoMetadata.kt index cbc25f0e..676cb00b 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/models/VideoMetadata.kt +++ b/data/src/main/java/org/askartv/phone/models/VideoMetadata.kt @@ -1,6 +1,6 @@ @file:Suppress("Unused") -package dev.jdtech.jellyfin.models +package org.askartv.phone.models data class VideoMetadata( val resolution: List, diff --git a/data/src/main/java/dev/jdtech/jellyfin/repository/ItemsPagingSource.kt b/data/src/main/java/org/askartv/phone/repository/ItemsPagingSource.kt similarity index 92% rename from data/src/main/java/dev/jdtech/jellyfin/repository/ItemsPagingSource.kt rename to data/src/main/java/org/askartv/phone/repository/ItemsPagingSource.kt index af8e601c..1f521d1c 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/repository/ItemsPagingSource.kt +++ b/data/src/main/java/org/askartv/phone/repository/ItemsPagingSource.kt @@ -1,9 +1,9 @@ -package dev.jdtech.jellyfin.repository +package org.askartv.phone.repository import androidx.paging.PagingSource import androidx.paging.PagingState -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.SortBy +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.SortBy import org.jellyfin.sdk.model.api.BaseItemKind import org.jellyfin.sdk.model.api.SortOrder import timber.log.Timber diff --git a/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepository.kt b/data/src/main/java/org/askartv/phone/repository/JellyfinRepository.kt similarity index 87% rename from data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepository.kt rename to data/src/main/java/org/askartv/phone/repository/JellyfinRepository.kt index e2f117a3..00675d46 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepository.kt +++ b/data/src/main/java/org/askartv/phone/repository/JellyfinRepository.kt @@ -1,15 +1,15 @@ -package dev.jdtech.jellyfin.repository +package org.askartv.phone.repository import androidx.paging.PagingData -import dev.jdtech.jellyfin.models.FindroidCollection -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidSeason -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.models.FindroidSource -import dev.jdtech.jellyfin.models.Intro -import dev.jdtech.jellyfin.models.SortBy +import org.askartv.phone.models.FindroidCollection +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidSeason +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.models.FindroidSource +import org.askartv.phone.models.Intro +import org.askartv.phone.models.SortBy import kotlinx.coroutines.flow.Flow import org.jellyfin.sdk.model.api.BaseItemDto import org.jellyfin.sdk.model.api.BaseItemKind diff --git a/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt b/data/src/main/java/org/askartv/phone/repository/JellyfinRepositoryImpl.kt similarity index 95% rename from data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt rename to data/src/main/java/org/askartv/phone/repository/JellyfinRepositoryImpl.kt index 995619d2..22b676c7 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt +++ b/data/src/main/java/org/askartv/phone/repository/JellyfinRepositoryImpl.kt @@ -1,29 +1,29 @@ -package dev.jdtech.jellyfin.repository +package org.askartv.phone.repository import android.content.Context import androidx.paging.Pager import androidx.paging.PagingConfig import androidx.paging.PagingData -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.FindroidCollection -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidSeason -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.models.FindroidSource -import dev.jdtech.jellyfin.models.Intro -import dev.jdtech.jellyfin.models.SortBy -import dev.jdtech.jellyfin.models.toFindroidCollection -import dev.jdtech.jellyfin.models.toFindroidEpisode -import dev.jdtech.jellyfin.models.toFindroidItem -import dev.jdtech.jellyfin.models.toFindroidMovie -import dev.jdtech.jellyfin.models.toFindroidSeason -import dev.jdtech.jellyfin.models.toFindroidShow -import dev.jdtech.jellyfin.models.toFindroidSource -import dev.jdtech.jellyfin.models.toIntro +import org.askartv.phone.AppPreferences +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.FindroidCollection +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidSeason +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.models.FindroidSource +import org.askartv.phone.models.Intro +import org.askartv.phone.models.SortBy +import org.askartv.phone.models.toFindroidCollection +import org.askartv.phone.models.toFindroidEpisode +import org.askartv.phone.models.toFindroidItem +import org.askartv.phone.models.toFindroidMovie +import org.askartv.phone.models.toFindroidSeason +import org.askartv.phone.models.toFindroidShow +import org.askartv.phone.models.toFindroidSource +import org.askartv.phone.models.toIntro import io.ktor.util.toByteArray import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryOfflineImpl.kt b/data/src/main/java/org/askartv/phone/repository/JellyfinRepositoryOfflineImpl.kt similarity index 91% rename from data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryOfflineImpl.kt rename to data/src/main/java/org/askartv/phone/repository/JellyfinRepositoryOfflineImpl.kt index 0a78ec47..de31b2cd 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryOfflineImpl.kt +++ b/data/src/main/java/org/askartv/phone/repository/JellyfinRepositoryOfflineImpl.kt @@ -1,25 +1,25 @@ -package dev.jdtech.jellyfin.repository +package org.askartv.phone.repository import android.content.Context import androidx.paging.PagingData -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.api.JellyfinApi -import dev.jdtech.jellyfin.database.ServerDatabaseDao -import dev.jdtech.jellyfin.models.FindroidCollection -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidSeason -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.models.FindroidSource -import dev.jdtech.jellyfin.models.Intro -import dev.jdtech.jellyfin.models.SortBy -import dev.jdtech.jellyfin.models.toFindroidEpisode -import dev.jdtech.jellyfin.models.toFindroidMovie -import dev.jdtech.jellyfin.models.toFindroidSeason -import dev.jdtech.jellyfin.models.toFindroidShow -import dev.jdtech.jellyfin.models.toFindroidSource -import dev.jdtech.jellyfin.models.toIntro +import org.askartv.phone.AppPreferences +import org.askartv.phone.api.JellyfinApi +import org.askartv.phone.database.ServerDatabaseDao +import org.askartv.phone.models.FindroidCollection +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidSeason +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.models.FindroidSource +import org.askartv.phone.models.Intro +import org.askartv.phone.models.SortBy +import org.askartv.phone.models.toFindroidEpisode +import org.askartv.phone.models.toFindroidMovie +import org.askartv.phone.models.toFindroidSeason +import org.askartv.phone.models.toFindroidShow +import org.askartv.phone.models.toFindroidSource +import org.askartv.phone.models.toIntro import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.withContext diff --git a/fastlane/Appfile b/fastlane/Appfile index bfff7ed2..0a093856 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1 +1 @@ -package_name("dev.jdtech.jellyfin") +package_name("org.askartv.phone") diff --git a/player/core/build.gradle.kts b/player/core/build.gradle.kts index 91d45fd9..9ddcb5b0 100644 --- a/player/core/build.gradle.kts +++ b/player/core/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } android { - namespace = "dev.jdtech.jellyfin.player.core" + namespace = "org.askartv.phone.player.core" compileSdk = Versions.compileSdk buildToolsVersion = Versions.buildTools diff --git a/player/core/src/main/java/dev/jdtech/jellyfin/models/ExternalSubtitle.kt b/player/core/src/main/java/org/askartv/phone/models/ExternalSubtitle.kt similarity index 86% rename from player/core/src/main/java/dev/jdtech/jellyfin/models/ExternalSubtitle.kt rename to player/core/src/main/java/org/askartv/phone/models/ExternalSubtitle.kt index cfe5e4a0..d5067ade 100644 --- a/player/core/src/main/java/dev/jdtech/jellyfin/models/ExternalSubtitle.kt +++ b/player/core/src/main/java/org/askartv/phone/models/ExternalSubtitle.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import android.net.Uri import android.os.Parcelable diff --git a/player/core/src/main/java/dev/jdtech/jellyfin/models/PlayerChapter.kt b/player/core/src/main/java/org/askartv/phone/models/PlayerChapter.kt similarity index 87% rename from player/core/src/main/java/dev/jdtech/jellyfin/models/PlayerChapter.kt rename to player/core/src/main/java/org/askartv/phone/models/PlayerChapter.kt index c05e7e84..ccde185d 100644 --- a/player/core/src/main/java/dev/jdtech/jellyfin/models/PlayerChapter.kt +++ b/player/core/src/main/java/org/askartv/phone/models/PlayerChapter.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/player/core/src/main/java/dev/jdtech/jellyfin/models/PlayerItem.kt b/player/core/src/main/java/org/askartv/phone/models/PlayerItem.kt similarity index 94% rename from player/core/src/main/java/dev/jdtech/jellyfin/models/PlayerItem.kt rename to player/core/src/main/java/org/askartv/phone/models/PlayerItem.kt index 370c1b33..15d6a68f 100644 --- a/player/core/src/main/java/dev/jdtech/jellyfin/models/PlayerItem.kt +++ b/player/core/src/main/java/org/askartv/phone/models/PlayerItem.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/player/core/src/main/java/dev/jdtech/jellyfin/models/Track.kt b/player/core/src/main/java/org/askartv/phone/models/Track.kt similarity index 88% rename from player/core/src/main/java/dev/jdtech/jellyfin/models/Track.kt rename to player/core/src/main/java/org/askartv/phone/models/Track.kt index 35371240..592304a4 100644 --- a/player/core/src/main/java/dev/jdtech/jellyfin/models/Track.kt +++ b/player/core/src/main/java/org/askartv/phone/models/Track.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/player/core/src/main/java/dev/jdtech/jellyfin/models/Trickplay.kt b/player/core/src/main/java/org/askartv/phone/models/Trickplay.kt similarity index 75% rename from player/core/src/main/java/dev/jdtech/jellyfin/models/Trickplay.kt rename to player/core/src/main/java/org/askartv/phone/models/Trickplay.kt index 2a5700d7..255278af 100644 --- a/player/core/src/main/java/dev/jdtech/jellyfin/models/Trickplay.kt +++ b/player/core/src/main/java/org/askartv/phone/models/Trickplay.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import android.graphics.Bitmap diff --git a/player/core/src/main/java/dev/jdtech/jellyfin/models/TrickplayInfo.kt b/player/core/src/main/java/org/askartv/phone/models/TrickplayInfo.kt similarity index 89% rename from player/core/src/main/java/dev/jdtech/jellyfin/models/TrickplayInfo.kt rename to player/core/src/main/java/org/askartv/phone/models/TrickplayInfo.kt index e38cd1b4..85337f1d 100644 --- a/player/core/src/main/java/dev/jdtech/jellyfin/models/TrickplayInfo.kt +++ b/player/core/src/main/java/org/askartv/phone/models/TrickplayInfo.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/player/video/build.gradle.kts b/player/video/build.gradle.kts index 2653116e..1eaf1d37 100644 --- a/player/video/build.gradle.kts +++ b/player/video/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } android { - namespace = "dev.jdtech.jellyfin.player.video" + namespace = "org.askartv.phone.player.video" compileSdk = Versions.compileSdk buildToolsVersion = Versions.buildTools diff --git a/player/video/src/main/java/dev/jdtech/jellyfin/Extensions.kt b/player/video/src/main/java/org/askartv/phone/Extensions.kt similarity index 95% rename from player/video/src/main/java/dev/jdtech/jellyfin/Extensions.kt rename to player/video/src/main/java/org/askartv/phone/Extensions.kt index 9f701e3b..e2fcc137 100644 --- a/player/video/src/main/java/dev/jdtech/jellyfin/Extensions.kt +++ b/player/video/src/main/java/org/askartv/phone/Extensions.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin +package org.askartv.phone import androidx.media3.common.Tracks import java.util.Locale diff --git a/player/video/src/main/java/dev/jdtech/jellyfin/dialogs/SpeedSelectionDialogFragment.kt b/player/video/src/main/java/org/askartv/phone/dialogs/SpeedSelectionDialogFragment.kt similarity index 89% rename from player/video/src/main/java/dev/jdtech/jellyfin/dialogs/SpeedSelectionDialogFragment.kt rename to player/video/src/main/java/org/askartv/phone/dialogs/SpeedSelectionDialogFragment.kt index 288f02ee..1392b405 100644 --- a/player/video/src/main/java/dev/jdtech/jellyfin/dialogs/SpeedSelectionDialogFragment.kt +++ b/player/video/src/main/java/org/askartv/phone/dialogs/SpeedSelectionDialogFragment.kt @@ -1,11 +1,11 @@ -package dev.jdtech.jellyfin.dialogs +package org.askartv.phone.dialogs import android.app.Dialog import android.os.Bundle import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.jdtech.jellyfin.player.video.R -import dev.jdtech.jellyfin.viewmodels.PlayerActivityViewModel +import org.askartv.phone.player.video.R +import org.askartv.phone.viewmodels.PlayerActivityViewModel import java.lang.IllegalStateException class SpeedSelectionDialogFragment( diff --git a/player/video/src/main/java/dev/jdtech/jellyfin/dialogs/TrackSelectionDialogFragment.kt b/player/video/src/main/java/org/askartv/phone/dialogs/TrackSelectionDialogFragment.kt similarity index 90% rename from player/video/src/main/java/dev/jdtech/jellyfin/dialogs/TrackSelectionDialogFragment.kt rename to player/video/src/main/java/org/askartv/phone/dialogs/TrackSelectionDialogFragment.kt index db9c5285..8e158224 100644 --- a/player/video/src/main/java/dev/jdtech/jellyfin/dialogs/TrackSelectionDialogFragment.kt +++ b/player/video/src/main/java/org/askartv/phone/dialogs/TrackSelectionDialogFragment.kt @@ -1,13 +1,13 @@ -package dev.jdtech.jellyfin.dialogs +package org.askartv.phone.dialogs import android.app.Dialog import android.os.Bundle import androidx.fragment.app.DialogFragment import androidx.media3.common.C import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.jdtech.jellyfin.getTrackNames -import dev.jdtech.jellyfin.player.video.R -import dev.jdtech.jellyfin.viewmodels.PlayerActivityViewModel +import org.askartv.phone.getTrackNames +import org.askartv.phone.player.video.R +import org.askartv.phone.viewmodels.PlayerActivityViewModel import java.lang.IllegalStateException class TrackSelectionDialogFragment( diff --git a/player/video/src/main/java/dev/jdtech/jellyfin/dialogs/VideoVersionDialogFragment.kt b/player/video/src/main/java/org/askartv/phone/dialogs/VideoVersionDialogFragment.kt similarity index 84% rename from player/video/src/main/java/dev/jdtech/jellyfin/dialogs/VideoVersionDialogFragment.kt rename to player/video/src/main/java/org/askartv/phone/dialogs/VideoVersionDialogFragment.kt index 59a3ae43..f720497e 100644 --- a/player/video/src/main/java/dev/jdtech/jellyfin/dialogs/VideoVersionDialogFragment.kt +++ b/player/video/src/main/java/org/askartv/phone/dialogs/VideoVersionDialogFragment.kt @@ -1,10 +1,10 @@ -package dev.jdtech.jellyfin.dialogs +package org.askartv.phone.dialogs import android.content.Context import androidx.appcompat.app.AlertDialog import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.player.video.R +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.player.video.R fun getVideoVersionDialog( context: Context, diff --git a/player/video/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt b/player/video/src/main/java/org/askartv/phone/mpv/MPVPlayer.kt similarity index 99% rename from player/video/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt rename to player/video/src/main/java/org/askartv/phone/mpv/MPVPlayer.kt index d7004fe6..644e59df 100644 --- a/player/video/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt +++ b/player/video/src/main/java/org/askartv/phone/mpv/MPVPlayer.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.mpv +package org.askartv.phone.mpv import android.app.Application import android.content.Context diff --git a/player/video/src/main/java/dev/jdtech/jellyfin/mpv/TrackType.kt b/player/video/src/main/java/org/askartv/phone/mpv/TrackType.kt similarity index 94% rename from player/video/src/main/java/dev/jdtech/jellyfin/mpv/TrackType.kt rename to player/video/src/main/java/org/askartv/phone/mpv/TrackType.kt index 4a88121a..3b1f1c3a 100644 --- a/player/video/src/main/java/dev/jdtech/jellyfin/mpv/TrackType.kt +++ b/player/video/src/main/java/org/askartv/phone/mpv/TrackType.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.mpv +package org.askartv.phone.mpv import android.os.Parcelable import androidx.media3.common.C diff --git a/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt b/player/video/src/main/java/org/askartv/phone/viewmodels/PlayerActivityViewModel.kt similarity index 97% rename from player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt rename to player/video/src/main/java/org/askartv/phone/viewmodels/PlayerActivityViewModel.kt index 37b1ed42..ae1aa969 100644 --- a/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt +++ b/player/video/src/main/java/org/askartv/phone/viewmodels/PlayerActivityViewModel.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import android.app.Application import android.graphics.Bitmap @@ -19,14 +19,14 @@ import androidx.media3.exoplayer.DefaultRenderersFactory import androidx.media3.exoplayer.ExoPlayer import androidx.media3.exoplayer.trackselection.DefaultTrackSelector import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.AppPreferences -import dev.jdtech.jellyfin.models.Intro -import dev.jdtech.jellyfin.models.PlayerChapter -import dev.jdtech.jellyfin.models.PlayerItem -import dev.jdtech.jellyfin.models.Trickplay -import dev.jdtech.jellyfin.mpv.MPVPlayer -import dev.jdtech.jellyfin.player.video.R -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.AppPreferences +import org.askartv.phone.models.Intro +import org.askartv.phone.models.PlayerChapter +import org.askartv.phone.models.PlayerItem +import org.askartv.phone.models.Trickplay +import org.askartv.phone.mpv.MPVPlayer +import org.askartv.phone.player.video.R +import org.askartv.phone.repository.JellyfinRepository import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope diff --git a/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerViewModel.kt b/player/video/src/main/java/org/askartv/phone/viewmodels/PlayerViewModel.kt similarity index 91% rename from player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerViewModel.kt rename to player/video/src/main/java/org/askartv/phone/viewmodels/PlayerViewModel.kt index 9b3f76ff..a8c10ea0 100644 --- a/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerViewModel.kt +++ b/player/video/src/main/java/org/askartv/phone/viewmodels/PlayerViewModel.kt @@ -1,23 +1,23 @@ -package dev.jdtech.jellyfin.viewmodels +package org.askartv.phone.viewmodels import android.net.Uri import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.media3.common.MimeTypes import dagger.hilt.android.lifecycle.HiltViewModel -import dev.jdtech.jellyfin.models.ExternalSubtitle -import dev.jdtech.jellyfin.models.FindroidChapter -import dev.jdtech.jellyfin.models.FindroidEpisode -import dev.jdtech.jellyfin.models.FindroidItem -import dev.jdtech.jellyfin.models.FindroidMovie -import dev.jdtech.jellyfin.models.FindroidSeason -import dev.jdtech.jellyfin.models.FindroidShow -import dev.jdtech.jellyfin.models.FindroidSourceType -import dev.jdtech.jellyfin.models.FindroidSources -import dev.jdtech.jellyfin.models.PlayerChapter -import dev.jdtech.jellyfin.models.PlayerItem -import dev.jdtech.jellyfin.models.TrickplayInfo -import dev.jdtech.jellyfin.repository.JellyfinRepository +import org.askartv.phone.models.ExternalSubtitle +import org.askartv.phone.models.FindroidChapter +import org.askartv.phone.models.FindroidEpisode +import org.askartv.phone.models.FindroidItem +import org.askartv.phone.models.FindroidMovie +import org.askartv.phone.models.FindroidSeason +import org.askartv.phone.models.FindroidShow +import org.askartv.phone.models.FindroidSourceType +import org.askartv.phone.models.FindroidSources +import org.askartv.phone.models.PlayerChapter +import org.askartv.phone.models.PlayerItem +import org.askartv.phone.models.TrickplayInfo +import org.askartv.phone.repository.JellyfinRepository import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.launch diff --git a/preferences/build.gradle.kts b/preferences/build.gradle.kts index 9bbb61fb..c4b6dbf1 100644 --- a/preferences/build.gradle.kts +++ b/preferences/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } android { - namespace = "dev.jdtech.jellyfin.preferences" + namespace = "org.askartv.phone.preferences" compileSdk = Versions.compileSdk buildToolsVersion = Versions.buildTools diff --git a/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt b/preferences/src/main/java/org/askartv/phone/AppPreferences.kt similarity index 99% rename from preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt rename to preferences/src/main/java/org/askartv/phone/AppPreferences.kt index eb7e9dca..e27463b2 100644 --- a/preferences/src/main/java/dev/jdtech/jellyfin/AppPreferences.kt +++ b/preferences/src/main/java/org/askartv/phone/AppPreferences.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin +package org.askartv.phone import android.content.SharedPreferences import android.view.WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE diff --git a/preferences/src/main/java/dev/jdtech/jellyfin/Constants.kt b/preferences/src/main/java/org/askartv/phone/Constants.kt similarity index 99% rename from preferences/src/main/java/dev/jdtech/jellyfin/Constants.kt rename to preferences/src/main/java/org/askartv/phone/Constants.kt index cca99608..7c6f28ef 100644 --- a/preferences/src/main/java/dev/jdtech/jellyfin/Constants.kt +++ b/preferences/src/main/java/org/askartv/phone/Constants.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin +package org.askartv.phone object Constants { diff --git a/preferences/src/main/java/dev/jdtech/jellyfin/models/Preference.kt b/preferences/src/main/java/org/askartv/phone/models/Preference.kt similarity index 83% rename from preferences/src/main/java/dev/jdtech/jellyfin/models/Preference.kt rename to preferences/src/main/java/org/askartv/phone/models/Preference.kt index 4f90dae9..ffaf4c26 100644 --- a/preferences/src/main/java/dev/jdtech/jellyfin/models/Preference.kt +++ b/preferences/src/main/java/org/askartv/phone/models/Preference.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models interface Preference { val nameStringResource: Int diff --git a/preferences/src/main/java/dev/jdtech/jellyfin/models/PreferenceCategory.kt b/preferences/src/main/java/org/askartv/phone/models/PreferenceCategory.kt similarity index 93% rename from preferences/src/main/java/dev/jdtech/jellyfin/models/PreferenceCategory.kt rename to preferences/src/main/java/org/askartv/phone/models/PreferenceCategory.kt index ed4ba555..eb346510 100644 --- a/preferences/src/main/java/dev/jdtech/jellyfin/models/PreferenceCategory.kt +++ b/preferences/src/main/java/org/askartv/phone/models/PreferenceCategory.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/preferences/src/main/java/dev/jdtech/jellyfin/models/PreferenceSelect.kt b/preferences/src/main/java/org/askartv/phone/models/PreferenceSelect.kt similarity index 94% rename from preferences/src/main/java/dev/jdtech/jellyfin/models/PreferenceSelect.kt rename to preferences/src/main/java/org/askartv/phone/models/PreferenceSelect.kt index f0a58cfd..91febd5d 100644 --- a/preferences/src/main/java/dev/jdtech/jellyfin/models/PreferenceSelect.kt +++ b/preferences/src/main/java/org/askartv/phone/models/PreferenceSelect.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/preferences/src/main/java/dev/jdtech/jellyfin/models/PreferenceSwitch.kt b/preferences/src/main/java/org/askartv/phone/models/PreferenceSwitch.kt similarity index 93% rename from preferences/src/main/java/dev/jdtech/jellyfin/models/PreferenceSwitch.kt rename to preferences/src/main/java/org/askartv/phone/models/PreferenceSwitch.kt index b276978b..fab1b6fb 100644 --- a/preferences/src/main/java/dev/jdtech/jellyfin/models/PreferenceSwitch.kt +++ b/preferences/src/main/java/org/askartv/phone/models/PreferenceSwitch.kt @@ -1,4 +1,4 @@ -package dev.jdtech.jellyfin.models +package org.askartv.phone.models import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/settings.gradle.kts b/settings.gradle.kts index 8a24003c..ddbc5993 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,6 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") -rootProject.name = "findroid" +rootProject.name = "askarfin" include(":app:phone") include(":app:tv")