mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-11-27 23:19:02 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3513 from grummbeer/fix-shared-dialog-change-id

Browse Source 
fix. Mobile. Style of input on "changeID" dialog
This commit is contained in:
RustDesk 2023-03-05 11:14:07 +08:00 committed by GitHub
commit 9031f8cbd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
flutter/lib/common/widgets/dialog.dart
View File

@ -63,8 +63,9 @@ void changeIdDialog() {
final Iterable violations = rules.where((r) => !r.validate(newId));
if (violations.isNotEmpty) {
setState(() {
msg =
'${translate('Prompt')}: ${violations.map((r) => r.name).join(', ')}';
msg = isDesktop
? '${translate('Prompt')}: ${violations.map((r) => r.name).join(', ')}'
: violations.map((r) => r.name).join(', ');
});
return;
}
@ -87,7 +88,9 @@ void changeIdDialog() {
}
setState(() {
isInProgress = false;
msg = '${translate('Prompt')}: ${translate(status)}';
msg = isDesktop
? '${translate('Prompt')}: ${translate(status)}'
: translate(status);
});
}
@ -103,7 +106,7 @@ void changeIdDialog() {
TextField(
decoration: InputDecoration(
labelText: translate('Your new ID'),
border: const OutlineInputBorder(),
border: isDesktop ? const OutlineInputBorder() : null,
errorText: msg.isEmpty ? null : translate(msg),
suffixText: '${rxId.value.length}/16',
suffixStyle: const TextStyle(fontSize: 12, color: Colors.grey)),
@ -123,27 +126,26 @@ void changeIdDialog() {
const SizedBox(
height: 8.0,
),
Obx(() => Wrap(
runSpacing: 8,
spacing: 4,
children: rules.map((e) {
var checked = e.validate(rxId.value);
return Chip(
label: Text(
e.name,
style: TextStyle(
color: checked
? const Color(0xFF0A9471)
: Color.fromARGB(255, 198, 86, 157)),
),
backgroundColor: checked
? const Color(0xFFD0F7ED)
: Color.fromARGB(255, 247, 205, 232));
}).toList(),
)),
const SizedBox(
height: 8.0,
),
isDesktop
? Obx(() => Wrap(
runSpacing: 8,
spacing: 4,
children: rules.map((e) {
var checked = e.validate(rxId.value);
return Chip(
label: Text(
e.name,
style: TextStyle(
color: checked
? const Color(0xFF0A9471)
: Color.fromARGB(255, 198, 86, 157)),
),
backgroundColor: checked
? const Color(0xFFD0F7ED)
: Color.fromARGB(255, 247, 205, 232));
}).toList(),
)).marginOnly(bottom: 8)
: SizedBox.shrink(),
Offstage(
offstage: !isInProgress, child: const LinearProgressIndicator())
],