Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,5 @@ package com.redmadrobot.debug.plugin.servers

import com.redmadrobot.debug.core.DebugEvent
import com.redmadrobot.debug.plugin.servers.data.model.DebugServer
import com.redmadrobot.debug.plugin.servers.data.model.DebugStage

public data class ServerSelectedEvent(val debugServer: DebugServer) : DebugEvent

public data class StageSelectedEvent(val debugServer: DebugStage) : DebugEvent
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@ import com.redmadrobot.debug.core.internal.EditablePlugin
import com.redmadrobot.debug.core.internal.PluginDependencyContainer
import com.redmadrobot.debug.core.plugin.Plugin
import com.redmadrobot.debug.plugin.servers.data.model.DebugServer
import com.redmadrobot.debug.plugin.servers.data.model.DebugServerData
import com.redmadrobot.debug.plugin.servers.data.model.DebugStage
import com.redmadrobot.debug.plugin.servers.ui.ServersScreen
import kotlinx.coroutines.runBlocking

public class ServersPlugin(
private val preInstalledServers: List<DebugServerData> = emptyList(),
private val preInstalledServers: List<DebugServer> = emptyList(),
) : Plugin(), EditablePlugin {

init {
Expand All @@ -34,14 +32,6 @@ public class ServersPlugin(
public fun getDefaultServer(): DebugServer {
return getPlugin<ServersPlugin>().getContainer<ServersPluginContainer>().serversRepository.getDefault()
}

public fun getSelectedStage(): DebugStage? {
return getPlugin<ServersPlugin>().getContainer<ServersPluginContainer>().stagesRepository.getSelectedStage()
}

public fun getDefaultStage(): DebugStage? {
return getPlugin<ServersPlugin>().getContainer<ServersPluginContainer>().stagesRepository.getDefault()
}
}

public constructor(preInstalledServers: DebugDataProvider<List<DebugServer>>) : this(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,27 @@ package com.redmadrobot.debug.plugin.servers
import com.redmadrobot.debug.core.internal.CommonContainer
import com.redmadrobot.debug.core.internal.PluginDependencyContainer
import com.redmadrobot.debug.plugin.servers.data.DebugServerRepository
import com.redmadrobot.debug.plugin.servers.data.DebugStageRepository
import com.redmadrobot.debug.plugin.servers.data.model.DebugServer
import com.redmadrobot.debug.plugin.servers.data.model.DebugServerData
import com.redmadrobot.debug.plugin.servers.data.model.DebugStage
import com.redmadrobot.debug.plugin.servers.data.storage.ServersPluginDatabase
import com.redmadrobot.debug.plugin.servers.ui.ServersViewModel

internal class ServersPluginContainer(
private val preinstalledStages: List<DebugServerData>,
private val preinstalledServers: List<DebugServer>,
private val container: CommonContainer
) : PluginDependencyContainer {

private val pluginStorage by lazy { ServersPluginDatabase.getInstance(container.context) }

val serversRepository by lazy {
DebugServerRepository(
container.context,
pluginStorage.getDebugServersDao(),
preinstalledStages.filterIsInstance<DebugServer>(),
)
}

val stagesRepository by lazy {
DebugStageRepository(
container.context,
pluginStorage.getDebugStagesDao(),
preinstalledStages.filterIsInstance<DebugStage>()
context = container.context,
debugServersDao = pluginStorage.getDebugServersDao(),
preInstalledServers = preinstalledServers,
)
}

fun createServersViewModel(): ServersViewModel {
return ServersViewModel(
serversRepository,
stagesRepository
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ internal class DebugServerRepository(
private val debugServersDao: DebugServersDao,
private val preInstalledServers: List<DebugServer>
) {

companion object {
private const val SELECTED_SERVER_URL = "SELECTED_SERVER_URL"
private const val SELECTED_SERVER_NAME = "SELECTED_SERVER_NAME"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import androidx.room.PrimaryKey
@Entity(tableName = DebugServer.TABLE_NAME)
public data class DebugServer(
@PrimaryKey(autoGenerate = true)
override val id: Int = 0,
override val name: String,
val id: Int = 0,
val name: String,
val url: String,
override val isDefault: Boolean = false
) : DebugServerData {
val isDefault: Boolean = false
) {
internal companion object {
const val TABLE_NAME = "debug_server"
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,15 @@ import android.content.Context
import androidx.room.Database
import androidx.room.Room
import androidx.room.RoomDatabase
import androidx.room.TypeConverters
import com.redmadrobot.debug.plugin.servers.data.model.DebugServer
import com.redmadrobot.debug.plugin.servers.data.model.DebugStage

@Database(
entities = [DebugServer::class, DebugStage::class],
version = 2
entities = [DebugServer::class],
version = 3
)
@TypeConverters(DbConverters::class)
internal abstract class ServersPluginDatabase : RoomDatabase() {
abstract fun getDebugServersDao(): DebugServersDao

abstract fun getDebugStagesDao(): DebugStagesDao

companion object {
private const val DATABASE_NAME = "servers_plugin_db"

Expand Down

This file was deleted.

Loading
Loading