Changed several strings
This commit is contained in:
parent
bfcee03185
commit
3953f80940
6 changed files with 19 additions and 12 deletions
|
@ -66,7 +66,7 @@ class _ExpandingInputFabState extends State<ExpandingInputFab> {
|
|||
},
|
||||
splashRadius: 16,
|
||||
iconSize: 28,
|
||||
icon: _isExtended ? const Icon(Icons.close) : const Icon(Icons.search),
|
||||
icon: _isExtended ? const Icon(Icons.close) : const Icon(Icons.person_search),
|
||||
),
|
||||
)
|
||||
],
|
||||
|
|
|
@ -21,7 +21,7 @@ class _FriendsListAppBarState extends State<FriendsListAppBar> with AutomaticKee
|
|||
Widget build(BuildContext context) {
|
||||
super.build(context);
|
||||
return AppBar(
|
||||
title: const Text("recon"),
|
||||
title: const Text("OpenContacts"),
|
||||
actions: [
|
||||
Consumer<MessagingClient>(builder: (context, client, _) {
|
||||
return PopupMenuButton<OnlineStatus>(
|
||||
|
@ -85,7 +85,7 @@ class _FriendsListAppBarState extends State<FriendsListAppBar> with AutomaticKee
|
|||
},
|
||||
itemBuilder: (BuildContext context) => [
|
||||
MenuItemDefinition(
|
||||
name: "Find Users",
|
||||
name: "Add Users",
|
||||
icon: Icons.person_add,
|
||||
onTap: () async {
|
||||
final mClient = Provider.of<MessagingClient>(context, listen: false);
|
||||
|
|
|
@ -56,7 +56,7 @@ class _UserSearchState extends State<UserSearch> {
|
|||
final mClient = Provider.of<MessagingClient>(context, listen: false);
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: const Text("Find Users"),
|
||||
title: const Text("Add Users"),
|
||||
),
|
||||
body: SafeArea(
|
||||
top: false,
|
||||
|
|
|
@ -27,7 +27,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||
late final FocusNode _totpFocusNode;
|
||||
|
||||
bool _isLoading = false;
|
||||
bool _isUsernameEmail = false;
|
||||
bool _isEmailResetSend = false;
|
||||
String _error = "";
|
||||
bool _needsTotp = false;
|
||||
|
||||
|
@ -47,7 +47,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||
_totpFocusNode.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
RegExp emailReg = new RegExp(
|
||||
RegExp emailReg = RegExp(
|
||||
r"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$",
|
||||
|
||||
caseSensitive: false,
|
||||
|
@ -112,15 +112,22 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||
}
|
||||
}
|
||||
Future<void> passwordResetSubmit() async {
|
||||
if (_usernameController.text.contains(emailReg) || _passwordController.text.isEmpty) {
|
||||
if (_usernameController.text.isEmpty) {
|
||||
setState(() {
|
||||
_error = "Please provide an email on the 'Username' textbox";
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (_usernameController.text.contains(emailReg)) {
|
||||
setState(() {
|
||||
_error = "An email to reset your password has been requested to resonite.";
|
||||
_isEmailResetSend = true;
|
||||
});
|
||||
return;
|
||||
}
|
||||
setState(() {
|
||||
_error = "";
|
||||
_isLoading = false;
|
||||
_isEmailResetSend = true;
|
||||
});
|
||||
/*try {
|
||||
final authData = await ApiClient.tryLogin(
|
||||
|
@ -223,7 +230,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: const Text("recon"),
|
||||
title: const Text("OpenContacts"),
|
||||
),
|
||||
body: Builder(builder: (context) {
|
||||
return ListView(
|
||||
|
@ -292,7 +299,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 16),
|
||||
child: _isUsernameEmail
|
||||
child: _isEmailResetSend
|
||||
? const Center(child: CircularProgressIndicator())
|
||||
: TextButton.icon(
|
||||
onPressed: passwordResetSubmit,
|
||||
|
|
|
@ -95,7 +95,7 @@ class SettingsPage extends StatelessWidget {
|
|||
child: Image.asset("assets/images/logo512.png"),
|
||||
),
|
||||
),
|
||||
applicationLegalese: "Created by Nutcake with love <3",
|
||||
applicationLegalese: "ReCon by Nutcake, OpenContacts by ThatOneJackalGuy. Both apps made with <3",
|
||||
);
|
||||
},
|
||||
)
|
||||
|
|
|
@ -54,7 +54,7 @@ class UpdateNotifier extends StatelessWidget {
|
|||
.secondary
|
||||
),
|
||||
icon: const Icon(Icons.download),
|
||||
label: const Text("Get it on Github"),
|
||||
label: const Text("Get it on Forgejo"),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
Loading…
Reference in a new issue