Skip to content

Commit cab0647

Browse files
d12frostedwebframp
authored andcommittedJan 18, 2017
Icons update (#132)
* update regular icons * update icons (and add debug/beta versions) * do not round icons
1 parent 715f6d3 commit cab0647

32 files changed

+25
-66
lines changed
 

‎MobileOrg.xcodeproj/project.pbxproj

+2-53
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,15 @@
1717
28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; };
1818
28C3AD8A0F43EF2300507BA6 /* MobileOrg.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 28C3AD890F43EF2300507BA6 /* MobileOrg.xcdatamodel */; };
1919
28D801B40F44B63D00FB423F /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28D801B30F44B63D00FB423F /* CoreData.framework */; };
20-
6C2D36161E13B1BE007D482F /* SyncSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C2D36151E13B1BE007D482F /* SyncSettingsController.m */; };
21-
7419FA541E20DACA00F0EA45 /* SettingsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7419FA531E20DAC900F0EA45 /* SettingsTest.swift */; };
2220
6CB501F01E20C3D70082FD40 /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6CB501EC1E20C3D70082FD40 /* Settings.storyboard */; };
2321
6CB501F11E20C3D70082FD40 /* SettingsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CB501ED1E20C3D70082FD40 /* SettingsController.swift */; };
2422
6CB501F21E20C3D70082FD40 /* SyncSettingsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CB501EE1E20C3D70082FD40 /* SyncSettingsController.swift */; };
2523
6CB501F31E20C3D70082FD40 /* TextInputCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CB501EF1E20C3D70082FD40 /* TextInputCell.swift */; };
24+
7419FA541E20DACA00F0EA45 /* SettingsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7419FA531E20DAC900F0EA45 /* SettingsTest.swift */; };
2625
743C12F41DFED37F0051EC6F /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 743C12F31DFED37F0051EC6F /* Images.xcassets */; };
2726
743C12F61DFED5950051EC6F /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 743C12F51DFED5950051EC6F /* Launch Screen.storyboard */; };
2827
744408DE1E035A1800BCE192 /* DropboxTransferManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 744408DD1E035A1800BCE192 /* DropboxTransferManager.swift */; };
2928
746103091E017E5700C8E34F /* String+RegexSplitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 746102FC1DFF0EDB00C8E34F /* String+RegexSplitter.swift */; };
30-
7461030B1E0187F500C8E34F /* Icon-beta@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7461030A1E0187F500C8E34F /* Icon-beta@2x.png */; };
31-
7461030D1E01880A00C8E34F /* Icon-debug@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7461030C1E01880A00C8E34F /* Icon-debug@2x.png */; };
32-
746103101E01882A00C8E34F /* Icon-beta.png in Resources */ = {isa = PBXBuildFile; fileRef = 7461030E1E01882A00C8E34F /* Icon-beta.png */; };
33-
746103111E01882A00C8E34F /* Icon-debug.png in Resources */ = {isa = PBXBuildFile; fileRef = 7461030F1E01882A00C8E34F /* Icon-debug.png */; };
34-
746103161E01887B00C8E34F /* Icon-Small.png in Resources */ = {isa = PBXBuildFile; fileRef = 746103131E01887B00C8E34F /* Icon-Small.png */; };
35-
746103171E01887B00C8E34F /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 746103141E01887B00C8E34F /* Icon.png */; };
36-
746103181E01887B00C8E34F /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 746103151E01887B00C8E34F /* Icon@2x.png */; };
37-
7461031C1E0189F100C8E34F /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 746103191E0189F100C8E34F /* Icon-72.png */; };
38-
7461031D1E0189F100C8E34F /* Icon-beta-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 7461031A1E0189F100C8E34F /* Icon-beta-72.png */; };
39-
7461031E1E0189F100C8E34F /* Icon-debug-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 7461031B1E0189F100C8E34F /* Icon-debug-72.png */; };
4029
7476CA9F1E01C749007EAE6F /* String+RegexTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7476CA9E1E01C749007EAE6F /* String+RegexTests.swift */; };
4130
747BF9811DFCBC3F00E800FB /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 747BF9801DFCBC3F00E800FB /* libicucore.tbd */; };
4231
747BF98A1DFD5CD900E800FB /* AppKey.plist in Resources */ = {isa = PBXBuildFile; fileRef = 747BF9881DFD5CD900E800FB /* AppKey.plist */; };
@@ -151,29 +140,17 @@
151140
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
152141
32CA4F630368D1EE00C91783 /* MobileOrg_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobileOrg_Prefix.pch; sourceTree = "<group>"; };
153142
6561B399A841A3A5958A5889 /* Pods-MobileOrg.appstore.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MobileOrg.appstore.xcconfig"; path = "Pods/Target Support Files/Pods-MobileOrg/Pods-MobileOrg.appstore.xcconfig"; sourceTree = "<group>"; };
154-
6C2D36141E13B19B007D482F /* SyncSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyncSettingsController.h; sourceTree = "<group>"; };
155-
6C2D36151E13B1BE007D482F /* SyncSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SyncSettingsController.m; sourceTree = "<group>"; };
156-
7419FA531E20DAC900F0EA45 /* SettingsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTest.swift; sourceTree = "<group>"; };
157143
6CB501EC1E20C3D70082FD40 /* Settings.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Settings.storyboard; sourceTree = "<group>"; };
158144
6CB501ED1E20C3D70082FD40 /* SettingsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsController.swift; sourceTree = "<group>"; };
159145
6CB501EE1E20C3D70082FD40 /* SyncSettingsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyncSettingsController.swift; sourceTree = "<group>"; };
160146
6CB501EF1E20C3D70082FD40 /* TextInputCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextInputCell.swift; sourceTree = "<group>"; };
147+
7419FA531E20DAC900F0EA45 /* SettingsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTest.swift; sourceTree = "<group>"; };
161148
743C12F31DFED37F0051EC6F /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = MobileOrg/Images.xcassets; sourceTree = "<group>"; };
162149
743C12F51DFED5950051EC6F /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
163150
744408DD1E035A1800BCE192 /* DropboxTransferManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DropboxTransferManager.swift; path = Dropbox/DropboxTransferManager.swift; sourceTree = "<group>"; };
164151
746102FB1DFF0EDA00C8E34F /* MobileOrg-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MobileOrg-Bridging-Header.h"; sourceTree = "<group>"; };
165152
746102FC1DFF0EDB00C8E34F /* String+RegexSplitter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "String+RegexSplitter.swift"; path = "Classes/Extensions/String+RegexSplitter.swift"; sourceTree = "<group>"; };
166153
746102FF1DFF15F300C8E34F /* MobileOrgTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MobileOrgTests-Bridging-Header.h"; sourceTree = "<group>"; };
167-
7461030A1E0187F500C8E34F /* Icon-beta@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-beta@2x.png"; path = "../AppIcons/Icon-beta@2x.png"; sourceTree = "<group>"; };
168-
7461030C1E01880A00C8E34F /* Icon-debug@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-debug@2x.png"; path = "../AppIcons/Icon-debug@2x.png"; sourceTree = "<group>"; };
169-
7461030E1E01882A00C8E34F /* Icon-beta.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-beta.png"; path = "Resources/AppIcons/Icon-beta.png"; sourceTree = SOURCE_ROOT; };
170-
7461030F1E01882A00C8E34F /* Icon-debug.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-debug.png"; path = "Resources/AppIcons/Icon-debug.png"; sourceTree = SOURCE_ROOT; };
171-
746103131E01887B00C8E34F /* Icon-Small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small.png"; path = "Resources/AppIcons/Icon-Small.png"; sourceTree = SOURCE_ROOT; };
172-
746103141E01887B00C8E34F /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = Resources/AppIcons/Icon.png; sourceTree = SOURCE_ROOT; };
173-
746103151E01887B00C8E34F /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon@2x.png"; path = "Resources/AppIcons/Icon@2x.png"; sourceTree = SOURCE_ROOT; };
174-
746103191E0189F100C8E34F /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "Resources/AppIcons/Icon-72.png"; sourceTree = "<group>"; };
175-
7461031A1E0189F100C8E34F /* Icon-beta-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-beta-72.png"; path = "Resources/AppIcons/Icon-beta-72.png"; sourceTree = "<group>"; };
176-
7461031B1E0189F100C8E34F /* Icon-debug-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-debug-72.png"; path = "Resources/AppIcons/Icon-debug-72.png"; sourceTree = "<group>"; };
177154
7476CA9E1E01C749007EAE6F /* String+RegexTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+RegexTests.swift"; sourceTree = "<group>"; };
178155
747BF9801DFCBC3F00E800FB /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; };
179156
747BF9881DFD5CD900E800FB /* AppKey.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppKey.plist; path = Configuration/AppKey.plist; sourceTree = "<group>"; };
@@ -414,20 +391,6 @@
414391
name = Frameworks;
415392
sourceTree = "<group>";
416393
};
417-
746103121E01884100C8E34F /* App-Icons */ = {
418-
isa = PBXGroup;
419-
children = (
420-
746103131E01887B00C8E34F /* Icon-Small.png */,
421-
746103141E01887B00C8E34F /* Icon.png */,
422-
746103151E01887B00C8E34F /* Icon@2x.png */,
423-
7461030E1E01882A00C8E34F /* Icon-beta.png */,
424-
7461030F1E01882A00C8E34F /* Icon-debug.png */,
425-
7461030A1E0187F500C8E34F /* Icon-beta@2x.png */,
426-
7461030C1E01880A00C8E34F /* Icon-debug@2x.png */,
427-
);
428-
name = "App-Icons";
429-
sourceTree = "<group>";
430-
};
431394
747BF98B1DFD5CF500E800FB /* Configuration */ = {
432395
isa = PBXGroup;
433396
children = (
@@ -472,9 +435,6 @@
472435
7936F928120DDF3E0062CF0E /* Resources-iPad */ = {
473436
isa = PBXGroup;
474437
children = (
475-
746103191E0189F100C8E34F /* Icon-72.png */,
476-
7461031A1E0189F100C8E34F /* Icon-beta-72.png */,
477-
7461031B1E0189F100C8E34F /* Icon-debug-72.png */,
478438
7936F929120DDF3F0062CF0E /* MainWindow-iPad.xib */,
479439
);
480440
name = "Resources-iPad";
@@ -653,7 +613,6 @@
653613
79BA55681073A7DF00D67917 /* Images */ = {
654614
isa = PBXGroup;
655615
children = (
656-
746103121E01884100C8E34F /* App-Icons */,
657616
79F87A9810854FEA00A54CA9 /* cant-sync-offline.png */,
658617
8322ED6B176AE93C008B37C7 /* cant-sync-offline@2x.png */,
659618
79F87A9910854FEA00A54CA9 /* please-configure.png */,
@@ -831,7 +790,6 @@
831790
7998B06E1079847C0000ED49 /* down.png in Resources */,
832791
7998B06F1079847C0000ED49 /* flag.png in Resources */,
833792
7998B0701079847C0000ED49 /* flagged.png in Resources */,
834-
7461030B1E0187F500C8E34F /* Icon-beta@2x.png in Resources */,
835793
7998B0711079847C0000ED49 /* forward.png in Resources */,
836794
7998B0721079847C0000ED49 /* home.png in Resources */,
837795
7998B0731079847C0000ED49 /* inbox.png in Resources */,
@@ -841,19 +799,14 @@
841799
7998B0761079847C0000ED49 /* outline.png in Resources */,
842800
747BF98A1DFD5CD900E800FB /* AppKey.plist in Resources */,
843801
7998B0771079847C0000ED49 /* search.png in Resources */,
844-
746103181E01887B00C8E34F /* Icon@2x.png in Resources */,
845802
7998B0781079847C0000ED49 /* settings.png in Resources */,
846-
746103101E01882A00C8E34F /* Icon-beta.png in Resources */,
847803
7998B0791079847C0000ED49 /* table_gray.png in Resources */,
848804
7998B07A1079847C0000ED49 /* up.png in Resources */,
849805
793F7F0A107C385200674D0A /* DocumentView.css in Resources */,
850806
796A6A911083E67400D0DB25 /* DocumentView.js in Resources */,
851807
79F879B9108544A100A54CA9 /* press-sync.png in Resources */,
852808
79F87A9A10854FEA00A54CA9 /* cant-sync-offline.png in Resources */,
853-
746103161E01887B00C8E34F /* Icon-Small.png in Resources */,
854-
7461031D1E0189F100C8E34F /* Icon-beta-72.png in Resources */,
855809
79F87A9B10854FEA00A54CA9 /* please-configure.png in Resources */,
856-
746103111E01882A00C8E34F /* Icon-debug.png in Resources */,
857810
7936F92A120DDF3F0062CF0E /* MainWindow-iPad.xib in Resources */,
858811
6CB501F01E20C3D70082FD40 /* Settings.storyboard in Resources */,
859812
7936FA91120DF4280062CF0E /* Entitlements.plist in Resources */,
@@ -870,16 +823,12 @@
870823
8322ED7F176AEF62008B37C7 /* note_entry@2x.png in Resources */,
871824
8322ED80176AEF62008B37C7 /* up@2x.png in Resources */,
872825
8322ED87176AF1C7008B37C7 /* capture@2x.png in Resources */,
873-
7461031E1E0189F100C8E34F /* Icon-debug-72.png in Resources */,
874826
8322ED88176AF1C7008B37C7 /* inbox@2x.png in Resources */,
875-
7461031C1E0189F100C8E34F /* Icon-72.png in Resources */,
876827
749CCE3D1E05A8A600DE4648 /* Default-568h@2x.png in Resources */,
877828
8322ED89176AF1C7008B37C7 /* outline@2x.png in Resources */,
878829
8322ED8A176AF1C7008B37C7 /* search@2x.png in Resources */,
879830
8322ED8B176AF1C7008B37C7 /* settings@2x.png in Resources */,
880831
8322ED8C176AF1C7008B37C7 /* table_gray@2x.png in Resources */,
881-
746103171E01887B00C8E34F /* Icon.png in Resources */,
882-
7461030D1E01880A00C8E34F /* Icon-debug@2x.png in Resources */,
883832
);
884833
runOnlyForDeploymentPostprocessing = 0;
885834
};

‎MobileOrg/Images.xcassets/AppIcon.adhoc.appiconset/Contents.json

+10-5
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@
3131
"scale" : "3x"
3232
},
3333
{
34-
"idiom" : "iphone",
3534
"size" : "60x60",
35+
"idiom" : "iphone",
36+
"filename" : "Icon-Small-60@2x.png",
3637
"scale" : "2x"
3738
},
3839
{
39-
"idiom" : "iphone",
4040
"size" : "60x60",
41+
"idiom" : "iphone",
42+
"filename" : "Icon-Small-60@3x.png",
4143
"scale" : "3x"
4244
},
4345
{
@@ -71,18 +73,21 @@
7173
"scale" : "2x"
7274
},
7375
{
74-
"idiom" : "ipad",
7576
"size" : "76x76",
77+
"idiom" : "ipad",
78+
"filename" : "Icon-76.png",
7679
"scale" : "1x"
7780
},
7881
{
79-
"idiom" : "ipad",
8082
"size" : "76x76",
83+
"idiom" : "ipad",
84+
"filename" : "Icon-76@2x.png",
8185
"scale" : "2x"
8286
},
8387
{
84-
"idiom" : "ipad",
8588
"size" : "83.5x83.5",
89+
"idiom" : "ipad",
90+
"filename" : "Icon-83.5@2x.png",
8691
"scale" : "2x"
8792
}
8893
],
Loading
Loading
Loading
Loading
Loading

‎MobileOrg/Images.xcassets/AppIcon.appiconset/Contents.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
{
3434
"size" : "60x60",
3535
"idiom" : "iphone",
36-
"filename" : "Icon@2x.png",
36+
"filename" : "Icon-Small-60@2x.png",
3737
"scale" : "2x"
3838
},
3939
{
4040
"size" : "60x60",
4141
"idiom" : "iphone",
42-
"filename" : "Icon@3x.png",
42+
"filename" : "Icon-Small-60@3x.png",
4343
"scale" : "3x"
4444
},
4545
{
@@ -87,7 +87,7 @@
8787
{
8888
"size" : "83.5x83.5",
8989
"idiom" : "ipad",
90-
"filename" : "Icon-iPad-Retina@2x.png",
90+
"filename" : "Icon-83.5@2x.png",
9191
"scale" : "2x"
9292
}
9393
],
Loading
Loading
Loading
Loading
Loading
Binary file not shown.
Binary file not shown.
Binary file not shown.

‎MobileOrg/Images.xcassets/AppIcon.debug.appiconset/Contents.json

+10-5
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@
3131
"scale" : "3x"
3232
},
3333
{
34-
"idiom" : "iphone",
3534
"size" : "60x60",
35+
"idiom" : "iphone",
36+
"filename" : "Icon-Small-60@2x.png",
3637
"scale" : "2x"
3738
},
3839
{
39-
"idiom" : "iphone",
4040
"size" : "60x60",
41+
"idiom" : "iphone",
42+
"filename" : "Icon-Small-60@3x.png",
4143
"scale" : "3x"
4244
},
4345
{
@@ -71,18 +73,21 @@
7173
"scale" : "2x"
7274
},
7375
{
74-
"idiom" : "ipad",
7576
"size" : "76x76",
77+
"idiom" : "ipad",
78+
"filename" : "Icon-76.png",
7679
"scale" : "1x"
7780
},
7881
{
79-
"idiom" : "ipad",
8082
"size" : "76x76",
83+
"idiom" : "ipad",
84+
"filename" : "Icon-76@2x.png",
8185
"scale" : "2x"
8286
},
8387
{
84-
"idiom" : "ipad",
8588
"size" : "83.5x83.5",
89+
"idiom" : "ipad",
90+
"filename" : "Icon-83.5@2x.png",
8691
"scale" : "2x"
8792
}
8893
],
Loading
Loading
Loading
Loading
Loading

‎Resources/AppIcons/Icon-72.png

-12.1 KB
Binary file not shown.

‎Resources/AppIcons/Icon-Small.png

-6.66 KB
Binary file not shown.

‎Resources/AppIcons/Icon-beta-72.png

-12.5 KB
Binary file not shown.

‎Resources/AppIcons/Icon-beta.png

-10.2 KB
Binary file not shown.

‎Resources/AppIcons/Icon-beta@2x.png

-16.3 KB
Binary file not shown.

‎Resources/AppIcons/Icon-debug-72.png

-12.8 KB
Binary file not shown.

‎Resources/AppIcons/Icon-debug.png

-10.5 KB
Binary file not shown.

‎Resources/AppIcons/Icon-debug@2x.png

-16.9 KB
Binary file not shown.

‎Resources/AppIcons/Icon.png

-10 KB
Binary file not shown.

‎Resources/AppIcons/Icon@2x.png

-26 KB
Binary file not shown.

0 commit comments

Comments
 (0)
Please sign in to comment.