Skip to content

Commit

Permalink
Merge pull request #6 from savelichalex/feature/5
Browse files Browse the repository at this point in the history 
Feature/5
  • Loading branch information
@savelichalex
savelichalex authored Sep 3, 2016
2 parents f3742f9 + edf5a99 commit 84c08a9
Show file tree
Hide file tree
Showing 7 changed files with 578 additions and 543 deletions.
22 changes: 17 additions & 5 deletions SerialsManager.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

/* Begin PBXBuildFile section */
4AE5B06E316A1176A11BC77E /* Pods_SerialsManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06904BF05179C14EA0F573D1 /* Pods_SerialsManager.framework */; };
842D06511D60DE610077E766 /* AppConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = 842D06501D60DE610077E766 /* AppConfig.plist */; };
8421FFD81D7ACC4000DC2CA3 /* RemoteDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8421FFD71D7ACC4000DC2CA3 /* RemoteDB.swift */; };
8421FFDA1D7ACEB900DC2CA3 /* DropboxDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8421FFD91D7ACEB900DC2CA3 /* DropboxDB.swift */; };
8430721E1D2A6F4300C08568 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8430721D1D2A6F4300C08568 /* AppDelegate.swift */; };
843072201D2A6F4300C08568 /* SerialsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8430721F1D2A6F4300C08568 /* SerialsViewController.swift */; };
843072221D2A6F4300C08568 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 843072211D2A6F4300C08568 /* Assets.xcassets */; };
Expand All @@ -24,7 +25,8 @@
06904BF05179C14EA0F573D1 /* Pods_SerialsManager.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SerialsManager.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5A5E237592A9EDABCA615799 /* Pods-SerialsManager.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SerialsManager.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SerialsManager/Pods-SerialsManager.debug.xcconfig"; sourceTree = "<group>"; };
71CBF9B5B8108202D74EF33C /* Pods-SerialsManager.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SerialsManager.release.xcconfig"; path = "Pods/Target Support Files/Pods-SerialsManager/Pods-SerialsManager.release.xcconfig"; sourceTree = "<group>"; };
842D06501D60DE610077E766 /* AppConfig.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = AppConfig.plist; sourceTree = "<group>"; };
8421FFD71D7ACC4000DC2CA3 /* RemoteDB.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoteDB.swift; sourceTree = "<group>"; };
8421FFD91D7ACEB900DC2CA3 /* DropboxDB.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DropboxDB.swift; sourceTree = "<group>"; };
8430721A1D2A6F4200C08568 /* SerialsManager.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SerialsManager.app; sourceTree = BUILT_PRODUCTS_DIR; };
8430721D1D2A6F4300C08568 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
8430721F1D2A6F4300C08568 /* SerialsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SerialsViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -58,6 +60,16 @@
name = Frameworks;
sourceTree = "<group>";
};
8421FFD61D7ACB7200DC2CA3 /* Services */ = {
isa = PBXGroup;
children = (
843072301D2BB19E00C08568 /* Serials.swift */,
8421FFD71D7ACC4000DC2CA3 /* RemoteDB.swift */,
8421FFD91D7ACEB900DC2CA3 /* DropboxDB.swift */,
);
name = Services;
sourceTree = "<group>";
};
843072111D2A6F4200C08568 = {
isa = PBXGroup;
children = (
Expand All @@ -79,15 +91,14 @@
8430721C1D2A6F4200C08568 /* SerialsManager */ = {
isa = PBXGroup;
children = (
8421FFD61D7ACB7200DC2CA3 /* Services */,
845131EC1D76FFFA00B76B1E /* SecretConfig.swift */,
845131F11D773A8A00B76B1E /* config.yml.sample */,
842D06501D60DE610077E766 /* AppConfig.plist */,
84E1828A1D5215DF003A6FB6 /* Main.storyboard */,
8430721D1D2A6F4300C08568 /* AppDelegate.swift */,
8430721F1D2A6F4300C08568 /* SerialsViewController.swift */,
843072211D2A6F4300C08568 /* Assets.xcassets */,
843072261D2A6F4300C08568 /* Info.plist */,
843072301D2BB19E00C08568 /* Serials.swift */,
84E1828C1D524403003A6FB6 /* ChapterDetailsViewController.swift */,
84619DD31D72F72D00B7BCCA /* LoadingSheetViewController.swift */,
);
Expand Down Expand Up @@ -166,7 +177,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
842D06511D60DE610077E766 /* AppConfig.plist in Resources */,
84E1828B1D5215DF003A6FB6 /* Main.storyboard in Resources */,
843072221D2A6F4300C08568 /* Assets.xcassets in Resources */,
845131F21D773A8A00B76B1E /* config.yml.sample in Resources */,
Expand Down Expand Up @@ -254,11 +264,13 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8421FFD81D7ACC4000DC2CA3 /* RemoteDB.swift in Sources */,
843072201D2A6F4300C08568 /* SerialsViewController.swift in Sources */,
84E1828D1D524403003A6FB6 /* ChapterDetailsViewController.swift in Sources */,
8430721E1D2A6F4300C08568 /* AppDelegate.swift in Sources */,
845131ED1D76FFFA00B76B1E /* SecretConfig.swift in Sources */,
84619DD41D72F72D00B7BCCA /* LoadingSheetViewController.swift in Sources */,
8421FFDA1D7ACEB900DC2CA3 /* DropboxDB.swift in Sources */,
843072311D2BB19E00C08568 /* Serials.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
12 changes: 0 additions & 12 deletions SerialsManager/AppConfig.plist
View file

This file was deleted.

Loading

0 comments on commit 84c08a9

Please sign in to comment.