FIX icons and textbuttons

android/app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
    <application
         android:label="flutter_ecommerce_template"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"
             android:exported="true"

lib/screens/auth/forgot_password_page.dart

@@ -1,9 +1,5 @@
-
 import 'package:ecommerce_int2/app_properties.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:country_code_picker/country_code_picker.dart';
-
 
 import 'confirm_otp_page.dart';
 
@@ -18,21 +14,6 @@ class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
   GlobalKey prefixKey = GlobalKey();
   double prefixWidth = 0;
 
-  Widget prefix() {
-    return Container(
-      key: prefixKey,
-      //padding: EdgeInsets.fromLTRB(12.0, 20.0, 12.0, 12.0),
-      margin: EdgeInsets.only(right: 4.0),
-      decoration: BoxDecoration(
-          border: Border(bottom: BorderSide(color: Colors.black, width: 0.5))),
-      child: CountryCodePicker(
-        initialSelection: 'GT',
-
-        favorite: ['+1','US'],
-      )
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
     Widget background = Container(
@@ -73,7 +54,8 @@ class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
       bottom: 40,
       child: InkWell(
         onTap: () {
-          Navigator.of(context).push(MaterialPageRoute(builder:(_)=>ConfirmOtpPage()));
+          Navigator.of(context)
+              .push(MaterialPageRoute(builder: (_) => ConfirmOtpPage()));
         },
         child: Container(
           width: MediaQuery.of(context).size.width / 2,
@@ -113,7 +95,7 @@ class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
           Container(
             height: 100,
             width: MediaQuery.of(context).size.width,
-            padding: const EdgeInsets.only(left: 32.0, right: 12.0,bottom: 30),
+            padding: const EdgeInsets.only(left: 32.0, right: 12.0, bottom: 30),
             decoration: BoxDecoration(
                 color: Color.fromRGBO(255, 255, 255, 0.8),
                 borderRadius: BorderRadius.only(
@@ -122,7 +104,6 @@ class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.end,
               children: <Widget>[
-                prefix(),
                 Flexible(
                   child: Padding(
                     padding: const EdgeInsets.only(top: 8.0),
@@ -170,16 +151,11 @@ class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
     return GestureDetector(
       onTap: () => FocusScope.of(context).requestFocus(new FocusNode()),
       child: Container(
-        decoration:BoxDecoration(
-            image:DecorationImage(
-                image: AssetImage('assets/background.jpg'),
-                fit: BoxFit.cover
-            )
-        ),
+        decoration: BoxDecoration(
+            image: DecorationImage(
+                image: AssetImage('assets/background.jpg'), fit: BoxFit.cover)),
         child: Container(
-          decoration: BoxDecoration(
-            color:transparentYellow
-          ),
+          decoration: BoxDecoration(color: transparentYellow),
           child: Scaffold(
             appBar: AppBar(
               backgroundColor: Colors.transparent,
@@ -211,5 +187,3 @@ class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
     );
   }
 }
-
-

lib/screens/intro_page.dart

@@ -167,7 +167,7 @@ class _IntroPageState extends State<IntroPage> {
                       children: <Widget>[
                         Opacity(
                           opacity: pageIndex != 2 ? 1.0 : 0.0,
-                          child: ElevatedButton(
+                          child: TextButton(
                             child: Text(
                               'SKIP',
                               style: TextStyle(
@@ -183,7 +183,7 @@ class _IntroPageState extends State<IntroPage> {
                           ),
                         ),
                         pageIndex != 2
-                            ? ElevatedButton(
+                            ? TextButton(
                                 child: Text(
                                   'NEXT',
                                   style: TextStyle(
@@ -198,7 +198,7 @@ class _IntroPageState extends State<IntroPage> {
                                         curve: Curves.linear);
                                 },
                               )
-                            : ElevatedButton(
+                            : TextButton(
                                 child: Text(
                                   'FINISH',
                                   style: TextStyle(

lib/screens/main/components/product_list.dart

@@ -31,7 +31,7 @@ class ProductList extends StatelessWidget {
         fade: 0.5,
         pagination: SwiperCustomPagination(
           builder: (context, config) {
-            if (config!.itemCount! > 20) {
+            if (config.itemCount > 20) {
               print(
                   "The itemCount is too big, we suggest use FractionPaginationBuilder instead of DotSwiperPaginationBuilder in this sitituation");
             }
@@ -43,7 +43,7 @@ class ProductList extends StatelessWidget {
             if (config.indicatorLayout != PageIndicatorLayout.NONE &&
                 config.layout == SwiperLayout.DEFAULT) {
               return new PageIndicator(
-                count: config.itemCount!,
+                count: config.itemCount,
                 controller: config.pageController!,
                 layout: config.indicatorLayout,
                 size: size,
@@ -55,8 +55,8 @@ class ProductList extends StatelessWidget {
 
             List<Widget> dots = [];
 
-            int itemCount = config.itemCount!;
-            int activeIndex = config.activeIndex!;
+            int itemCount = config.itemCount;
+            int activeIndex = config.activeIndex;
 
             for (int i = 0; i < itemCount; ++i) {
               bool active = i == activeIndex;

pubspec.yaml

@@ -27,12 +27,10 @@ dependencies:
   flutter_staggered_grid_view: ^0.6.2
   rubber: ^1.0.1
   pin_code_text_field: ^1.8.0
-  country_code_picker: ^2.0.2
   http: ^0.13.4
   flutter_rating_bar: ^4.0.0
   intl: ^0.18.0
   numberpicker: ^2.1.1
-  flare_splash_screen: ^4.0.0
   flutter_svg: ^2.0.2