manager: fix update button

This commit is contained in:
weishu
2023-06-22 19:29:37 +08:00
parent 07273b6971
commit 303a3a8482
2 changed files with 8 additions and 2 deletions

View File

@@ -9,6 +9,7 @@ import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Add
@@ -355,8 +356,13 @@ private fun ModuleItem(
Spacer(modifier = Modifier.weight(1f, true)) Spacer(modifier = Modifier.weight(1f, true))
if (updateUrl.isNotEmpty()) { if (updateUrl.isNotEmpty()) {
TextButton( Button(
modifier = Modifier
.padding(0.dp)
.defaultMinSize(48.dp, 32.dp),
onClick = { onUpdate(module) }, onClick = { onUpdate(module) },
shape = RoundedCornerShape(6.dp),
contentPadding = PaddingValues(0.dp)
) { ) {
Text( Text(
fontFamily = MaterialTheme.typography.labelMedium.fontFamily, fontFamily = MaterialTheme.typography.labelMedium.fontFamily,

View File

@@ -149,7 +149,7 @@ class ModuleViewModel : ViewModel() {
val versionCode = updateJson.optInt("versionCode", 0) val versionCode = updateJson.optInt("versionCode", 0)
val zipUrl = updateJson.optString("zipUrl", "") val zipUrl = updateJson.optString("zipUrl", "")
val changelog = updateJson.optString("changelog", "") val changelog = updateJson.optString("changelog", "")
if (versionCode < m.versionCode || zipUrl.isEmpty()) { if (versionCode <= m.versionCode || zipUrl.isEmpty()) {
callback(null) callback(null)
return@launch return@launch
} }