diff --git a/android/app/build.gradle b/android/app/build.gradle
index 39ef1c7..61db26b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -30,7 +30,8 @@ android {
         noCompress "tflite"
     }
 
-    compileSdkVersion 29
+    compileSdkVersion 31
+    ndkVersion "20.0.5594570"
 
     lintOptions {
         disable 'InvalidPackage'
@@ -40,7 +41,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "tech.mr0kaushik.sms_spam_detection"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -63,9 +64,9 @@ flutter {
 
 dependencies {
 
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'org.tensorflow:tensorflow-lite:2.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation 'junit:junit:4.13.1'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 4b63155..fb04b26 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -24,6 +24,8 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:showWhenLocked="true"
+            android:turnScreenOn="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/assets/images/logo.png b/android/app/src/main/res/drawable/app_icon.png
similarity index 100%
rename from assets/images/logo.png
rename to android/app/src/main/res/drawable/app_icon.png
diff --git a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png
new file mode 100644
index 0000000..1339650
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png
new file mode 100644
index 0000000..22f2443
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png
new file mode 100644
index 0000000..0017a38
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png
new file mode 100644
index 0000000..b0548db
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png
new file mode 100644
index 0000000..fee2848
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differ
diff --git a/android/build.gradle b/android/build.gradle
index 786f3dc..1e6919c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,18 +1,18 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:3.6.4'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/android/settings_aar.gradle b/android/settings_aar.gradle
new file mode 100644
index 0000000..e7b4def
--- /dev/null
+++ b/android/settings_aar.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/assets/images/app_icon.png b/assets/images/app_icon.png
new file mode 100644
index 0000000..9bcea53
Binary files /dev/null and b/assets/images/app_icon.png differ
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 0112ce5..0cd71e1 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -508,4 +508,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
+}
\ No newline at end of file
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
index fb9f912..4b989ec 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index 87a6930..98646ee 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index 9b23369..eb5dcf0 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index e6d2b32..a275933 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index e6d2b32..a275933 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index 252a2af..a92718d 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index 9da5fb1..a42c02f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index 155c555..54899f1 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index c2c3524..550c701 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/lib/screens/Home.dart b/lib/screens/Home.dart
index 5d8eb9a..459e4af 100644
--- a/lib/screens/Home.dart
+++ b/lib/screens/Home.dart
@@ -82,11 +82,11 @@ class _HomeState extends State<HomeScreen> {
     });
 
     var androidPlatformChannelSpecifics = new AndroidNotificationDetails(
-        threadId.toString(), 'sms_spam', 'Spam Sms detection',
-        importance: Importance.Max, priority: Priority.High);
+        threadId.toString(), 'sms_spam', channelDescription: 'Spam Sms detection',
+        importance: Importance.max, priority: Priority.high);
     var iOSPlatformChannelSpecifics = new IOSNotificationDetails();
     var platformChannelSpecifics = new NotificationDetails(
-        androidPlatformChannelSpecifics, iOSPlatformChannelSpecifics);
+        android: androidPlatformChannelSpecifics, iOS: iOSPlatformChannelSpecifics);
     await flutterLocalNotificationsPlugin.show(
       threadId,
       head,
@@ -108,10 +108,10 @@ class _HomeState extends State<HomeScreen> {
     }
 
     var initializationSettingsAndroid =
-    new AndroidInitializationSettings('@mipmap/ic_launcher');
+    new AndroidInitializationSettings('app_icon');
     var initializationSettingsIOS = new IOSInitializationSettings();
     var initializationSettings = new InitializationSettings(
-        initializationSettingsAndroid, initializationSettingsIOS);
+        android: initializationSettingsAndroid, iOS: initializationSettingsIOS);
     flutterLocalNotificationsPlugin = new FlutterLocalNotificationsPlugin();
     flutterLocalNotificationsPlugin.initialize(initializationSettings,
         onSelectNotification: onNotificationSelected);
@@ -192,7 +192,7 @@ class _HomeState extends State<HomeScreen> {
         child: new Column(
           children: <Widget>[
             new UserAccountsDrawerHeader(
-                currentAccountPicture: Image.asset('assets/images/logo.png'),
+                currentAccountPicture: Image.asset('assets/images/app_icon.png'),
                 accountName: new Text("SMS Spam Detection"),
                 accountEmail: null),
             new Column(children: drawerOptions)
diff --git a/lib/screens/ImportScreen.dart b/lib/screens/ImportScreen.dart
index 1ed98e9..eae112e 100644
--- a/lib/screens/ImportScreen.dart
+++ b/lib/screens/ImportScreen.dart
@@ -113,7 +113,7 @@ class _ImportedScreenState extends State<ImportedScreen> {
             Flexible(
               child: Center(
                 child: Image.asset(
-                  "assets/images/logo.png",
+                  "assets/images/app_icon.png",
                   width: imageSize,
                   height: imageSize,
 //                  fit: BoxFit.cover,
diff --git a/lib/screens/onboarding_screen.dart b/lib/screens/onboarding_screen.dart
index 536c4f1..5d11c30 100644
--- a/lib/screens/onboarding_screen.dart
+++ b/lib/screens/onboarding_screen.dart
@@ -83,7 +83,7 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
           });
         }
         break;
-      case PermissionStatus.undetermined:
+      case PermissionStatus.limited:
       case PermissionStatus.restricted:
       case PermissionStatus.permanentlyDenied:
         if (mounted) {
diff --git a/lib/screens/select_contacts.dart b/lib/screens/select_contacts.dart
index c884175..0f13558 100644
--- a/lib/screens/select_contacts.dart
+++ b/lib/screens/select_contacts.dart
@@ -30,7 +30,7 @@ class _SelectContactState extends State<SelectContact> {
     ContactsService.getContacts(orderByGivenName: true).then((value) {
       if (mounted) {
         setState(() {
-          contacts = value.toList();
+          contacts = value;
           filteredContacts = contacts;
           showProgress = false;
         });
diff --git a/lib/screens/splash_screen.dart b/lib/screens/splash_screen.dart
index 81a2e22..ecebe37 100644
--- a/lib/screens/splash_screen.dart
+++ b/lib/screens/splash_screen.dart
@@ -56,7 +56,7 @@ class _SplashscreenState extends State<Splashscreen> {
                 Center(
                   child: Image(
                     image: AssetImage(
-                      'assets/images/logo.png',
+                      'assets/images/app_icon.png',
                     ),
                     height: 200.0,
                     width: 200.0,
diff --git a/lib/sms/contacts.dart b/lib/sms/contacts.dart
index fb77f6e..e15d7f2 100644
--- a/lib/sms/contacts.dart
+++ b/lib/sms/contacts.dart
@@ -9,37 +9,45 @@ class ContactsService {
   static const MethodChannel _channel =
       MethodChannel('github.com/clovisnicolas/flutter_contacts');
 
-  static Future<Iterable<Contact>> getContacts(
+  static Future<List<Contact>> getContacts(
       {String query,
-      bool withThumbnails = true,
-      bool photoHighResolution = true,
-      bool orderByGivenName = true}) async {
+        bool withThumbnails = true,
+        bool photoHighResolution = true,
+        bool orderByGivenName = true,
+        bool iOSLocalizedLabels = true,
+        bool androidLocalizedLabels = true}) async {
     Iterable contacts =
-        await _channel.invokeMethod('getContacts', <String, dynamic>{
+    await _channel.invokeMethod('getContacts', <String, dynamic>{
       'query': query,
       'withThumbnails': withThumbnails,
       'photoHighResolution': photoHighResolution,
-      'orderByGivenName': orderByGivenName
+      'orderByGivenName': orderByGivenName,
+      'iOSLocalizedLabels': iOSLocalizedLabels,
+      'androidLocalizedLabels': androidLocalizedLabels,
     });
-    return contacts.map((m) => Contact.fromMap(m));
+    return contacts.map((m) => Contact.fromMap(m)).toList();
   }
 
   /// Fetches all contacts, or when specified, the contacts with a name
   /// matching [query]
-  static Future<Iterable<Contact>> getContactsForPhone(String phone,
+  static Future<List<Contact>> getContactsForPhone(String phone,
       {bool withThumbnails = true,
-      bool photoHighResolution = true,
-      bool orderByGivenName = true}) async {
-    if (phone == null || phone.isEmpty) return Iterable.empty();
+        bool photoHighResolution = true,
+        bool orderByGivenName = true,
+        bool iOSLocalizedLabels = true,
+        bool androidLocalizedLabels = true}) async {
+    if (phone == null || phone.isEmpty) return List.empty();
 
     Iterable contacts =
-        await _channel.invokeMethod('getContactsForPhone', <String, dynamic>{
+    await _channel.invokeMethod('getContactsForPhone', <String, dynamic>{
       'phone': phone,
       'withThumbnails': withThumbnails,
       'photoHighResolution': photoHighResolution,
-      'orderByGivenName': orderByGivenName
+      'orderByGivenName': orderByGivenName,
+      'iOSLocalizedLabels': iOSLocalizedLabels,
+      'androidLocalizedLabels': androidLocalizedLabels,
     });
-    return contacts.map((m) => Contact.fromMap(m));
+    return contacts.map((m) => Contact.fromMap(m)).toList();
   }
 
   /// Loads the avatar for the given contact and returns it. If the user does
diff --git a/lib/widgets/ChatItem.dart b/lib/widgets/ChatItem.dart
index 43dd0ec..3b5edc8 100644
--- a/lib/widgets/ChatItem.dart
+++ b/lib/widgets/ChatItem.dart
@@ -87,11 +87,12 @@ class _ChatItemState extends State<ChatItem> {
     return GestureDetector(
       onTap: () {
         if (contact != null) {
+          String label = contact.displayName;
           Navigator.push(
               context,
               MaterialPageRoute(
                   builder: (context) => ChatScreen(
-                      contact.getPrimaryAddress(), widget._thread.threadId)));
+                      label, widget._thread.threadId)));
         } else {
           Navigator.push(
               context,
diff --git a/lib/widgets/ChatMessage.dart b/lib/widgets/ChatMessage.dart
index 2e50f5d..5e53476 100644
--- a/lib/widgets/ChatMessage.dart
+++ b/lib/widgets/ChatMessage.dart
@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_widgets/flutter_widgets.dart';
+// import 'package:flutter_widgets/flutter_widgets.dart';
 import 'package:intl/intl.dart';
 import 'package:sms_spam_detection/presentation/MatColor.dart';
 import 'package:sms_spam_detection/sms/sms_service.dart';
 import 'package:sms_spam_detection/sqflite/SmsDatabase.dart';
+import 'package:visibility_detector/visibility_detector.dart';
 
 abstract class ChatScreenItem {}
 
diff --git a/lib/widgets/contact_item.dart b/lib/widgets/contact_item.dart
index d2b7344..e270e0a 100644
--- a/lib/widgets/contact_item.dart
+++ b/lib/widgets/contact_item.dart
@@ -2,75 +2,39 @@ import 'package:flutter/material.dart';
 import 'package:sms_spam_detection/screens/ChatScreen.dart';
 import 'package:sms_spam_detection/sms/contacts.dart';
 
-class ContactItem extends StatefulWidget {
+class ContactItem extends StatelessWidget {
   final Contact contact;
 
   ContactItem(this.contact);
 
   @override
-  _ContactItemState createState() => _ContactItemState();
-}
-
-class _ContactItemState extends State<ContactItem> {
-  String title, address;
-  List<String> addresses = [];
-  bool showItem = true;
-
-  @override
-  void initState() {
-    super.initState();
-    if (widget.contact != null) {
-      title = (widget.contact.displayName != null)
-          ? widget.contact.displayName
-          : '';
-      if (widget.contact.getPhonesString == null) {
+  Widget build(BuildContext context) {
+    String title, address;
+    if (contact != null) {
+      title = (contact.displayName != null) ? contact.displayName : '';
+      if (contact.getPhonesString == null) {
         address = '';
-        return;
       }
 
-      String str = widget.contact.getPhonesString();
+      String str = contact.getPhonesString();
       if (str.length > 0) {
         address = str.split(RegExp(','))[0];
       }
     }
-  }
-
-  getSubTitle(List<String> addresses) {
-    String s = addresses[0];
-    if (showItem && addresses.length > 1) {
-      for (int i = 1; i < addresses.length; i++) {
-        if (addresses[i] != null) {
-          s = s + ' ' + addresses[i];
-        }
-      }
-    }
-  }
 
-  @override
-  Widget build(BuildContext context) {
-//    subTitle += (phones.length > 1) ? ", + ${phones.length - 1}" : "";
-//    String subTitle = address;
-//    if (showItem && addresses.length > 1) {
-//      for (int i = 1; i < addresses.length; i++) {
-//        if (addresses[i] != null) {
-//          subTitle = subTitle + ' ' + addresses[i];
-//        }
-//      }
-//    }
-    String subTitle = widget.contact.getPhonesString();
+    String subTitle = contact.getPhonesString();
 
     return ListTile(
       leading: CircleAvatar(
-        child:
-            (widget.contact.avatar != null && widget.contact.avatar.length > 0)
-                ? ClipOval(child: Image.memory(widget.contact.avatar))
-                : Icon(
-                    Icons.person,
-                    color: Colors.white,
-                  ),
+        child: (contact.avatar != null && contact.avatar.length > 0)
+            ? ClipOval(child: Image.memory(contact.avatar))
+            : Icon(
+                Icons.person,
+                color: Colors.white,
+              ),
       ),
-      title: Text(title != null ? title : 'Deepak'),
-      subtitle: Text((subTitle != null) ? subTitle : '14729822'),
+      title: Text(title != null ? title : '<>'),
+      subtitle: Text((subTitle != null) ? subTitle : '<>'),
       onTap: () {
         Navigator.pop(context);
         Navigator.of(context).push(MaterialPageRoute(builder: (context) {
diff --git a/pubspec.lock b/pubspec.lock
index bf76df4..0ae58df 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,35 +7,35 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "22.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.39.5"
+    version: "1.7.1"
   archive:
     dependency: transitive
     description:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.11"
+    version: "3.1.6"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.2"
+    version: "2.3.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "2.6.1"
   auto_size_text:
     dependency: "direct main"
     description:
@@ -49,140 +49,182 @@ packages:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "2.1.0"
   build:
     dependency: transitive
     description:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.2"
+    version: "2.1.0"
   build_config:
     dependency: transitive
     description:
       name: build_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "1.0.0"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "3.0.0"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.3"
+    version: "2.0.4"
   build_runner:
     dependency: "direct main"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "2.1.2"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.0"
+    version: "7.1.0"
   built_collection:
     dependency: transitive
     description:
       name: built_collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.2"
+    version: "5.1.1"
   built_value:
     dependency: transitive
     description:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.0.9"
+    version: "8.1.2"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.0"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "2.0.1"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.5"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.1"
+    version: "4.1.0"
   collection:
     dependency: "direct main"
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.15.0"
   contacts_service:
     dependency: "direct main"
     description:
       name: contacts_service
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.10"
+    version: "0.6.3"
   convert:
     dependency: transitive
     description:
       name: convert
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "3.0.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
-  csslib:
-    dependency: transitive
-    description:
-      name: csslib
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.16.1"
+    version: "3.0.1"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.3"
+    version: "1.0.3"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.3"
+    version: "2.1.1"
+  dbus:
+    dependency: transitive
+    description:
+      name: dbus
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.5.6"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.0"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.2"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.1.2"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.11"
+    version: "1.0.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -194,21 +236,28 @@ packages:
       name: flutter_launcher_icons
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.4"
+    version: "0.9.2"
   flutter_local_notifications:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.0"
+    version: "9.0.0"
+  flutter_local_notifications_linux:
+    dependency: transitive
+    description:
+      name: flutter_local_notifications_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.0"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "5.0.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -219,286 +268,293 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_widgets:
+  fluttertoast:
     dependency: "direct main"
     description:
-      name: flutter_widgets
+      name: fluttertoast
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.12"
-  fluttertoast:
-    dependency: "direct main"
+    version: "8.0.8"
+  frontend_server_client:
+    dependency: transitive
     description:
-      name: fluttertoast
+      name: frontend_server_client
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.3"
+    version: "2.1.2"
   glob:
     dependency: transitive
     description:
       name: glob
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "2.0.1"
   graphs:
     dependency: transitive
     description:
       name: graphs
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
-  html:
-    dependency: transitive
-    description:
-      name: html
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.14.0+3"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.12.0+4"
+    version: "2.1.0"
   http_multi_server:
     dependency: transitive
     description:
       name: http_multi_server
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "3.0.1"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.4"
+    version: "4.0.0"
   image:
     dependency: transitive
     description:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "3.0.8"
   intl:
     dependency: "direct main"
     description:
       name: intl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.1"
+    version: "0.17.0"
   io:
     dependency: transitive
     description:
       name: io
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.4"
+    version: "1.0.3"
   js:
     dependency: transitive
     description:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.1+1"
+    version: "0.6.3"
   json_annotation:
     dependency: "direct main"
     description:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "4.0.1"
   json_serializable:
     dependency: "direct main"
     description:
       name: json_serializable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.0"
+    version: "4.1.4"
   logging:
     dependency: transitive
     description:
       name: logging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.11.4"
+    version: "1.0.2"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.6"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.8"
+    version: "1.3.0"
   mime:
     dependency: transitive
     description:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.6+3"
-  node_interop:
+    version: "1.0.0"
+  package_config:
     dependency: transitive
     description:
-      name: node_interop
+      name: package_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
-  node_io:
-    dependency: transitive
+    version: "2.0.2"
+  path:
+    dependency: "direct main"
     description:
-      name: node_io
+      name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1+2"
-  package_config:
+    version: "1.8.0"
+  path_provider_linux:
     dependency: transitive
     description:
-      name: package_config
+      name: path_provider_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.3"
-  package_resolver:
+    version: "2.1.0"
+  path_provider_platform_interface:
     dependency: transitive
     description:
-      name: package_resolver
+      name: path_provider_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.10"
-  path:
-    dependency: "direct main"
+    version: "2.0.1"
+  path_provider_windows:
+    dependency: transitive
     description:
-      name: path
+      name: path_provider_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.4"
+    version: "2.0.3"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0+1"
+    version: "1.11.1"
   percent_indicator:
     dependency: "direct main"
     description:
       name: percent_indicator
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1+1"
+    version: "3.4.0"
   permission_handler:
     dependency: "direct main"
     description:
       name: permission_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.0+hotfix.3"
+    version: "8.1.6"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "3.6.1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "4.1.0"
   platform:
     dependency: transitive
     description:
       name: platform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.1"
+    version: "3.0.2"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "2.0.2"
   pool:
     dependency: transitive
     description:
       name: pool
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.2.3"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.4"
+    version: "2.1.0"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.5"
+    version: "1.0.0"
   quiver:
     dependency: "direct main"
     description:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "3.0.1"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.6+3"
+    version: "2.0.7"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.2"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.1+6"
+    version: "2.0.2"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "2.0.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2+4"
+    version: "2.0.2"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.2"
   shelf:
     dependency: transitive
     description:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.5"
+    version: "1.2.0"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.3"
+    version: "1.0.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -517,126 +573,154 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.5"
+    version: "1.0.3"
   source_span:
     dependency: transitive
     description:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.8.1"
   sqflite:
     dependency: "direct main"
     description:
       name: sqflite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "2.0.0+4"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0+1"
+    version: "2.0.1+1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.3"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0"
   synchronized:
     dependency: transitive
     description:
       name: synchronized
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "3.0.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.11"
+    version: "0.3.0"
+  timezone:
+    dependency: transitive
+    description:
+      name: timezone
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.8.0"
   timing:
     dependency: transitive
     description:
       name: timing
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.1+2"
+    version: "1.0.0"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0"
+  visibility_detector:
+    dependency: "direct main"
+    description:
+      name: visibility_detector
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.7+14"
+    version: "1.0.0"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "2.1.0"
+  win32:
+    dependency: transitive
+    description:
+      name: win32
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.9"
+  xdg_directories:
+    dependency: transitive
+    description:
+      name: xdg_directories
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.0"
   xml:
     dependency: transitive
     description:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.5.0"
+    version: "5.1.2"
   yaml:
     dependency: transitive
     description:
       name: yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "3.1.0"
 sdks:
-  dart: ">=2.7.0 <3.0.0"
-  flutter: ">=1.12.13+hotfix.5 <2.0.0"
+  dart: ">=2.13.0 <3.0.0"
+  flutter: ">=2.2.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index bbee05b..944ed15 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: A Spam SMS Detection app
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.0+1
+version: 1.1.0
 
 environment:
   sdk: ">=2.2.2 <3.0.0"
@@ -19,39 +19,39 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  intl: ^0.16.1
+  intl: ^0.17.0
   sms_maintained: ^0.2.5
   auto_size_text: ^2.1.0
-  fluttertoast: ^3.1.3
-  sqflite: ^1.2.2
-  flutter_local_notifications: ^1.2.2
-  contacts_service: ^0.3.10
+  fluttertoast: ^8.0.8
+  sqflite: ^2.0.0+4
+  flutter_local_notifications: ^9.0.0
+  contacts_service: ^0.6.3
   path: ^1.6.4
-  json_annotation: ^3.0.1
-  build_runner: ^1.8.0
-  json_serializable: ^3.2.5
+  json_annotation: ^4.0.1
+  build_runner: ^2.1.2
+  json_serializable: ^4.1.4
   collection: ^1.14.11
-  quiver: ^2.0.5
-  shared_preferences: ^0.5.6+3
-  percent_indicator: ^2.1.1+1
-  flutter_widgets: ^0.1.12
-  permission_handler: ^5.0.0+hotfix.3
+  quiver: ^3.0.1
+  shared_preferences: ^2.0.7
+  percent_indicator: ^3.4.0
+  visibility_detector: ^0.2.0
+  permission_handler: ^8.1.6
 
   #  flutter_launcher_icons: ^0.7.4
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^0.1.2
+  cupertino_icons: ^1.0.3
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_launcher_icons: "^0.7.4"
+  flutter_launcher_icons: ^0.9.2
 
 flutter_icons:
   android: "launcher_icon"
   ios: true
-  image_path: "assets/images/spam_1.png"
+  image_path: "assets/images/app_icon.png"
 
 
 # For information on the generic Dart part of this file, see the