Skip to content

Commit

Permalink
Merge pull request #2 from okertanov/master
Browse files Browse the repository at this point in the history 
Project structure reorganized a bit & AppDelegate refactoring: Constants, Initialization methods, etc.
  • Loading branch information
@tonsky
tonsky committed Mar 3, 2015
2 parents 41d6b7f + 0b332f2 commit 5dc6cf2
Show file tree
Hide file tree
Showing 16 changed files with 263 additions and 90 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
xcuserdata
*.xcuserdatad
build
98 changes: 53 additions & 45 deletions AnyBar.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,35 @@
objects = {

/* Begin PBXBuildFile section */
C511DFF01AA4DEBF00DEE15F /* black@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C511DFE71AA4DEBF00DEE15F /* black@2x.png */; };
C511DFF11AA4DEBF00DEE15F /* blue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C511DFE81AA4DEBF00DEE15F /* blue@2x.png */; };
C511DFF21AA4DEBF00DEE15F /* cyan@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C511DFE91AA4DEBF00DEE15F /* cyan@2x.png */; };
C511DFF31AA4DEBF00DEE15F /* green@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C511DFEA1AA4DEBF00DEE15F /* green@2x.png */; };
C511DFF41AA4DEBF00DEE15F /* orange@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C511DFEB1AA4DEBF00DEE15F /* orange@2x.png */; };
C511DFF51AA4DEBF00DEE15F /* purple@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C511DFEC1AA4DEBF00DEE15F /* purple@2x.png */; };
C511DFF61AA4DEBF00DEE15F /* red@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C511DFED1AA4DEBF00DEE15F /* red@2x.png */; };
C511DFF71AA4DEBF00DEE15F /* white@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C511DFEE1AA4DEBF00DEE15F /* white@2x.png */; };
C511DFF81AA4DEBF00DEE15F /* yellow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C511DFEF1AA4DEBF00DEE15F /* yellow@2x.png */; };
C511DFFA1AA4E16600DEE15F /* alternate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C511DFF91AA4E16600DEE15F /* alternate@2x.png */; };
C511DFFC1AA4E9CF00DEE15F /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = C511DFFB1AA4E9CF00DEE15F /* README.md */; };
7648BAB81AA5A3C0003DA28F /* alternate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7648BAAD1AA5A3C0003DA28F /* alternate@2x.png */; };
7648BAB91AA5A3C0003DA28F /* black@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7648BAAE1AA5A3C0003DA28F /* black@2x.png */; };
7648BABA1AA5A3C0003DA28F /* blue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7648BAAF1AA5A3C0003DA28F /* blue@2x.png */; };
7648BABB1AA5A3C0003DA28F /* cyan@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7648BAB01AA5A3C0003DA28F /* cyan@2x.png */; };
7648BABC1AA5A3C0003DA28F /* green@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7648BAB11AA5A3C0003DA28F /* green@2x.png */; };
7648BABD1AA5A3C0003DA28F /* orange@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7648BAB21AA5A3C0003DA28F /* orange@2x.png */; };
7648BABE1AA5A3C0003DA28F /* purple@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7648BAB31AA5A3C0003DA28F /* purple@2x.png */; };
7648BABF1AA5A3C0003DA28F /* red@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7648BAB41AA5A3C0003DA28F /* red@2x.png */; };
7648BAC11AA5A3C0003DA28F /* white@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7648BAB61AA5A3C0003DA28F /* white@2x.png */; };
7648BAC21AA5A3C0003DA28F /* yellow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7648BAB71AA5A3C0003DA28F /* yellow@2x.png */; };
7648BAC31AA5A50B003DA28F /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = C5AB32C41A8F9091002258B6 /* MainMenu.xib */; };
C5AB32BF1A8F9091002258B6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AB32BE1A8F9091002258B6 /* AppDelegate.m */; };
C5AB32C11A8F9091002258B6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AB32C01A8F9091002258B6 /* main.m */; };
C5AB32C31A8F9091002258B6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C5AB32C21A8F9091002258B6 /* Images.xcassets */; };
C5AB32C61A8F9091002258B6 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = C5AB32C41A8F9091002258B6 /* MainMenu.xib */; };
C5AB32E71A8F9B4E002258B6 /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AB32E41A8F9B4E002258B6 /* GCDAsyncSocket.m */; };
C5AB32E81A8F9B4E002258B6 /* GCDAsyncUdpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = C5AB32E61A8F9B4E002258B6 /* GCDAsyncUdpSocket.m */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
C511DFE71AA4DEBF00DEE15F /* black@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "black@2x.png"; sourceTree = "<group>"; };
C511DFE81AA4DEBF00DEE15F /* blue@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "blue@2x.png"; sourceTree = "<group>"; };
C511DFE91AA4DEBF00DEE15F /* cyan@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cyan@2x.png"; sourceTree = "<group>"; };
C511DFEA1AA4DEBF00DEE15F /* green@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "green@2x.png"; sourceTree = "<group>"; };
C511DFEB1AA4DEBF00DEE15F /* orange@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "orange@2x.png"; sourceTree = "<group>"; };
C511DFEC1AA4DEBF00DEE15F /* purple@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "purple@2x.png"; sourceTree = "<group>"; };
C511DFED1AA4DEBF00DEE15F /* red@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "red@2x.png"; sourceTree = "<group>"; };
C511DFEE1AA4DEBF00DEE15F /* white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "white@2x.png"; sourceTree = "<group>"; };
C511DFEF1AA4DEBF00DEE15F /* yellow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "yellow@2x.png"; sourceTree = "<group>"; };
C511DFF91AA4E16600DEE15F /* alternate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "alternate@2x.png"; sourceTree = "<group>"; };
7648BAAD1AA5A3C0003DA28F /* alternate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "alternate@2x.png"; sourceTree = "<group>"; };
7648BAAE1AA5A3C0003DA28F /* black@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "black@2x.png"; sourceTree = "<group>"; };
7648BAAF1AA5A3C0003DA28F /* blue@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "blue@2x.png"; sourceTree = "<group>"; };
7648BAB01AA5A3C0003DA28F /* cyan@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cyan@2x.png"; sourceTree = "<group>"; };
7648BAB11AA5A3C0003DA28F /* green@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "green@2x.png"; sourceTree = "<group>"; };
7648BAB21AA5A3C0003DA28F /* orange@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "orange@2x.png"; sourceTree = "<group>"; };
7648BAB31AA5A3C0003DA28F /* purple@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "purple@2x.png"; sourceTree = "<group>"; };
7648BAB41AA5A3C0003DA28F /* red@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "red@2x.png"; sourceTree = "<group>"; };
7648BAB61AA5A3C0003DA28F /* white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "white@2x.png"; sourceTree = "<group>"; };
7648BAB71AA5A3C0003DA28F /* yellow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "yellow@2x.png"; sourceTree = "<group>"; };
C511DFFB1AA4E9CF00DEE15F /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
C5AB32B81A8F9091002258B6 /* AnyBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AnyBar.app; sourceTree = BUILT_PRODUCTS_DIR; };
C5AB32BC1A8F9091002258B6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -62,22 +61,29 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
7648BAAC1AA5A3C0003DA28F /* Resources */ = {
isa = PBXGroup;
children = (
7648BAAD1AA5A3C0003DA28F /* alternate@2x.png */,
7648BAAE1AA5A3C0003DA28F /* black@2x.png */,
7648BAAF1AA5A3C0003DA28F /* blue@2x.png */,
7648BAB01AA5A3C0003DA28F /* cyan@2x.png */,
7648BAB11AA5A3C0003DA28F /* green@2x.png */,
7648BAB21AA5A3C0003DA28F /* orange@2x.png */,
7648BAB31AA5A3C0003DA28F /* purple@2x.png */,
7648BAB41AA5A3C0003DA28F /* red@2x.png */,
7648BAB61AA5A3C0003DA28F /* white@2x.png */,
7648BAB71AA5A3C0003DA28F /* yellow@2x.png */,
);
path = Resources;
sourceTree = "<group>";
};
C5AB32AF1A8F9091002258B6 = {
isa = PBXGroup;
children = (
C511DFFB1AA4E9CF00DEE15F /* README.md */,
C511DFF91AA4E16600DEE15F /* alternate@2x.png */,
C511DFE71AA4DEBF00DEE15F /* black@2x.png */,
C511DFE81AA4DEBF00DEE15F /* blue@2x.png */,
C511DFE91AA4DEBF00DEE15F /* cyan@2x.png */,
C511DFEA1AA4DEBF00DEE15F /* green@2x.png */,
C511DFEB1AA4DEBF00DEE15F /* orange@2x.png */,
C511DFEC1AA4DEBF00DEE15F /* purple@2x.png */,
C511DFED1AA4DEBF00DEE15F /* red@2x.png */,
C511DFEE1AA4DEBF00DEE15F /* white@2x.png */,
C511DFEF1AA4DEBF00DEE15F /* yellow@2x.png */,
C5AB32BA1A8F9091002258B6 /* AnyBar */,
C5AB32B91A8F9091002258B6 /* Products */,
C511DFFB1AA4E9CF00DEE15F /* README.md */,
);
sourceTree = "<group>";
};
Expand All @@ -100,6 +106,7 @@
C5AB32BE1A8F9091002258B6 /* AppDelegate.m */,
C5AB32C21A8F9091002258B6 /* Images.xcassets */,
C5AB32C41A8F9091002258B6 /* MainMenu.xib */,
7648BAAC1AA5A3C0003DA28F /* Resources */,
C5AB32BB1A8F9091002258B6 /* Supporting Files */,
);
path = AnyBar;
Expand Down Expand Up @@ -171,18 +178,18 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C511DFF31AA4DEBF00DEE15F /* green@2x.png in Resources */,
C511DFFA1AA4E16600DEE15F /* alternate@2x.png in Resources */,
C511DFF21AA4DEBF00DEE15F /* cyan@2x.png in Resources */,
C511DFF71AA4DEBF00DEE15F /* white@2x.png in Resources */,
C511DFF51AA4DEBF00DEE15F /* purple@2x.png in Resources */,
C511DFF41AA4DEBF00DEE15F /* orange@2x.png in Resources */,
C511DFF61AA4DEBF00DEE15F /* red@2x.png in Resources */,
C511DFF81AA4DEBF00DEE15F /* yellow@2x.png in Resources */,
C511DFF11AA4DEBF00DEE15F /* blue@2x.png in Resources */,
7648BABF1AA5A3C0003DA28F /* red@2x.png in Resources */,
7648BAC21AA5A3C0003DA28F /* yellow@2x.png in Resources */,
7648BABE1AA5A3C0003DA28F /* purple@2x.png in Resources */,
7648BAC11AA5A3C0003DA28F /* white@2x.png in Resources */,
C5AB32C31A8F9091002258B6 /* Images.xcassets in Resources */,
C511DFF01AA4DEBF00DEE15F /* black@2x.png in Resources */,
C5AB32C61A8F9091002258B6 /* MainMenu.xib in Resources */,
7648BAB81AA5A3C0003DA28F /* alternate@2x.png in Resources */,
7648BABC1AA5A3C0003DA28F /* green@2x.png in Resources */,
7648BAB91AA5A3C0003DA28F /* black@2x.png in Resources */,
7648BABB1AA5A3C0003DA28F /* cyan@2x.png in Resources */,
7648BABA1AA5A3C0003DA28F /* blue@2x.png in Resources */,
7648BABD1AA5A3C0003DA28F /* orange@2x.png in Resources */,
7648BAC31AA5A50B003DA28F /* MainMenu.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -195,7 +202,6 @@
files = (
C5AB32E81A8F9B4E002258B6 /* GCDAsyncUdpSocket.m in Sources */,
C5AB32E71A8F9B4E002258B6 /* GCDAsyncSocket.m in Sources */,
C511DFFC1AA4E9CF00DEE15F /* README.md in Sources */,
C5AB32C11A8F9091002258B6 /* main.m in Sources */,
C5AB32BF1A8F9091002258B6 /* AppDelegate.m in Sources */,
);
Expand Down Expand Up @@ -298,6 +304,7 @@
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = AnyBar/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
Expand All @@ -309,6 +316,7 @@
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = AnyBar/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand Down
Loading

0 comments on commit 5dc6cf2

Please sign in to comment.