diff --git a/Podfile b/Podfile index c012dd0..4984e14 100644 --- a/Podfile +++ b/Podfile @@ -2,7 +2,6 @@ platform :ios, '11.2' target 'Stickers' do pod 'PureLayout' - pod 'DKNightVersion' end post_install do |pi| diff --git a/Podfile.lock b/Podfile.lock index cffe8ba..c58e0d5 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,32 +1,16 @@ PODS: - - DKNightVersion (2.4.3): - - DKNightVersion/Core (= 2.4.3) - - DKNightVersion/CoreAnimation (= 2.4.3) - - DKNightVersion/UIKit (= 2.4.3) - - DKNightVersion/Core (2.4.3): - - DKNightVersion/Core/DeallocBlockExecutor (= 2.4.3) - - DKNightVersion/Core/extobjc (= 2.4.3) - - DKNightVersion/Core/DeallocBlockExecutor (2.4.3) - - DKNightVersion/Core/extobjc (2.4.3) - - DKNightVersion/CoreAnimation (2.4.3): - - DKNightVersion/Core - - DKNightVersion/UIKit (2.4.3): - - DKNightVersion/Core - PureLayout (3.1.4) DEPENDENCIES: - - DKNightVersion - PureLayout SPEC REPOS: https://github.com/cocoapods/specs.git: - - DKNightVersion - PureLayout SPEC CHECKSUMS: - DKNightVersion: eaa80cc4014b4bae7d4b535fd87ecc6a3c2767b3 PureLayout: f08c01b8dec00bb14a1fefa3de4c7d9c265df85e -PODFILE CHECKSUM: 7083de66f8df9aaec10eb7d72c80765d30a15a9a +PODFILE CHECKSUM: 141ee4775185091e8a998c8bcffe23b295e003f9 COCOAPODS: 1.7.2 diff --git a/Stickers.xcodeproj/project.pbxproj b/Stickers.xcodeproj/project.pbxproj index a27ddc9..120865b 100644 --- a/Stickers.xcodeproj/project.pbxproj +++ b/Stickers.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - E655B12820683F2600FB2D6D /* Themes.txt in Resources */ = {isa = PBXBuildFile; fileRef = E655B12720683F2600FB2D6D /* Themes.txt */; }; E655B12B20684A0B00FB2D6D /* STStickerStatisticsBoxView.m in Sources */ = {isa = PBXBuildFile; fileRef = E655B12A20684A0B00FB2D6D /* STStickerStatisticsBoxView.m */; }; E655B131206886DB00FB2D6D /* STStickerStatisticView.m in Sources */ = {isa = PBXBuildFile; fileRef = E655B130206886DB00FB2D6D /* STStickerStatisticView.m */; }; E655B1342068890200FB2D6D /* STStickerStatistic.m in Sources */ = {isa = PBXBuildFile; fileRef = E655B1332068890200FB2D6D /* STStickerStatistic.m */; }; @@ -29,7 +28,6 @@ /* Begin PBXFileReference section */ 2B8BB87D3DC1C7E2D6B9741A /* libPods-Stickers.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Stickers.a"; sourceTree = BUILT_PRODUCTS_DIR; }; ADB46962161D76AA79DA6C7D /* Pods-Stickers.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Stickers.release.xcconfig"; path = "Pods/Target Support Files/Pods-Stickers/Pods-Stickers.release.xcconfig"; sourceTree = ""; }; - E655B12720683F2600FB2D6D /* Themes.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = Themes.txt; sourceTree = ""; }; E655B12920684A0B00FB2D6D /* STStickerStatisticsBoxView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = STStickerStatisticsBoxView.h; sourceTree = ""; }; E655B12A20684A0B00FB2D6D /* STStickerStatisticsBoxView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = STStickerStatisticsBoxView.m; sourceTree = ""; }; E655B12F206886DB00FB2D6D /* STStickerStatisticView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = STStickerStatisticView.h; sourceTree = ""; }; @@ -97,7 +95,6 @@ isa = PBXGroup; children = ( E6FFC6D92067352400B25631 /* Assets.xcassets */, - E655B12720683F2600FB2D6D /* Themes.txt */, ); path = Resources; sourceTree = ""; @@ -124,7 +121,7 @@ isa = PBXGroup; children = ( E655B12620683F0700FB2D6D /* Resources */, - E6FFC6F3206737DB00B25631 /* Protocols */, + E6FFC6F3206737DB00B25631 /* DAO */, E6FFC6EF2067360D00B25631 /* Views */, E6FFC6EE2067360900B25631 /* Controllers */, E6FFC6ED2067360400B25631 /* Models */, @@ -153,8 +150,6 @@ children = ( E6FFC6E9206735E100B25631 /* STSticker.h */, E6FFC6EA206735E100B25631 /* STSticker.m */, - E6FFC6F520673C4800B25631 /* STUserDefaultsStickerDAO.h */, - E6FFC6F620673C4800B25631 /* STUserDefaultsStickerDAO.m */, E6FFC6FB2067454E00B25631 /* STStickersLayout.h */, E6FFC6FC2067454E00B25631 /* STStickersLayout.m */, E655B1322068890200FB2D6D /* STStickerStatistic.h */, @@ -189,12 +184,14 @@ path = Views; sourceTree = ""; }; - E6FFC6F3206737DB00B25631 /* Protocols */ = { + E6FFC6F3206737DB00B25631 /* DAO */ = { isa = PBXGroup; children = ( E6FFC6F4206737EB00B25631 /* STStickerDAO.h */, + E6FFC6F520673C4800B25631 /* STUserDefaultsStickerDAO.h */, + E6FFC6F620673C4800B25631 /* STUserDefaultsStickerDAO.m */, ); - path = Protocols; + path = DAO; sourceTree = ""; }; /* End PBXGroup section */ @@ -208,7 +205,6 @@ E6FFC6C92067352400B25631 /* Sources */, E6FFC6CA2067352400B25631 /* Frameworks */, E6FFC6CB2067352400B25631 /* Resources */, - B8412DB853E7CCE1EF319527 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -257,7 +253,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - E655B12820683F2600FB2D6D /* Themes.txt in Resources */, E6FFC6DA2067352400B25631 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -283,24 +278,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - B8412DB853E7CCE1EF319527 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Stickers/Pods-Stickers-resources.sh", - "${PODS_ROOT}/DKNightVersion/DKNightVersion/ColorTable/DKColorTable.txt", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DKColorTable.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Stickers/Pods-Stickers-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/Stickers/Controllers/STMainStickersCollectionViewController.m b/Stickers/Controllers/STMainStickersCollectionViewController.m index 5b01543..28750b1 100644 --- a/Stickers/Controllers/STMainStickersCollectionViewController.m +++ b/Stickers/Controllers/STMainStickersCollectionViewController.m @@ -18,7 +18,6 @@ #import "STStickersLayout.h" #import -#import @interface STMainStickersCollectionViewController () @property (strong, nonatomic) STStickersViewModel *viewModel; diff --git a/Stickers/Protocols/STStickerDAO.h b/Stickers/DAO/STStickerDAO.h similarity index 100% rename from Stickers/Protocols/STStickerDAO.h rename to Stickers/DAO/STStickerDAO.h diff --git a/Stickers/Models/STUserDefaultsStickerDAO.h b/Stickers/DAO/STUserDefaultsStickerDAO.h similarity index 100% rename from Stickers/Models/STUserDefaultsStickerDAO.h rename to Stickers/DAO/STUserDefaultsStickerDAO.h diff --git a/Stickers/Models/STUserDefaultsStickerDAO.m b/Stickers/DAO/STUserDefaultsStickerDAO.m similarity index 100% rename from Stickers/Models/STUserDefaultsStickerDAO.m rename to Stickers/DAO/STUserDefaultsStickerDAO.m diff --git a/Stickers/Resources/Themes.txt b/Stickers/Resources/Themes.txt deleted file mode 100644 index 5c55785..0000000 --- a/Stickers/Resources/Themes.txt +++ /dev/null @@ -1,17 +0,0 @@ -NORMAL -#222222 BG -#111111 DARK_BG -#000000 NAVBAR_BG_TINT -#BCBCBC NAVBAR_TEXT_TINT -#BCBCBC TEXT -#424242 UNONWNED_STICKER_BG -#BCBCBC UNONWNED_STICKER_TITLE -#BCBCBC UNONWNED_STICKER_SUBTITLE -#69DF73 OWNED_STICKER_BG -#1C6F3E OWNED_STICKER_TITLE -#1C6F3E OWNED_STICKER_SUBTITLE -#E4EFFB STAT_VALUE_TEXT -#4992E2 STAT_VALUE_BG -#36DF6A PROGRESS_BAR_FILL -#000000 PROGRESS_BAR_BG -#000000 SEPARATOR_COLOR diff --git a/Stickers/STAppDelegate.m b/Stickers/STAppDelegate.m index 8532833..615d160 100644 --- a/Stickers/STAppDelegate.m +++ b/Stickers/STAppDelegate.m @@ -10,16 +10,10 @@ #import "STMainStickersCollectionViewController.h" -#import - -static NSString *const kThemeFile = @"Themes.txt"; - @implementation STAppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - [self setupTheme]; - UIViewController *root = [STMainStickersCollectionViewController new]; UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:root]; self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; @@ -29,10 +23,4 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( return YES; } -- (void)setupTheme -{ - [[DKNightVersionManager sharedManager] setThemeVersion:DKThemeVersionNormal]; - [[DKColorTable sharedColorTable] setFile:kThemeFile]; -} - @end diff --git a/Stickers/Views/STStickerCollectionViewCell.m b/Stickers/Views/STStickerCollectionViewCell.m index 33e4059..4da9ef5 100644 --- a/Stickers/Views/STStickerCollectionViewCell.m +++ b/Stickers/Views/STStickerCollectionViewCell.m @@ -8,7 +8,6 @@ #import "STStickerCollectionViewCell.h" -#import #import @interface STStickerCollectionViewCell () @@ -29,8 +28,6 @@ - (instancetype)initWithFrame:(CGRect)frame - (void)setupView { - [self setBackgroundColor:[UIColor lightGrayColor]]; - self.title = [UILabel newAutoLayoutView]; self.subtitle = [UILabel newAutoLayoutView]; diff --git a/Stickers/Views/STStickerProgressView.m b/Stickers/Views/STStickerProgressView.m index 1e0a7ed..a0579e3 100644 --- a/Stickers/Views/STStickerProgressView.m +++ b/Stickers/Views/STStickerProgressView.m @@ -8,7 +8,6 @@ #import "STStickerProgressView.h" -#import #import @interface STStickerProgressView () diff --git a/Stickers/Views/STStickerSectionScrubber.m b/Stickers/Views/STStickerSectionScrubber.m index e7a58fd..8c1ff54 100644 --- a/Stickers/Views/STStickerSectionScrubber.m +++ b/Stickers/Views/STStickerSectionScrubber.m @@ -8,7 +8,6 @@ #import "STStickerSectionScrubber.h" -#import #import @interface STStickerSectionScrubber () diff --git a/Stickers/Views/STStickerStatisticView.m b/Stickers/Views/STStickerStatisticView.m index 6a51d29..8d41827 100644 --- a/Stickers/Views/STStickerStatisticView.m +++ b/Stickers/Views/STStickerStatisticView.m @@ -8,7 +8,6 @@ #import "STStickerStatisticView.h" -#import #import @interface STStickerStatisticView () diff --git a/Stickers/Views/STStickerStatisticsBoxView.m b/Stickers/Views/STStickerStatisticsBoxView.m index 4f22cf5..7fe7f1a 100644 --- a/Stickers/Views/STStickerStatisticsBoxView.m +++ b/Stickers/Views/STStickerStatisticsBoxView.m @@ -10,7 +10,6 @@ #import "STStickerStatisticView.h" -#import #import @interface STStickerStatisticsBoxView ()