Skip to content

Commit 8728435

Browse files
author
Olga Konoreva
authored
Merge enhancement branch: feature/refactoring
Feature/refactoring
2 parents 20db6ff + ca2926d commit 8728435

17 files changed

Lines changed: 186 additions & 55 deletions

File tree

‎InteractiveSideMenu.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
881EF07A1E30FFE40035DEB4 /* Project object */ = {
103103
isa = PBXProject;
104104
attributes = {
105-
LastUpgradeCheck = 0820;
105+
LastUpgradeCheck = 0830;
106106
ORGANIZATIONNAME = Handsome;
107107
TargetAttributes = {
108108
881EF0821E30FFE40035DEB4 = {
@@ -258,7 +258,9 @@
258258
buildSettings = {
259259
CLANG_ENABLE_MODULES = YES;
260260
CODE_SIGN_IDENTITY = "";
261+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
261262
DEFINES_MODULE = YES;
263+
DEVELOPMENT_TEAM = "";
262264
DYLIB_COMPATIBILITY_VERSION = 1;
263265
DYLIB_CURRENT_VERSION = 1;
264266
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -279,6 +281,7 @@
279281
CLANG_ENABLE_MODULES = YES;
280282
CODE_SIGN_IDENTITY = "";
281283
DEFINES_MODULE = YES;
284+
DEVELOPMENT_TEAM = "";
282285
DYLIB_COMPATIBILITY_VERSION = 1;
283286
DYLIB_CURRENT_VERSION = 1;
284287
DYLIB_INSTALL_NAME_BASE = "@rpath";

‎InteractiveSideMenu.xcodeproj/xcshareddata/xcschemes/InteractiveSideMenu.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0830"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Sample/Sample.xcodeproj/project.pbxproj‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
881EF0BD1E31037D0035DEB4 /* KittyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881EF0B91E31037D0035DEB4 /* KittyViewController.swift */; };
1515
881EF0BE1E31037D0035DEB4 /* HostViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881EF0BA1E31037D0035DEB4 /* HostViewController.swift */; };
1616
881EF0BF1E31037D0035DEB4 /* NavigationMenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881EF0BB1E31037D0035DEB4 /* NavigationMenuViewController.swift */; };
17+
9A15C5481EDD62BC00C4FD75 /* InteractiveSideMenu.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 881EF0C71E31049C0035DEB4 /* InteractiveSideMenu.framework */; };
18+
9A15C5491EDD62BC00C4FD75 /* InteractiveSideMenu.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 881EF0C71E31049C0035DEB4 /* InteractiveSideMenu.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1719
9A6755031EA8E30C00F0C71D /* TabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A6755021EA8E30C00F0C71D /* TabBarViewController.swift */; };
1820
/* End PBXBuildFile section */
1921

@@ -32,8 +34,29 @@
3234
remoteGlobalIDString = 881EF0821E30FFE40035DEB4;
3335
remoteInfo = InteractiveSideMenu;
3436
};
37+
9A15C54A1EDD62BC00C4FD75 /* PBXContainerItemProxy */ = {
38+
isa = PBXContainerItemProxy;
39+
containerPortal = 881EF0C21E31049C0035DEB4 /* InteractiveSideMenu.xcodeproj */;
40+
proxyType = 1;
41+
remoteGlobalIDString = 881EF0821E30FFE40035DEB4;
42+
remoteInfo = InteractiveSideMenu;
43+
};
3544
/* End PBXContainerItemProxy section */
3645

46+
/* Begin PBXCopyFilesBuildPhase section */
47+
9A15C54C1EDD62BC00C4FD75 /* Embed Frameworks */ = {
48+
isa = PBXCopyFilesBuildPhase;
49+
buildActionMask = 2147483647;
50+
dstPath = "";
51+
dstSubfolderSpec = 10;
52+
files = (
53+
9A15C5491EDD62BC00C4FD75 /* InteractiveSideMenu.framework in Embed Frameworks */,
54+
);
55+
name = "Embed Frameworks";
56+
runOnlyForDeploymentPostprocessing = 0;
57+
};
58+
/* End PBXCopyFilesBuildPhase section */
59+
3760
/* Begin PBXFileReference section */
3861
881EF0A41E3102E30035DEB4 /* Sample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Sample.app; sourceTree = BUILT_PRODUCTS_DIR; };
3962
881EF0A71E3102E30035DEB4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -53,6 +76,7 @@
5376
isa = PBXFrameworksBuildPhase;
5477
buildActionMask = 2147483647;
5578
files = (
79+
9A15C5481EDD62BC00C4FD75 /* InteractiveSideMenu.framework in Frameworks */,
5680
);
5781
runOnlyForDeploymentPostprocessing = 0;
5882
};
@@ -118,11 +142,13 @@
118142
881EF0A01E3102E30035DEB4 /* Sources */,
119143
881EF0A11E3102E30035DEB4 /* Frameworks */,
120144
881EF0A21E3102E30035DEB4 /* Resources */,
145+
9A15C54C1EDD62BC00C4FD75 /* Embed Frameworks */,
121146
);
122147
buildRules = (
123148
);
124149
dependencies = (
125150
881EF0C91E3104AD0035DEB4 /* PBXTargetDependency */,
151+
9A15C54B1EDD62BC00C4FD75 /* PBXTargetDependency */,
126152
);
127153
name = Sample;
128154
productName = Sample;
@@ -213,6 +239,11 @@
213239
name = InteractiveSideMenu;
214240
targetProxy = 881EF0C81E3104AD0035DEB4 /* PBXContainerItemProxy */;
215241
};
242+
9A15C54B1EDD62BC00C4FD75 /* PBXTargetDependency */ = {
243+
isa = PBXTargetDependency;
244+
name = InteractiveSideMenu;
245+
targetProxy = 9A15C54A1EDD62BC00C4FD75 /* PBXContainerItemProxy */;
246+
};
216247
/* End PBXTargetDependency section */
217248

218249
/* Begin PBXVariantGroup section */
@@ -329,6 +360,7 @@
329360
881EF0B71E3102E30035DEB4 /* Debug */ = {
330361
isa = XCBuildConfiguration;
331362
buildSettings = {
363+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
332364
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
333365
INFOPLIST_FILE = Sample/Info.plist;
334366
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -341,6 +373,7 @@
341373
881EF0B81E3102E30035DEB4 /* Release */ = {
342374
isa = XCBuildConfiguration;
343375
buildSettings = {
376+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
344377
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
345378
INFOPLIST_FILE = Sample/Info.plist;
346379
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

Sample/Sample/Assets.xcassets/ic_tabbar_surprise.imageset/Black Cat-50.png renamed to Sample/Sample/Assets.xcassets/ic_tabbar_playful.imageset/Black Cat-50.png

File renamed without changes.

Sample/Sample/Assets.xcassets/ic_tabbar_surprise.imageset/Contents.json renamed to Sample/Sample/Assets.xcassets/ic_tabbar_playful.imageset/Contents.json

File renamed without changes.

Sample/Sample/Assets.xcassets/ic_tabbar_smile.imageset/Cat-50.png renamed to Sample/Sample/Assets.xcassets/ic_tabbar_serious.imageset/Cat-50.png

File renamed without changes.

Sample/Sample/Assets.xcassets/ic_tabbar_smile.imageset/Contents.json renamed to Sample/Sample/Assets.xcassets/ic_tabbar_serious.imageset/Contents.json

File renamed without changes.

Sample/Sample/Assets.xcassets/surprised cat.imageset/Contents.json renamed to Sample/Sample/Assets.xcassets/playful cat.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"images" : [
33
{
44
"idiom" : "universal",
5-
"filename" : "c11.jpg",
5+
"filename" : "cute-little-cat-Wallpaper-1.jpg",
66
"scale" : "1x"
77
},
88
{

‎Sample/Sample/Assets.xcassets/playful cat.imageset/cute-little-cat-Wallpaper-1.jpg‎

40.4 KB
Loading

Sample/Sample/Assets.xcassets/smiling cat.imageset/Contents.json renamed to Sample/Sample/Assets.xcassets/serious cat.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"images" : [
33
{
44
"idiom" : "universal",
5-
"filename" : "c7.jpg",
5+
"filename" : "fcbf16daa5d8865.jpg",
66
"scale" : "1x"
77
},
88
{

0 commit comments

Comments
 (0)