Merge pull request #8 from LonelyCpp/settings_screen

Settings screen

Author: Ananthu P Kanive

README.md

@@ -4,10 +4,11 @@ A Flutter application to view current weather status.
 This is my first project on my journey to learning and understanding flutter and dart.
 
 ![android](./screenshots/android.png?raw=true 'android')
-![ios](./screenshots/ios.png?raw=true 'ios')
+![ios](./screenshots/ios.gif?raw=true 'ios')
 
 ## Features
 - :white_check_mark: Beautiful minimal UI
+- :white_check_mark: Dark and Light themes
 - :white_check_mark: Current temperature, max and min temperature, sunset, sunrise
 - :white_check_mark: Custom icons for each weather condition
 - :white_check_mark: 5 day forecast
@@ -39,8 +40,7 @@ eg:
  ```
 
 ## todo
-- dark and light theme switching
-- persist city name
+- i18n support for multiple languages
 
 ## Acknowledgments
 

ios/Podfile

@@ -0,0 +1,69 @@
+# Uncomment this line to define a global platform for your project
+# platform :ios, '9.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+ 'Debug' => :debug,
+ 'Profile' => :release,
+ 'Release' => :release,
+}
+
+def parse_KV_file(file, separator='=')
+ file_abs_path = File.expand_path(file)
+ if !File.exists? file_abs_path
+ return [];
+ end
+ pods_ary = []
+ skip_line_start_symbols = ["#", "/"]
+ File.foreach(file_abs_path) { |line|
+ next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
+ plugin = line.split(pattern=separator)
+ if plugin.length == 2
+ podname = plugin[0].strip()
+ path = plugin[1].strip()
+ podpath = File.expand_path("#{path}", file_abs_path)
+ pods_ary.push({:name => podname, :path => podpath});
+ else
+ puts "Invalid plugin specification: #{line}"
+ end
+ }
+ return pods_ary
+end
+
+target 'Runner' do
+ # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
+ # referring to absolute paths on developers' machines.
+ system('rm -rf .symlinks')
+ system('mkdir -p .symlinks/plugins')
+
+ # Flutter Pods
+ generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig')
+ if generated_xcode_build_settings.empty?
+ puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter packages get is executed first."
+ end
+ generated_xcode_build_settings.map { |p|
+ if p[:name] == 'FLUTTER_FRAMEWORK_DIR'
+ symlink = File.join('.symlinks', 'flutter')
+ File.symlink(File.dirname(p[:path]), symlink)
+ pod 'Flutter', :path => File.join(symlink, File.basename(p[:path]))
+ end
+ }
+
+ # Plugin Pods
+ plugin_pods = parse_KV_file('../.flutter-plugins')
+ plugin_pods.map { |p|
+ symlink = File.join('.symlinks', 'plugins', p[:name])
+ File.symlink(p[:path], symlink)
+ pod p[:name], :path => File.join(symlink, 'ios')
+ }
+end
+
+post_install do |installer|
+ installer.pods_project.targets.each do |target|
+ target.build_configurations.each do |config|
+ config.build_settings['ENABLE_BITCODE'] = 'NO'
+ end
+ end
+end

ios/Podfile.lock

@@ -0,0 +1,22 @@
+PODS:
+ - Flutter (1.0.0)
+ - shared_preferences (0.0.1):
+ - Flutter
+
+DEPENDENCIES:
+ - Flutter (from `.symlinks/flutter/ios`)
+ - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
+
+EXTERNAL SOURCES:
+ Flutter:
+ :path: ".symlinks/flutter/ios"
+ shared_preferences:
+ :path: ".symlinks/plugins/shared_preferences/ios"
+
+SPEC CHECKSUMS:
+ Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
+ shared_preferences: 5a1d487c427ee18fcd3ea1f2a131569481834b53
+
+PODFILE CHECKSUM: aff02bfeed411c636180d6812254b2daeea14d09
+
+COCOAPODS: 1.5.3

ios/Runner.xcodeproj/project.pbxproj

@@ -19,6 +19,7 @@
 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+FC591B0B7B6AF333797AC39C /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BD1DC290B126F2A57C7C24AF /* libPods-Runner.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -53,6 +54,7 @@
 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+BD1DC290B126F2A57C7C24AF /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -62,12 +64,20 @@
 files = (
 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
 3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
+FC591B0B7B6AF333797AC39C /* libPods-Runner.a in Frameworks */,
 );
 runOnlyForDeploymentPostprocessing = 0;
 };
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+01AE53962CB7FCED0505B703 /* Pods */ = {
+isa = PBXGroup;
+children = (
+);
+name = Pods;
+sourceTree = "<group>";
+};
 9740EEB11CF90186004384FC /* Flutter */ = {
 isa = PBXGroup;
 children = (
@@ -87,7 +97,8 @@
 9740EEB11CF90186004384FC /* Flutter */,
 97C146F01CF9000F007C117D /* Runner */,
 97C146EF1CF9000F007C117D /* Products */,
-CF3B75C9A7D2FA2A4C99F110 /* Frameworks */,
+01AE53962CB7FCED0505B703 /* Pods */,
+ABECF56C9BA414B6288AD0F0 /* Frameworks */,
 );
 sourceTree = "<group>";
 };
@@ -123,19 +134,29 @@
 name = "Supporting Files";
 sourceTree = "<group>";
 };
+ABECF56C9BA414B6288AD0F0 /* Frameworks */ = {
+isa = PBXGroup;
+children = (
+BD1DC290B126F2A57C7C24AF /* libPods-Runner.a */,
+);
+name = Frameworks;
+sourceTree = "<group>";
+};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
 97C146ED1CF9000F007C117D /* Runner */ = {
 isa = PBXNativeTarget;
 buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 buildPhases = (
+74DF3C7EFBE324577AC388F5 /* [CP] Check Pods Manifest.lock */,
 9740EEB61CF901F6004384FC /* Run Script */,
 97C146EA1CF9000F007C117D /* Sources */,
 97C146EB1CF9000F007C117D /* Frameworks */,
 97C146EC1CF9000F007C117D /* Resources */,
 9705A1C41CF9048500538489 /* Embed Frameworks */,
 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+E031359F41A63973EDBB7368 /* [CP] Embed Pods Frameworks */,
 );
 buildRules = (
 );
@@ -157,6 +178,7 @@
 TargetAttributes = {
 97C146ED1CF9000F007C117D = {
 CreatedOnToolsVersion = 7.3.1;
+DevelopmentTeam = 5ZT6D5885Q;
 };
 };
 };
@@ -208,6 +230,28 @@
 shellPath = /bin/sh;
 shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
 };
+74DF3C7EFBE324577AC388F5 /* [CP] Check Pods Manifest.lock */ = {
+isa = PBXShellScriptBuildPhase;
+buildActionMask = 2147483647;
+files = (
+);
+inputFileListPaths = (
+);
+inputPaths = (
+"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+"${PODS_ROOT}/Manifest.lock",
+);
+name = "[CP] Check Pods Manifest.lock";
+outputFileListPaths = (
+);
+outputPaths = (
+"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+);
+runOnlyForDeploymentPostprocessing = 0;
+shellPath = /bin/sh;
+shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+showEnvVarsInLog = 0;
+};
 9740EEB61CF901F6004384FC /* Run Script */ = {
 isa = PBXShellScriptBuildPhase;
 buildActionMask = 2147483647;
@@ -222,6 +266,28 @@
 shellPath = /bin/sh;
 shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 };
+E031359F41A63973EDBB7368 /* [CP] Embed Pods Frameworks */ = {
+isa = PBXShellScriptBuildPhase;
+buildActionMask = 2147483647;
+files = (
+);
+inputFileListPaths = (
+);
+inputPaths = (
+"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
+);
+name = "[CP] Embed Pods Frameworks";
+outputFileListPaths = (
+);
+outputPaths = (
+"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
+);
+runOnlyForDeploymentPostprocessing = 0;
+shellPath = /bin/sh;
+shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+showEnvVarsInLog = 0;
+};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -311,7 +377,7 @@
 buildSettings = {
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-DEVELOPMENT_TEAM = S8QB4VV633;
+DEVELOPMENT_TEAM = 5ZT6D5885Q;
 ENABLE_BITCODE = NO;
 FRAMEWORK_SEARCH_PATHS = (
 "$(inherited)",
@@ -437,6 +503,7 @@
 buildSettings = {
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+DEVELOPMENT_TEAM = 5ZT6D5885Q;
 ENABLE_BITCODE = NO;
 FRAMEWORK_SEARCH_PATHS = (
 "$(inherited)",
@@ -460,6 +527,7 @@
 buildSettings = {
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+DEVELOPMENT_TEAM = 5ZT6D5885Q;
 ENABLE_BITCODE = NO;
 FRAMEWORK_SEARCH_PATHS = (
 "$(inherited)",

ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-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>IDEDidComputeMac32BitWarning</key>
+<true/>
+</dict>
+</plist>

ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,7 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_weather/src/screens/routes.dart';
 import 'package:flutter_weather/src/screens/weather_screen.dart';
 import 'package:bloc/bloc.dart';
 import 'package:flutter_weather/src/themes.dart';
+import 'package:flutter_weather/src/utils/constants.dart';
+import 'package:flutter_weather/src/utils/converters.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 void main() {
@@ -24,6 +27,7 @@ class WeatherApp extends StatelessWidget {
  title: 'Flutter Weather App',
  theme: AppStateContainer.of(context).theme,
  home: WeatherScreen(),
+ routes: Routes.mainRoute,
  );
  }
 }
@@ -47,14 +51,19 @@ class AppStateContainer extends StatefulWidget {
 
 class _AppStateContainerState extends State<AppStateContainer> {
  ThemeData _theme = Themes.getTheme(Themes.DARK_THEME_CODE);
+ int themeCode = Themes.DARK_THEME_CODE;
+ TemperatureUnit temperatureUnit = TemperatureUnit.celsius;
 
  @override
  initState() {
  super.initState();
  SharedPreferences.getInstance().then((sharedPref) {
- int themeCode =
- sharedPref.getInt(Themes.SHARED_PREF_KEY) ?? Themes.DARK_THEME_CODE;
  setState(() {
+ themeCode = sharedPref.getInt(CONSTANTS.SHARED_PREF_KEY_THEME) ??
+ Themes.DARK_THEME_CODE;
+ temperatureUnit = TemperatureUnit.values[
+ sharedPref.getInt(CONSTANTS.SHARED_PREF_KEY_TEMPERATURE_UNIT) ??
+ TemperatureUnit.kelvin];
  this._theme = Themes.getTheme(themeCode);
  });
  });
@@ -74,9 +83,19 @@ class _AppStateContainerState extends State<AppStateContainer> {
  updateTheme(int themeCode) {
  setState(() {
  _theme = Themes.getTheme(themeCode);
+ this.themeCode = themeCode;
  });
  SharedPreferences.getInstance().then((sharedPref) {
- sharedPref.setInt(Themes.SHARED_PREF_KEY, themeCode);
+ sharedPref.setInt(CONSTANTS.SHARED_PREF_KEY_THEME, themeCode);
+ });
+ }
+
+ updateTemperatureUnit(TemperatureUnit unit) {
+ setState(() {
+ this.temperatureUnit = unit;
+ });
+ SharedPreferences.getInstance().then((sharedPref) {
+ sharedPref.setInt(CONSTANTS.SHARED_PREF_KEY_THEME, unit.index);
  });
  }
 }

lib/main.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_weather/src/screens/settings_screen.dart';
+import 'package:flutter_weather/src/screens/weather_screen.dart';
+
+class Routes {
+
+ static final mainRoute = <String, WidgetBuilder>{
+ '/home': (context) => WeatherScreen(),
+ '/settings': (context) => SettingsScreen(),
+ };
+}