add theme switch option

add humidity and wind speed data

Author: Ananthu Kanive

ios/Flutter/Debug.xcconfig

@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

lib/main.dart

@@ -2,10 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_weather/src/screens/weather_screen.dart';
 import 'package:bloc/bloc.dart';
 import 'package:flutter_weather/src/themes.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 void main() {
  BlocSupervisor().delegate = SimpleBlocDelegate();
- runApp(RootWidget());
+ runApp(AppStateContainer(child: WeatherApp()));
 }
 
 class SimpleBlocDelegate extends BlocDelegate {
@@ -16,25 +17,19 @@ class SimpleBlocDelegate extends BlocDelegate {
  }
 }
 
-class RootWidget extends StatelessWidget {
- @override
- Widget build(BuildContext context) {
- return AppStateContainer(child: WeatherApp());
- }
-}
-
 class WeatherApp extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
- return AppStateContainer(
- child: MaterialApp(
+ return MaterialApp(
  title: 'Flutter Weather App',
  theme: AppStateContainer.of(context).theme,
  home: WeatherScreen(),
- ));
+ );
  }
 }
 
+/// top level widget to hold application state
+/// state is passed down with an inherited widget
 class AppStateContainer extends StatefulWidget {
  final Widget child;
 
@@ -51,7 +46,19 @@ class AppStateContainer extends StatefulWidget {
 }
 
 class _AppStateContainerState extends State<AppStateContainer> {
- ThemeData _theme = Themes.light;
+ ThemeData _theme = Themes.getTheme(Themes.DARK_THEME_CODE);
+
+ @override
+ initState() {
+ super.initState();
+ SharedPreferences.getInstance().then((sharedPref) {
+ int themeCode =
+ sharedPref.getInt(Themes.SHARED_PREF_KEY) ?? Themes.DARK_THEME_CODE;
+ setState(() {
+ this._theme = Themes.getTheme(themeCode);
+ });
+ });
+ }
 
  @override
  Widget build(BuildContext context) {
@@ -64,9 +71,12 @@ class _AppStateContainerState extends State<AppStateContainer> {
 
  ThemeData get theme => _theme;
 
- updateTheme(ThemeData value) {
+ updateTheme(int themeCode) {
  setState(() {
- _theme = value;
+ _theme = Themes.getTheme(themeCode);
+ });
+ SharedPreferences.getInstance().then((sharedPref) {
+ sharedPref.setInt(Themes.SHARED_PREF_KEY, themeCode);
  });
  }
 }

lib/src/screens/weather_screen.dart

@@ -195,10 +195,10 @@ class _WeatherScreenState extends State<WeatherScreen>
  this._showCityChangeDialog();
  break;
  case OptionsMenu.nightMode:
- AppStateContainer.of(context).updateTheme(Themes.dark);
+ AppStateContainer.of(context).updateTheme(Themes.DARK_THEME_CODE);
  break;
  case OptionsMenu.lightMode:
- AppStateContainer.of(context).updateTheme(Themes.light);
+ AppStateContainer.of(context).updateTheme(Themes.LIGHT_THEME_CODE);
  break;
  }
  }

lib/src/themes.dart

@@ -1,7 +1,11 @@
 import 'package:flutter/material.dart';
 
 class Themes {
- static final dark = ThemeData(
+ static const SHARED_PREF_KEY = "theme_code";
+ static const DARK_THEME_CODE = 0;
+ static const LIGHT_THEME_CODE = 1;
+
+ static final _dark = ThemeData(
  primarySwatch: MaterialColor(
  Colors.black.value,
  const <int, Color>{
@@ -19,7 +23,8 @@ class Themes {
  ),
  accentColor: Colors.white,
  );
- static final light = ThemeData(
+
+ static final _light = ThemeData(
  primarySwatch: MaterialColor(
  Colors.white.value,
  const <int, Color>{
@@ -37,4 +42,12 @@ class Themes {
  ),
  accentColor: Colors.black,
  );
+
+ static ThemeData getTheme(int code) {
+ if(code == LIGHT_THEME_CODE){
+ return _light;
+ }
+ return _dark;
+ }
+
 }

lib/src/widgets/forecast_horizontal_widget.dart

@@ -30,7 +30,7 @@ class ForecastHorizontal extends StatelessWidget {
  padding: const EdgeInsets.only(left: 10, right: 10),
  child: Center(
  child: ValueTile(
- DateFormat('h aa').format(
+ DateFormat('E, ha').format(
  DateTime.fromMillisecondsSinceEpoch(item.time * 1000)),
  '${item.temperature.celsius.round()}°',
  iconData: item.getIconData(),

lib/src/widgets/weather_widget.dart

@@ -54,8 +54,7 @@ class WeatherWidget extends StatelessWidget {
  color: AppStateContainer.of(context).theme.accentColor),
  ),
  Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
- ValueTile(
- "max", '${this.weather.maxTemperature.celsius.round()}°'),
+ ValueTile("max", '${this.weather.maxTemperature.celsius.round()}°'),
  Padding(
  padding: const EdgeInsets.only(left: 20, right: 20),
  child: Center(
@@ -68,34 +67,41 @@ class WeatherWidget extends StatelessWidget {
  .withAlpha(50),
  )),
  ),
- ValueTile(
- "min", '${this.weather.minTemperature.celsius.round()}°'),
+ ValueTile("min", '${this.weather.minTemperature.celsius.round()}°'),
  ]),
  Padding(
  child: Divider(
- color: AppStateContainer.of(context)
- .theme
- .accentColor
- .withAlpha(50),
+ color:
+ AppStateContainer.of(context).theme.accentColor.withAlpha(50),
  ),
  padding: EdgeInsets.all(10),
  ),
  ForecastHorizontal(weathers: weather.forecast),
  Padding(
  child: Divider(
- color: AppStateContainer.of(context)
- .theme
- .accentColor
- .withAlpha(50),
+ color:
+ AppStateContainer.of(context).theme.accentColor.withAlpha(50),
  ),
  padding: EdgeInsets.all(10),
  ),
  Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
+ ValueTile("wind speed", '${this.weather.windSpeed} m/s'),
+ Padding(
+ padding: const EdgeInsets.only(left: 20, right: 20),
+ child: Center(
+ child: Container(
+ width: 1,
+ height: 30,
+ color: AppStateContainer.of(context)
+ .theme
+ .accentColor
+ .withAlpha(50),
+ )),
+ ),
  ValueTile(
  "sunrise",
- DateFormat('h:m a').format(
- DateTime.fromMillisecondsSinceEpoch(
- this.weather.sunrise * 1000))),
+ DateFormat('h:m a').format(DateTime.fromMillisecondsSinceEpoch(
+ this.weather.sunrise * 1000))),
  Padding(
  padding: const EdgeInsets.only(left: 20, right: 20),
  child: Center(
@@ -110,9 +116,21 @@ class WeatherWidget extends StatelessWidget {
  ),
  ValueTile(
  "sunset",
- DateFormat('h:m a').format(
- DateTime.fromMillisecondsSinceEpoch(
- this.weather.sunset * 1000))),
+ DateFormat('h:m a').format(DateTime.fromMillisecondsSinceEpoch(
+ this.weather.sunset * 1000))),
+ Padding(
+ padding: const EdgeInsets.only(left: 20, right: 20),
+ child: Center(
+ child: Container(
+ width: 1,
+ height: 30,
+ color: AppStateContainer.of(context)
+ .theme
+ .accentColor
+ .withAlpha(50),
+ )),
+ ),
+ ValueTile("humidity", '${this.weather.humidity}%'),
  ]),
  ],
  ),

pubspec.lock

@@ -130,6 +130,13 @@ packages:
  url: "https://pub.dartlang.org"
  source: hosted
  version: "0.22.0"
+ shared_preferences:
+ dependency: "direct main"
+ description:
+ name: shared_preferences
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.5.3+1"
  sky_engine:
  dependency: transitive
  description: flutter
@@ -193,3 +200,4 @@ packages:
  version: "2.0.8"
 sdks:
  dart: ">=2.2.0 <3.0.0"
+ flutter: ">=1.5.0 <2.0.0"

pubspec.yaml

@@ -24,6 +24,7 @@ dependencies:
  bloc: ^0.13.0
  flutter_bloc: ^0.13.0
  intl: ^0.15.8
+ shared_preferences: 0.5.3+1
 
  # The following adds the Cupertino Icons font to your application.
  # Use with the CupertinoIcons class for iOS style icons.

test/widget_test.dart

@@ -1,30 +1,3 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility that Flutter provides. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:flutter_weather/main.dart';
-
 void main() {
- testWidgets('Counter increments smoke test', (WidgetTester tester) async {
- // Build our app and trigger a frame.
- await tester.pumpWidget(RootWidget());
-
- // Verify that our counter starts at 0.
- expect(find.text('0'), findsOneWidget);
- expect(find.text('1'), findsNothing);
-
- // Tap the '+' icon and trigger a frame.
- await tester.tap(find.byIcon(Icons.add));
- await tester.pump();
 
- // Verify that our counter has incremented.
- expect(find.text('0'), findsNothing);
- expect(find.text('1'), findsOneWidget);
- });
 }