Merge pull request #2 from morenosh/resolve-issues

Resolve issues

Author: ArizArmeidi

android/settings.gradle

@@ -9,3 +9,17 @@ localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
 def flutterSdkPath = properties.getProperty("flutter.sdk")
 assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
 apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+
+
+def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+
+def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
+if (pluginsFile.exists()) {
+    pluginsFile.withReader('UTF-8') { reader -> properties.load(reader) }
+}
+
+properties.each { name, path ->
+    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
+    include ":$name"
+    project(":$name").projectDir = pluginDirectory
+}

lib/main.dart

@@ -29,8 +29,9 @@ class MyApp extends StatelessWidget {
           ),
           scaffoldBackgroundColor: Colors.white,
           primaryColor: Colors.blue,
-          accentColor: Colors.white,
           visualDensity: VisualDensity.adaptivePlatformDensity,
+          colorScheme:
+              ColorScheme.fromSwatch().copyWith(secondary: Colors.white),
         ),
         home: HomeScreen(),
         routes: {

lib/widgets/mainWeather.dart

@@ -24,9 +24,7 @@ class MainWeather extends StatelessWidget {
       padding: EdgeInsets.fromLTRB(25, 15, 25, 5),
       height: MediaQuery.of(context).size.height / 3.4,
       width: MediaQuery.of(context).size.width,
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        mainAxisAlignment: MainAxisAlignment.start,
+      child: ListView(
         children: [
           Row(
             mainAxisAlignment: MainAxisAlignment.center,

lib/widgets/sevenDayForecast.dart

@@ -28,7 +28,7 @@ class SevenDayForecast extends StatelessWidget {
           Padding(
             padding: const EdgeInsets.fromLTRB(5, 5, 5, 20),
             child:
-                MapString.mapStringToIcon('${weather.condition}', context, 35),
+            MapString.mapStringToIcon('${weather.condition}', context, 35),
           ),
           Text(
             '${weather.condition}',
@@ -70,9 +70,7 @@ class SevenDayForecast extends StatelessWidget {
               ),
             ],
           ),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.spaceAround,
-            crossAxisAlignment: CrossAxisAlignment.start,
+          child: ListView(
             children: [
               Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -105,16 +103,12 @@ class SevenDayForecast extends StatelessWidget {
                 ],
               ),
               SizedBox(height: 15),
-              Expanded(
-                child: ListView(
-                  scrollDirection: Axis.horizontal,
-                  children: [
-                    Row(
-                      children: dWeather
-                          .map((item) => dailyWidget(item, context))
-                          .toList(),
-                    ),
-                  ],
+              SingleChildScrollView(
+                scrollDirection: Axis.horizontal,
+                child: Row(
+                  children: dWeather
+                      .map((item) => dailyWidget(item, context))
+                      .toList(),
                 ),
               ),
             ],