diff --git a/lib/widgets/friends/expanding_input_fab.dart b/lib/widgets/friends/expanding_input_fab.dart index fffd932..dff6a41 100644 --- a/lib/widgets/friends/expanding_input_fab.dart +++ b/lib/widgets/friends/expanding_input_fab.dart @@ -66,7 +66,7 @@ class _ExpandingInputFabState extends State { }, 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), ), ) ], diff --git a/lib/widgets/friends/friends_list_app_bar.dart b/lib/widgets/friends/friends_list_app_bar.dart index 245c3ba..f2ac86a 100644 --- a/lib/widgets/friends/friends_list_app_bar.dart +++ b/lib/widgets/friends/friends_list_app_bar.dart @@ -21,7 +21,7 @@ class _FriendsListAppBarState extends State with AutomaticKee Widget build(BuildContext context) { super.build(context); return AppBar( - title: const Text("recon"), + title: const Text("OpenContacts"), actions: [ Consumer(builder: (context, client, _) { return PopupMenuButton( @@ -85,7 +85,7 @@ class _FriendsListAppBarState extends State with AutomaticKee }, itemBuilder: (BuildContext context) => [ MenuItemDefinition( - name: "Find Users", + name: "Add Users", icon: Icons.person_add, onTap: () async { final mClient = Provider.of(context, listen: false); diff --git a/lib/widgets/friends/user_search.dart b/lib/widgets/friends/user_search.dart index dc374a8..d22f563 100644 --- a/lib/widgets/friends/user_search.dart +++ b/lib/widgets/friends/user_search.dart @@ -56,7 +56,7 @@ class _UserSearchState extends State { final mClient = Provider.of(context, listen: false); return Scaffold( appBar: AppBar( - title: const Text("Find Users"), + title: const Text("Add Users"), ), body: SafeArea( top: false, diff --git a/lib/widgets/login_screen.dart b/lib/widgets/login_screen.dart index c2f1137..a0bd481 100644 --- a/lib/widgets/login_screen.dart +++ b/lib/widgets/login_screen.dart @@ -27,7 +27,7 @@ class _LoginScreenState extends State { 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 { _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 { } } Future 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 { 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 { ), Padding( padding: const EdgeInsets.only(top: 16), - child: _isUsernameEmail + child: _isEmailResetSend ? const Center(child: CircularProgressIndicator()) : TextButton.icon( onPressed: passwordResetSubmit, diff --git a/lib/widgets/settings_page.dart b/lib/widgets/settings_page.dart index e16e07f..dcc18f3 100644 --- a/lib/widgets/settings_page.dart +++ b/lib/widgets/settings_page.dart @@ -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", ); }, ) diff --git a/lib/widgets/update_notifier.dart b/lib/widgets/update_notifier.dart index 7080f03..f07ad32 100644 --- a/lib/widgets/update_notifier.dart +++ b/lib/widgets/update_notifier.dart @@ -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"), ), ], ),