Merge pull request #259 from atsign-foundation/feat/follow-check

feat: validate atSign before follow and migrate to flutter 3.10

Author: sonle-geekyants

android/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.jetifier.blacklist=moshi-1.13.0
+android.jetifier.ignorelist=moshi-1.13.0

lib/app.dart

@@ -16,7 +16,6 @@ import 'package:at_wavi_app/view_models/user_preview.dart';
 import 'package:at_wavi_app/view_models/user_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
-import 'package:internet_connection_checker/internet_connection_checker.dart';
 import 'package:provider/provider.dart';
 
 import 'desktop/routes/desktop_routes.dart';

lib/common_components/custom_card.dart

@@ -12,8 +12,7 @@ class CustomCard extends StatelessWidget {
   final bool isUrl;
   final String? url;
   final bool isEmail;
-  late bool _isDark;
-  late ThemeData themeData;
+  final ThemeData themeData;
   CustomCard(
       {this.title,
       this.isEmail = false,
@@ -22,13 +21,8 @@ class CustomCard extends StatelessWidget {
       this.isUrl = false,
       required this.themeData});
 
-  void setThemeData(BuildContext context) {
-    _isDark = themeData.scaffoldBackgroundColor == ColorConstants.black;
-  }
-
   @override
   Widget build(BuildContext context) {
-    setThemeData(context);
     return Container(
       color: themeData.backgroundColor,
       child: Padding(

lib/common_components/custom_media_card.dart

@@ -3,7 +3,6 @@ import 'dart:typed_data';
 
 import 'package:at_wavi_app/model/user.dart';
 import 'package:at_wavi_app/utils/at_enum.dart';
-import 'package:at_wavi_app/utils/colors.dart';
 import 'package:at_wavi_app/utils/text_styles.dart';
 import 'package:flutter/material.dart';
 import 'package:youtube_player_flutter/youtube_player_flutter.dart';
@@ -18,14 +17,10 @@ class CustomMediaCard extends StatefulWidget {
 }
 
 class _CustomMediaCardState extends State<CustomMediaCard> {
-  late bool _isDark, _isImage = false, _isVideo = false;
+  late bool _isImage = false, _isVideo = false;
   Uint8List? customImage;
   late YoutubePlayerController _controller;
 
-  void setThemeData(BuildContext context) {
-    _isDark = widget.themeData.scaffoldBackgroundColor == ColorConstants.black;
-  }
-
   @override
   void initState() {
     if (widget.basicData.type == CustomContentType.Image.name) {
@@ -55,7 +50,6 @@ class _CustomMediaCardState extends State<CustomMediaCard> {
 
   @override
   Widget build(BuildContext context) {
-    setThemeData(context);
     return Container(
       color: widget.themeData.backgroundColor,
       child: Padding(

lib/common_components/media_content_edit_card.dart

@@ -4,7 +4,6 @@ import 'package:at_wavi_app/model/user.dart';
 import 'package:at_wavi_app/utils/colors.dart';
 import 'package:at_wavi_app/utils/text_styles.dart';
 import 'package:flutter/material.dart';
-import 'package:at_wavi_app/services/size_config.dart';
 
 class MediaContentEditCard extends StatefulWidget {
   final BasicData basicData;

lib/common_components/public_private_bottomsheet.dart

@@ -1,6 +1,5 @@
 import 'package:at_wavi_app/services/nav_service.dart';
 import 'package:at_wavi_app/services/size_config.dart';
-import 'package:at_wavi_app/utils/colors.dart';
 import 'package:at_wavi_app/utils/text_styles.dart';
 import 'package:flutter/material.dart';
 

lib/common_components/qr_scanner.dart

@@ -8,7 +8,6 @@ import 'package:at_wavi_app/routes/routes.dart';
 import 'package:at_wavi_app/services/common_functions.dart';
 import 'package:at_wavi_app/services/field_order_service.dart';
 import 'package:at_wavi_app/services/search_service.dart';
-import 'package:at_wavi_app/services/size_config.dart';
 import 'package:at_wavi_app/utils/colors.dart';
 import 'package:at_wavi_app/utils/text_styles.dart';
 import 'package:at_wavi_app/view_models/user_preview.dart';

lib/common_components/switch_at_sign.dart

@@ -2,8 +2,6 @@ import 'dart:math';
 import 'dart:typed_data';
 import 'package:at_common_flutter/services/size_config.dart';
 import 'package:at_contacts_flutter/widgets/custom_circle_avatar.dart';
-import 'package:at_wavi_app/routes/route_names.dart';
-import 'package:at_wavi_app/routes/routes.dart';
 import 'package:at_wavi_app/services/backend_service.dart';
 import 'package:at_wavi_app/services/common_functions.dart';
 import 'package:flutter/material.dart';

lib/desktop/screens/desktop_edit_profile/desktop_profile_picture/desktop_profile_picture_page.dart

@@ -9,12 +9,9 @@ import 'package:at_wavi_app/view_models/user_preview.dart';
 import 'package:at_wavi_app/view_models/user_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:at_wavi_app/desktop/services/theme/app_theme.dart';
-import '../../../services/theme/app_theme.dart';
 import 'package:at_wavi_app/desktop/widgets/buttons/desktop_icon_button.dart';
 import 'package:flutter/material.dart';
 
-import '../desktop_edit_profile_model.dart';
-
 class DesktopProfilePicturePage extends StatefulWidget {
   DesktopProfilePicturePage({Key? key}) : super(key: key);
 

lib/desktop/screens/desktop_my_profile/desktop_search_atsign/desktop_search_atsign_model.dart

@@ -1,5 +1,4 @@
 import 'package:at_wavi_app/desktop/utils/load_status.dart';
-import 'package:at_wavi_app/model/user.dart';
 import 'package:at_wavi_app/services/search_service.dart';
 import 'package:at_wavi_app/view_models/user_preview.dart';
 import 'package:flutter/cupertino.dart';

lib/desktop/screens/desktop_my_profile/desktop_settings/desktop_switch_account/desktop_switch_account_page.dart

@@ -2,14 +2,9 @@ import 'dart:math';
 import 'dart:typed_data';
 import 'package:at_common_flutter/services/size_config.dart';
 import 'package:at_contacts_flutter/widgets/custom_circle_avatar.dart';
-import 'package:at_onboarding_flutter/at_onboarding_flutter.dart';
 import 'package:at_wavi_app/common_components/contact_initial.dart';
-import 'package:at_wavi_app/routes/route_names.dart';
-import 'package:at_wavi_app/routes/routes.dart';
 import 'package:at_wavi_app/services/backend_service.dart';
 import 'package:at_wavi_app/services/common_functions.dart';
-import 'package:at_wavi_app/services/nav_service.dart';
-import 'package:at_wavi_app/utils/constants.dart';
 import 'package:flutter/material.dart';
 
 class DesktopSwitchAccountPage extends StatefulWidget {

lib/desktop/screens/desktop_notification/desktop_new_request_page.dart

@@ -1,5 +1,4 @@
 import 'package:at_wavi_app/desktop/services/theme/app_theme.dart';
-import 'package:at_wavi_app/utils/colors.dart';
 import 'package:flutter/material.dart';
 
 import 'item/desktop_new_request_item.dart';
@@ -14,7 +13,6 @@ class DesktopNewRequestPage extends StatefulWidget {
 class _DesktopNewRequestPageState extends State<DesktopNewRequestPage> {
   @override
   Widget build(BuildContext context) {
-    final appTheme = AppTheme.of(context);
     return ListView.separated(
       itemCount: 5,
       shrinkWrap: true,

lib/desktop/screens/desktop_notification/desktop_notification_list_page.dart

@@ -1,6 +1,5 @@
 import 'package:at_wavi_app/desktop/services/theme/app_theme.dart';
 import 'package:at_wavi_app/desktop/utils/enums.dart';
-import 'package:at_wavi_app/utils/colors.dart';
 import 'package:flutter/material.dart';
 
 import 'item/desktop_notification_item.dart';
@@ -20,7 +19,6 @@ class _DesktopNotificationListPageState
     extends State<DesktopNotificationListPage> {
   @override
   Widget build(BuildContext context) {
-    final appTheme = AppTheme.of(context);
     return ListView.separated(
       itemCount: 5,
       shrinkWrap: true,

lib/desktop/screens/desktop_notification/item/desktop_notification_item.dart

@@ -4,7 +4,6 @@ import 'package:at_wavi_app/desktop/services/theme/app_theme.dart';
 import 'package:at_wavi_app/desktop/utils/enums.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:showcaseview/showcaseview.dart';
 import 'package:at_wavi_app/desktop/widgets/images/desktop_circle_avatar.dart';
 
 class DesktopNotificationItem extends StatelessWidget {

lib/desktop/screens/desktop_profile_basic_info/desktop_profile_basic_info_page.dart

@@ -1,5 +1,4 @@
 import 'package:at_wavi_app/common_components/provider_callback.dart';
-import 'package:at_wavi_app/desktop/screens/desktop_edit_profile/desktop_edit_profile_model.dart';
 import 'package:at_wavi_app/desktop/screens/desktop_location/desktop_location_preview_page.dart';
 import 'package:at_wavi_app/desktop/screens/desktop_user_profile/desktop_user_profile_page.dart';
 import 'package:at_wavi_app/desktop/services/theme/app_theme.dart';
@@ -469,7 +468,7 @@ class _DesktopProfileBasicInfoPageState
   }
 
   void _showAddDetailPopup() async {
-    final result = await showDialog<String>(
+    await showDialog<String>(
       context: context,
       builder: (BuildContext context) => Dialog(
         backgroundColor: Colors.transparent,
@@ -489,7 +488,7 @@ class _DesktopProfileBasicInfoPageState
   }
 
   void _showAddCustomContent() async {
-    final result = await showDialog<String>(
+    await showDialog<String>(
       context: context,
       builder: (BuildContext context) => Dialog(
         backgroundColor: Colors.transparent,
@@ -501,7 +500,7 @@ class _DesktopProfileBasicInfoPageState
   }
 
   void _showEditCustomContent(BasicData data) async {
-    final result = await showDialog<String>(
+    await showDialog<String>(
       context: context,
       builder: (BuildContext context) => Dialog(
         backgroundColor: Colors.transparent,
@@ -519,7 +518,7 @@ class _DesktopProfileBasicInfoPageState
     BasicData? location,
     BasicData? locationNickname,
   }) async {
-    final result = await showDialog<String>(
+    await showDialog<String>(
       context: context,
       builder: (BuildContext context) => Dialog(
         backgroundColor: Colors.transparent,
@@ -534,7 +533,7 @@ class _DesktopProfileBasicInfoPageState
   }
 
   void _showReorderDetailPopup() async {
-    final result = await showDialog<List<String>>(
+    await showDialog<List<String>>(
       context: context,
       builder: (BuildContext context) => Dialog(
         backgroundColor: Colors.transparent,
@@ -563,7 +562,7 @@ class _DesktopProfileBasicInfoPageState
       );
     } else if ((title ?? '').isNotEmpty) {
       try {
-        launch('https://www.google.com/maps/place/$title');
+        launchUrl(Uri.parse('https://www.google.com/maps/place/$title'));
       } catch (e) {}
     }
   }

lib/desktop/screens/desktop_profile_basic_info/desktop_profile_media/desktop_profile_media_page.dart

@@ -1,5 +1,4 @@
 import 'package:at_wavi_app/common_components/provider_callback.dart';
-import 'package:at_wavi_app/desktop/screens/desktop_edit_profile/desktop_edit_profile_model.dart';
 import 'package:at_wavi_app/desktop/screens/desktop_profile_basic_info/desktop_profile_add_custom_field/desktop_profile_add_custom_field.dart';
 import 'package:at_wavi_app/desktop/screens/desktop_profile_basic_info/desktop_profile_media/widgets/desktop_media_item.dart';
 import 'package:at_wavi_app/desktop/screens/desktop_profile_basic_info/widgets/desktop_empty_category_widget.dart';
@@ -209,7 +208,7 @@ class _DesktopProfileMediaPageState extends State<DesktopProfileMediaPage>
   }
 
   void _showAddCustomContent() async {
-    final result = await showDialog<String>(
+    await showDialog<String>(
       context: context,
       builder: (BuildContext context) => Dialog(
         backgroundColor: Colors.transparent,
@@ -229,7 +228,7 @@ class _DesktopProfileMediaPageState extends State<DesktopProfileMediaPage>
   }
 
   void _editData(BasicData basicData) async {
-    final result = await showDialog<String>(
+    await showDialog<String>(
       context: context,
       builder: (BuildContext context) => Dialog(
         backgroundColor: Colors.transparent,

lib/desktop/screens/desktop_user_profile/desktop_profile_info_page.dart

@@ -21,7 +21,6 @@ import 'package:at_wavi_app/view_models/user_preview.dart';
 import 'package:at_wavi_app/view_models/user_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 class DesktopProfileInfoPage extends StatefulWidget {
   final String? atSign;

lib/desktop/services/theme/app_theme.dart

@@ -140,9 +140,7 @@ class AppTheme {
     return ThemeData(
       // brightness: brightness,
       primaryColor: primaryColor,
-      backgroundColor: backgroundColor,
       scaffoldBackgroundColor: backgroundColor,
-      accentColor: accentColor,
       fontFamily: 'Inter',
       textTheme: textTheme,
       colorScheme: ThemeData.dark().colorScheme.copyWith(

lib/desktop/utils/dialog_utils.dart

@@ -1,7 +1,4 @@
-import 'package:at_wavi_app/desktop/screens/desktop_notification/desktop_notification_page.dart';
 import 'package:at_wavi_app/desktop/screens/desktop_profile_basic_info/desktop_reorder_basic_info/desktop_reorder_basic_info_page.dart';
-import 'package:at_wavi_app/desktop/utils/shared_preferences_utils.dart';
-import 'package:at_wavi_app/desktop/utils/strings.dart';
 import 'package:at_wavi_app/utils/at_enum.dart';
 import 'package:flutter/material.dart';
 

lib/screens/add_link/create_custom_add_link/create_custom_add_link.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:at_wavi_app/common_components/custom_input_field.dart';
 import 'package:at_wavi_app/common_components/loading_widget.dart';
-import 'package:at_wavi_app/common_components/text_tile.dart';
 import 'package:at_wavi_app/model/user.dart';
 import 'package:at_wavi_app/routes/route_names.dart';
 import 'package:at_wavi_app/routes/routes.dart';

lib/screens/edit_persona/edit_category_fields.dart

@@ -413,7 +413,6 @@ class _EditCategoryFieldsState extends State<EditCategoryFields> {
   }
 
   Widget inputField(BasicData basicData, {bool isCustomField = false}) {
-    String error = "error";
     return Slidable(
       key: UniqueKey(),
       actionPane: SlidableDrawerActionPane(),

lib/screens/following.dart

@@ -40,7 +40,6 @@ class Following extends StatefulWidget {
 class _FollowingState extends State<Following>
     with SingleTickerProviderStateMixin {
   late TabController _controller;
-  int _tabIndex = 0;
   String _searchedText = '';
 
   @override

lib/screens/home/home.dart

@@ -15,7 +15,6 @@ import 'package:at_wavi_app/screens/options.dart';
 import 'package:at_wavi_app/services/backend_service.dart';
 import 'package:at_wavi_app/services/common_functions.dart';
 import 'package:at_wavi_app/services/field_order_service.dart';
-import 'package:at_wavi_app/services/version_service.dart';
 import 'package:at_wavi_app/view_models/base_model.dart';
 import 'package:at_wavi_app/view_models/deep_link_provider.dart';
 import 'package:at_wavi_app/view_models/follow_service.dart';

lib/view_models/follow_service.dart

@@ -3,11 +3,17 @@ import 'package:at_contact/at_contact.dart';
 import 'package:at_contacts_flutter/utils/init_contacts_service.dart';
 import 'package:at_follows_flutter/domain/at_follows_list.dart';
 import 'package:at_follows_flutter/utils/at_follow_services.dart';
+import 'package:at_server_status/at_server_status.dart';
 import 'package:at_wavi_app/common_components/confirmation_dialog.dart';
+import 'package:at_wavi_app/desktop/utils/snackbar_utils.dart';
 import 'package:at_wavi_app/model/at_follows_value.dart';
 import 'package:at_wavi_app/services/backend_service.dart';
 import 'package:at_wavi_app/view_models/base_model.dart';
 import 'package:easy_debounce/easy_debounce.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import '../services/nav_service.dart';
 
 class FollowService extends BaseModel {
   FollowService();
@@ -16,6 +22,13 @@ class FollowService extends BaseModel {
   final String FETCH_FOLLOWERS = 'fetch_followers';
   final String FETCH_FOLLOWING = 'fetch_followings';
 
+  late AtStatus atStatus;
+  final AtStatusImpl atStatusImpl = AtStatusImpl();
+
+  // AtStatus atStatus = await atStatusImpl.get(atSign);
+  // AtSignStatus atSignStatus = atStatus.status();
+  // int httpStatus = atStatus.httpStatus();
+
   bool isFollowersFetched = false;
   bool isFollowingFetched = false;
 
@@ -180,6 +193,22 @@ class FollowService extends BaseModel {
   ///[forFollowersList] is to identify whether we want to perform operation on followers list or following list.
   Future<void> performFollowUnfollow(String atsign,
       {bool forFollowersList: false}) async {
+    // check for the atsign we are about to follow is valid or not
+    atStatus = await atStatusImpl.get(atsign);
+    if (atStatus.serverLocation == null) {
+      print('Invalid atSign');
+      await ScaffoldMessenger.of(NavService.navKey.currentContext!)
+          .showSnackBar(
+        SnackBar(
+          backgroundColor: Colors.red,
+          content: Text(
+            "Invalid atsign",
+            style: TextStyle(color: Colors.white),
+          ),
+        ),
+      );
+      return;
+    }
     try {
       bool isFollowingAtsign = isFollowing(atsign);
       if (isFollowingAtsign) {