mirror of
https://gitlab.com/famedly/fluffychat.git
synced 2024-11-08 04:59:29 +01:00
Merge branch 'krille/redesignbootstrap' into 'main'
design: Redesign and simplify bootstrap See merge request famedly/fluffychat!561
This commit is contained in:
commit
b76b02325a
@ -2612,5 +2612,7 @@
|
|||||||
"removeFromSpaceDescription": "This removes this chat from the current space. It will then still be visible under \"All chats\".",
|
"removeFromSpaceDescription": "This removes this chat from the current space. It will then still be visible under \"All chats\".",
|
||||||
"addToSpaceDescription": "Select a space to add this chat to it.",
|
"addToSpaceDescription": "Select a space to add this chat to it.",
|
||||||
"start": "Start",
|
"start": "Start",
|
||||||
"setupChatBackupNow": "Set up your chat backup now"
|
"setupChatBackupNow": "Set up your chat backup now",
|
||||||
|
"pleaseEnterSecurityKeyDescription": "To unlock your chat backup, please enter your security key that has been generated in a previous session. Your security key is NOT your password.",
|
||||||
|
"saveTheSecurityKeyNow": "Save the security key now"
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
|
||||||
|
|
||||||
import 'package:adaptive_dialog/adaptive_dialog.dart';
|
import 'package:adaptive_dialog/adaptive_dialog.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
||||||
@ -8,6 +7,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart';
|
|||||||
import 'package:matrix/encryption.dart';
|
import 'package:matrix/encryption.dart';
|
||||||
import 'package:matrix/encryption/utils/bootstrap.dart';
|
import 'package:matrix/encryption/utils/bootstrap.dart';
|
||||||
import 'package:matrix/matrix.dart';
|
import 'package:matrix/matrix.dart';
|
||||||
|
import 'package:share/share.dart';
|
||||||
|
|
||||||
import 'package:fluffychat/config/themes.dart';
|
import 'package:fluffychat/config/themes.dart';
|
||||||
import 'package:fluffychat/utils/platform_infos.dart';
|
import 'package:fluffychat/utils/platform_infos.dart';
|
||||||
@ -54,6 +54,7 @@ class _BootstrapDialogState extends State<BootstrapDialog> {
|
|||||||
String titleText;
|
String titleText;
|
||||||
|
|
||||||
bool _recoveryKeyStored = false;
|
bool _recoveryKeyStored = false;
|
||||||
|
bool _recoveryKeyCopied = false;
|
||||||
|
|
||||||
bool _wipe;
|
bool _wipe;
|
||||||
|
|
||||||
@ -100,6 +101,15 @@ class _BootstrapDialogState extends State<BootstrapDialog> {
|
|||||||
child: ListView(
|
child: ListView(
|
||||||
padding: const EdgeInsets.all(16.0),
|
padding: const EdgeInsets.all(16.0),
|
||||||
children: [
|
children: [
|
||||||
|
Text(
|
||||||
|
L10n.of(context).chatBackupDescription,
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: const TextStyle(
|
||||||
|
fontSize: 16,
|
||||||
|
fontStyle: FontStyle.italic,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const Divider(height: 64),
|
||||||
TextField(
|
TextField(
|
||||||
minLines: 4,
|
minLines: 4,
|
||||||
maxLines: 4,
|
maxLines: 4,
|
||||||
@ -108,9 +118,12 @@ class _BootstrapDialogState extends State<BootstrapDialog> {
|
|||||||
),
|
),
|
||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
ElevatedButton.icon(
|
ElevatedButton.icon(
|
||||||
icon: const Icon(Icons.copy_outlined),
|
icon: const Icon(Icons.save_alt_outlined),
|
||||||
label: Text(L10n.of(context).copyToClipboard),
|
label: Text(L10n.of(context).saveTheSecurityKeyNow),
|
||||||
onPressed: () => Clipboard.setData(ClipboardData(text: key)),
|
onPressed: () {
|
||||||
|
Share.share(key);
|
||||||
|
setState(() => _recoveryKeyCopied = true);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
ElevatedButton.icon(
|
ElevatedButton.icon(
|
||||||
@ -119,8 +132,10 @@ class _BootstrapDialogState extends State<BootstrapDialog> {
|
|||||||
onPrimary: Theme.of(context).primaryColor,
|
onPrimary: Theme.of(context).primaryColor,
|
||||||
),
|
),
|
||||||
icon: const Icon(Icons.check_outlined),
|
icon: const Icon(Icons.check_outlined),
|
||||||
label: Text(L10n.of(context).iWroteDownTheKey),
|
label: Text(L10n.of(context).next),
|
||||||
onPressed: () => setState(() => _recoveryKeyStored = true),
|
onPressed: _recoveryKeyCopied
|
||||||
|
? () => setState(() => _recoveryKeyStored = true)
|
||||||
|
: null,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@ -175,13 +190,17 @@ class _BootstrapDialogState extends State<BootstrapDialog> {
|
|||||||
padding: const EdgeInsets.all(16.0),
|
padding: const EdgeInsets.all(16.0),
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
L10n.of(context).setupChatBackupDescription,
|
L10n.of(context).pleaseEnterSecurityKeyDescription,
|
||||||
textAlign: TextAlign.center,
|
textAlign: TextAlign.center,
|
||||||
|
style: const TextStyle(
|
||||||
|
fontSize: 16,
|
||||||
|
fontStyle: FontStyle.italic,
|
||||||
),
|
),
|
||||||
const SizedBox(height: 16),
|
),
|
||||||
|
const Divider(height: 64),
|
||||||
TextField(
|
TextField(
|
||||||
minLines: 4,
|
minLines: 1,
|
||||||
maxLines: 4,
|
maxLines: 1,
|
||||||
autocorrect: false,
|
autocorrect: false,
|
||||||
readOnly: _recoveryKeyInputLoading,
|
readOnly: _recoveryKeyInputLoading,
|
||||||
autofillHints: _recoveryKeyInputLoading
|
autofillHints: _recoveryKeyInputLoading
|
||||||
@ -229,7 +248,7 @@ class _BootstrapDialogState extends State<BootstrapDialog> {
|
|||||||
() => _recoveryKeyInputLoading = false);
|
() => _recoveryKeyInputLoading = false);
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
const SizedBox(height: 16),
|
const SizedBox(height: 32),
|
||||||
Row(children: [
|
Row(children: [
|
||||||
const Expanded(child: Divider()),
|
const Expanded(child: Divider()),
|
||||||
Padding(
|
Padding(
|
||||||
@ -238,14 +257,13 @@ class _BootstrapDialogState extends State<BootstrapDialog> {
|
|||||||
),
|
),
|
||||||
const Expanded(child: Divider()),
|
const Expanded(child: Divider()),
|
||||||
]),
|
]),
|
||||||
const SizedBox(height: 16),
|
const SizedBox(height: 32),
|
||||||
ElevatedButton.icon(
|
ElevatedButton.icon(
|
||||||
style: ElevatedButton.styleFrom(
|
style: ElevatedButton.styleFrom(
|
||||||
primary: Theme.of(context).secondaryHeaderColor,
|
primary: Theme.of(context).secondaryHeaderColor,
|
||||||
onPrimary: Theme.of(context).primaryColor,
|
onPrimary: Theme.of(context).primaryColor,
|
||||||
),
|
),
|
||||||
icon:
|
icon: const Icon(Icons.cast_connected_outlined),
|
||||||
const Icon(Icons.transfer_within_a_station_outlined),
|
|
||||||
label: Text(L10n.of(context).transferFromAnotherDevice),
|
label: Text(L10n.of(context).transferFromAnotherDevice),
|
||||||
onPressed: _recoveryKeyInputLoading
|
onPressed: _recoveryKeyInputLoading
|
||||||
? null
|
? null
|
||||||
|
Loading…
Reference in New Issue
Block a user