Merge pull request #558 from rebelonion/dev

Dev

.github/workflows/beta.yml

@@ -136,16 +136,17 @@ jobs:
         declare -A additional_info
         additional_info["ibo"]="\n Discord: <@951737931159187457>\n AniList: [takarealist112](<https://anilist.co/user/5790266/>)"
         additional_info["aayush262"]="\n Discord: <@918825160654598224>\n AniList: [aayush262](<https://anilist.co/user/5144645/>)"
-        additional_info["rebelonion"]="\n Discord: <@714249925248024617>\n AniList: [rebelonion](<https://anilist.co/user/6077251/>)\n PornHub: [rebelonion](<https://www.cornhub.com/model/rebelonion>)"
+        additional_info["rebel onion"]="\n Discord: <@714249925248024617>\n AniList: [rebelonion](<https://anilist.co/user/6077251/>)\n PornHub: [rebelonion](<https://www.cornhub.com/model/rebelonion>)"
         additional_info["Ankit Grai"]="\n Discord: <@1125628254330560623>\n AniList: [bheshnarayan](<https://anilist.co/user/6417303/>)"
         
         # Decimal color codes for contributors
         declare -A contributor_colors
-        default_color="16721401"
-        contributor_colors["grayankit"]="#350297"
+        default_color="#bf2cc8"
         contributor_colors["ibo"]="#ff9b46"
         contributor_colors["aayush262"]="#5d689d"
         contributor_colors["Sadwhy"]="#ff7e95"
+        contributor_colors["grayankit"]="#c51aa1"
+        contributor_colors["rebelonion"]="#d4e5ed"
 
         hex_to_decimal() { printf '%d' "0x${1#"#"}"; }
         
@@ -179,7 +180,7 @@ jobs:
         top_contributor=""
         top_contributor_count=0
         top_contributor_avatar=""
-        embed_color=$default_color
+        embed_color=$(hex_to_decimal "$default_color")
         
         # Process contributors in the new order
         while read -r login; do
@@ -201,7 +202,7 @@ jobs:
             elif [ $commit_count -eq $max_commits ]; then
               top_contributors+=("$login")
               top_contributor_count=$((top_contributor_count + 1))
-              embed_color=$default_color
+              embed_color=$(hex_to_decimal "$default_color")
             fi
             echo "Debug top contributors:"
             echo "$top_contributors"
@@ -241,7 +242,7 @@ jobs:
           thumbnail_url="$top_contributor_avatar"
         else
           thumbnail_url="https://i.imgur.com/5o3Y9Jb.gif"
-          embed_color=$default_color
+          embed_color=$(hex_to_decimal "$default_color")
         fi
         
         # Truncate field values

app/build.gradle

@@ -18,8 +18,8 @@ android {
         minSdk 21
         targetSdk 35
         versionCode((System.currentTimeMillis() / 60000).toInteger())
-        versionName "3.1.0"
-        versionCode 300100000
+        versionName "3.2.0"
+        versionCode 300200000
         signingConfig signingConfigs.debug
 
     }

app/src/google/java/ani/dantotsu/others/AppUpdater.kt

@@ -29,7 +29,6 @@ import ani.dantotsu.util.Logger
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.time.delay
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonArray

app/src/main/AndroidManifest.xml

@@ -394,11 +394,10 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Support both schemes -->
-                <data android:scheme="tachiyomi"/>
                 <data android:host="add-repo"/>
+                <data android:scheme="tachiyomi"/>
                 <data android:scheme="aniyomi"/>
-                <data android:host="add-repo"/>
+                <data android:scheme="novelyomi"/>
             </intent-filter>
         </activity>
         <activity

app/src/main/java/ani/dantotsu/MainActivity.kt

@@ -449,19 +449,20 @@ class MainActivity : AppCompatActivity() {
             if (uri == null) {
                 throw Exception("Uri is null")
             }
-            if ((uri.scheme == "tachiyomi" || uri.scheme == "aniyomi") && uri.host == "add-repo") {
+            if ((uri.scheme == "tachiyomi" || uri.scheme == "aniyomi" || uri.scheme == "novelyomi") && uri.host == "add-repo") {
                 val url = uri.getQueryParameter("url") ?: throw Exception("No url for repo import")
-                val prefName = if (uri.scheme == "tachiyomi") {
-                    PrefName.MangaExtensionRepos
-                } else {
-                    PrefName.AnimeExtensionRepos
+                val (prefName, name) = when (uri.scheme) {
+                    "tachiyomi" -> PrefName.MangaExtensionRepos to "Manga"
+                    "aniyomi" -> PrefName.AnimeExtensionRepos to "Anime"
+                    "novelyomi" -> PrefName.NovelExtensionRepos to "Novel"
+                    else -> throw Exception("Invalid scheme")
                 }
                 val savedRepos: Set<String> = PrefManager.getVal(prefName)
                 val newRepos = savedRepos.toMutableSet()
                 AddRepositoryBottomSheet.addRepoWarning(this) {
                     newRepos.add(url)
                     PrefManager.setVal(prefName, newRepos)
-                    toast("${if (uri.scheme == "tachiyomi") "Manga" else "Anime"} Extension Repo added")
+                    toast("$name Extension Repo added")
                 }
                 return
             }
@@ -488,9 +489,9 @@ class MainActivity : AppCompatActivity() {
                             return@passwordAlertDialog
                         }
                         if (PreferencePackager.unpack(decryptedJson)) {
-                            val intent = Intent(this, this.javaClass)
+                            val newIntent = Intent(this, this.javaClass)
                             this.finish()
-                            startActivity(intent)
+                            startActivity(newIntent)
                         }
                     } else {
                         toast("Password cannot be empty")
@@ -499,9 +500,9 @@ class MainActivity : AppCompatActivity() {
             } else if (name.endsWith(".ani")) {
                 val decryptedJson = jsonString.toString(Charsets.UTF_8)
                 if (PreferencePackager.unpack(decryptedJson)) {
-                    val intent = Intent(this, this.javaClass)
+                    val newIntent = Intent(this, this.javaClass)
                     this.finish()
-                    startActivity(intent)
+                    startActivity(newIntent)
                 }
             } else {
                 toast("Invalid file type")

app/src/main/java/ani/dantotsu/connections/anilist/SearchResults.kt → app/src/main/java/ani/dantotsu/connections/anilist/AniMangaSearchResults.kt

@@ -2,15 +2,25 @@ package ani.dantotsu.connections.anilist
 
 import ani.dantotsu.R
 import ani.dantotsu.currContext
+import ani.dantotsu.media.Author
+import ani.dantotsu.media.Character
 import ani.dantotsu.media.Media
+import ani.dantotsu.media.Studio
+import ani.dantotsu.profile.User
 import java.io.Serializable
 
-data class SearchResults(
+interface SearchResults<T> {
+    var search: String?
+    var page: Int
+    var results: MutableList<T>
+    var hasNextPage: Boolean
+}
+
+data class AniMangaSearchResults(
     val type: String,
     var isAdult: Boolean,
     var onList: Boolean? = null,
     var perPage: Int? = null,
-    var search: String? = null,
     var countryOfOrigin: String? = null,
     var sort: String? = null,
     var genres: MutableList<String>? = null,
@@ -23,10 +33,11 @@ data class SearchResults(
     var seasonYear: Int? = null,
     var startYear: Int? = null,
     var season: String? = null,
-    var page: Int = 1,
-    var results: MutableList<Media>,
-    var hasNextPage: Boolean,
-) : Serializable {
+    override var search: String? = null,
+    override var page: Int = 1,
+    override var results: MutableList<Media>,
+    override var hasNextPage: Boolean,
+) : SearchResults<Media>, Serializable {
     fun toChipList(): List<SearchChip> {
         val list = mutableListOf<SearchChip>()
         sort?.let {
@@ -108,4 +119,33 @@ data class SearchResults(
         val type: String,
         val text: String
     )
-}
+}
+
+data class CharacterSearchResults(
+    override var search: String?,
+    override var page: Int = 1,
+    override var results: MutableList<Character>,
+    override var hasNextPage: Boolean,
+) : SearchResults<Character>, Serializable
+
+data class StudioSearchResults(
+    override var search: String?,
+    override var page: Int = 1,
+    override var results: MutableList<Studio>,
+    override var hasNextPage: Boolean,
+) : SearchResults<Studio>, Serializable
+
+
+data class StaffSearchResults(
+    override var search: String?,
+    override var page: Int = 1,
+    override var results: MutableList<Author>,
+    override var hasNextPage: Boolean,
+) : SearchResults<Author>, Serializable
+
+data class UserSearchResults(
+    override var search: String?,
+    override var page: Int = 1,
+    override var results: MutableList<User>,
+    override var hasNextPage: Boolean,
+) : SearchResults<User>, Serializable

app/src/main/java/ani/dantotsu/connections/anilist/Anilist.kt

@@ -311,7 +311,6 @@ object Anilist {
                 )
                 val remaining = json.headers["X-RateLimit-Remaining"]?.toIntOrNull() ?: -1
                 Logger.log("Remaining requests: $remaining")
-                println("Remaining requests: $remaining")
                 if (json.code == 429) {
                     val retry = json.headers["Retry-After"]?.toIntOrNull() ?: -1
                     val passedLimitReset = json.headers["X-RateLimit-Reset"]?.toLongOrNull() ?: 0