[Final Testing Phase!] External apk test

Models/src/main/java/com/programmersbox/models/ApiService.kt

@@ -1,7 +1,14 @@
 package com.programmersbox.models
 
+import android.app.Application
+import android.content.pm.PackageInfo
+import android.graphics.drawable.Drawable
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
 import java.io.Serializable
 
 interface ApiService : Serializable {
@@ -78,4 +85,42 @@ interface ApiService : Serializable {
     fun <T> Flow<T>.dispatchIo() = this.flowOn(Dispatchers.IO)
 }
 
-val sourceFlow = MutableStateFlow<ApiService?>(null)
+interface ApiServicesCatalog {
+    fun createSources(): List<ApiService>
+    val name: String
+}
+
+interface ExternalApiServicesCatalog : ApiServicesCatalog {
+    suspend fun initialize(app: Application)
+
+    fun getSources(): List<SourceInformation>
+    override fun createSources(): List<ApiService> = getSources().map { it.apiService }
+
+    val hasRemoteSources: Boolean
+    suspend fun getRemoteSources(): List<RemoteSources> = emptyList()
+
+    fun shouldReload(packageName: String, packageInfo: PackageInfo): Boolean = false
+}
+
+data class RemoteSources(
+    val name: String,
+    val packageName: String,
+    val version: String,
+    val iconUrl: String,
+    val downloadLink: String,
+    val sources: List<Sources>,
+)
+
+data class Sources(
+    val name: String,
+    val baseUrl: String,
+    val version: String
+)
+
+data class SourceInformation(
+    val apiService: ApiService,
+    val name: String,
+    val icon: Drawable?,
+    val packageName: String,
+    val catalog: ApiServicesCatalog? = null
+)

Models/src/main/java/com/programmersbox/models/Models.kt

@@ -10,6 +10,7 @@ data class ItemModel(
     val source: ApiService
 ) : Serializable {
     val extras = mutableMapOf<String, Any>()
+    val otherExtras = mutableMapOf<String, Any>()
     fun toInfoModel() = source.getItemInfoFlow(this)
 }
 
@@ -36,6 +37,7 @@ data class ChapterModel(
     var uploadedTime: Long? = null
     fun getChapterInfo() = source.getChapterInfoFlow(this)
     val extras = mutableMapOf<String, Any>()
+    val otherExtras = mutableMapOf<String, Any>()
 }
 
 class NormalLink(var normal: Normal? = null)

UIViews/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
     id("otaku-library")
     id("androidx.navigation.safeargs.kotlin")
     id("kotlinx-serialization")
-    id("com.google.protobuf") version "0.9.3"
+    id("com.google.protobuf") version "0.9.4"
     alias(libs.plugins.ksp)
 }
 
@@ -111,8 +111,13 @@ dependencies {
 
     implementation(libs.bundles.protobuf)
 
+    implementation(libs.bundles.ktorLibs)
+
     //Multiplatform
     implementation(projects.imageloader)
+
+    //Extension Loader
+    api(projects.sharedutils.extensionloader)
 }
 
 protobuf {

UIViews/src/main/AndroidManifest.xml

@@ -2,15 +2,18 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application>
 
         <receiver
-            android:name=".DeleteNotificationReceiver"
+            android:name=".checkers.DeleteNotificationReceiver"
             android:enabled="true"
             android:exported="true" />
         <receiver
-            android:name=".BootReceived"
+            android:name=".checkers.BootReceived"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />

UIViews/src/main/java/com/programmersbox/uiviews/AboutLibrariesScreen.kt

@@ -7,11 +7,40 @@ import androidx.appcompat.content.res.AppCompatResources
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Badge
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedCard
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.TopAppBarScrollBehavior
+import androidx.compose.material3.contentColorFor
+import androidx.compose.material3.rememberTopAppBarState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
@@ -353,7 +382,7 @@ private fun DefaultHeader(
                 }
             }
             description?.let {
-                Divider(modifier = Modifier.padding(horizontal = 4.dp))
+                HorizontalDivider(modifier = Modifier.padding(horizontal = 4.dp))
                 Text(it, textAlign = TextAlign.Center)
             }
         }

UIViews/src/main/java/com/programmersbox/uiviews/BaseMainActivity.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
@@ -30,9 +31,12 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.BrowseGallery
+import androidx.compose.material.icons.filled.Extension
 import androidx.compose.material.icons.filled.History
 import androidx.compose.material.icons.filled.List
 import androidx.compose.material.icons.filled.Notifications
@@ -60,6 +64,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
@@ -87,9 +92,9 @@ import com.google.accompanist.navigation.material.ExperimentalMaterialNavigation
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberPermissionState
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import com.programmersbox.extensionloader.SourceRepository
 import com.programmersbox.favoritesdatabase.ItemDatabase
 import com.programmersbox.helpfulutils.notificationManager
-import com.programmersbox.models.sourceFlow
 import com.programmersbox.sharedutils.AppUpdate
 import com.programmersbox.sharedutils.MainLogo
 import com.programmersbox.sharedutils.updateAppCheck
@@ -106,6 +111,7 @@ import com.programmersbox.uiviews.notifications.NotificationsScreen
 import com.programmersbox.uiviews.notifications.cancelNotification
 import com.programmersbox.uiviews.recent.RecentView
 import com.programmersbox.uiviews.settings.ComposeSettingsDsl
+import com.programmersbox.uiviews.settings.ExtensionList
 import com.programmersbox.uiviews.settings.GeneralSettings
 import com.programmersbox.uiviews.settings.InfoSettings
 import com.programmersbox.uiviews.settings.NotificationSettings
@@ -147,6 +153,9 @@ abstract class BaseMainActivity : AppCompatActivity() {
 
     private val settingsHandling: SettingsHandling by inject()
 
+    private val sourceRepository by inject<SourceRepository>()
+    private val currentSourceRepository by inject<CurrentSourceRepository>()
+
     protected abstract fun onCreate()
 
     @Composable
@@ -161,7 +170,8 @@ abstract class BaseMainActivity : AppCompatActivity() {
     @OptIn(
         ExperimentalMaterialNavigationApi::class,
         ExperimentalMaterial3Api::class,
-        ExperimentalMaterial3WindowSizeClassApi::class
+        ExperimentalMaterial3WindowSizeClassApi::class,
+        ExperimentalMaterialApi::class
     )
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -176,6 +186,11 @@ abstract class BaseMainActivity : AppCompatActivity() {
                 remember { ChromeCustomTabsNavigator(this) }
             )
 
+            val scope = rememberCoroutineScope()
+            BackHandler(bottomSheetNavigator.sheetState.isVisible) {
+                scope.launch { bottomSheetNavigator.sheetState.hide() }
+            }
+
             val systemUiController = rememberSystemUiController()
             val customPreferences = remember { ComposeSettingsDsl().apply(genericInfo.composeCustomPreferences(navController)) }
 
@@ -320,7 +335,8 @@ abstract class BaseMainActivity : AppCompatActivity() {
                         AppCompatResources.getDrawable(this@BaseMainActivity, logo.logoId)!!.toBitmap().asImageBitmap(),
                         null,
                     )
-                }
+                },
+                modifier = Modifier.verticalScroll(rememberScrollState())
             ) {
                 NavigationRailItem(
                     imageVector = Icons.Default.History,
@@ -378,6 +394,15 @@ abstract class BaseMainActivity : AppCompatActivity() {
                     customRoute = "_home"
                 )
 
+                NavigationRailItem(
+                    imageVector = Icons.Default.Extension,
+                    label = stringResource(R.string.extensions),
+                    screen = Screen.ExtensionListScreen,
+                    currentDestination = currentDestination,
+                    navController = navController,
+                    customRoute = "_home"
+                )
+
                 NavigationRailItem(
                     icon = {
                         BadgedBox(
@@ -572,6 +597,12 @@ abstract class BaseMainActivity : AppCompatActivity() {
                 )
             }
 
+            composable(
+                Screen.ExtensionListScreen.route,
+                enterTransition = { slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Start) },
+                exitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.End) },
+            ) { ExtensionList() }
+
             additionalSettings()
 
             if (BuildConfig.DEBUG) {
@@ -611,6 +642,12 @@ abstract class BaseMainActivity : AppCompatActivity() {
             enterTransition = { slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) },
             exitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) }
         ) { FavoriteUi(logo) }
+
+        composable(
+            Screen.ExtensionListScreen.route + "_home",
+            enterTransition = { slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) },
+            exitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) }
+        ) { ExtensionList() }
     }
 
     @OptIn(ExperimentalPermissionsApi::class)
@@ -633,7 +670,13 @@ abstract class BaseMainActivity : AppCompatActivity() {
 
     private fun setup() {
         lifecycleScope.launch {
-            genericInfo.toSource(currentService.orEmpty())?.let { sourceFlow.emit(it) }
+            if (currentService == null) {
+                val s = sourceRepository.list.randomOrNull()?.apiService
+                currentSourceRepository.emit(s)
+                currentService = s?.serviceName
+            } else {
+                sourceRepository.toSourceByApiServiceName(currentService.orEmpty())?.let { currentSourceRepository.emit(it.apiService) }
+            }
         }
 
         when (runBlocking { settingsHandling.systemThemeMode.firstOrNull() }) {