Merge pull request #11 from LonelyCpp/dev

Dev

Author: Ananthu P Kanive

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  package="com.ananthu.flutter_weather">
 
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
  <!-- io.flutter.app.FlutterApplication is an android.app.Application that
  calls FlutterMain.startInitialization(this); in its onCreate method.
  In most cases you can leave this as-is, but you if you want to provide

android/gradle.properties

@@ -1 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
+android.enableJetifier=true

ios/Podfile.lock

@@ -1,20 +1,44 @@
 PODS:
  - Flutter (1.0.0)
+ - geolocator (5.0.1):
+ - Flutter
+ - google_api_availability (2.0.1):
+ - Flutter
+ - location_permissions (2.0.2):
+ - Flutter
+ - permission_handler (3.1.0):
+ - Flutter
  - shared_preferences (0.0.1):
  - Flutter
 
 DEPENDENCIES:
  - Flutter (from `.symlinks/flutter/ios`)
+ - geolocator (from `.symlinks/plugins/geolocator/ios`)
+ - google_api_availability (from `.symlinks/plugins/google_api_availability/ios`)
+ - location_permissions (from `.symlinks/plugins/location_permissions/ios`)
+ - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
  - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
 
 EXTERNAL SOURCES:
  Flutter:
  :path: ".symlinks/flutter/ios"
+ geolocator:
+ :path: ".symlinks/plugins/geolocator/ios"
+ google_api_availability:
+ :path: ".symlinks/plugins/google_api_availability/ios"
+ location_permissions:
+ :path: ".symlinks/plugins/location_permissions/ios"
+ permission_handler:
+ :path: ".symlinks/plugins/permission_handler/ios"
  shared_preferences:
  :path: ".symlinks/plugins/shared_preferences/ios"
 
 SPEC CHECKSUMS:
  Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
+ geolocator: ac98a5fcdddd7fcbae404b136ab9c33bf08739c7
+ google_api_availability: cd29400b9c6eb73b0978f609f0ad66f41dfa90b4
+ location_permissions: 974d8fbc3ec5fed16908492a5e03bcb3372fcfd9
+ permission_handler: a1b8c0f8c83b4e7201f9c04b9aef09979cc97f60
  shared_preferences: 5a1d487c427ee18fcd3ea1f2a131569481834b53
 
 PODFILE CHECKSUM: aff02bfeed411c636180d6812254b2daeea14d09

ios/Runner/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+<key>NSLocationWhenInUseUsageDescription</key>
+<string>Your location will be used to determine the current weather</string>
 <key>CFBundleDevelopmentRegion</key>
 <string>en</string>
 <key>CFBundleExecutable</key>

lib/main.dart

@@ -54,6 +54,7 @@ class _AppStateContainerState extends State<AppStateContainer> {
  int themeCode = Themes.DARK_THEME_CODE;
  TemperatureUnit temperatureUnit = TemperatureUnit.celsius;
 
+
  @override
  initState() {
  super.initState();
@@ -63,7 +64,7 @@ class _AppStateContainerState extends State<AppStateContainer> {
  Themes.DARK_THEME_CODE;
  temperatureUnit = TemperatureUnit.values[
  sharedPref.getInt(CONSTANTS.SHARED_PREF_KEY_TEMPERATURE_UNIT) ??
- TemperatureUnit.kelvin];
+ TemperatureUnit.celsius.index];
  this._theme = Themes.getTheme(themeCode);
  });
  });
@@ -95,7 +96,7 @@ class _AppStateContainerState extends State<AppStateContainer> {
  this.temperatureUnit = unit;
  });
  SharedPreferences.getInstance().then((sharedPref) {
- sharedPref.setInt(CONSTANTS.SHARED_PREF_KEY_THEME, unit.index);
+ sharedPref.setInt(CONSTANTS.SHARED_PREF_KEY_TEMPERATURE_UNIT, unit.index);
  });
  }
 }

lib/src/api/weather_api_client.dart

@@ -13,6 +13,19 @@ class WeatherApiClient {
  : assert(httpClient != null),
  assert(apiKey != null);
 
+ Future<String> getCityNameFromLocation(
+ {double latitude, double longitude}) async {
+ final url =
+ '$baseUrl/data/2.5/weather?lat=$latitude&lon=$longitude&appid=$apiKey';
+ print('fetching $url');
+ final res = await this.httpClient.get(url);
+ if (res.statusCode != 200) {
+ throw HTTPException(res.statusCode, "unable to fetch weather data");
+ }
+ final weatherJson = json.decode(res.body);
+ return weatherJson['name'];
+ }
+
  Future<Weather> getWeatherData(String cityName) async {
  final url = '$baseUrl/data/2.5/weather?q=$cityName&appid=$apiKey';
  print('fetching $url');

lib/src/bloc/weather_bloc.dart

@@ -24,7 +24,7 @@ class WeatherBloc extends Bloc<WeatherEvent, WeatherState> {
  yield WeatherLoading();
  try {
  final Weather weather =
- await weatherRepository.getWeather(event.cityName);
+ await weatherRepository.getWeather(event.cityName, latitude: event.latitude, longitude: event.longitude);
  yield WeatherLoaded(weather: weather);
  } catch (exception) {
  print(exception);

lib/src/bloc/weather_event.dart

@@ -1,14 +1,16 @@
 import 'package:equatable/equatable.dart';
-import 'package:meta/meta.dart';
 
 abstract class WeatherEvent extends Equatable {
  WeatherEvent([List props = const []]) : super(props);
 }
 
 class FetchWeather extends WeatherEvent {
  final String cityName;
+ final double longitude;
+ final double latitude;
 
- FetchWeather({@required this.cityName})
- : assert(cityName != null),
- super([cityName]);
+ FetchWeather({this.cityName, this.longitude, this.latitude})
+ : assert(cityName != null || longitude != null || latitude != null),
+ super([cityName, longitude, latitude]);
 }
+

lib/src/repository/weather_repository.dart

@@ -7,7 +7,10 @@ class WeatherRepository {
  WeatherRepository({@required this.weatherApiClient})
  : assert(weatherApiClient != null);
 
- Future<Weather> getWeather(String cityName) async {
+ Future<Weather> getWeather(String cityName, {double latitude, double longitude}) async {
+ if(cityName == null){
+ cityName = await weatherApiClient.getCityNameFromLocation(latitude: latitude, longitude: longitude);
+ }
  var weather = await weatherApiClient.getWeatherData(cityName);
  var weathers = await weatherApiClient.getForecast(cityName);
  weather.forecast = weathers;

lib/src/screens/weather_screen.dart

@@ -10,6 +10,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_weather/src/widgets/weather_widget.dart';
 import 'package:http/http.dart' as http;
 import 'package:intl/intl.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:permission_handler/permission_handler.dart';
 
 enum OptionsMenu { changeCity, settings }
 
@@ -32,7 +34,9 @@ class _WeatherScreenState extends State<WeatherScreen>
  void initState() {
  super.initState();
  _weatherBloc = WeatherBloc(weatherRepository: widget.weatherRepository);
- _weatherBloc.dispatch(FetchWeather(cityName: _cityName));
+ _fetchWeatherWithLocation().catchError((error) {
+ _fetchWeatherWithCity();
+ });
  _fadeController = AnimationController(
  duration: const Duration(milliseconds: 1000), vsync: this);
  _fadeAnimation =
@@ -49,7 +53,7 @@ class _WeatherScreenState extends State<WeatherScreen>
  mainAxisAlignment: MainAxisAlignment.center,
  children: <Widget>[
  Text(
- DateFormat('EEEE, MMMM yyyy').format(DateTime.now()),
+ DateFormat('EEEE, d MMMM yyyy').format(DateTime.now()),
  style: TextStyle(
  color: AppStateContainer.of(context)
  .theme
@@ -90,6 +94,7 @@ class _WeatherScreenState extends State<WeatherScreen>
  bloc: _weatherBloc,
  builder: (_, WeatherState weatherState) {
  if (weatherState is WeatherLoaded) {
+ this._cityName = weatherState.weather.cityName;
  _fadeController.reset();
  _fadeController.forward();
  return WeatherWidget(
@@ -131,7 +136,7 @@ class _WeatherScreenState extends State<WeatherScreen>
  .theme
  .accentColor),
  ),
- onPressed: _fetchWeather,
+ onPressed: _fetchWeatherWithCity,
  )
  ],
  );
@@ -161,24 +166,37 @@ class _WeatherScreenState extends State<WeatherScreen>
  FlatButton(
  child: Text(
  'ok',
- style: TextStyle(color: Colors.black),
+ style: TextStyle(color: Colors.black, fontSize: 16),
  ),
  onPressed: () {
- _fetchWeather();
+ _fetchWeatherWithCity();
  Navigator.of(context).pop();
  },
- )
+ ),
  ],
  content: TextField(
  autofocus: true,
  onChanged: (text) {
  _cityName = text;
  },
  decoration: InputDecoration(
- hintText: 'Enter the name of your city',
- hintStyle: TextStyle(color: Colors.black),
- ),
+ hintText: 'Name of your city',
+ hintStyle: TextStyle(color: Colors.black),
+ suffixIcon: GestureDetector(
+ onTap: () {
+ _fetchWeatherWithLocation().catchError((error) {
+ _fetchWeatherWithCity();
+ });
+ Navigator.of(context).pop();
+ },
+ child: Icon(
+ Icons.my_location,
+ color: Colors.black,
+ size: 16,
+ ),
+ )),
  style: TextStyle(color: Colors.black),
+ cursorColor: Colors.black,
  ),
  );
  });
@@ -195,7 +213,52 @@ class _WeatherScreenState extends State<WeatherScreen>
  }
  }
 
- _fetchWeather() {
+ _fetchWeatherWithCity() {
  _weatherBloc.dispatch(FetchWeather(cityName: _cityName));
  }
+
+ _fetchWeatherWithLocation() async {
+ var permissionHandler = PermissionHandler();
+ var permissionResult = await permissionHandler
+ .requestPermissions([PermissionGroup.locationWhenInUse]);
+
+ switch (permissionResult[PermissionGroup.locationWhenInUse]) {
+ case PermissionStatus.denied:
+ case PermissionStatus.unknown:
+ print('location permission denied');
+ _showLocationDeniedDialog(permissionHandler);
+ throw Error();
+ }
+
+ Position position = await Geolocator()
+ .getCurrentPosition(desiredAccuracy: LocationAccuracy.low);
+ print(position);
+ _weatherBloc.dispatch(FetchWeather(
+ longitude: position.longitude, latitude: position.latitude));
+ }
+
+ void _showLocationDeniedDialog(PermissionHandler permissionHandler) {
+ showDialog(
+ context: context,
+ barrierDismissible: true,
+ builder: (BuildContext context) {
+ return AlertDialog(
+ backgroundColor: Colors.white,
+ title: Text('Location is disabled :(',
+ style: TextStyle(color: Colors.black)),
+ actions: <Widget>[
+ FlatButton(
+ child: Text(
+ 'Enable!',
+ style: TextStyle(color: Colors.green, fontSize: 16),
+ ),
+ onPressed: () {
+ permissionHandler.openAppSettings().then((val) => print(val));
+ Navigator.of(context).pop();
+ },
+ ),
+ ],
+ );
+ });
+ }
 }