From 9edfb815ce43e487b8d43cff869cf635e59fe73f Mon Sep 17 00:00:00 2001 From: urFate Date: Sun, 30 Jun 2024 17:52:36 +0300 Subject: [PATCH] refactor!: move to shirabox.org domain name --- README.md | 2 +- app/build.gradle.kts | 4 +- app/google-services.json | 38 +++++++++++++++++++ app/proguard-rules.pro | 2 +- .../shirabox/app}/ExampleInstrumentedTest.kt | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../shirabox => org/shirabox/app}/App.kt | 2 +- .../shirabox/app}/NotificationService.kt | 12 +++--- .../shirabox/app}/ValuesHelper.kt | 6 +-- .../shirabox/app}/ui/activity/MainActivity.kt | 10 ++--- .../ui/activity/auth/AnimeSkipAuthForm.kt | 12 +++--- .../app}/ui/activity/auth/AuthActivity.kt | 8 ++-- .../app}/ui/activity/player/PlayerActivity.kt | 8 ++-- .../ui/activity/player/PlayerBottomSheets.kt | 10 ++--- .../app}/ui/activity/player/PlayerControls.kt | 12 +++--- .../ui/activity/player/PlayerStateListener.kt | 4 +- .../ui/activity/player/PlayerViewModel.kt | 22 +++++------ .../app}/ui/activity/player/ShiraPlayer.kt | 8 ++-- .../ui/activity/resource/ResourceActivity.kt | 22 +++++------ .../activity/resource/ResourceSheetScreens.kt | 22 +++++------ .../ui/activity/resource/ResourceViewModel.kt | 30 +++++++-------- .../app}/ui/activity/search/SearchActivity.kt | 24 ++++++------ .../app}/ui/activity/settings/Preferences.kt | 6 +-- .../ui/activity/settings/SettingsActivity.kt | 6 +-- .../ui/activity/settings/SettingsNavHost.kt | 12 +++--- .../ui/activity/settings/SettingsNavItems.kt | 4 +- .../settings/category/AboutSettingsScreen.kt | 12 +++--- .../category/AppearanceSettingsScreen.kt | 10 ++--- .../category/GeneralSettingsScreen.kt | 10 ++--- .../settings/category/SettingsRootScreen.kt | 6 +-- .../settings/category/playback/Dialogs.kt | 8 ++-- .../playback/PlaybackSettingsScreen.kt | 22 +++++------ .../ui/activity/update/AppUpdateActivity.kt | 14 +++---- .../app}/ui/component/general/ContentCard.kt | 14 +++---- .../app}/ui/component/general/Emoticons.kt | 2 +- .../ui/component/general/ExpandableBox.kt | 2 +- .../app}/ui/component/general/ListItem.kt | 4 +- .../app}/ui/component/general/Monogram.kt | 2 +- .../ui/component/general/Notifications.kt | 4 +- .../app}/ui/component/general/PreviewCard.kt | 6 +-- .../app}/ui/component/general/RatingView.kt | 4 +- .../ui/component/general/SpecialSnackbar.kt | 2 +- .../ui/component/navigation/BottomNavItems.kt | 4 +- .../navigation/BottomNavigationBar.kt | 2 +- .../navigation/BottomNavigationView.kt | 2 +- .../ui/component/navigation/NestedNavItems.kt | 2 +- .../ui/component/navigation/ShiraNavHost.kt | 12 +++--- .../shirabox/app}/ui/component/top/TopBar.kt | 12 +++--- .../ui/screen/explore/AppUpdateSnackBar.kt | 12 +++--- .../app}/ui/screen/explore/BaseMediaScreen.kt | 14 +++---- .../app}/ui/screen/explore/ExploreScreen.kt | 4 +- .../ui/screen/explore/ExploreViewModel.kt | 14 +++---- .../ui/screen/explore/feed/HistoryFeed.kt | 18 ++++----- .../ui/screen/explore/feed/PopularsFeed.kt | 14 +++---- .../ui/screen/explore/feed/TrendingFeed.kt | 14 +++---- .../notifications/NotificationsDialog.kt | 6 +-- .../notifications/NotificationsScreen.kt | 10 ++--- .../notifications/NotificationsViewModel.kt | 8 ++-- .../ui/screen/favourites/FavouritesScreen.kt | 18 ++++----- .../screen/favourites/FavouritesViewModel.kt | 6 +-- .../app}/ui/screen/profile/ProfileScreen.kt | 16 ++++---- .../screen/profile/history/HistoryScreen.kt | 16 ++++---- .../profile/history/HistoryViewModel.kt | 6 +-- .../shirabox/app}/ui/theme/Color.kt | 2 +- .../shirabox/app}/ui/theme/Theme.kt | 6 +-- .../shirabox/app}/ui/theme/Type.kt | 2 +- core/build.gradle.kts | 2 +- .../shirabox/core}/ExampleInstrumentedTest.kt | 4 +- .../shirabox/core/datastore/AppDataStore.kt | 2 +- .../core/datastore/DataStoreScheme.kt | 2 +- .../core/datastore/PreferenceField.kt | 2 +- .../shirabox/core/db/AppDatabase.kt | 16 ++++---- .../shirabox/core/db/Converters.kt | 6 +-- .../shirabox/core/db/Migrations.kt | 8 ++-- .../shirabox/core/db/dao/ContentDao.kt | 6 +-- .../shirabox/core/db/dao/EpisodeDao.kt | 4 +- .../shirabox/core/db/dao/NotificationDao.kt | 6 +-- .../shirabox/core/entity/ContentEntity.kt | 10 ++--- .../shirabox/core/entity/EpisodeEntity.kt | 6 +-- .../core/entity/NotificationEntity.kt | 2 +- .../core/entity/relation/CombinedContent.kt | 6 +-- .../entity/relation/NotificationAndContent.kt | 6 +-- .../shirabox/core/model/ActingTeam.kt | 2 +- .../shirabox/core/model/AuthService.kt | 2 +- .../shirabox/core/model/Content.kt | 2 +- .../shirabox/core/model/ContentKind.kt | 2 +- .../shirabox/core/model/ContentType.kt | 2 +- .../shirabox/core/model/PlaylistVideo.kt | 2 +- .../shirabox/core/model/Quality.kt | 2 +- .../shirabox/core/model/Rating.kt | 2 +- .../shirabox/core/model/ReleaseStatus.kt | 2 +- .../shirabox/core/serializable/Topic.kt | 2 +- .../shirabox/core/update/UpdateManager.kt | 2 +- .../shirabox/core/util/Extensions.kt | 2 +- .../shirabox/core/util/IntentExtras.kt | 6 +-- .../{live => org}/shirabox/core/util/Util.kt | 8 ++-- .../shirabox/core/util/Values.kt | 2 +- .../org/shirabox/core}/ExampleUnitTest.kt | 2 +- data/build.gradle.kts | 2 +- .../shirabox/data}/ExampleInstrumentedTest.kt | 6 +-- .../data/content/ContentRepositoryRegistry.kt | 10 ----- .../shirabox/data/EpisodesHelper.kt | 10 ++--- .../shirabox/data/animeskip/AnimeSkipData.kt | 2 +- .../data/animeskip/AnimeSkipRepository.kt | 2 +- .../shirabox/data/animeskip/AuthData.kt | 2 +- .../shirabox/data/animeskip/RequestBody.kt | 2 +- .../shirabox/data/auth/AbstractAuthService.kt | 2 +- .../data/auth/AnimeSkipAuthService.kt | 10 ++--- .../shikimori/AbstractCatalogRepository.kt | 6 +-- .../data/catalog/shikimori/ShikimoriData.kt | 2 +- .../catalog/shikimori/ShikimoriRepository.kt | 14 +++---- .../data/content/AbstractContentRepository.kt | 8 ++-- .../data/content/ContentRepositoryRegistry.kt | 10 +++++ .../data/content/anime/animelib/AniLibData.kt | 2 +- .../anime/animelib/AniLibRepository.kt | 12 +++--- .../data/content/anime/libria/LibriaData.kt | 2 +- .../content/anime/libria/LibriaRepository.kt | 14 +++---- .../data/update/AppUpdateRepository.kt | 4 +- .../data/update/UpdateRepositoryData.kt | 2 +- .../org/shirabox/data}/ExampleUnitTest.kt | 2 +- 120 files changed, 464 insertions(+), 426 deletions(-) rename {core/src/androidTest/java/live/shirabox/core => app/src/androidTest/java/org/shirabox/app}/ExampleInstrumentedTest.kt (85%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/App.kt (94%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/NotificationService.kt (94%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ValuesHelper.kt (90%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/MainActivity.kt (80%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/auth/AnimeSkipAuthForm.kt (93%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/auth/AuthActivity.kt (97%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/player/PlayerActivity.kt (95%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/player/PlayerBottomSheets.kt (98%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/player/PlayerControls.kt (98%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/player/PlayerStateListener.kt (89%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/player/PlayerViewModel.kt (91%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/player/ShiraPlayer.kt (97%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/resource/ResourceActivity.kt (97%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/resource/ResourceSheetScreens.kt (97%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/resource/ResourceViewModel.kt (91%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/search/SearchActivity.kt (93%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/settings/Preferences.kt (97%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/settings/SettingsActivity.kt (95%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/settings/SettingsNavHost.kt (81%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/settings/SettingsNavItems.kt (94%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/settings/category/AboutSettingsScreen.kt (94%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/settings/category/AppearanceSettingsScreen.kt (92%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/settings/category/GeneralSettingsScreen.kt (91%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/settings/category/SettingsRootScreen.kt (87%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/settings/category/playback/Dialogs.kt (97%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/settings/category/playback/PlaybackSettingsScreen.kt (91%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/activity/update/AppUpdateActivity.kt (97%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/general/ContentCard.kt (93%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/general/Emoticons.kt (97%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/general/ExpandableBox.kt (98%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/general/ListItem.kt (98%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/general/Monogram.kt (96%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/general/Notifications.kt (98%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/general/PreviewCard.kt (98%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/general/RatingView.kt (97%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/general/SpecialSnackbar.kt (97%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/navigation/BottomNavItems.kt (93%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/navigation/BottomNavigationBar.kt (97%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/navigation/BottomNavigationView.kt (91%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/navigation/NestedNavItems.kt (74%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/navigation/ShiraNavHost.kt (79%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/component/top/TopBar.kt (92%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/explore/AppUpdateSnackBar.kt (90%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/explore/BaseMediaScreen.kt (89%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/explore/ExploreScreen.kt (95%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/explore/ExploreViewModel.kt (93%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/explore/feed/HistoryFeed.kt (89%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/explore/feed/PopularsFeed.kt (90%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/explore/feed/TrendingFeed.kt (89%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/explore/notifications/NotificationsDialog.kt (89%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/explore/notifications/NotificationsScreen.kt (96%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/explore/notifications/NotificationsViewModel.kt (84%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/favourites/FavouritesScreen.kt (89%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/favourites/FavouritesViewModel.kt (80%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/profile/ProfileScreen.kt (93%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/profile/history/HistoryScreen.kt (90%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/screen/profile/history/HistoryViewModel.kt (79%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/theme/Color.kt (98%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/theme/Theme.kt (97%) rename app/src/main/java/{live/shirabox/shirabox => org/shirabox/app}/ui/theme/Type.kt (95%) rename {data/src/androidTest/java/live/shirabox/data => core/src/androidTest/java/org/shirabox/core}/ExampleInstrumentedTest.kt (85%) rename core/src/main/java/{live => org}/shirabox/core/datastore/AppDataStore.kt (96%) rename core/src/main/java/{live => org}/shirabox/core/datastore/DataStoreScheme.kt (96%) rename core/src/main/java/{live => org}/shirabox/core/datastore/PreferenceField.kt (80%) rename core/src/main/java/{live => org}/shirabox/core/db/AppDatabase.kt (76%) rename core/src/main/java/{live => org}/shirabox/core/db/Converters.kt (93%) rename core/src/main/java/{live => org}/shirabox/core/db/Migrations.kt (96%) rename core/src/main/java/{live => org}/shirabox/core/db/dao/ContentDao.kt (89%) rename core/src/main/java/{live => org}/shirabox/core/db/dao/EpisodeDao.kt (93%) rename core/src/main/java/{live => org}/shirabox/core/db/dao/NotificationDao.kt (87%) rename core/src/main/java/{live => org}/shirabox/core/entity/ContentEntity.kt (86%) rename core/src/main/java/{live => org}/shirabox/core/entity/EpisodeEntity.kt (91%) rename core/src/main/java/{live => org}/shirabox/core/entity/NotificationEntity.kt (93%) rename core/src/main/java/{live => org}/shirabox/core/entity/relation/CombinedContent.kt (65%) rename core/src/main/java/{live => org}/shirabox/core/entity/relation/NotificationAndContent.kt (67%) rename core/src/main/java/{live => org}/shirabox/core/model/ActingTeam.kt (85%) rename core/src/main/java/{live => org}/shirabox/core/model/AuthService.kt (60%) rename core/src/main/java/{live => org}/shirabox/core/model/Content.kt (93%) rename core/src/main/java/{live => org}/shirabox/core/model/ContentKind.kt (67%) rename core/src/main/java/{live => org}/shirabox/core/model/ContentType.kt (92%) rename core/src/main/java/{live => org}/shirabox/core/model/PlaylistVideo.kt (85%) rename core/src/main/java/{live => org}/shirabox/core/model/Quality.kt (93%) rename core/src/main/java/{live => org}/shirabox/core/model/Rating.kt (72%) rename core/src/main/java/{live => org}/shirabox/core/model/ReleaseStatus.kt (73%) rename core/src/main/java/{live => org}/shirabox/core/serializable/Topic.kt (84%) rename core/src/main/java/{live => org}/shirabox/core/update/UpdateManager.kt (98%) rename core/src/main/java/{live => org}/shirabox/core/util/Extensions.kt (92%) rename core/src/main/java/{live => org}/shirabox/core/util/IntentExtras.kt (81%) rename core/src/main/java/{live => org}/shirabox/core/util/Util.kt (97%) rename core/src/main/java/{live => org}/shirabox/core/util/Values.kt (91%) rename {data/src/test/java/live/shirabox/data => core/src/test/java/org/shirabox/core}/ExampleUnitTest.kt (92%) rename {app/src/androidTest/java/live/shirabox/shirabox => data/src/androidTest/java/org/shirabox/data}/ExampleInstrumentedTest.kt (81%) delete mode 100644 data/src/main/java/live/shirabox/data/content/ContentRepositoryRegistry.kt rename data/src/main/java/{live => org}/shirabox/data/EpisodesHelper.kt (90%) rename data/src/main/java/{live => org}/shirabox/data/animeskip/AnimeSkipData.kt (98%) rename data/src/main/java/{live => org}/shirabox/data/animeskip/AnimeSkipRepository.kt (99%) rename data/src/main/java/{live => org}/shirabox/data/animeskip/AuthData.kt (75%) rename data/src/main/java/{live => org}/shirabox/data/animeskip/RequestBody.kt (97%) rename data/src/main/java/{live => org}/shirabox/data/auth/AbstractAuthService.kt (90%) rename data/src/main/java/{live => org}/shirabox/data/auth/AnimeSkipAuthService.kt (86%) rename data/src/main/java/{live => org}/shirabox/data/catalog/shikimori/AbstractCatalogRepository.kt (86%) rename data/src/main/java/{live => org}/shirabox/data/catalog/shikimori/ShikimoriData.kt (98%) rename data/src/main/java/{live => org}/shirabox/data/catalog/shikimori/ShikimoriRepository.kt (97%) rename data/src/main/java/{live => org}/shirabox/data/content/AbstractContentRepository.kt (74%) create mode 100644 data/src/main/java/org/shirabox/data/content/ContentRepositoryRegistry.kt rename data/src/main/java/{live => org}/shirabox/data/content/anime/animelib/AniLibData.kt (98%) rename data/src/main/java/{live => org}/shirabox/data/content/anime/animelib/AniLibRepository.kt (95%) rename data/src/main/java/{live => org}/shirabox/data/content/anime/libria/LibriaData.kt (95%) rename data/src/main/java/{live => org}/shirabox/data/content/anime/libria/LibriaRepository.kt (91%) rename data/src/main/java/{live => org}/shirabox/data/update/AppUpdateRepository.kt (85%) rename data/src/main/java/{live => org}/shirabox/data/update/UpdateRepositoryData.kt (94%) rename {core/src/test/java/live/shirabox/core => data/src/test/java/org/shirabox/data}/ExampleUnitTest.kt (92%) diff --git a/README.md b/README.md index 48d8f5c..09744b5 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ ## Installation -Downloads available on our [GitHub Releases](https://github.com/urFate/shirabox-app/releases/latest) page or on [official website](https://www.shirabox.live/). +Downloads available on our [GitHub Releases](https://github.com/urFate/shirabox-app/releases/latest) page or on [official website](https://www.shirabox.org/). Nightly APK builds currently available on our [Github Actions](https://github.com/urFate/shirabox-app/actions). > [!IMPORTANT] diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 91db34a..d47b0db 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,11 +9,11 @@ plugins { } android { - namespace = "live.shirabox.shirabox" + namespace = "org.shirabox.app" compileSdk = 34 defaultConfig { - applicationId = "live.shirabox.shirabox" + applicationId = "org.shirabox.app" minSdk = 24 targetSdk = 34 versionCode = 1 diff --git a/app/google-services.json b/app/google-services.json index 689e055..634c09b 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -42,6 +42,44 @@ "other_platform_oauth_client": [] } } + }, + { + "client_info": { + "mobilesdk_app_id": "1:865017455269:android:32c78d9945b42eef5ae34c", + "android_client_info": { + "package_name": "org.shirabox.app" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyCqaeyhvvEMEkIav3U1TAgkF1CRAqRTn5w" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:865017455269:android:27c817c67efeadf05ae34c", + "android_client_info": { + "package_name": "org.shirabox.app.debug" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyCqaeyhvvEMEkIav3U1TAgkF1CRAqRTn5w" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } } ], "configuration_version": "1" diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 6344de3..ff86701 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -22,7 +22,7 @@ -dontobfuscate --keep,allowoptimization class live.shirabox.** +-keep,allowoptimization class org.shirabox.** # Keep `Companion` object fields of serializable classes. diff --git a/core/src/androidTest/java/live/shirabox/core/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/shirabox/app/ExampleInstrumentedTest.kt similarity index 85% rename from core/src/androidTest/java/live/shirabox/core/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/org/shirabox/app/ExampleInstrumentedTest.kt index ae7e5dc..7102d58 100644 --- a/core/src/androidTest/java/live/shirabox/core/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/org/shirabox/app/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package live.shirabox.core +package org.shirabox.app import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry @@ -17,6 +17,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("live.shirabox.core.test", appContext.packageName) + assertEquals("org.shirabox.shirabox", appContext.packageName) } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f35bc47..a1da686 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ , model: PlayerViewModel) { diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/player/PlayerControls.kt b/app/src/main/java/org/shirabox/app/ui/activity/player/PlayerControls.kt similarity index 98% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/player/PlayerControls.kt rename to app/src/main/java/org/shirabox/app/ui/activity/player/PlayerControls.kt index e35078b..9c4d59f 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/player/PlayerControls.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/player/PlayerControls.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.player +package org.shirabox.app.ui.activity.player import android.app.Activity import android.content.pm.ActivityInfo @@ -76,11 +76,11 @@ import androidx.media3.common.Player import androidx.media3.exoplayer.ExoPlayer import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import live.shirabox.core.datastore.DataStoreScheme -import live.shirabox.core.entity.EpisodeEntity -import live.shirabox.core.util.Util -import live.shirabox.core.util.Values -import live.shirabox.shirabox.R +import org.shirabox.app.R +import org.shirabox.core.datastore.DataStoreScheme +import org.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.util.Util +import org.shirabox.core.util.Values @Composable fun ControlsScaffold(exoPlayer: ExoPlayer, playlist: List, model: PlayerViewModel) { diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/player/PlayerStateListener.kt b/app/src/main/java/org/shirabox/app/ui/activity/player/PlayerStateListener.kt similarity index 89% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/player/PlayerStateListener.kt rename to app/src/main/java/org/shirabox/app/ui/activity/player/PlayerStateListener.kt index eed1467..2d24ef3 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/player/PlayerStateListener.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/player/PlayerStateListener.kt @@ -1,10 +1,10 @@ -package live.shirabox.shirabox.ui.activity.player +package org.shirabox.app.ui.activity.player import androidx.media3.common.Player import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import live.shirabox.core.util.Values +import org.shirabox.core.util.Values class PlayerStateListener( diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/player/PlayerViewModel.kt b/app/src/main/java/org/shirabox/app/ui/activity/player/PlayerViewModel.kt similarity index 91% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/player/PlayerViewModel.kt rename to app/src/main/java/org/shirabox/app/ui/activity/player/PlayerViewModel.kt index e2ac9a2..cc3717e 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/player/PlayerViewModel.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/player/PlayerViewModel.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.player +package org.shirabox.app.ui.activity.player import android.content.Context import android.content.pm.ActivityInfo @@ -21,16 +21,16 @@ import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch -import live.shirabox.core.datastore.AppDataStore -import live.shirabox.core.datastore.DataStoreScheme -import live.shirabox.core.db.AppDatabase -import live.shirabox.core.entity.EpisodeEntity -import live.shirabox.core.model.ContentType -import live.shirabox.core.model.Quality -import live.shirabox.core.util.Util -import live.shirabox.data.EpisodesHelper -import live.shirabox.data.animeskip.AnimeSkipRepository -import live.shirabox.data.content.ContentRepositoryRegistry +import org.shirabox.core.datastore.AppDataStore +import org.shirabox.core.datastore.DataStoreScheme +import org.shirabox.core.db.AppDatabase +import org.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.model.ContentType +import org.shirabox.core.model.Quality +import org.shirabox.core.util.Util +import org.shirabox.data.EpisodesHelper +import org.shirabox.data.animeskip.AnimeSkipRepository +import org.shirabox.data.content.ContentRepositoryRegistry @HiltViewModel(assistedFactory = PlayerViewModel.PlayerViewModelFactory::class) class PlayerViewModel @AssistedInject constructor( diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/player/ShiraPlayer.kt b/app/src/main/java/org/shirabox/app/ui/activity/player/ShiraPlayer.kt similarity index 97% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/player/ShiraPlayer.kt rename to app/src/main/java/org/shirabox/app/ui/activity/player/ShiraPlayer.kt index 011a562..9e5b638 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/player/ShiraPlayer.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/player/ShiraPlayer.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.player +package org.shirabox.app.ui.activity.player import android.view.ViewGroup import android.widget.FrameLayout @@ -28,9 +28,9 @@ import androidx.media3.common.util.UnstableApi import androidx.media3.exoplayer.ExoPlayer import androidx.media3.ui.PlayerView import kotlinx.coroutines.launch -import live.shirabox.core.datastore.DataStoreScheme -import live.shirabox.core.entity.EpisodeEntity -import live.shirabox.core.model.Quality +import org.shirabox.core.datastore.DataStoreScheme +import org.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.model.Quality @OptIn(UnstableApi::class) diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/resource/ResourceActivity.kt b/app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceActivity.kt similarity index 97% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/resource/ResourceActivity.kt rename to app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceActivity.kt index 8f2943f..d08ebfc 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/resource/ResourceActivity.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceActivity.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.resource +package org.shirabox.app.ui.activity.resource import android.app.Activity import android.content.Context @@ -89,16 +89,16 @@ import androidx.hilt.navigation.compose.hiltViewModel import coil.compose.AsyncImage import coil.request.ImageRequest import dagger.hilt.android.AndroidEntryPoint -import live.shirabox.core.model.ContentType -import live.shirabox.core.util.round -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ValuesHelper -import live.shirabox.shirabox.ui.component.general.ContentCard -import live.shirabox.shirabox.ui.component.general.ExpandableBox -import live.shirabox.shirabox.ui.component.general.ExtendedListItem -import live.shirabox.shirabox.ui.component.general.RatingView -import live.shirabox.shirabox.ui.component.general.ScaredEmoticon -import live.shirabox.shirabox.ui.theme.ShiraBoxTheme +import org.shirabox.app.R +import org.shirabox.app.ValuesHelper +import org.shirabox.app.ui.component.general.ContentCard +import org.shirabox.app.ui.component.general.ExpandableBox +import org.shirabox.app.ui.component.general.ExtendedListItem +import org.shirabox.app.ui.component.general.RatingView +import org.shirabox.app.ui.component.general.ScaredEmoticon +import org.shirabox.app.ui.theme.ShiraBoxTheme +import org.shirabox.core.model.ContentType +import org.shirabox.core.util.round import java.io.IOException @AndroidEntryPoint diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/resource/ResourceSheetScreens.kt b/app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceSheetScreens.kt similarity index 97% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/resource/ResourceSheetScreens.kt rename to app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceSheetScreens.kt index f0ae2e7..2c3ce07 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/resource/ResourceSheetScreens.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceSheetScreens.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.resource +package org.shirabox.app.ui.activity.resource import android.content.Context import android.content.Intent @@ -57,16 +57,16 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import kotlinx.coroutines.launch -import live.shirabox.core.entity.EpisodeEntity -import live.shirabox.core.model.ActingTeam -import live.shirabox.core.model.Content -import live.shirabox.core.model.ContentKind -import live.shirabox.core.model.ContentType -import live.shirabox.core.util.IntentExtras -import live.shirabox.data.content.AbstractContentRepository -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.activity.player.PlayerActivity -import live.shirabox.shirabox.ui.component.general.ExtendedListItem +import org.shirabox.app.R +import org.shirabox.app.ui.activity.player.PlayerActivity +import org.shirabox.app.ui.component.general.ExtendedListItem +import org.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.model.ActingTeam +import org.shirabox.core.model.Content +import org.shirabox.core.model.ContentKind +import org.shirabox.core.model.ContentType +import org.shirabox.core.util.IntentExtras +import org.shirabox.data.content.AbstractContentRepository @Composable fun ResourceBottomSheet( diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/resource/ResourceViewModel.kt b/app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceViewModel.kt similarity index 91% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/resource/ResourceViewModel.kt rename to app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceViewModel.kt index 208aa18..c811f63 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/resource/ResourceViewModel.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceViewModel.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.resource +package org.shirabox.app.ui.activity.resource import android.content.Context import androidx.compose.runtime.mutableLongStateOf @@ -20,20 +20,20 @@ import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch -import live.shirabox.core.datastore.AppDataStore -import live.shirabox.core.datastore.DataStoreScheme -import live.shirabox.core.db.AppDatabase -import live.shirabox.core.entity.EpisodeEntity -import live.shirabox.core.model.ActingTeam -import live.shirabox.core.model.Content -import live.shirabox.core.model.ContentType.ANIME -import live.shirabox.core.util.Util -import live.shirabox.core.util.Util.Companion.mapContentToEntity -import live.shirabox.core.util.Util.Companion.mapEntityToContent -import live.shirabox.data.EpisodesHelper -import live.shirabox.data.catalog.shikimori.ShikimoriRepository -import live.shirabox.data.content.AbstractContentRepository -import live.shirabox.data.content.ContentRepositoryRegistry +import org.shirabox.core.datastore.AppDataStore +import org.shirabox.core.datastore.DataStoreScheme +import org.shirabox.core.db.AppDatabase +import org.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.model.ActingTeam +import org.shirabox.core.model.Content +import org.shirabox.core.model.ContentType.ANIME +import org.shirabox.core.util.Util +import org.shirabox.core.util.Util.Companion.mapContentToEntity +import org.shirabox.core.util.Util.Companion.mapEntityToContent +import org.shirabox.data.EpisodesHelper +import org.shirabox.data.catalog.shikimori.ShikimoriRepository +import org.shirabox.data.content.AbstractContentRepository +import org.shirabox.data.content.ContentRepositoryRegistry import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/search/SearchActivity.kt b/app/src/main/java/org/shirabox/app/ui/activity/search/SearchActivity.kt similarity index 93% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/search/SearchActivity.kt rename to app/src/main/java/org/shirabox/app/ui/activity/search/SearchActivity.kt index 067a569..4b99774 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/search/SearchActivity.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/search/SearchActivity.kt @@ -1,4 +1,4 @@ - package live.shirabox.shirabox.ui.activity.search + package org.shirabox.app.ui.activity.search import android.app.Activity import android.content.Intent @@ -56,17 +56,17 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.emptyFlow -import live.shirabox.core.model.Content -import live.shirabox.core.model.ContentType -import live.shirabox.data.catalog.shikimori.ShikimoriRepository -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ValuesHelper -import live.shirabox.shirabox.ui.activity.resource.ResourceActivity -import live.shirabox.shirabox.ui.component.general.DespondencyEmoticon -import live.shirabox.shirabox.ui.component.general.ListItem -import live.shirabox.shirabox.ui.theme.ShiraBoxTheme - -class SearchActivity : ComponentActivity() { +import org.shirabox.app.R +import org.shirabox.app.ValuesHelper +import org.shirabox.app.ui.activity.resource.ResourceActivity +import org.shirabox.app.ui.component.general.DespondencyEmoticon +import org.shirabox.app.ui.component.general.ListItem +import org.shirabox.app.ui.theme.ShiraBoxTheme +import org.shirabox.core.model.Content +import org.shirabox.core.model.ContentType +import org.shirabox.data.catalog.shikimori.ShikimoriRepository + + class SearchActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/Preferences.kt b/app/src/main/java/org/shirabox/app/ui/activity/settings/Preferences.kt similarity index 97% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/settings/Preferences.kt rename to app/src/main/java/org/shirabox/app/ui/activity/settings/Preferences.kt index d256e38..d1c281f 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/Preferences.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/settings/Preferences.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.settings +package org.shirabox.app.ui.activity.settings import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -25,8 +25,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import live.shirabox.core.datastore.AppDataStore -import live.shirabox.core.datastore.PreferenceField +import org.shirabox.core.datastore.AppDataStore +import org.shirabox.core.datastore.PreferenceField @Composable fun SwitchPreference( diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/SettingsActivity.kt b/app/src/main/java/org/shirabox/app/ui/activity/settings/SettingsActivity.kt similarity index 95% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/settings/SettingsActivity.kt rename to app/src/main/java/org/shirabox/app/ui/activity/settings/SettingsActivity.kt index b41806b..d323ded 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/SettingsActivity.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/settings/SettingsActivity.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.settings +package org.shirabox.app.ui.activity.settings import android.app.Activity import android.os.Bundle @@ -23,8 +23,8 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.theme.ShiraBoxTheme +import org.shirabox.app.R +import org.shirabox.app.ui.theme.ShiraBoxTheme class SettingsActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/SettingsNavHost.kt b/app/src/main/java/org/shirabox/app/ui/activity/settings/SettingsNavHost.kt similarity index 81% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/settings/SettingsNavHost.kt rename to app/src/main/java/org/shirabox/app/ui/activity/settings/SettingsNavHost.kt index 2aaf2e8..3bca824 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/SettingsNavHost.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/settings/SettingsNavHost.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.settings +package org.shirabox.app.ui.activity.settings import androidx.compose.animation.AnimatedContentTransitionScope import androidx.compose.animation.core.EaseInOut @@ -11,11 +11,11 @@ import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.navigation -import live.shirabox.shirabox.ui.activity.settings.category.AboutSettingsScreen -import live.shirabox.shirabox.ui.activity.settings.category.AppearanceSettingsScreen -import live.shirabox.shirabox.ui.activity.settings.category.GeneralSettingsScreen -import live.shirabox.shirabox.ui.activity.settings.category.SettingsRootScreen -import live.shirabox.shirabox.ui.activity.settings.category.playback.PlaybackSettingsScreen +import org.shirabox.app.ui.activity.settings.category.AboutSettingsScreen +import org.shirabox.app.ui.activity.settings.category.AppearanceSettingsScreen +import org.shirabox.app.ui.activity.settings.category.GeneralSettingsScreen +import org.shirabox.app.ui.activity.settings.category.SettingsRootScreen +import org.shirabox.app.ui.activity.settings.category.playback.PlaybackSettingsScreen @Composable fun SettingsNavHost(navController: NavHostController) { diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/SettingsNavItems.kt b/app/src/main/java/org/shirabox/app/ui/activity/settings/SettingsNavItems.kt similarity index 94% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/settings/SettingsNavItems.kt rename to app/src/main/java/org/shirabox/app/ui/activity/settings/SettingsNavItems.kt index 99f74bd..b7f5408 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/SettingsNavItems.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/settings/SettingsNavItems.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.settings +package org.shirabox.app.ui.activity.settings import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.outlined.PlaylistPlay @@ -7,7 +7,7 @@ import androidx.compose.material.icons.filled.Tune import androidx.compose.material.icons.outlined.Info import androidx.compose.material.icons.outlined.Palette import androidx.compose.ui.graphics.vector.ImageVector -import live.shirabox.shirabox.R +import org.shirabox.app.R sealed class SettingsNavItems( val name: Int, diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/AboutSettingsScreen.kt b/app/src/main/java/org/shirabox/app/ui/activity/settings/category/AboutSettingsScreen.kt similarity index 94% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/AboutSettingsScreen.kt rename to app/src/main/java/org/shirabox/app/ui/activity/settings/category/AboutSettingsScreen.kt index ea55dc3..97967a8 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/AboutSettingsScreen.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/settings/category/AboutSettingsScreen.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.settings.category +package org.shirabox.app.ui.activity.settings.category import android.content.ClipData import android.content.ClipboardManager @@ -28,17 +28,17 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import live.shirabox.core.util.Util -import live.shirabox.core.util.Util.Companion.openUri -import live.shirabox.shirabox.BuildConfig -import live.shirabox.shirabox.R +import org.shirabox.app.BuildConfig +import org.shirabox.app.R +import org.shirabox.core.util.Util +import org.shirabox.core.util.Util.Companion.openUri @Composable fun AboutSettingsScreen() { val context = LocalContext.current val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - val site = "https://www.shirabox.live" + val site = "https://shirabox.org" val privacyPolicyUri = Uri.parse("$site/privacy") val licenceUri = Uri.parse("https://github.com/urFate/shirabox-app/blob/master/LICENSE") diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/AppearanceSettingsScreen.kt b/app/src/main/java/org/shirabox/app/ui/activity/settings/category/AppearanceSettingsScreen.kt similarity index 92% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/AppearanceSettingsScreen.kt rename to app/src/main/java/org/shirabox/app/ui/activity/settings/category/AppearanceSettingsScreen.kt index 883af4a..f594f32 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/AppearanceSettingsScreen.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/settings/category/AppearanceSettingsScreen.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.settings.category +package org.shirabox.app.ui.activity.settings.category import android.os.Build import androidx.compose.foundation.layout.fillMaxSize @@ -14,10 +14,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.sp -import live.shirabox.core.datastore.DataStoreScheme -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.activity.settings.OptionsBlock -import live.shirabox.shirabox.ui.activity.settings.SwitchPreference +import org.shirabox.app.R +import org.shirabox.app.ui.activity.settings.OptionsBlock +import org.shirabox.app.ui.activity.settings.SwitchPreference +import org.shirabox.core.datastore.DataStoreScheme @Composable fun AppearanceSettingsScreen() { diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/GeneralSettingsScreen.kt b/app/src/main/java/org/shirabox/app/ui/activity/settings/category/GeneralSettingsScreen.kt similarity index 91% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/GeneralSettingsScreen.kt rename to app/src/main/java/org/shirabox/app/ui/activity/settings/category/GeneralSettingsScreen.kt index e53bc8c..616363b 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/GeneralSettingsScreen.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/settings/category/GeneralSettingsScreen.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.settings.category +package org.shirabox.app.ui.activity.settings.category import android.content.Intent import android.net.Uri @@ -17,10 +17,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.sp -import live.shirabox.core.datastore.DataStoreScheme -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.activity.settings.Preference -import live.shirabox.shirabox.ui.activity.settings.SwitchPreference +import org.shirabox.app.R +import org.shirabox.app.ui.activity.settings.Preference +import org.shirabox.app.ui.activity.settings.SwitchPreference +import org.shirabox.core.datastore.DataStoreScheme @Composable diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/SettingsRootScreen.kt b/app/src/main/java/org/shirabox/app/ui/activity/settings/category/SettingsRootScreen.kt similarity index 87% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/SettingsRootScreen.kt rename to app/src/main/java/org/shirabox/app/ui/activity/settings/category/SettingsRootScreen.kt index b04e868..154f179 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/SettingsRootScreen.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/settings/category/SettingsRootScreen.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.settings.category +package org.shirabox.app.ui.activity.settings.category import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.lazy.LazyColumn @@ -11,8 +11,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.sp import androidx.navigation.NavController -import live.shirabox.shirabox.ui.activity.settings.Preference -import live.shirabox.shirabox.ui.activity.settings.settingsNavItems +import org.shirabox.app.ui.activity.settings.Preference +import org.shirabox.app.ui.activity.settings.settingsNavItems @Composable fun SettingsRootScreen(navController: NavController) { diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/playback/Dialogs.kt b/app/src/main/java/org/shirabox/app/ui/activity/settings/category/playback/Dialogs.kt similarity index 97% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/playback/Dialogs.kt rename to app/src/main/java/org/shirabox/app/ui/activity/settings/category/playback/Dialogs.kt index 725ea9e..4e45b69 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/playback/Dialogs.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/settings/category/playback/Dialogs.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.settings.category.playback +package org.shirabox.app.ui.activity.settings.category.playback import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -30,9 +30,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import kotlinx.coroutines.launch -import live.shirabox.core.datastore.AppDataStore -import live.shirabox.core.datastore.DataStoreScheme -import live.shirabox.shirabox.R +import org.shirabox.app.R +import org.shirabox.core.datastore.AppDataStore +import org.shirabox.core.datastore.DataStoreScheme @Composable fun QualityDialog(visibilityState: MutableState) { diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/playback/PlaybackSettingsScreen.kt b/app/src/main/java/org/shirabox/app/ui/activity/settings/category/playback/PlaybackSettingsScreen.kt similarity index 91% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/playback/PlaybackSettingsScreen.kt rename to app/src/main/java/org/shirabox/app/ui/activity/settings/category/playback/PlaybackSettingsScreen.kt index 6367212..a6aea6c 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/settings/category/playback/PlaybackSettingsScreen.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/settings/category/playback/PlaybackSettingsScreen.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.settings.category.playback +package org.shirabox.app.ui.activity.settings.category.playback import android.content.Intent import androidx.compose.foundation.layout.Column @@ -24,16 +24,16 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import kotlinx.coroutines.flow.catch -import live.shirabox.core.datastore.AppDataStore -import live.shirabox.core.datastore.DataStoreScheme -import live.shirabox.core.model.AuthService -import live.shirabox.data.animeskip.AnimeSkipRepository -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.activity.auth.AuthActivity -import live.shirabox.shirabox.ui.activity.settings.CombinedSwitchPreference -import live.shirabox.shirabox.ui.activity.settings.OptionsBlock -import live.shirabox.shirabox.ui.activity.settings.Preference -import live.shirabox.shirabox.ui.activity.settings.SwitchPreference +import org.shirabox.app.R +import org.shirabox.app.ui.activity.auth.AuthActivity +import org.shirabox.app.ui.activity.settings.CombinedSwitchPreference +import org.shirabox.app.ui.activity.settings.OptionsBlock +import org.shirabox.app.ui.activity.settings.Preference +import org.shirabox.app.ui.activity.settings.SwitchPreference +import org.shirabox.core.datastore.AppDataStore +import org.shirabox.core.datastore.DataStoreScheme +import org.shirabox.core.model.AuthService +import org.shirabox.data.animeskip.AnimeSkipRepository import java.io.IOException @Composable diff --git a/app/src/main/java/live/shirabox/shirabox/ui/activity/update/AppUpdateActivity.kt b/app/src/main/java/org/shirabox/app/ui/activity/update/AppUpdateActivity.kt similarity index 97% rename from app/src/main/java/live/shirabox/shirabox/ui/activity/update/AppUpdateActivity.kt rename to app/src/main/java/org/shirabox/app/ui/activity/update/AppUpdateActivity.kt index a69dbf0..05bd362 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/activity/update/AppUpdateActivity.kt +++ b/app/src/main/java/org/shirabox/app/ui/activity/update/AppUpdateActivity.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.activity.update +package org.shirabox.app.ui.activity.update import android.app.Activity import android.os.Bundle @@ -61,12 +61,12 @@ import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.onCompletion import kotlinx.coroutines.launch -import live.shirabox.core.update.UpdateManager -import live.shirabox.data.update.AppUpdateRepository -import live.shirabox.data.update.AppUpdateState -import live.shirabox.shirabox.BuildConfig -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.theme.ShiraBoxTheme +import org.shirabox.app.BuildConfig +import org.shirabox.app.R +import org.shirabox.app.ui.theme.ShiraBoxTheme +import org.shirabox.core.update.UpdateManager +import org.shirabox.data.update.AppUpdateRepository +import org.shirabox.data.update.AppUpdateState import java.io.File import java.net.URL import java.text.SimpleDateFormat diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/general/ContentCard.kt b/app/src/main/java/org/shirabox/app/ui/component/general/ContentCard.kt similarity index 93% rename from app/src/main/java/live/shirabox/shirabox/ui/component/general/ContentCard.kt rename to app/src/main/java/org/shirabox/app/ui/component/general/ContentCard.kt index 66b71e6..d0620cd 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/general/ContentCard.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/general/ContentCard.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.general +package org.shirabox.app.ui.component.general import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -30,12 +30,12 @@ import coil.request.ImageRequest import com.google.accompanist.placeholder.PlaceholderHighlight import com.google.accompanist.placeholder.material3.fade import com.google.accompanist.placeholder.material3.placeholder -import live.shirabox.core.model.Content -import live.shirabox.core.model.ContentType -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.theme.light_primary -import live.shirabox.shirabox.ui.theme.mangaPrimary -import live.shirabox.shirabox.ui.theme.ranobePrimary +import org.shirabox.app.R +import org.shirabox.app.ui.theme.light_primary +import org.shirabox.app.ui.theme.mangaPrimary +import org.shirabox.app.ui.theme.ranobePrimary +import org.shirabox.core.model.Content +import org.shirabox.core.model.ContentType @Composable fun ContentCard( diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/general/Emoticons.kt b/app/src/main/java/org/shirabox/app/ui/component/general/Emoticons.kt similarity index 97% rename from app/src/main/java/live/shirabox/shirabox/ui/component/general/Emoticons.kt rename to app/src/main/java/org/shirabox/app/ui/component/general/Emoticons.kt index d0745e9..99ec843 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/general/Emoticons.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/general/Emoticons.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.general +package org.shirabox.app.ui.component.general import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/general/ExpandableBox.kt b/app/src/main/java/org/shirabox/app/ui/component/general/ExpandableBox.kt similarity index 98% rename from app/src/main/java/live/shirabox/shirabox/ui/component/general/ExpandableBox.kt rename to app/src/main/java/org/shirabox/app/ui/component/general/ExpandableBox.kt index 2302aac..29b5d91 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/general/ExpandableBox.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/general/ExpandableBox.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.general +package org.shirabox.app.ui.component.general import androidx.compose.animation.animateContentSize import androidx.compose.foundation.clickable diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/general/ListItem.kt b/app/src/main/java/org/shirabox/app/ui/component/general/ListItem.kt similarity index 98% rename from app/src/main/java/live/shirabox/shirabox/ui/component/general/ListItem.kt rename to app/src/main/java/org/shirabox/app/ui/component/general/ListItem.kt index 1c164c6..0ca24d0 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/general/ListItem.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/general/ListItem.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.general +package org.shirabox.app.ui.component.general import androidx.compose.foundation.Image import androidx.compose.foundation.clickable @@ -26,7 +26,7 @@ import coil.compose.SubcomposeAsyncImage import coil.compose.SubcomposeAsyncImageContent import coil.request.CachePolicy import coil.request.ImageRequest -import live.shirabox.shirabox.R +import org.shirabox.app.R @Composable fun ListItem( diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/general/Monogram.kt b/app/src/main/java/org/shirabox/app/ui/component/general/Monogram.kt similarity index 96% rename from app/src/main/java/live/shirabox/shirabox/ui/component/general/Monogram.kt rename to app/src/main/java/org/shirabox/app/ui/component/general/Monogram.kt index ee76526..04f079c 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/general/Monogram.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/general/Monogram.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.general +package org.shirabox.app.ui.component.general import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.size diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/general/Notifications.kt b/app/src/main/java/org/shirabox/app/ui/component/general/Notifications.kt similarity index 98% rename from app/src/main/java/live/shirabox/shirabox/ui/component/general/Notifications.kt rename to app/src/main/java/org/shirabox/app/ui/component/general/Notifications.kt index 4fd64f4..41af568 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/general/Notifications.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/general/Notifications.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.general +package org.shirabox.app.ui.component.general import android.content.Context import android.content.Intent @@ -20,7 +20,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import live.shirabox.shirabox.R +import org.shirabox.app.R @Composable fun NotificationsRequestDialog(isOpen: MutableState, onConfirm: () -> Unit) { diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/general/PreviewCard.kt b/app/src/main/java/org/shirabox/app/ui/component/general/PreviewCard.kt similarity index 98% rename from app/src/main/java/live/shirabox/shirabox/ui/component/general/PreviewCard.kt rename to app/src/main/java/org/shirabox/app/ui/component/general/PreviewCard.kt index f3d3726..8efc722 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/general/PreviewCard.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/general/PreviewCard.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.general +package org.shirabox.app.ui.component.general import androidx.compose.animation.animateContentSize import androidx.compose.foundation.background @@ -35,8 +35,8 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp import coil.compose.AsyncImage -import live.shirabox.core.model.ContentKind -import live.shirabox.shirabox.R +import org.shirabox.app.R +import org.shirabox.core.model.ContentKind import java.text.SimpleDateFormat import java.util.Date import java.util.Locale diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/general/RatingView.kt b/app/src/main/java/org/shirabox/app/ui/component/general/RatingView.kt similarity index 97% rename from app/src/main/java/live/shirabox/shirabox/ui/component/general/RatingView.kt rename to app/src/main/java/org/shirabox/app/ui/component/general/RatingView.kt index 9de1dfb..4d2f093 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/general/RatingView.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/general/RatingView.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.general +package org.shirabox.app.ui.component.general import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -20,7 +20,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import live.shirabox.shirabox.R +import org.shirabox.app.R @Composable fun RatingView(averageRating: Double, votes: Int, values: Map){ diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/general/SpecialSnackbar.kt b/app/src/main/java/org/shirabox/app/ui/component/general/SpecialSnackbar.kt similarity index 97% rename from app/src/main/java/live/shirabox/shirabox/ui/component/general/SpecialSnackbar.kt rename to app/src/main/java/org/shirabox/app/ui/component/general/SpecialSnackbar.kt index f40f94e..513e0b0 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/general/SpecialSnackbar.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/general/SpecialSnackbar.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.general +package org.shirabox.app.ui.component.general import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/navigation/BottomNavItems.kt b/app/src/main/java/org/shirabox/app/ui/component/navigation/BottomNavItems.kt similarity index 93% rename from app/src/main/java/live/shirabox/shirabox/ui/component/navigation/BottomNavItems.kt rename to app/src/main/java/org/shirabox/app/ui/component/navigation/BottomNavItems.kt index 2e7131c..fcd932b 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/navigation/BottomNavItems.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/navigation/BottomNavItems.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.navigation +package org.shirabox.app.ui.component.navigation import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.AccountCircle @@ -8,7 +8,7 @@ import androidx.compose.material.icons.outlined.AccountCircle import androidx.compose.material.icons.outlined.BookmarkBorder import androidx.compose.material.icons.outlined.Explore import androidx.compose.ui.graphics.vector.ImageVector -import live.shirabox.shirabox.R +import org.shirabox.app.R sealed class BottomNavItems( val name: Int, diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/navigation/BottomNavigationBar.kt b/app/src/main/java/org/shirabox/app/ui/component/navigation/BottomNavigationBar.kt similarity index 97% rename from app/src/main/java/live/shirabox/shirabox/ui/component/navigation/BottomNavigationBar.kt rename to app/src/main/java/org/shirabox/app/ui/component/navigation/BottomNavigationBar.kt index c15c7dc..612379d 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/navigation/BottomNavigationBar.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/navigation/BottomNavigationBar.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.navigation +package org.shirabox.app.ui.component.navigation import androidx.compose.material3.Icon import androidx.compose.material3.NavigationBar diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/navigation/BottomNavigationView.kt b/app/src/main/java/org/shirabox/app/ui/component/navigation/BottomNavigationView.kt similarity index 91% rename from app/src/main/java/live/shirabox/shirabox/ui/component/navigation/BottomNavigationView.kt rename to app/src/main/java/org/shirabox/app/ui/component/navigation/BottomNavigationView.kt index 5cb98db..df018e3 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/navigation/BottomNavigationView.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/navigation/BottomNavigationView.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.navigation +package org.shirabox.app.ui.component.navigation import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/navigation/NestedNavItems.kt b/app/src/main/java/org/shirabox/app/ui/component/navigation/NestedNavItems.kt similarity index 74% rename from app/src/main/java/live/shirabox/shirabox/ui/component/navigation/NestedNavItems.kt rename to app/src/main/java/org/shirabox/app/ui/component/navigation/NestedNavItems.kt index 3438e17..c7a9574 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/navigation/NestedNavItems.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/navigation/NestedNavItems.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.navigation +package org.shirabox.app.ui.component.navigation sealed class NestedNavItems( val route: String diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/navigation/ShiraNavHost.kt b/app/src/main/java/org/shirabox/app/ui/component/navigation/ShiraNavHost.kt similarity index 79% rename from app/src/main/java/live/shirabox/shirabox/ui/component/navigation/ShiraNavHost.kt rename to app/src/main/java/org/shirabox/app/ui/component/navigation/ShiraNavHost.kt index 818c824..075f0fb 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/navigation/ShiraNavHost.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/navigation/ShiraNavHost.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.navigation +package org.shirabox.app.ui.component.navigation import androidx.compose.animation.core.tween import androidx.compose.animation.fadeIn @@ -11,11 +11,11 @@ import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.navigation -import live.shirabox.shirabox.ui.screen.explore.ExploreScreen -import live.shirabox.shirabox.ui.screen.explore.notifications.NotificationsScreen -import live.shirabox.shirabox.ui.screen.favourites.FavouritesScreen -import live.shirabox.shirabox.ui.screen.profile.ProfileScreen -import live.shirabox.shirabox.ui.screen.profile.history.History +import org.shirabox.app.ui.screen.explore.ExploreScreen +import org.shirabox.app.ui.screen.explore.notifications.NotificationsScreen +import org.shirabox.app.ui.screen.favourites.FavouritesScreen +import org.shirabox.app.ui.screen.profile.ProfileScreen +import org.shirabox.app.ui.screen.profile.history.History @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/live/shirabox/shirabox/ui/component/top/TopBar.kt b/app/src/main/java/org/shirabox/app/ui/component/top/TopBar.kt similarity index 92% rename from app/src/main/java/live/shirabox/shirabox/ui/component/top/TopBar.kt rename to app/src/main/java/org/shirabox/app/ui/component/top/TopBar.kt index fd1c144..fd925d8 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/component/top/TopBar.kt +++ b/app/src/main/java/org/shirabox/app/ui/component/top/TopBar.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.component.top +package org.shirabox.app.ui.component.top import android.content.Intent import androidx.compose.foundation.background @@ -36,11 +36,11 @@ import androidx.navigation.NavController import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.emptyFlow -import live.shirabox.core.util.Util -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.activity.search.SearchActivity -import live.shirabox.shirabox.ui.component.navigation.NestedNavItems -import live.shirabox.shirabox.ui.screen.explore.notifications.NotificationsViewModel +import org.shirabox.app.R +import org.shirabox.app.ui.activity.search.SearchActivity +import org.shirabox.app.ui.component.navigation.NestedNavItems +import org.shirabox.app.ui.screen.explore.notifications.NotificationsViewModel +import org.shirabox.core.util.Util @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/AppUpdateSnackBar.kt b/app/src/main/java/org/shirabox/app/ui/screen/explore/AppUpdateSnackBar.kt similarity index 90% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/explore/AppUpdateSnackBar.kt rename to app/src/main/java/org/shirabox/app/ui/screen/explore/AppUpdateSnackBar.kt index dec2f65..5b8aeb9 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/AppUpdateSnackBar.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/explore/AppUpdateSnackBar.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.explore +package org.shirabox.app.ui.screen.explore import android.content.Intent import androidx.compose.foundation.layout.Box @@ -29,11 +29,11 @@ import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.onStart -import live.shirabox.data.update.AppUpdateRepository -import live.shirabox.shirabox.BuildConfig -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.activity.update.AppUpdateActivity -import live.shirabox.shirabox.ui.component.general.SpecialSnackBar +import org.shirabox.app.BuildConfig +import org.shirabox.app.R +import org.shirabox.app.ui.activity.update.AppUpdateActivity +import org.shirabox.app.ui.component.general.SpecialSnackBar +import org.shirabox.data.update.AppUpdateRepository @Composable fun AppUpdateSnackbarHost(){ diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/BaseMediaScreen.kt b/app/src/main/java/org/shirabox/app/ui/screen/explore/BaseMediaScreen.kt similarity index 89% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/explore/BaseMediaScreen.kt rename to app/src/main/java/org/shirabox/app/ui/screen/explore/BaseMediaScreen.kt index 0f778e6..be7b2d3 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/BaseMediaScreen.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/explore/BaseMediaScreen.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.explore +package org.shirabox.app.ui.screen.explore import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateContentSize @@ -21,12 +21,12 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.component.general.DespondencyEmoticon -import live.shirabox.shirabox.ui.component.general.ScaredEmoticon -import live.shirabox.shirabox.ui.screen.explore.feed.HistoryFeed -import live.shirabox.shirabox.ui.screen.explore.feed.PopularsFeed -import live.shirabox.shirabox.ui.screen.explore.feed.TrendingFeed +import org.shirabox.app.R +import org.shirabox.app.ui.component.general.DespondencyEmoticon +import org.shirabox.app.ui.component.general.ScaredEmoticon +import org.shirabox.app.ui.screen.explore.feed.HistoryFeed +import org.shirabox.app.ui.screen.explore.feed.PopularsFeed +import org.shirabox.app.ui.screen.explore.feed.TrendingFeed import java.io.IOException @Composable diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/ExploreScreen.kt b/app/src/main/java/org/shirabox/app/ui/screen/explore/ExploreScreen.kt similarity index 95% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/explore/ExploreScreen.kt rename to app/src/main/java/org/shirabox/app/ui/screen/explore/ExploreScreen.kt index a3b5d29..b6d92da 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/ExploreScreen.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/explore/ExploreScreen.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.explore +package org.shirabox.app.ui.screen.explore import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -21,7 +21,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import live.shirabox.shirabox.ui.component.top.TopBar +import org.shirabox.app.ui.component.top.TopBar @OptIn(ExperimentalMaterialApi::class) diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/ExploreViewModel.kt b/app/src/main/java/org/shirabox/app/ui/screen/explore/ExploreViewModel.kt similarity index 93% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/explore/ExploreViewModel.kt rename to app/src/main/java/org/shirabox/app/ui/screen/explore/ExploreViewModel.kt index 70ee917..39be16d 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/ExploreViewModel.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/explore/ExploreViewModel.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.explore +package org.shirabox.app.ui.screen.explore import android.content.Context import androidx.compose.runtime.mutableIntStateOf @@ -18,12 +18,12 @@ import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onCompletion import kotlinx.coroutines.launch -import live.shirabox.core.db.AppDatabase -import live.shirabox.core.entity.EpisodeEntity -import live.shirabox.core.entity.relation.CombinedContent -import live.shirabox.core.model.Content -import live.shirabox.core.model.ContentType -import live.shirabox.data.catalog.shikimori.ShikimoriRepository +import org.shirabox.core.db.AppDatabase +import org.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.entity.relation.CombinedContent +import org.shirabox.core.model.Content +import org.shirabox.core.model.ContentType +import org.shirabox.data.catalog.shikimori.ShikimoriRepository import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/feed/HistoryFeed.kt b/app/src/main/java/org/shirabox/app/ui/screen/explore/feed/HistoryFeed.kt similarity index 89% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/explore/feed/HistoryFeed.kt rename to app/src/main/java/org/shirabox/app/ui/screen/explore/feed/HistoryFeed.kt index 09ef97c..bfa4a7f 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/feed/HistoryFeed.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/explore/feed/HistoryFeed.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.explore.feed +package org.shirabox.app.ui.screen.explore.feed import android.content.Context import android.content.Intent @@ -26,14 +26,14 @@ import androidx.compose.ui.unit.sp import com.google.accompanist.placeholder.PlaceholderHighlight import com.google.accompanist.placeholder.material3.fade import com.google.accompanist.placeholder.material3.placeholder -import live.shirabox.core.entity.EpisodeEntity -import live.shirabox.core.entity.relation.CombinedContent -import live.shirabox.core.util.IntentExtras -import live.shirabox.core.util.Util -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.activity.player.PlayerActivity -import live.shirabox.shirabox.ui.component.general.ContentCardPlaceholder -import live.shirabox.shirabox.ui.component.general.PreviewCard +import org.shirabox.app.R +import org.shirabox.app.ui.activity.player.PlayerActivity +import org.shirabox.app.ui.component.general.ContentCardPlaceholder +import org.shirabox.app.ui.component.general.PreviewCard +import org.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.entity.relation.CombinedContent +import org.shirabox.core.util.IntentExtras +import org.shirabox.core.util.Util @Composable internal fun HistoryFeed( diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/feed/PopularsFeed.kt b/app/src/main/java/org/shirabox/app/ui/screen/explore/feed/PopularsFeed.kt similarity index 90% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/explore/feed/PopularsFeed.kt rename to app/src/main/java/org/shirabox/app/ui/screen/explore/feed/PopularsFeed.kt index 23cbdc4..e1f9eb3 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/feed/PopularsFeed.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/explore/feed/PopularsFeed.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.explore.feed +package org.shirabox.app.ui.screen.explore.feed import android.content.Intent import androidx.compose.foundation.layout.Arrangement @@ -24,12 +24,12 @@ import androidx.compose.ui.unit.sp import com.google.accompanist.placeholder.PlaceholderHighlight import com.google.accompanist.placeholder.material3.fade import com.google.accompanist.placeholder.material3.placeholder -import live.shirabox.core.model.Content -import live.shirabox.core.util.Util -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.activity.resource.ResourceActivity -import live.shirabox.shirabox.ui.component.general.BaseCard -import live.shirabox.shirabox.ui.component.general.ContentCardPlaceholder +import org.shirabox.app.R +import org.shirabox.app.ui.activity.resource.ResourceActivity +import org.shirabox.app.ui.component.general.BaseCard +import org.shirabox.app.ui.component.general.ContentCardPlaceholder +import org.shirabox.core.model.Content +import org.shirabox.core.util.Util @Composable internal fun PopularsFeed(isReady: Boolean, contents: List) { diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/feed/TrendingFeed.kt b/app/src/main/java/org/shirabox/app/ui/screen/explore/feed/TrendingFeed.kt similarity index 89% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/explore/feed/TrendingFeed.kt rename to app/src/main/java/org/shirabox/app/ui/screen/explore/feed/TrendingFeed.kt index 0f940fb..8d27a0e 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/feed/TrendingFeed.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/explore/feed/TrendingFeed.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.explore.feed +package org.shirabox.app.ui.screen.explore.feed import android.content.Intent import androidx.compose.foundation.layout.Arrangement @@ -23,12 +23,12 @@ import androidx.compose.ui.unit.sp import com.google.accompanist.placeholder.PlaceholderHighlight import com.google.accompanist.placeholder.material3.fade import com.google.accompanist.placeholder.material3.placeholder -import live.shirabox.core.model.Content -import live.shirabox.core.util.Util -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.activity.resource.ResourceActivity -import live.shirabox.shirabox.ui.component.general.BaseCard -import live.shirabox.shirabox.ui.component.general.ContentCardPlaceholder +import org.shirabox.app.R +import org.shirabox.app.ui.activity.resource.ResourceActivity +import org.shirabox.app.ui.component.general.BaseCard +import org.shirabox.app.ui.component.general.ContentCardPlaceholder +import org.shirabox.core.model.Content +import org.shirabox.core.util.Util @Composable internal fun TrendingFeed( diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/notifications/NotificationsDialog.kt b/app/src/main/java/org/shirabox/app/ui/screen/explore/notifications/NotificationsDialog.kt similarity index 89% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/explore/notifications/NotificationsDialog.kt rename to app/src/main/java/org/shirabox/app/ui/screen/explore/notifications/NotificationsDialog.kt index 8c6aee2..d5936c6 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/notifications/NotificationsDialog.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/explore/notifications/NotificationsDialog.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.explore.notifications +package org.shirabox.app.ui.screen.explore.notifications import android.Manifest import android.app.Activity @@ -14,8 +14,8 @@ import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat -import live.shirabox.shirabox.ui.component.general.NotificationsDismissDialog -import live.shirabox.shirabox.ui.component.general.NotificationsRequestDialog +import org.shirabox.app.ui.component.general.NotificationsDismissDialog +import org.shirabox.app.ui.component.general.NotificationsRequestDialog @Composable fun NotificationsDialog() { diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/notifications/NotificationsScreen.kt b/app/src/main/java/org/shirabox/app/ui/screen/explore/notifications/NotificationsScreen.kt similarity index 96% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/explore/notifications/NotificationsScreen.kt rename to app/src/main/java/org/shirabox/app/ui/screen/explore/notifications/NotificationsScreen.kt index 3323119..411a889 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/notifications/NotificationsScreen.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/explore/notifications/NotificationsScreen.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.explore.notifications +package org.shirabox.app.ui.screen.explore.notifications import android.content.Intent import android.text.format.DateUtils @@ -37,10 +37,10 @@ import androidx.navigation.NavController import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.emptyFlow -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.activity.resource.ResourceActivity -import live.shirabox.shirabox.ui.component.general.ListItem -import live.shirabox.shirabox.ui.component.top.TopBar +import org.shirabox.app.R +import org.shirabox.app.ui.activity.resource.ResourceActivity +import org.shirabox.app.ui.component.general.ListItem +import org.shirabox.app.ui.component.top.TopBar import java.text.DateFormat import java.text.SimpleDateFormat import java.util.Date diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/notifications/NotificationsViewModel.kt b/app/src/main/java/org/shirabox/app/ui/screen/explore/notifications/NotificationsViewModel.kt similarity index 84% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/explore/notifications/NotificationsViewModel.kt rename to app/src/main/java/org/shirabox/app/ui/screen/explore/notifications/NotificationsViewModel.kt index 0597cb3..0e681b4 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/explore/notifications/NotificationsViewModel.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/explore/notifications/NotificationsViewModel.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.explore.notifications +package org.shirabox.app.ui.screen.explore.notifications import android.content.Context import androidx.lifecycle.ViewModel @@ -9,9 +9,9 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.launch -import live.shirabox.core.db.AppDatabase -import live.shirabox.core.entity.NotificationEntity -import live.shirabox.core.entity.relation.NotificationAndContent +import org.shirabox.core.db.AppDatabase +import org.shirabox.core.entity.NotificationEntity +import org.shirabox.core.entity.relation.NotificationAndContent import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/favourites/FavouritesScreen.kt b/app/src/main/java/org/shirabox/app/ui/screen/favourites/FavouritesScreen.kt similarity index 89% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/favourites/FavouritesScreen.kt rename to app/src/main/java/org/shirabox/app/ui/screen/favourites/FavouritesScreen.kt index 18cc9fc..02ffa80 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/favourites/FavouritesScreen.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/favourites/FavouritesScreen.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.favourites +package org.shirabox.app.ui.screen.favourites import android.content.Intent import androidx.compose.foundation.layout.Arrangement @@ -29,13 +29,13 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import live.shirabox.core.model.ContentType -import live.shirabox.core.util.Util -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.activity.resource.ResourceActivity -import live.shirabox.shirabox.ui.component.general.ContentCard -import live.shirabox.shirabox.ui.component.general.DespondencyEmoticon -import live.shirabox.shirabox.ui.component.top.TopBar +import org.shirabox.app.R +import org.shirabox.app.ui.activity.resource.ResourceActivity +import org.shirabox.app.ui.component.general.ContentCard +import org.shirabox.app.ui.component.general.DespondencyEmoticon +import org.shirabox.app.ui.component.top.TopBar +import org.shirabox.core.model.ContentType +import org.shirabox.core.util.Util @Composable fun FavouritesScreen( @@ -89,7 +89,7 @@ fun FavouritesScreen( } @Composable -fun FavouritesGrid(contents: List) { +fun FavouritesGrid(contents: List) { val context = LocalContext.current val configuration = LocalConfiguration.current diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/favourites/FavouritesViewModel.kt b/app/src/main/java/org/shirabox/app/ui/screen/favourites/FavouritesViewModel.kt similarity index 80% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/favourites/FavouritesViewModel.kt rename to app/src/main/java/org/shirabox/app/ui/screen/favourites/FavouritesViewModel.kt index 136d6ef..e9b7c72 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/favourites/FavouritesViewModel.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/favourites/FavouritesViewModel.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.favourites +package org.shirabox.app.ui.screen.favourites import android.content.Context import androidx.lifecycle.ViewModel @@ -6,8 +6,8 @@ import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow -import live.shirabox.core.db.AppDatabase -import live.shirabox.core.entity.ContentEntity +import org.shirabox.core.db.AppDatabase +import org.shirabox.core.entity.ContentEntity import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/profile/ProfileScreen.kt b/app/src/main/java/org/shirabox/app/ui/screen/profile/ProfileScreen.kt similarity index 93% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/profile/ProfileScreen.kt rename to app/src/main/java/org/shirabox/app/ui/screen/profile/ProfileScreen.kt index 4b01f32..0d413fd 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/profile/ProfileScreen.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/profile/ProfileScreen.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.profile +package org.shirabox.app.ui.screen.profile import android.content.Intent import android.net.Uri @@ -33,17 +33,17 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import live.shirabox.core.util.Util.Companion.openUri -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ui.activity.settings.SettingsActivity -import live.shirabox.shirabox.ui.activity.update.AppUpdateActivity -import live.shirabox.shirabox.ui.component.navigation.NestedNavItems -import live.shirabox.shirabox.ui.theme.ShiraBoxTheme +import org.shirabox.app.R +import org.shirabox.app.ui.activity.settings.SettingsActivity +import org.shirabox.app.ui.activity.update.AppUpdateActivity +import org.shirabox.app.ui.component.navigation.NestedNavItems +import org.shirabox.app.ui.theme.ShiraBoxTheme +import org.shirabox.core.util.Util.Companion.openUri @Composable fun ProfileScreen(navController: NavController){ val context = LocalContext.current - val site = "https://www.shirabox.live" + val site = "https://www.shirabox.org" val donationUri = Uri.parse("$site/donate") val helpUri = Uri.parse("$site/faq") diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/profile/history/HistoryScreen.kt b/app/src/main/java/org/shirabox/app/ui/screen/profile/history/HistoryScreen.kt similarity index 90% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/profile/history/HistoryScreen.kt rename to app/src/main/java/org/shirabox/app/ui/screen/profile/history/HistoryScreen.kt index b53e315..a1ad072 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/profile/history/HistoryScreen.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/profile/history/HistoryScreen.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.profile.history +package org.shirabox.app.ui.screen.profile.history import android.content.Intent import androidx.compose.foundation.layout.Arrangement @@ -25,13 +25,13 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import live.shirabox.core.model.ContentType -import live.shirabox.shirabox.R -import live.shirabox.shirabox.ValuesHelper -import live.shirabox.shirabox.ui.activity.resource.ResourceActivity -import live.shirabox.shirabox.ui.component.general.DespondencyEmoticon -import live.shirabox.shirabox.ui.component.general.ListItem -import live.shirabox.shirabox.ui.component.top.TopBar +import org.shirabox.app.R +import org.shirabox.app.ValuesHelper +import org.shirabox.app.ui.activity.resource.ResourceActivity +import org.shirabox.app.ui.component.general.DespondencyEmoticon +import org.shirabox.app.ui.component.general.ListItem +import org.shirabox.app.ui.component.top.TopBar +import org.shirabox.core.model.ContentType import java.text.SimpleDateFormat import java.util.Date diff --git a/app/src/main/java/live/shirabox/shirabox/ui/screen/profile/history/HistoryViewModel.kt b/app/src/main/java/org/shirabox/app/ui/screen/profile/history/HistoryViewModel.kt similarity index 79% rename from app/src/main/java/live/shirabox/shirabox/ui/screen/profile/history/HistoryViewModel.kt rename to app/src/main/java/org/shirabox/app/ui/screen/profile/history/HistoryViewModel.kt index 2404e60..85a6d61 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/screen/profile/history/HistoryViewModel.kt +++ b/app/src/main/java/org/shirabox/app/ui/screen/profile/history/HistoryViewModel.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.screen.profile.history +package org.shirabox.app.ui.screen.profile.history import android.content.Context import androidx.lifecycle.ViewModel @@ -6,8 +6,8 @@ import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow -import live.shirabox.core.db.AppDatabase -import live.shirabox.core.entity.ContentEntity +import org.shirabox.core.db.AppDatabase +import org.shirabox.core.entity.ContentEntity import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/live/shirabox/shirabox/ui/theme/Color.kt b/app/src/main/java/org/shirabox/app/ui/theme/Color.kt similarity index 98% rename from app/src/main/java/live/shirabox/shirabox/ui/theme/Color.kt rename to app/src/main/java/org/shirabox/app/ui/theme/Color.kt index bc5622a..c9e8bbc 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/theme/Color.kt +++ b/app/src/main/java/org/shirabox/app/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.theme +package org.shirabox.app.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/live/shirabox/shirabox/ui/theme/Theme.kt b/app/src/main/java/org/shirabox/app/ui/theme/Theme.kt similarity index 97% rename from app/src/main/java/live/shirabox/shirabox/ui/theme/Theme.kt rename to app/src/main/java/org/shirabox/app/ui/theme/Theme.kt index 9ed16f6..e36058e 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/theme/Theme.kt +++ b/app/src/main/java/org/shirabox/app/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.theme +package org.shirabox.app.ui.theme import android.app.Activity import android.os.Build @@ -19,8 +19,8 @@ import androidx.compose.ui.platform.LocalView import androidx.core.view.WindowCompat import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking -import live.shirabox.core.datastore.AppDataStore -import live.shirabox.core.datastore.DataStoreScheme +import org.shirabox.core.datastore.AppDataStore +import org.shirabox.core.datastore.DataStoreScheme private val LightColorScheme = lightColorScheme( primary = light_primary, diff --git a/app/src/main/java/live/shirabox/shirabox/ui/theme/Type.kt b/app/src/main/java/org/shirabox/app/ui/theme/Type.kt similarity index 95% rename from app/src/main/java/live/shirabox/shirabox/ui/theme/Type.kt rename to app/src/main/java/org/shirabox/app/ui/theme/Type.kt index d6d102e..2e52270 100644 --- a/app/src/main/java/live/shirabox/shirabox/ui/theme/Type.kt +++ b/app/src/main/java/org/shirabox/app/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package live.shirabox.shirabox.ui.theme +package org.shirabox.app.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 16dd2f3..5ce528c 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } android { - namespace = "live.shirabox.core" + namespace = "org.shirabox.core" compileSdk = 34 defaultConfig { diff --git a/data/src/androidTest/java/live/shirabox/data/ExampleInstrumentedTest.kt b/core/src/androidTest/java/org/shirabox/core/ExampleInstrumentedTest.kt similarity index 85% rename from data/src/androidTest/java/live/shirabox/data/ExampleInstrumentedTest.kt rename to core/src/androidTest/java/org/shirabox/core/ExampleInstrumentedTest.kt index 153db01..a1d0b13 100644 --- a/data/src/androidTest/java/live/shirabox/data/ExampleInstrumentedTest.kt +++ b/core/src/androidTest/java/org/shirabox/core/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package live.shirabox.data +package org.shirabox.core import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry @@ -17,6 +17,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("live.shirabox.data.test", appContext.packageName) + assertEquals("org.shirabox.core.test", appContext.packageName) } } \ No newline at end of file diff --git a/core/src/main/java/live/shirabox/core/datastore/AppDataStore.kt b/core/src/main/java/org/shirabox/core/datastore/AppDataStore.kt similarity index 96% rename from core/src/main/java/live/shirabox/core/datastore/AppDataStore.kt rename to core/src/main/java/org/shirabox/core/datastore/AppDataStore.kt index 80d27f4..e24e358 100644 --- a/core/src/main/java/live/shirabox/core/datastore/AppDataStore.kt +++ b/core/src/main/java/org/shirabox/core/datastore/AppDataStore.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.datastore +package org.shirabox.core.datastore import android.content.Context import androidx.datastore.preferences.core.Preferences diff --git a/core/src/main/java/live/shirabox/core/datastore/DataStoreScheme.kt b/core/src/main/java/org/shirabox/core/datastore/DataStoreScheme.kt similarity index 96% rename from core/src/main/java/live/shirabox/core/datastore/DataStoreScheme.kt rename to core/src/main/java/org/shirabox/core/datastore/DataStoreScheme.kt index 6e35956..c81d3f4 100644 --- a/core/src/main/java/live/shirabox/core/datastore/DataStoreScheme.kt +++ b/core/src/main/java/org/shirabox/core/datastore/DataStoreScheme.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.datastore +package org.shirabox.core.datastore import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.intPreferencesKey diff --git a/core/src/main/java/live/shirabox/core/datastore/PreferenceField.kt b/core/src/main/java/org/shirabox/core/datastore/PreferenceField.kt similarity index 80% rename from core/src/main/java/live/shirabox/core/datastore/PreferenceField.kt rename to core/src/main/java/org/shirabox/core/datastore/PreferenceField.kt index f4ecfaa..12a486c 100644 --- a/core/src/main/java/live/shirabox/core/datastore/PreferenceField.kt +++ b/core/src/main/java/org/shirabox/core/datastore/PreferenceField.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.datastore +package org.shirabox.core.datastore import androidx.datastore.preferences.core.Preferences diff --git a/core/src/main/java/live/shirabox/core/db/AppDatabase.kt b/core/src/main/java/org/shirabox/core/db/AppDatabase.kt similarity index 76% rename from core/src/main/java/live/shirabox/core/db/AppDatabase.kt rename to core/src/main/java/org/shirabox/core/db/AppDatabase.kt index 909db36..abe9f40 100644 --- a/core/src/main/java/live/shirabox/core/db/AppDatabase.kt +++ b/core/src/main/java/org/shirabox/core/db/AppDatabase.kt @@ -1,17 +1,17 @@ -package live.shirabox.core.db +package org.shirabox.core.db import android.content.Context import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase import androidx.room.TypeConverters -import live.shirabox.core.db.dao.ContentDao -import live.shirabox.core.db.dao.EpisodeDao -import live.shirabox.core.db.dao.NotificationDao -import live.shirabox.core.entity.ContentEntity -import live.shirabox.core.entity.EpisodeEntity -import live.shirabox.core.entity.NotificationEntity -import live.shirabox.core.util.Values +import org.shirabox.core.db.dao.ContentDao +import org.shirabox.core.db.dao.EpisodeDao +import org.shirabox.core.db.dao.NotificationDao +import org.shirabox.core.entity.ContentEntity +import org.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.entity.NotificationEntity +import org.shirabox.core.util.Values @Database( entities = [ContentEntity::class, EpisodeEntity::class, NotificationEntity::class], diff --git a/core/src/main/java/live/shirabox/core/db/Converters.kt b/core/src/main/java/org/shirabox/core/db/Converters.kt similarity index 93% rename from core/src/main/java/live/shirabox/core/db/Converters.kt rename to core/src/main/java/org/shirabox/core/db/Converters.kt index ab2232f..dfae905 100644 --- a/core/src/main/java/live/shirabox/core/db/Converters.kt +++ b/core/src/main/java/org/shirabox/core/db/Converters.kt @@ -1,10 +1,10 @@ -package live.shirabox.core.db +package org.shirabox.core.db import androidx.room.TypeConverter import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json -import live.shirabox.core.model.ContentType -import live.shirabox.core.model.Quality +import org.shirabox.core.model.ContentType +import org.shirabox.core.model.Quality class Converters { diff --git a/core/src/main/java/live/shirabox/core/db/Migrations.kt b/core/src/main/java/org/shirabox/core/db/Migrations.kt similarity index 96% rename from core/src/main/java/live/shirabox/core/db/Migrations.kt rename to core/src/main/java/org/shirabox/core/db/Migrations.kt index 36d0649..ab29263 100644 --- a/core/src/main/java/live/shirabox/core/db/Migrations.kt +++ b/core/src/main/java/org/shirabox/core/db/Migrations.kt @@ -1,13 +1,13 @@ -package live.shirabox.core.db +package org.shirabox.core.db import android.content.ContentValues import android.database.sqlite.SQLiteDatabase import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase import kotlinx.serialization.json.Json -import live.shirabox.core.model.ActingTeam -import live.shirabox.core.model.ContentKind -import live.shirabox.core.model.ReleaseStatus +import org.shirabox.core.model.ActingTeam +import org.shirabox.core.model.ContentKind +import org.shirabox.core.model.ReleaseStatus object Migrations { val MIGRATION_1_2 = object : Migration(1, 2) { diff --git a/core/src/main/java/live/shirabox/core/db/dao/ContentDao.kt b/core/src/main/java/org/shirabox/core/db/dao/ContentDao.kt similarity index 89% rename from core/src/main/java/live/shirabox/core/db/dao/ContentDao.kt rename to core/src/main/java/org/shirabox/core/db/dao/ContentDao.kt index 3c51ceb..20eba9a 100644 --- a/core/src/main/java/live/shirabox/core/db/dao/ContentDao.kt +++ b/core/src/main/java/org/shirabox/core/db/dao/ContentDao.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.db.dao +package org.shirabox.core.db.dao import androidx.room.Dao import androidx.room.Delete @@ -8,8 +8,8 @@ import androidx.room.Query import androidx.room.Transaction import androidx.room.Update import kotlinx.coroutines.flow.Flow -import live.shirabox.core.entity.ContentEntity -import live.shirabox.core.entity.relation.CombinedContent +import org.shirabox.core.entity.ContentEntity +import org.shirabox.core.entity.relation.CombinedContent @Dao interface ContentDao { diff --git a/core/src/main/java/live/shirabox/core/db/dao/EpisodeDao.kt b/core/src/main/java/org/shirabox/core/db/dao/EpisodeDao.kt similarity index 93% rename from core/src/main/java/live/shirabox/core/db/dao/EpisodeDao.kt rename to core/src/main/java/org/shirabox/core/db/dao/EpisodeDao.kt index 4aaf9d5..2d10c82 100644 --- a/core/src/main/java/live/shirabox/core/db/dao/EpisodeDao.kt +++ b/core/src/main/java/org/shirabox/core/db/dao/EpisodeDao.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.db.dao +package org.shirabox.core.db.dao import androidx.room.Dao import androidx.room.Delete @@ -7,7 +7,7 @@ import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Update import kotlinx.coroutines.flow.Flow -import live.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.entity.EpisodeEntity @Dao interface EpisodeDao { diff --git a/core/src/main/java/live/shirabox/core/db/dao/NotificationDao.kt b/core/src/main/java/org/shirabox/core/db/dao/NotificationDao.kt similarity index 87% rename from core/src/main/java/live/shirabox/core/db/dao/NotificationDao.kt rename to core/src/main/java/org/shirabox/core/db/dao/NotificationDao.kt index 06001ac..1d3bc7e 100644 --- a/core/src/main/java/live/shirabox/core/db/dao/NotificationDao.kt +++ b/core/src/main/java/org/shirabox/core/db/dao/NotificationDao.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.db.dao +package org.shirabox.core.db.dao import androidx.room.Dao import androidx.room.Delete @@ -8,8 +8,8 @@ import androidx.room.Query import androidx.room.Transaction import androidx.room.Update import kotlinx.coroutines.flow.Flow -import live.shirabox.core.entity.NotificationEntity -import live.shirabox.core.entity.relation.NotificationAndContent +import org.shirabox.core.entity.NotificationEntity +import org.shirabox.core.entity.relation.NotificationAndContent @Dao interface NotificationDao { diff --git a/core/src/main/java/live/shirabox/core/entity/ContentEntity.kt b/core/src/main/java/org/shirabox/core/entity/ContentEntity.kt similarity index 86% rename from core/src/main/java/live/shirabox/core/entity/ContentEntity.kt rename to core/src/main/java/org/shirabox/core/entity/ContentEntity.kt index b01eb0f..7acbb27 100644 --- a/core/src/main/java/live/shirabox/core/entity/ContentEntity.kt +++ b/core/src/main/java/org/shirabox/core/entity/ContentEntity.kt @@ -1,13 +1,13 @@ -package live.shirabox.core.entity +package org.shirabox.core.entity import androidx.room.ColumnInfo import androidx.room.Embedded import androidx.room.Entity import androidx.room.PrimaryKey -import live.shirabox.core.model.ContentKind -import live.shirabox.core.model.ContentType -import live.shirabox.core.model.Rating -import live.shirabox.core.model.ReleaseStatus +import org.shirabox.core.model.ContentKind +import org.shirabox.core.model.ContentType +import org.shirabox.core.model.Rating +import org.shirabox.core.model.ReleaseStatus @Entity(tableName = "content") data class ContentEntity( diff --git a/core/src/main/java/live/shirabox/core/entity/EpisodeEntity.kt b/core/src/main/java/org/shirabox/core/entity/EpisodeEntity.kt similarity index 91% rename from core/src/main/java/live/shirabox/core/entity/EpisodeEntity.kt rename to core/src/main/java/org/shirabox/core/entity/EpisodeEntity.kt index 6853ed6..5f7b97c 100644 --- a/core/src/main/java/live/shirabox/core/entity/EpisodeEntity.kt +++ b/core/src/main/java/org/shirabox/core/entity/EpisodeEntity.kt @@ -1,10 +1,10 @@ -package live.shirabox.core.entity +package org.shirabox.core.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import live.shirabox.core.model.ContentType -import live.shirabox.core.model.Quality +import org.shirabox.core.model.ContentType +import org.shirabox.core.model.Quality @Entity(tableName = "episode") data class EpisodeEntity( diff --git a/core/src/main/java/live/shirabox/core/entity/NotificationEntity.kt b/core/src/main/java/org/shirabox/core/entity/NotificationEntity.kt similarity index 93% rename from core/src/main/java/live/shirabox/core/entity/NotificationEntity.kt rename to core/src/main/java/org/shirabox/core/entity/NotificationEntity.kt index 4c78f91..e41f4b0 100644 --- a/core/src/main/java/live/shirabox/core/entity/NotificationEntity.kt +++ b/core/src/main/java/org/shirabox/core/entity/NotificationEntity.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.entity +package org.shirabox.core.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/core/src/main/java/live/shirabox/core/entity/relation/CombinedContent.kt b/core/src/main/java/org/shirabox/core/entity/relation/CombinedContent.kt similarity index 65% rename from core/src/main/java/live/shirabox/core/entity/relation/CombinedContent.kt rename to core/src/main/java/org/shirabox/core/entity/relation/CombinedContent.kt index 0f23b57..22e67d2 100644 --- a/core/src/main/java/live/shirabox/core/entity/relation/CombinedContent.kt +++ b/core/src/main/java/org/shirabox/core/entity/relation/CombinedContent.kt @@ -1,9 +1,9 @@ -package live.shirabox.core.entity.relation +package org.shirabox.core.entity.relation import androidx.room.Embedded import androidx.room.Relation -import live.shirabox.core.entity.ContentEntity -import live.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.entity.ContentEntity +import org.shirabox.core.entity.EpisodeEntity data class CombinedContent( @Embedded val content: ContentEntity, diff --git a/core/src/main/java/live/shirabox/core/entity/relation/NotificationAndContent.kt b/core/src/main/java/org/shirabox/core/entity/relation/NotificationAndContent.kt similarity index 67% rename from core/src/main/java/live/shirabox/core/entity/relation/NotificationAndContent.kt rename to core/src/main/java/org/shirabox/core/entity/relation/NotificationAndContent.kt index 103d7f9..184da6b 100644 --- a/core/src/main/java/live/shirabox/core/entity/relation/NotificationAndContent.kt +++ b/core/src/main/java/org/shirabox/core/entity/relation/NotificationAndContent.kt @@ -1,9 +1,9 @@ -package live.shirabox.core.entity.relation +package org.shirabox.core.entity.relation import androidx.room.Embedded import androidx.room.Relation -import live.shirabox.core.entity.ContentEntity -import live.shirabox.core.entity.NotificationEntity +import org.shirabox.core.entity.ContentEntity +import org.shirabox.core.entity.NotificationEntity data class NotificationAndContent ( @Embedded val notificationEntity: NotificationEntity, diff --git a/core/src/main/java/live/shirabox/core/model/ActingTeam.kt b/core/src/main/java/org/shirabox/core/model/ActingTeam.kt similarity index 85% rename from core/src/main/java/live/shirabox/core/model/ActingTeam.kt rename to core/src/main/java/org/shirabox/core/model/ActingTeam.kt index b32ed3a..206e9dc 100644 --- a/core/src/main/java/live/shirabox/core/model/ActingTeam.kt +++ b/core/src/main/java/org/shirabox/core/model/ActingTeam.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.model +package org.shirabox.core.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/core/src/main/java/live/shirabox/core/model/AuthService.kt b/core/src/main/java/org/shirabox/core/model/AuthService.kt similarity index 60% rename from core/src/main/java/live/shirabox/core/model/AuthService.kt rename to core/src/main/java/org/shirabox/core/model/AuthService.kt index f484547..591cd54 100644 --- a/core/src/main/java/live/shirabox/core/model/AuthService.kt +++ b/core/src/main/java/org/shirabox/core/model/AuthService.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.model +package org.shirabox.core.model enum class AuthService { ShiraBox, AnimeSkip diff --git a/core/src/main/java/live/shirabox/core/model/Content.kt b/core/src/main/java/org/shirabox/core/model/Content.kt similarity index 93% rename from core/src/main/java/live/shirabox/core/model/Content.kt rename to core/src/main/java/org/shirabox/core/model/Content.kt index 56c13ff..811ed99 100644 --- a/core/src/main/java/live/shirabox/core/model/Content.kt +++ b/core/src/main/java/org/shirabox/core/model/Content.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.model +package org.shirabox.core.model data class Content( val name: String, diff --git a/core/src/main/java/live/shirabox/core/model/ContentKind.kt b/core/src/main/java/org/shirabox/core/model/ContentKind.kt similarity index 67% rename from core/src/main/java/live/shirabox/core/model/ContentKind.kt rename to core/src/main/java/org/shirabox/core/model/ContentKind.kt index 9c67525..7f9e9fa 100644 --- a/core/src/main/java/live/shirabox/core/model/ContentKind.kt +++ b/core/src/main/java/org/shirabox/core/model/ContentKind.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.model +package org.shirabox.core.model enum class ContentKind { TV, MOVIE, OVA, ONA, SPECIAL, OTHER diff --git a/core/src/main/java/live/shirabox/core/model/ContentType.kt b/core/src/main/java/org/shirabox/core/model/ContentType.kt similarity index 92% rename from core/src/main/java/live/shirabox/core/model/ContentType.kt rename to core/src/main/java/org/shirabox/core/model/ContentType.kt index 70b2ede..5351b25 100644 --- a/core/src/main/java/live/shirabox/core/model/ContentType.kt +++ b/core/src/main/java/org/shirabox/core/model/ContentType.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.model +package org.shirabox.core.model enum class ContentType { ANIME, MANGA, RANOBE; diff --git a/core/src/main/java/live/shirabox/core/model/PlaylistVideo.kt b/core/src/main/java/org/shirabox/core/model/PlaylistVideo.kt similarity index 85% rename from core/src/main/java/live/shirabox/core/model/PlaylistVideo.kt rename to core/src/main/java/org/shirabox/core/model/PlaylistVideo.kt index 69585ba..f54b26b 100644 --- a/core/src/main/java/live/shirabox/core/model/PlaylistVideo.kt +++ b/core/src/main/java/org/shirabox/core/model/PlaylistVideo.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.model +package org.shirabox.core.model import kotlinx.serialization.Serializable diff --git a/core/src/main/java/live/shirabox/core/model/Quality.kt b/core/src/main/java/org/shirabox/core/model/Quality.kt similarity index 93% rename from core/src/main/java/live/shirabox/core/model/Quality.kt rename to core/src/main/java/org/shirabox/core/model/Quality.kt index c63bd97..b04b9c0 100644 --- a/core/src/main/java/live/shirabox/core/model/Quality.kt +++ b/core/src/main/java/org/shirabox/core/model/Quality.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.model +package org.shirabox.core.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/core/src/main/java/live/shirabox/core/model/Rating.kt b/core/src/main/java/org/shirabox/core/model/Rating.kt similarity index 72% rename from core/src/main/java/live/shirabox/core/model/Rating.kt rename to core/src/main/java/org/shirabox/core/model/Rating.kt index 546b9d5..13cf91d 100644 --- a/core/src/main/java/live/shirabox/core/model/Rating.kt +++ b/core/src/main/java/org/shirabox/core/model/Rating.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.model +package org.shirabox.core.model data class Rating( val average: Double, diff --git a/core/src/main/java/live/shirabox/core/model/ReleaseStatus.kt b/core/src/main/java/org/shirabox/core/model/ReleaseStatus.kt similarity index 73% rename from core/src/main/java/live/shirabox/core/model/ReleaseStatus.kt rename to core/src/main/java/org/shirabox/core/model/ReleaseStatus.kt index 6fc5b4c..62a755c 100644 --- a/core/src/main/java/live/shirabox/core/model/ReleaseStatus.kt +++ b/core/src/main/java/org/shirabox/core/model/ReleaseStatus.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.model +package org.shirabox.core.model enum class ReleaseStatus { FINISHED, RELEASING, ANNOUNCED, PAUSED, DISCOUNTED, UNKNOWN diff --git a/core/src/main/java/live/shirabox/core/serializable/Topic.kt b/core/src/main/java/org/shirabox/core/serializable/Topic.kt similarity index 84% rename from core/src/main/java/live/shirabox/core/serializable/Topic.kt rename to core/src/main/java/org/shirabox/core/serializable/Topic.kt index 83a00ea..663bae2 100644 --- a/core/src/main/java/live/shirabox/core/serializable/Topic.kt +++ b/core/src/main/java/org/shirabox/core/serializable/Topic.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.serializable +package org.shirabox.core.serializable import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/core/src/main/java/live/shirabox/core/update/UpdateManager.kt b/core/src/main/java/org/shirabox/core/update/UpdateManager.kt similarity index 98% rename from core/src/main/java/live/shirabox/core/update/UpdateManager.kt rename to core/src/main/java/org/shirabox/core/update/UpdateManager.kt index 8ab91b5..1fbb460 100644 --- a/core/src/main/java/live/shirabox/core/update/UpdateManager.kt +++ b/core/src/main/java/org/shirabox/core/update/UpdateManager.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.update +package org.shirabox.core.update import android.content.Context import android.content.Intent diff --git a/core/src/main/java/live/shirabox/core/util/Extensions.kt b/core/src/main/java/org/shirabox/core/util/Extensions.kt similarity index 92% rename from core/src/main/java/live/shirabox/core/util/Extensions.kt rename to core/src/main/java/org/shirabox/core/util/Extensions.kt index 2a49071..722fc9d 100644 --- a/core/src/main/java/live/shirabox/core/util/Extensions.kt +++ b/core/src/main/java/org/shirabox/core/util/Extensions.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.util +package org.shirabox.core.util import java.math.BigDecimal import java.math.RoundingMode diff --git a/core/src/main/java/live/shirabox/core/util/IntentExtras.kt b/core/src/main/java/org/shirabox/core/util/IntentExtras.kt similarity index 81% rename from core/src/main/java/live/shirabox/core/util/IntentExtras.kt rename to core/src/main/java/org/shirabox/core/util/IntentExtras.kt index 5dcf9f6..8b3ea09 100644 --- a/core/src/main/java/live/shirabox/core/util/IntentExtras.kt +++ b/core/src/main/java/org/shirabox/core/util/IntentExtras.kt @@ -1,8 +1,8 @@ -package live.shirabox.core.util +package org.shirabox.core.util import android.content.Intent -import live.shirabox.core.entity.EpisodeEntity -import live.shirabox.core.model.Content +import org.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.model.Content object IntentExtras { fun playerIntentExtras( diff --git a/core/src/main/java/live/shirabox/core/util/Util.kt b/core/src/main/java/org/shirabox/core/util/Util.kt similarity index 97% rename from core/src/main/java/live/shirabox/core/util/Util.kt rename to core/src/main/java/org/shirabox/core/util/Util.kt index 732a5b3..599636c 100644 --- a/core/src/main/java/live/shirabox/core/util/Util.kt +++ b/core/src/main/java/org/shirabox/core/util/Util.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.util +package org.shirabox.core.util import android.content.Context import android.content.Intent @@ -18,9 +18,9 @@ import kotlinx.coroutines.async import kotlinx.coroutines.withContext import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json -import live.shirabox.core.entity.ContentEntity -import live.shirabox.core.model.Content -import live.shirabox.core.serializable.Topic +import org.shirabox.core.entity.ContentEntity +import org.shirabox.core.model.Content +import org.shirabox.core.serializable.Topic import java.net.URL import kotlin.io.encoding.Base64 import kotlin.io.encoding.ExperimentalEncodingApi diff --git a/core/src/main/java/live/shirabox/core/util/Values.kt b/core/src/main/java/org/shirabox/core/util/Values.kt similarity index 91% rename from core/src/main/java/live/shirabox/core/util/Values.kt rename to core/src/main/java/org/shirabox/core/util/Values.kt index 2eb235b..acbe0eb 100644 --- a/core/src/main/java/live/shirabox/core/util/Values.kt +++ b/core/src/main/java/org/shirabox/core/util/Values.kt @@ -1,4 +1,4 @@ -package live.shirabox.core.util +package org.shirabox.core.util class Values { companion object { diff --git a/data/src/test/java/live/shirabox/data/ExampleUnitTest.kt b/core/src/test/java/org/shirabox/core/ExampleUnitTest.kt similarity index 92% rename from data/src/test/java/live/shirabox/data/ExampleUnitTest.kt rename to core/src/test/java/org/shirabox/core/ExampleUnitTest.kt index 860f399..b359b4a 100644 --- a/data/src/test/java/live/shirabox/data/ExampleUnitTest.kt +++ b/core/src/test/java/org/shirabox/core/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package live.shirabox.data +package org.shirabox.core import org.junit.Assert.assertEquals import org.junit.Test diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 5189c72..0f93fd3 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } android { - namespace = "live.shirabox.data" + namespace = "org.shirabox.data" compileSdk = 34 defaultConfig { diff --git a/app/src/androidTest/java/live/shirabox/shirabox/ExampleInstrumentedTest.kt b/data/src/androidTest/java/org/shirabox/data/ExampleInstrumentedTest.kt similarity index 81% rename from app/src/androidTest/java/live/shirabox/shirabox/ExampleInstrumentedTest.kt rename to data/src/androidTest/java/org/shirabox/data/ExampleInstrumentedTest.kt index 21532db..f7f2c25 100644 --- a/app/src/androidTest/java/live/shirabox/shirabox/ExampleInstrumentedTest.kt +++ b/data/src/androidTest/java/org/shirabox/data/ExampleInstrumentedTest.kt @@ -1,8 +1,8 @@ -package live.shirabox.shirabox +package org.shirabox.data import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import org.junit.Assert.* +import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith @@ -17,6 +17,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("live.shirabox.shirabox", appContext.packageName) + assertEquals("org.shirabox.data.test", appContext.packageName) } } \ No newline at end of file diff --git a/data/src/main/java/live/shirabox/data/content/ContentRepositoryRegistry.kt b/data/src/main/java/live/shirabox/data/content/ContentRepositoryRegistry.kt deleted file mode 100644 index acca07f..0000000 --- a/data/src/main/java/live/shirabox/data/content/ContentRepositoryRegistry.kt +++ /dev/null @@ -1,10 +0,0 @@ -package live.shirabox.data.content - -import live.shirabox.data.content.anime.animelib.AniLibRepository -import live.shirabox.data.content.anime.libria.LibriaRepository - -object ContentRepositoryRegistry { - val REPOSITORIES = listOf( - LibriaRepository(), AniLibRepository() - ) -} \ No newline at end of file diff --git a/data/src/main/java/live/shirabox/data/EpisodesHelper.kt b/data/src/main/java/org/shirabox/data/EpisodesHelper.kt similarity index 90% rename from data/src/main/java/live/shirabox/data/EpisodesHelper.kt rename to data/src/main/java/org/shirabox/data/EpisodesHelper.kt index ab924fb..0e4c764 100644 --- a/data/src/main/java/live/shirabox/data/EpisodesHelper.kt +++ b/data/src/main/java/org/shirabox/data/EpisodesHelper.kt @@ -1,13 +1,13 @@ -package live.shirabox.data +package org.shirabox.data import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.emptyFlow -import live.shirabox.core.db.AppDatabase -import live.shirabox.core.entity.EpisodeEntity -import live.shirabox.core.model.Content -import live.shirabox.data.content.AbstractContentRepository +import org.shirabox.core.db.AppDatabase +import org.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.model.Content +import org.shirabox.data.content.AbstractContentRepository class EpisodesHelper(private val db: AppDatabase) { suspend fun completeEpisodesSearch( diff --git a/data/src/main/java/live/shirabox/data/animeskip/AnimeSkipData.kt b/data/src/main/java/org/shirabox/data/animeskip/AnimeSkipData.kt similarity index 98% rename from data/src/main/java/live/shirabox/data/animeskip/AnimeSkipData.kt rename to data/src/main/java/org/shirabox/data/animeskip/AnimeSkipData.kt index c0d943a..ccf0e8e 100644 --- a/data/src/main/java/live/shirabox/data/animeskip/AnimeSkipData.kt +++ b/data/src/main/java/org/shirabox/data/animeskip/AnimeSkipData.kt @@ -1,4 +1,4 @@ -package live.shirabox.data.animeskip +package org.shirabox.data.animeskip import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/main/java/live/shirabox/data/animeskip/AnimeSkipRepository.kt b/data/src/main/java/org/shirabox/data/animeskip/AnimeSkipRepository.kt similarity index 99% rename from data/src/main/java/live/shirabox/data/animeskip/AnimeSkipRepository.kt rename to data/src/main/java/org/shirabox/data/animeskip/AnimeSkipRepository.kt index 4f959ed..9b1cc43 100644 --- a/data/src/main/java/live/shirabox/data/animeskip/AnimeSkipRepository.kt +++ b/data/src/main/java/org/shirabox/data/animeskip/AnimeSkipRepository.kt @@ -1,4 +1,4 @@ -package live.shirabox.data.animeskip +package org.shirabox.data.animeskip import fuel.HttpResponse import fuel.httpPost diff --git a/data/src/main/java/live/shirabox/data/animeskip/AuthData.kt b/data/src/main/java/org/shirabox/data/animeskip/AuthData.kt similarity index 75% rename from data/src/main/java/live/shirabox/data/animeskip/AuthData.kt rename to data/src/main/java/org/shirabox/data/animeskip/AuthData.kt index fa1613c..0a43fcb 100644 --- a/data/src/main/java/live/shirabox/data/animeskip/AuthData.kt +++ b/data/src/main/java/org/shirabox/data/animeskip/AuthData.kt @@ -1,4 +1,4 @@ -package live.shirabox.data.animeskip +package org.shirabox.data.animeskip data class AuthData( val authToken: String, diff --git a/data/src/main/java/live/shirabox/data/animeskip/RequestBody.kt b/data/src/main/java/org/shirabox/data/animeskip/RequestBody.kt similarity index 97% rename from data/src/main/java/live/shirabox/data/animeskip/RequestBody.kt rename to data/src/main/java/org/shirabox/data/animeskip/RequestBody.kt index 69ff364..44f3044 100644 --- a/data/src/main/java/live/shirabox/data/animeskip/RequestBody.kt +++ b/data/src/main/java/org/shirabox/data/animeskip/RequestBody.kt @@ -1,4 +1,4 @@ -package live.shirabox.data.animeskip +package org.shirabox.data.animeskip object RequestBody { const val API_CLIENT_CREATION_MUTATION = "mutation {\n" + diff --git a/data/src/main/java/live/shirabox/data/auth/AbstractAuthService.kt b/data/src/main/java/org/shirabox/data/auth/AbstractAuthService.kt similarity index 90% rename from data/src/main/java/live/shirabox/data/auth/AbstractAuthService.kt rename to data/src/main/java/org/shirabox/data/auth/AbstractAuthService.kt index 31e2745..9e3a776 100644 --- a/data/src/main/java/live/shirabox/data/auth/AbstractAuthService.kt +++ b/data/src/main/java/org/shirabox/data/auth/AbstractAuthService.kt @@ -1,4 +1,4 @@ -package live.shirabox.data.auth +package org.shirabox.data.auth import android.content.Context import kotlinx.coroutines.flow.Flow diff --git a/data/src/main/java/live/shirabox/data/auth/AnimeSkipAuthService.kt b/data/src/main/java/org/shirabox/data/auth/AnimeSkipAuthService.kt similarity index 86% rename from data/src/main/java/live/shirabox/data/auth/AnimeSkipAuthService.kt rename to data/src/main/java/org/shirabox/data/auth/AnimeSkipAuthService.kt index de65506..5e02422 100644 --- a/data/src/main/java/live/shirabox/data/auth/AnimeSkipAuthService.kt +++ b/data/src/main/java/org/shirabox/data/auth/AnimeSkipAuthService.kt @@ -1,4 +1,4 @@ -package live.shirabox.data.auth +package org.shirabox.data.auth import android.content.Context import kotlinx.coroutines.Dispatchers @@ -6,10 +6,10 @@ import kotlinx.coroutines.async import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import kotlinx.coroutines.withContext -import live.shirabox.core.datastore.AppDataStore -import live.shirabox.core.datastore.DataStoreScheme -import live.shirabox.core.util.md5 -import live.shirabox.data.animeskip.AnimeSkipRepository +import org.shirabox.core.datastore.AppDataStore +import org.shirabox.core.datastore.DataStoreScheme +import org.shirabox.core.util.md5 +import org.shirabox.data.animeskip.AnimeSkipRepository object AnimeSkipAuthService : AbstractAuthService( registrationUrl = "https://anime-skip.com/sign-up", diff --git a/data/src/main/java/live/shirabox/data/catalog/shikimori/AbstractCatalogRepository.kt b/data/src/main/java/org/shirabox/data/catalog/shikimori/AbstractCatalogRepository.kt similarity index 86% rename from data/src/main/java/live/shirabox/data/catalog/shikimori/AbstractCatalogRepository.kt rename to data/src/main/java/org/shirabox/data/catalog/shikimori/AbstractCatalogRepository.kt index a720e3d..366f2e5 100644 --- a/data/src/main/java/live/shirabox/data/catalog/shikimori/AbstractCatalogRepository.kt +++ b/data/src/main/java/org/shirabox/data/catalog/shikimori/AbstractCatalogRepository.kt @@ -1,9 +1,9 @@ -package live.shirabox.data.catalog.shikimori +package org.shirabox.data.catalog.shikimori import kotlinx.coroutines.flow.Flow -import live.shirabox.core.model.Content -import live.shirabox.core.model.ContentType import okhttp3.OkHttpClient +import org.shirabox.core.model.Content +import org.shirabox.core.model.ContentType import java.util.concurrent.TimeUnit abstract class AbstractCatalogRepository internal constructor( diff --git a/data/src/main/java/live/shirabox/data/catalog/shikimori/ShikimoriData.kt b/data/src/main/java/org/shirabox/data/catalog/shikimori/ShikimoriData.kt similarity index 98% rename from data/src/main/java/live/shirabox/data/catalog/shikimori/ShikimoriData.kt rename to data/src/main/java/org/shirabox/data/catalog/shikimori/ShikimoriData.kt index caac28f..129757a 100644 --- a/data/src/main/java/live/shirabox/data/catalog/shikimori/ShikimoriData.kt +++ b/data/src/main/java/org/shirabox/data/catalog/shikimori/ShikimoriData.kt @@ -1,4 +1,4 @@ -package live.shirabox.data.catalog.shikimori +package org.shirabox.data.catalog.shikimori import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/main/java/live/shirabox/data/catalog/shikimori/ShikimoriRepository.kt b/data/src/main/java/org/shirabox/data/catalog/shikimori/ShikimoriRepository.kt similarity index 97% rename from data/src/main/java/live/shirabox/data/catalog/shikimori/ShikimoriRepository.kt rename to data/src/main/java/org/shirabox/data/catalog/shikimori/ShikimoriRepository.kt index b89942b..7a3f3ff 100644 --- a/data/src/main/java/live/shirabox/data/catalog/shikimori/ShikimoriRepository.kt +++ b/data/src/main/java/org/shirabox/data/catalog/shikimori/ShikimoriRepository.kt @@ -1,16 +1,16 @@ -package live.shirabox.data.catalog.shikimori +package org.shirabox.data.catalog.shikimori import fuel.httpGet import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import kotlinx.serialization.json.Json -import live.shirabox.core.model.Content -import live.shirabox.core.model.ContentKind -import live.shirabox.core.model.ContentType -import live.shirabox.core.model.Rating -import live.shirabox.core.model.ReleaseStatus -import live.shirabox.core.util.Util import okhttp3.Request +import org.shirabox.core.model.Content +import org.shirabox.core.model.ContentKind +import org.shirabox.core.model.ContentType +import org.shirabox.core.model.Rating +import org.shirabox.core.model.ReleaseStatus +import org.shirabox.core.util.Util import java.net.SocketTimeoutException import java.text.SimpleDateFormat import java.util.Date diff --git a/data/src/main/java/live/shirabox/data/content/AbstractContentRepository.kt b/data/src/main/java/org/shirabox/data/content/AbstractContentRepository.kt similarity index 74% rename from data/src/main/java/live/shirabox/data/content/AbstractContentRepository.kt rename to data/src/main/java/org/shirabox/data/content/AbstractContentRepository.kt index 46f759e..13b8f7f 100644 --- a/data/src/main/java/live/shirabox/data/content/AbstractContentRepository.kt +++ b/data/src/main/java/org/shirabox/data/content/AbstractContentRepository.kt @@ -1,10 +1,10 @@ -package live.shirabox.data.content +package org.shirabox.data.content import kotlinx.coroutines.flow.Flow import kotlinx.serialization.json.Json -import live.shirabox.core.entity.EpisodeEntity -import live.shirabox.core.model.Content -import live.shirabox.core.model.ContentType +import org.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.model.Content +import org.shirabox.core.model.ContentType abstract class AbstractContentRepository ( val name: String, diff --git a/data/src/main/java/org/shirabox/data/content/ContentRepositoryRegistry.kt b/data/src/main/java/org/shirabox/data/content/ContentRepositoryRegistry.kt new file mode 100644 index 0000000..bb92850 --- /dev/null +++ b/data/src/main/java/org/shirabox/data/content/ContentRepositoryRegistry.kt @@ -0,0 +1,10 @@ +package org.shirabox.data.content + +import org.shirabox.data.content.anime.animelib.AniLibRepository +import org.shirabox.data.content.anime.libria.LibriaRepository + +object ContentRepositoryRegistry { + val REPOSITORIES = listOf( + LibriaRepository(), AniLibRepository() + ) +} \ No newline at end of file diff --git a/data/src/main/java/live/shirabox/data/content/anime/animelib/AniLibData.kt b/data/src/main/java/org/shirabox/data/content/anime/animelib/AniLibData.kt similarity index 98% rename from data/src/main/java/live/shirabox/data/content/anime/animelib/AniLibData.kt rename to data/src/main/java/org/shirabox/data/content/anime/animelib/AniLibData.kt index f732f41..6e18218 100644 --- a/data/src/main/java/live/shirabox/data/content/anime/animelib/AniLibData.kt +++ b/data/src/main/java/org/shirabox/data/content/anime/animelib/AniLibData.kt @@ -1,4 +1,4 @@ -package live.shirabox.data.content.anime.animelib +package org.shirabox.data.content.anime.animelib import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/main/java/live/shirabox/data/content/anime/animelib/AniLibRepository.kt b/data/src/main/java/org/shirabox/data/content/anime/animelib/AniLibRepository.kt similarity index 95% rename from data/src/main/java/live/shirabox/data/content/anime/animelib/AniLibRepository.kt rename to data/src/main/java/org/shirabox/data/content/anime/animelib/AniLibRepository.kt index b2c7d2d..41edde3 100644 --- a/data/src/main/java/live/shirabox/data/content/anime/animelib/AniLibRepository.kt +++ b/data/src/main/java/org/shirabox/data/content/anime/animelib/AniLibRepository.kt @@ -1,4 +1,4 @@ -package live.shirabox.data.content.anime.animelib +package org.shirabox.data.content.anime.animelib import fuel.httpGet import kotlinx.coroutines.delay @@ -10,11 +10,11 @@ import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.retryWhen import kotlinx.coroutines.flow.singleOrNull import kotlinx.serialization.SerializationException -import live.shirabox.core.entity.EpisodeEntity -import live.shirabox.core.model.Content -import live.shirabox.core.model.ContentType -import live.shirabox.core.model.Quality -import live.shirabox.data.content.AbstractContentRepository +import org.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.model.Content +import org.shirabox.core.model.ContentType +import org.shirabox.core.model.Quality +import org.shirabox.data.content.AbstractContentRepository import java.text.SimpleDateFormat import java.util.Locale diff --git a/data/src/main/java/live/shirabox/data/content/anime/libria/LibriaData.kt b/data/src/main/java/org/shirabox/data/content/anime/libria/LibriaData.kt similarity index 95% rename from data/src/main/java/live/shirabox/data/content/anime/libria/LibriaData.kt rename to data/src/main/java/org/shirabox/data/content/anime/libria/LibriaData.kt index 65cccb5..c02f95c 100644 --- a/data/src/main/java/live/shirabox/data/content/anime/libria/LibriaData.kt +++ b/data/src/main/java/org/shirabox/data/content/anime/libria/LibriaData.kt @@ -1,4 +1,4 @@ -package live.shirabox.data.content.anime.libria +package org.shirabox.data.content.anime.libria import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/main/java/live/shirabox/data/content/anime/libria/LibriaRepository.kt b/data/src/main/java/org/shirabox/data/content/anime/libria/LibriaRepository.kt similarity index 91% rename from data/src/main/java/live/shirabox/data/content/anime/libria/LibriaRepository.kt rename to data/src/main/java/org/shirabox/data/content/anime/libria/LibriaRepository.kt index b83b0bd..c611768 100644 --- a/data/src/main/java/live/shirabox/data/content/anime/libria/LibriaRepository.kt +++ b/data/src/main/java/org/shirabox/data/content/anime/libria/LibriaRepository.kt @@ -1,14 +1,14 @@ -package live.shirabox.data.content.anime.libria +package org.shirabox.data.content.anime.libria import fuel.httpGet import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow -import live.shirabox.core.entity.EpisodeEntity -import live.shirabox.core.model.Content -import live.shirabox.core.model.ContentKind -import live.shirabox.core.model.ContentType -import live.shirabox.core.model.Quality -import live.shirabox.data.content.AbstractContentRepository +import org.shirabox.core.entity.EpisodeEntity +import org.shirabox.core.model.Content +import org.shirabox.core.model.ContentKind +import org.shirabox.core.model.ContentType +import org.shirabox.core.model.Quality +import org.shirabox.data.content.AbstractContentRepository import java.net.SocketTimeoutException diff --git a/data/src/main/java/live/shirabox/data/update/AppUpdateRepository.kt b/data/src/main/java/org/shirabox/data/update/AppUpdateRepository.kt similarity index 85% rename from data/src/main/java/live/shirabox/data/update/AppUpdateRepository.kt rename to data/src/main/java/org/shirabox/data/update/AppUpdateRepository.kt index 2477a1e..121e293 100644 --- a/data/src/main/java/live/shirabox/data/update/AppUpdateRepository.kt +++ b/data/src/main/java/org/shirabox/data/update/AppUpdateRepository.kt @@ -1,4 +1,4 @@ -package live.shirabox.data.update +package org.shirabox.data.update import fuel.httpGet import kotlinx.coroutines.flow.Flow @@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.flow import kotlinx.serialization.json.Json object AppUpdateRepository { - private const val API_ENDPOINT = "https://api.shirabox.live/v1" + private const val API_ENDPOINT = "https://api.shirabox.org/v1" private val json = Json { ignoreUnknownKeys = true; coerceInputValues = true } fun checkAppUpdates(currentVersionTag: String): Flow = flow { diff --git a/data/src/main/java/live/shirabox/data/update/UpdateRepositoryData.kt b/data/src/main/java/org/shirabox/data/update/UpdateRepositoryData.kt similarity index 94% rename from data/src/main/java/live/shirabox/data/update/UpdateRepositoryData.kt rename to data/src/main/java/org/shirabox/data/update/UpdateRepositoryData.kt index 82f456f..c30e81b 100644 --- a/data/src/main/java/live/shirabox/data/update/UpdateRepositoryData.kt +++ b/data/src/main/java/org/shirabox/data/update/UpdateRepositoryData.kt @@ -1,4 +1,4 @@ -package live.shirabox.data.update +package org.shirabox.data.update import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/core/src/test/java/live/shirabox/core/ExampleUnitTest.kt b/data/src/test/java/org/shirabox/data/ExampleUnitTest.kt similarity index 92% rename from core/src/test/java/live/shirabox/core/ExampleUnitTest.kt rename to data/src/test/java/org/shirabox/data/ExampleUnitTest.kt index d5759f1..7b684e5 100644 --- a/core/src/test/java/live/shirabox/core/ExampleUnitTest.kt +++ b/data/src/test/java/org/shirabox/data/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package live.shirabox.core +package org.shirabox.data import org.junit.Assert.assertEquals import org.junit.Test