Merge branch 'coldfix' into 'master'

Coldfix

See merge request !1

.gitignore

@@ -8,6 +8,8 @@
 .buildlog/
 .history
 .svn/
+local.properties
+key.jks
 
 # IntelliJ related
 *.iml

.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>pilar-mobile</name>
+	<comment>Project pilar-mobile created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1614337149389</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

.settings/org.eclipse.buildship.core.prefs

+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Library/Java/JavaVirtualMachines/jdk-11.0.7.jdk/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true

android/app/build.gradle

@@ -43,7 +43,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.home.industry"
+        applicationId "com.pilar.mobile"
         minSdkVersion 18
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()

android/app/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
          FlutterApplication and put your custom class here. -->
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="Industri Pilar"
+        android:label="Pilar Mobile"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

lib/Component/bottom_navigation_bar.dart

 import 'package:animations/animations.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:home_industry/Component/cart_icon.dart';
 import 'package:home_industry/Component/router.dart';

lib/Component/cart_icon.dart

 import 'package:badges/badges.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:home_industry/Component/router.dart';
 import 'package:home_industry/Pages/Cart/bloc/bloc.dart';

lib/Pages/Cart/cart.dart

-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:home_industry/Component/blue_button.dart';
 import 'package:home_industry/Component/custom_circular.dart';

lib/Pages/Donation/donation_dialog.dart

-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:home_industry/Component/router.dart';
 import 'package:home_industry/Pages/Program/model/program.dart';
 

lib/Pages/DonationHistory/donation_history.dart

 import 'dart:async';
 
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter/rendering.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:home_industry/Component/custom_circular.dart';

lib/Pages/Home/home_page.dart

-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:home_industry/Component/circular_image.dart';
 import 'package:home_industry/Component/custom_circular.dart';

lib/Pages/Login/login_phone.dart

-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:home_industry/Component/custom_input_form.dart';

lib/Pages/Product/category_page.dart

-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter/rendering.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:home_industry/Component/custom_circular.dart';

lib/Pages/Product/component/list_product_grid.dart

-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:home_industry/Component/custom_circular.dart';
 import 'package:home_industry/Component/price_text_formatter.dart';

lib/Pages/Product/component/product_item_list.dart

-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:home_industry/Component/price_text_formatter.dart';
 import 'package:home_industry/Component/product_image.dart';

lib/Pages/Product/component/scaffold_sliver.dart

-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter/rendering.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:home_industry/Component/price_text_formatter.dart';

lib/Pages/Product/detail_product.dart

-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:home_industry/Component/blue_button.dart';
 import 'package:home_industry/Component/border_blue_button.dart';

lib/Pages/Product/subcategory_page.dart

-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:home_industry/Component/custom_circular.dart';
 import 'package:home_industry/Component/product_image.dart';

lib/Pages/Program/program_page.dart

-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter/painting.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

lib/Pages/Summary/summary_page.dart

-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';