Skip to content

Commit 5dc6cf2

Browse files
tonskytonsky
committed
Merge pull request #2 from okertanov/master
Project structure reorganized a bit & AppDelegate refactoring: Constants, Initialization methods, etc.
2 parents 41d6b7f + 0b332f2 commit 5dc6cf2

16 files changed

Lines changed: 263 additions & 90 deletions

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
xcuserdata
2+
*.xcuserdatad
3+
build

‎AnyBar.xcodeproj/project.pbxproj‎

Lines changed: 53 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,35 @@
77
objects = {
88

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

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

6463
/* Begin PBXGroup section */
64+
7648BAAC1AA5A3C0003DA28F /* Resources */ = {
65+
isa = PBXGroup;
66+
children = (
67+
7648BAAD1AA5A3C0003DA28F /* alternate@2x.png */,
68+
7648BAAE1AA5A3C0003DA28F /* black@2x.png */,
69+
7648BAAF1AA5A3C0003DA28F /* blue@2x.png */,
70+
7648BAB01AA5A3C0003DA28F /* cyan@2x.png */,
71+
7648BAB11AA5A3C0003DA28F /* green@2x.png */,
72+
7648BAB21AA5A3C0003DA28F /* orange@2x.png */,
73+
7648BAB31AA5A3C0003DA28F /* purple@2x.png */,
74+
7648BAB41AA5A3C0003DA28F /* red@2x.png */,
75+
7648BAB61AA5A3C0003DA28F /* white@2x.png */,
76+
7648BAB71AA5A3C0003DA28F /* yellow@2x.png */,
77+
);
78+
path = Resources;
79+
sourceTree = "<group>";
80+
};
6581
C5AB32AF1A8F9091002258B6 = {
6682
isa = PBXGroup;
6783
children = (
68-
C511DFFB1AA4E9CF00DEE15F /* README.md */,
69-
C511DFF91AA4E16600DEE15F /* alternate@2x.png */,
70-
C511DFE71AA4DEBF00DEE15F /* black@2x.png */,
71-
C511DFE81AA4DEBF00DEE15F /* blue@2x.png */,
72-
C511DFE91AA4DEBF00DEE15F /* cyan@2x.png */,
73-
C511DFEA1AA4DEBF00DEE15F /* green@2x.png */,
74-
C511DFEB1AA4DEBF00DEE15F /* orange@2x.png */,
75-
C511DFEC1AA4DEBF00DEE15F /* purple@2x.png */,
76-
C511DFED1AA4DEBF00DEE15F /* red@2x.png */,
77-
C511DFEE1AA4DEBF00DEE15F /* white@2x.png */,
78-
C511DFEF1AA4DEBF00DEE15F /* yellow@2x.png */,
7984
C5AB32BA1A8F9091002258B6 /* AnyBar */,
8085
C5AB32B91A8F9091002258B6 /* Products */,
86+
C511DFFB1AA4E9CF00DEE15F /* README.md */,
8187
);
8288
sourceTree = "<group>";
8389
};
@@ -100,6 +106,7 @@
100106
C5AB32BE1A8F9091002258B6 /* AppDelegate.m */,
101107
C5AB32C21A8F9091002258B6 /* Images.xcassets */,
102108
C5AB32C41A8F9091002258B6 /* MainMenu.xib */,
109+
7648BAAC1AA5A3C0003DA28F /* Resources */,
103110
C5AB32BB1A8F9091002258B6 /* Supporting Files */,
104111
);
105112
path = AnyBar;
@@ -171,18 +178,18 @@
171178
isa = PBXResourcesBuildPhase;
172179
buildActionMask = 2147483647;
173180
files = (
174-
C511DFF31AA4DEBF00DEE15F /* green@2x.png in Resources */,
175-
C511DFFA1AA4E16600DEE15F /* alternate@2x.png in Resources */,
176-
C511DFF21AA4DEBF00DEE15F /* cyan@2x.png in Resources */,
177-
C511DFF71AA4DEBF00DEE15F /* white@2x.png in Resources */,
178-
C511DFF51AA4DEBF00DEE15F /* purple@2x.png in Resources */,
179-
C511DFF41AA4DEBF00DEE15F /* orange@2x.png in Resources */,
180-
C511DFF61AA4DEBF00DEE15F /* red@2x.png in Resources */,
181-
C511DFF81AA4DEBF00DEE15F /* yellow@2x.png in Resources */,
182-
C511DFF11AA4DEBF00DEE15F /* blue@2x.png in Resources */,
181+
7648BABF1AA5A3C0003DA28F /* red@2x.png in Resources */,
182+
7648BAC21AA5A3C0003DA28F /* yellow@2x.png in Resources */,
183+
7648BABE1AA5A3C0003DA28F /* purple@2x.png in Resources */,
184+
7648BAC11AA5A3C0003DA28F /* white@2x.png in Resources */,
183185
C5AB32C31A8F9091002258B6 /* Images.xcassets in Resources */,
184-
C511DFF01AA4DEBF00DEE15F /* black@2x.png in Resources */,
185-
C5AB32C61A8F9091002258B6 /* MainMenu.xib in Resources */,
186+
7648BAB81AA5A3C0003DA28F /* alternate@2x.png in Resources */,
187+
7648BABC1AA5A3C0003DA28F /* green@2x.png in Resources */,
188+
7648BAB91AA5A3C0003DA28F /* black@2x.png in Resources */,
189+
7648BABB1AA5A3C0003DA28F /* cyan@2x.png in Resources */,
190+
7648BABA1AA5A3C0003DA28F /* blue@2x.png in Resources */,
191+
7648BABD1AA5A3C0003DA28F /* orange@2x.png in Resources */,
192+
7648BAC31AA5A50B003DA28F /* MainMenu.xib in Resources */,
186193
);
187194
runOnlyForDeploymentPostprocessing = 0;
188195
};
@@ -195,7 +202,6 @@
195202
files = (
196203
C5AB32E81A8F9B4E002258B6 /* GCDAsyncUdpSocket.m in Sources */,
197204
C5AB32E71A8F9B4E002258B6 /* GCDAsyncSocket.m in Sources */,
198-
C511DFFC1AA4E9CF00DEE15F /* README.md in Sources */,
199205
C5AB32C11A8F9091002258B6 /* main.m in Sources */,
200206
C5AB32BF1A8F9091002258B6 /* AppDelegate.m in Sources */,
201207
);
@@ -298,6 +304,7 @@
298304
COMBINE_HIDPI_IMAGES = YES;
299305
INFOPLIST_FILE = AnyBar/Info.plist;
300306
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
307+
MACOSX_DEPLOYMENT_TARGET = 10.9;
301308
PRODUCT_NAME = "$(TARGET_NAME)";
302309
};
303310
name = Debug;
@@ -309,6 +316,7 @@
309316
COMBINE_HIDPI_IMAGES = YES;
310317
INFOPLIST_FILE = AnyBar/Info.plist;
311318
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
319+
MACOSX_DEPLOYMENT_TARGET = 10.9;
312320
PRODUCT_NAME = "$(TARGET_NAME)";
313321
};
314322
name = Release;

0 commit comments

Comments
 (0)