Compare commits

...

3 Commits

Author SHA1 Message Date
a360f081f2 fixes 2025-06-29 19:21:38 +06:00
c954e2cf42 small fix 2025-05-25 13:09:18 +06:00
ffe0f3f33b small improvements 2025-05-16 09:18:31 +06:00
6 changed files with 47 additions and 21 deletions

View File

@@ -6,7 +6,9 @@ const val generateCentralSonatypeUploadingPartImports = """import java.nio.chars
import java.net.http.HttpClient import java.net.http.HttpClient
import java.net.http.HttpRequest import java.net.http.HttpRequest
import java.net.http.HttpResponse""" import java.net.http.HttpResponse"""
const val generateCentralSonatypeUploadingPart = """if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { const val generateCentralSonatypeUploadingPart = """// This script work based on https://ossrh-staging-api.central.sonatype.com/swagger-ui/#/default/manual_upload_repository
// and getting available open repos and just uploading them
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
def taskName = "uploadSonatypePublication" def taskName = "uploadSonatypePublication"
if (rootProject.tasks.names.contains(taskName) == false) { if (rootProject.tasks.names.contains(taskName) == false) {
rootProject.tasks.register(taskName) { rootProject.tasks.register(taskName) {
@@ -39,7 +41,7 @@ const val generateCentralSonatypeUploadingPart = """if ((project.hasProperty('SO
.build() .build()
def uploadResponse = client.send(uploadRequest, HttpResponse.BodyHandlers.ofString()) def uploadResponse = client.send(uploadRequest, HttpResponse.BodyHandlers.ofString())
if (uploadResponse.statusCode() != 200) { if (uploadResponse.statusCode() != 200) {
throw IllegalStateException("Faced error of uploading for repo with key ${"$"}it. Response: ${"$"}uploadResponse") throw new IllegalStateException("Faced error of uploading for repo with key ${"$"}it. Response: ${"$"}uploadResponse")
} }
} }
} }

View File

@@ -61,11 +61,11 @@ publishing {
""" }} """ }}
} }
} }
}
}
repositories { repositories {
${repositories.joinToString("\n ") { it.build(" ") }} ${repositories.joinToString("\n ") { it.build(" ") }}
} }
} }
}
}
${gpgSigning.generateMavenConfig()} ${gpgSigning.generateMavenConfig()}
""".trimIndent() """.trimIndent()

View File

@@ -58,11 +58,11 @@ publishing {
""" }} """ }}
} }
} }
}
}
repositories { repositories {
${repositories.joinToString("\n ") { it.build(" ") }} ${repositories.joinToString("\n ") { it.build(" ") }}
} }
} }
}
}
${gpgSigning.generateMavenConfig()} ${gpgSigning.generateMavenConfig()}
""".trimIndent() """.trimIndent()

View File

@@ -42,10 +42,10 @@ publishing {
}""" }} }""" }}
} }
} }
}
repositories { repositories {
${repositories.joinToString("\n ") { it.build(" ") }} ${repositories.joinToString("\n ") { it.build(" ") }}
} }
} }
}
${gpgSigning.generateMavenConfig()} ${gpgSigning.generateMavenConfig()}
""".trimIndent() """.trimIndent()

View File

@@ -1,11 +1,18 @@
package dev.inmo.kmppscriptbuilder.core.ui package dev.inmo.kmppscriptbuilder.core.ui
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.Button import androidx.compose.material.Button
import androidx.compose.material.Divider import androidx.compose.material.Divider
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import dev.inmo.kmppscriptbuilder.core.ui.utils.CommonText import dev.inmo.kmppscriptbuilder.core.ui.utils.CommonText
import dev.inmo.kmppscriptbuilder.core.ui.utils.CommonTextField import dev.inmo.kmppscriptbuilder.core.ui.utils.CommonTextField
@@ -14,13 +21,26 @@ import dev.inmo.kmppscriptbuilder.core.ui.utils.Drawer
actual object LicensesDrawer : Drawer<LicensesView> { actual object LicensesDrawer : Drawer<LicensesView> {
@Composable @Composable
override fun LicensesView.draw() { override fun LicensesView.draw() {
val internalFocusState = remember { mutableStateOf(false) }
if (searchFieldFocused.value || internalFocusState.value) {
}
Column(
Modifier
.let {
if (searchFieldFocused.value) { if (searchFieldFocused.value) {
Column { it.heightIn(max = 128.dp)
} else {
it.height(0.dp)
}
}
.verticalScroll(rememberScrollState())
) {
licensesOffersToShow.value.forEach { licensesOffersToShow.value.forEach {
Column(Modifier.padding(16.dp, 8.dp, 8.dp, 8.dp)) { Column(Modifier.padding(16.dp, 8.dp, 8.dp, 8.dp)) {
CommonText(it.title) { CommonText(it.title) {
itemsList.add(it.toLicenseState()) itemsList.add(it.toLicenseState())
licenseSearchFilter = "" licenseSearchFilter = ""
internalFocusState.value = false
} }
Divider() Divider()
} }
@@ -28,4 +48,3 @@ actual object LicensesDrawer : Drawer<LicensesView> {
} }
} }
} }
}

View File

@@ -12,6 +12,7 @@ import androidx.compose.material.Divider
import androidx.compose.material.OutlinedTextField import androidx.compose.material.OutlinedTextField
import androidx.compose.material.Switch import androidx.compose.material.Switch
import androidx.compose.material.Text import androidx.compose.material.Text
import androidx.compose.material.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
@@ -73,7 +74,11 @@ actual fun CommonTextField(
@Composable @Composable
actual fun CommonText(text: String, onClick: (() -> Unit)?) { actual fun CommonText(text: String, onClick: (() -> Unit)?) {
Text(text, modifier = Modifier.run { onClick ?.let { clickable(onClick = it) } ?: this }) onClick ?.let {
TextButton(it) {
Text(text)
}
} ?: Text(text)
} }
@Composable @Composable