Revert "Revert "Merge remote-tracking branch 'upstream/master'""

This reverts commit caa3fb9.

Author: mordvintseva

.gitignore

@@ -0,0 +1,145 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xcuserstate
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+.build/
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+*.generated.swift
+.DS_Store

CurrencyConverter/.gitignore renamed to 2019-spring/AlenaMordvintseva/Notes/.gitignore

@@ -0,0 +1,128 @@
+disabled_rules:
+- explicit_acl
+- explicit_top_level_acl
+- explicit_type_interface
+- explicit_enum_raw_value 
+- no_extension_access_modifier
+- no_grouping_extension
+- multiline_literal_brackets
+- vertical_whitespace_between_cases
+
+opt_in_rules:
+- anyobject_protocol
+- array_init
+- attributes
+- closure_body_length
+- closure_end_indentation
+- closure_spacing
+- collection_alignment
+- conditional_returns_on_newline
+- contains_over_first_not_nil
+- convenience_type
+- discouraged_object_literal
+- discouraged_optional_boolean
+- discouraged_optional_collection
+- dynamic_inline
+- empty_count
+- empty_string
+- empty_xctest_method
+- explicit_init
+- extension_access_modifier
+- fallthrough
+- fatal_error_message
+- file_name
+- first_where
+- last_where
+- force_unwrapping
+- function_default_parameter_at_end
+- identical_operands
+- implicit_return
+- implicitly_unwrapped_optional
+- joined_default_parameter
+- large_tuple
+- legacy_random
+- let_var_whitespace
+- literal_expression_end_indentation
+- lower_acl_than_parent
+- mark
+- modifier_order
+- multiline_arguments
+- multiline_function_chains
+- multiline_parameters
+- multiline_arguments_brackets
+- multiline_parameters_brackets
+- multiline_literal_brackets
+- nimble_operator
+- number_separator
+- nslocalizedstring_key
+- object_literal
+- operator_usage_whitespace
+- overridden_super_call
+- override_in_extension
+- pattern_matching_keywords
+- prefixed_toplevel_constant
+- private_action
+- private_outlet
+- prohibited_super_call
+- quick_discouraged_call
+- quick_discouraged_focused_test
+- quick_discouraged_pending_test
+- redundant_nil_coalescing
+- redundant_type_annotation
+- required_enum_case
+- shorthand_operator
+- single_test_class
+- sorted_first_last
+- sorted_imports
+- static_operator
+- strong_iboutlet
+- strict_fileprivate
+- switch_case_on_newline
+- toggle_bool
+- todo
+- trailing_closure
+- unavailable_function
+- unneeded_parentheses_in_closure_argument
+- untyped_error_in_catch
+- unused_import
+- unused_private_declaration
+- vertical_parameter_alignment_on_call
+- vertical_whitespace_closing_braces
+- vertical_whitespace_opening_braces
+- yoda_condition
+- xct_specific_matcher
+
+excluded:
+  - Pods
+
+attributes:
+  always_on_same_line: ["@discardableResult", "@objc", "@IBAction", "@IBDesignable"]
+
+line_length: 
+  warning: 160
+  ignores_function_declarations: true
+  ignores_comments: true
+
+nesting:
+  type_level: 2
+
+type_body_length: 500 
+
+file_length: 700
+
+function_parameter_count: 6
+
+warning_threshold: 2
+
+conditional_returns_on_newline:
+  if_only: true 
+
+identifier_name:
+  excluded:
+    - id
+    - x
+    - y
+
+file_name:
+  excluded: [Util.swift]
+

CurrencyConverter/.swiftlint.yml renamed to 2019-spring/AlenaMordvintseva/Notes/.swiftlint.yml

@@ -0,0 +1,9 @@
+platform :ios, '12.0'
+use_frameworks!
+target 'hw1' do
+    pod 'SwiftLint'
+    pod 'Alamofire'
+    pod 'RealmSwift'
+    pod 'Kingfisher'
+    pod 'ReachabilitySwift'
+end

Mordvintseva/Notes/Notes.xcodeproj/project.pbxproj renamed to 2019-spring/AlenaMordvintseva/Notes/Notes.xcodeproj/project.pbxproj

@@ -0,0 +1,38 @@
+PODS:
+  - Alamofire (4.8.1)
+  - Kingfisher (5.2.0)
+  - ReachabilitySwift (4.3.0)
+  - Realm (3.13.1):
+    - Realm/Headers (= 3.13.1)
+  - Realm/Headers (3.13.1)
+  - RealmSwift (3.13.1):
+    - Realm (= 3.13.1)
+  - SwiftLint (0.31.0)
+
+DEPENDENCIES:
+  - Alamofire
+  - Kingfisher
+  - ReachabilitySwift
+  - RealmSwift
+  - SwiftLint
+
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+    - Kingfisher
+    - ReachabilitySwift
+    - Realm
+    - RealmSwift
+    - SwiftLint
+
+SPEC CHECKSUMS:
+  Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11
+  Kingfisher: 07067cfacf371117330dceb4b4b8f5c4b691ab42
+  ReachabilitySwift: 408477d1b6ed9779dba301953171e017c31241f3
+  Realm: 50071da38fe079e0735e47c9f2eae738c68c5996
+  RealmSwift: 8a1e6a02b7a08cd17a31e3115143fb69fe5f3fb9
+  SwiftLint: 7a0227733d786395817373b2d0ca799fd0093ff3
+
+PODFILE CHECKSUM: 1ee616a491c0577c7da9b071a696760f8b7ca9f6
+
+COCOAPODS: 1.5.3