diff --git a/README.md b/README.md index 1c06560e..98312890 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 5a0617ff..12f8231f 100644 --- a/app/phone/build.gradle.kts +++ b/app/phone/build.gradle.kts @@ -10,19 +10,19 @@ plugins { } android { - namespace = "org.askartv.phone" + namespace = "com.nomadics9.ananas" compileSdk = Versions.compileSdk buildToolsVersion = Versions.buildTools defaultConfig { - applicationId = "org.askartv.phone" + applicationId = "com.nomadics9.ananas" minSdk = Versions.minSdk targetSdk = Versions.targetSdk versionCode = Versions.appCode versionName = Versions.appName - testInstrumentationRunner = "org.askartv.phone.HiltTestRunner" + testInstrumentationRunner = "com.nomadics9.ananas.HiltTestRunner" } applicationVariants.all { diff --git a/app/phone/proguard-rules.pro b/app/phone/proguard-rules.pro index f1dc601b..664ad57d 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 org.askartv.phone.models.PlayerItem +-keepnames class com.nomadics9.ananas.models.PlayerItem # ProGuard thinks all SettingsFragments are unused --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 +-keep class com.nomadics9.ananas.fragments.SettingsLanguageFragment +-keep class com.nomadics9.ananas.fragments.SettingsAppearanceFragment +-keep class com.nomadics9.ananas.fragments.SettingsDownloadsFragment +-keep class com.nomadics9.ananas.fragments.SettingsPlayerFragment +-keep class com.nomadics9.ananas.fragments.SettingsDeviceFragment +-keep class com.nomadics9.ananas.fragments.SettingsCacheFragment +-keep class com.nomadics9.ananas.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/org/askartv/phone/HiltTestRunner.kt b/app/phone/src/androidTest/kotlin/com/nomadics9/ananas/HiltTestRunner.kt similarity index 93% rename from app/phone/src/androidTest/kotlin/org/askartv/phone/HiltTestRunner.kt rename to app/phone/src/androidTest/kotlin/com/nomadics9/ananas/HiltTestRunner.kt index 4b537324..c24bb0a0 100644 --- a/app/phone/src/androidTest/kotlin/org/askartv/phone/HiltTestRunner.kt +++ b/app/phone/src/androidTest/kotlin/com/nomadics9/ananas/HiltTestRunner.kt @@ -1,4 +1,4 @@ -package org.askartv.phone +package com.nomadics9.ananas import android.app.Application import android.content.Context diff --git a/app/phone/src/androidTest/kotlin/org/askartv/phone/MainActivityTest.kt b/app/phone/src/androidTest/kotlin/com/nomadics9/ananas/MainActivityTest.kt similarity index 97% rename from app/phone/src/androidTest/kotlin/org/askartv/phone/MainActivityTest.kt rename to app/phone/src/androidTest/kotlin/com/nomadics9/ananas/MainActivityTest.kt index b914a0b3..5455c170 100644 --- a/app/phone/src/androidTest/kotlin/org/askartv/phone/MainActivityTest.kt +++ b/app/phone/src/androidTest/kotlin/com/nomadics9/ananas/MainActivityTest.kt @@ -1,4 +1,4 @@ -package org.askartv.phone +package com.nomadics9.ananas 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 org.askartv.phone.di.DatabaseModule +import com.nomadics9.ananas.di.DatabaseModule import org.hamcrest.CoreMatchers.allOf import org.hamcrest.CoreMatchers.not import org.junit.Before diff --git a/app/phone/src/androidTest/kotlin/org/askartv/phone/ViewPropertyChangeCallback.kt b/app/phone/src/androidTest/kotlin/com/nomadics9/ananas/ViewPropertyChangeCallback.kt similarity index 98% rename from app/phone/src/androidTest/kotlin/org/askartv/phone/ViewPropertyChangeCallback.kt rename to app/phone/src/androidTest/kotlin/com/nomadics9/ananas/ViewPropertyChangeCallback.kt index af69fa29..d1ec4ac0 100644 --- a/app/phone/src/androidTest/kotlin/org/askartv/phone/ViewPropertyChangeCallback.kt +++ b/app/phone/src/androidTest/kotlin/com/nomadics9/ananas/ViewPropertyChangeCallback.kt @@ -1,4 +1,4 @@ -package org.askartv.phone +package com.nomadics9.ananas import android.view.View import android.view.ViewTreeObserver diff --git a/app/phone/src/androidTest/kotlin/org/askartv/phone/di/DatabaseTestModule.kt b/app/phone/src/androidTest/kotlin/com/nomadics9/ananas/di/DatabaseTestModule.kt similarity index 84% rename from app/phone/src/androidTest/kotlin/org/askartv/phone/di/DatabaseTestModule.kt rename to app/phone/src/androidTest/kotlin/com/nomadics9/ananas/di/DatabaseTestModule.kt index 10008909..608aef5a 100644 --- a/app/phone/src/androidTest/kotlin/org/askartv/phone/di/DatabaseTestModule.kt +++ b/app/phone/src/androidTest/kotlin/com/nomadics9/ananas/di/DatabaseTestModule.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.di +package com.nomadics9.ananas.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 org.askartv.phone.database.ServerDatabase -import org.askartv.phone.database.ServerDatabaseDao +import com.nomadics9.ananas.database.ServerDatabase +import com.nomadics9.ananas.database.ServerDatabaseDao import javax.inject.Singleton @Module diff --git a/app/phone/src/main/java/org/askartv/phone/BaseApplication.kt b/app/phone/src/main/java/com/nomadics9/ananas/BaseApplication.kt similarity index 96% rename from app/phone/src/main/java/org/askartv/phone/BaseApplication.kt rename to app/phone/src/main/java/com/nomadics9/ananas/BaseApplication.kt index 7aedf409..61728884 100644 --- a/app/phone/src/main/java/org/askartv/phone/BaseApplication.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/BaseApplication.kt @@ -1,4 +1,4 @@ -package org.askartv.phone +package com.nomadics9.ananas 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 org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR @HiltAndroidApp class BaseApplication : Application(), Configuration.Provider, ImageLoaderFactory { diff --git a/app/phone/src/main/java/org/askartv/phone/BasePlayerActivity.kt b/app/phone/src/main/java/com/nomadics9/ananas/BasePlayerActivity.kt similarity index 96% rename from app/phone/src/main/java/org/askartv/phone/BasePlayerActivity.kt rename to app/phone/src/main/java/com/nomadics9/ananas/BasePlayerActivity.kt index 8f26c53a..83daa036 100644 --- a/app/phone/src/main/java/org/askartv/phone/BasePlayerActivity.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/BasePlayerActivity.kt @@ -1,4 +1,4 @@ -package org.askartv.phone +package com.nomadics9.ananas 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 org.askartv.phone.viewmodels.PlayerActivityViewModel +import com.nomadics9.ananas.viewmodels.PlayerActivityViewModel abstract class BasePlayerActivity : AppCompatActivity() { diff --git a/app/phone/src/main/java/org/askartv/phone/BindingAdapters.kt b/app/phone/src/main/java/com/nomadics9/ananas/BindingAdapters.kt similarity index 90% rename from app/phone/src/main/java/org/askartv/phone/BindingAdapters.kt rename to app/phone/src/main/java/com/nomadics9/ananas/BindingAdapters.kt index 5d8446dc..7524ca21 100644 --- a/app/phone/src/main/java/org/askartv/phone/BindingAdapters.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/BindingAdapters.kt @@ -1,20 +1,20 @@ -package org.askartv.phone +package com.nomadics9.ananas import android.view.View import android.widget.ImageView import androidx.annotation.DrawableRes import coil.load -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 com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.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 org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR fun bindItemImage(imageView: ImageView, item: BaseItemDto) { val itemId = diff --git a/app/phone/src/main/java/org/askartv/phone/MainActivity.kt b/app/phone/src/main/java/com/nomadics9/ananas/MainActivity.kt similarity index 94% rename from app/phone/src/main/java/org/askartv/phone/MainActivity.kt rename to app/phone/src/main/java/com/nomadics9/ananas/MainActivity.kt index 694fc90f..6fcc5a19 100644 --- a/app/phone/src/main/java/org/askartv/phone/MainActivity.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/MainActivity.kt @@ -1,4 +1,4 @@ -package org.askartv.phone +package com.nomadics9.ananas 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 org.askartv.phone.database.ServerDatabaseDao -import org.askartv.phone.databinding.ActivityMainBinding -import org.askartv.phone.viewmodels.MainViewModel -import org.askartv.phone.work.SyncWorker +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.databinding.ActivityMainBinding +import com.nomadics9.ananas.viewmodels.MainViewModel +import com.nomadics9.ananas.work.SyncWorker import javax.inject.Inject -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR @AndroidEntryPoint class MainActivity : AppCompatActivity() { diff --git a/app/phone/src/main/java/org/askartv/phone/PlayerActivity.kt b/app/phone/src/main/java/com/nomadics9/ananas/PlayerActivity.kt similarity index 96% rename from app/phone/src/main/java/org/askartv/phone/PlayerActivity.kt rename to app/phone/src/main/java/com/nomadics9/ananas/PlayerActivity.kt index 21217771..bb88cee3 100644 --- a/app/phone/src/main/java/org/askartv/phone/PlayerActivity.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/PlayerActivity.kt @@ -1,4 +1,4 @@ -package org.askartv.phone +package com.nomadics9.ananas 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 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 com.nomadics9.ananas.databinding.ActivityPlayerBinding +import com.nomadics9.ananas.dialogs.SpeedSelectionDialogFragment +import com.nomadics9.ananas.dialogs.TrackSelectionDialogFragment +import com.nomadics9.ananas.viewmodels.PlayerActivityViewModel +import com.nomadics9.ananas.viewmodels.PlayerEvents import kotlinx.coroutines.launch -import org.askartv.phone.utils.PlayerGestureHelper -import org.askartv.phone.utils.PreviewScrubListener +import com.nomadics9.ananas.utils.PlayerGestureHelper +import com.nomadics9.ananas.utils.PreviewScrubListener import timber.log.Timber import javax.inject.Inject diff --git a/app/phone/src/main/java/org/askartv/phone/adapters/CollectionListAdapter.kt b/app/phone/src/main/java/com/nomadics9/ananas/adapters/CollectionListAdapter.kt similarity index 89% rename from app/phone/src/main/java/org/askartv/phone/adapters/CollectionListAdapter.kt rename to app/phone/src/main/java/com/nomadics9/ananas/adapters/CollectionListAdapter.kt index 9cb78d5a..53338ef6 100644 --- a/app/phone/src/main/java/org/askartv/phone/adapters/CollectionListAdapter.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/adapters/CollectionListAdapter.kt @@ -1,13 +1,13 @@ -package org.askartv.phone.adapters +package com.nomadics9.ananas.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 org.askartv.phone.bindCardItemImage -import org.askartv.phone.databinding.CollectionItemBinding -import org.askartv.phone.models.FindroidCollection +import com.nomadics9.ananas.bindCardItemImage +import com.nomadics9.ananas.databinding.CollectionItemBinding +import com.nomadics9.ananas.models.FindroidCollection class CollectionListAdapter( private val onClickListener: (collection: FindroidCollection) -> Unit, diff --git a/app/phone/src/main/java/org/askartv/phone/adapters/DiscoveredServerListAdapter.kt b/app/phone/src/main/java/com/nomadics9/ananas/adapters/DiscoveredServerListAdapter.kt similarity index 91% rename from app/phone/src/main/java/org/askartv/phone/adapters/DiscoveredServerListAdapter.kt rename to app/phone/src/main/java/com/nomadics9/ananas/adapters/DiscoveredServerListAdapter.kt index 0d02e46e..0a24a11c 100644 --- a/app/phone/src/main/java/org/askartv/phone/adapters/DiscoveredServerListAdapter.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/adapters/DiscoveredServerListAdapter.kt @@ -1,12 +1,12 @@ -package org.askartv.phone.adapters +package com.nomadics9.ananas.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 org.askartv.phone.databinding.DiscoveredServerItemBinding -import org.askartv.phone.models.DiscoveredServer +import com.nomadics9.ananas.databinding.DiscoveredServerItemBinding +import com.nomadics9.ananas.models.DiscoveredServer class DiscoveredServerListAdapter( private val clickListener: (server: DiscoveredServer) -> Unit, diff --git a/app/phone/src/main/java/org/askartv/phone/adapters/EpisodeListAdapter.kt b/app/phone/src/main/java/com/nomadics9/ananas/adapters/EpisodeListAdapter.kt similarity index 90% rename from app/phone/src/main/java/org/askartv/phone/adapters/EpisodeListAdapter.kt rename to app/phone/src/main/java/com/nomadics9/ananas/adapters/EpisodeListAdapter.kt index a33c02d1..0d9c5f59 100644 --- a/app/phone/src/main/java/org/askartv/phone/adapters/EpisodeListAdapter.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/adapters/EpisodeListAdapter.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.adapters +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.bindCardItemImage +import com.nomadics9.ananas.bindItemBackdropById +import com.nomadics9.ananas.bindSeasonPoster +import com.nomadics9.ananas.databinding.EpisodeItemBinding +import com.nomadics9.ananas.databinding.SeasonHeaderBinding +import com.nomadics9.ananas.models.EpisodeItem +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.isDownloaded +import com.nomadics9.ananas.core.R as CoreR private const val ITEM_VIEW_TYPE_HEADER = 0 private const val ITEM_VIEW_TYPE_EPISODE = 1 diff --git a/app/phone/src/main/java/org/askartv/phone/adapters/FavoritesListAdapter.kt b/app/phone/src/main/java/com/nomadics9/ananas/adapters/FavoritesListAdapter.kt similarity index 90% rename from app/phone/src/main/java/org/askartv/phone/adapters/FavoritesListAdapter.kt rename to app/phone/src/main/java/com/nomadics9/ananas/adapters/FavoritesListAdapter.kt index cf381de2..ed9b88be 100644 --- a/app/phone/src/main/java/org/askartv/phone/adapters/FavoritesListAdapter.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/adapters/FavoritesListAdapter.kt @@ -1,14 +1,14 @@ -package org.askartv.phone.adapters +package com.nomadics9.ananas.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 org.askartv.phone.Constants -import org.askartv.phone.databinding.FavoriteSectionBinding -import org.askartv.phone.models.FavoriteSection -import org.askartv.phone.models.FindroidItem +import com.nomadics9.ananas.Constants +import com.nomadics9.ananas.databinding.FavoriteSectionBinding +import com.nomadics9.ananas.models.FavoriteSection +import com.nomadics9.ananas.models.FindroidItem class FavoritesListAdapter( private val onItemClickListener: (item: FindroidItem) -> Unit, diff --git a/app/phone/src/main/java/org/askartv/phone/adapters/HomeEpisodeListAdapter.kt b/app/phone/src/main/java/com/nomadics9/ananas/adapters/HomeEpisodeListAdapter.kt similarity index 88% rename from app/phone/src/main/java/org/askartv/phone/adapters/HomeEpisodeListAdapter.kt rename to app/phone/src/main/java/com/nomadics9/ananas/adapters/HomeEpisodeListAdapter.kt index 509f7f63..2c7adfbc 100644 --- a/app/phone/src/main/java/org/askartv/phone/adapters/HomeEpisodeListAdapter.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/adapters/HomeEpisodeListAdapter.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.adapters +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.bindCardItemImage +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.databinding.HomeEpisodeItemBinding +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.isDownloaded class HomeEpisodeListAdapter(private val onClickListener: (item: FindroidItem) -> Unit) : ListAdapter(DiffCallback) { class EpisodeViewHolder( diff --git a/app/phone/src/main/java/org/askartv/phone/adapters/PersonListAdapter.kt b/app/phone/src/main/java/com/nomadics9/ananas/adapters/PersonListAdapter.kt similarity index 92% rename from app/phone/src/main/java/org/askartv/phone/adapters/PersonListAdapter.kt rename to app/phone/src/main/java/com/nomadics9/ananas/adapters/PersonListAdapter.kt index e03dfb4c..f554ba05 100644 --- a/app/phone/src/main/java/org/askartv/phone/adapters/PersonListAdapter.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/adapters/PersonListAdapter.kt @@ -1,12 +1,12 @@ -package org.askartv.phone.adapters +package com.nomadics9.ananas.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 org.askartv.phone.bindPersonImage -import org.askartv.phone.databinding.PersonItemBinding +import com.nomadics9.ananas.bindPersonImage +import com.nomadics9.ananas.databinding.PersonItemBinding import org.jellyfin.sdk.model.api.BaseItemPerson class PersonListAdapter(private val clickListener: (item: BaseItemPerson) -> Unit) : ListAdapter(DiffCallback) { diff --git a/app/phone/src/main/java/org/askartv/phone/adapters/ServerAddressAdapter.kt b/app/phone/src/main/java/com/nomadics9/ananas/adapters/ServerAddressAdapter.kt similarity index 91% rename from app/phone/src/main/java/org/askartv/phone/adapters/ServerAddressAdapter.kt rename to app/phone/src/main/java/com/nomadics9/ananas/adapters/ServerAddressAdapter.kt index fda933de..482c4810 100644 --- a/app/phone/src/main/java/org/askartv/phone/adapters/ServerAddressAdapter.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/adapters/ServerAddressAdapter.kt @@ -1,12 +1,12 @@ -package org.askartv.phone.adapters +package com.nomadics9.ananas.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 org.askartv.phone.databinding.ServerAddressListItemBinding -import org.askartv.phone.models.ServerAddress +import com.nomadics9.ananas.databinding.ServerAddressListItemBinding +import com.nomadics9.ananas.models.ServerAddress class ServerAddressAdapter( private val clickListener: (address: ServerAddress) -> Unit, diff --git a/app/phone/src/main/java/org/askartv/phone/adapters/ServerGridAdapter.kt b/app/phone/src/main/java/com/nomadics9/ananas/adapters/ServerGridAdapter.kt similarity index 91% rename from app/phone/src/main/java/org/askartv/phone/adapters/ServerGridAdapter.kt rename to app/phone/src/main/java/com/nomadics9/ananas/adapters/ServerGridAdapter.kt index a2e2a872..31737e03 100644 --- a/app/phone/src/main/java/org/askartv/phone/adapters/ServerGridAdapter.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/adapters/ServerGridAdapter.kt @@ -1,12 +1,12 @@ -package org.askartv.phone.adapters +package com.nomadics9.ananas.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 org.askartv.phone.databinding.ServerItemBinding -import org.askartv.phone.models.Server +import com.nomadics9.ananas.databinding.ServerItemBinding +import com.nomadics9.ananas.models.Server class ServerGridAdapter( private val onClickListener: (server: Server) -> Unit, diff --git a/app/phone/src/main/java/org/askartv/phone/adapters/UserListAdapter.kt b/app/phone/src/main/java/com/nomadics9/ananas/adapters/UserListAdapter.kt similarity index 89% rename from app/phone/src/main/java/org/askartv/phone/adapters/UserListAdapter.kt rename to app/phone/src/main/java/com/nomadics9/ananas/adapters/UserListAdapter.kt index 942fa0c0..12bf6386 100644 --- a/app/phone/src/main/java/org/askartv/phone/adapters/UserListAdapter.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/adapters/UserListAdapter.kt @@ -1,13 +1,13 @@ -package org.askartv.phone.adapters +package com.nomadics9.ananas.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 org.askartv.phone.bindUserImage -import org.askartv.phone.databinding.UserListItemBinding -import org.askartv.phone.models.User +import com.nomadics9.ananas.bindUserImage +import com.nomadics9.ananas.databinding.UserListItemBinding +import com.nomadics9.ananas.models.User class UserListAdapter( private val clickListener: (user: User) -> Unit, diff --git a/app/phone/src/main/java/org/askartv/phone/adapters/UserLoginListAdapter.kt b/app/phone/src/main/java/com/nomadics9/ananas/adapters/UserLoginListAdapter.kt similarity index 89% rename from app/phone/src/main/java/org/askartv/phone/adapters/UserLoginListAdapter.kt rename to app/phone/src/main/java/com/nomadics9/ananas/adapters/UserLoginListAdapter.kt index 6c40db33..c1767a5a 100644 --- a/app/phone/src/main/java/org/askartv/phone/adapters/UserLoginListAdapter.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/adapters/UserLoginListAdapter.kt @@ -1,13 +1,13 @@ -package org.askartv.phone.adapters +package com.nomadics9.ananas.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 org.askartv.phone.bindUserImage -import org.askartv.phone.databinding.UserItemBinding -import org.askartv.phone.models.User +import com.nomadics9.ananas.bindUserImage +import com.nomadics9.ananas.databinding.UserItemBinding +import com.nomadics9.ananas.models.User class UserLoginListAdapter( private val clickListener: (user: User) -> Unit, diff --git a/app/phone/src/main/java/org/askartv/phone/adapters/ViewItemListAdapter.kt b/app/phone/src/main/java/com/nomadics9/ananas/adapters/ViewItemListAdapter.kt similarity index 88% rename from app/phone/src/main/java/org/askartv/phone/adapters/ViewItemListAdapter.kt rename to app/phone/src/main/java/com/nomadics9/ananas/adapters/ViewItemListAdapter.kt index 98a9d641..1ff6e279 100644 --- a/app/phone/src/main/java/org/askartv/phone/adapters/ViewItemListAdapter.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/adapters/ViewItemListAdapter.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.adapters +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.bindItemImage +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.databinding.BaseItemBinding +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.isDownloaded class ViewItemListAdapter( private val onClickListener: (item: FindroidItem) -> Unit, diff --git a/app/phone/src/main/java/org/askartv/phone/adapters/ViewItemPagingAdapter.kt b/app/phone/src/main/java/com/nomadics9/ananas/adapters/ViewItemPagingAdapter.kt similarity index 88% rename from app/phone/src/main/java/org/askartv/phone/adapters/ViewItemPagingAdapter.kt rename to app/phone/src/main/java/com/nomadics9/ananas/adapters/ViewItemPagingAdapter.kt index 653e1d86..3cc4e582 100644 --- a/app/phone/src/main/java/org/askartv/phone/adapters/ViewItemPagingAdapter.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/adapters/ViewItemPagingAdapter.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.adapters +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.bindItemImage +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.databinding.BaseItemBinding +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.isDownloaded class ViewItemPagingAdapter( private val onClickListener: (item: FindroidItem) -> Unit, diff --git a/app/phone/src/main/java/org/askartv/phone/adapters/ViewListAdapter.kt b/app/phone/src/main/java/com/nomadics9/ananas/adapters/ViewListAdapter.kt similarity index 92% rename from app/phone/src/main/java/org/askartv/phone/adapters/ViewListAdapter.kt rename to app/phone/src/main/java/com/nomadics9/ananas/adapters/ViewListAdapter.kt index ebaf52a7..ab3e3ca6 100644 --- a/app/phone/src/main/java/org/askartv/phone/adapters/ViewListAdapter.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/adapters/ViewListAdapter.kt @@ -1,17 +1,17 @@ -package org.askartv.phone.adapters +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.databinding.CardOfflineBinding +import com.nomadics9.ananas.databinding.NextUpSectionBinding +import com.nomadics9.ananas.databinding.ViewItemBinding +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.HomeItem +import com.nomadics9.ananas.models.View +import com.nomadics9.ananas.core.R as CoreR private const val ITEM_VIEW_TYPE_NEXT_UP = 0 private const val ITEM_VIEW_TYPE_VIEW = 1 diff --git a/app/phone/src/main/java/org/askartv/phone/di/AppModule.kt b/app/phone/src/main/java/com/nomadics9/ananas/di/AppModule.kt similarity index 85% rename from app/phone/src/main/java/org/askartv/phone/di/AppModule.kt rename to app/phone/src/main/java/com/nomadics9/ananas/di/AppModule.kt index bff4c9e5..1e8bd4ff 100644 --- a/app/phone/src/main/java/org/askartv/phone/di/AppModule.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/di/AppModule.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.di +package com.nomadics9.ananas.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 org.askartv.phone.BaseApplication +import com.nomadics9.ananas.BaseApplication import javax.inject.Singleton @Module diff --git a/app/phone/src/main/java/org/askartv/phone/dialogs/StorageSelectionDialog.kt b/app/phone/src/main/java/com/nomadics9/ananas/dialogs/StorageSelectionDialog.kt similarity index 92% rename from app/phone/src/main/java/org/askartv/phone/dialogs/StorageSelectionDialog.kt rename to app/phone/src/main/java/com/nomadics9/ananas/dialogs/StorageSelectionDialog.kt index 74237dc9..29129948 100644 --- a/app/phone/src/main/java/org/askartv/phone/dialogs/StorageSelectionDialog.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/dialogs/StorageSelectionDialog.kt @@ -1,11 +1,11 @@ -package org.askartv.phone.dialogs +package com.nomadics9.ananas.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 org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR fun getStorageSelectionDialog( context: Context, diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/AddServerFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/AddServerFragment.kt similarity index 94% rename from app/phone/src/main/java/org/askartv/phone/fragments/AddServerFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/AddServerFragment.kt index 61b4d5b5..fc971f4f 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/AddServerFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/AddServerFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 org.askartv.phone.adapters.DiscoveredServerListAdapter -import org.askartv.phone.databinding.FragmentAddServerBinding -import org.askartv.phone.viewmodels.AddServerEvent -import org.askartv.phone.viewmodels.AddServerViewModel +import com.nomadics9.ananas.adapters.DiscoveredServerListAdapter +import com.nomadics9.ananas.databinding.FragmentAddServerBinding +import com.nomadics9.ananas.viewmodels.AddServerEvent +import com.nomadics9.ananas.viewmodels.AddServerViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/CollectionFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/CollectionFragment.kt similarity index 88% rename from app/phone/src/main/java/org/askartv/phone/fragments/CollectionFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/CollectionFragment.kt index bc59f5d9..2eebc6c8 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/CollectionFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/CollectionFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.adapters.FavoritesListAdapter +import com.nomadics9.ananas.databinding.FragmentFavoriteBinding +import com.nomadics9.ananas.dialogs.ErrorDialogFragment +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.utils.checkIfLoginRequired +import com.nomadics9.ananas.viewmodels.CollectionViewModel import kotlinx.coroutines.launch import timber.log.Timber -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR @AndroidEntryPoint class CollectionFragment : Fragment() { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/DownloadsFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/DownloadsFragment.kt similarity index 88% rename from app/phone/src/main/java/org/askartv/phone/fragments/DownloadsFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/DownloadsFragment.kt index 2a758f26..59cf54c5 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/DownloadsFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/DownloadsFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.adapters.FavoritesListAdapter +import com.nomadics9.ananas.databinding.FragmentDownloadsBinding +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.utils.restart +import com.nomadics9.ananas.viewmodels.DownloadsEvent +import com.nomadics9.ananas.viewmodels.DownloadsViewModel import kotlinx.coroutines.launch import timber.log.Timber import javax.inject.Inject -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR @AndroidEntryPoint class DownloadsFragment : Fragment() { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/EpisodeBottomSheetFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/EpisodeBottomSheetFragment.kt similarity index 94% rename from app/phone/src/main/java/org/askartv/phone/fragments/EpisodeBottomSheetFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/EpisodeBottomSheetFragment.kt index a958b88f..f6ae4229 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/EpisodeBottomSheetFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/EpisodeBottomSheetFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.R +import com.nomadics9.ananas.bindCardItemImage +import com.nomadics9.ananas.databinding.EpisodeBottomSheetBinding +import com.nomadics9.ananas.dialogs.ErrorDialogFragment +import com.nomadics9.ananas.dialogs.getStorageSelectionDialog +import com.nomadics9.ananas.dialogs.getVideoVersionDialog +import com.nomadics9.ananas.models.FindroidSourceType +import com.nomadics9.ananas.models.PlayerItem +import com.nomadics9.ananas.models.UiText +import com.nomadics9.ananas.models.isDownloaded +import com.nomadics9.ananas.models.isDownloading +import com.nomadics9.ananas.utils.setIconTintColorAttribute +import com.nomadics9.ananas.viewmodels.EpisodeBottomSheetEvent +import com.nomadics9.ananas.viewmodels.EpisodeBottomSheetViewModel +import com.nomadics9.ananas.viewmodels.PlayerItemsEvent +import com.nomadics9.ananas.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 org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR @AndroidEntryPoint class EpisodeBottomSheetFragment : BottomSheetDialogFragment() { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/FavoriteFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/FavoriteFragment.kt similarity index 88% rename from app/phone/src/main/java/org/askartv/phone/fragments/FavoriteFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/FavoriteFragment.kt index 1ba9dea4..9ccc8c12 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/FavoriteFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/FavoriteFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.adapters.FavoritesListAdapter +import com.nomadics9.ananas.databinding.FragmentFavoriteBinding +import com.nomadics9.ananas.dialogs.ErrorDialogFragment +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.utils.checkIfLoginRequired +import com.nomadics9.ananas.viewmodels.FavoriteViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/HomeFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/HomeFragment.kt similarity index 91% rename from app/phone/src/main/java/org/askartv/phone/fragments/HomeFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/HomeFragment.kt index ff422f6f..73f67153 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/HomeFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/HomeFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.adapters.ViewListAdapter +import com.nomadics9.ananas.databinding.FragmentHomeBinding +import com.nomadics9.ananas.dialogs.ErrorDialogFragment +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.utils.checkIfLoginRequired +import com.nomadics9.ananas.utils.restart +import com.nomadics9.ananas.viewmodels.HomeViewModel import kotlinx.coroutines.launch import timber.log.Timber import javax.inject.Inject -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR @AndroidEntryPoint class HomeFragment : Fragment() { @@ -202,7 +202,7 @@ class HomeFragment : Fragment() { checkIfLoginRequired(uiState.error.message) } - private fun navigateToLibraryFragment(view: org.askartv.phone.models.View) { + private fun navigateToLibraryFragment(view: com.nomadics9.ananas.models.View) { findNavController().navigate( HomeFragmentDirections.actionNavigationHomeToLibraryFragment( libraryId = view.id, diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/LibraryFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/LibraryFragment.kt similarity index 91% rename from app/phone/src/main/java/org/askartv/phone/fragments/LibraryFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/LibraryFragment.kt index 4cde01e0..862b0d12 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/LibraryFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/LibraryFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.adapters.ViewItemPagingAdapter +import com.nomadics9.ananas.databinding.FragmentLibraryBinding +import com.nomadics9.ananas.dialogs.ErrorDialogFragment +import com.nomadics9.ananas.dialogs.SortDialogFragment +import com.nomadics9.ananas.models.FindroidBoxSet +import com.nomadics9.ananas.models.FindroidFolder +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.models.SortBy +import com.nomadics9.ananas.utils.checkIfLoginRequired +import com.nomadics9.ananas.viewmodels.LibraryViewModel import kotlinx.coroutines.launch import org.jellyfin.sdk.model.api.SortOrder import java.lang.IllegalArgumentException import javax.inject.Inject -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR @AndroidEntryPoint class LibraryFragment : Fragment() { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/LoginFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/LoginFragment.kt similarity index 94% rename from app/phone/src/main/java/org/askartv/phone/fragments/LoginFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/LoginFragment.kt index 0bef03d9..401ddd9d 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/LoginFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/LoginFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.adapters.UserLoginListAdapter +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.databinding.FragmentLoginBinding +import com.nomadics9.ananas.viewmodels.LoginEvent +import com.nomadics9.ananas.viewmodels.LoginViewModel import kotlinx.coroutines.launch import timber.log.Timber import javax.inject.Inject -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR @AndroidEntryPoint class LoginFragment : Fragment() { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/MediaFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/MediaFragment.kt similarity index 92% rename from app/phone/src/main/java/org/askartv/phone/fragments/MediaFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/MediaFragment.kt index 91526fb5..ea32d85c 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/MediaFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/MediaFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.adapters.CollectionListAdapter +import com.nomadics9.ananas.databinding.FragmentMediaBinding +import com.nomadics9.ananas.dialogs.ErrorDialogFragment +import com.nomadics9.ananas.models.FindroidCollection +import com.nomadics9.ananas.utils.checkIfLoginRequired +import com.nomadics9.ananas.viewmodels.MediaViewModel import kotlinx.coroutines.launch import timber.log.Timber -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR @AndroidEntryPoint class MediaFragment : Fragment() { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/MovieFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/MovieFragment.kt similarity index 94% rename from app/phone/src/main/java/org/askartv/phone/fragments/MovieFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/MovieFragment.kt index 43dc9ca1..4eeca9ea 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/MovieFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/MovieFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.R +import com.nomadics9.ananas.adapters.PersonListAdapter +import com.nomadics9.ananas.bindItemBackdropImage +import com.nomadics9.ananas.databinding.FragmentMovieBinding +import com.nomadics9.ananas.dialogs.ErrorDialogFragment +import com.nomadics9.ananas.dialogs.getStorageSelectionDialog +import com.nomadics9.ananas.dialogs.getVideoVersionDialog +import com.nomadics9.ananas.models.AudioCodec +import com.nomadics9.ananas.models.DisplayProfile +import com.nomadics9.ananas.models.FindroidSourceType +import com.nomadics9.ananas.models.PlayerItem +import com.nomadics9.ananas.models.UiText +import com.nomadics9.ananas.models.isDownloaded +import com.nomadics9.ananas.models.isDownloading +import com.nomadics9.ananas.utils.checkIfLoginRequired +import com.nomadics9.ananas.utils.setIconTintColorAttribute +import com.nomadics9.ananas.viewmodels.MovieEvent +import com.nomadics9.ananas.viewmodels.MovieViewModel +import com.nomadics9.ananas.viewmodels.PlayerItemsEvent +import com.nomadics9.ananas.viewmodels.PlayerViewModel import kotlinx.coroutines.launch import timber.log.Timber import java.util.UUID import javax.inject.Inject -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR @AndroidEntryPoint class MovieFragment : Fragment() { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/PersonDetailFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/PersonDetailFragment.kt similarity index 90% rename from app/phone/src/main/java/org/askartv/phone/fragments/PersonDetailFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/PersonDetailFragment.kt index 808a1da5..ffe69acc 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/PersonDetailFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/PersonDetailFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.adapters.ViewItemListAdapter +import com.nomadics9.ananas.bindItemImage +import com.nomadics9.ananas.databinding.FragmentPersonDetailBinding +import com.nomadics9.ananas.dialogs.ErrorDialogFragment +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.utils.checkIfLoginRequired +import com.nomadics9.ananas.viewmodels.PersonDetailViewModel import kotlinx.coroutines.launch import timber.log.Timber -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR @AndroidEntryPoint internal class PersonDetailFragment : Fragment() { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/SearchResultFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SearchResultFragment.kt similarity index 89% rename from app/phone/src/main/java/org/askartv/phone/fragments/SearchResultFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/SearchResultFragment.kt index 9aa6b6bb..b57a15f3 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/SearchResultFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SearchResultFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.adapters.FavoritesListAdapter +import com.nomadics9.ananas.databinding.FragmentSearchResultBinding +import com.nomadics9.ananas.dialogs.ErrorDialogFragment +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.utils.checkIfLoginRequired +import com.nomadics9.ananas.viewmodels.SearchResultViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/SeasonFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SeasonFragment.kt similarity index 90% rename from app/phone/src/main/java/org/askartv/phone/fragments/SeasonFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/SeasonFragment.kt index 97558b45..bcd07f62 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/SeasonFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SeasonFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.adapters.EpisodeListAdapter +import com.nomadics9.ananas.databinding.FragmentSeasonBinding +import com.nomadics9.ananas.dialogs.ErrorDialogFragment +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.utils.checkIfLoginRequired +import com.nomadics9.ananas.viewmodels.SeasonEvent +import com.nomadics9.ananas.viewmodels.SeasonViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/ServerAddressesFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/ServerAddressesFragment.kt similarity index 88% rename from app/phone/src/main/java/org/askartv/phone/fragments/ServerAddressesFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/ServerAddressesFragment.kt index f11b45ad..67a86f20 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/ServerAddressesFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/ServerAddressesFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.adapters.ServerAddressAdapter +import com.nomadics9.ananas.databinding.FragmentServerAddressesBinding +import com.nomadics9.ananas.dialogs.AddServerAddressDialog +import com.nomadics9.ananas.dialogs.DeleteServerAddressDialog +import com.nomadics9.ananas.viewmodels.ServerAddressesEvent +import com.nomadics9.ananas.viewmodels.ServerAddressesViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/ServerSelectFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/ServerSelectFragment.kt similarity index 90% rename from app/phone/src/main/java/org/askartv/phone/fragments/ServerSelectFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/ServerSelectFragment.kt index f60834d6..b63f74bc 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/ServerSelectFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/ServerSelectFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.adapters.ServerGridAdapter +import com.nomadics9.ananas.databinding.FragmentServerSelectBinding +import com.nomadics9.ananas.dialogs.DeleteServerDialogFragment +import com.nomadics9.ananas.viewmodels.ServerSelectEvent +import com.nomadics9.ananas.viewmodels.ServerSelectViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsAppearanceFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsAppearanceFragment.kt similarity index 93% rename from app/phone/src/main/java/org/askartv/phone/fragments/SettingsAppearanceFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsAppearanceFragment.kt index cf22964c..c7c151f6 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsAppearanceFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsAppearanceFragment.kt @@ -1,11 +1,11 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.fragments import android.os.Bundle import androidx.appcompat.app.AppCompatDelegate import androidx.preference.ListPreference import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreferenceCompat -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR class SettingsAppearanceFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsCacheFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsCacheFragment.kt similarity index 87% rename from app/phone/src/main/java/org/askartv/phone/fragments/SettingsCacheFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsCacheFragment.kt index 745b1f88..2180f9d3 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsCacheFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsCacheFragment.kt @@ -1,10 +1,10 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.fragments import android.os.Bundle import android.text.InputType import androidx.preference.EditTextPreference import androidx.preference.PreferenceFragmentCompat -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR class SettingsCacheFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsDeviceFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsDeviceFragment.kt similarity index 83% rename from app/phone/src/main/java/org/askartv/phone/fragments/SettingsDeviceFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsDeviceFragment.kt index 9382596d..db0ebd0a 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsDeviceFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsDeviceFragment.kt @@ -1,12 +1,12 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.fragments import android.os.Bundle import androidx.fragment.app.viewModels import androidx.preference.EditTextPreference import androidx.preference.PreferenceFragmentCompat import dagger.hilt.android.AndroidEntryPoint -import org.askartv.phone.viewmodels.SettingsDeviceViewModel -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.viewmodels.SettingsDeviceViewModel +import com.nomadics9.ananas.core.R as CoreR @AndroidEntryPoint class SettingsDeviceFragment : PreferenceFragmentCompat() { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsDownloadsFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsDownloadsFragment.kt similarity index 79% rename from app/phone/src/main/java/org/askartv/phone/fragments/SettingsDownloadsFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsDownloadsFragment.kt index 7232cc09..a5ab5c31 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsDownloadsFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsDownloadsFragment.kt @@ -1,8 +1,8 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.fragments import android.os.Bundle import androidx.preference.PreferenceFragmentCompat -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR class SettingsDownloadsFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsFragment.kt similarity index 92% rename from app/phone/src/main/java/org/askartv/phone/fragments/SettingsFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsFragment.kt index 9464b9eb..b3bd27b1 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 org.askartv.phone.AppPreferences -import org.askartv.phone.utils.restart +import com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.utils.restart import javax.inject.Inject -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR @AndroidEntryPoint class SettingsFragment : PreferenceFragmentCompat() { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsLanguageFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsLanguageFragment.kt similarity index 92% rename from app/phone/src/main/java/org/askartv/phone/fragments/SettingsLanguageFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsLanguageFragment.kt index a45f8322..e1816d6c 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsLanguageFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsLanguageFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR class SettingsLanguageFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsNetworkFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsNetworkFragment.kt similarity index 82% rename from app/phone/src/main/java/org/askartv/phone/fragments/SettingsNetworkFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsNetworkFragment.kt index 42529919..5b813836 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsNetworkFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsNetworkFragment.kt @@ -1,11 +1,11 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.fragments import android.os.Bundle import android.text.InputType import androidx.preference.EditTextPreference import androidx.preference.PreferenceFragmentCompat -import org.askartv.phone.Constants -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.Constants +import com.nomadics9.ananas.core.R as CoreR class SettingsNetworkFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsPlayerFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsPlayerFragment.kt similarity index 92% rename from app/phone/src/main/java/org/askartv/phone/fragments/SettingsPlayerFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsPlayerFragment.kt index 8402a54e..ee50731c 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/SettingsPlayerFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/SettingsPlayerFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR class SettingsPlayerFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/ShowFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/ShowFragment.kt similarity index 92% rename from app/phone/src/main/java/org/askartv/phone/fragments/ShowFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/ShowFragment.kt index e60aa768..af83eeac 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/ShowFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/ShowFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.adapters.PersonListAdapter +import com.nomadics9.ananas.adapters.ViewItemListAdapter +import com.nomadics9.ananas.bindCardItemImage +import com.nomadics9.ananas.bindItemBackdropImage +import com.nomadics9.ananas.databinding.FragmentShowBinding +import com.nomadics9.ananas.dialogs.ErrorDialogFragment +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidSeason +import com.nomadics9.ananas.models.FindroidSourceType +import com.nomadics9.ananas.models.PlayerItem +import com.nomadics9.ananas.models.isDownloaded +import com.nomadics9.ananas.utils.checkIfLoginRequired +import com.nomadics9.ananas.utils.setIconTintColorAttribute +import com.nomadics9.ananas.viewmodels.PlayerItemsEvent +import com.nomadics9.ananas.viewmodels.PlayerViewModel +import com.nomadics9.ananas.viewmodels.ShowEvent +import com.nomadics9.ananas.viewmodels.ShowViewModel import kotlinx.coroutines.launch import timber.log.Timber import java.util.UUID import javax.inject.Inject -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR @AndroidEntryPoint class ShowFragment : Fragment() { diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/TwoPaneSettingsFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/TwoPaneSettingsFragment.kt similarity index 88% rename from app/phone/src/main/java/org/askartv/phone/fragments/TwoPaneSettingsFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/TwoPaneSettingsFragment.kt index c949f242..01f2a9a7 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/TwoPaneSettingsFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/TwoPaneSettingsFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.fragments import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceHeaderFragmentCompat diff --git a/app/phone/src/main/java/org/askartv/phone/fragments/UsersFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/UsersFragment.kt similarity index 89% rename from app/phone/src/main/java/org/askartv/phone/fragments/UsersFragment.kt rename to app/phone/src/main/java/com/nomadics9/ananas/fragments/UsersFragment.kt index 2fe21404..ac54bd18 100644 --- a/app/phone/src/main/java/org/askartv/phone/fragments/UsersFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/UsersFragment.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.fragments +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.AppNavigationDirections +import com.nomadics9.ananas.adapters.UserListAdapter +import com.nomadics9.ananas.databinding.FragmentUsersBinding +import com.nomadics9.ananas.dialogs.DeleteUserDialogFragment +import com.nomadics9.ananas.viewmodels.UsersEvent +import com.nomadics9.ananas.viewmodels.UsersViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/phone/src/main/java/org/askartv/phone/utils/Extensions.kt b/app/phone/src/main/java/com/nomadics9/ananas/utils/Extensions.kt similarity index 82% rename from app/phone/src/main/java/org/askartv/phone/utils/Extensions.kt rename to app/phone/src/main/java/com/nomadics9/ananas/utils/Extensions.kt index a09b98a3..9e167b9c 100644 --- a/app/phone/src/main/java/org/askartv/phone/utils/Extensions.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/utils/Extensions.kt @@ -1,8 +1,8 @@ -package org.askartv.phone.utils +package com.nomadics9.ananas.utils import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController -import org.askartv.phone.AppNavigationDirections +import com.nomadics9.ananas.AppNavigationDirections import timber.log.Timber fun Fragment.checkIfLoginRequired(error: String?) { diff --git a/app/phone/src/main/java/org/askartv/phone/utils/PlayerGestureHelper.kt b/app/phone/src/main/java/com/nomadics9/ananas/utils/PlayerGestureHelper.kt similarity index 98% rename from app/phone/src/main/java/org/askartv/phone/utils/PlayerGestureHelper.kt rename to app/phone/src/main/java/com/nomadics9/ananas/utils/PlayerGestureHelper.kt index 44c0d8d7..7be379c0 100644 --- a/app/phone/src/main/java/org/askartv/phone/utils/PlayerGestureHelper.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/utils/PlayerGestureHelper.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.utils +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.Constants +import com.nomadics9.ananas.PlayerActivity +import com.nomadics9.ananas.isControlsLocked +import com.nomadics9.ananas.models.PlayerChapter +import com.nomadics9.ananas.mpv.MPVPlayer import timber.log.Timber import kotlin.math.abs diff --git a/app/phone/src/main/java/org/askartv/phone/utils/PreviewScrubListener.kt b/app/phone/src/main/java/com/nomadics9/ananas/utils/PreviewScrubListener.kt similarity index 96% rename from app/phone/src/main/java/org/askartv/phone/utils/PreviewScrubListener.kt rename to app/phone/src/main/java/com/nomadics9/ananas/utils/PreviewScrubListener.kt index 2c784e0f..84d3705a 100644 --- a/app/phone/src/main/java/org/askartv/phone/utils/PreviewScrubListener.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/utils/PreviewScrubListener.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.utils +package com.nomadics9.ananas.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 org.askartv.phone.models.Trickplay +import com.nomadics9.ananas.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 e4cc1839..e62476df 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="com.nomadics9.ananas.fragments.SettingsFragment" /> + app:argType="com.nomadics9.ananas.models.CollectionType" /> @@ -342,12 +342,12 @@ + app:argType="com.nomadics9.ananas.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 b5fbc13d..15d9db92 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.destinations.LoginScreenDestination +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.utils.ObserveAsEvents +import com.nomadics9.ananas.viewmodels.AddServerEvent +import com.nomadics9.ananas.viewmodels.AddServerViewModel +import com.nomadics9.ananas.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 8ed596e0..f9522ed5 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.destinations.MovieScreenDestination +import com.nomadics9.ananas.destinations.PlayerActivityDestination +import com.nomadics9.ananas.destinations.ShowScreenDestination +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.models.HomeItem +import com.nomadics9.ananas.ui.components.Direction +import com.nomadics9.ananas.ui.components.ItemCard +import com.nomadics9.ananas.ui.dummy.dummyHomeItems +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.utils.ObserveAsEvents +import com.nomadics9.ananas.viewmodels.HomeViewModel +import com.nomadics9.ananas.viewmodels.PlayerItemsEvent +import com.nomadics9.ananas.viewmodels.PlayerViewModel +import com.nomadics9.ananas.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 e85b0b2b..fc01d72d 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.destinations.LibraryScreenDestination +import com.nomadics9.ananas.models.CollectionType +import com.nomadics9.ananas.models.FindroidCollection +import com.nomadics9.ananas.ui.components.Direction +import com.nomadics9.ananas.ui.components.ItemCard +import com.nomadics9.ananas.ui.dummy.dummyCollections +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.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 9f36b530..aa91e023 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.destinations.LibraryScreenDestination +import com.nomadics9.ananas.destinations.MovieScreenDestination +import com.nomadics9.ananas.destinations.ShowScreenDestination +import com.nomadics9.ananas.models.CollectionType +import com.nomadics9.ananas.models.FindroidFolder +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.ui.components.Direction +import com.nomadics9.ananas.ui.components.ItemCard +import com.nomadics9.ananas.ui.dummy.dummyMovies +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.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 89acaaa6..55f238ab 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.NavGraphs +import com.nomadics9.ananas.destinations.MainScreenDestination +import com.nomadics9.ananas.models.UiText +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.utils.ObserveAsEvents +import com.nomadics9.ananas.viewmodels.LoginEvent +import com.nomadics9.ananas.viewmodels.LoginViewModel +import com.nomadics9.ananas.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 e4238cd2..411c8029 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.destinations.SettingsScreenDestination +import com.nomadics9.ananas.models.User +import com.nomadics9.ananas.ui.components.LoadingIndicator +import com.nomadics9.ananas.ui.components.PillBorderIndicator +import com.nomadics9.ananas.ui.components.ProfileButton +import com.nomadics9.ananas.ui.dummy.dummyServer +import com.nomadics9.ananas.ui.dummy.dummyUser +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.viewmodels.MainViewModel +import com.nomadics9.ananas.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 074635ee..0b3cac87 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.destinations.PlayerActivityDestination +import com.nomadics9.ananas.models.AudioChannel +import com.nomadics9.ananas.models.AudioCodec +import com.nomadics9.ananas.models.DisplayProfile +import com.nomadics9.ananas.models.Resolution +import com.nomadics9.ananas.models.VideoMetadata +import com.nomadics9.ananas.ui.dummy.dummyMovie +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.Yellow +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.utils.ObserveAsEvents +import com.nomadics9.ananas.viewmodels.MovieViewModel +import com.nomadics9.ananas.viewmodels.PlayerItemsEvent +import com.nomadics9.ananas.viewmodels.PlayerViewModel import org.jellyfin.sdk.model.api.BaseItemPerson import org.jellyfin.sdk.model.api.PersonKind import java.util.UUID -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.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 efa7ce43..bfa6ce11 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.core.R +import com.nomadics9.ananas.destinations.VideoPlayerTrackSelectorDialogDestination +import com.nomadics9.ananas.models.PlayerItem +import com.nomadics9.ananas.models.Track +import com.nomadics9.ananas.ui.components.player.VideoPlayerControlsLayout +import com.nomadics9.ananas.ui.components.player.VideoPlayerMediaButton +import com.nomadics9.ananas.ui.components.player.VideoPlayerMediaTitle +import com.nomadics9.ananas.ui.components.player.VideoPlayerOverlay +import com.nomadics9.ananas.ui.components.player.VideoPlayerSeeker +import com.nomadics9.ananas.ui.components.player.VideoPlayerState +import com.nomadics9.ananas.ui.components.player.rememberVideoPlayerState +import com.nomadics9.ananas.ui.dialogs.VideoPlayerTrackSelectorDialogResult +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.utils.handleDPadKeyEvents +import com.nomadics9.ananas.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 3efcadea..dffe04f7 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.destinations.PlayerActivityDestination +import com.nomadics9.ananas.models.EpisodeItem +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.ui.components.EpisodeCard +import com.nomadics9.ananas.ui.dummy.dummyEpisodeItems +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.utils.ObserveAsEvents +import com.nomadics9.ananas.viewmodels.PlayerItemsEvent +import com.nomadics9.ananas.viewmodels.PlayerViewModel +import com.nomadics9.ananas.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 cf6102c5..5cba3abf 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.NavGraphs +import com.nomadics9.ananas.destinations.AddServerScreenDestination +import com.nomadics9.ananas.destinations.MainScreenDestination +import com.nomadics9.ananas.destinations.UserSelectScreenDestination +import com.nomadics9.ananas.models.DiscoveredServer +import com.nomadics9.ananas.models.Server +import com.nomadics9.ananas.ui.dummy.dummyDiscoveredServer +import com.nomadics9.ananas.ui.dummy.dummyDiscoveredServers +import com.nomadics9.ananas.ui.dummy.dummyServers +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.utils.ObserveAsEvents +import com.nomadics9.ananas.viewmodels.ServerSelectEvent +import com.nomadics9.ananas.viewmodels.ServerSelectViewModel +import com.nomadics9.ananas.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 c514cae0..119f1a5e 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.destinations.ServerSelectScreenDestination +import com.nomadics9.ananas.destinations.SettingsSubScreenDestination +import com.nomadics9.ananas.destinations.UserSelectScreenDestination +import com.nomadics9.ananas.models.Preference +import com.nomadics9.ananas.models.PreferenceCategory +import com.nomadics9.ananas.models.PreferenceSelect +import com.nomadics9.ananas.models.PreferenceSwitch +import com.nomadics9.ananas.ui.components.SettingsCategoryCard +import com.nomadics9.ananas.ui.components.SettingsSelectCard +import com.nomadics9.ananas.ui.components.SettingsSwitchCard +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.utils.ObserveAsEvents +import com.nomadics9.ananas.viewmodels.SettingsEvent +import com.nomadics9.ananas.viewmodels.SettingsViewModel +import com.nomadics9.ananas.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 3e49adc7..14d75fd5 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.Constants +import com.nomadics9.ananas.destinations.ServerSelectScreenDestination +import com.nomadics9.ananas.destinations.SettingsScreenDestination +import com.nomadics9.ananas.destinations.UserSelectScreenDestination +import com.nomadics9.ananas.models.Preference +import com.nomadics9.ananas.models.PreferenceCategory +import com.nomadics9.ananas.models.PreferenceSelect +import com.nomadics9.ananas.models.PreferenceSwitch +import com.nomadics9.ananas.ui.components.SettingsCategoryCard +import com.nomadics9.ananas.ui.components.SettingsDetailsCard +import com.nomadics9.ananas.ui.components.SettingsSelectCard +import com.nomadics9.ananas.ui.components.SettingsSwitchCard +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.utils.ObserveAsEvents +import com.nomadics9.ananas.viewmodels.SettingsEvent +import com.nomadics9.ananas.viewmodels.SettingsViewModel +import com.nomadics9.ananas.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 f0d78e18..8a7bfbf8 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.destinations.PlayerActivityDestination +import com.nomadics9.ananas.destinations.SeasonScreenDestination +import com.nomadics9.ananas.models.FindroidSeason +import com.nomadics9.ananas.ui.components.Direction +import com.nomadics9.ananas.ui.components.ItemCard +import com.nomadics9.ananas.ui.dummy.dummyShow +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.Yellow +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.utils.ObserveAsEvents +import com.nomadics9.ananas.viewmodels.PlayerItemsEvent +import com.nomadics9.ananas.viewmodels.PlayerViewModel +import com.nomadics9.ananas.viewmodels.ShowViewModel import java.util.UUID -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.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 8f305e82..b2bea2a6 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 org.askartv.phone.ui +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.NavGraphs +import com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.destinations.LoginScreenDestination +import com.nomadics9.ananas.destinations.MainScreenDestination +import com.nomadics9.ananas.models.Server +import com.nomadics9.ananas.models.User +import com.nomadics9.ananas.ui.dummy.dummyServer +import com.nomadics9.ananas.ui.dummy.dummyUser +import com.nomadics9.ananas.ui.dummy.dummyUsers +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.utils.ObserveAsEvents +import com.nomadics9.ananas.viewmodels.UserSelectEvent +import com.nomadics9.ananas.viewmodels.UserSelectViewModel import org.jellyfin.sdk.model.api.ImageType -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.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 4a760594..aaaae96b 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 org.askartv.phone.ui.components +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.ui.dummy.dummyEpisode +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings @Composable fun EpisodeCard( @@ -76,7 +76,7 @@ fun EpisodeCard( Column { Text( text = stringResource( - id = org.askartv.phone.core.R.string.episode_name, + id = com.nomadics9.ananas.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 dafcb34b..94f57784 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 org.askartv.phone.ui.components +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.ui.dummy.dummyEpisode +import com.nomadics9.ananas.ui.dummy.dummyMovie +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.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 37e187d6..12b41f95 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 org.askartv.phone.ui.components +package com.nomadics9.ananas.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 org.askartv.phone.models.FindroidEpisode -import org.askartv.phone.models.FindroidItem -import org.askartv.phone.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.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 529628c9..4871871b 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 org.askartv.phone.ui.components +package com.nomadics9.ananas.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 38849949..600a9895 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 org.askartv.phone.ui.components +package com.nomadics9.ananas.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 8767712a..4b71d000 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 org.askartv.phone.ui.components +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.models.User +import com.nomadics9.ananas.ui.dummy.dummyUser +import com.nomadics9.ananas.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 fd738154..20fdf73c 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 org.askartv.phone.ui.components +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.ui.dummy.dummyEpisode +import com.nomadics9.ananas.ui.dummy.dummyShow +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.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 55ce48dd..bfdb6469 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 org.askartv.phone.ui.components +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.models.PreferenceCategory +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.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 52b64046..24b8e526 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 org.askartv.phone.ui.components +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.Constants +import com.nomadics9.ananas.models.PreferenceSelect +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.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 f487fd2f..30a2b16e 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 org.askartv.phone.ui.components +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.Constants +import com.nomadics9.ananas.models.PreferenceSelect +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings +import com.nomadics9.ananas.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 bd022aaa..787c08ca 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 org.askartv.phone.ui.components +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.models.PreferenceSwitch +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.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 51331b33..f14f73f8 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 org.askartv.phone.ui.components.player +package com.nomadics9.ananas.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 org.askartv.phone.ui.theme.FindroidTheme -import org.askartv.phone.ui.theme.spacings +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.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 f97786d2..2056db57 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 org.askartv.phone.ui.components.player +package com.nomadics9.ananas.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 a54b35fa..7315f8bc 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 org.askartv.phone.ui.components.player +package com.nomadics9.ananas.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 org.askartv.phone.ui.theme.FindroidTheme +import com.nomadics9.ananas.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 3c2b2725..17caa38d 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 org.askartv.phone.ui.components.player +package com.nomadics9.ananas.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 org.askartv.phone.ui.theme.FindroidTheme -import org.askartv.phone.ui.theme.spacings +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.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 d46fb617..7106e617 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 org.askartv.phone.ui.components.player +package com.nomadics9.ananas.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 org.askartv.phone.ui.theme.FindroidTheme -import org.askartv.phone.utils.handleDPadKeyEvents +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.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 45a8c2f2..ad77fe14 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 org.askartv.phone.ui.components.player +package com.nomadics9.ananas.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 org.askartv.phone.ui.theme.FindroidTheme -import org.askartv.phone.ui.theme.spacings +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings import kotlin.time.Duration -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.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 d05151ba..530e26c1 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 org.askartv.phone.ui.components.player +package com.nomadics9.ananas.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 7cacba0c..66d1dd3e 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 org.askartv.phone.ui.dialogs +package com.nomadics9.ananas.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 f774b678..bacc3a5c 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 org.askartv.phone.ui.dialogs +package com.nomadics9.ananas.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 org.askartv.phone.models.Track -import org.askartv.phone.ui.theme.FindroidTheme -import org.askartv.phone.ui.theme.spacings +import com.nomadics9.ananas.models.Track +import com.nomadics9.ananas.ui.theme.FindroidTheme +import com.nomadics9.ananas.ui.theme.spacings import kotlinx.parcelize.Parcelize -import org.askartv.phone.core.R as CoreR -import org.askartv.phone.player.video.R as PlayerVideoR +import com.nomadics9.ananas.core.R as CoreR +import com.nomadics9.ananas.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 311b86ea..efb61dd3 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 org.askartv.phone.ui.dummy +package com.nomadics9.ananas.ui.dummy -import org.askartv.phone.models.CollectionType -import org.askartv.phone.models.FindroidCollection -import org.askartv.phone.models.FindroidImages +import com.nomadics9.ananas.models.CollectionType +import com.nomadics9.ananas.models.FindroidCollection +import com.nomadics9.ananas.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 fd234642..2b5fc1ad 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 org.askartv.phone.ui.dummy +package com.nomadics9.ananas.ui.dummy -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 com.nomadics9.ananas.models.EpisodeItem +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidImages +import com.nomadics9.ananas.models.FindroidMediaStream +import com.nomadics9.ananas.models.FindroidSource +import com.nomadics9.ananas.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 4d990254..fca37904 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 org.askartv.phone.ui.dummy +package com.nomadics9.ananas.ui.dummy -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 com.nomadics9.ananas.models.CollectionType +import com.nomadics9.ananas.models.HomeItem +import com.nomadics9.ananas.models.HomeSection +import com.nomadics9.ananas.models.UiText +import com.nomadics9.ananas.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 0c2c786e..03b3d5b1 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 org.askartv.phone.ui.dummy +package com.nomadics9.ananas.ui.dummy -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 com.nomadics9.ananas.models.FindroidImages +import com.nomadics9.ananas.models.FindroidMediaStream +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidSource +import com.nomadics9.ananas.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 27186fb7..3e035096 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 org.askartv.phone.ui.dummy +package com.nomadics9.ananas.ui.dummy -import org.askartv.phone.models.DiscoveredServer -import org.askartv.phone.models.Server +import com.nomadics9.ananas.models.DiscoveredServer +import com.nomadics9.ananas.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 b616be2d..920dd6c4 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 org.askartv.phone.ui.dummy +package com.nomadics9.ananas.ui.dummy -import org.askartv.phone.models.FindroidImages -import org.askartv.phone.models.FindroidShow +import com.nomadics9.ananas.models.FindroidImages +import com.nomadics9.ananas.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 6b5df969..5aba7503 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 org.askartv.phone.ui.dummy +package com.nomadics9.ananas.ui.dummy -import org.askartv.phone.models.User +import com.nomadics9.ananas.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 d5b1388b..0beae458 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 org.askartv.phone.ui.theme +package com.nomadics9.ananas.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 bf720ec9..5bbc274c 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 org.askartv.phone.ui.theme +package com.nomadics9.ananas.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 5d46ba69..187a215f 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 org.askartv.phone.ui.theme +package com.nomadics9.ananas.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 2ed29127..9ee342c3 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 org.askartv.phone.ui.theme +package com.nomadics9.ananas.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 a8d71b0e..44130479 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 org.askartv.phone.ui.theme +package com.nomadics9.ananas.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 9ca3b848..2f929813 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } android { - namespace = "org.askartv.phone.core" + namespace = "com.nomadics9.ananas.core" compileSdk = Versions.compileSdk buildToolsVersion = Versions.buildTools diff --git a/core/src/main/java/org/askartv/phone/di/ApiModule.kt b/core/src/main/java/com/nomadics9/ananas/di/ApiModule.kt similarity index 88% rename from core/src/main/java/org/askartv/phone/di/ApiModule.kt rename to core/src/main/java/com/nomadics9/ananas/di/ApiModule.kt index 6fe79f8c..89a5f8df 100644 --- a/core/src/main/java/org/askartv/phone/di/ApiModule.kt +++ b/core/src/main/java/com/nomadics9/ananas/di/ApiModule.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.di +package com.nomadics9.ananas.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 org.askartv.phone.AppPreferences -import org.askartv.phone.api.JellyfinApi -import org.askartv.phone.database.ServerDatabaseDao +import com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.database.ServerDatabaseDao import javax.inject.Singleton @Module diff --git a/core/src/main/java/org/askartv/phone/di/AppPreferencesModule.kt b/core/src/main/java/com/nomadics9/ananas/di/AppPreferencesModule.kt similarity index 84% rename from core/src/main/java/org/askartv/phone/di/AppPreferencesModule.kt rename to core/src/main/java/com/nomadics9/ananas/di/AppPreferencesModule.kt index 7585de99..6dda102b 100644 --- a/core/src/main/java/org/askartv/phone/di/AppPreferencesModule.kt +++ b/core/src/main/java/com/nomadics9/ananas/di/AppPreferencesModule.kt @@ -1,11 +1,11 @@ -package org.askartv.phone.di +package com.nomadics9.ananas.di import android.content.SharedPreferences import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import org.askartv.phone.AppPreferences +import com.nomadics9.ananas.AppPreferences import javax.inject.Singleton @Module diff --git a/core/src/main/java/org/askartv/phone/di/DatabaseModule.kt b/core/src/main/java/com/nomadics9/ananas/di/DatabaseModule.kt similarity index 84% rename from core/src/main/java/org/askartv/phone/di/DatabaseModule.kt rename to core/src/main/java/com/nomadics9/ananas/di/DatabaseModule.kt index 2d7063ea..52ef9a13 100644 --- a/core/src/main/java/org/askartv/phone/di/DatabaseModule.kt +++ b/core/src/main/java/com/nomadics9/ananas/di/DatabaseModule.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.di +package com.nomadics9.ananas.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 org.askartv.phone.database.ServerDatabase -import org.askartv.phone.database.ServerDatabaseDao +import com.nomadics9.ananas.database.ServerDatabase +import com.nomadics9.ananas.database.ServerDatabaseDao import javax.inject.Singleton @Module diff --git a/core/src/main/java/org/askartv/phone/di/DownloaderModule.kt b/core/src/main/java/com/nomadics9/ananas/di/DownloaderModule.kt similarity index 68% rename from core/src/main/java/org/askartv/phone/di/DownloaderModule.kt rename to core/src/main/java/com/nomadics9/ananas/di/DownloaderModule.kt index dd8b4c52..fcb88eb1 100644 --- a/core/src/main/java/org/askartv/phone/di/DownloaderModule.kt +++ b/core/src/main/java/com/nomadics9/ananas/di/DownloaderModule.kt @@ -1,15 +1,15 @@ -package org.askartv.phone.di +package com.nomadics9.ananas.di import android.app.Application import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.repository.JellyfinRepository +import com.nomadics9.ananas.utils.Downloader +import com.nomadics9.ananas.utils.DownloaderImpl import javax.inject.Singleton @Module diff --git a/core/src/main/java/org/askartv/phone/di/RepositoryModule.kt b/core/src/main/java/com/nomadics9/ananas/di/RepositoryModule.kt similarity index 81% rename from core/src/main/java/org/askartv/phone/di/RepositoryModule.kt rename to core/src/main/java/com/nomadics9/ananas/di/RepositoryModule.kt index a3c63a85..a0a818fc 100644 --- a/core/src/main/java/org/askartv/phone/di/RepositoryModule.kt +++ b/core/src/main/java/com/nomadics9/ananas/di/RepositoryModule.kt @@ -1,16 +1,16 @@ -package org.askartv.phone.di +package com.nomadics9.ananas.di import android.app.Application import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.repository.JellyfinRepository +import com.nomadics9.ananas.repository.JellyfinRepositoryImpl +import com.nomadics9.ananas.repository.JellyfinRepositoryOfflineImpl import javax.inject.Singleton @Module diff --git a/core/src/main/java/org/askartv/phone/di/SharedPreferencesModule.kt b/core/src/main/java/com/nomadics9/ananas/di/SharedPreferencesModule.kt similarity index 95% rename from core/src/main/java/org/askartv/phone/di/SharedPreferencesModule.kt rename to core/src/main/java/com/nomadics9/ananas/di/SharedPreferencesModule.kt index c523eaa2..4ca5969c 100644 --- a/core/src/main/java/org/askartv/phone/di/SharedPreferencesModule.kt +++ b/core/src/main/java/com/nomadics9/ananas/di/SharedPreferencesModule.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.di +package com.nomadics9.ananas.di import android.content.Context import android.content.SharedPreferences diff --git a/core/src/main/java/org/askartv/phone/dialogs/AddServerAddressDialog.kt b/core/src/main/java/com/nomadics9/ananas/dialogs/AddServerAddressDialog.kt similarity index 89% rename from core/src/main/java/org/askartv/phone/dialogs/AddServerAddressDialog.kt rename to core/src/main/java/com/nomadics9/ananas/dialogs/AddServerAddressDialog.kt index 6a715b06..cbe92203 100644 --- a/core/src/main/java/org/askartv/phone/dialogs/AddServerAddressDialog.kt +++ b/core/src/main/java/com/nomadics9/ananas/dialogs/AddServerAddressDialog.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.dialogs +package com.nomadics9.ananas.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 org.askartv.phone.core.R -import org.askartv.phone.viewmodels.ServerAddressesViewModel +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.viewmodels.ServerAddressesViewModel import java.lang.IllegalStateException class AddServerAddressDialog( diff --git a/core/src/main/java/org/askartv/phone/dialogs/DeleteServerAddressDialog.kt b/core/src/main/java/com/nomadics9/ananas/dialogs/DeleteServerAddressDialog.kt similarity index 84% rename from core/src/main/java/org/askartv/phone/dialogs/DeleteServerAddressDialog.kt rename to core/src/main/java/com/nomadics9/ananas/dialogs/DeleteServerAddressDialog.kt index 99d9d462..d28097fa 100644 --- a/core/src/main/java/org/askartv/phone/dialogs/DeleteServerAddressDialog.kt +++ b/core/src/main/java/com/nomadics9/ananas/dialogs/DeleteServerAddressDialog.kt @@ -1,12 +1,12 @@ -package org.askartv.phone.dialogs +package com.nomadics9.ananas.dialogs import android.app.Dialog import android.os.Bundle import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.askartv.phone.core.R -import org.askartv.phone.models.ServerAddress -import org.askartv.phone.viewmodels.ServerAddressesViewModel +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.models.ServerAddress +import com.nomadics9.ananas.viewmodels.ServerAddressesViewModel import java.lang.IllegalStateException class DeleteServerAddressDialog( diff --git a/core/src/main/java/org/askartv/phone/dialogs/DeleteServerDialogFragment.kt b/core/src/main/java/com/nomadics9/ananas/dialogs/DeleteServerDialogFragment.kt similarity index 84% rename from core/src/main/java/org/askartv/phone/dialogs/DeleteServerDialogFragment.kt rename to core/src/main/java/com/nomadics9/ananas/dialogs/DeleteServerDialogFragment.kt index 1f4faaf6..6b52c781 100644 --- a/core/src/main/java/org/askartv/phone/dialogs/DeleteServerDialogFragment.kt +++ b/core/src/main/java/com/nomadics9/ananas/dialogs/DeleteServerDialogFragment.kt @@ -1,12 +1,12 @@ -package org.askartv.phone.dialogs +package com.nomadics9.ananas.dialogs import android.app.Dialog import android.os.Bundle import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.askartv.phone.core.R -import org.askartv.phone.models.Server -import org.askartv.phone.viewmodels.ServerSelectViewModel +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.models.Server +import com.nomadics9.ananas.viewmodels.ServerSelectViewModel import java.lang.IllegalStateException class DeleteServerDialogFragment(private val viewModel: ServerSelectViewModel, val server: Server) : DialogFragment() { diff --git a/core/src/main/java/org/askartv/phone/dialogs/DeleteUserDialogFragment.kt b/core/src/main/java/com/nomadics9/ananas/dialogs/DeleteUserDialogFragment.kt similarity index 85% rename from core/src/main/java/org/askartv/phone/dialogs/DeleteUserDialogFragment.kt rename to core/src/main/java/com/nomadics9/ananas/dialogs/DeleteUserDialogFragment.kt index 09fcc7ad..b5011278 100644 --- a/core/src/main/java/org/askartv/phone/dialogs/DeleteUserDialogFragment.kt +++ b/core/src/main/java/com/nomadics9/ananas/dialogs/DeleteUserDialogFragment.kt @@ -1,12 +1,12 @@ -package org.askartv.phone.dialogs +package com.nomadics9.ananas.dialogs import android.app.Dialog import android.os.Bundle import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.askartv.phone.core.R -import org.askartv.phone.models.User -import org.askartv.phone.viewmodels.UsersViewModel +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.models.User +import com.nomadics9.ananas.viewmodels.UsersViewModel import java.lang.IllegalStateException class DeleteUserDialogFragment(private val viewModel: UsersViewModel, val user: User) : DialogFragment() { diff --git a/core/src/main/java/org/askartv/phone/dialogs/ErrorDialogFragment.kt b/core/src/main/java/com/nomadics9/ananas/dialogs/ErrorDialogFragment.kt similarity index 93% rename from core/src/main/java/org/askartv/phone/dialogs/ErrorDialogFragment.kt rename to core/src/main/java/com/nomadics9/ananas/dialogs/ErrorDialogFragment.kt index 1c08659a..61682a92 100644 --- a/core/src/main/java/org/askartv/phone/dialogs/ErrorDialogFragment.kt +++ b/core/src/main/java/com/nomadics9/ananas/dialogs/ErrorDialogFragment.kt @@ -1,12 +1,12 @@ -package org.askartv.phone.dialogs +package com.nomadics9.ananas.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 org.askartv.phone.core.R -import org.askartv.phone.utils.serializable +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.utils.serializable import java.io.Serializable import java.lang.IllegalStateException diff --git a/core/src/main/java/org/askartv/phone/dialogs/SortDialogFragment.kt b/core/src/main/java/com/nomadics9/ananas/dialogs/SortDialogFragment.kt similarity index 93% rename from core/src/main/java/org/askartv/phone/dialogs/SortDialogFragment.kt rename to core/src/main/java/com/nomadics9/ananas/dialogs/SortDialogFragment.kt index d46e651c..07e55b36 100644 --- a/core/src/main/java/org/askartv/phone/dialogs/SortDialogFragment.kt +++ b/core/src/main/java/com/nomadics9/ananas/dialogs/SortDialogFragment.kt @@ -1,15 +1,15 @@ -package org.askartv.phone.dialogs +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.models.CollectionType +import com.nomadics9.ananas.models.SortBy +import com.nomadics9.ananas.viewmodels.LibraryViewModel import org.jellyfin.sdk.model.api.SortOrder import java.lang.IllegalStateException import java.util.UUID diff --git a/core/src/main/java/org/askartv/phone/models/DiscoveredServer.kt b/core/src/main/java/com/nomadics9/ananas/models/DiscoveredServer.kt similarity index 73% rename from core/src/main/java/org/askartv/phone/models/DiscoveredServer.kt rename to core/src/main/java/com/nomadics9/ananas/models/DiscoveredServer.kt index 07504fc1..fd235902 100644 --- a/core/src/main/java/org/askartv/phone/models/DiscoveredServer.kt +++ b/core/src/main/java/com/nomadics9/ananas/models/DiscoveredServer.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models data class DiscoveredServer( val id: String, diff --git a/core/src/main/java/org/askartv/phone/models/EpisodeItem.kt b/core/src/main/java/com/nomadics9/ananas/models/EpisodeItem.kt similarity index 92% rename from core/src/main/java/org/askartv/phone/models/EpisodeItem.kt rename to core/src/main/java/com/nomadics9/ananas/models/EpisodeItem.kt index dff496c8..fe15712f 100644 --- a/core/src/main/java/org/askartv/phone/models/EpisodeItem.kt +++ b/core/src/main/java/com/nomadics9/ananas/models/EpisodeItem.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import java.util.UUID diff --git a/core/src/main/java/org/askartv/phone/models/ExceptionUiText.kt b/core/src/main/java/com/nomadics9/ananas/models/ExceptionUiText.kt similarity index 80% rename from core/src/main/java/org/askartv/phone/models/ExceptionUiText.kt rename to core/src/main/java/com/nomadics9/ananas/models/ExceptionUiText.kt index 8d0f595f..19fa4fe2 100644 --- a/core/src/main/java/org/askartv/phone/models/ExceptionUiText.kt +++ b/core/src/main/java/com/nomadics9/ananas/models/ExceptionUiText.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models data class ExceptionUiText( val uiText: UiText, diff --git a/core/src/main/java/org/askartv/phone/models/FavoriteSection.kt b/core/src/main/java/com/nomadics9/ananas/models/FavoriteSection.kt similarity index 74% rename from core/src/main/java/org/askartv/phone/models/FavoriteSection.kt rename to core/src/main/java/com/nomadics9/ananas/models/FavoriteSection.kt index b4de33a7..a88c0a71 100644 --- a/core/src/main/java/org/askartv/phone/models/FavoriteSection.kt +++ b/core/src/main/java/com/nomadics9/ananas/models/FavoriteSection.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models data class FavoriteSection( val id: Int, diff --git a/core/src/main/java/org/askartv/phone/models/HomeItem.kt b/core/src/main/java/com/nomadics9/ananas/models/HomeItem.kt similarity index 92% rename from core/src/main/java/org/askartv/phone/models/HomeItem.kt rename to core/src/main/java/com/nomadics9/ananas/models/HomeItem.kt index a36c6a2c..779b4cb0 100644 --- a/core/src/main/java/org/askartv/phone/models/HomeItem.kt +++ b/core/src/main/java/com/nomadics9/ananas/models/HomeItem.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import java.util.UUID diff --git a/core/src/main/java/org/askartv/phone/models/HomeSection.kt b/core/src/main/java/com/nomadics9/ananas/models/HomeSection.kt similarity index 77% rename from core/src/main/java/org/askartv/phone/models/HomeSection.kt rename to core/src/main/java/com/nomadics9/ananas/models/HomeSection.kt index 31bcecc3..1eaa27aa 100644 --- a/core/src/main/java/org/askartv/phone/models/HomeSection.kt +++ b/core/src/main/java/com/nomadics9/ananas/models/HomeSection.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import java.util.UUID diff --git a/core/src/main/java/org/askartv/phone/models/UiText.kt b/core/src/main/java/com/nomadics9/ananas/models/UiText.kt similarity index 95% rename from core/src/main/java/org/askartv/phone/models/UiText.kt rename to core/src/main/java/com/nomadics9/ananas/models/UiText.kt index 2f8f4d08..d3ea3599 100644 --- a/core/src/main/java/org/askartv/phone/models/UiText.kt +++ b/core/src/main/java/com/nomadics9/ananas/models/UiText.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import android.content.res.Resources import androidx.annotation.StringRes diff --git a/core/src/main/java/org/askartv/phone/models/View.kt b/core/src/main/java/com/nomadics9/ananas/models/View.kt similarity index 81% rename from core/src/main/java/org/askartv/phone/models/View.kt rename to core/src/main/java/com/nomadics9/ananas/models/View.kt index b861e945..83dfb8cc 100644 --- a/core/src/main/java/org/askartv/phone/models/View.kt +++ b/core/src/main/java/com/nomadics9/ananas/models/View.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import java.util.UUID diff --git a/core/src/main/java/org/askartv/phone/utils/ComposeUtils.kt b/core/src/main/java/com/nomadics9/ananas/utils/ComposeUtils.kt similarity index 99% rename from core/src/main/java/org/askartv/phone/utils/ComposeUtils.kt rename to core/src/main/java/com/nomadics9/ananas/utils/ComposeUtils.kt index f73bd7b4..07402137 100644 --- a/core/src/main/java/org/askartv/phone/utils/ComposeUtils.kt +++ b/core/src/main/java/com/nomadics9/ananas/utils/ComposeUtils.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.utils +package com.nomadics9.ananas.utils import android.view.KeyEvent import androidx.compose.runtime.Composable diff --git a/core/src/main/java/org/askartv/phone/utils/CoreExtensions.kt b/core/src/main/java/com/nomadics9/ananas/utils/CoreExtensions.kt similarity index 91% rename from core/src/main/java/org/askartv/phone/utils/CoreExtensions.kt rename to core/src/main/java/com/nomadics9/ananas/utils/CoreExtensions.kt index 31abcd0c..b24b38a9 100644 --- a/core/src/main/java/org/askartv/phone/utils/CoreExtensions.kt +++ b/core/src/main/java/com/nomadics9/ananas/utils/CoreExtensions.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.utils +package com.nomadics9.ananas.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 org.askartv.phone.models.CollectionType -import org.askartv.phone.models.View +import com.nomadics9.ananas.models.CollectionType +import com.nomadics9.ananas.models.View import org.jellyfin.sdk.model.api.BaseItemDto import java.io.Serializable diff --git a/core/src/main/java/org/askartv/phone/utils/DownloadReceiver.kt b/core/src/main/java/com/nomadics9/ananas/utils/DownloadReceiver.kt similarity index 86% rename from core/src/main/java/org/askartv/phone/utils/DownloadReceiver.kt rename to core/src/main/java/com/nomadics9/ananas/utils/DownloadReceiver.kt index 65a649ef..120616b7 100644 --- a/core/src/main/java/org/askartv/phone/utils/DownloadReceiver.kt +++ b/core/src/main/java/com/nomadics9/ananas/utils/DownloadReceiver.kt @@ -1,18 +1,18 @@ -package org.askartv.phone.utils +package com.nomadics9.ananas.utils import android.app.DownloadManager import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import dagger.hilt.android.AndroidEntryPoint -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 com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.toFindroidEpisode +import com.nomadics9.ananas.models.toFindroidMovie +import com.nomadics9.ananas.models.toFindroidSeason +import com.nomadics9.ananas.models.toFindroidShow +import com.nomadics9.ananas.models.toFindroidSource +import com.nomadics9.ananas.repository.JellyfinRepository import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/core/src/main/java/org/askartv/phone/utils/Downloader.kt b/core/src/main/java/com/nomadics9/ananas/utils/Downloader.kt similarity index 68% rename from core/src/main/java/org/askartv/phone/utils/Downloader.kt rename to core/src/main/java/com/nomadics9/ananas/utils/Downloader.kt index bd849b2c..7f360686 100644 --- a/core/src/main/java/org/askartv/phone/utils/Downloader.kt +++ b/core/src/main/java/com/nomadics9/ananas/utils/Downloader.kt @@ -1,8 +1,8 @@ -package org.askartv.phone.utils +package com.nomadics9.ananas.utils -import org.askartv.phone.models.FindroidItem -import org.askartv.phone.models.FindroidSource -import org.askartv.phone.models.UiText +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidSource +import com.nomadics9.ananas.models.UiText interface Downloader { suspend fun downloadItem( diff --git a/core/src/main/java/org/askartv/phone/utils/DownloaderImpl.kt b/core/src/main/java/com/nomadics9/ananas/utils/DownloaderImpl.kt similarity index 90% rename from core/src/main/java/org/askartv/phone/utils/DownloaderImpl.kt rename to core/src/main/java/com/nomadics9/ananas/utils/DownloaderImpl.kt index c148a5d0..dd7688ce 100644 --- a/core/src/main/java/org/askartv/phone/utils/DownloaderImpl.kt +++ b/core/src/main/java/com/nomadics9/ananas/utils/DownloaderImpl.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.utils +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidSource +import com.nomadics9.ananas.models.FindroidSources +import com.nomadics9.ananas.models.FindroidTrickplayInfo +import com.nomadics9.ananas.models.UiText +import com.nomadics9.ananas.models.toFindroidEpisodeDto +import com.nomadics9.ananas.models.toFindroidMediaStreamDto +import com.nomadics9.ananas.models.toFindroidMovieDto +import com.nomadics9.ananas.models.toFindroidSeasonDto +import com.nomadics9.ananas.models.toFindroidShowDto +import com.nomadics9.ananas.models.toFindroidSourceDto +import com.nomadics9.ananas.models.toFindroidTrickplayInfoDto +import com.nomadics9.ananas.models.toFindroidUserDataDto +import com.nomadics9.ananas.models.toIntroDto +import com.nomadics9.ananas.repository.JellyfinRepository import java.io.File import java.util.UUID import kotlin.Exception import kotlin.math.ceil -import org.askartv.phone.core.R as CoreR +import com.nomadics9.ananas.core.R as CoreR class DownloaderImpl( private val context: Context, diff --git a/core/src/main/java/org/askartv/phone/viewmodels/AddServerViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/AddServerViewModel.kt similarity index 95% rename from core/src/main/java/org/askartv/phone/viewmodels/AddServerViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/AddServerViewModel.kt index e2bee284..033a0d30 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/AddServerViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/AddServerViewModel.kt @@ -1,18 +1,18 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.DiscoveredServer +import com.nomadics9.ananas.models.ExceptionUiText +import com.nomadics9.ananas.models.ExceptionUiTexts +import com.nomadics9.ananas.models.Server +import com.nomadics9.ananas.models.ServerAddress +import com.nomadics9.ananas.models.UiText import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel diff --git a/core/src/main/java/org/askartv/phone/viewmodels/CollectionViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/CollectionViewModel.kt similarity index 87% rename from core/src/main/java/org/askartv/phone/viewmodels/CollectionViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/CollectionViewModel.kt index d3365fda..b546ad62 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/CollectionViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/CollectionViewModel.kt @@ -1,17 +1,17 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -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 com.nomadics9.ananas.Constants +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.models.FavoriteSection +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.models.SortBy +import com.nomadics9.ananas.models.UiText +import com.nomadics9.ananas.repository.JellyfinRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/org/askartv/phone/viewmodels/DownloadsViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/DownloadsViewModel.kt similarity index 86% rename from core/src/main/java/org/askartv/phone/viewmodels/DownloadsViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/DownloadsViewModel.kt index 6aac43f2..f967b91b 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/DownloadsViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/DownloadsViewModel.kt @@ -1,16 +1,16 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.Constants +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.models.FavoriteSection +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.models.UiText +import com.nomadics9.ananas.repository.JellyfinRepository import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow diff --git a/core/src/main/java/org/askartv/phone/viewmodels/EpisodeBottomSheetViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/EpisodeBottomSheetViewModel.kt similarity index 94% rename from core/src/main/java/org/askartv/phone/viewmodels/EpisodeBottomSheetViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/EpisodeBottomSheetViewModel.kt index 4a4a0a61..93f89e6b 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/EpisodeBottomSheetViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/EpisodeBottomSheetViewModel.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidSourceType +import com.nomadics9.ananas.models.UiText +import com.nomadics9.ananas.models.isDownloading +import com.nomadics9.ananas.repository.JellyfinRepository +import com.nomadics9.ananas.utils.Downloader import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/org/askartv/phone/viewmodels/FavoriteViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/FavoriteViewModel.kt similarity index 87% rename from core/src/main/java/org/askartv/phone/viewmodels/FavoriteViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/FavoriteViewModel.kt index 9a7ad18b..2ad39757 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/FavoriteViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/FavoriteViewModel.kt @@ -1,16 +1,16 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -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 com.nomadics9.ananas.Constants +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.models.FavoriteSection +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.models.UiText +import com.nomadics9.ananas.repository.JellyfinRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/org/askartv/phone/viewmodels/HomeViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/HomeViewModel.kt similarity index 88% rename from core/src/main/java/org/askartv/phone/viewmodels/HomeViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/HomeViewModel.kt index ea70e8ff..7049ec61 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/HomeViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/HomeViewModel.kt @@ -1,16 +1,16 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.models.CollectionType +import com.nomadics9.ananas.models.HomeItem +import com.nomadics9.ananas.models.HomeSection +import com.nomadics9.ananas.models.UiText +import com.nomadics9.ananas.repository.JellyfinRepository +import com.nomadics9.ananas.utils.toView import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/org/askartv/phone/viewmodels/LibraryViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/LibraryViewModel.kt similarity index 91% rename from core/src/main/java/org/askartv/phone/viewmodels/LibraryViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/LibraryViewModel.kt index dd6e9301..51e7abca 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/LibraryViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/LibraryViewModel.kt @@ -1,14 +1,14 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.paging.PagingData import androidx.paging.cachedIn import dagger.hilt.android.lifecycle.HiltViewModel -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 com.nomadics9.ananas.models.CollectionType +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.SortBy +import com.nomadics9.ananas.repository.JellyfinRepository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/org/askartv/phone/viewmodels/LoginViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/LoginViewModel.kt similarity index 95% rename from core/src/main/java/org/askartv/phone/viewmodels/LoginViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/LoginViewModel.kt index 4a308dcb..5fdffee7 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/LoginViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/LoginViewModel.kt @@ -1,14 +1,14 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.UiText +import com.nomadics9.ananas.models.User import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.channels.Channel diff --git a/core/src/main/java/org/askartv/phone/viewmodels/MainViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/MainViewModel.kt similarity index 84% rename from core/src/main/java/org/askartv/phone/viewmodels/MainViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/MainViewModel.kt index 4b611f4e..46453f65 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/MainViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/MainViewModel.kt @@ -1,12 +1,12 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import org.askartv.phone.AppPreferences -import org.askartv.phone.database.ServerDatabaseDao -import org.askartv.phone.models.Server -import org.askartv.phone.models.User +import com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.Server +import com.nomadics9.ananas.models.User import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch diff --git a/core/src/main/java/org/askartv/phone/viewmodels/MediaViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/MediaViewModel.kt similarity index 88% rename from core/src/main/java/org/askartv/phone/viewmodels/MediaViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/MediaViewModel.kt index 6604dd32..5e29d96c 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/MediaViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/MediaViewModel.kt @@ -1,10 +1,10 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import org.askartv.phone.models.FindroidCollection -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.models.FindroidCollection +import com.nomadics9.ananas.repository.JellyfinRepository import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch diff --git a/core/src/main/java/org/askartv/phone/viewmodels/MovieViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/MovieViewModel.kt similarity index 95% rename from core/src/main/java/org/askartv/phone/viewmodels/MovieViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/MovieViewModel.kt index 84285b7e..e3900eb9 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/MovieViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/MovieViewModel.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.AudioChannel +import com.nomadics9.ananas.models.AudioCodec +import com.nomadics9.ananas.models.DisplayProfile +import com.nomadics9.ananas.models.FindroidMediaStream +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidSourceType +import com.nomadics9.ananas.models.Resolution +import com.nomadics9.ananas.models.UiText +import com.nomadics9.ananas.models.VideoMetadata +import com.nomadics9.ananas.models.isDownloading +import com.nomadics9.ananas.repository.JellyfinRepository +import com.nomadics9.ananas.utils.Downloader import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Runnable import kotlinx.coroutines.channels.Channel diff --git a/core/src/main/java/org/askartv/phone/viewmodels/PersonDetailViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/PersonDetailViewModel.kt similarity index 91% rename from core/src/main/java/org/askartv/phone/viewmodels/PersonDetailViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/PersonDetailViewModel.kt index c858c784..279963ed 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/PersonDetailViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/PersonDetailViewModel.kt @@ -1,11 +1,11 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import org.askartv.phone.models.FindroidMovie -import org.askartv.phone.models.FindroidShow -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.repository.JellyfinRepository import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch diff --git a/core/src/main/java/org/askartv/phone/viewmodels/SearchResultViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/SearchResultViewModel.kt similarity index 87% rename from core/src/main/java/org/askartv/phone/viewmodels/SearchResultViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/SearchResultViewModel.kt index e49e112c..0f134140 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/SearchResultViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/SearchResultViewModel.kt @@ -1,16 +1,16 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -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 com.nomadics9.ananas.Constants +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.models.FavoriteSection +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.models.UiText +import com.nomadics9.ananas.repository.JellyfinRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/org/askartv/phone/viewmodels/SeasonViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/SeasonViewModel.kt similarity index 92% rename from core/src/main/java/org/askartv/phone/viewmodels/SeasonViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/SeasonViewModel.kt index 06357f69..805ec535 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/SeasonViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/SeasonViewModel.kt @@ -1,11 +1,11 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import org.askartv.phone.models.EpisodeItem -import org.askartv.phone.models.FindroidSeason -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.models.EpisodeItem +import com.nomadics9.ananas.models.FindroidSeason +import com.nomadics9.ananas.repository.JellyfinRepository import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/org/askartv/phone/viewmodels/ServerAddressesViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/ServerAddressesViewModel.kt similarity index 94% rename from core/src/main/java/org/askartv/phone/viewmodels/ServerAddressesViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/ServerAddressesViewModel.kt index 2d10d531..6c1d2eb3 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/ServerAddressesViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/ServerAddressesViewModel.kt @@ -1,12 +1,12 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import android.content.Context import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import org.askartv.phone.api.JellyfinApi -import org.askartv.phone.database.ServerDatabaseDao -import org.askartv.phone.models.ServerAddress +import com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.ServerAddress import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/core/src/main/java/org/askartv/phone/viewmodels/ServerSelectViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/ServerSelectViewModel.kt similarity index 93% rename from core/src/main/java/org/askartv/phone/viewmodels/ServerSelectViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/ServerSelectViewModel.kt index 75b67ce2..a4b69501 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/ServerSelectViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/ServerSelectViewModel.kt @@ -1,14 +1,14 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.DiscoveredServer +import com.nomadics9.ananas.models.Server +import com.nomadics9.ananas.models.UiText import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/core/src/main/java/org/askartv/phone/viewmodels/SettingsDeviceViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/SettingsDeviceViewModel.kt similarity index 86% rename from core/src/main/java/org/askartv/phone/viewmodels/SettingsDeviceViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/SettingsDeviceViewModel.kt index b469497e..f52d665d 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/SettingsDeviceViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/SettingsDeviceViewModel.kt @@ -1,9 +1,9 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.repository.JellyfinRepository import kotlinx.coroutines.launch import timber.log.Timber import javax.inject.Inject diff --git a/core/src/main/java/org/askartv/phone/viewmodels/SettingsViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/SettingsViewModel.kt similarity index 95% rename from core/src/main/java/org/askartv/phone/viewmodels/SettingsViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/SettingsViewModel.kt index 98034dcd..67d94910 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/SettingsViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/SettingsViewModel.kt @@ -1,15 +1,15 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.Constants +import com.nomadics9.ananas.core.R +import com.nomadics9.ananas.models.Preference +import com.nomadics9.ananas.models.PreferenceCategory +import com.nomadics9.ananas.models.PreferenceSelect +import com.nomadics9.ananas.models.PreferenceSwitch import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/org/askartv/phone/viewmodels/ShowViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/ShowViewModel.kt similarity index 96% rename from core/src/main/java/org/askartv/phone/viewmodels/ShowViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/ShowViewModel.kt index abd6c015..f836e5f2 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/ShowViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/ShowViewModel.kt @@ -1,12 +1,12 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -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 com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidSeason +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.repository.JellyfinRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/core/src/main/java/org/askartv/phone/viewmodels/UserSelectViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/UserSelectViewModel.kt similarity index 90% rename from core/src/main/java/org/askartv/phone/viewmodels/UserSelectViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/UserSelectViewModel.kt index 97b9576f..9fbdb51f 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/UserSelectViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/UserSelectViewModel.kt @@ -1,13 +1,13 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.Server +import com.nomadics9.ananas.models.User import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/src/main/java/org/askartv/phone/viewmodels/UsersViewModel.kt b/core/src/main/java/com/nomadics9/ananas/viewmodels/UsersViewModel.kt similarity index 93% rename from core/src/main/java/org/askartv/phone/viewmodels/UsersViewModel.kt rename to core/src/main/java/com/nomadics9/ananas/viewmodels/UsersViewModel.kt index 1d059bcf..108a626a 100644 --- a/core/src/main/java/org/askartv/phone/viewmodels/UsersViewModel.kt +++ b/core/src/main/java/com/nomadics9/ananas/viewmodels/UsersViewModel.kt @@ -1,11 +1,11 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import org.askartv.phone.api.JellyfinApi -import org.askartv.phone.database.ServerDatabaseDao -import org.askartv.phone.models.User +import com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.User import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/core/src/main/java/org/askartv/phone/work/SyncWorker.kt b/core/src/main/java/com/nomadics9/ananas/work/SyncWorker.kt similarity index 89% rename from core/src/main/java/org/askartv/phone/work/SyncWorker.kt rename to core/src/main/java/com/nomadics9/ananas/work/SyncWorker.kt index 8201ac9b..5d980ed4 100644 --- a/core/src/main/java/org/askartv/phone/work/SyncWorker.kt +++ b/core/src/main/java/com/nomadics9/ananas/work/SyncWorker.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.work +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.User +import com.nomadics9.ananas.models.toFindroidEpisode +import com.nomadics9.ananas.models.toFindroidMovie import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/src/main/res/xml/fragment_settings.xml b/core/src/main/res/xml/fragment_settings.xml index 80178dd2..16915477 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" /> $$serializer INSTANCE; #} --keepnames class org.askartv.phone.models.CollectionType +-keepnames class com.nomadics9.ananas.models.CollectionType diff --git a/data/schemas/org.askartv.phone.database.ServerDatabase/2.json b/data/schemas/com.nomadics9.ananas.database.ServerDatabase/2.json similarity index 100% rename from data/schemas/org.askartv.phone.database.ServerDatabase/2.json rename to data/schemas/com.nomadics9.ananas.database.ServerDatabase/2.json diff --git a/data/schemas/org.askartv.phone.database.ServerDatabase/3.json b/data/schemas/com.nomadics9.ananas.database.ServerDatabase/3.json similarity index 100% rename from data/schemas/org.askartv.phone.database.ServerDatabase/3.json rename to data/schemas/com.nomadics9.ananas.database.ServerDatabase/3.json diff --git a/data/schemas/org.askartv.phone.database.ServerDatabase/4.json b/data/schemas/com.nomadics9.ananas.database.ServerDatabase/4.json similarity index 100% rename from data/schemas/org.askartv.phone.database.ServerDatabase/4.json rename to data/schemas/com.nomadics9.ananas.database.ServerDatabase/4.json diff --git a/data/schemas/org.askartv.phone.database.ServerDatabase/5.json b/data/schemas/com.nomadics9.ananas.database.ServerDatabase/5.json similarity index 100% rename from data/schemas/org.askartv.phone.database.ServerDatabase/5.json rename to data/schemas/com.nomadics9.ananas.database.ServerDatabase/5.json diff --git a/data/src/main/java/org/askartv/phone/api/JellyfinApi.kt b/data/src/main/java/com/nomadics9/ananas/api/JellyfinApi.kt similarity index 96% rename from data/src/main/java/org/askartv/phone/api/JellyfinApi.kt rename to data/src/main/java/com/nomadics9/ananas/api/JellyfinApi.kt index 3d518971..5e13c724 100644 --- a/data/src/main/java/org/askartv/phone/api/JellyfinApi.kt +++ b/data/src/main/java/com/nomadics9/ananas/api/JellyfinApi.kt @@ -1,8 +1,8 @@ -package org.askartv.phone.api +package com.nomadics9.ananas.api import android.content.Context -import org.askartv.phone.Constants -import org.askartv.phone.data.BuildConfig +import com.nomadics9.ananas.Constants +import com.nomadics9.ananas.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/org/askartv/phone/database/Converters.kt b/data/src/main/java/com/nomadics9/ananas/database/Converters.kt similarity index 92% rename from data/src/main/java/org/askartv/phone/database/Converters.kt rename to data/src/main/java/com/nomadics9/ananas/database/Converters.kt index 98b737f8..a216b5c1 100644 --- a/data/src/main/java/org/askartv/phone/database/Converters.kt +++ b/data/src/main/java/com/nomadics9/ananas/database/Converters.kt @@ -1,7 +1,7 @@ -package org.askartv.phone.database +package com.nomadics9.ananas.database import androidx.room.TypeConverter -import org.askartv.phone.models.FindroidChapter +import com.nomadics9.ananas.models.FindroidChapter import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.jellyfin.sdk.model.DateTime diff --git a/data/src/main/java/org/askartv/phone/database/ServerDatabase.kt b/data/src/main/java/com/nomadics9/ananas/database/ServerDatabase.kt similarity index 60% rename from data/src/main/java/org/askartv/phone/database/ServerDatabase.kt rename to data/src/main/java/com/nomadics9/ananas/database/ServerDatabase.kt index 60a0157c..06ebaee9 100644 --- a/data/src/main/java/org/askartv/phone/database/ServerDatabase.kt +++ b/data/src/main/java/com/nomadics9/ananas/database/ServerDatabase.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.database +package com.nomadics9.ananas.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 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 +import com.nomadics9.ananas.models.FindroidEpisodeDto +import com.nomadics9.ananas.models.FindroidMediaStreamDto +import com.nomadics9.ananas.models.FindroidMovieDto +import com.nomadics9.ananas.models.FindroidSeasonDto +import com.nomadics9.ananas.models.FindroidShowDto +import com.nomadics9.ananas.models.FindroidSourceDto +import com.nomadics9.ananas.models.FindroidTrickplayInfoDto +import com.nomadics9.ananas.models.FindroidUserDataDto +import com.nomadics9.ananas.models.IntroDto +import com.nomadics9.ananas.models.Server +import com.nomadics9.ananas.models.ServerAddress +import com.nomadics9.ananas.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/org/askartv/phone/database/ServerDatabaseDao.kt b/data/src/main/java/com/nomadics9/ananas/database/ServerDatabaseDao.kt similarity index 91% rename from data/src/main/java/org/askartv/phone/database/ServerDatabaseDao.kt rename to data/src/main/java/com/nomadics9/ananas/database/ServerDatabaseDao.kt index 7876cc36..13d1e266 100644 --- a/data/src/main/java/org/askartv/phone/database/ServerDatabaseDao.kt +++ b/data/src/main/java/com/nomadics9/ananas/database/ServerDatabaseDao.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.database +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.models.FindroidEpisodeDto +import com.nomadics9.ananas.models.FindroidMediaStreamDto +import com.nomadics9.ananas.models.FindroidMovieDto +import com.nomadics9.ananas.models.FindroidSeasonDto +import com.nomadics9.ananas.models.FindroidShowDto +import com.nomadics9.ananas.models.FindroidSourceDto +import com.nomadics9.ananas.models.FindroidTrickplayInfoDto +import com.nomadics9.ananas.models.FindroidUserDataDto +import com.nomadics9.ananas.models.IntroDto +import com.nomadics9.ananas.models.Server +import com.nomadics9.ananas.models.ServerAddress +import com.nomadics9.ananas.models.ServerWithAddressAndUser +import com.nomadics9.ananas.models.ServerWithAddresses +import com.nomadics9.ananas.models.ServerWithAddressesAndUsers +import com.nomadics9.ananas.models.ServerWithUsers +import com.nomadics9.ananas.models.User import java.util.UUID @Dao diff --git a/data/src/main/java/org/askartv/phone/models/CollectionType.kt b/data/src/main/java/com/nomadics9/ananas/models/CollectionType.kt similarity index 96% rename from data/src/main/java/org/askartv/phone/models/CollectionType.kt rename to data/src/main/java/com/nomadics9/ananas/models/CollectionType.kt index 5f4c03a8..6d08e735 100644 --- a/data/src/main/java/org/askartv/phone/models/CollectionType.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/CollectionType.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models enum class CollectionType(val type: String) { Movies("movies"), diff --git a/data/src/main/java/org/askartv/phone/models/FindroidBoxSet.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidBoxSet.kt similarity index 91% rename from data/src/main/java/org/askartv/phone/models/FindroidBoxSet.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidBoxSet.kt index 4a87aec4..b3d631d8 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidBoxSet.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidBoxSet.kt @@ -1,6 +1,6 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.repository.JellyfinRepository import org.jellyfin.sdk.model.api.BaseItemDto import java.util.UUID diff --git a/data/src/main/java/org/askartv/phone/models/FindroidChapter.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidChapter.kt similarity index 93% rename from data/src/main/java/org/askartv/phone/models/FindroidChapter.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidChapter.kt index 1f7a82d1..f66d52e3 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidChapter.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidChapter.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import kotlinx.serialization.Serializable import org.jellyfin.sdk.model.api.BaseItemDto diff --git a/data/src/main/java/org/askartv/phone/models/FindroidCollection.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidCollection.kt similarity index 92% rename from data/src/main/java/org/askartv/phone/models/FindroidCollection.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidCollection.kt index 2c2f1f11..7bc78b32 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidCollection.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidCollection.kt @@ -1,6 +1,6 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.repository.JellyfinRepository import org.jellyfin.sdk.model.api.BaseItemDto import java.util.UUID diff --git a/data/src/main/java/org/askartv/phone/models/FindroidEpisode.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidEpisode.kt similarity index 96% rename from data/src/main/java/org/askartv/phone/models/FindroidEpisode.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidEpisode.kt index 58960c6e..7ad60a1c 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidEpisode.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidEpisode.kt @@ -1,7 +1,7 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models -import org.askartv.phone.database.ServerDatabaseDao -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.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/org/askartv/phone/models/FindroidEpisodeDto.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidEpisodeDto.kt similarity index 98% rename from data/src/main/java/org/askartv/phone/models/FindroidEpisodeDto.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidEpisodeDto.kt index 106c8890..66157896 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidEpisodeDto.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidEpisodeDto.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Entity import androidx.room.ForeignKey diff --git a/data/src/main/java/org/askartv/phone/models/FindroidFolder.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidFolder.kt similarity index 92% rename from data/src/main/java/org/askartv/phone/models/FindroidFolder.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidFolder.kt index 6f853885..eeb80971 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidFolder.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidFolder.kt @@ -1,6 +1,6 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.repository.JellyfinRepository import org.jellyfin.sdk.model.api.BaseItemDto import java.util.UUID diff --git a/data/src/main/java/org/askartv/phone/models/FindroidImages.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidImages.kt similarity index 94% rename from data/src/main/java/org/askartv/phone/models/FindroidImages.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidImages.kt index b245809f..be1eadc4 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidImages.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidImages.kt @@ -1,7 +1,7 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import android.net.Uri -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.repository.JellyfinRepository import org.jellyfin.sdk.model.api.BaseItemDto import org.jellyfin.sdk.model.api.ImageType diff --git a/data/src/main/java/org/askartv/phone/models/FindroidItem.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidItem.kt similarity index 90% rename from data/src/main/java/org/askartv/phone/models/FindroidItem.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidItem.kt index 55f5fb9f..b49d8204 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidItem.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidItem.kt @@ -1,7 +1,7 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models -import org.askartv.phone.database.ServerDatabaseDao -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.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/org/askartv/phone/models/FindroidMediaStream.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidMediaStream.kt similarity index 94% rename from data/src/main/java/org/askartv/phone/models/FindroidMediaStream.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidMediaStream.kt index a7eec3bb..ee8507cb 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidMediaStream.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidMediaStream.kt @@ -1,6 +1,6 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.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/org/askartv/phone/models/FindroidMediaStreamDto.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidMediaStreamDto.kt similarity index 97% rename from data/src/main/java/org/askartv/phone/models/FindroidMediaStreamDto.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidMediaStreamDto.kt index 9ecb2a05..191ab96d 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidMediaStreamDto.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidMediaStreamDto.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/data/src/main/java/org/askartv/phone/models/FindroidMovie.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidMovie.kt similarity index 96% rename from data/src/main/java/org/askartv/phone/models/FindroidMovie.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidMovie.kt index 252aa360..1e83d649 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidMovie.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidMovie.kt @@ -1,7 +1,7 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models -import org.askartv.phone.database.ServerDatabaseDao -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.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/org/askartv/phone/models/FindroidMovieDto.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidMovieDto.kt similarity index 96% rename from data/src/main/java/org/askartv/phone/models/FindroidMovieDto.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidMovieDto.kt index 9467088b..5b110925 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidMovieDto.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidMovieDto.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/data/src/main/java/org/askartv/phone/models/FindroidSeason.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidSeason.kt similarity index 93% rename from data/src/main/java/org/askartv/phone/models/FindroidSeason.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidSeason.kt index a6e347eb..f3916aa5 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidSeason.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidSeason.kt @@ -1,7 +1,7 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models -import org.askartv.phone.database.ServerDatabaseDao -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.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/org/askartv/phone/models/FindroidSeasonDto.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidSeasonDto.kt similarity index 96% rename from data/src/main/java/org/askartv/phone/models/FindroidSeasonDto.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidSeasonDto.kt index 3441c1f5..d31df363 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidSeasonDto.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidSeasonDto.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Entity import androidx.room.ForeignKey diff --git a/data/src/main/java/org/askartv/phone/models/FindroidShow.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidShow.kt similarity index 95% rename from data/src/main/java/org/askartv/phone/models/FindroidShow.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidShow.kt index 2a5c5051..e0f2f52b 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidShow.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidShow.kt @@ -1,7 +1,7 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models -import org.askartv.phone.database.ServerDatabaseDao -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.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/org/askartv/phone/models/FindroidShowDto.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidShowDto.kt similarity index 96% rename from data/src/main/java/org/askartv/phone/models/FindroidShowDto.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidShowDto.kt index 32bf4789..2613f819 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidShowDto.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidShowDto.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/data/src/main/java/org/askartv/phone/models/FindroidSource.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidSource.kt similarity index 91% rename from data/src/main/java/org/askartv/phone/models/FindroidSource.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidSource.kt index fec86489..271f3b0f 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidSource.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidSource.kt @@ -1,7 +1,7 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models -import org.askartv.phone.database.ServerDatabaseDao -import org.askartv.phone.repository.JellyfinRepository +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.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/org/askartv/phone/models/FindroidSourceDto.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidSourceDto.kt similarity index 94% rename from data/src/main/java/org/askartv/phone/models/FindroidSourceDto.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidSourceDto.kt index f573022c..950e283a 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidSourceDto.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidSourceDto.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/data/src/main/java/org/askartv/phone/models/FindroidSources.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidSources.kt similarity index 81% rename from data/src/main/java/org/askartv/phone/models/FindroidSources.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidSources.kt index d742f2bf..700bea9b 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidSources.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidSources.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models interface FindroidSources { val sources: List diff --git a/data/src/main/java/org/askartv/phone/models/FindroidTrickplayInfo.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidTrickplayInfo.kt similarity index 96% rename from data/src/main/java/org/askartv/phone/models/FindroidTrickplayInfo.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidTrickplayInfo.kt index be051ffa..442eeaf7 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidTrickplayInfo.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidTrickplayInfo.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import org.jellyfin.sdk.model.api.TrickplayInfo diff --git a/data/src/main/java/org/askartv/phone/models/FindroidTrickplayInfoDto.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidTrickplayInfoDto.kt similarity index 96% rename from data/src/main/java/org/askartv/phone/models/FindroidTrickplayInfoDto.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidTrickplayInfoDto.kt index 43da2927..273eee5e 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidTrickplayInfoDto.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidTrickplayInfoDto.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Entity import androidx.room.ForeignKey diff --git a/data/src/main/java/org/askartv/phone/models/FindroidUserDataDto.kt b/data/src/main/java/com/nomadics9/ananas/models/FindroidUserDataDto.kt similarity index 94% rename from data/src/main/java/org/askartv/phone/models/FindroidUserDataDto.kt rename to data/src/main/java/com/nomadics9/ananas/models/FindroidUserDataDto.kt index 5e0af134..5595eb7a 100644 --- a/data/src/main/java/org/askartv/phone/models/FindroidUserDataDto.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/FindroidUserDataDto.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Entity import java.util.UUID diff --git a/data/src/main/java/org/askartv/phone/models/Intro.kt b/data/src/main/java/com/nomadics9/ananas/models/Intro.kt similarity index 93% rename from data/src/main/java/org/askartv/phone/models/Intro.kt rename to data/src/main/java/com/nomadics9/ananas/models/Intro.kt index 7b8ccded..eb2e6fc6 100644 --- a/data/src/main/java/org/askartv/phone/models/Intro.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/Intro.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/main/java/org/askartv/phone/models/IntroDto.kt b/data/src/main/java/com/nomadics9/ananas/models/IntroDto.kt similarity index 93% rename from data/src/main/java/org/askartv/phone/models/IntroDto.kt rename to data/src/main/java/com/nomadics9/ananas/models/IntroDto.kt index 0046a3c7..d67501db 100644 --- a/data/src/main/java/org/askartv/phone/models/IntroDto.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/IntroDto.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/data/src/main/java/org/askartv/phone/models/Server.kt b/data/src/main/java/com/nomadics9/ananas/models/Server.kt similarity index 87% rename from data/src/main/java/org/askartv/phone/models/Server.kt rename to data/src/main/java/com/nomadics9/ananas/models/Server.kt index 03f3d61e..878fa1e5 100644 --- a/data/src/main/java/org/askartv/phone/models/Server.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/Server.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/data/src/main/java/org/askartv/phone/models/ServerAddress.kt b/data/src/main/java/com/nomadics9/ananas/models/ServerAddress.kt similarity index 94% rename from data/src/main/java/org/askartv/phone/models/ServerAddress.kt rename to data/src/main/java/com/nomadics9/ananas/models/ServerAddress.kt index cf38b551..a94b1610 100644 --- a/data/src/main/java/org/askartv/phone/models/ServerAddress.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/ServerAddress.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/data/src/main/java/org/askartv/phone/models/ServerWithAddressAndUser.kt b/data/src/main/java/com/nomadics9/ananas/models/ServerWithAddressAndUser.kt similarity index 91% rename from data/src/main/java/org/askartv/phone/models/ServerWithAddressAndUser.kt rename to data/src/main/java/com/nomadics9/ananas/models/ServerWithAddressAndUser.kt index 665b2a28..0c4012ac 100644 --- a/data/src/main/java/org/askartv/phone/models/ServerWithAddressAndUser.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/ServerWithAddressAndUser.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Embedded import androidx.room.Relation diff --git a/data/src/main/java/org/askartv/phone/models/ServerWithAddresses.kt b/data/src/main/java/com/nomadics9/ananas/models/ServerWithAddresses.kt similarity index 91% rename from data/src/main/java/org/askartv/phone/models/ServerWithAddresses.kt rename to data/src/main/java/com/nomadics9/ananas/models/ServerWithAddresses.kt index a9c45015..2d82e7ec 100644 --- a/data/src/main/java/org/askartv/phone/models/ServerWithAddresses.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/ServerWithAddresses.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Embedded import androidx.room.Relation diff --git a/data/src/main/java/org/askartv/phone/models/ServerWithAddressesAndUsers.kt b/data/src/main/java/com/nomadics9/ananas/models/ServerWithAddressesAndUsers.kt similarity index 91% rename from data/src/main/java/org/askartv/phone/models/ServerWithAddressesAndUsers.kt rename to data/src/main/java/com/nomadics9/ananas/models/ServerWithAddressesAndUsers.kt index 1e2e7847..737edfed 100644 --- a/data/src/main/java/org/askartv/phone/models/ServerWithAddressesAndUsers.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/ServerWithAddressesAndUsers.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Embedded import androidx.room.Relation diff --git a/data/src/main/java/org/askartv/phone/models/ServerWithUsers.kt b/data/src/main/java/com/nomadics9/ananas/models/ServerWithUsers.kt similarity index 87% rename from data/src/main/java/org/askartv/phone/models/ServerWithUsers.kt rename to data/src/main/java/com/nomadics9/ananas/models/ServerWithUsers.kt index c27a6d88..1d59d2a7 100644 --- a/data/src/main/java/org/askartv/phone/models/ServerWithUsers.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/ServerWithUsers.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.Embedded import androidx.room.Relation diff --git a/data/src/main/java/org/askartv/phone/models/SortBy.kt b/data/src/main/java/com/nomadics9/ananas/models/SortBy.kt similarity index 93% rename from data/src/main/java/org/askartv/phone/models/SortBy.kt rename to data/src/main/java/com/nomadics9/ananas/models/SortBy.kt index d75dbf2a..d0d6f930 100644 --- a/data/src/main/java/org/askartv/phone/models/SortBy.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/SortBy.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models enum class SortBy(val sortString: String) { NAME("SortName"), diff --git a/data/src/main/java/org/askartv/phone/models/User.kt b/data/src/main/java/com/nomadics9/ananas/models/User.kt similarity index 94% rename from data/src/main/java/org/askartv/phone/models/User.kt rename to data/src/main/java/com/nomadics9/ananas/models/User.kt index e91e00f4..0e7a0292 100644 --- a/data/src/main/java/org/askartv/phone/models/User.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/User.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/data/src/main/java/org/askartv/phone/models/VideoMetadata.kt b/data/src/main/java/com/nomadics9/ananas/models/VideoMetadata.kt similarity index 96% rename from data/src/main/java/org/askartv/phone/models/VideoMetadata.kt rename to data/src/main/java/com/nomadics9/ananas/models/VideoMetadata.kt index 676cb00b..f64dc575 100644 --- a/data/src/main/java/org/askartv/phone/models/VideoMetadata.kt +++ b/data/src/main/java/com/nomadics9/ananas/models/VideoMetadata.kt @@ -1,6 +1,6 @@ @file:Suppress("Unused") -package org.askartv.phone.models +package com.nomadics9.ananas.models data class VideoMetadata( val resolution: List, diff --git a/data/src/main/java/org/askartv/phone/repository/ItemsPagingSource.kt b/data/src/main/java/com/nomadics9/ananas/repository/ItemsPagingSource.kt similarity index 91% rename from data/src/main/java/org/askartv/phone/repository/ItemsPagingSource.kt rename to data/src/main/java/com/nomadics9/ananas/repository/ItemsPagingSource.kt index 1f521d1c..1fc499f0 100644 --- a/data/src/main/java/org/askartv/phone/repository/ItemsPagingSource.kt +++ b/data/src/main/java/com/nomadics9/ananas/repository/ItemsPagingSource.kt @@ -1,9 +1,9 @@ -package org.askartv.phone.repository +package com.nomadics9.ananas.repository import androidx.paging.PagingSource import androidx.paging.PagingState -import org.askartv.phone.models.FindroidItem -import org.askartv.phone.models.SortBy +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.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/org/askartv/phone/repository/JellyfinRepository.kt b/data/src/main/java/com/nomadics9/ananas/repository/JellyfinRepository.kt similarity index 87% rename from data/src/main/java/org/askartv/phone/repository/JellyfinRepository.kt rename to data/src/main/java/com/nomadics9/ananas/repository/JellyfinRepository.kt index 00675d46..96a88904 100644 --- a/data/src/main/java/org/askartv/phone/repository/JellyfinRepository.kt +++ b/data/src/main/java/com/nomadics9/ananas/repository/JellyfinRepository.kt @@ -1,15 +1,15 @@ -package org.askartv.phone.repository +package com.nomadics9.ananas.repository import androidx.paging.PagingData -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 com.nomadics9.ananas.models.FindroidCollection +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidSeason +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.models.FindroidSource +import com.nomadics9.ananas.models.Intro +import com.nomadics9.ananas.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/org/askartv/phone/repository/JellyfinRepositoryImpl.kt b/data/src/main/java/com/nomadics9/ananas/repository/JellyfinRepositoryImpl.kt similarity index 95% rename from data/src/main/java/org/askartv/phone/repository/JellyfinRepositoryImpl.kt rename to data/src/main/java/com/nomadics9/ananas/repository/JellyfinRepositoryImpl.kt index 22b676c7..6cb6137a 100644 --- a/data/src/main/java/org/askartv/phone/repository/JellyfinRepositoryImpl.kt +++ b/data/src/main/java/com/nomadics9/ananas/repository/JellyfinRepositoryImpl.kt @@ -1,29 +1,29 @@ -package org.askartv.phone.repository +package com.nomadics9.ananas.repository import android.content.Context import androidx.paging.Pager import androidx.paging.PagingConfig import androidx.paging.PagingData -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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.FindroidCollection +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidSeason +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.models.FindroidSource +import com.nomadics9.ananas.models.Intro +import com.nomadics9.ananas.models.SortBy +import com.nomadics9.ananas.models.toFindroidCollection +import com.nomadics9.ananas.models.toFindroidEpisode +import com.nomadics9.ananas.models.toFindroidItem +import com.nomadics9.ananas.models.toFindroidMovie +import com.nomadics9.ananas.models.toFindroidSeason +import com.nomadics9.ananas.models.toFindroidShow +import com.nomadics9.ananas.models.toFindroidSource +import com.nomadics9.ananas.models.toIntro import io.ktor.util.toByteArray import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/data/src/main/java/org/askartv/phone/repository/JellyfinRepositoryOfflineImpl.kt b/data/src/main/java/com/nomadics9/ananas/repository/JellyfinRepositoryOfflineImpl.kt similarity index 91% rename from data/src/main/java/org/askartv/phone/repository/JellyfinRepositoryOfflineImpl.kt rename to data/src/main/java/com/nomadics9/ananas/repository/JellyfinRepositoryOfflineImpl.kt index de31b2cd..8823bb31 100644 --- a/data/src/main/java/org/askartv/phone/repository/JellyfinRepositoryOfflineImpl.kt +++ b/data/src/main/java/com/nomadics9/ananas/repository/JellyfinRepositoryOfflineImpl.kt @@ -1,25 +1,25 @@ -package org.askartv.phone.repository +package com.nomadics9.ananas.repository import android.content.Context import androidx.paging.PagingData -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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.api.JellyfinApi +import com.nomadics9.ananas.database.ServerDatabaseDao +import com.nomadics9.ananas.models.FindroidCollection +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidSeason +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.models.FindroidSource +import com.nomadics9.ananas.models.Intro +import com.nomadics9.ananas.models.SortBy +import com.nomadics9.ananas.models.toFindroidEpisode +import com.nomadics9.ananas.models.toFindroidMovie +import com.nomadics9.ananas.models.toFindroidSeason +import com.nomadics9.ananas.models.toFindroidShow +import com.nomadics9.ananas.models.toFindroidSource +import com.nomadics9.ananas.models.toIntro import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.withContext diff --git a/fastlane/Appfile b/fastlane/Appfile index 0a093856..7f32556c 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1 +1 @@ -package_name("org.askartv.phone") +package_name("com.nomadics9.ananas") diff --git a/player/core/build.gradle.kts b/player/core/build.gradle.kts index 9ddcb5b0..e7642a35 100644 --- a/player/core/build.gradle.kts +++ b/player/core/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } android { - namespace = "org.askartv.phone.player.core" + namespace = "com.nomadics9.ananas.player.core" compileSdk = Versions.compileSdk buildToolsVersion = Versions.buildTools diff --git a/player/core/src/main/java/org/askartv/phone/models/ExternalSubtitle.kt b/player/core/src/main/java/com/nomadics9/ananas/models/ExternalSubtitle.kt similarity index 86% rename from player/core/src/main/java/org/askartv/phone/models/ExternalSubtitle.kt rename to player/core/src/main/java/com/nomadics9/ananas/models/ExternalSubtitle.kt index d5067ade..ee2da553 100644 --- a/player/core/src/main/java/org/askartv/phone/models/ExternalSubtitle.kt +++ b/player/core/src/main/java/com/nomadics9/ananas/models/ExternalSubtitle.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import android.net.Uri import android.os.Parcelable diff --git a/player/core/src/main/java/org/askartv/phone/models/PlayerChapter.kt b/player/core/src/main/java/com/nomadics9/ananas/models/PlayerChapter.kt similarity index 87% rename from player/core/src/main/java/org/askartv/phone/models/PlayerChapter.kt rename to player/core/src/main/java/com/nomadics9/ananas/models/PlayerChapter.kt index ccde185d..cff33ea5 100644 --- a/player/core/src/main/java/org/askartv/phone/models/PlayerChapter.kt +++ b/player/core/src/main/java/com/nomadics9/ananas/models/PlayerChapter.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/player/core/src/main/java/org/askartv/phone/models/PlayerItem.kt b/player/core/src/main/java/com/nomadics9/ananas/models/PlayerItem.kt similarity index 93% rename from player/core/src/main/java/org/askartv/phone/models/PlayerItem.kt rename to player/core/src/main/java/com/nomadics9/ananas/models/PlayerItem.kt index 15d6a68f..65a7af2f 100644 --- a/player/core/src/main/java/org/askartv/phone/models/PlayerItem.kt +++ b/player/core/src/main/java/com/nomadics9/ananas/models/PlayerItem.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/player/core/src/main/java/org/askartv/phone/models/Track.kt b/player/core/src/main/java/com/nomadics9/ananas/models/Track.kt similarity index 87% rename from player/core/src/main/java/org/askartv/phone/models/Track.kt rename to player/core/src/main/java/com/nomadics9/ananas/models/Track.kt index 592304a4..8946170f 100644 --- a/player/core/src/main/java/org/askartv/phone/models/Track.kt +++ b/player/core/src/main/java/com/nomadics9/ananas/models/Track.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/player/core/src/main/java/org/askartv/phone/models/Trickplay.kt b/player/core/src/main/java/com/nomadics9/ananas/models/Trickplay.kt similarity index 75% rename from player/core/src/main/java/org/askartv/phone/models/Trickplay.kt rename to player/core/src/main/java/com/nomadics9/ananas/models/Trickplay.kt index 255278af..7b34c816 100644 --- a/player/core/src/main/java/org/askartv/phone/models/Trickplay.kt +++ b/player/core/src/main/java/com/nomadics9/ananas/models/Trickplay.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import android.graphics.Bitmap diff --git a/player/core/src/main/java/org/askartv/phone/models/TrickplayInfo.kt b/player/core/src/main/java/com/nomadics9/ananas/models/TrickplayInfo.kt similarity index 88% rename from player/core/src/main/java/org/askartv/phone/models/TrickplayInfo.kt rename to player/core/src/main/java/com/nomadics9/ananas/models/TrickplayInfo.kt index 85337f1d..9e840933 100644 --- a/player/core/src/main/java/org/askartv/phone/models/TrickplayInfo.kt +++ b/player/core/src/main/java/com/nomadics9/ananas/models/TrickplayInfo.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/player/video/build.gradle.kts b/player/video/build.gradle.kts index 1eaf1d37..2dbcd0ad 100644 --- a/player/video/build.gradle.kts +++ b/player/video/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } android { - namespace = "org.askartv.phone.player.video" + namespace = "com.nomadics9.ananas.player.video" compileSdk = Versions.compileSdk buildToolsVersion = Versions.buildTools diff --git a/player/video/src/main/java/org/askartv/phone/Extensions.kt b/player/video/src/main/java/com/nomadics9/ananas/Extensions.kt similarity index 94% rename from player/video/src/main/java/org/askartv/phone/Extensions.kt rename to player/video/src/main/java/com/nomadics9/ananas/Extensions.kt index e2fcc137..336cd7f8 100644 --- a/player/video/src/main/java/org/askartv/phone/Extensions.kt +++ b/player/video/src/main/java/com/nomadics9/ananas/Extensions.kt @@ -1,4 +1,4 @@ -package org.askartv.phone +package com.nomadics9.ananas import androidx.media3.common.Tracks import java.util.Locale diff --git a/player/video/src/main/java/org/askartv/phone/dialogs/SpeedSelectionDialogFragment.kt b/player/video/src/main/java/com/nomadics9/ananas/dialogs/SpeedSelectionDialogFragment.kt similarity index 89% rename from player/video/src/main/java/org/askartv/phone/dialogs/SpeedSelectionDialogFragment.kt rename to player/video/src/main/java/com/nomadics9/ananas/dialogs/SpeedSelectionDialogFragment.kt index 1392b405..21f92fce 100644 --- a/player/video/src/main/java/org/askartv/phone/dialogs/SpeedSelectionDialogFragment.kt +++ b/player/video/src/main/java/com/nomadics9/ananas/dialogs/SpeedSelectionDialogFragment.kt @@ -1,11 +1,11 @@ -package org.askartv.phone.dialogs +package com.nomadics9.ananas.dialogs import android.app.Dialog import android.os.Bundle import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.askartv.phone.player.video.R -import org.askartv.phone.viewmodels.PlayerActivityViewModel +import com.nomadics9.ananas.player.video.R +import com.nomadics9.ananas.viewmodels.PlayerActivityViewModel import java.lang.IllegalStateException class SpeedSelectionDialogFragment( diff --git a/player/video/src/main/java/org/askartv/phone/dialogs/TrackSelectionDialogFragment.kt b/player/video/src/main/java/com/nomadics9/ananas/dialogs/TrackSelectionDialogFragment.kt similarity index 90% rename from player/video/src/main/java/org/askartv/phone/dialogs/TrackSelectionDialogFragment.kt rename to player/video/src/main/java/com/nomadics9/ananas/dialogs/TrackSelectionDialogFragment.kt index 8e158224..fb48030a 100644 --- a/player/video/src/main/java/org/askartv/phone/dialogs/TrackSelectionDialogFragment.kt +++ b/player/video/src/main/java/com/nomadics9/ananas/dialogs/TrackSelectionDialogFragment.kt @@ -1,13 +1,13 @@ -package org.askartv.phone.dialogs +package com.nomadics9.ananas.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 org.askartv.phone.getTrackNames -import org.askartv.phone.player.video.R -import org.askartv.phone.viewmodels.PlayerActivityViewModel +import com.nomadics9.ananas.getTrackNames +import com.nomadics9.ananas.player.video.R +import com.nomadics9.ananas.viewmodels.PlayerActivityViewModel import java.lang.IllegalStateException class TrackSelectionDialogFragment( diff --git a/player/video/src/main/java/org/askartv/phone/dialogs/VideoVersionDialogFragment.kt b/player/video/src/main/java/com/nomadics9/ananas/dialogs/VideoVersionDialogFragment.kt similarity index 83% rename from player/video/src/main/java/org/askartv/phone/dialogs/VideoVersionDialogFragment.kt rename to player/video/src/main/java/com/nomadics9/ananas/dialogs/VideoVersionDialogFragment.kt index f720497e..0a5f87c0 100644 --- a/player/video/src/main/java/org/askartv/phone/dialogs/VideoVersionDialogFragment.kt +++ b/player/video/src/main/java/com/nomadics9/ananas/dialogs/VideoVersionDialogFragment.kt @@ -1,10 +1,10 @@ -package org.askartv.phone.dialogs +package com.nomadics9.ananas.dialogs import android.content.Context import androidx.appcompat.app.AlertDialog import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.askartv.phone.models.FindroidItem -import org.askartv.phone.player.video.R +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.player.video.R fun getVideoVersionDialog( context: Context, diff --git a/player/video/src/main/java/org/askartv/phone/mpv/MPVPlayer.kt b/player/video/src/main/java/com/nomadics9/ananas/mpv/MPVPlayer.kt similarity index 99% rename from player/video/src/main/java/org/askartv/phone/mpv/MPVPlayer.kt rename to player/video/src/main/java/com/nomadics9/ananas/mpv/MPVPlayer.kt index 644e59df..7e9c79ef 100644 --- a/player/video/src/main/java/org/askartv/phone/mpv/MPVPlayer.kt +++ b/player/video/src/main/java/com/nomadics9/ananas/mpv/MPVPlayer.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.mpv +package com.nomadics9.ananas.mpv import android.app.Application import android.content.Context diff --git a/player/video/src/main/java/org/askartv/phone/mpv/TrackType.kt b/player/video/src/main/java/com/nomadics9/ananas/mpv/TrackType.kt similarity index 94% rename from player/video/src/main/java/org/askartv/phone/mpv/TrackType.kt rename to player/video/src/main/java/com/nomadics9/ananas/mpv/TrackType.kt index 3b1f1c3a..8b1cbc26 100644 --- a/player/video/src/main/java/org/askartv/phone/mpv/TrackType.kt +++ b/player/video/src/main/java/com/nomadics9/ananas/mpv/TrackType.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.mpv +package com.nomadics9.ananas.mpv import android.os.Parcelable import androidx.media3.common.C diff --git a/player/video/src/main/java/org/askartv/phone/viewmodels/PlayerActivityViewModel.kt b/player/video/src/main/java/com/nomadics9/ananas/viewmodels/PlayerActivityViewModel.kt similarity index 97% rename from player/video/src/main/java/org/askartv/phone/viewmodels/PlayerActivityViewModel.kt rename to player/video/src/main/java/com/nomadics9/ananas/viewmodels/PlayerActivityViewModel.kt index ae1aa969..ba4786d8 100644 --- a/player/video/src/main/java/org/askartv/phone/viewmodels/PlayerActivityViewModel.kt +++ b/player/video/src/main/java/com/nomadics9/ananas/viewmodels/PlayerActivityViewModel.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.AppPreferences +import com.nomadics9.ananas.models.Intro +import com.nomadics9.ananas.models.PlayerChapter +import com.nomadics9.ananas.models.PlayerItem +import com.nomadics9.ananas.models.Trickplay +import com.nomadics9.ananas.mpv.MPVPlayer +import com.nomadics9.ananas.player.video.R +import com.nomadics9.ananas.repository.JellyfinRepository import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope diff --git a/player/video/src/main/java/org/askartv/phone/viewmodels/PlayerViewModel.kt b/player/video/src/main/java/com/nomadics9/ananas/viewmodels/PlayerViewModel.kt similarity index 90% rename from player/video/src/main/java/org/askartv/phone/viewmodels/PlayerViewModel.kt rename to player/video/src/main/java/com/nomadics9/ananas/viewmodels/PlayerViewModel.kt index a8c10ea0..097df0e1 100644 --- a/player/video/src/main/java/org/askartv/phone/viewmodels/PlayerViewModel.kt +++ b/player/video/src/main/java/com/nomadics9/ananas/viewmodels/PlayerViewModel.kt @@ -1,23 +1,23 @@ -package org.askartv.phone.viewmodels +package com.nomadics9.ananas.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 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 com.nomadics9.ananas.models.ExternalSubtitle +import com.nomadics9.ananas.models.FindroidChapter +import com.nomadics9.ananas.models.FindroidEpisode +import com.nomadics9.ananas.models.FindroidItem +import com.nomadics9.ananas.models.FindroidMovie +import com.nomadics9.ananas.models.FindroidSeason +import com.nomadics9.ananas.models.FindroidShow +import com.nomadics9.ananas.models.FindroidSourceType +import com.nomadics9.ananas.models.FindroidSources +import com.nomadics9.ananas.models.PlayerChapter +import com.nomadics9.ananas.models.PlayerItem +import com.nomadics9.ananas.models.TrickplayInfo +import com.nomadics9.ananas.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 c4b6dbf1..bf8a69de 100644 --- a/preferences/build.gradle.kts +++ b/preferences/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } android { - namespace = "org.askartv.phone.preferences" + namespace = "com.nomadics9.ananas.preferences" compileSdk = Versions.compileSdk buildToolsVersion = Versions.buildTools diff --git a/preferences/src/main/java/org/askartv/phone/AppPreferences.kt b/preferences/src/main/java/com/nomadics9/ananas/AppPreferences.kt similarity index 99% rename from preferences/src/main/java/org/askartv/phone/AppPreferences.kt rename to preferences/src/main/java/com/nomadics9/ananas/AppPreferences.kt index e27463b2..80aa4afa 100644 --- a/preferences/src/main/java/org/askartv/phone/AppPreferences.kt +++ b/preferences/src/main/java/com/nomadics9/ananas/AppPreferences.kt @@ -1,4 +1,4 @@ -package org.askartv.phone +package com.nomadics9.ananas import android.content.SharedPreferences import android.view.WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE diff --git a/preferences/src/main/java/org/askartv/phone/Constants.kt b/preferences/src/main/java/com/nomadics9/ananas/Constants.kt similarity index 99% rename from preferences/src/main/java/org/askartv/phone/Constants.kt rename to preferences/src/main/java/com/nomadics9/ananas/Constants.kt index 7c6f28ef..ac8e9944 100644 --- a/preferences/src/main/java/org/askartv/phone/Constants.kt +++ b/preferences/src/main/java/com/nomadics9/ananas/Constants.kt @@ -1,4 +1,4 @@ -package org.askartv.phone +package com.nomadics9.ananas object Constants { diff --git a/preferences/src/main/java/org/askartv/phone/models/Preference.kt b/preferences/src/main/java/com/nomadics9/ananas/models/Preference.kt similarity index 83% rename from preferences/src/main/java/org/askartv/phone/models/Preference.kt rename to preferences/src/main/java/com/nomadics9/ananas/models/Preference.kt index ffaf4c26..1f1539b8 100644 --- a/preferences/src/main/java/org/askartv/phone/models/Preference.kt +++ b/preferences/src/main/java/com/nomadics9/ananas/models/Preference.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models interface Preference { val nameStringResource: Int diff --git a/preferences/src/main/java/org/askartv/phone/models/PreferenceCategory.kt b/preferences/src/main/java/com/nomadics9/ananas/models/PreferenceCategory.kt similarity index 93% rename from preferences/src/main/java/org/askartv/phone/models/PreferenceCategory.kt rename to preferences/src/main/java/com/nomadics9/ananas/models/PreferenceCategory.kt index eb346510..4862a561 100644 --- a/preferences/src/main/java/org/askartv/phone/models/PreferenceCategory.kt +++ b/preferences/src/main/java/com/nomadics9/ananas/models/PreferenceCategory.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/preferences/src/main/java/org/askartv/phone/models/PreferenceSelect.kt b/preferences/src/main/java/com/nomadics9/ananas/models/PreferenceSelect.kt similarity index 94% rename from preferences/src/main/java/org/askartv/phone/models/PreferenceSelect.kt rename to preferences/src/main/java/com/nomadics9/ananas/models/PreferenceSelect.kt index 91febd5d..57f3db91 100644 --- a/preferences/src/main/java/org/askartv/phone/models/PreferenceSelect.kt +++ b/preferences/src/main/java/com/nomadics9/ananas/models/PreferenceSelect.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/preferences/src/main/java/org/askartv/phone/models/PreferenceSwitch.kt b/preferences/src/main/java/com/nomadics9/ananas/models/PreferenceSwitch.kt similarity index 93% rename from preferences/src/main/java/org/askartv/phone/models/PreferenceSwitch.kt rename to preferences/src/main/java/com/nomadics9/ananas/models/PreferenceSwitch.kt index fab1b6fb..c3837e78 100644 --- a/preferences/src/main/java/org/askartv/phone/models/PreferenceSwitch.kt +++ b/preferences/src/main/java/com/nomadics9/ananas/models/PreferenceSwitch.kt @@ -1,4 +1,4 @@ -package org.askartv.phone.models +package com.nomadics9.ananas.models import androidx.annotation.DrawableRes import androidx.annotation.StringRes