chore: code refactor

rebelonion · Feb 6, 2024 · a2e44da · a2e44da
1 parent 8d7b86a
commit a2e44da
Show file tree

Hide file tree

Showing 334 changed files with 3,545 additions and 3,087 deletions.
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -55,12 +55,6 @@ jobs:
     - name: Save Current SHA for Next Run
       run: echo ${{ github.sha }} > last_sha.txt
 
-    - name: Upload Current SHA as Artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: last-sha
-        path: last_sha.txt
-
     - name: Set variables
       run: |
         VER=$(grep -E -o "versionName \".*\"" app/build.gradle | sed -e 's/versionName //g' | tr -d '"')
@@ -86,13 +80,13 @@ jobs:
       run: chmod +x ./gradlew
 
     - name: Build with Gradle
-      run: ./gradlew assembleAlpha -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/key.keystore -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }}
+      run: ./gradlew assembleAlpha -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/key.keystore -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} -Pcustom.filename="app-alpha.apk"
 
     - name: Upload a Build Artifact
       uses: actions/[email protected]
       with:
           name: Dantotsu
-          path: "app/build/outputs/apk/alpha/app-alpha.apk"
+          path: "app/build/outputs/apk/google/alpha/app-alpha.apk"
 
     - name: Upload APK to Discord and Telegram
       shell: bash
@@ -105,20 +99,25 @@ jobs:
           commit_messages="${commit_messages:0:$max_length}... (truncated)"
         fi
         contentbody=$( jq -nc --arg msg "Alpha-Build: <@719439449423085569> **$VERSION**:" --arg commits "$commit_messages" '{"content": ($msg + "\n" + $commits)}' )
-        curl -F "payload_json=${contentbody}" -F "dantotsu_debug=@app/build/outputs/apk/alpha/app-alpha.apk" ${{ secrets.DISCORD_WEBHOOK }}
+        curl -F "payload_json=${contentbody}" -F "dantotsu_debug=@app/build/outputs/apk/google/alpha/app-alpha.apk" ${{ secrets.DISCORD_WEBHOOK }}
         
         #Telegram
         curl -F "chat_id=${{ secrets.TELEGRAM_CHANNEL_ID }}" \
-          -F "document=@app/build/outputs/apk/alpha/app-alpha.apk" \
+          -F "document=@app/build/outputs/apk/google/alpha/app-alpha.apk" \
           -F "caption=[Alpha-Build: ${VERSION}] Change logs :${commit_messages}" \
          https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendDocument
 
       env:
         COMMIT_LOG: ${{ env.COMMIT_LOG }}
         VERSION: ${{ env.VERSION }}
 
-
-
+    - name: Upload Current SHA as Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: last-sha
+        path: last_sha.txt
+
+
     - name: Delete Old Pre-Releases
       id: delete-pre-releases
       uses: sgpublic/delete-release-action@master

diff --git a/app/build.gradle b/app/build.gradle
@@ -17,7 +17,7 @@ android {
         applicationId "ani.dantotsu"
         minSdk 23
         targetSdk 34
-        versionCode ((System.currentTimeMillis() / 60000).toInteger())
+        versionCode((System.currentTimeMillis() / 60000).toInteger())
         versionName "2.1.0"
         versionCode 210
         signingConfig signingConfigs.debug

diff --git a/app/src/alpha/res/drawable/anim_splash.xml b/app/src/alpha/res/drawable/anim_splash.xml
diff --git a/app/src/debug/res/drawable/anim_splash.xml b/app/src/debug/res/drawable/anim_splash.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
         android:required="false" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"
+    <uses-permission
+        android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"
         tools:ignore="LeanbackUsesWifi" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
@@ -289,13 +290,13 @@
 
         <service
             android:name=".widgets.CurrentlyAiringRemoteViewsService"
-            android:permission="android.permission.BIND_REMOTEVIEWS"
-            android:exported="true" />
+            android:exported="true"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
         <service
             android:name=".download.video.ExoplayerDownloadService"
             android:exported="false"
             android:foregroundServiceType="dataSync">
-        <intent-filter>
+            <intent-filter>
                 <action android:name="androidx.media3.exoplayer.downloadService.action.RESTART" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -317,19 +318,22 @@
             android:name=".download.novel.NovelDownloaderService"
             android:exported="false"
             android:foregroundServiceType="dataSync" />
-        <service android:name=".download.anime.AnimeDownloaderService"
+        <service
+            android:name=".download.anime.AnimeDownloaderService"
             android:exported="false"
             android:foregroundServiceType="dataSync" />
         <service
             android:name=".connections.discord.DiscordService"
             android:exported="false"
             android:foregroundServiceType="dataSync" />
-        <service android:name="androidx.media3.exoplayer.scheduler.PlatformScheduler$PlatformSchedulerService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="true"/>
+        <service
+            android:name="androidx.media3.exoplayer.scheduler.PlatformScheduler$PlatformSchedulerService"
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
-        <meta-data android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
-            android:value="androidx.media3.cast.DefaultCastOptionsProvider"/>
+        <meta-data
+            android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
+            android:value="androidx.media3.cast.DefaultCastOptionsProvider" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/ani/dantotsu/App.kt b/app/src/main/java/ani/dantotsu/App.kt
@@ -15,8 +15,8 @@ import ani.dantotsu.parsers.MangaSources
 import ani.dantotsu.parsers.NovelSources
 import ani.dantotsu.parsers.novel.NovelExtensionManager
 import ani.dantotsu.settings.SettingsActivity
-import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.PrefManager
+import ani.dantotsu.settings.saving.PrefName
 import com.google.android.material.color.DynamicColors
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager

diff --git a/app/src/main/java/ani/dantotsu/Functions.kt b/app/src/main/java/ani/dantotsu/Functions.kt
@@ -48,8 +48,8 @@ import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.databinding.ItemCountDownBinding
 import ani.dantotsu.media.Media
 import ani.dantotsu.parsers.ShowResponse
-import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.PrefManager
+import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.internal.PreferenceKeystore
 import ani.dantotsu.settings.saving.internal.PreferenceKeystore.Companion.generateSalt
 import ani.dantotsu.subcriptions.NotificationClickReceiver
@@ -62,7 +62,6 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.internal.ViewUtils
 import com.google.android.material.snackbar.Snackbar
-import com.google.gson.Gson
 import eu.kanade.tachiyomi.data.notification.Notifications
 import kotlinx.coroutines.*
 import nl.joery.animatedbottombar.AnimatedBottomBar
@@ -304,7 +303,8 @@ class ZoomOutPageTransformer() :
                 0.5f to 0f
             )
             ObjectAnimator.ofFloat(view, "alpha", 0f, 1.0f)
-                .setDuration((200 * (PrefManager.getVal(PrefName.AnimationSpeed) as Float)).toLong()).start()
+                .setDuration((200 * (PrefManager.getVal(PrefName.AnimationSpeed) as Float)).toLong())
+                .start()
         }
     }
 }
@@ -592,7 +592,12 @@ fun saveImageToDownloads(title: String, bitmap: Bitmap, context: Context) {
     )
 }
 
-fun savePrefsToDownloads(title: String, serialized: String, context: Context, password: CharArray? = null) {
+fun savePrefsToDownloads(
+    title: String,
+    serialized: String,
+    context: Context,
+    password: CharArray? = null
+) {
     FileProvider.getUriForFile(
         context,
         "$APPLICATION_ID.provider",
@@ -634,7 +639,13 @@ fun savePrefs(serialized: String, path: String, title: String, context: Context)
     }
 }
 
-fun savePrefs(serialized: String, path: String, title: String, context: Context, password: CharArray): File? {
+fun savePrefs(
+    serialized: String,
+    path: String,
+    title: String,
+    context: Context,
+    password: CharArray
+): File? {
     var file = File(path, "$title.ani")
     var counter = 1
     while (file.exists()) {

diff --git a/app/src/main/java/ani/dantotsu/MainActivity.kt b/app/src/main/java/ani/dantotsu/MainActivity.kt
@@ -44,11 +44,10 @@ import ani.dantotsu.home.MangaFragment
 import ani.dantotsu.home.NoInternet
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.others.CustomBottomDialog
-import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefManager.asLiveBool
+import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.SharedPreferenceBooleanLiveData
-import ani.dantotsu.settings.saving.internal.Location
 import ani.dantotsu.subcriptions.Subscription.Companion.startSubscription
 import ani.dantotsu.themes.ThemeManager
 import eu.kanade.domain.source.service.SourcePreferences

diff --git a/app/src/main/java/ani/dantotsu/aniyomi/anime/custom/InjektModules.kt b/app/src/main/java/ani/dantotsu/aniyomi/anime/custom/InjektModules.kt
@@ -2,14 +2,11 @@ package ani.dantotsu.aniyomi.anime.custom
 
 
 import android.app.Application
-import android.content.Context
 import androidx.annotation.OptIn
 import androidx.core.content.ContextCompat
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.database.StandaloneDatabaseProvider
-import ani.dantotsu.BuildConfig
 import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
-import ani.dantotsu.connections.crashlytics.CrashlyticsStub
 import ani.dantotsu.download.DownloadsManager
 import ani.dantotsu.media.manga.MangaCache
 import ani.dantotsu.parsers.novel.NovelExtensionManager

diff --git a/app/src/main/java/ani/dantotsu/connections/UpdateProgress.kt b/app/src/main/java/ani/dantotsu/connections/UpdateProgress.kt
@@ -6,8 +6,8 @@ import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.mal.MAL
 import ani.dantotsu.currContext
 import ani.dantotsu.media.Media
-import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.PrefManager
+import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.toast
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/Anilist.kt b/app/src/main/java/ani/dantotsu/connections/anilist/Anilist.kt
@@ -12,7 +12,6 @@ import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.toast
 import ani.dantotsu.tryWithSuspend
-import java.io.File
 import java.util.Calendar
 
 object Anilist {

diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt
@@ -1,6 +1,7 @@
 package ani.dantotsu.connections.anilist
 
 import android.app.Activity
+import android.util.Base64
 import ani.dantotsu.R
 import ani.dantotsu.checkGenreTime
 import ani.dantotsu.checkId
@@ -17,18 +18,17 @@ import ani.dantotsu.media.Character
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.Studio
 import ani.dantotsu.others.MalScraper
-import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.PrefManager
+import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.runBlocking
+import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
+import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
 import java.io.Serializable
-import android.util.Base64
-import java.io.ByteArrayInputStream
-import java.io.ObjectInputStream
 import kotlin.system.measureTimeMillis
 
 class AnilistQueries {
@@ -357,9 +357,9 @@ class AnilistQueries {
     private suspend fun bannerImage(type: String): String? {
         //var image = loadData<BannerImage>("banner_$type")
         val image: BannerImage? = BannerImage(
-                PrefManager.getCustomVal("banner_${type}_url", null),
-                PrefManager.getCustomVal("banner_${type}_time", 0L)
-                )
+            PrefManager.getCustomVal("banner_${type}_url", null),
+            PrefManager.getCustomVal("banner_${type}_time", 0L)
+        )
         if (image == null || image.checkTime()) {
             val response =
                 executeQuery<Query.MediaListCollection>("""{ MediaListCollection(userId: ${Anilist.userid}, type: $type, chunk:1,perChunk:25, sort: [SCORE_DESC,UPDATED_TIME_DESC]) { lists { entries{ media { id bannerImage } } } } } """)
@@ -445,14 +445,16 @@ class AnilistQueries {
 
 
     suspend fun getGenresAndTags(activity: Activity): Boolean {
-        var genres: ArrayList<String>? = PrefManager.getVal<Set<String>>(PrefName.GenresList).toMutableList() as ArrayList<String>?
+        var genres: ArrayList<String>? = PrefManager.getVal<Set<String>>(PrefName.GenresList)
+            .toMutableList() as ArrayList<String>?
         val adultTags = PrefManager.getVal<Set<String>>(PrefName.TagsListIsAdult).toMutableList()
-        val nonAdultTags = PrefManager.getVal<Set<String>>(PrefName.TagsListNonAdult).toMutableList()
+        val nonAdultTags =
+            PrefManager.getVal<Set<String>>(PrefName.TagsListNonAdult).toMutableList()
         var tags = if (adultTags.isEmpty() || nonAdultTags.isEmpty()) null else
             mapOf(
-            true to adultTags,
-            false to nonAdultTags
-        )
+                true to adultTags,
+                false to nonAdultTags
+            )
 
         if (genres.isNullOrEmpty()) {
             executeQuery<Query.GenreCollection>(
@@ -530,9 +532,10 @@ class AnilistQueries {
         }
     }
 
-        private suspend fun getGenreThumbnail(genre: String): Genre? {
-        val genres: MutableMap<String, Genre> = loadSerializableMap<String, Genre>("genre_thumb")?.toMutableMap()
-            ?: mutableMapOf()
+    private suspend fun getGenreThumbnail(genre: String): Genre? {
+        val genres: MutableMap<String, Genre> =
+            loadSerializableMap<String, Genre>("genre_thumb")?.toMutableMap()
+                ?: mutableMapOf()
         if (genres.checkGenreTime(genre)) {
             try {
                 val genreQuery =

diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistViewModel.kt b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistViewModel.kt
@@ -11,8 +11,8 @@ import ani.dantotsu.connections.discord.Discord
 import ani.dantotsu.connections.mal.MAL
 import ani.dantotsu.media.Media
 import ani.dantotsu.others.AppUpdater
-import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.PrefManager
+import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import ani.dantotsu.tryWithSuspend
 import kotlinx.coroutines.CoroutineScope

diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/Login.kt b/app/src/main/java/ani/dantotsu/connections/anilist/Login.kt
@@ -1,6 +1,5 @@
 package ani.dantotsu.connections.anilist
 
-import android.content.Context
 import android.net.Uri
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -14,14 +13,14 @@ import ani.dantotsu.themes.ThemeManager
 class Login : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         ThemeManager(this).applyTheme()
         val data: Uri? = intent?.data
         logger(data.toString())
         try {
             Anilist.token =
                 Regex("""(?<=access_token=).+(?=&token_type)""").find(data.toString())!!.value
-            PrefManager.setVal(PrefName.AnilistToken, Anilist.token?:"")
+            PrefManager.setVal(PrefName.AnilistToken, Anilist.token ?: "")
         } catch (e: Exception) {
             logError(e)
         }

diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/UrlMedia.kt b/app/src/main/java/ani/dantotsu/connections/anilist/UrlMedia.kt
@@ -11,7 +11,7 @@ import ani.dantotsu.themes.ThemeManager
 class UrlMedia : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         ThemeManager(this).applyTheme()
         var id: Int? = intent?.extras?.getInt("media", 0) ?: 0
         var isMAL = false

diff --git a/app/src/main/java/ani/dantotsu/connections/discord/Discord.kt b/app/src/main/java/ani/dantotsu/connections/discord/Discord.kt
@@ -5,8 +5,8 @@ import android.content.Intent
 import android.widget.TextView
 import ani.dantotsu.R
 import ani.dantotsu.others.CustomBottomDialog
-import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.PrefManager
+import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.toast
 import ani.dantotsu.tryWith
 import io.noties.markwon.Markwon
@@ -22,7 +22,8 @@ object Discord {
 
     fun getSavedToken(context: Context): Boolean {
         token = PrefManager.getVal(
-            PrefName.DiscordToken, null as String?)
+            PrefName.DiscordToken, null as String?
+        )
         return token != null
     }
 

diff --git a/app/src/main/java/ani/dantotsu/connections/discord/DiscordService.kt b/app/src/main/java/ani/dantotsu/connections/discord/DiscordService.kt
@@ -24,8 +24,8 @@ import ani.dantotsu.R
 import ani.dantotsu.connections.discord.serializers.Presence
 import ani.dantotsu.connections.discord.serializers.User
 import ani.dantotsu.isOnline
-import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.PrefManager
+import ani.dantotsu.settings.saving.PrefName
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser

diff --git a/app/src/main/java/ani/dantotsu/connections/discord/Login.kt b/app/src/main/java/ani/dantotsu/connections/discord/Login.kt
@@ -19,7 +19,7 @@ class Login : AppCompatActivity() {
     @SuppressLint("SetJavaScriptEnabled")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         ThemeManager(this).applyTheme()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             val process = getProcessName()