SheWhoReignsSupreme/GoonManager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(DI): properly add modules to koin

Browse source
This commit is contained in:
rushiiMachine 2024-01-12 16:20:58 -08:00
parent 1b5cc48fdf
commit c73edaa12f
No known key found for this signature in database
GPG key ID: DCBE5952BB3B6420
3 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/kotlin/com/aliucord/manager/ManagerApplication.kt
View file

@ -20,39 +20,40 @@ class ManagerApplication : Application() {
androidContext(this@ManagerApplication) androidContext(this@ManagerApplication)
// HTTP // HTTP
module { modules(module {
singleOf(::provideJson) single { provideJson() }
singleOf(::provideHttpClient) single { provideHttpClient() }
} })
// Services // Services
module { modules(module {
singleOf(::HttpService)
singleOf(::GithubService) singleOf(::GithubService)
singleOf(::MavenService) singleOf(::MavenService)
singleOf(::AliucordGithubService) singleOf(::AliucordGithubService)
} })
// Repositories // Repositories
module { modules(module {
singleOf(::GithubRepository) singleOf(::GithubRepository)
singleOf(::AliucordMavenRepository) singleOf(::AliucordMavenRepository)
} })
// ViewModels // ViewModels
module { modules(module {
viewModelOf(::HomeViewModel) viewModelOf(::HomeViewModel)
viewModelOf(::PluginsViewModel) viewModelOf(::PluginsViewModel)
viewModelOf(::AboutViewModel) viewModelOf(::AboutViewModel)
viewModelOf(::InstallViewModel) viewModelOf(::InstallViewModel)
viewModelOf(::SettingsViewModel) viewModelOf(::SettingsViewModel)
viewModelOf(::UpdaterViewModel) viewModelOf(::UpdaterViewModel)
} })
// Managers // Managers
module { modules(module {
singleOf(::providePreferences) single { providePreferences() }
singleOf(::provideDownloadManager) single { provideDownloadManager() }
} })
} }
} }
} }

7
app/src/main/kotlin/com/aliucord/manager/di/Http.kt
View file

@ -10,13 +10,12 @@ import org.koin.core.scope.Scope
import java.net.Inet4Address import java.net.Inet4Address
import java.net.InetAddress import java.net.InetAddress
context(Scope) @Suppress("UnusedReceiverParameter")
fun provideJson() = Json { fun Scope.provideJson() = Json {
ignoreUnknownKeys = true ignoreUnknownKeys = true
} }
context(Scope) fun Scope.provideHttpClient() = HttpClient(OkHttp) {
fun provideHttpClient() = HttpClient(OkHttp) {
val json: Json = get() val json: Json = get()
engine { engine {

6
app/src/main/kotlin/com/aliucord/manager/di/Managers.kt
View file

@ -6,14 +6,12 @@ import com.aliucord.manager.domain.manager.DownloadManager
import com.aliucord.manager.domain.manager.PreferencesManager import com.aliucord.manager.domain.manager.PreferencesManager
import org.koin.core.scope.Scope import org.koin.core.scope.Scope
context(Scope) fun Scope.providePreferences(): PreferencesManager {
fun providePreferences(): PreferencesManager {
val ctx: Context = get() val ctx: Context = get()
return PreferencesManager(ctx.getSharedPreferences("preferences", Context.MODE_PRIVATE)) return PreferencesManager(ctx.getSharedPreferences("preferences", Context.MODE_PRIVATE))
} }
context(Scope) fun Scope.provideDownloadManager(): DownloadManager {
fun provideDownloadManager(): DownloadManager {
val application: Application = get() val application: Application = get()
return DownloadManager(application) return DownloadManager(application)
} }