Correctly count extensions at the SplashScreen,

MrBoomDeveloper · MrBoomDeveloper · commit c4b0fc872031 · 2025-02-23T09:35:28.000+05:00
Fixed wrong path for an tv build,
Removed unused libraries

Signed-off-by: MrBoom &lt;github@mrboomdev.ru&gt;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -48,7 +48,7 @@ jobs:
         run: ./gradlew assemble${{ inputs.channel }}TvRelease -Pbuildkonfig.flavor=${{ inputs.channel }}
 
 #      - name: Build Exe
-#        id: build_alpha_exe
+#        id: build_exe
 #        run: ./gradlew packageExe -Pbuildkonfig.flavor=${{ inputs.channel }}
 
       - name: Sign Mobile Apk
@@ -95,4 +95,4 @@ jobs:
         with:
           name: "Tv Apk"
           retention-days: 90
-          path: "app/build/outputs/apk/${{ inputs.channel }}Tv/tv/release/awery-tv-${{ inputs.channel }}.apk"
+          path: "app/build/outputs/apk/${{ inputs.channel }}Tv/release/awery-tv-${{ inputs.channel }}.apk"
diff --git a/.github/workflows/publish_alpha.yml b/.github/workflows/publish_alpha.yml
@@ -112,29 +112,29 @@ jobs:
         env:
           BUILD_TOOLS_VERSION: "34.0.0"
 
-      - name: Rename APK File
+      - name: Rename Mobile Apk File
         run: |
           mv app/build/outputs/apk/alphaMobile/release/app-alpha-mobile-release-signed.apk app/build/outputs/apk/alphaMobile/release/awery-mobile-alpha.apk
           
-      - name: Rename Tv APK File
+      - name: Rename Tv Apk File
         run: |
           mv app/build/outputs/apk/alphaTv/release/app-alpha-tv-release-signed.apk app/build/outputs/apk/alphaTv/release/awery-tv-alpha.apk
       
-      - name: Upload Alpha APK
+      - name: Upload Mobile Apk
         uses: actions/upload-artifact@v4
         with:
-          name: "Alpha APK"
+          name: "Mobile Apk"
           retention-days: 90
           path: "app/build/outputs/apk/alphaMobile/release/awery-mobile-alpha.apk"
           
-      - name: Upload Tv Alpha APK
+      - name: Upload Tv Apk
         uses: actions/upload-artifact@v4
         with:
-          name: "Tv Alpha APK"
+          name: "Tv Apk"
           retention-days: 90
-          path: "app/build/outputs/apk/alphaTv/tv/release/awery-tv-alpha.apk"
+          path: "app/build/outputs/apk/alphaTv/release/awery-tv-alpha.apk"
           
-      - name: Upload APK to Discord and Telegram
+      - name: Upload Apk to Discord and Telegram
         shell: bash
         run: |      
           fetch_user_details() {
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -67,7 +67,6 @@ kotlin {
 			implementation(libs.androidx.appcompat)
 			implementation(libs.androidx.splashscreen)
 			
-			implementation(libs.androidx.recyclerview)
 			implementation(libs.material)
 			implementation(libs.bundles.exoplayer)
 			implementation(libs.safeargsnext)
diff --git a/ext/build.gradle.kts b/ext/build.gradle.kts
@@ -14,12 +14,7 @@ kotlin {
 }
 
 dependencies {
-	// Coroutines
-	api(libs.kotlinx.coroutines.core)
-
-	// Serialization
-	implementation(libs.moshi)
-	implementation(libs.moshi.kotlin)
+	implementation(libs.kotlinx.coroutines.core)
 	implementation(libs.kotlinx.serialization.json)
 }
 
diff --git a/ext/src/main/kotlin/com/mrboomdev/awery/ext/data/CatalogFeed.kt b/ext/src/main/kotlin/com/mrboomdev/awery/ext/data/CatalogFeed.kt
@@ -1,18 +1,13 @@
 package com.mrboomdev.awery.ext.data
 
-import com.squareup.moshi.Json
 import java.io.Serializable
 
 class CatalogFeed(
-	@Json(name = "source_manager")
 	val managerId: String? = null,
-	@Json(name = "source_id")
 	val sourceId: String? = null,
-	@Json(name = "source_feed")
 	val feedId: String? = null,
 	val title: String,
 	val style: Style = Style.UNSPECIFIED,
-	@Json(name = "hide_if_empty")
 	val hideIfEmpty: Boolean = false,
 	val filters: List<Setting>? = null
 ): Serializable {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,25 +8,15 @@ media3 = "1.5.1"
 markwon = "4.6.2"
 room = "2.7.0-beta01"
 coil = "3.0.4"
-
-# For removal
-glide = "4.16.0"
-moshi = "1.15.2"
 okhttp = "5.0.0-alpha.14"
-bigimageviewer = "1.8.1"
-sonner = "0.3.8"
 voyager-navigator = "1.1.0-beta02"
 
 [libraries]
 safeargsnext = { group = "ru.mrboomdev.safeargsnext", name = "safeargsnext", version = "1.0.1" }
 lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle-viewmodel-compose" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.9.0" }
 balloon = { module = "com.github.skydoves:balloon", version = "1.6.11" }
-animatedbottombar = { module = "nl.joery.animatedbottombar:library", version = "1.1.0" }
-bigimageviewer = { module = "com.github.piasy:BigImageViewer", version.ref = "bigimageviewer" }
 ebook-reader = { module = "com.github.VipulOG:ebook-reader", version = "0.1.6" }
-pageindicatorview = { module = "com.github.emilaleborn:PageIndicatorView", version = "905cd4e2ab" }
-retrostreams = { module = "net.sourceforge.streamsupport:android-retrostreams", version = "1.7.4" }
 
 # Android
 androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.15.0" }
@@ -38,7 +28,7 @@ androidx-preference = { module = "androidx.preference:preference-ktx", version =
 androidx-webkit = { module = "androidx.webkit:webkit", version = "1.12.1" }
 material = { group = "com.google.android.material", name = "material", version = "1.12.0" }
 hauler = { module = "app.futured.hauler:hauler", version = "5.0.0" }
-sonner = { module = "io.github.dokar3:sonner", version.ref = "sonner" }
+sonner = { module = "io.github.dokar3:sonner", version = "0.3.8" }
 voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager-navigator" }
 voyager-screenmodel = { module = "cafe.adriel.voyager:voyager-screenmodel", version.ref = "voyager-navigator" }
 voyager-tab-navigator = { module = "cafe.adriel.voyager:voyager-tab-navigator", version.ref = "voyager-navigator" }
@@ -112,23 +102,6 @@ okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", ver
 androidx-navigation = { group = "org.jetbrains.androidx.navigation", name = "navigation-compose", version = "2.8.0-alpha10"}
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version = "2.8.7" }
 
-# For removal (Use compose components instead)
-konfetti-xml = { module = "nl.dionsegijn:konfetti-xml", version = "2.0.5" }
-androidx-fragment = { module = "androidx.fragment:fragment-ktx", version = "1.8.6" }
-androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.4.0" }
-androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version = "1.1.0" }
-
-# For removal (Use coil instead)
-glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
-glide-imageloader = { module = "com.github.piasy:GlideImageLoader", version.ref = "bigimageviewer" }
-glide-imageViewFactory = { module = "com.github.piasy:GlideImageViewFactory", version.ref = "bigimageviewer" }
-glide-okhttp3 = { module = "com.github.bumptech.glide:okhttp3-integration", version.ref = "glide" }
-
-# For removal (Use kotlin serialization instead)
-moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
-moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
-moshi-kotlin-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" }
-
 [bundles]
 okhttp = ["okhttp", "okhttp-brotli", "okhttp-dnsoverhttps", "okhttp-logging"]
 
diff --git a/shared/src/androidMain/kotlin/com/mrboomdev/awery/sources/yomi/tachiyomi/TachiyomiManager.kt b/shared/src/androidMain/kotlin/com/mrboomdev/awery/sources/yomi/tachiyomi/TachiyomiManager.kt
@@ -52,8 +52,7 @@ class TachiyomiManager: YomiManager<Source>(
 
 		throw UnsupportedOperationException("Unsupported source type!")
 	}
-
-	@Throws(IllegalArgumentException::class)
+	
 	override fun createSourceWrapper(
 		label: String,
 		isNsfw: Boolean,
diff --git a/shared/src/commonMain/kotlin/com/mrboomdev/awery/sources/ExtensionsManager.kt b/shared/src/commonMain/kotlin/com/mrboomdev/awery/sources/ExtensionsManager.kt
@@ -106,34 +106,34 @@ object ExtensionsManager {
 		override fun getAll(): List<AbstractSource> = managers.values.toList()
 		
 		override fun onLoad(): PendingTask<Flow<Progress>> {
-			var totalSize = 0L
+			val progresses = mutableMapOf<SourcesManager, Progress>()
 			
 			for(manager in createPlatformSourceManagers()) {
 				managers[manager.context.id] = manager
 			}
 			
 			val pendingTasks = managers.values.map { manager ->
 				val task = manager.onLoad()
-				task.size?.let { totalSize += it }
+				task.size?.let { progresses[manager] = Progress(it) }
 				manager to task
 			}
 			
+			val progress = Progress(progresses.values.sumOf { it.max })
+			
 			return object : PendingTask<Flow<Progress>>() {
-				override val size = totalSize
+				override val size = progress.max
 				
 				override val data: Flow<Progress>
 					get() = channelFlow {
-						val progresses = mutableMapOf<SourcesManager, Long>()
-						val progress = Progress(totalSize)
-						
 						for((manager, task) in pendingTasks) {
 							task.data.collectIndexed { index, it ->
+								progresses[manager] = it
+								
 								if(index == 0) {
-									progress.max += it.max
+									progress.max = progresses.values.sumOf { it.max }
 								}
 								
-								progresses[manager] = it.value
-								progress.value = progresses.values.sum()
+								progress.value = progresses.values.sumOf { it.value }
 								send(progress)
 							}
 						}

Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,7 @@ kotlin {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`dependencies {`
`17`		`- // Coroutines`
`18`		`- api(libs.kotlinx.coroutines.core)`
`19`		`-`
`20`		`- // Serialization`
`21`		`- implementation(libs.moshi)`
`22`		`- implementation(libs.moshi.kotlin)`
	`17`	`+ implementation(libs.kotlinx.coroutines.core)`
`23`	`18`	`implementation(libs.kotlinx.serialization.json)`
`24`	`19`	`}`
`25`	`20`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,7 @@ class TachiyomiManager: YomiManager<Source>(`
`52`	`52`
`53`	`53`	`throw UnsupportedOperationException("Unsupported source type!")`
`54`	`54`	`}`
`55`		`-`
`56`		`- @Throws(IllegalArgumentException::class)`
	`55`	`+`
`57`	`56`	`override fun createSourceWrapper(`
`58`	`57`	`label: String,`
`59`	`58`	`isNsfw: Boolean,`