Upgraded the flutter project. removed deprecated stuff, updated sdk v…

…ersions
Shobu95 · Apr 1, 2023 · 89c5947 · 89c5947
1 parent deb6dab
commit 89c5947
Show file tree

Hide file tree

Showing 11 changed files with 92 additions and 91 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -39,8 +39,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.sewistic_app"
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdkVersion 21
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="Sewistic"
         android:icon="@mipmap/ic_launcher_round">
         <activity

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.4.32'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
diff --git a/lib/screens/core/cart/cart.dart b/lib/screens/core/cart/cart.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:sewistic_app/models/order/cart_item.dart';
 import 'package:sewistic_app/screens/core/cart/widgets/cart_item_card.dart';
@@ -132,10 +131,7 @@ class CartState extends State<Cart> {
                     SizedBox(
                       height: 20,
                     ),
-                    FlatButton(
-                      height: 45,
-                      minWidth: double.infinity,
-                      color: Colors.pink,
+                    TextButton(
                       child: Text(
                         'Enter',
                         style: TextStyle(color: Colors.white, fontSize: 16),
@@ -179,10 +175,7 @@ class CartState extends State<Cart> {
   }
 
   Widget _checkoutBtn(BuildContext context) {
-    return FlatButton(
-      height: 45,
-      color: Colors.pink,
-      disabledColor: Colors.pink[100],
+    return TextButton(
       child: Row(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [

diff --git a/lib/screens/core/checkout/checkout.dart b/lib/screens/core/checkout/checkout.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:sewistic_app/screens/core/checkout/widgets/my_stepper.dart';
 
 class Checkout extends StatefulWidget {
@@ -62,10 +61,7 @@ class _CheckoutState extends State<Checkout> {
   }
 
   Widget _proceedBtn() {
-    return FlatButton(
-      height: 45,
-      color: Colors.pink,
-      disabledColor: Colors.pink[100],
+    return TextButton(
       child: Row(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [

diff --git a/lib/screens/core/core_widgets/bottom_nav_bar.dart b/lib/screens/core/core_widgets/bottom_nav_bar.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import '../core.dart';
 
 class BottomNavBar extends StatefulWidget {
   final Function notifyParent;
@@ -27,23 +26,23 @@ class _BottomNavBarState extends State<BottomNavBar> {
     return const <BottomNavigationBarItem>[
       BottomNavigationBarItem(
         icon: Icon(Icons.home),
-        title: Text('Home'),
+        label: 'Home',
       ),
       BottomNavigationBarItem(
         icon: Icon(Icons.search),
-        title: Text('Search'),
+        label: 'Search',
       ),
       BottomNavigationBarItem(
         icon: Icon(Icons.favorite),
-        title: Text('Wishlist'),
+        label: 'Wishlist',
       ),
       BottomNavigationBarItem(
         icon: Icon(Icons.shopping_basket),
-        title: Text('Orders'),
+        label: 'Orders',
       ),
       BottomNavigationBarItem(
         icon: Icon(Icons.settings),
-        title: Text('Settings'),
+        label: 'Settings',
       ),
     ];
   }

diff --git a/lib/screens/core/product/product_details/product_details.dart b/lib/screens/core/product/product_details/product_details.dart
@@ -1,7 +1,5 @@
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
-import 'package:sewistic_app/models/order/design_type.dart';
 import 'package:sewistic_app/models/product/product.dart';
 import 'package:sewistic_app/screens/core/product/product_details/product_options.dart';
 import 'package:sewistic_app/shared/constants.dart';
@@ -148,9 +146,7 @@ class _ProductDetailsState extends State<ProductDetails> {
               width: 20,
             ),
             Expanded(
-              child: FlatButton(
-                height: 45,
-                color: Theme.of(context).primaryColor,
+              child: TextButton(
                 child: Text(
                   'Order This Design',
                   style: TextStyle(color: Colors.white, fontSize: 16),

diff --git a/lib/screens/core/product/product_details/product_options.dart b/lib/screens/core/product/product_details/product_options.dart
@@ -68,9 +68,7 @@ class ProductOptions extends StatelessWidget {
   Widget _addToCartBtn(BuildContext context) {
     return Padding(
       padding: const EdgeInsets.all(8.0),
-      child: FlatButton(
-        height: 45,
-        color: Colors.pink,
+      child: TextButton(
         child: Row(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [

diff --git a/lib/screens/intro/intro_slider/intro_slider.dart b/lib/screens/intro/intro_slider/intro_slider.dart
@@ -53,9 +53,8 @@ class _IntroSliderState extends State<IntroSlider> {
     );
   }
 
-  FlatButton skipButton() {
-    return FlatButton(
-      splashColor: Colors.pink[500],
+  TextButton skipButton() {
+    return TextButton(
       child: Text(
         "SKIP",
         style: TextStyle(
@@ -84,9 +83,8 @@ class _IntroSliderState extends State<IntroSlider> {
     );
   }
 
-  FlatButton nextButton() {
-    return FlatButton(
-      splashColor: Colors.pink[500],
+  TextButton nextButton() {
+    return TextButton(
       child: Text(
         "NEXT",
         style: TextStyle(