Matte23/circolapp
1
0
Fork 0
mirror of https://github.com/Matte23/circolapp.git synced 2025-12-06 07:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add function getServerById to shared module and format code

Browse Source
This commit is contained in:
Matteo Schiff
2020-11-30 12:00:36 +01:00
parent 56c98db0b8
commit 48ee2c3c89
6 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/net/underdesk/circolapp/server/AndroidServerApi.kt
View File

@@ -19,7 +19,7 @@ object AndroidServerApi {
val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
val serverID = sharedPreferences.getString("school", "0")?.toInt() ?: 0 val serverID = sharedPreferences.getString("school", "0")?.toInt() ?: 0
val server = ServerAPI.Companion.Servers.values()[serverID] val server = ServerAPI.getServer(serverID)
return instance ?: synchronized(this) { return instance ?: synchronized(this) {
instance ?: ServerAPI(ServerAPI.createServer(server)).also { instance = it } instance ?: ServerAPI(ServerAPI.createServer(server)).also { instance = it }

2
shared/build.gradle.kts
View File

@@ -38,7 +38,7 @@ kotlin {
frameworkName = "Shared" frameworkName = "Shared"
pod ("HTMLKit", "~> 3.1.0") pod("HTMLKit", "~> 3.1.0")
} }
sourceSets { sourceSets {

4
shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/server/ServerAPI.kt
View File

@@ -54,6 +54,10 @@ class ServerAPI(
SUCCESS, ERROR SUCCESS, ERROR
} }
fun getServer(serverID: Int): Servers {
return Servers.values()[serverID]
}
fun getServerId(server: Servers): Int { fun getServerId(server: Servers): Int {
return Servers.values().indexOf(server) return Servers.values().indexOf(server)
} }

2
shared/src/iosMain/kotlin/net/underdesk/circolapp/shared/server/curie/SpecificCurieServer.kt
View File

@@ -12,7 +12,7 @@ actual class SpecificCurieServer actual constructor(private val curieServer: Cur
val list = ArrayList<Circular>() val list = ArrayList<Circular>()
htmlList?.forEach { element -> htmlList?.forEach { element ->
if (element.parentElement?.parentElement?.parentElement?.tagName == "li") { if (element.parentElement?.parentElement?.parentElement?.tagName == "li") {
list.last().attachmentsNames.add(element.textContent) list.last().attachmentsNames.add(element.textContent)
list.last().attachmentsUrls.add(element.attributes.objectForKey("href").toString()) list.last().attachmentsUrls.add(element.attributes.objectForKey("href").toString())
} else { } else {