refactor!: move to shirabox.org domain name

urFate · Jun 30, 2024 · 9edfb81 · 9edfb81
1 parent 5630fb7
commit 9edfb81
Show file tree

Hide file tree

Showing 120 changed files with 464 additions and 426 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/.../shirabox/core/ExampleInstrumentedTest.kt → ...g/shirabox/app/ExampleInstrumentedTest.kt b/.../shirabox/core/ExampleInstrumentedTest.kt → ...g/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)
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
-        android:name="live.shirabox.shirabox.App"
+        android:name="org.shirabox.app.App"
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"

diff --git a/...c/main/java/live/shirabox/shirabox/App.kt → app/src/main/java/org/shirabox/app/App.kt b/...c/main/java/live/shirabox/shirabox/App.kt → app/src/main/java/org/shirabox/app/App.kt
@@ -1,4 +1,4 @@
-package live.shirabox.shirabox
+package org.shirabox.app
 
 import android.app.Application
 import coil.ImageLoader

diff --git a/.../shirabox/shirabox/NotificationService.kt → ...a/org/shirabox/app/NotificationService.kt b/.../shirabox/shirabox/NotificationService.kt → ...a/org/shirabox/app/NotificationService.kt
@@ -1,4 +1,4 @@
-package live.shirabox.shirabox
+package org.shirabox.app
 
 import android.app.Notification
 import android.app.NotificationChannel
@@ -18,11 +18,11 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import live.shirabox.core.db.AppDatabase
-import live.shirabox.core.entity.NotificationEntity
-import live.shirabox.core.model.ContentType
-import live.shirabox.core.util.Util
-import live.shirabox.shirabox.ui.activity.resource.ResourceActivity
+import org.shirabox.app.ui.activity.resource.ResourceActivity
+import org.shirabox.core.db.AppDatabase
+import org.shirabox.core.entity.NotificationEntity
+import org.shirabox.core.model.ContentType
+import org.shirabox.core.util.Util
 import java.net.URL
 
 class NotificationService : FirebaseMessagingService() {

diff --git a/...va/live/shirabox/shirabox/ValuesHelper.kt → ...ain/java/org/shirabox/app/ValuesHelper.kt b/...va/live/shirabox/shirabox/ValuesHelper.kt → ...ain/java/org/shirabox/app/ValuesHelper.kt
@@ -1,8 +1,8 @@
-package live.shirabox.shirabox
+package org.shirabox.app
 
 import android.content.Context
-import live.shirabox.core.model.ContentKind
-import live.shirabox.core.model.ReleaseStatus
+import org.shirabox.core.model.ContentKind
+import org.shirabox.core.model.ReleaseStatus
 
 object ValuesHelper {
     fun decodeKind(contentKind: ContentKind, context: Context): String = when (contentKind) {

diff --git a/...abox/shirabox/ui/activity/MainActivity.kt → .../shirabox/app/ui/activity/MainActivity.kt b/...abox/shirabox/ui/activity/MainActivity.kt → .../shirabox/app/ui/activity/MainActivity.kt
@@ -1,4 +1,4 @@
-package live.shirabox.shirabox.ui.activity
+package org.shirabox.app.ui.activity
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -10,10 +10,10 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
 import dagger.hilt.android.AndroidEntryPoint
-import live.shirabox.shirabox.R
-import live.shirabox.shirabox.ui.component.navigation.BottomNavigationView
-import live.shirabox.shirabox.ui.screen.explore.notifications.NotificationsDialog
-import live.shirabox.shirabox.ui.theme.ShiraBoxTheme
+import org.shirabox.app.R
+import org.shirabox.app.ui.component.navigation.BottomNavigationView
+import org.shirabox.app.ui.screen.explore.notifications.NotificationsDialog
+import org.shirabox.app.ui.theme.ShiraBoxTheme
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {

diff --git a/...box/ui/activity/auth/AnimeSkipAuthForm.kt → ...app/ui/activity/auth/AnimeSkipAuthForm.kt b/...box/ui/activity/auth/AnimeSkipAuthForm.kt → ...app/ui/activity/auth/AnimeSkipAuthForm.kt
@@ -1,4 +1,4 @@
-package live.shirabox.shirabox.ui.activity.auth
+package org.shirabox.app.ui.activity.auth
 
 import android.app.Activity
 import android.content.Intent
@@ -22,11 +22,11 @@ import coil.decode.SvgDecoder
 import kotlinx.coroutines.flow.catch
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.MissingFieldException
-import live.shirabox.core.datastore.AppDataStore
-import live.shirabox.core.datastore.DataStoreScheme
-import live.shirabox.data.auth.AbstractAuthService
-import live.shirabox.data.auth.AnimeSkipAuthService
-import live.shirabox.shirabox.R
+import org.shirabox.app.R
+import org.shirabox.core.datastore.AppDataStore
+import org.shirabox.core.datastore.DataStoreScheme
+import org.shirabox.data.auth.AbstractAuthService
+import org.shirabox.data.auth.AnimeSkipAuthService
 import java.io.IOException
 
 @OptIn(ExperimentalSerializationApi::class)

diff --git a/...shirabox/ui/activity/auth/AuthActivity.kt → ...abox/app/ui/activity/auth/AuthActivity.kt b/...shirabox/ui/activity/auth/AuthActivity.kt → ...abox/app/ui/activity/auth/AuthActivity.kt
@@ -1,4 +1,4 @@
-package live.shirabox.shirabox.ui.activity.auth
+package org.shirabox.app.ui.activity.auth
 
 import android.app.Activity
 import android.os.Bundle
@@ -41,9 +41,9 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import live.shirabox.core.model.AuthService
-import live.shirabox.shirabox.R
-import live.shirabox.shirabox.ui.theme.ShiraBoxTheme
+import org.shirabox.app.R
+import org.shirabox.app.ui.theme.ShiraBoxTheme
+import org.shirabox.core.model.AuthService
 
 class AuthActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/...abox/ui/activity/player/PlayerActivity.kt → .../app/ui/activity/player/PlayerActivity.kt b/...abox/ui/activity/player/PlayerActivity.kt → .../app/ui/activity/player/PlayerActivity.kt
@@ -1,4 +1,4 @@
-package live.shirabox.shirabox.ui.activity.player
+package org.shirabox.app.ui.activity.player
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -19,9 +19,9 @@ import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import dagger.hilt.android.AndroidEntryPoint
-import live.shirabox.core.util.Util
-import live.shirabox.core.util.Values
-import live.shirabox.shirabox.ui.theme.ShiraBoxTheme
+import org.shirabox.app.ui.theme.ShiraBoxTheme
+import org.shirabox.core.util.Util
+import org.shirabox.core.util.Values
 
 @AndroidEntryPoint
 class PlayerActivity : ComponentActivity() {

diff --git a/.../ui/activity/player/PlayerBottomSheets.kt → .../ui/activity/player/PlayerBottomSheets.kt b/.../ui/activity/player/PlayerBottomSheets.kt → .../ui/activity/player/PlayerBottomSheets.kt
@@ -1,4 +1,4 @@
-package live.shirabox.shirabox.ui.activity.player
+package org.shirabox.app.ui.activity.player
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
@@ -34,10 +34,10 @@ import androidx.media3.exoplayer.ExoPlayer
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import live.shirabox.core.entity.EpisodeEntity
-import live.shirabox.core.model.Quality
-import live.shirabox.core.util.Util
-import live.shirabox.shirabox.R
+import org.shirabox.app.R
+import org.shirabox.core.entity.EpisodeEntity
+import org.shirabox.core.model.Quality
+import org.shirabox.core.util.Util
 
 @Composable
 fun SettingsBottomSheet(exoPlayer: ExoPlayer, playlist: List<EpisodeEntity>, model: PlayerViewModel) {

diff --git a/...abox/ui/activity/player/PlayerControls.kt → .../app/ui/activity/player/PlayerControls.kt b/...abox/ui/activity/player/PlayerControls.kt → .../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<EpisodeEntity>, model: PlayerViewModel) {

diff --git a/...ui/activity/player/PlayerStateListener.kt → ...ui/activity/player/PlayerStateListener.kt b/...ui/activity/player/PlayerStateListener.kt → ...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/...box/ui/activity/player/PlayerViewModel.kt → ...app/ui/activity/player/PlayerViewModel.kt b/...box/ui/activity/player/PlayerViewModel.kt → ...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/...hirabox/ui/activity/player/ShiraPlayer.kt → ...box/app/ui/activity/player/ShiraPlayer.kt b/...hirabox/ui/activity/player/ShiraPlayer.kt → ...box/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/.../ui/activity/resource/ResourceActivity.kt → .../ui/activity/resource/ResourceActivity.kt b/.../ui/activity/resource/ResourceActivity.kt → .../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/...activity/resource/ResourceSheetScreens.kt → ...activity/resource/ResourceSheetScreens.kt b/...activity/resource/ResourceSheetScreens.kt → ...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(