clean up verify page
This commit is contained in:
parent
ceb765e805
commit
7001796343
2 changed files with 8 additions and 91 deletions
|
|
@ -3,7 +3,6 @@ import "package:flutter_hooks/flutter_hooks.dart";
|
||||||
import "package:hooks_riverpod/hooks_riverpod.dart";
|
import "package:hooks_riverpod/hooks_riverpod.dart";
|
||||||
import "package:nexus/controllers/client_controller.dart";
|
import "package:nexus/controllers/client_controller.dart";
|
||||||
import "package:nexus/widgets/appbar.dart";
|
import "package:nexus/widgets/appbar.dart";
|
||||||
import "package:nexus/widgets/form_text_input.dart";
|
|
||||||
|
|
||||||
class VerifyPage extends HookConsumerWidget {
|
class VerifyPage extends HookConsumerWidget {
|
||||||
const VerifyPage({super.key});
|
const VerifyPage({super.key});
|
||||||
|
|
@ -11,7 +10,8 @@ class VerifyPage extends HookConsumerWidget {
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
final passphraseController = useTextEditingController();
|
final passphraseController = useTextEditingController();
|
||||||
final isVerifying = useState(false);
|
final isLoading = useState(false);
|
||||||
|
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: Appbar(),
|
appBar: Appbar(),
|
||||||
body: AlertDialog(
|
body: AlertDialog(
|
||||||
|
|
@ -24,19 +24,17 @@ class VerifyPage extends HookConsumerWidget {
|
||||||
"Enter your recovery key or passphrase below to unlock encrypted events.\nYour passphrase is usually not the same as your password.",
|
"Enter your recovery key or passphrase below to unlock encrypted events.\nYour passphrase is usually not the same as your password.",
|
||||||
),
|
),
|
||||||
SizedBox(height: 12),
|
SizedBox(height: 12),
|
||||||
FormTextInput(
|
TextField(
|
||||||
required: false,
|
|
||||||
autofocus: true,
|
autofocus: true,
|
||||||
capitalize: true,
|
|
||||||
controller: passphraseController,
|
controller: passphraseController,
|
||||||
obscure: true,
|
obscureText: true,
|
||||||
title: "Recovery Key or Passphrase",
|
decoration: .new(label: Text("Recovery Key or Passphrase")),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
actions: [
|
actions: [
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: isVerifying.value
|
onPressed: isLoading.value
|
||||||
? null
|
? null
|
||||||
: () async {
|
: () async {
|
||||||
final scaffoldMessenger = ScaffoldMessenger.of(context);
|
final scaffoldMessenger = ScaffoldMessenger.of(context);
|
||||||
|
|
@ -49,7 +47,7 @@ class VerifyPage extends HookConsumerWidget {
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
isVerifying.value = true;
|
isLoading.value = true;
|
||||||
|
|
||||||
final error = await ref
|
final error = await ref
|
||||||
.watch(ClientController.provider.notifier)
|
.watch(ClientController.provider.notifier)
|
||||||
|
|
@ -57,7 +55,7 @@ class VerifyPage extends HookConsumerWidget {
|
||||||
|
|
||||||
snackbar.close();
|
snackbar.close();
|
||||||
if (error != null) {
|
if (error != null) {
|
||||||
isVerifying.value = false;
|
isLoading.value = false;
|
||||||
if (context.mounted) {
|
if (context.mounted) {
|
||||||
scaffoldMessenger.showSnackBar(
|
scaffoldMessenger.showSnackBar(
|
||||||
.new(
|
.new(
|
||||||
|
|
|
||||||
|
|
@ -1,81 +0,0 @@
|
||||||
import "package:flutter/material.dart";
|
|
||||||
import "package:flutter/services.dart";
|
|
||||||
|
|
||||||
class FormTextInput extends StatelessWidget {
|
|
||||||
final List<String? Function(String value)> extraValidators;
|
|
||||||
final TextEditingController? controller;
|
|
||||||
final TextInputType keyboardType;
|
|
||||||
final String? initialValue;
|
|
||||||
final bool readOnly;
|
|
||||||
final bool obscure;
|
|
||||||
final String? title;
|
|
||||||
final int? minLines;
|
|
||||||
final int? maxLength;
|
|
||||||
final bool outlined;
|
|
||||||
final int? maxLines;
|
|
||||||
final bool capitalize;
|
|
||||||
final bool required;
|
|
||||||
final bool autocorrect;
|
|
||||||
final void Function()? onTap;
|
|
||||||
final Widget? trailing;
|
|
||||||
final InputBorder? border;
|
|
||||||
final List<TextInputFormatter>? formatters;
|
|
||||||
final bool autofocus;
|
|
||||||
|
|
||||||
const FormTextInput({
|
|
||||||
super.key,
|
|
||||||
this.border,
|
|
||||||
this.controller,
|
|
||||||
this.autofocus = false,
|
|
||||||
this.title,
|
|
||||||
this.obscure = false,
|
|
||||||
this.readOnly = false,
|
|
||||||
this.extraValidators = const [],
|
|
||||||
this.keyboardType = TextInputType.text,
|
|
||||||
this.initialValue,
|
|
||||||
this.minLines,
|
|
||||||
this.capitalize = false,
|
|
||||||
this.maxLength,
|
|
||||||
this.formatters,
|
|
||||||
this.maxLines = 1,
|
|
||||||
this.outlined = true,
|
|
||||||
this.trailing,
|
|
||||||
this.onTap,
|
|
||||||
this.autocorrect = true,
|
|
||||||
this.required = true,
|
|
||||||
});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) => TextFormField(
|
|
||||||
autofocus: autofocus,
|
|
||||||
controller: controller,
|
|
||||||
keyboardType: keyboardType,
|
|
||||||
readOnly: readOnly,
|
|
||||||
minLines: minLines,
|
|
||||||
maxLines: maxLines,
|
|
||||||
maxLength: maxLength,
|
|
||||||
inputFormatters: formatters,
|
|
||||||
textCapitalization: capitalize ? .sentences : .none,
|
|
||||||
initialValue: initialValue,
|
|
||||||
autocorrect: autocorrect,
|
|
||||||
obscureText: obscure,
|
|
||||||
onTap: onTap,
|
|
||||||
decoration: .new(
|
|
||||||
labelText: title,
|
|
||||||
border: border ?? (outlined ? null : const UnderlineInputBorder()),
|
|
||||||
suffixIcon: trailing,
|
|
||||||
),
|
|
||||||
validator: (value) {
|
|
||||||
if ((value?.isEmpty ?? true) && required) {
|
|
||||||
return "This field is required";
|
|
||||||
}
|
|
||||||
|
|
||||||
for (final validator in extraValidators) {
|
|
||||||
final reason = validator(value!);
|
|
||||||
if (reason != null) return reason;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue