Skip to content

Commit

Permalink
Merge pull request #127 from SoftwareEngineeringDaily/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
thedc89 authored Jul 17, 2019
2 parents cd1c246 + fb9533e commit a24ccde
Show file tree
Hide file tree
Showing 316 changed files with 20,655 additions and 3,137 deletions.
14 changes: 14 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
excluded: # paths to ignore during linting. Takes precedence over `included`.
- Pods

disabled_rules:
- line_length
- identifier_name
- superfluous_disable_command
- todo
- cyclomatic_complexity
- function_body_length
- nesting
- file_length
- type_body_length
- trailing_whitespace
53 changes: 53 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
How to Contribute
-----------------
We'd love to accept your patches and contributions to this project. There are just a few small guidelines you need to follow.

Getting Started
---------------
We use [gitflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) so instead of a single `master` branch, we use two branches to record the history of the project. The `master` branch stores the official release history, and the `develop` branch serves as an integration branch for features. It's also convenient to tag all commits in the master branch with a version number.

Workflow
--------
If you would like to contribute to this project, please:
- Pick an [issue](https://github.com/SoftwareEngineeringDaily/se-daily-iOS/issues) to work on or create a [proposal](https://github.com/SoftwareEngineeringDaily/se-daily-iOS//blob/master/CONTRIBUTING.md#feature-proposals) for a new feature.
- Fork this project.
- Create your feature branch based off the `develop` branch.
- Create a pull request to get your worked reviewed and merged back into the upstream `develop` branch.

Please include screenshots of your app changes and write down the test scenarios you followed to verify that your code works.

Feature proposals
-----------------
Please create an issue, label it as a `feature proposal` and follow the following template:
```markdown
# Proposal: [your title here]

## Summary
{Also include any designs or wireframes here}

## Rationale
{First reason for why we should consider this proposal}
{Second reason for why we should consider this proposal}
{etc}

## Scope

## Important Notes

## Open Questions
```

How to get unstuck
------------------
We have an active Slack community that you can reach out to for more information or just to chat with anyone. Check out the [<img src="https://upload.wikimedia.org/wikipedia/commons/7/76/Slack_Icon.png" alt="Slack Channel" width="15px"/> SED iOS app development](https://softwaredaily.slack.com/app_redirect?channel=sed_app_ios) slack channel.

Also checkout the [Open Source Guide](https://softwareengineeringdaily.github.io/).

Code reviews
------------
All submissions, including submissions by project members, require review. We use GitHub pull requests for this purpose. Consult [GitHub Help](https://help.github.com/articles/about-pull-requests/) for more information on using pull requests.

Community Guidelines
--------------------
- Be considerate, kind, constructive, and helpful.
- Do not engage in demeaning, discriminatory, harassing, or hateful speech, and imagery.
111 changes: 111 additions & 0 deletions Constants/L10nEnum.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@

import Foundation

// swiftlint:disable superfluous_disable_command
// swiftlint:disable file_length

// swiftlint:disable explicit_type_interface identifier_name line_length nesting type_body_length type_name
enum L10n {
/// Add a link
static let addLink = L10n.tr("Localizable", "AddLink")
/// Email Field Empty
static let alertMessageEmailEmpty = L10n.tr("Localizable", "AlertMessageEmailEmpty")
/// Invalid Email Format
Expand All @@ -32,18 +35,62 @@ enum L10n {
static let alertMessagePasswordsDonotMatch = L10n.tr("Localizable", "AlertMessagePasswordsDonotMatch")
/// Please Login
static let alertMessagePleaseLogin = L10n.tr("Localizable", "AlertMessagePleaseLogin")
/// Username Field Empty
static let alertMessageUsernameEmpty = L10n.tr("Localizable", "AlertMessageUsernameEmpty")
/// You must login to use this feature.
static let alertMessageYouMustLogin = L10n.tr("Localizable", "AlertMessageYouMustLogin")
/// Anonymous
static let anonymous = L10n.tr("Localizable", "Anonymous")
/// Oh, sorry you're not liking the SEDaily app
static let appReviewApology = L10n.tr("Localizable", "AppReviewApology")
/// SEDaily iOS App Feedback
static let appReviewEmailSubject = L10n.tr("Localizable", "AppReviewEmailSubject")
/// Would you help us out by sending us your feedback?
static let appReviewGiveFeedbackQuestion = L10n.tr("Localizable", "AppReviewGiveFeedbackQuestion")
/// Enjoying the SEDaily app?
static let appReviewPromptQuestion = L10n.tr("Localizable", "AppReviewPromptQuestion")
/// Cancel
static let cancelButtonTitle = L10n.tr("Localizable", "CancelButtonTitle")
/// Cancel reply
static let cancelReplyButtonTitle = L10n.tr("Localizable", "CancelReplyButtonTitle")
/// Comments
static let comments = L10n.tr("Localizable", "Comments")
/// Add a comment...
static let commentsPlaceholder = L10n.tr("Localizable", "CommentsPlaceholder")
/// Confirm Password
static let confirmPasswordPlaceholder = L10n.tr("Localizable", "ConfirmPasswordPlaceholder")
/// Are you sure you want to delete this podcast?
static let deletePodcast = L10n.tr("Localizable", "DeletePodcast")
/// YEP! Delete it please.
static let deletePodcastButtonTitle = L10n.tr("Localizable", "DeletePodcastButtonTitle")
/// Edit Profile
static let editProfile = L10n.tr("Localizable", "EditProfile")
/// Email
static let emailAddressPlaceholder = L10n.tr("Localizable", "EmailAddressPlaceholder")
/// Please send an email to [email protected]
static let emailUnsupportedMessage = L10n.tr("Localizable", "EmailUnsupportedMessage")
/// Email unsupported on this device
static let emailUnsupportedOnDevice = L10n.tr("Localizable", "EmailUnsupportedOnDevice")
/// No results for search
static let emptySearch = L10n.tr("Localizable", "EmptySearch")
/// Enable Notifications
static let enableNotifications = L10n.tr("Localizable", "EnableNotifications")
/// Hello!
static let enthusiasticHello = L10n.tr("Localizable", "EnthusiasticHello")
/// Sure! Send email
static let enthusiasticSureSendEmail = L10n.tr("Localizable", "EnthusiasticSureSendEmail")
/// Yes!
static let enthusiasticYes = L10n.tr("Localizable", "EnthusiasticYes")
/// Fetching results
static let fetchingSearch = L10n.tr("Localizable", "FetchingSearch")
/// Fields cannot be blank, please fill and retry
static let fieldEmpty = L10n.tr("Localizable", "FieldEmpty")
/// First Name
static let firstNamePlaceholder = L10n.tr("Localizable", "FirstNamePlaceholder")
/// Error
static let genericError = L10n.tr("Localizable", "GenericError")
/// No
static let genericNo = L10n.tr("Localizable", "GenericNo")
/// OK
static let genericOK = L10n.tr("Localizable", "GenericOK")
/// Okay
Expand All @@ -54,18 +101,64 @@ enum L10n {
static let lastNamePlaceholder = L10n.tr("Localizable", "LastNamePlaceholder")
/// Login
static let loginButtonTitle = L10n.tr("Localizable", "LoginButtonTitle")
/// Login to see your saved episodes
static let loginSeeBookmarks = L10n.tr("Localizable", "LoginSeeBookmarks")
/// Login
static let loginTitle = L10n.tr("Localizable", "LoginTitle")
/// Logout
static let logoutTitle = L10n.tr("Localizable", "LogoutTitle")
/// We have new episodes for you!
static let mwfNotificationBody = L10n.tr("Localizable", "mwfNotificationBody")
/// Software Daily
static let mwfNotificationTitle = L10n.tr("Localizable", "mwfNotificationTitle")
/// Add new link
static let newLink = L10n.tr("Localizable", "NewLink")
/// No saved episodes.
static let noBookmarks = L10n.tr("Localizable", "NoBookmarks")
/// No downloaded episodes
static let noDownloads = L10n.tr("Localizable", "NoDownloads")
/// No thanks
static let noWithGratitude = L10n.tr("Localizable", "NoWithGratitude")
/// Password
static let passwordPlaceholder = L10n.tr("Localizable", "PasswordPlaceholder")
/// Play
static let play = L10n.tr("Localizable", "Play")
/// Post
static let post = L10n.tr("Localizable", "Post")
/// Related Links
static let relatedLinks = L10n.tr("Localizable", "RelatedLinks")
/// Reply
static let replyButtonTitle = L10n.tr("Localizable", "ReplyButtonTitle")
/// Search
static let search = L10n.tr("Localizable", "Search")
/// Add a short title
static let shortTitle = L10n.tr("Localizable", "ShortTitle")
/// Sign In
static let signInHeader = L10n.tr("Localizable", "SignInHeader")
/// Sign Up
static let signUpButtonTitle = L10n.tr("Localizable", "SignUpButtonTitle")
/// Sign Up
static let signUpHeader = L10n.tr("Localizable", "SignUpHeader")
/// Something went wrong, please try again
static let somethingWentWrong = L10n.tr("Localizable", "SomethingWentWrong")
/// Submit
static let submit = L10n.tr("Localizable", "Submit")
/// Submitting...
static let submitting = L10n.tr("Localizable", "Submitting")
/// Successfully submitted :)
static let succcessfullySubmitted = L10n.tr("Localizable", "SucccessfullySubmitted")
/// Downloads
static let tabBarDownloads = L10n.tr("Localizable", "TabBarDownloads")
/// Feed
static let tabBarFeed = L10n.tr("Localizable", "TabBarFeed")
/// Forum
static let tabBarForum = L10n.tr("Localizable", "TabBarForum")
/// Just For You
static let tabBarJustForYou = L10n.tr("Localizable", "TabBarJustForYou")
/// Notifications
static let tabBarNotifications = L10n.tr("Localizable", "TabBarNotifications")
/// Saved
static let tabBarSaved = L10n.tr("Localizable", "TabBarSaved")
/// Latest
static let tabBarTitleLatest = L10n.tr("Localizable", "TabBarTitleLatest")
/// All
Expand All @@ -90,6 +183,24 @@ enum L10n {
static let tabTitleOpenSource = L10n.tr("Localizable", "TabTitleOpenSource")
/// Security
static let tabTitleSecurity = L10n.tr("Localizable", "TabTitleSecurity")
/// Tap to refresh
static let tapToRefresh = L10n.tr("Localizable", "TapToRefresh")
/// There was a problem :(
static let thereWasAProblem = L10n.tr("Localizable", "ThereWasAProblem")
/// minutes left
static let timeLeft = L10n.tr("Localizable", "TimeLeft")
/// back to sign in
static let toggleToSignInButtonTitle = L10n.tr("Localizable", "ToggleToSignInButtonTitle")
/// no account? sign up
static let toggleToSignUpButtonTitle = L10n.tr("Localizable", "ToggleToSignUpButtonTitle")
/// Transcript
static let transcript = L10n.tr("Localizable", "Transcript")
/// Type here
static let typeHere = L10n.tr("Localizable", "TypeHere")
/// Username or Email
static let usernameOrEmailPlaceholder = L10n.tr("Localizable", "UsernameOrEmailPlaceholder")
/// Username
static let usernamePlaceholder = L10n.tr("Localizable", "UsernamePlaceholder")
}
// swiftlint:enable explicit_type_interface identifier_name line_length nesting type_body_length type_name

Expand Down
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2016-2017 Kunal Kapadia

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
32 changes: 19 additions & 13 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,40 @@ target 'SEDaily-IOS' do

# Pods for SEDaily-IOS
pod 'ActiveLabel', :git => 'https://github.com/optonaut/ActiveLabel.swift.git'
p
pod 'Alamofire', '~> 4.5.1'
pod 'Crashlytics', '~> 3.9.3'
pod 'Down'
pod 'Disk', '~> 0.3.1'
pod 'Eureka', '~> 4.0.1'
pod 'Fabric', '~> 1.7.2'
pod 'IQKeyboardManagerSwift', '~> 5.0.5'
pod 'Eureka', '~> 4.1.1'
pod 'Fabric', '~> 1.7.5'
pod 'Firebase/Core'
pod 'IQKeyboardManagerSwift', '~> 5.0.8'
pod 'Kingfisher', '~> 4.2.0'
pod 'KTResponsiveUI', '~> 0.2.4'
pod 'KoalaTeaFlowLayout', '~> 0.3.1'
pod 'KoalaTeaPlayer', '~> 0.1.7'
pod 'MBProgressHUD', '~> 1.1.0'
pod 'Pageboy', '~> 2.0.2'
pod 'PureLayout', '~> 3.0.2'
pod 'PopupDialog', '~> 0.6.0'
pod 'Reusable', '~> 4.0.0'
pod 'SDWebImage', '~> 4.2.1'
pod 'SideMenu', '~> 3.1.4'
pod 'Skeleton', '~> 0.1.0'
pod 'SnapKit', '~> 4.0.0'
pod 'StatefulViewController', '~> 3.0'
pod 'SwiftGen', '~> 5.2.1'
pod 'SwiftIcons', :git => 'https://github.com/themisterholliday/SwiftIcons.git', :branch => 'swift-4'
pod 'SwiftMoment'
pod 'SwiftLint', '~> 0.25.1'
pod 'SwiftSoup', '~> 1.5.8'
pod 'SwifterSwift', '~> 4.0.1'
pod 'SwiftyBeaver', '~> 1.4.2'
pod 'SwiftyJSON', '~> 3.1.4'
pod 'SwiftyJSON'
pod 'Tabman', '~> 1.0.5'
pod 'UIFontComplete', '~> 2.0.1'

pod 'WaitForIt', '~> 2.0.0'
pod 'Tags'

target 'SEDaily-IOSTests' do
inherit! :search_paths
# Pods for testing
pod 'Quick'
pod 'Nimble'
pod 'Mockingjay'
end

end
Loading

0 comments on commit a24ccde

Please sign in to comment.