Skip to content

Commit 9f5835b

Browse files
committed
refactor: move custom geodata URL dialog to window level
1 parent 0719dc7 commit 9f5835b

1 file changed

Lines changed: 37 additions & 32 deletions

File tree

app/src/main/kotlin/features/resources/ResourceFileComponents.kt

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ import top.yukonga.miuix.kmp.icon.extended.Delete
4848
import top.yukonga.miuix.kmp.icon.extended.Edit
4949
import top.yukonga.miuix.kmp.icon.extended.Replace
5050
import top.yukonga.miuix.kmp.icon.extended.Reset
51-
import top.yukonga.miuix.kmp.overlay.OverlayDialog
5251
import top.yukonga.miuix.kmp.preference.ArrowPreference
5352
import top.yukonga.miuix.kmp.preference.OverlaySpinnerPreference
5453
import top.yukonga.miuix.kmp.theme.MiuixTheme
@@ -155,44 +154,50 @@ private fun CustomResourceFileSourceDialog(
155154
onDismissRequest: () -> Unit,
156155
onSave: () -> Unit,
157156
) {
158-
OverlayDialog(
157+
WindowDialog(
159158
show = show,
160159
title = stringResource(R.string.settings_resource_files_source_custom_title),
161160
onDismissRequest = onDismissRequest,
162161
content = {
163-
TextField(
164-
state = geoIpUrlState,
165-
label = ResourceFileGeoIpName,
166-
lineLimits = TextFieldLineLimits.SingleLine,
167-
modifier = Modifier.padding(bottom = 12.dp),
168-
)
169-
TextField(
170-
state = geoSiteUrlState,
171-
label = ResourceFileGeoSiteName,
172-
lineLimits = TextFieldLineLimits.SingleLine,
173-
modifier = Modifier.padding(bottom = 12.dp),
174-
)
175-
TextField(
176-
state = geoIpOnlyCnPrivateUrlState,
177-
label = ResourceFileGeoIpOnlyCnPrivateName,
178-
lineLimits = TextFieldLineLimits.SingleLine,
179-
modifier = Modifier.padding(bottom = 16.dp),
180-
)
181-
Row(
182-
modifier = Modifier.fillMaxWidth(),
183-
horizontalArrangement = Arrangement.SpaceBetween,
162+
Column(
163+
modifier = Modifier
164+
.fillMaxWidth()
165+
.verticalScroll(rememberScrollState()),
184166
) {
185-
TextButton(
186-
text = stringResource(R.string.common_cancel),
187-
onClick = onDismissRequest,
188-
modifier = Modifier.weight(1f),
167+
TextField(
168+
state = geoIpUrlState,
169+
label = ResourceFileGeoIpName,
170+
lineLimits = TextFieldLineLimits.SingleLine,
171+
modifier = Modifier.fillMaxWidth().padding(bottom = 12.dp),
172+
)
173+
TextField(
174+
state = geoSiteUrlState,
175+
label = ResourceFileGeoSiteName,
176+
lineLimits = TextFieldLineLimits.SingleLine,
177+
modifier = Modifier.fillMaxWidth().padding(bottom = 12.dp),
189178
)
190-
Spacer(Modifier.width(20.dp))
191-
TextButton(
192-
text = stringResource(R.string.common_save),
193-
onClick = onSave,
194-
modifier = Modifier.weight(1f),
179+
TextField(
180+
state = geoIpOnlyCnPrivateUrlState,
181+
label = ResourceFileGeoIpOnlyCnPrivateName,
182+
lineLimits = TextFieldLineLimits.SingleLine,
183+
modifier = Modifier.fillMaxWidth().padding(bottom = 16.dp),
195184
)
185+
Row(
186+
modifier = Modifier.fillMaxWidth(),
187+
horizontalArrangement = Arrangement.SpaceBetween,
188+
) {
189+
TextButton(
190+
text = stringResource(R.string.common_cancel),
191+
onClick = onDismissRequest,
192+
modifier = Modifier.weight(1f),
193+
)
194+
Spacer(Modifier.width(20.dp))
195+
TextButton(
196+
text = stringResource(R.string.common_save),
197+
onClick = onSave,
198+
modifier = Modifier.weight(1f),
199+
)
200+
}
196201
}
197202
},
198203
)

0 commit comments

Comments
 (0)