⬆️ Upgrade packages dependencies.

🩹 Fix deprecated code
shahanajparvin · May 27, 2023 · 8461982 · 8461982
1 parent 223a8a5
commit 8461982
Show file tree

Hide file tree

Showing 23 changed files with 732 additions and 580 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -25,15 +25,15 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     lintOptions {
         disable 'InvalidPackage'
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.thealphamerc.flutter_twitter_clone_dev"
+        applicationId "com.thealphamerc.flutter_twitter_clone"
         minSdkVersion 20
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.thealphamerc.flutter_twitter_clone_dev">
+    package="com.thealphamerc.flutter_twitter_clone">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.thealphamerc.flutter_twitter_clone_dev">
+    package="com.thealphamerc.flutter_twitter_clone">
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.

diff --git a/android/build.gradle b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath 'com.google.gms:google-services:4.3.10'
     }
 }

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Mon Aug 01 13:36:21 IST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/lib/helper/utility.dart b/lib/helper/utility.dart
@@ -10,7 +10,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:intl/intl.dart';
-import 'package:share/share.dart';
+import 'package:share_plus/share_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../widgets/newWidget/customLoader.dart';
@@ -271,7 +271,8 @@ class Utility {
 
   static shareFile(List<String> path, {String text = ""}) {
     try {
-      Share.shareFiles(path, text: text);
+      final files = path.map((path) => XFile(path)).toList();
+      Share.shareXFiles(files, text: text);
     } catch (error) {
       print(error);
     }

diff --git a/lib/state/feedState.dart b/lib/state/feedState.dart
@@ -10,8 +10,8 @@ import 'package:flutter_twitter_clone/helper/utility.dart';
 import 'package:flutter_twitter_clone/model/user.dart';
 import 'package:flutter_twitter_clone/state/appState.dart';
 import 'package:flutter_twitter_clone/ui/page/common/locator.dart';
-import 'package:link_preview_generator/link_preview_generator.dart'
-    show WebInfo;
+// import 'package:link_preview_generator/link_preview_generator.dart'
+//     show WebInfo;
 import 'package:path/path.dart' as path;
 import 'package:translator/translator.dart';
 // import 'package:flutter_chat_types/flutter_chat_types.dart' show PreviewData;
@@ -76,9 +76,9 @@ class FeedState extends AppState {
     return list;
   }
 
-  Map<String, WebInfo> _linkWebInfos = {};
-  Map<String, WebInfo> get linkWebInfos => _linkWebInfos;
-  void addWebInfo(String url, WebInfo webInfo) {
+  Map<String, dynamic> _linkWebInfos = {};
+  Map<String, dynamic> get linkWebInfos => _linkWebInfos;
+  void addWebInfo(String url, dynamic webInfo) {
     _linkWebInfos.addAll({url: webInfo});
   }
 

diff --git a/lib/ui/page/common/splash.dart b/lib/ui/page/common/splash.dart
@@ -12,7 +12,7 @@ import 'package:flutter_twitter_clone/ui/page/Auth/selectAuthMethod.dart';
 import 'package:flutter_twitter_clone/ui/page/common/updateApp.dart';
 import 'package:flutter_twitter_clone/ui/page/homePage.dart';
 import 'package:flutter_twitter_clone/ui/theme/theme.dart';
-import 'package:package_info/package_info.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:provider/provider.dart';
 
 class SplashPage extends StatefulWidget {

diff --git a/lib/ui/page/feed/composeTweet/composeTweet.dart b/lib/ui/page/feed/composeTweet/composeTweet.dart
@@ -215,7 +215,7 @@ class _ComposeTweetReplyPageState extends State<ComposeTweetPage> {
                 Provider.of<FeedState>(context).isBusy,
         isBottomLine: Provider.of<ComposeTweetState>(context).isScrollingDown,
       ),
-      backgroundColor: Theme.of(context).backgroundColor,
+      backgroundColor: Theme.of(context).scaffoldBackgroundColor,
       body: Stack(
         //!Removed container
         children: <Widget>[

diff --git a/lib/ui/page/feed/composeTweet/widget/composeBottomIconWidget.dart b/lib/ui/page/feed/composeTweet/widget/composeBottomIconWidget.dart
@@ -40,7 +40,7 @@ class _ComposeBottomIconWidgetState extends State<ComposeBottomIconWidget> {
             widget.textEditingController.text.length < 280) {
           wordCountColor = Colors.orange;
         } else if (widget.textEditingController.text.length >= 280) {
-          wordCountColor = Theme.of(context).errorColor;
+          wordCountColor = Theme.of(context).colorScheme.error;
         } else {
           wordCountColor = Colors.blue;
         }
@@ -53,9 +53,9 @@ class _ComposeBottomIconWidgetState extends State<ComposeBottomIconWidget> {
       width: double.infinity,
       height: 50,
       decoration: BoxDecoration(
-          border:
-              Border(top: BorderSide(color: Theme.of(context).dividerColor)),
-          color: Theme.of(context).backgroundColor),
+        border: Border(top: BorderSide(color: Theme.of(context).dividerColor)),
+        color: Theme.of(context).scaffoldBackgroundColor,
+      ),
       child: Row(
         children: <Widget>[
           IconButton(
@@ -83,9 +83,11 @@ class _ComposeBottomIconWidgetState extends State<ComposeBottomIconWidget> {
                 child: /*tweet != null &&*/ tweet.length > 289
                     ? Padding(
                         padding: const EdgeInsets.only(right: 10),
-                        child: customText('${280 - tweet.length}',
-                            style:
-                                TextStyle(color: Theme.of(context).errorColor)),
+                        child: customText(
+                          '${280 - tweet.length}',
+                          style: TextStyle(
+                              color: Theme.of(context).colorScheme.error),
+                        ),
                       )
                     : Stack(
                         alignment: Alignment.center,

diff --git a/lib/ui/page/feed/feedPostDetail.dart b/lib/ui/page/feed/feedPostDetail.dart
@@ -96,7 +96,7 @@ class _FeedPostDetailState extends State<FeedPostDetail> {
       child: Scaffold(
         key: scaffoldKey,
         floatingActionButton: _floatingActionButton(),
-        backgroundColor: Theme.of(context).backgroundColor,
+        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
         body: CustomScrollView(
           slivers: <Widget>[
             SliverAppBar(

diff --git a/lib/ui/page/feed/suggestedUsers.dart b/lib/ui/page/feed/suggestedUsers.dart
@@ -54,7 +54,7 @@ class _SuggestedUsersState extends State<SuggestedUsers> {
           ? null
           : BottomAppBar(
               child: Container(
-                color: Theme.of(context).backgroundColor,
+                color: Theme.of(context).scaffoldBackgroundColor,
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [

diff --git a/lib/ui/page/message/chatScreenPage.dart b/lib/ui/page/message/chatScreenPage.dart
@@ -138,7 +138,7 @@ class _ChatScreenPageState extends State<ChatScreenPage> {
           padding: const EdgeInsets.only(right: 10, left: 10),
           child: Text(
             Utility.getChatTime(chat.createdAt),
-            style: Theme.of(context).textTheme.caption!.copyWith(fontSize: 12),
+            style: Theme.of(context).textTheme.bodySmall,
           ),
         )
       ],

diff --git a/lib/ui/page/profile/qrCode/scanner.dart b/lib/ui/page/profile/qrCode/scanner.dart
@@ -247,7 +247,7 @@ class _QrCodeState extends State<QrCode> {
                       ),
                       borderRadius: BorderRadius.circular(10)),
                   padding: const EdgeInsets.all(22),
-                  child: QrImage(
+                  child: QrImageView(
                     data: "fwitter/profile/${widget.user.userId}",
                     embeddedImageStyle:
                         QrEmbeddedImageStyle(size: const Size(60, 60)),

diff --git a/lib/ui/theme/theme.dart b/lib/ui/theme/theme.dart
@@ -5,52 +5,54 @@ part 'text_styles.dart';
 part 'extention.dart';
 
 class AppTheme {
-  static final ThemeData appTheme = ThemeData(
+  static final ThemeData appTheme = ThemeData.light().copyWith(
+    scaffoldBackgroundColor: TwitterColor.white,
+    brightness: Brightness.light,
+    primaryColor: AppColor.primary,
+    cardColor: Colors.white,
+    unselectedWidgetColor: Colors.grey,
+    bottomSheetTheme: const BottomSheetThemeData(
+      backgroundColor: AppColor.white,
+    ),
+    appBarTheme: AppBarTheme(
       backgroundColor: TwitterColor.white,
-      brightness: Brightness.light,
-      primaryColor: AppColor.primary,
-      cardColor: Colors.white,
-      unselectedWidgetColor: Colors.grey,
-      bottomAppBarColor: Colors.white,
-      bottomSheetTheme:
-          const BottomSheetThemeData(backgroundColor: AppColor.white),
-      appBarTheme: AppBarTheme(
-          backgroundColor: TwitterColor.white,
-          iconTheme: IconThemeData(
-            color: TwitterColor.dodgeBlue,
-          ),
-          elevation: 0,
-          // ignore: deprecated_member_use
-          textTheme: const TextTheme(
-            headline5: TextStyle(
-                color: Colors.black, fontSize: 26, fontStyle: FontStyle.normal),
-          )),
-      tabBarTheme: TabBarTheme(
-        labelStyle:
-            TextStyles.titleStyle.copyWith(color: TwitterColor.dodgeBlue),
-        unselectedLabelColor: AppColor.darkGrey,
-        unselectedLabelStyle:
-            TextStyles.titleStyle.copyWith(color: AppColor.darkGrey),
-        labelColor: TwitterColor.dodgeBlue,
-        labelPadding: const EdgeInsets.symmetric(vertical: 12),
-      ),
-      floatingActionButtonTheme: FloatingActionButtonThemeData(
-        backgroundColor: TwitterColor.dodgeBlue,
+      iconTheme: IconThemeData(
+        color: TwitterColor.dodgeBlue,
       ),
-      colorScheme: const ColorScheme(
-          background: Colors.white,
-          onPrimary: Colors.white,
-          onBackground: Colors.black,
-          onError: Colors.white,
-          onSecondary: Colors.white,
-          onSurface: Colors.black,
-          error: Colors.red,
-          primary: Colors.blue,
-          primaryContainer: Colors.blue,
-          secondary: AppColor.secondary,
-          secondaryContainer: AppColor.darkGrey,
-          surface: Colors.white,
-          brightness: Brightness.light));
+      elevation: 0,
+      // ignore: deprecated_member_use
+    ),
+    bottomAppBarTheme: ThemeData.light().bottomAppBarTheme.copyWith(
+          color: Colors.white,
+          elevation: 0,
+        ),
+    tabBarTheme: TabBarTheme(
+      labelStyle: TextStyles.titleStyle.copyWith(color: TwitterColor.dodgeBlue),
+      unselectedLabelColor: AppColor.darkGrey,
+      unselectedLabelStyle:
+          TextStyles.titleStyle.copyWith(color: AppColor.darkGrey),
+      labelColor: TwitterColor.dodgeBlue,
+      labelPadding: const EdgeInsets.symmetric(vertical: 12),
+    ),
+    floatingActionButtonTheme: FloatingActionButtonThemeData(
+      backgroundColor: TwitterColor.dodgeBlue,
+    ),
+    colorScheme: const ColorScheme(
+      background: Colors.white,
+      onPrimary: Colors.white,
+      onBackground: Colors.black,
+      onError: Colors.white,
+      onSecondary: Colors.white,
+      onSurface: Colors.black,
+      error: Colors.red,
+      primary: Colors.blue,
+      primaryContainer: Colors.blue,
+      secondary: AppColor.secondary,
+      secondaryContainer: AppColor.darkGrey,
+      surface: Colors.white,
+      brightness: Brightness.light,
+    ),
+  );
 
   static List<BoxShadow> shadow = <BoxShadow>[
     BoxShadow(

diff --git a/lib/widgets/bottomMenuBar/bottomMenuBar.dart b/lib/widgets/bottomMenuBar/bottomMenuBar.dart
@@ -27,7 +27,7 @@ class _BottomMenubarState extends State<BottomMenubar> {
     return Container(
       height: 50,
       decoration: BoxDecoration(
-          color: Theme.of(context).bottomAppBarColor,
+          color: Theme.of(context).bottomAppBarTheme.color,
           boxShadow: const [
             BoxShadow(
                 color: Colors.black12, offset: Offset(0, -.1), blurRadius: 0)

diff --git a/lib/widgets/customAppBar.dart b/lib/widgets/customAppBar.dart
@@ -137,7 +137,7 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
         child: Container(
           color: isBottomLine
               ? Colors.grey.shade200
-              : Theme.of(context).backgroundColor,
+              : Theme.of(context).scaffoldBackgroundColor,
           height: 1.0,
         ),
         preferredSize: const Size.fromHeight(0.0),

diff --git a/lib/widgets/customWidgets.dart b/lib/widgets/customWidgets.dart
@@ -44,7 +44,7 @@ Widget customText(
   TextAlign textAlign = TextAlign.justify,
   TextOverflow overflow = TextOverflow.visible,
   BuildContext? context,
-  bool softwrap = true,
+  bool softWrap = true,
   int? maxLines,
 }) {
   if (msg == null) {
@@ -55,7 +55,7 @@ Widget customText(
   } else {
     if (context != null && style != null) {
       var fontSize =
-          style.fontSize ?? Theme.of(context).textTheme.bodyText1!.fontSize;
+          style.fontSize ?? Theme.of(context).textTheme.bodyMedium!.fontSize;
       style = style.copyWith(
         fontSize: fontSize! - (context.width <= 375 ? 2 : 0),
       );
@@ -65,7 +65,7 @@ Widget customText(
       style: style,
       textAlign: textAlign,
       overflow: overflow,
-      softWrap: softwrap,
+      softWrap: softWrap,
       key: key,
       maxLines: maxLines,
     );

diff --git a/lib/widgets/newWidget/customLoader.dart b/lib/widgets/newWidget/customLoader.dart
@@ -31,7 +31,7 @@ class CustomLoader {
   }
 
   showLoader(context) {
-    _overlayState = Overlay.of(context)!;
+    _overlayState = Overlay.of(context);
     _buildLoader();
     _overlayState!.insert(_overlayEntry!);
   }

diff --git a/lib/widgets/tweet/widgets/tweetImage.dart b/lib/widgets/tweet/widgets/tweetImage.dart
@@ -46,7 +46,7 @@ class TweetImage extends StatelessWidget {
                         context.width * (type == TweetType.Detail ? .95 : .8) -
                             8,
                     decoration: BoxDecoration(
-                      color: Theme.of(context).backgroundColor,
+                      color: Theme.of(context).scaffoldBackgroundColor,
                     ),
                     child: AspectRatio(
                       aspectRatio: 4 / 3,