From 8b6f5bc00c403fbae2e2facfd75f7db370f42c45 Mon Sep 17 00:00:00 2001 From: Mrdabup Date: Tue, 30 Jul 2024 14:54:38 -0400 Subject: [PATCH] Fixed several issues --- lib/models/session.dart | 2 ++ lib/widgets/friends/user_profile_dialog.dart | 13 ------------- lib/widgets/login_screen.dart | 8 -------- lib/widgets/my_profile_dialog.dart | 1 + lib/widgets/sessions/session_list.dart | 4 ++-- lib/widgets/update_notifier.dart | 2 +- 6 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 lib/widgets/friends/user_profile_dialog.dart diff --git a/lib/models/session.dart b/lib/models/session.dart index 9af34f6..0acb528 100644 --- a/lib/models/session.dart +++ b/lib/models/session.dart @@ -131,6 +131,7 @@ class Session { enum SessionAccessLevel { unknown, private, + lan, contacts, contactsPlus, registeredUsers, @@ -139,6 +140,7 @@ enum SessionAccessLevel { static const _readableNamesMap = { SessionAccessLevel.unknown: "Unknown", SessionAccessLevel.private: "Private", + SessionAccessLevel.lan: "LAN", SessionAccessLevel.contacts: "Contacts only", SessionAccessLevel.contactsPlus: "Contacts+", SessionAccessLevel.registeredUsers: "Registered users", diff --git a/lib/widgets/friends/user_profile_dialog.dart b/lib/widgets/friends/user_profile_dialog.dart deleted file mode 100644 index 30de2f5..0000000 --- a/lib/widgets/friends/user_profile_dialog.dart +++ /dev/null @@ -1,13 +0,0 @@ -import 'package:OpenContacts/widgets/my_profile_dialog.dart'; -import 'package:flutter/material.dart'; -import 'package:intl/intl.dart'; -import 'package:OpenContacts/apis/contact_api.dart'; -import 'package:OpenContacts/models/users/friend.dart'; -import 'package:OpenContacts/models/users/online_status.dart'; -import 'package:OpenContacts/widgets/generic_avatar.dart'; -import 'package:OpenContacts/widgets/default_error_widget.dart'; -import 'package:OpenContacts/auxiliary.dart'; -import 'package:OpenContacts/models/users/user_status.dart'; - -// Will do this later - diff --git a/lib/widgets/login_screen.dart b/lib/widgets/login_screen.dart index 6140183..621312a 100644 --- a/lib/widgets/login_screen.dart +++ b/lib/widgets/login_screen.dart @@ -27,7 +27,6 @@ class _LoginScreenState extends State { late final FocusNode _totpFocusNode; bool _isLoading = false; - bool _isEmailResetSend = false; String _error = ""; bool _needsTotp = false; @@ -47,13 +46,6 @@ class _LoginScreenState extends State { _totpFocusNode.dispose(); super.dispose(); } - RegExp emailReg = RegExp( - r"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$", - - caseSensitive: false, - multiLine: false, - - ); Future submit() async { if (_usernameController.text.isEmpty || _passwordController.text.isEmpty) { diff --git a/lib/widgets/my_profile_dialog.dart b/lib/widgets/my_profile_dialog.dart index 4fde49e..9d79318 100644 --- a/lib/widgets/my_profile_dialog.dart +++ b/lib/widgets/my_profile_dialog.dart @@ -6,6 +6,7 @@ import 'package:OpenContacts/client_holder.dart'; import 'package:OpenContacts/models/personal_profile.dart'; import 'package:OpenContacts/widgets/default_error_widget.dart'; import 'package:OpenContacts/widgets/generic_avatar.dart'; +import 'package:OpenContacts/models/users/friend.dart'; class MyProfileDialog extends StatefulWidget { const MyProfileDialog({super.key}); diff --git a/lib/widgets/sessions/session_list.dart b/lib/widgets/sessions/session_list.dart index e72c97e..87fa846 100644 --- a/lib/widgets/sessions/session_list.dart +++ b/lib/widgets/sessions/session_list.dart @@ -132,7 +132,7 @@ class _SessionListState extends State with AutomaticKeepAliveClient ], ), const SizedBox( - height: 4, + height: 2, ), Row( children: [ @@ -149,7 +149,7 @@ class _SessionListState extends State with AutomaticKeepAliveClient ], ), const SizedBox( - height: 4, + height: 2, ), Row( children: [ diff --git a/lib/widgets/update_notifier.dart b/lib/widgets/update_notifier.dart index f07ad32..c0f5fc5 100644 --- a/lib/widgets/update_notifier.dart +++ b/lib/widgets/update_notifier.dart @@ -38,7 +38,7 @@ class UpdateNotifier extends StatelessWidget { children: [ TextButton.icon( onPressed: () { - launchUrl(Uri.parse("https://github.com/Nutcake/recon/releases/latest"), + launchUrl(Uri.parse("https://git.mrdab.vore.media/ThatOneJackalGuy/OpenContacts/releases/latest"), mode: LaunchMode.externalApplication, ); },