Skip to content

Commit 5c29105

Browse files
niki-timofeniki-timofe
committed
branding and cleanup
1 parent d4c4a53 commit 5c29105

File tree

15 files changed

+71
-64
lines changed

15 files changed

+71
-64
lines changed

‎NarodMonMenubarApp.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
/* Begin PBXFileReference section */
1818
112636A51E82EF5800599AB0 /* StatusMenuController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusMenuController.swift; sourceTree = "<group>"; };
1919
112636A71E82F20300599AB0 /* NarodMonAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NarodMonAPI.swift; sourceTree = "<group>"; };
20-
11775E9C1E88AB2D00EB88B0 /* BridgingHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BridgingHeader.h; sourceTree = "<group>"; };
20+
11775E9C1E88AB2D00EB88B0 /* BridgingHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BridgingHeader.h; path = NarodMonMenubarApp/BridgingHeader.h; sourceTree = SOURCE_ROOT; };
2121
117CA21D1E8317E400FC406C /* NarodMonMenubarApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NarodMonMenubarApp.entitlements; sourceTree = "<group>"; };
22-
11A3D1DB1E82CE5D00E7163D /* NarodMonMenubarApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NarodMonMenubarApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
22+
11A3D1DB1E82CE5D00E7163D /* Народный мониторинг.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Народный мониторинг.app"; sourceTree = BUILT_PRODUCTS_DIR; };
2323
11A3D1DE1E82CE5D00E7163D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
2424
11A3D1E01E82CE5D00E7163D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2525
11A3D1E51E82CE5D00E7163D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -37,6 +37,18 @@
3737
/* End PBXFrameworksBuildPhase section */
3838

3939
/* Begin PBXGroup section */
40+
11775E9E1E88B3E300EB88B0 /* Sources */ = {
41+
isa = PBXGroup;
42+
children = (
43+
11775E9C1E88AB2D00EB88B0 /* BridgingHeader.h */,
44+
11A3D1F31E82D36D00E7163D /* main.swift */,
45+
11A3D1DE1E82CE5D00E7163D /* AppDelegate.swift */,
46+
112636A71E82F20300599AB0 /* NarodMonAPI.swift */,
47+
112636A51E82EF5800599AB0 /* StatusMenuController.swift */,
48+
);
49+
name = Sources;
50+
sourceTree = "<group>";
51+
};
4052
11A3D1D21E82CE5D00E7163D = {
4153
isa = PBXGroup;
4254
children = (
@@ -48,32 +60,28 @@
4860
11A3D1DC1E82CE5D00E7163D /* Products */ = {
4961
isa = PBXGroup;
5062
children = (
51-
11A3D1DB1E82CE5D00E7163D /* NarodMonMenubarApp.app */,
63+
11A3D1DB1E82CE5D00E7163D /* Народный мониторинг.app */,
5264
);
5365
name = Products;
5466
sourceTree = "<group>";
5567
};
5668
11A3D1DD1E82CE5D00E7163D /* NarodMonMenubarApp */ = {
5769
isa = PBXGroup;
5870
children = (
59-
117CA21D1E8317E400FC406C /* NarodMonMenubarApp.entitlements */,
60-
11775E9C1E88AB2D00EB88B0 /* BridgingHeader.h */,
61-
112636A71E82F20300599AB0 /* NarodMonAPI.swift */,
62-
112636A51E82EF5800599AB0 /* StatusMenuController.swift */,
63-
11A3D1DE1E82CE5D00E7163D /* AppDelegate.swift */,
64-
11A3D1E01E82CE5D00E7163D /* Assets.xcassets */,
6571
11A3D1E51E82CE5D00E7163D /* Info.plist */,
66-
11A3D1F31E82D36D00E7163D /* main.swift */,
72+
11775E9E1E88B3E300EB88B0 /* Sources */,
73+
11A3D1E01E82CE5D00E7163D /* Assets.xcassets */,
74+
117CA21D1E8317E400FC406C /* NarodMonMenubarApp.entitlements */,
6775
);
6876
path = NarodMonMenubarApp;
6977
sourceTree = "<group>";
7078
};
7179
/* End PBXGroup section */
7280

7381
/* Begin PBXNativeTarget section */
74-
11A3D1DA1E82CE5D00E7163D /* NarodMonMenubarApp */ = {
82+
11A3D1DA1E82CE5D00E7163D /* Народный мониторинг */ = {
7583
isa = PBXNativeTarget;
76-
buildConfigurationList = 11A3D1E81E82CE5D00E7163D /* Build configuration list for PBXNativeTarget "NarodMonMenubarApp" */;
84+
buildConfigurationList = 11A3D1E81E82CE5D00E7163D /* Build configuration list for PBXNativeTarget "Народный мониторинг" */;
7785
buildPhases = (
7886
11A3D1D71E82CE5D00E7163D /* Sources */,
7987
11B8D29A1E86923700E834D4 /* Increment Build */,
@@ -84,9 +92,9 @@
8492
);
8593
dependencies = (
8694
);
87-
name = NarodMonMenubarApp;
95+
name = "Народный мониторинг";
8896
productName = NarodMonMenubarApp;
89-
productReference = 11A3D1DB1E82CE5D00E7163D /* NarodMonMenubarApp.app */;
97+
productReference = 11A3D1DB1E82CE5D00E7163D /* Народный мониторинг.app */;
9098
productType = "com.apple.product-type.application";
9199
};
92100
/* End PBXNativeTarget section */
@@ -114,16 +122,12 @@
114122
compatibilityVersion = "Xcode 8.0";
115123
developmentRegion = English;
116124
hasScannedForEncodings = 0;
117-
knownRegions = (
118-
en,
119-
Base,
120-
);
121125
mainGroup = 11A3D1D21E82CE5D00E7163D;
122126
productRefGroup = 11A3D1DC1E82CE5D00E7163D /* Products */;
123127
projectDirPath = "";
124128
projectRoot = "";
125129
targets = (
126-
11A3D1DA1E82CE5D00E7163D /* NarodMonMenubarApp */,
130+
11A3D1DA1E82CE5D00E7163D /* Народный мониторинг */,
127131
);
128132
};
129133
/* End PBXProject section */
@@ -174,12 +178,8 @@
174178
11A3D1E61E82CE5D00E7163D /* Debug */ = {
175179
isa = XCBuildConfiguration;
176180
buildSettings = {
177-
ALWAYS_SEARCH_USER_PATHS = NO;
178181
CLANG_ANALYZER_NONNULL = YES;
179-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
180-
CLANG_CXX_LIBRARY = "libc++";
181182
CLANG_ENABLE_MODULES = YES;
182-
CLANG_ENABLE_OBJC_ARC = YES;
183183
CLANG_WARN_BOOL_CONVERSION = YES;
184184
CLANG_WARN_CONSTANT_CONVERSION = YES;
185185
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -192,43 +192,35 @@
192192
CLANG_WARN_SUSPICIOUS_MOVE = YES;
193193
CLANG_WARN_UNREACHABLE_CODE = YES;
194194
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
195-
CODE_SIGN_IDENTITY = "-";
196-
COPY_PHASE_STRIP = NO;
197-
DEBUG_INFORMATION_FORMAT = dwarf;
198-
ENABLE_STRICT_OBJC_MSGSEND = YES;
199-
ENABLE_TESTABILITY = YES;
200-
GCC_C_LANGUAGE_STANDARD = gnu99;
201-
GCC_DYNAMIC_NO_PIC = NO;
202-
GCC_NO_COMMON_BLOCKS = YES;
195+
CODE_SIGN_IDENTITY = "Mac Developer: niki-timofe@ya.ru (2K765C2VK3)";
196+
DEVELOPMENT_TEAM = K8RU6J728Q;
197+
GCC_DYNAMIC_NO_PIC = YES;
203198
GCC_OPTIMIZATION_LEVEL = 0;
204199
GCC_PREPROCESSOR_DEFINITIONS = (
205200
"DEBUG=1",
206201
"$(inherited)",
207202
);
208203
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
209204
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
205+
GCC_WARN_SHADOW = YES;
210206
GCC_WARN_UNDECLARED_SELECTOR = YES;
211207
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
212208
GCC_WARN_UNUSED_FUNCTION = YES;
209+
GCC_WARN_UNUSED_LABEL = YES;
210+
GCC_WARN_UNUSED_PARAMETER = YES;
213211
GCC_WARN_UNUSED_VARIABLE = YES;
214-
MACOSX_DEPLOYMENT_TARGET = 10.12;
215212
MTL_ENABLE_DEBUG_INFO = YES;
216-
ONLY_ACTIVE_ARCH = YES;
217-
SDKROOT = macosx;
218213
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
214+
SWIFT_OBJC_BRIDGING_HEADER = NarodMonMenubarApp/BridgingHeader.h;
219215
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
220216
};
221217
name = Debug;
222218
};
223219
11A3D1E71E82CE5D00E7163D /* Release */ = {
224220
isa = XCBuildConfiguration;
225221
buildSettings = {
226-
ALWAYS_SEARCH_USER_PATHS = NO;
227222
CLANG_ANALYZER_NONNULL = YES;
228-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
229-
CLANG_CXX_LIBRARY = "libc++";
230223
CLANG_ENABLE_MODULES = YES;
231-
CLANG_ENABLE_OBJC_ARC = YES;
232224
CLANG_WARN_BOOL_CONVERSION = YES;
233225
CLANG_WARN_CONSTANT_CONVERSION = YES;
234226
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -241,22 +233,22 @@
241233
CLANG_WARN_SUSPICIOUS_MOVE = YES;
242234
CLANG_WARN_UNREACHABLE_CODE = YES;
243235
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
244-
CODE_SIGN_IDENTITY = "-";
245-
COPY_PHASE_STRIP = NO;
246-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
236+
CODE_SIGN_IDENTITY = "Mac Developer: niki-timofe@ya.ru (2K765C2VK3)";
237+
DEVELOPMENT_TEAM = K8RU6J728Q;
247238
ENABLE_NS_ASSERTIONS = NO;
248-
ENABLE_STRICT_OBJC_MSGSEND = YES;
249-
GCC_C_LANGUAGE_STANDARD = gnu99;
250-
GCC_NO_COMMON_BLOCKS = YES;
239+
GCC_DYNAMIC_NO_PIC = YES;
240+
GCC_OPTIMIZATION_LEVEL = fast;
251241
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
252242
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
243+
GCC_WARN_SHADOW = YES;
253244
GCC_WARN_UNDECLARED_SELECTOR = YES;
254245
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
255246
GCC_WARN_UNUSED_FUNCTION = YES;
247+
GCC_WARN_UNUSED_LABEL = YES;
248+
GCC_WARN_UNUSED_PARAMETER = YES;
256249
GCC_WARN_UNUSED_VARIABLE = YES;
257-
MACOSX_DEPLOYMENT_TARGET = 10.12;
258250
MTL_ENABLE_DEBUG_INFO = NO;
259-
SDKROOT = macosx;
251+
SWIFT_OBJC_BRIDGING_HEADER = NarodMonMenubarApp/BridgingHeader.h;
260252
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
261253
};
262254
name = Release;
@@ -268,7 +260,6 @@
268260
CODE_SIGN_ENTITLEMENTS = NarodMonMenubarApp/NarodMonMenubarApp.entitlements;
269261
CODE_SIGN_IDENTITY = "Mac Developer";
270262
COMBINE_HIDPI_IMAGES = YES;
271-
CURRENT_PROJECT_VERSION = 3;
272263
DEVELOPMENT_TEAM = K8RU6J728Q;
273264
INFOPLIST_FILE = NarodMonMenubarApp/Info.plist;
274265
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
@@ -278,9 +269,8 @@
278269
);
279270
PRODUCT_BUNDLE_IDENTIFIER = "ru.niki-timofe.NarodMonMenubarApp";
280271
PRODUCT_NAME = "$(TARGET_NAME)";
281-
SWIFT_OBJC_BRIDGING_HEADER = BridgingHeader.h;
282272
SWIFT_VERSION = 3.0;
283-
VERSIONING_SYSTEM = "apple-generic";
273+
VERSIONING_SYSTEM = "";
284274
};
285275
name = Debug;
286276
};
@@ -300,9 +290,8 @@
300290
);
301291
PRODUCT_BUNDLE_IDENTIFIER = "ru.niki-timofe.NarodMonMenubarApp";
302292
PRODUCT_NAME = "$(TARGET_NAME)";
303-
SWIFT_OBJC_BRIDGING_HEADER = BridgingHeader.h;
304293
SWIFT_VERSION = 3.0;
305-
VERSIONING_SYSTEM = "apple-generic";
294+
VERSIONING_SYSTEM = "";
306295
};
307296
name = Release;
308297
};
@@ -318,7 +307,7 @@
318307
defaultConfigurationIsVisible = 0;
319308
defaultConfigurationName = Release;
320309
};
321-
11A3D1E81E82CE5D00E7163D /* Build configuration list for PBXNativeTarget "NarodMonMenubarApp" */ = {
310+
11A3D1E81E82CE5D00E7163D /* Build configuration list for PBXNativeTarget "Народный мониторинг" */ = {
322311
isa = XCConfigurationList;
323312
buildConfigurations = (
324313
11A3D1E91E82CE5D00E7163D /* Debug */,

‎NarodMonMenubarApp/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,63 @@
11
{
22
"images" : [
33
{
4-
"idiom" : "mac",
54
"size" : "16x16",
5+
"idiom" : "mac",
6+
"filename" : "Icon_16x16.png",
67
"scale" : "1x"
78
},
89
{
9-
"idiom" : "mac",
1010
"size" : "16x16",
11+
"idiom" : "mac",
12+
"filename" : "Icon_16x16@2x.png",
1113
"scale" : "2x"
1214
},
1315
{
14-
"idiom" : "mac",
1516
"size" : "32x32",
17+
"idiom" : "mac",
18+
"filename" : "Icon_32x32.png",
1619
"scale" : "1x"
1720
},
1821
{
19-
"idiom" : "mac",
2022
"size" : "32x32",
23+
"idiom" : "mac",
24+
"filename" : "Icon_32x32@2x.png",
2125
"scale" : "2x"
2226
},
2327
{
24-
"idiom" : "mac",
2528
"size" : "128x128",
29+
"idiom" : "mac",
30+
"filename" : "Icon_128x128.png",
2631
"scale" : "1x"
2732
},
2833
{
29-
"idiom" : "mac",
3034
"size" : "128x128",
35+
"idiom" : "mac",
36+
"filename" : "Icon_128x128@2x.png",
3137
"scale" : "2x"
3238
},
3339
{
34-
"idiom" : "mac",
3540
"size" : "256x256",
41+
"idiom" : "mac",
42+
"filename" : "Icon_256x256.png",
3643
"scale" : "1x"
3744
},
3845
{
39-
"idiom" : "mac",
4046
"size" : "256x256",
47+
"idiom" : "mac",
48+
"filename" : "Icon_256x256@2x.png",
4149
"scale" : "2x"
4250
},
4351
{
44-
"idiom" : "mac",
4552
"size" : "512x512",
53+
"idiom" : "mac",
54+
"filename" : "Icon_512x512.png",
4655
"scale" : "1x"
4756
},
4857
{
49-
"idiom" : "mac",
5058
"size" : "512x512",
59+
"idiom" : "mac",
60+
"filename" : "Icon_512x512@2x.png",
5161
"scale" : "2x"
5262
}
5363
],

‎NarodMonMenubarApp/Assets.xcassets/AppIcon.appiconset/Icon_128x128.png‎

14.1 KB
Loading

‎NarodMonMenubarApp/Assets.xcassets/AppIcon.appiconset/Icon_128x128@2x.png‎

43.4 KB
Loading

‎NarodMonMenubarApp/Assets.xcassets/AppIcon.appiconset/Icon_16x16.png‎

634 Bytes
Loading

‎NarodMonMenubarApp/Assets.xcassets/AppIcon.appiconset/Icon_16x16@2x.png‎

1.59 KB
Loading

‎NarodMonMenubarApp/Assets.xcassets/AppIcon.appiconset/Icon_256x256.png‎

43.6 KB
Loading

‎NarodMonMenubarApp/Assets.xcassets/AppIcon.appiconset/Icon_256x256@2x.png‎

115 KB
Loading

‎NarodMonMenubarApp/Assets.xcassets/AppIcon.appiconset/Icon_32x32.png‎

1.55 KB
Loading

‎NarodMonMenubarApp/Assets.xcassets/AppIcon.appiconset/Icon_32x32@2x.png‎

4.57 KB
Loading

0 commit comments

Comments
 (0)