Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: weareopensource/Swift
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.0
Choose a base ref
...
head repository: weareopensource/Swift
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 18,303 additions and 11,463 deletions.
  1. +3 −2 .github/FUNDING.yml
  2. +8 −0 .github/dependabot.yml
  3. +16 −0 .github/workflows/dependabot.yml
  4. +1 −0 .husky/.gitignore
  5. +4 −0 .husky/commit-msg
  6. +2 −12 .travis.yml
  7. +248 −182 CHANGELOG.md
  8. +0 −19 Cartfile
  9. +0 −21 Cartfile.resolved
  10. +2 −2 Gemfile
  11. +171 −113 Gemfile.lock
  12. +60 −66 README.md
  13. +12 −0 example.apns
  14. +3 −2 fastlane/Fastfile
  15. +11,118 −9,718 package-lock.json
  16. +9 −14 package.json
  17. +753 −300 waosSwift.xcodeproj/project.pbxproj
  18. +1 −1 waosSwift.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  19. +313 −0 waosSwift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
  20. +2 −1 waosSwift.xcodeproj/xcshareddata/xcschemes/waosSwift.xcscheme
  21. +0 −6 waosSwift.xcworkspace/contents.xcworkspacedata
  22. +221 −0 waosSwift.xcworkspace/xcshareddata/swiftpm/Package.resolved
  23. +3 −3 waosSwift/Assets.xcassets/Contents.json
  24. BIN waosSwift/Assets.xcassets/authBackground.imageset/14.jpg
  25. +21 −0 waosSwift/Assets.xcassets/authBackground.imageset/Contents.json
  26. +21 −21 waosSwift/Assets.xcassets/waosError.colorset/Contents.json
  27. +20 −0 waosSwift/Assets.xcassets/waosFacebook.colorset/Contents.json
  28. +20 −0 waosSwift/Assets.xcassets/waosInstagram.colorset/Contents.json
  29. +20 −0 waosSwift/Assets.xcassets/waosLinkedin.colorset/Contents.json
  30. +20 −0 waosSwift/Assets.xcassets/waosTwitter.colorset/Contents.json
  31. +20 −9 waosSwift/Info.plist
  32. +0 −11 waosSwift/config/BridgingHeader.h
  33. +36 −20 waosSwift/config/default/development.json
  34. +7 −0 waosSwift/config/default/release.json
  35. BIN waosSwift/config/fonts/Font Awesome 5 Brands-Regular-400.otf
  36. BIN waosSwift/config/fonts/Font Awesome 5 Free-Regular-400.otf
  37. BIN waosSwift/config/fonts/Font Awesome 5 Free-Solid-900.otf
  38. +44 −10 waosSwift/config/localizations/Strings.swift
  39. +26 −6 waosSwift/config/localizations/en.lproj/Localizable.strings
  40. +29 −9 waosSwift/config/localizations/fr.lproj/Localizable.strings
  41. +9 −6 waosSwift/lib/helpers/CookiePlugin.swift
  42. +58 −3 waosSwift/lib/helpers/Errors.swift
  43. +59 −0 waosSwift/lib/helpers/Extensions/ASAuthorizationControllerProxy.swift
  44. +1 −0 waosSwift/lib/helpers/Extensions/Array+SectionModel.swift
  45. +6 −0 waosSwift/lib/helpers/Extensions/Data.swift
  46. +64 −1 waosSwift/lib/helpers/Extensions/Eureka.swift
  47. +7 −7 waosSwift/lib/helpers/Extensions/KeyboardConstraints.swift
  48. +6 −0 waosSwift/lib/helpers/Extensions/L10n.swift
  49. +9 −0 waosSwift/lib/helpers/Extensions/String.swift
  50. +29 −0 waosSwift/lib/helpers/Extensions/UIButton.swift
  51. +27 −0 waosSwift/lib/helpers/Extensions/UIColor.swift
  52. +44 −0 waosSwift/lib/helpers/Extensions/UIImage.swift
  53. +10 −0 waosSwift/lib/helpers/Extensions/UILabel.swift
  54. +22 −0 waosSwift/lib/helpers/Extensions/UINavigationController.swift
  55. +45 −0 waosSwift/lib/helpers/Extensions/UIScrollView.swift
  56. +34 −0 waosSwift/lib/helpers/Extensions/UISegmentedControl.swift
  57. +37 −0 waosSwift/lib/helpers/Extensions/UITextField.swift
  58. +6 −0 waosSwift/lib/helpers/Extensions/UserDefaults.swift
  59. +254 −0 waosSwift/lib/helpers/Libs/PopupView/File.swift
  60. +238 −0 waosSwift/lib/helpers/Libs/PopupView/PopupView.swift
  61. +2 −2 waosSwift/lib/helpers/Libs/ReusableKit/ReusableKit.swift
  62. +51 −0 waosSwift/lib/helpers/MarkDown.swift
  63. +42 −0 waosSwift/lib/helpers/Rx/ASAuthorizationAppleIDButton+Rx.swift
  64. +8 −0 waosSwift/lib/helpers/Rx/Eureka+Valid+Rx.swift
  65. +9 −1 waosSwift/lib/helpers/Rx/NSViewController+Rx.swift
  66. +0 −35 waosSwift/lib/helpers/Rx/NVActivityIndicatorView+Rx.swift
  67. +7 −7 waosSwift/lib/helpers/Rx/ObservableType+Extras.swift
  68. +41 −0 waosSwift/lib/helpers/Rx/SwiftSpinner+Rx.swift
  69. +11 −0 waosSwift/lib/helpers/Rx/UIAlertController+Rx.swift
  70. +8 −29 waosSwift/lib/helpers/Rx/UIImageView+Kingfisher.swift
  71. +34 −0 waosSwift/lib/helpers/Rx/UIScrollView+Rx.swift
  72. +9 −1 waosSwift/lib/helpers/Rx/UIViewController+Rx.swift
  73. +6 −0 waosSwift/lib/helpers/Stubbed.swift
  74. +16 −5 waosSwift/lib/helpers/UITricks.swift
  75. +24 −6 waosSwift/lib/helpers/Url.swift
  76. +29 −4 waosSwift/lib/helpers/{TokenState.swift → Users.swift}
  77. +29 −2 waosSwift/lib/helpers/Validations.swift
  78. +22 −0 waosSwift/lib/services/Configuration.swift
  79. +1 −1 waosSwift/lib/services/Networking.swift
  80. +3 −1 waosSwift/lib/services/Preferences.swift
  81. +96 −19 waosSwift/modules/app/AppDelegate.swift
  82. +17 −3 waosSwift/modules/app/AppFlow.swift
  83. +3 −1 waosSwift/modules/app/AppServicesProvider.swift
  84. +10 −0 waosSwift/modules/app/AppSteps.swift
  85. +267 −0 waosSwift/modules/auth/controllers/AuthForgotController.swift
  86. +125 −37 waosSwift/modules/auth/controllers/AuthSigninController.swift
  87. +136 −67 waosSwift/modules/auth/controllers/AuthSignupController.swift
  88. +1 −1 waosSwift/modules/auth/flow/AuthFlow.swift
  89. +30 −0 waosSwift/modules/auth/models/AuthResponses.swift
  90. +157 −0 waosSwift/modules/auth/reactors/AuthForgotReactor.swift
  91. +35 −11 waosSwift/modules/auth/reactors/AuthSigninReactor.swift
  92. +22 −11 waosSwift/modules/auth/reactors/AuthSignupReactor.swift
  93. +42 −4 waosSwift/modules/auth/services/AuthService.swift
  94. +15 −2 waosSwift/modules/auth/services/api/AuthApi.swift
  95. +18 −0 waosSwift/modules/auth/services/api/stubbed/forgot.json
  96. +18 −0 waosSwift/modules/auth/services/api/stubbed/oauth.json
  97. +36 −1 waosSwift/modules/core/controllers/CoreCollectionViewCellController.swift
  98. +73 −4 waosSwift/modules/core/controllers/CoreController.swift
  99. +75 −4 waosSwift/modules/core/controllers/CoreFormController.swift
  100. +36 −0 waosSwift/modules/core/controllers/CoreTableViewCellController.swift
  101. +10 −1 waosSwift/modules/core/flows/CoreFlow.swift
  102. +10 −0 waosSwift/modules/core/ui/CoreUIButton.swift
  103. +10 −0 waosSwift/modules/core/ui/CoreUILabel.swift
  104. +10 −0 waosSwift/modules/core/ui/CoreUITableView.swift
  105. +27 −10 waosSwift/modules/core/ui/CoreUITextField.swift
  106. +12 −2 waosSwift/modules/core/ui/CoreUiRefreshControl.swift
  107. +165 −0 waosSwift/modules/home/controllers/HomePageController.swift
  108. +142 −0 waosSwift/modules/home/controllers/HomeTermsController.swift
  109. +31 −0 waosSwift/modules/home/models/PagesModel.swift
  110. +12 −0 waosSwift/modules/home/models/PagesResponses.swift
  111. +122 −0 waosSwift/modules/home/reactors/HomePageReactor.swift
  112. +110 −0 waosSwift/modules/home/reactors/HomeTermsReactor.swift
  113. +41 −0 waosSwift/modules/home/services/HomeService.swift
  114. +65 −0 waosSwift/modules/home/services/api/HomeApi.swift
  115. +1 −0 waosSwift/modules/home/services/api/stubbed/changelogs.json
  116. +8 −30 waosSwift/modules/onBoarding/controllers/OnBoardingController.swift
  117. +1 −0 waosSwift/modules/onBoarding/flows/OnBoardingFlow.swift
  118. +1 −1 waosSwift/modules/secondController/flows/SecondFlow.swift
  119. +80 −6 waosSwift/modules/tasks/controllers/TasksListController.swift
  120. +28 −0 waosSwift/modules/tasks/controllers/TasksViewController.swift
  121. +1 −0 waosSwift/modules/tasks/flows/TasksFlow.swift
  122. +75 −15 waosSwift/modules/tasks/reactors/TasksListReactor.swift
  123. +3 −10 waosSwift/modules/tasks/reactors/TasksViewReactor.swift
  124. +11 −4 waosSwift/modules/tasks/services/TasksService.swift
  125. +1 −0 waosSwift/modules/tasks/services/api/TasksApi.swift
  126. +0 −367 waosSwift/modules/user/controllers/UserController.swift
  127. +0 −106 waosSwift/modules/user/services/UserService.swift
  128. +548 −0 waosSwift/modules/users/controllers/UserController.swift
  129. +198 −0 waosSwift/modules/users/controllers/UserMoreController.swift
  130. +32 −7 waosSwift/modules/{user → users}/controllers/UserPreferenceController.swift
  131. +151 −23 waosSwift/modules/{user → users}/controllers/UserViewController.swift
  132. +1 −0 waosSwift/modules/{user → users}/flows/UserFlow.swift
  133. +87 −0 waosSwift/modules/users/models/ComplementaryModel.swift
  134. +56 −6 waosSwift/modules/{user → users}/models/UserModel.swift
  135. +31 −0 waosSwift/modules/users/models/UserPolicyModel.swift
  136. +90 −0 waosSwift/modules/users/reactors/UserMoreReactor.swift
  137. +27 −14 waosSwift/modules/{user → users}/reactors/UserPreferenceReactor.swift
  138. +37 −22 waosSwift/modules/{user → users}/reactors/UserReactor.swift
  139. +79 −11 waosSwift/modules/{user → users}/reactors/UserViewReactor.swift
  140. +176 −0 waosSwift/modules/users/services/UserService.swift
  141. +12 −4 waosSwift/modules/{user → users}/services/api/UserApi.swift
  142. 0 waosSwift/modules/{user → users}/services/api/stubbed/me.json
  143. +6 −0 waosSwift/waosSwift.entitlements
  144. +16 −0 waosSwift/waosSwiftRelease.entitlements
  145. +16 −0 waosSwift/waosSwiftdevelopment.entitlements
5 changes: 3 additions & 2 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# These are supported funding model platforms

patreon: pbrisorgueil
open_collective: weareopensource
ko_fi: weareopensource

# github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
# open_collective: weareopensource
# tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
# liberapay: # Replace with a single Liberapay username
# issuehunt: # Replace with a single IssueHunt username
# otechie: # Replace with a single Otechie username
# custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
# custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
16 changes: 16 additions & 0 deletions .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Dependabot auto-merge
on: pull_request

permissions:
contents: write
pull-requests: write

jobs:
auto-merge:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
target: minor
github-token: ${{ secrets.WAOS }}
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
4 changes: 4 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install commitlint --edit "$1"
14 changes: 2 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
language: swift
osx_image: xcode11.4
osx_image: xcode12
xcode_workspace: waosSwift.xcworkspace
xcode_scheme: waosSwift
xcode_destination: platform=iOS Simulator,OS=13.2.2,name=iPhone 11
cache:
bundler: true
directories:
- Carthage
before_install:
- brew install carthage || true
- brew outdated carthage || brew upgrade carthage
- rvm use $RVM_RUBY_VERSION #slather
install: bundle install --without=documentation
before_script:
- carthage bootstrap --no-build --new-resolver
- (cd Carthage/Checkouts/ReactorKit && swift package generate-xcodeproj)
- timeout 30m carthage build --platform iOS --no-use-binaries --cache-builds || true
after_success:
- fastlane lint
- fastlane test
- fastlane build_and_test
Loading