Skip to content

Commit

Permalink
Merge branch 'release/v0.3'
Browse files Browse the repository at this point in the history
publish v0.3
  • Loading branch information
chaoyang805 committed Oct 24, 2016
2 parents 9f8fb28 + 20f40a0 commit f7eb796
Show file tree
Hide file tree
Showing 59 changed files with 770 additions and 394 deletions.
71 changes: 71 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,72 @@
.DS_Store

# Created by https://www.gitignore.io/api/sw,swift

#!! ERROR: sw is undefined. Use list command to see defined gitignore types !!#

### Swift ###
# 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
4 changes: 2 additions & 2 deletions DoubanMovie.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@
INFOPLIST_FILE = DoubanMovie/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.jikexueyuan.DoubanMovie;
PRODUCT_BUNDLE_IDENTIFIER = me.chaoyang805.DoubanMovie;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -946,7 +946,7 @@
INFOPLIST_FILE = DoubanMovie/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.jikexueyuan.DoubanMovie;
PRODUCT_BUNDLE_IDENTIFIER = me.chaoyang805.DoubanMovie;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
Binary file not shown.
22 changes: 15 additions & 7 deletions DoubanMovie/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@

// AppDelegate.swift
// DoubanMovie
//
// Created by chaoyang805 on 16/7/13.
// Copyright © 2016年 jikexueyuan. All rights reserved.
//
/*
* Copyright 2016 chaoyang805 [email protected]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import UIKit

Expand Down
22 changes: 15 additions & 7 deletions DoubanMovie/AvatarView.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
//
// AvatarView.swift
// DoubanMovie
//
// Created by chaoyang805 on 16/7/25.
// Copyright © 2016年 jikexueyuan. All rights reserved.
//
/*
* Copyright 2016 chaoyang805 [email protected]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import UIKit

Expand Down
22 changes: 15 additions & 7 deletions DoubanMovie/BaseMovieCell.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
//
// BaseTableViewCell.swift
// DoubanMovie
//
// Created by chaoyang805 on 16/7/18.
// Copyright © 2016年 jikexueyuan. All rights reserved.
//
/*
* Copyright 2016 chaoyang805 [email protected]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import UIKit
import SDWebImage
Expand Down
22 changes: 15 additions & 7 deletions DoubanMovie/ClearTransitionTableViewController.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
//
// BaseViewController.swift
// DoubanMovie
//
// Created by chaoyang805 on 16/7/18.
// Copyright © 2016年 jikexueyuan. All rights reserved.
//
/*
* Copyright 2016 chaoyang805 [email protected]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import UIKit

Expand Down
23 changes: 15 additions & 8 deletions DoubanMovie/DetailMovieCell.swift
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
//
// DetailMovieCell.swift
// DoubanMovie
//
// Created by chaoyang805 on 16/7/20.
// Copyright © 2016年 jikexueyuan. All rights reserved.
//

/*
* Copyright 2016 chaoyang805 [email protected]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import UIKit

class DetailMovieCell: BaseMovieCell {
Expand Down
25 changes: 17 additions & 8 deletions DoubanMovie/DoubanAPI.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
//
// DoubanAPI.swift
// DoubanMovie
//
// Created by chaoyang805 on 16/8/5.
// Copyright © 2016年 jikexueyuan. All rights reserved.
//
/*
* Copyright 2016 chaoyang805 [email protected]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/


import Foundation

Expand Down Expand Up @@ -63,4 +72,4 @@ protocol DoubanAPI {
func celebrity(forId id: String, forceReload: Bool, completionHandler: ResponseHandler?)


}
}
22 changes: 15 additions & 7 deletions DoubanMovie/DoubanCelebrity.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
//
// Artist.swift
// DoubanMovie
//
// Created by chaoyang805 on 16/7/18.
// Copyright © 2016年 jikexueyuan. All rights reserved.
//
/*
* Copyright 2016 chaoyang805 [email protected]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import UIKit
import ObjectMapper
Expand Down
22 changes: 15 additions & 7 deletions DoubanMovie/DoubanImage.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
//
// DoubanImage.swift
// DoubanMovie
//
// Created by chaoyang805 on 16/8/5.
// Copyright © 2016年 jikexueyuan. All rights reserved.
//
/*
* Copyright 2016 chaoyang805 [email protected]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import UIKit
import ObjectMapper
Expand Down
23 changes: 16 additions & 7 deletions DoubanMovie/DoubanMovie.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
//
// MovieSubject.swift
// DoubanMovie
//
// Created by chaoyang805 on 16/7/18.
// Copyright © 2016年 jikexueyuan. All rights reserved.
//
/*
* Copyright 2016 chaoyang805 [email protected]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/


import UIKit
import ObjectMapper
Expand Down
22 changes: 15 additions & 7 deletions DoubanMovie/DoubanResultsSet.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
//
// DoubanResultsSet.swift
// DoubanMovie
//
// Created by chaoyang805 on 16/8/5.
// Copyright © 2016年 jikexueyuan. All rights reserved.
//
/*
* Copyright 2016 chaoyang805 [email protected]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import UIKit
import ObjectMapper
Expand Down
23 changes: 16 additions & 7 deletions DoubanMovie/DoubanService.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
//
// DoubanService.swift
// DoubanMovie
//
// Created by chaoyang805 on 16/7/20.
// Copyright © 2016年 jikexueyuan. All rights reserved.
//
/*
* Copyright 2016 chaoyang805 [email protected]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/


import UIKit
import AFNetworking
Expand Down
Loading

0 comments on commit f7eb796

Please sign in to comment.