diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies
index fb42347..c068602 100644
--- a/.flutter-plugins-dependencies
+++ b/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"google_places_picker","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_places_picker-2.1.0+2\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+2\\\\","dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-1.0.8\\\\","dependencies":[]},{"name":"google_places_picker","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_places_picker-2.1.0+2\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+2\\\\","dependencies":["flutter_plugin_android_lifecycle"]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"google_places_picker","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]}],"date_created":"2020-06-26 22:39:06.633075","version":"1.20.0-1.0.pre"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"google_places_picker","path":"D:\\\\program_app\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_places_picker-2.1.0+3\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\program_app\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+22\\\\","dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"D:\\\\program_app\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-1.0.11\\\\","dependencies":[]},{"name":"google_places_picker","path":"D:\\\\program_app\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_places_picker-2.1.0+3\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\program_app\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+22\\\\","dependencies":["flutter_plugin_android_lifecycle"]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"google_places_picker","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]}],"date_created":"2022-01-14 00:13:07.508169","version":"2.8.1"}
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index f8d97c1..ce47e82 100644
--- 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 27
+    compileSdkVersion 29
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -40,7 +40,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.nb.flutteruishopping"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 212794a..d70ed42 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -41,5 +41,8 @@
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="YOUR_API_KEY"/>
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
 </manifest>
diff --git a/android/app/src/main/kotlin/com/nb/flutteruishopping/MainActivity.kt b/android/app/src/main/kotlin/com/nb/flutteruishopping/MainActivity.kt
index 20b82af..e713d58 100644
--- a/android/app/src/main/kotlin/com/nb/flutteruishopping/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/nb/flutteruishopping/MainActivity.kt
@@ -2,12 +2,8 @@ package com.nb.flutteruishopping
 
 import android.os.Bundle
 
-import io.flutter.app.FlutterActivity
-import io.flutter.plugins.GeneratedPluginRegistrant
+import io.flutter.embedding.android.FlutterActivity
+
 
 class MainActivity: FlutterActivity() {
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    GeneratedPluginRegistrant.registerWith(this)
-  }
 }
diff --git a/android/build.gradle b/android/build.gradle
index cee685d..0e46939 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index 7be3d8b..a673820 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,2 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
+android.enableJetifier=true
 android.enableR8=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 2819f02..bc6a58a 100644
--- 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-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh
index 8f3a788..b86360e 100644
--- a/ios/Flutter/flutter_export_environment.sh
+++ b/ios/Flutter/flutter_export_environment.sh
@@ -1,14 +1,13 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=D:\flutter"
-export "FLUTTER_APPLICATION_PATH=D:\flutter-ui-nice"
+export "FLUTTER_ROOT=D:\program_app\flutter"
+export "FLUTTER_APPLICATION_PATH=D:\program_data\flutter\flutter-ui-nice"
+export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_TARGET=lib\main.dart"
 export "FLUTTER_BUILD_DIR=build"
-export "SYMROOT=${SOURCE_ROOT}/../build\ios"
-export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
-export "FLUTTER_FRAMEWORK_DIR=D:\flutter\bin\cache\artifacts\engine\ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=false"
 export "TREE_SHAKE_ICONS=false"
+export "PACKAGE_CONFIG=.packages"
diff --git a/lib/page/feed/FeedPageOne.dart b/lib/page/feed/FeedPageOne.dart
index 56bfa44..de18b50 100644
--- a/lib/page/feed/FeedPageOne.dart
+++ b/lib/page/feed/FeedPageOne.dart
@@ -99,7 +99,7 @@ class _FeedState extends State<FeedPageOne> {
                     child: Text('+33',
                         style: Theme.of(context)
                             .textTheme
-                            .title
+                            .headline6
                             .copyWith(color: Colors.white)),
                   ),
                 )),
diff --git a/lib/page/shopping/ShopPageEighteen.dart b/lib/page/shopping/ShopPageEighteen.dart
index 28579b3..ae528b9 100644
--- a/lib/page/shopping/ShopPageEighteen.dart
+++ b/lib/page/shopping/ShopPageEighteen.dart
@@ -58,11 +58,10 @@ class _ShopEighteenState extends State<ShopPageEighteen> {
             prefix: Text(
               name + "        ",
             ),
-            hasFloatingPlaceholder: false,
             hintStyle: TextStyle(color: Colors.white),
             // helperText: 'Keep it short, this is just a demo.',
             labelText: name,
-            labelStyle: TextStyle(color: Colors.black),
+            labelStyle: TextStyle(color: Colors.black), floatingLabelBehavior: FloatingLabelBehavior.never,
             // prefixText: 'Email ',
             // suffixText: 'USD',
             // suffixStyle: const TextStyle(color: Colors.green)
diff --git a/lib/page/shopping/ShopPageNineteen.dart b/lib/page/shopping/ShopPageNineteen.dart
index 622a7d0..ba35cec 100644
--- a/lib/page/shopping/ShopPageNineteen.dart
+++ b/lib/page/shopping/ShopPageNineteen.dart
@@ -39,8 +39,7 @@ class _ShopNineteenState extends State<ShopPageNineteen> {
   Widget textfield(String hint) {
     return TextField(
       decoration: InputDecoration(
-        hasFloatingPlaceholder: false,
-        labelText: hint,
+        labelText: hint, floatingLabelBehavior: FloatingLabelBehavior.never,
       ),
     );
   }
diff --git a/lib/page/signup/SignPageSix.dart b/lib/page/signup/SignPageSix.dart
index 7961cb8..252a1db 100644
--- a/lib/page/signup/SignPageSix.dart
+++ b/lib/page/signup/SignPageSix.dart
@@ -243,7 +243,7 @@ class _SignPageSixState extends State<SignPageSix>
     ];
 
     return Scaffold(
-      resizeToAvoidBottomPadding: false,
+      resizeToAvoidBottomInset: false,
       body: Stack(
         overflow: Overflow.visible,
         fit: StackFit.expand,
diff --git a/lib/page/signup/SingPageTen.dart b/lib/page/signup/SingPageTen.dart
index 0c56127..e65254c 100644
--- a/lib/page/signup/SingPageTen.dart
+++ b/lib/page/signup/SingPageTen.dart
@@ -37,7 +37,7 @@ class _SignPageTeenState extends State<SignPageTeen>
     ];
 
     return Scaffold(
-      resizeToAvoidBottomPadding: false,
+      resizeToAvoidBottomInset: false,
       appBar: SignupApbar(
         title: "CREATE ACCOUNT",
       ),