Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

UI overhaul for iOS 7

  • Loading branch information...
commit 51aa7b090567f8ca4d7e9bdf5221d16c65cef7f3 1 parent 73ba06d
Ole Zorn authored
Showing with 324 additions and 196 deletions.
  1. +20 −52 AppSales.xcodeproj/project.pbxproj
  2. +39 −0 AppSales.xcodeproj/project.xcworkspace/xcshareddata/AppSales.xccheckout
  3. +0 −2  Classes/AccountStatusView.m
  4. +3 −4 Classes/AccountsViewController.m
  5. +4 −0 Classes/AppSalesAppDelegate.m
  6. +0 −7 Classes/BadgedCell.m
  7. +2 −14 Classes/ColorButton.m
  8. +8 −8 Classes/DashboardAppCell.m
  9. +7 −24 Classes/DashboardViewController.m
  10. +0 −1  Classes/FieldEditorViewController.m
  11. +6 −14 Classes/GraphView.m
  12. +10 −11 Classes/KKPasscodeViewController.m
  13. +11 −11 Classes/ReportDetailEntryCell.m
  14. +10 −26 Classes/ReportDetailViewController.m
  15. +11 −12 Classes/SalesViewController.m
  16. +2 −4 Classes/UIColor+Extensions.m
  17. BIN  Images/Account.png
  18. BIN  Images/Account@2x.png
  19. BIN  Images/AllApps.png
  20. BIN  Images/AllApps@2x.png
  21. BIN  Images/Back.png
  22. BIN  Images/Back@2x.png
  23. BIN  Images/Badge.png
  24. BIN  Images/Badge@2x.png
  25. BIN  Images/DateButton.png
  26. BIN  Images/DateButton@2x.png
  27. BIN  Images/Default-Landscape.png
  28. BIN  Images/Default-Landscape@2x.png
  29. BIN  Images/Default-Portrait.png
  30. BIN  Images/Default-Portrait@2x.png
  31. BIN  Images/Default.png
  32. BIN  Images/Default@2x.png
  33. BIN  Images/DetailHeader.png
  34. BIN  Images/Forward.png
  35. BIN  Images/Forward@2x.png
  36. BIN  Images/GenericApp.png
  37. BIN  Images/GenericApp@2x.png
  38. BIN  Images/HideMap.png
  39. BIN  Images/HideMap@2x.png
  40. BIN  Images/Icon114.png
  41. BIN  Images/Icon57.png
  42. BIN  Images/Icon72.png
  43. BIN  Images/LatestValueButton.png
  44. BIN  Images/LatestValueButton@2x.png
  45. +91 −0 Images/Media.xcassets/AppIcon.appiconset/Contents.json
  46. BIN  Images/Media.xcassets/AppIcon.appiconset/Icon120.png
  47. BIN  Images/Media.xcassets/AppIcon.appiconset/Icon152.png
  48. BIN  Images/Media.xcassets/AppIcon.appiconset/Icon76.png
  49. +100 −0 Images/Media.xcassets/LaunchImage.launchimage/Contents.json
  50. BIN  Images/{ → Media.xcassets/LaunchImage.launchimage}/Default-568h@2x.png
  51. BIN  Images/Media.xcassets/LaunchImage.launchimage/Default-Landscape.png
  52. BIN  Images/Media.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png
  53. BIN  Images/Media.xcassets/LaunchImage.launchimage/Default-Portrait.png
  54. BIN  Images/Media.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png
  55. BIN  Images/Media.xcassets/LaunchImage.launchimage/Default@2x.png
  56. BIN  Images/Sales.png
  57. BIN  Images/Sales@2x.png
  58. BIN  Images/ShowMap.png
  59. BIN  Images/ShowMap@2x.png
  60. BIN  Images/TopBackground.png
  61. BIN  Images/passcode_square_empty.png
  62. BIN  Images/passcode_square_empty@2x.png
  63. BIN  Images/passcode_square_filled.png
  64. BIN  Images/passcode_square_filled@2x.png
  65. +0 −6 Support/AppSales-Info.plist
View
72 AppSales.xcodeproj/project.pbxproj
@@ -65,13 +65,11 @@
7F709D6E13BCC4270008DBAD /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F709D6D13BCC4270008DBAD /* Security.framework */; };
7F709D8C13BD03D40008DBAD /* SalesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F709D8B13BD03D30008DBAD /* SalesViewController.m */; };
7F709D8F13BD064E0008DBAD /* ASAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F709D8E13BD064D0008DBAD /* ASAccount.m */; };
- 7F82B197167DB1DC00C0D9E9 /* Default-Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F82B193167DB1D700C0D9E9 /* Default-Portrait.png */; };
- 7F82B198167DB1DC00C0D9E9 /* Default-Landscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F82B194167DB1D800C0D9E9 /* Default-Landscape@2x.png */; };
- 7F82B199167DB1DC00C0D9E9 /* Default-Portrait@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F82B195167DB1DA00C0D9E9 /* Default-Portrait@2x.png */; };
- 7F82B19A167DB1DC00C0D9E9 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F82B196167DB1DB00C0D9E9 /* Default-Landscape.png */; };
+ 7F86C0F4181C648400F7BE09 /* HideMap@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F86C0F2181C648400F7BE09 /* HideMap@2x.png */; };
+ 7F86C0F5181C648400F7BE09 /* ShowMap@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F86C0F3181C648400F7BE09 /* ShowMap@2x.png */; };
+ 7F86C0F7181C781A00F7BE09 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7F86C0F6181C781A00F7BE09 /* Media.xcassets */; };
7F958AC713D46DD000FDFF75 /* DateButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F958AC613D46DD000FDFF75 /* DateButton@2x.png */; };
7F963B4213E98B8600CA62FD /* AccountStatusView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F963B4113E98B8600CA62FD /* AccountStatusView.m */; };
- 7F97CFD5160CF9CF00313B1D /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F97CFD4160CF9CF00313B1D /* Default-568h@2x.png */; };
7FAB532613DCC1270027274F /* Back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FAB532413DCC1260027274F /* Back@2x.png */; };
7FAB532713DCC1270027274F /* Forward@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FAB532513DCC1270027274F /* Forward@2x.png */; };
7FAB532C13DCFA7E0027274F /* AppIconView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FAB532B13DCFA7D0027274F /* AppIconView.m */; };
@@ -615,16 +613,11 @@
7FDF727513D8E64D00B8CC4E /* ReportCSVViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FDF727413D8E64D00B8CC4E /* ReportCSVViewController.m */; };
7FDF727813D9C39100B8CC4E /* InApp.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FDF727613D9C39100B8CC4E /* InApp.png */; };
7FDF727D13DAAF2900B8CC4E /* ReportCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FDF727C13DAAF2900B8CC4E /* ReportCollection.m */; };
- 7FDF728013DAEBFE00B8CC4E /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FDF727E13DAEBFE00B8CC4E /* Default.png */; };
- 7FDF728113DAEBFE00B8CC4E /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FDF727F13DAEBFE00B8CC4E /* Default@2x.png */; };
7FDF728513DAED8E00B8CC4E /* InApp@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FDF728413DAED8D00B8CC4E /* InApp@2x.png */; };
7FE5E0D113E19A7200F7FDA3 /* AllApps.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FE5E0CF13E19A7100F7FDA3 /* AllApps.png */; };
7FE5E0D213E19A7200F7FDA3 /* AllApps@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FE5E0D013E19A7200F7FDA3 /* AllApps@2x.png */; };
7FE5E0D513E19B3900F7FDA3 /* GenericApp@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FE5E0D313E19B3900F7FDA3 /* GenericApp@2x.png */; };
7FE5E0D613E19B3900F7FDA3 /* GenericApp.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FE5E0D413E19B3900F7FDA3 /* GenericApp.png */; };
- 7FED633213DB2D6F00DF33B1 /* Icon57.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FED632F13DB2D6F00DF33B1 /* Icon57.png */; };
- 7FED633313DB2D6F00DF33B1 /* Icon72.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FED633013DB2D6F00DF33B1 /* Icon72.png */; };
- 7FED633413DB2D6F00DF33B1 /* Icon114.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FED633113DB2D6F00DF33B1 /* Icon114.png */; };
7FFE4BB113BD497A00D9D078 /* RegexKitLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FFE4BB013BD497A00D9D078 /* RegexKitLite.m */; };
7FFE4BB513BD4B9700D9D078 /* NSDictionary+HTTP.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FFE4BB413BD4B9700D9D078 /* NSDictionary+HTTP.m */; };
7FFFB39A13D4573700AD18E3 /* Sales.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FFFB39713D4573700AD18E3 /* Sales.png */; };
@@ -727,14 +720,12 @@
7F709D8B13BD03D30008DBAD /* SalesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SalesViewController.m; sourceTree = "<group>"; };
7F709D8D13BD064D0008DBAD /* ASAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASAccount.h; sourceTree = "<group>"; };
7F709D8E13BD064D0008DBAD /* ASAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASAccount.m; sourceTree = "<group>"; };
- 7F82B193167DB1D700C0D9E9 /* Default-Portrait.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait.png"; sourceTree = "<group>"; };
- 7F82B194167DB1D800C0D9E9 /* Default-Landscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Landscape@2x.png"; sourceTree = "<group>"; };
- 7F82B195167DB1DA00C0D9E9 /* Default-Portrait@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait@2x.png"; sourceTree = "<group>"; };
- 7F82B196167DB1DB00C0D9E9 /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Landscape.png"; sourceTree = "<group>"; };
+ 7F86C0F2181C648400F7BE09 /* HideMap@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "HideMap@2x.png"; sourceTree = "<group>"; };
+ 7F86C0F3181C648400F7BE09 /* ShowMap@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ShowMap@2x.png"; sourceTree = "<group>"; };
+ 7F86C0F6181C781A00F7BE09 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
7F958AC613D46DD000FDFF75 /* DateButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DateButton@2x.png"; sourceTree = "<group>"; };
7F963B4013E98B8600CA62FD /* AccountStatusView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccountStatusView.h; sourceTree = "<group>"; };
7F963B4113E98B8600CA62FD /* AccountStatusView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AccountStatusView.m; sourceTree = "<group>"; };
- 7F97CFD4160CF9CF00313B1D /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
7FAB532413DCC1260027274F /* Back@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Back@2x.png"; sourceTree = "<group>"; };
7FAB532513DCC1270027274F /* Forward@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Forward@2x.png"; sourceTree = "<group>"; };
7FAB532A13DCFA7D0027274F /* AppIconView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppIconView.h; sourceTree = "<group>"; };
@@ -1307,16 +1298,11 @@
7FDF727A13DAAEB300B8CC4E /* ReportSummary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReportSummary.h; sourceTree = "<group>"; };
7FDF727B13DAAF2900B8CC4E /* ReportCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReportCollection.h; sourceTree = "<group>"; };
7FDF727C13DAAF2900B8CC4E /* ReportCollection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReportCollection.m; sourceTree = "<group>"; };
- 7FDF727E13DAEBFE00B8CC4E /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
- 7FDF727F13DAEBFE00B8CC4E /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
7FDF728413DAED8D00B8CC4E /* InApp@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "InApp@2x.png"; sourceTree = "<group>"; };
7FE5E0CF13E19A7100F7FDA3 /* AllApps.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AllApps.png; sourceTree = "<group>"; };
7FE5E0D013E19A7200F7FDA3 /* AllApps@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AllApps@2x.png"; sourceTree = "<group>"; };
7FE5E0D313E19B3900F7FDA3 /* GenericApp@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "GenericApp@2x.png"; sourceTree = "<group>"; };
7FE5E0D413E19B3900F7FDA3 /* GenericApp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = GenericApp.png; sourceTree = "<group>"; };
- 7FED632F13DB2D6F00DF33B1 /* Icon57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon57.png; path = ../Images/Icon57.png; sourceTree = "<group>"; };
- 7FED633013DB2D6F00DF33B1 /* Icon72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon72.png; path = ../Images/Icon72.png; sourceTree = "<group>"; };
- 7FED633113DB2D6F00DF33B1 /* Icon114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon114.png; path = ../Images/Icon114.png; sourceTree = "<group>"; };
7FED633913DB69EA00DF33B1 /* GlobalSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlobalSettings.h; sourceTree = "<group>"; };
7FFE4BAF13BD497A00D9D078 /* RegexKitLite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegexKitLite.h; sourceTree = "<group>"; };
7FFE4BB013BD497A00D9D078 /* RegexKitLite.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegexKitLite.m; sourceTree = "<group>"; };
@@ -1448,7 +1434,6 @@
7F709D3413BC98860008DBAD /* Supporting Files */ = {
isa = PBXGroup;
children = (
- 7F89BCEA13DFE018001C607F /* App Icons */,
7FDF6E9813D8D4AD00B8CC4E /* Flag Images */,
7F709D6F13BCCB8B0008DBAD /* Images */,
7F709D3513BC98860008DBAD /* AppSales-Info.plist */,
@@ -1465,13 +1450,7 @@
7F709D6F13BCCB8B0008DBAD /* Images */ = {
isa = PBXGroup;
children = (
- 7F82B193167DB1D700C0D9E9 /* Default-Portrait.png */,
- 7F82B194167DB1D800C0D9E9 /* Default-Landscape@2x.png */,
- 7F82B195167DB1DA00C0D9E9 /* Default-Portrait@2x.png */,
- 7F82B196167DB1DB00C0D9E9 /* Default-Landscape.png */,
- 7FDF727E13DAEBFE00B8CC4E /* Default.png */,
- 7FDF727F13DAEBFE00B8CC4E /* Default@2x.png */,
- 7F97CFD4160CF9CF00313B1D /* Default-568h@2x.png */,
+ 7F86C0F6181C781A00F7BE09 /* Media.xcassets */,
6D81576114CB44BE005E8F3F /* passcode_square_empty.png */,
6D81576214CB44BE005E8F3F /* passcode_square_empty@2x.png */,
6D81576314CB44BE005E8F3F /* passcode_square_filled.png */,
@@ -1513,6 +1492,8 @@
7FAEB67713E6DD4C00750788 /* Account@2x.png */,
7FFFB39713D4573700AD18E3 /* Sales.png */,
7F454F8713D4B4CF00AE47D1 /* Sales@2x.png */,
+ 7F86C0F2181C648400F7BE09 /* HideMap@2x.png */,
+ 7F86C0F3181C648400F7BE09 /* ShowMap@2x.png */,
);
name = Images;
path = ../Images;
@@ -1560,16 +1541,6 @@
name = "Passcode Lock";
sourceTree = "<group>";
};
- 7F89BCEA13DFE018001C607F /* App Icons */ = {
- isa = PBXGroup;
- children = (
- 7FED632F13DB2D6F00DF33B1 /* Icon57.png */,
- 7FED633013DB2D6F00DF33B1 /* Icon72.png */,
- 7FED633113DB2D6F00DF33B1 /* Icon114.png */,
- );
- name = "App Icons";
- sourceTree = "<group>";
- };
7FAB532913DCF00F0027274F /* Other Sources */ = {
isa = PBXGroup;
children = (
@@ -2338,6 +2309,7 @@
7FDF70C313D8D4AE00B8CC4E /* br@2x.png in Resources */,
7FDF70C413D8D4AE00B8CC4E /* bs.png in Resources */,
7FDF70C513D8D4AE00B8CC4E /* bs@2x.png in Resources */,
+ 7F86C0F7181C781A00F7BE09 /* Media.xcassets in Resources */,
7FDF70C613D8D4AE00B8CC4E /* bt.png in Resources */,
7FDF70C713D8D4AE00B8CC4E /* bt@2x.png in Resources */,
7FDF70C813D8D4AE00B8CC4E /* bv.png in Resources */,
@@ -2361,6 +2333,7 @@
7FDF70DA13D8D4AE00B8CC4E /* ch.png in Resources */,
7FDF70DB13D8D4AE00B8CC4E /* ch@2x.png in Resources */,
7FDF70DC13D8D4AE00B8CC4E /* ci.png in Resources */,
+ 7F86C0F5181C648400F7BE09 /* ShowMap@2x.png in Resources */,
7FDF70DD13D8D4AE00B8CC4E /* ci@2x.png in Resources */,
7FDF70DE13D8D4AE00B8CC4E /* ck.png in Resources */,
7FDF70DF13D8D4AE00B8CC4E /* ck@2x.png in Resources */,
@@ -2463,6 +2436,7 @@
7FDF714013D8D4AE00B8CC4E /* hk.png in Resources */,
7FDF714113D8D4AE00B8CC4E /* hk@2x.png in Resources */,
7FDF714213D8D4AE00B8CC4E /* hm.png in Resources */,
+ 7F86C0F4181C648400F7BE09 /* HideMap@2x.png in Resources */,
7FDF714313D8D4AE00B8CC4E /* hm@2x.png in Resources */,
7FDF714413D8D4AE00B8CC4E /* hn.png in Resources */,
7FDF714513D8D4AE00B8CC4E /* hn@2x.png in Resources */,
@@ -2768,12 +2742,7 @@
7FDF727113D8D4AE00B8CC4E /* zw.png in Resources */,
7FDF727213D8D4AE00B8CC4E /* zw@2x.png in Resources */,
7FDF727813D9C39100B8CC4E /* InApp.png in Resources */,
- 7FDF728013DAEBFE00B8CC4E /* Default.png in Resources */,
- 7FDF728113DAEBFE00B8CC4E /* Default@2x.png in Resources */,
7FDF728513DAED8E00B8CC4E /* InApp@2x.png in Resources */,
- 7FED633213DB2D6F00DF33B1 /* Icon57.png in Resources */,
- 7FED633313DB2D6F00DF33B1 /* Icon72.png in Resources */,
- 7FED633413DB2D6F00DF33B1 /* Icon114.png in Resources */,
7FAB532613DCC1270027274F /* Back@2x.png in Resources */,
7FAB532713DCC1270027274F /* Forward@2x.png in Resources */,
7FAB532F13DD00470027274F /* Pin.png in Resources */,
@@ -2798,11 +2767,6 @@
6D81576614CB44BE005E8F3F /* passcode_square_empty@2x.png in Resources */,
6D81576714CB44BE005E8F3F /* passcode_square_filled.png in Resources */,
6D81576814CB44BE005E8F3F /* passcode_square_filled@2x.png in Resources */,
- 7F97CFD5160CF9CF00313B1D /* Default-568h@2x.png in Resources */,
- 7F82B197167DB1DC00C0D9E9 /* Default-Portrait.png in Resources */,
- 7F82B198167DB1DC00C0D9E9 /* Default-Landscape@2x.png in Resources */,
- 7F82B199167DB1DC00C0D9E9 /* Default-Portrait@2x.png in Resources */,
- 7F82B19A167DB1DC00C0D9E9 /* Default-Landscape.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2904,7 +2868,7 @@
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 4.2;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
OTHER_LDFLAGS = "-licucore";
SDKROOT = iphoneos;
VALID_ARCHS = armv7;
@@ -2923,7 +2887,7 @@
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 4.2;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
OTHER_LDFLAGS = "-licucore";
SDKROOT = iphoneos;
@@ -2935,11 +2899,13 @@
7F709D4E13BC98860008DBAD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "OtherSources/AppSales-Prefix.pch";
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "Support/AppSales-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
PRODUCT_NAME = AppSalesMobile;
TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
@@ -2949,11 +2915,13 @@
7F709D4F13BC98860008DBAD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "OtherSources/AppSales-Prefix.pch";
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "Support/AppSales-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
PRODUCT_NAME = AppSalesMobile;
TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
View
39 AppSales.xcodeproj/project.xcworkspace/xcshareddata/AppSales.xccheckout
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDESourceControlProjectIdentifier</key>
+ <string>08ED4EBE-FDAD-46CC-AF72-7E8915FE9D00</string>
+ <key>IDESourceControlProjectName</key>
+ <string>AppSales</string>
+ <key>IDESourceControlProjectOriginsDictionary</key>
+ <dict>
+ <key>CD0CEDBD-6CB0-407F-AF25-62D3A517214E</key>
+ <string>ssh://github.com/omz/AppSales-Mobile.git</string>
+ </dict>
+ <key>IDESourceControlProjectPath</key>
+ <string>AppSales.xcodeproj/project.xcworkspace</string>
+ <key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+ <dict>
+ <key>CD0CEDBD-6CB0-407F-AF25-62D3A517214E</key>
+ <string>../..</string>
+ </dict>
+ <key>IDESourceControlProjectURL</key>
+ <string>ssh://github.com/omz/AppSales-Mobile.git</string>
+ <key>IDESourceControlProjectVersion</key>
+ <integer>110</integer>
+ <key>IDESourceControlProjectWCCIdentifier</key>
+ <string>CD0CEDBD-6CB0-407F-AF25-62D3A517214E</string>
+ <key>IDESourceControlProjectWCConfigurations</key>
+ <array>
+ <dict>
+ <key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+ <string>public.vcs.git</string>
+ <key>IDESourceControlWCCIdentifierKey</key>
+ <string>CD0CEDBD-6CB0-407F-AF25-62D3A517214E</string>
+ <key>IDESourceControlWCCName</key>
+ <string>AppSales</string>
+ </dict>
+ </array>
+</dict>
+</plist>
View
2  Classes/AccountStatusView.m
@@ -27,8 +27,6 @@ - (id)initWithFrame:(CGRect)frame account:(ASAccount *)anAccount
statusLabel.backgroundColor = [UIColor clearColor];
statusLabel.font = [UIFont systemFontOfSize:14.0];
statusLabel.textColor = [UIColor colorWithRed:0.322 green:0.357 blue:0.443 alpha:1.0];
- statusLabel.shadowColor = [UIColor whiteColor];
- statusLabel.shadowOffset = CGSizeMake(0, 1);
statusLabel.textAlignment = UITextAlignmentCenter;
[self addSubview:statusLabel];
View
7 Classes/AccountsViewController.m
@@ -60,6 +60,8 @@ - (void)viewDidLoad
self.navigationItem.rightBarButtonItem = refreshButtonItem;
self.title = NSLocalizedString(@"AppSales", nil);
+ self.navigationItem.backBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil] autorelease];
+
UIBarButtonItem *addButton = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(addNewAccount)] autorelease];
self.navigationItem.leftBarButtonItem = addButton;
@@ -124,10 +126,9 @@ - (void)showInfo:(id)sender
{
AboutViewController *aboutViewController = [[[AboutViewController alloc] initWithNibName:nil bundle:nil] autorelease];
UINavigationController *aboutNavController = [[[UINavigationController alloc] initWithRootViewController:aboutViewController] autorelease];
+
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
aboutNavController.modalPresentationStyle = UIModalPresentationFormSheet;
- } else {
- aboutNavController.modalTransitionStyle = UIModalTransitionStyleFlipHorizontal;
}
[self presentModalViewController:aboutNavController animated:YES];
}
@@ -194,11 +195,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
cell.textLabel.text = NSLocalizedString(@"Sales and Trends", nil);
cell.badgeCount = badge;
cell.imageView.image = [UIImage imageNamed:@"Sales.png"];
- cell.imageView.highlightedImage = [UIImage as_tintedImageNamed:@"Sales.png" color:[UIColor whiteColor]];
} else if (indexPath.row == 1) {
cell.textLabel.text = NSLocalizedString(@"Account", nil);
cell.imageView.image = [UIImage imageNamed:@"Account.png"];
- cell.imageView.highlightedImage = [UIImage as_tintedImageNamed:@"Account.png" color:[UIColor whiteColor]];
cell.badgeCount = 0;
}
return cell;
View
4 Classes/AppSalesAppDelegate.m
@@ -26,6 +26,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
srandom(time(NULL));
self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
+ self.window.tintColor = [UIColor colorWithRed:0.28 green:0.51 blue:0.69 alpha:1.0];
NSString *currencyCode = [[NSLocale currentLocale] objectForKey:NSLocaleCurrencyCode];
if (![[CurrencyManager sharedManager].availableCurrencies containsObject:currencyCode]) {
@@ -44,6 +45,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
rootViewController.managedObjectContext = self.managedObjectContext;
UINavigationController *navigationController = [[[UINavigationController alloc] initWithRootViewController:rootViewController] autorelease];
navigationController.toolbarHidden = NO;
+ navigationController.navigationBar.translucent = NO;
self.accountsViewController = rootViewController;
self.window.rootViewController = navigationController;
@@ -54,6 +56,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
self.accountsViewController.contentSizeForViewInPopover = CGSizeMake(320, 480);
self.accountsViewController.delegate = self;
UINavigationController *accountsNavController = [[[UINavigationController alloc] initWithRootViewController:self.accountsViewController] autorelease];
+ accountsNavController.navigationBar.translucent = NO;
accountsNavController.toolbarHidden = NO;
self.accountsPopover = [[[UIPopoverController alloc] initWithContentViewController:accountsNavController] autorelease];
[self loadAccount:nil];
@@ -131,6 +134,7 @@ - (void)loadAccount:(ASAccount *)account
SalesViewController *salesVC = [[[SalesViewController alloc] initWithAccount:account] autorelease];
salesVC.navigationItem.leftBarButtonItem = selectAccountButtonItem;
UINavigationController *salesNavController = [[[UINavigationController alloc] initWithRootViewController:salesVC] autorelease];
+ salesNavController.navigationBar.translucent = NO;
self.window.rootViewController = salesNavController;
}
View
7 Classes/BadgedCell.m
@@ -19,7 +19,6 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
if (self) {
badgeView = [[UIImageView alloc] initWithFrame:CGRectMake(self.contentView.bounds.size.width - 32 - 10, self.contentView.bounds.size.height * 0.5 - 10, 32, 20)];
badgeView.image = [UIImage imageNamed:@"Badge.png"];
- badgeView.highlightedImage = [UIImage as_tintedImageNamed:@"Badge.png" color:[UIColor whiteColor]];
badgeView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin;
badgeLabel = [[UILabel alloc] initWithFrame:CGRectInset(badgeView.bounds, 4, 0)];
badgeLabel.adjustsFontSizeToFitWidth = YES;
@@ -27,7 +26,6 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
badgeLabel.textColor = [UIColor whiteColor];
badgeLabel.textAlignment = UITextAlignmentCenter;
badgeLabel.font = [UIFont boldSystemFontOfSize:14.0];
- badgeLabel.highlightedTextColor = [UIColor colorWithRed:0.008 green:0.435 blue:0.929 alpha:1.0];
[badgeView addSubview:badgeLabel];
badgeView.hidden = YES;
[self.contentView addSubview:badgeView];
@@ -35,11 +33,6 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
return self;
}
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated
-{
- [super setSelected:selected animated:animated];
-}
-
- (void)setBadgeCount:(NSInteger)count
{
badgeCount = count;
View
16 Classes/ColorButton.m
@@ -16,24 +16,12 @@ @implementation ColorButton
- (void)drawRect:(CGRect)rect
{
if (!color) return;
-
- UIBezierPath *roundRect = [UIBezierPath bezierPathWithRoundedRect:self.bounds cornerRadius:5.0];
- UIBezierPath *innerRect = [UIBezierPath bezierPathWithRoundedRect:CGRectInset(self.bounds, 3, 3) cornerRadius:3];
-
if (self.highlighted) {
[[color colorByMultiplyingBy:0.5] set];
} else {
- [(showOutline) ? [color colorByMultiplyingBy:0.75] : color set];
- }
- if (displayAsEllipse) {
- CGContextFillEllipseInRect(UIGraphicsGetCurrentContext(), self.bounds);
- [color set];
- CGContextFillEllipseInRect(UIGraphicsGetCurrentContext(), CGRectInset(self.bounds, 3, 3));
- } else {
- [roundRect fill];
- [color set];
- [innerRect fill];
+ [color setFill];
}
+ UIRectFill(self.bounds);
}
- (void)setColor:(UIColor *)newColor
View
16 Classes/DashboardAppCell.m
@@ -25,11 +25,11 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
nameLabel = [[UILabel alloc] initWithFrame:CGRectMake(44, 10, contentSize.width - 49, 20)];
nameLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;
nameLabel.lineBreakMode = UILineBreakModeMiddleTruncation;
- nameLabel.font = [UIFont boldSystemFontOfSize:16.0];
+ nameLabel.font = [UIFont systemFontOfSize:16.0];
nameLabel.backgroundColor = [UIColor clearColor];
- nameLabel.shadowColor = [UIColor whiteColor];
- nameLabel.highlightedTextColor = [UIColor whiteColor];
- nameLabel.shadowOffset = CGSizeMake(0, 1);
+ //nameLabel.shadowColor = [UIColor whiteColor];
+ //nameLabel.highlightedTextColor = [UIColor whiteColor];
+ //nameLabel.shadowOffset = CGSizeMake(0, 1);
colorButton = [[ColorButton alloc] initWithFrame:CGRectMake(5, 5, 30, 30)];
colorButton.showOutline = NO;
@@ -40,8 +40,8 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
[self.contentView addSubview:iconView];
[self.contentView addSubview:nameLabel];
- self.backgroundView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"CellBackground.png"]] autorelease];
- self.selectedBackgroundView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"CellBackgroundSelected.png"]] autorelease];
+ //self.backgroundView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"CellBackground.png"]] autorelease];
+ //self.selectedBackgroundView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"CellBackgroundSelected.png"]] autorelease];
}
return self;
}
@@ -74,7 +74,7 @@ - (void)setHighlighted:(BOOL)highlighted animated:(BOOL)animated
[super setHighlighted:highlighted animated:animated];
colorButton.selected = NO;
colorButton.highlighted = NO;
- nameLabel.shadowColor = (self.highlighted || self.selected) ? [UIColor blackColor] : [UIColor whiteColor];
+ //nameLabel.shadowColor = (self.highlighted || self.selected) ? [UIColor blackColor] : [UIColor whiteColor];
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated
@@ -82,7 +82,7 @@ - (void)setSelected:(BOOL)selected animated:(BOOL)animated
[super setSelected:selected animated:animated];
colorButton.selected = NO;
colorButton.highlighted = NO;
- nameLabel.shadowColor = (self.highlighted || self.selected) ? [UIColor blackColor] : [UIColor whiteColor];
+ //nameLabel.shadowColor = (self.highlighted || self.selected) ? [UIColor blackColor] : [UIColor whiteColor];
}
- (void)dealloc
View
31 Classes/DashboardViewController.m
@@ -89,42 +89,23 @@ - (void)loadView
BOOL iPad = ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad);
statusVisible = [self shouldShowStatusBar];
- self.topView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"TopBackground.png"]] autorelease];
+ self.topView = [[[UIImageView alloc] initWithImage:[[UIImage imageNamed:@"TopBackground.png"] resizableImageWithCapInsets:UIEdgeInsetsMake(10, 10, 10, 10)]] autorelease];
topView.userInteractionEnabled = YES;
topView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
topView.frame = CGRectMake(0, 0, self.view.bounds.size.width, iPad ? 450.0 : (self.view.bounds.size.height - 44.0) * 0.5);
[self.view addSubview:topView];
- UIImageView *graphShadowView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ShadowBottom.png"]] autorelease];
- graphShadowView.frame = CGRectMake(0, CGRectGetMaxY(topView.bounds), topView.bounds.size.width, 20);
- graphShadowView.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
- [topView addSubview:graphShadowView];
-
self.productsTableView = [[[UITableView alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(topView.frame), self.view.bounds.size.width, self.view.bounds.size.height - topView.bounds.size.height) style:UITableViewStylePlain] autorelease];
productsTableView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
- productsTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
productsTableView.dataSource = self;
productsTableView.delegate = self;
productsTableView.backgroundColor = [UIColor clearColor];
- productsTableView.tableHeaderView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ShadowTop.png"]] autorelease];
- productsTableView.tableFooterView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ShadowBottom.png"]] autorelease];
- UIEdgeInsets productsTableContentInset = (statusVisible) ? UIEdgeInsetsMake(-20, 0, 24, 0) : UIEdgeInsetsMake(-20, 0, -20, 0);
- UIEdgeInsets productsTableScrollIndicatorInset = (statusVisible) ? UIEdgeInsetsMake(0, 0, 44, 0) : UIEdgeInsetsMake(0, 0, 0, 0);
- productsTableView.contentInset = productsTableContentInset;
- productsTableView.scrollIndicatorInsets = productsTableScrollIndicatorInset;
productsTableView.allowsMultipleSelection = YES;
- self.view.backgroundColor = [UIColor scrollViewTexturedBackgroundColor];
+ self.view.backgroundColor = [UIColor whiteColor];
[self.view addSubview:self.productsTableView];
- self.shadowView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ShadowBottom.png"]] autorelease];
- shadowView.frame = graphShadowView.frame;
- shadowView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
- shadowView.alpha = 0.0;
-
- [self.view addSubview:shadowView];
-
self.activityIndicator = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite] autorelease];
if (statusVisible) [activityIndicator startAnimating];
UIBarButtonItem *activityIndicatorItem = [[[UIBarButtonItem alloc] initWithCustomView:activityIndicator] autorelease];
@@ -133,8 +114,6 @@ - (void)loadView
statusLabel.font = [UIFont boldSystemFontOfSize:14.0];
statusLabel.backgroundColor = [UIColor clearColor];
statusLabel.textColor = [UIColor whiteColor];
- statusLabel.shadowColor = [UIColor blackColor];
- statusLabel.shadowOffset = CGSizeMake(0, -1);
statusLabel.textAlignment = UITextAlignmentCenter;
self.progressBar = [[[UIProgressView alloc] initWithFrame:CGRectMake(0, 25, 200, 10)] autorelease];
@@ -146,6 +125,7 @@ - (void)loadView
UIBarButtonItem *statusItem = [[[UIBarButtonItem alloc] initWithCustomView:statusView] autorelease];
UIBarButtonItem *flexSpace = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil] autorelease];
self.stopButtonItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemStop target:self action:@selector(stopDownload:)] autorelease];
+ self.stopButtonItem.tintColor = [UIColor whiteColor];
CGRect statusToolbarFrame = CGRectMake(0, self.view.bounds.size.height - ((statusVisible) ? 44 : 0), self.view.bounds.size.width, 44);
self.statusToolbar = [[[UIToolbar alloc] initWithFrame:statusToolbarFrame] autorelease];
@@ -198,7 +178,7 @@ - (void)showOrHideStatusBar
} else {
[self.activityIndicator stopAnimating];
}
- UIEdgeInsets productsTableContentInset = (statusVisible) ? UIEdgeInsetsMake(-20, 0, 24, 0) : UIEdgeInsetsMake(-20, 0, -20, 0);
+ UIEdgeInsets productsTableContentInset = (statusVisible) ? UIEdgeInsetsMake(0, 0, 44, 0) : UIEdgeInsetsMake(0, 0, 0, 0);
UIEdgeInsets productsTableScrollIndicatorInset = (statusVisible) ? UIEdgeInsetsMake(0, 0, 44, 0) : UIEdgeInsetsMake(0, 0, 0, 0);
CGRect statusToolbarFrame = CGRectMake(0, self.view.bounds.size.height - ((statusVisible) ? 44 : 0), self.view.bounds.size.width, 44);
if (statusVisible) {
@@ -317,6 +297,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
if (!cell) {
cell = [[[DashboardAppCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellIdentifier] autorelease];
}
+ if ([cell respondsToSelector:@selector(setSeparatorInset:)]) {
+ [cell setSeparatorInset:UIEdgeInsetsMake(0, 44, 0, 8)];
+ }
Product *product = nil;
if (indexPath.row != 0) {
View
1  Classes/FieldEditorViewController.m
@@ -225,7 +225,6 @@ - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)ce
FieldSpecifier *field = [fields objectAtIndex:indexPath.row];
cell.textLabel.text = field.title;
cell.textLabel.textAlignment = UITextAlignmentLeft;
- cell.textLabel.font = [UIFont boldSystemFontOfSize:16.0];
cell.accessoryType = UITableViewCellAccessoryNone;
CGSize labelSize = [field.title sizeWithFont:cell.textLabel.font];
CGRect textLabelFrame = CGRectMake(10, 0, labelSize.width, 10);
View
20 Classes/GraphView.m
@@ -26,7 +26,7 @@ - (id)initWithFrame:(CGRect)frameRect
cachedValues = [NSMutableDictionary new];
UIView *scaleBackgroundView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 46, self.bounds.size.height - 30)] autorelease];
- scaleBackgroundView.backgroundColor = [UIColor colorWithWhite:0.9 alpha:1.0];
+ scaleBackgroundView.backgroundColor = [UIColor colorWithWhite:0.95 alpha:1.0];
[self addSubview:scaleBackgroundView];
UIView *bottomLineView = [[[UIView alloc] initWithFrame:CGRectMake(46, self.bounds.size.height - 30, self.bounds.size.width - 46, 1)] autorelease];
@@ -58,19 +58,17 @@ - (id)initWithFrame:(CGRect)frameRect
[self addSubview:scrollView];
titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 4, self.bounds.size.width, 12)];
- titleLabel.font = [UIFont boldSystemFontOfSize:11.0];
+ titleLabel.font = [UIFont systemFontOfSize:11.0];
titleLabel.textAlignment = UITextAlignmentCenter;
titleLabel.textColor = [UIColor grayColor];
titleLabel.backgroundColor = [UIColor clearColor];
- titleLabel.shadowColor = [UIColor whiteColor];
- titleLabel.shadowOffset = CGSizeMake(0, 1);
[self addSubview:titleLabel];
self.sectionLabelButton = [UIButton buttonWithType:UIButtonTypeCustom];
sectionLabelButton.autoresizingMask = UIViewAutoresizingFlexibleTopMargin;
[self.sectionLabelButton setBackgroundImage:[UIImage imageNamed:@"DateButton.png"] forState:UIControlStateNormal];
self.sectionLabelButton.frame = CGRectMake(0, self.bounds.size.height - 30 - 16, 46, 32);
- self.sectionLabelButton.titleLabel.font = [UIFont boldSystemFontOfSize:10.0];
+ self.sectionLabelButton.titleLabel.font = [UIFont systemFontOfSize:10.0];
self.sectionLabelButton.titleLabel.adjustsFontSizeToFitWidth = YES;
[self.sectionLabelButton setTitleColor:[UIColor darkGrayColor] forState:UIControlStateNormal];
[self addSubview:self.sectionLabelButton];
@@ -348,10 +346,8 @@ - (void)scrollViewDidScroll:(UIScrollView *)aScrollView
dateLabel.autoresizingMask = UIViewAutoresizingFlexibleTopMargin;
dateLabel.backgroundColor = [UIColor clearColor];
dateLabel.textColor = [UIColor darkGrayColor];
- dateLabel.shadowColor = [UIColor whiteColor];
- dateLabel.shadowOffset = CGSizeMake(0, 1);
dateLabel.textAlignment = UITextAlignmentCenter;
- dateLabel.font = [UIFont boldSystemFontOfSize:14.0];
+ dateLabel.font = [UIFont systemFontOfSize:14.0];
dateLabel.adjustsFontSizeToFitWidth = YES;
[barView addSubview:dateLabel];
@@ -455,12 +451,10 @@ - (id)initWithColors:(NSArray *)colorArray
}
label = [[UILabel alloc] initWithFrame:CGRectZero];
label.backgroundColor = [UIColor clearColor];
- label.font = [UIFont boldSystemFontOfSize:12.0];
+ label.font = [UIFont systemFontOfSize:12.0];
label.adjustsFontSizeToFitWidth = YES;
label.textAlignment = UITextAlignmentCenter;
label.textColor = [UIColor darkGrayColor];
- label.shadowColor = [UIColor whiteColor];
- label.shadowOffset = CGSizeMake(0, 1);
[self addSubview:label];
}
return self;
@@ -684,10 +678,8 @@ - (id)initWithFrame:(CGRect)frameRect
self.backgroundColor = [UIColor colorWithWhite:0.75 alpha:1.0];
label = [[UILabel alloc] initWithFrame:CGRectMake(-40, -8, 40, 16)];
label.backgroundColor = [UIColor clearColor];
- label.font = [UIFont boldSystemFontOfSize:12.0];
+ label.font = [UIFont systemFontOfSize:12.0];
label.textColor = [UIColor darkGrayColor];
- label.shadowColor = [UIColor whiteColor];
- label.shadowOffset = CGSizeMake(0, 1);
label.textAlignment = UITextAlignmentRight;
label.adjustsFontSizeToFitWidth = YES;
[self addSubview:label];
View
21 Classes/KKPasscodeViewController.m
@@ -45,6 +45,8 @@ - (void)loadView
{
[super loadView];
+ self.edgesForExtendedLayout = UIRectEdgeNone;
+
self.view.backgroundColor = [UIColor whiteColor];
self.enterPasscodeTableView = [[[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleGrouped] autorelease];
@@ -214,7 +216,7 @@ - (void)incrementAndShowFailedAttemptsLabel
} else {
_failedAttemptsLabel.text = [NSString stringWithFormat:@"%i Failed Passcode Attempts", _failedAttemptsCount];
}
- CGSize size = [_failedAttemptsLabel.text sizeWithFont:[UIFont boldSystemFontOfSize:14.0]];
+ CGSize size = [_failedAttemptsLabel.text sizeWithFont:[UIFont systemFontOfSize:14.0]];
_failedAttemptsView.frame = CGRectMake((self.view.bounds.size.width - (size.width + 36.0)) / 2, 147.5, size.width + 36.0, size.height + 10.0);
_failedAttemptsLabel.frame = CGRectMake((self.view.bounds.size.width - (size.width + 36.0)) / 2, 147.5, size.width + 36.0, size.height + 10.0);
@@ -473,9 +475,7 @@ - (UIView*)passwordHeaderViewForTextField:(UITextField*)textField
headerLabel.textColor = [UIColor colorWithRed:0.298 green:0.337 blue:0.424 alpha:1.0];
headerLabel.backgroundColor = [UIColor clearColor];
headerLabel.textAlignment = UITextAlignmentCenter;
- headerLabel.font = [UIFont boldSystemFontOfSize:17.0];
- headerLabel.shadowOffset = CGSizeMake(0, 1.0);
- headerLabel.shadowColor = [UIColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:1.0];
+ headerLabel.font = [UIFont systemFontOfSize:17.0];
if ([textField isEqual:_setPasscodeTextField]) {
_passcodeConfirmationWarningLabel = [[UILabel alloc] initWithFrame:CGRectMake(0.0, 146.5, self.view.bounds.size.width, 30.0)];
@@ -483,8 +483,6 @@ - (UIView*)passwordHeaderViewForTextField:(UITextField*)textField
_passcodeConfirmationWarningLabel.backgroundColor = [UIColor clearColor];
_passcodeConfirmationWarningLabel.textAlignment = UITextAlignmentCenter;
_passcodeConfirmationWarningLabel.font = [UIFont systemFontOfSize:14.0];
- _passcodeConfirmationWarningLabel.shadowOffset = CGSizeMake(0, 1.0);
- _passcodeConfirmationWarningLabel.shadowColor = [UIColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:1.0];
_passcodeConfirmationWarningLabel.text = @"";
_passcodeConfirmationWarningLabel.numberOfLines = 0;
_passcodeConfirmationWarningLabel.lineBreakMode = UILineBreakModeWordWrap;
@@ -493,16 +491,14 @@ - (UIView*)passwordHeaderViewForTextField:(UITextField*)textField
if ([textField isEqual:_enterPasscodeTextField]) {
NSString *text = @"1 Failed Passcode Attempt";
- CGSize size = [text sizeWithFont:[UIFont boldSystemFontOfSize:14.0]];
+ CGSize size = [text sizeWithFont:[UIFont systemFontOfSize:14.0]];
_failedAttemptsView = [[UIView alloc] initWithFrame:CGRectMake((self.view.bounds.size.width - (size.width + 36.0)) / 2, 147.5, size.width + 36.0, size.height + 10.0)];
_failedAttemptsLabel = [[UILabel alloc] initWithFrame:CGRectMake((self.view.bounds.size.width - (size.width + 36.0)) / 2, 147.5, size.width + 36.0, size.height + 10.0)];
_failedAttemptsLabel.backgroundColor = [UIColor clearColor];
_failedAttemptsLabel.textColor = [UIColor whiteColor];
_failedAttemptsLabel.text = text;
- _failedAttemptsLabel.font = [UIFont boldSystemFontOfSize:14.0];
+ _failedAttemptsLabel.font = [UIFont systemFontOfSize:14.0];
_failedAttemptsLabel.textAlignment = UITextAlignmentCenter;
- _failedAttemptsLabel.shadowOffset = CGSizeMake(0, -1.0);
- _failedAttemptsLabel.shadowColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
_failedAttemptsView.layer.cornerRadius = 14;
_failedAttemptsView.layer.borderWidth = 1.0;
_failedAttemptsView.layer.borderColor = [[UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.25] CGColor];
@@ -527,15 +523,16 @@ - (UIView*)passwordHeaderViewForTextField:(UITextField*)textField
if (mode == KKPasscodeModeSet) {
self.navigationItem.title = @"Set Passcode";
UIBarButtonItem *cancel = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancelButtonPressed:)];
+ cancel.tintColor = [UIColor whiteColor];
self.navigationItem.leftBarButtonItem = cancel;
[cancel release];
-
if ([textField isEqual:_enterPasscodeTextField]) {
headerLabel.text = @"Enter your passcode";
} else if ([textField isEqual:_setPasscodeTextField]) {
headerLabel.text = @"Enter a passcode";
UIBarButtonItem *cancel = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancelButtonPressed:)];
+ cancel.tintColor = [UIColor whiteColor];
self.navigationItem.leftBarButtonItem = cancel;
[cancel release];
@@ -545,6 +542,7 @@ - (UIView*)passwordHeaderViewForTextField:(UITextField*)textField
} else if (mode == KKPasscodeModeDisabled) {
self.navigationItem.title = @"Turn off Passcode";
UIBarButtonItem *cancel = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancelButtonPressed:)];
+ cancel.tintColor = [UIColor whiteColor];
self.navigationItem.leftBarButtonItem = cancel;
[cancel release];
@@ -552,6 +550,7 @@ - (UIView*)passwordHeaderViewForTextField:(UITextField*)textField
} else if (mode == KKPasscodeModeChange) {
self.navigationItem.title = @"Change Passcode";
UIBarButtonItem *cancel = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancelButtonPressed:)];
+ cancel.tintColor = [UIColor whiteColor];
self.navigationItem.leftBarButtonItem = cancel;
[cancel release];
View
22 Classes/ReportDetailEntryCell.m
@@ -26,11 +26,11 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
[self.contentView addSubview:iconView];
revenueLabel = [[UILabel alloc] initWithFrame:CGRectMake(40, 4, 82, 30)];
- revenueLabel.font = [UIFont boldSystemFontOfSize:17.0];
+ revenueLabel.font = [UIFont systemFontOfSize:17.0];
revenueLabel.backgroundColor = [UIColor clearColor];
- revenueLabel.shadowColor = [UIColor whiteColor];
- revenueLabel.shadowOffset = CGSizeMake(0, 1);
- revenueLabel.highlightedTextColor = [UIColor whiteColor];
+ //revenueLabel.shadowColor = [UIColor whiteColor];
+ //revenueLabel.shadowOffset = CGSizeMake(0, 1);
+ //revenueLabel.highlightedTextColor = [UIColor whiteColor];
revenueLabel.adjustsFontSizeToFitWidth = YES;
revenueLabel.textAlignment = UITextAlignmentRight;
[self.contentView addSubview:revenueLabel];
@@ -48,7 +48,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
percentageLabel.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin;
percentageLabel.textAlignment = UITextAlignmentRight;
percentageLabel.backgroundColor = [UIColor clearColor];
- percentageLabel.font = [UIFont boldSystemFontOfSize:11.0];
+ percentageLabel.font = [UIFont systemFontOfSize:11.0];
percentageLabel.textColor = [UIColor whiteColor];
[barBackgroundView addSubview:percentageLabel];
@@ -56,7 +56,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
subtitleLabel.backgroundColor = [UIColor clearColor];
subtitleLabel.font = [UIFont systemFontOfSize:11.0];
subtitleLabel.textColor = [UIColor darkGrayColor];
- subtitleLabel.highlightedTextColor = [UIColor whiteColor];
+ subtitleLabel.highlightedTextColor = [UIColor darkGrayColor];
[self.contentView addSubview:subtitleLabel];
revenueFormatter = [[NSNumberFormatter alloc] init];
@@ -68,8 +68,8 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
[percentageFormatter setMaximumFractionDigits:1];
[percentageFormatter setNumberStyle:NSNumberFormatterPercentStyle];
- self.backgroundView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"CellBackground.png"]] autorelease];
- self.selectedBackgroundView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"CellBackgroundSelected.png"]] autorelease];
+ //self.backgroundView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"CellBackground.png"]] autorelease];
+ //self.selectedBackgroundView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"CellBackgroundSelected.png"]] autorelease];
}
return self;
}
@@ -117,8 +117,8 @@ - (void)setSelected:(BOOL)selected animated:(BOOL)animated
[super setSelected:selected animated:animated];
barBackgroundView.backgroundColor = [UIColor colorWithWhite:0.8 alpha:1.0];
barView.backgroundColor = [UIColor colorWithRed:0.541 green:0.612 blue:0.671 alpha:1.0];
- revenueLabel.shadowColor = [UIColor blackColor];
- revenueLabel.shadowColor = (self.highlighted || self.selected) ? [UIColor blackColor] : [UIColor whiteColor];
+ //revenueLabel.shadowColor = [UIColor blackColor];
+ //revenueLabel.shadowColor = (self.highlighted || self.selected) ? [UIColor blackColor] : [UIColor whiteColor];
}
- (void)setHighlighted:(BOOL)highlighted animated:(BOOL)animated
@@ -126,7 +126,7 @@ - (void)setHighlighted:(BOOL)highlighted animated:(BOOL)animated
[super setHighlighted:highlighted animated:animated];
barBackgroundView.backgroundColor = [UIColor colorWithWhite:0.8 alpha:1.0];
barView.backgroundColor = [UIColor colorWithRed:0.541 green:0.612 blue:0.671 alpha:1.0];
- revenueLabel.shadowColor = (self.highlighted || self.selected) ? [UIColor blackColor] : [UIColor whiteColor];
+ //revenueLabel.shadowColor = (self.highlighted || self.selected) ? [UIColor blackColor] : [UIColor whiteColor];
}
- (void)dealloc
View
36 Classes/ReportDetailViewController.m
@@ -41,6 +41,7 @@ - (id)initWithReports:(NSArray *)reportsArray selectedIndex:(NSInteger)selectedI
[revenueFormatter setMaximumFractionDigits:2];
mapHidden = [[NSUserDefaults standardUserDefaults] boolForKey:kSettingReportDetailMapHidden];
self.contentSizeForViewInPopover = CGSizeMake(320, 500);
+ self.edgesForExtendedLayout = UIRectEdgeNone;
}
return self;
}
@@ -48,7 +49,7 @@ - (id)initWithReports:(NSArray *)reportsArray selectedIndex:(NSInteger)selectedI
- (void)loadView
{
[super loadView];
- self.view.backgroundColor = [UIColor scrollViewTexturedBackgroundColor];
+ self.view.backgroundColor = [UIColor whiteColor];
viewMode = (self.selectedProduct) ? ReportDetailViewModeCountries : ReportDetailViewModeProducts;
@@ -61,22 +62,14 @@ - (void)loadView
}
[self.view addSubview:mapView];
- self.mapShadowView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ShadowBottom.png"]] autorelease];
- mapShadowView.frame = CGRectMake(0, CGRectGetMaxY(mapView.frame), self.view.bounds.size.width, 20);
- mapShadowView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
- mapShadowView.alpha = (mapHidden) ? 0.0 : 1.0;
- [self.view addSubview:mapShadowView];
-
CGRect headerFrame = (mapHidden) ? CGRectMake(0, 0, self.view.bounds.size.width, 20) : CGRectMake(0, 208-20, self.view.bounds.size.width, 20);
self.headerView = [[[UIImageView alloc] initWithFrame:headerFrame] autorelease];
headerView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
headerView.image = [UIImage imageNamed:@"DetailHeader.png"];
self.headerLabel = [[[UILabel alloc] initWithFrame:CGRectMake(30, 0, headerView.bounds.size.width - 40, 20)] autorelease];
headerLabel.textColor = [UIColor darkGrayColor];
- headerLabel.shadowColor = [UIColor whiteColor];
- headerLabel.shadowOffset = CGSizeMake(0, 1);
headerLabel.backgroundColor = [UIColor clearColor];
- headerLabel.font = [UIFont boldSystemFontOfSize:13.0];
+ headerLabel.font = [UIFont systemFontOfSize:13.0];
[headerView addSubview:headerLabel];
self.headerIconView = [[[AppIconView alloc] initWithFrame:CGRectMake(7, 2, 16, 16)] autorelease];
headerIconView.image = [UIImage imageNamed:@"AllApps.png"];
@@ -88,24 +81,15 @@ - (void)loadView
CGRect tableViewFrame = (mapHidden) ? CGRectMake(0, 20, self.view.bounds.size.width, self.view.bounds.size.height - 20) : CGRectMake(0, 208, self.view.bounds.size.width, self.view.bounds.size.height - 208);
self.tableView = [[[UITableView alloc] initWithFrame:tableViewFrame style:UITableViewStylePlain] autorelease];
tableView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
- tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+ tableView.separatorInset = UIEdgeInsetsMake(0, 40, 0, 0);
tableView.backgroundColor = [UIColor clearColor];
tableView.scrollIndicatorInsets = UIEdgeInsetsMake(0, 0, toolbarHeight, 0);
+ tableView.contentInset = tableView.scrollIndicatorInsets;
tableView.dataSource = self;
tableView.delegate = self;
- self.tableView.tableHeaderView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ShadowTop.png"]] autorelease];
- self.tableView.tableFooterView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ShadowBottom.png"]] autorelease];
- self.tableView.contentInset = UIEdgeInsetsMake(-20, 0, toolbarHeight - 20, 0);
-
[self.view addSubview:tableView];
- self.shadowView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ShadowBottom.png"]] autorelease];
- shadowView.frame = (mapHidden) ? CGRectMake(0, 20, self.view.bounds.size.width, 20) : CGRectMake(0, 208, self.view.bounds.size.width, 20);
- shadowView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
- shadowView.alpha = 0.0;
- [self.view addSubview:shadowView];
-
if (!UIInterfaceOrientationIsLandscape(self.interfaceOrientation)) {
self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:(mapHidden) ? @"ShowMap.png" : @"HideMap.png"] style:UIBarButtonItemStyleBordered target:self action:@selector(toggleMap:)] autorelease];
}
@@ -152,7 +136,7 @@ - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInte
CGFloat toolbarHeight = UIInterfaceOrientationIsLandscape(toInterfaceOrientation) ? 32.0 : 44.0;
self.toolbar.frame = CGRectMake(0, self.view.bounds.size.height - toolbarHeight, self.view.bounds.size.width, toolbarHeight);
self.tableView.scrollIndicatorInsets = UIEdgeInsetsMake(0, 0, toolbarHeight, 0);
- self.tableView.contentInset = UIEdgeInsetsMake(-20, 0, toolbarHeight - 20, 0);
+ self.tableView.contentInset = UIEdgeInsetsMake(0, 0, toolbarHeight, 0);
}
- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
@@ -368,21 +352,21 @@ - (void)updateHeader
if (viewMode == ReportDetailViewModeCountries) {
if (self.selectedProduct) {
self.headerIconView.productID = self.selectedProduct.productID;
- self.headerLabel.text = [self.selectedProduct displayName];
+ self.headerLabel.text = [[self.selectedProduct displayName] uppercaseString];
} else {
self.headerIconView.productID = nil;
self.headerIconView.image = [UIImage imageNamed:@"AllApps.png"];
- self.headerLabel.text = NSLocalizedString(@"All Apps", nil);
+ self.headerLabel.text = [NSLocalizedString(@"All Apps", nil) uppercaseString];
}
} else {
self.headerIconView.productID = nil;
if (self.selectedCountry) {
self.headerIconView.image = [UIImage imageNamed:[NSString stringWithFormat:@"%@.png", [self.selectedCountry lowercaseString]]];
NSString *countryName = [[CountryDictionary sharedDictionary] nameForCountryCode:self.selectedCountry];
- self.headerLabel.text = countryName;
+ self.headerLabel.text = [countryName uppercaseString];
} else {
self.headerIconView.image = [UIImage imageNamed:@"world.png"];
- self.headerLabel.text = NSLocalizedString(@"All Countries", nil);
+ self.headerLabel.text = [NSLocalizedString(@"All Countries", nil) uppercaseString];
}
}
}
View
23 Classes/SalesViewController.m
@@ -44,6 +44,8 @@ - (id)initWithAccount:(ASAccount *)anAccount
self.title = ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) ? NSLocalizedString(@"Sales", nil) : [account displayName];
self.tabBarItem.image = [UIImage imageNamed:@"Sales.png"];
+ self.edgesForExtendedLayout = UIRectEdgeNone;
+
sortedDailyReports = [NSMutableArray new];
sortedWeeklyReports = [NSMutableArray new];
sortedCalendarMonthReports = [NSMutableArray new];
@@ -239,21 +241,18 @@ - (void)reloadData
for (Report *dailyReport in sortedDailyReports) {
NSDateComponents *dateComponents = [calendar components:NSYearCalendarUnit | NSMonthCalendarUnit fromDate:dailyReport.startDate];
if (!prevDateComponents || (dateComponents.month != prevDateComponents.month || dateComponents.year != prevDateComponents.year)) {
- if (reportsInCurrentMonth) {
- ReportCollection *monthCollection = [[[ReportCollection alloc] initWithReports:reportsInCurrentMonth] autorelease];
- monthCollection.title = [monthFormatter stringFromDate:dailyReport.startDate];
- [sortedCalendarMonthReports addObject:monthCollection];
- }
+ // New month discovered. Make a new ReportCollection to gather all the daily reports in this month.
reportsInCurrentMonth = [NSMutableArray array];
+ [reportsInCurrentMonth addObject:dailyReport];
+ ReportCollection *monthCollection = [[[ReportCollection alloc] initWithReports:reportsInCurrentMonth] autorelease];
+ monthCollection.title = [monthFormatter stringFromDate:dailyReport.startDate];
+ [sortedCalendarMonthReports addObject:monthCollection];
+ } else {
+ // This report is from the same month as the previous report. Append the daily report to the existing collection.
+ [reportsInCurrentMonth addObject:dailyReport];
}
- [reportsInCurrentMonth addObject:dailyReport];
prevDateComponents = dateComponents;
}
- if ([reportsInCurrentMonth count] > 0) {
- ReportCollection *monthCollection = [[[ReportCollection alloc] initWithReports:reportsInCurrentMonth] autorelease];
- monthCollection.title = [monthFormatter stringFromDate:[monthCollection firstReport].startDate];
- [sortedCalendarMonthReports addObject:monthCollection];
- }
// Group daily reports by fiscal month:
[sortedFiscalMonthReports removeAllObjects];
@@ -705,7 +704,7 @@ - (UIView *)accessoryViewForRowAtIndexPath:(NSIndexPath *)indexPath
if (selectedTab == 0 || selectedTab == 1) {
UIButton *latestValueButton = [UIButton buttonWithType:UIButtonTypeCustom];
latestValueButton.frame = CGRectMake(0, 0, 64, 28);
- latestValueButton.titleLabel.font = [UIFont boldSystemFontOfSize:16.0];
+ latestValueButton.titleLabel.font = [UIFont systemFontOfSize:16.0];
latestValueButton.titleLabel.shadowColor = [UIColor colorWithWhite:0.0 alpha:0.5];
latestValueButton.titleLabel.shadowOffset = CGSizeMake(0, -1);
[latestValueButton setBackgroundImage:[UIImage imageNamed:@"LatestValueButton.png"] forState:UIControlStateNormal];
View
6 Classes/UIColor+Extensions.m
@@ -71,10 +71,8 @@ + (NSArray *)crayonColorPalette
+ (UIColor *)randomColor
{
- return [UIColor colorWithRed:(CGFloat)random() / RAND_MAX
- green:(CGFloat)random() / RAND_MAX
- blue:(CGFloat)random() / RAND_MAX
- alpha:1.0f];
+ NSArray *colors = [self crayonColorPalette];
+ return [[self crayonColorPalette] objectAtIndex:arc4random_uniform(colors.count)];
}
- (BOOL)red:(CGFloat *)red green:(CGFloat *)green blue:(CGFloat *)blue alpha:(CGFloat *)alpha
View
BIN  Images/Account.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/Account@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/AllApps.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/AllApps@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/Back.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/Back@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/Badge.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/Badge@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/DateButton.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/DateButton@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/Default-Landscape.png
Deleted file not rendered
View
BIN  Images/Default-Landscape@2x.png
Deleted file not rendered
View
BIN  Images/Default-Portrait.png
Deleted file not rendered
View
BIN  Images/Default-Portrait@2x.png
Deleted file not rendered
View
BIN  Images/Default.png
Deleted file not rendered
View
BIN  Images/Default@2x.png
Deleted file not rendered
View
BIN  Images/DetailHeader.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/Forward.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/Forward@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/GenericApp.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/GenericApp@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/HideMap.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/HideMap@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Images/Icon114.png
Deleted file not rendered
View
BIN  Images/Icon57.png
Deleted file not rendered
View
BIN  Images/Icon72.png
Diff not rendered
View
BIN  Images/LatestValueButton.png
Diff not rendered
View
BIN  Images/LatestValueButton@2x.png
Diff not rendered
View
91 Images/Media.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,91 @@
+{
+ "images" : [
+ {
+ "idiom" : "iphone",
+ "size" : "29x29",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "29x29",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "40x40",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "57x57",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "57x57",
+ "scale" : "2x"
+ },
+ {
+ "size" : "60x60",
+ "idiom" : "iphone",
+ "filename" : "Icon120.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "29x29",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "29x29",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "40x40",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "40x40",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "50x50",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "50x50",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "72x72",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "72x72",
+ "scale" : "2x"
+ },
+ {
+ "size" : "76x76",
+ "idiom" : "ipad",
+ "filename" : "Icon76.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "76x76",
+ "idiom" : "ipad",
+ "filename" : "Icon152.png",
+ "scale" : "2x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
View
BIN  Images/Media.xcassets/AppIcon.appiconset/Icon120.png
Diff not rendered
View
BIN  Images/Media.xcassets/AppIcon.appiconset/Icon152.png
Diff not rendered
View
BIN  Images/Media.xcassets/AppIcon.appiconset/Icon76.png
Diff not rendered
View
100 Images/Media.xcassets/LaunchImage.launchimage/Contents.json
@@ -0,0 +1,100 @@
+{
+ "images" : [
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "filename" : "Default@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "extent" : "full-screen",
+ "idiom" : "iphone",
+ "subtype" : "retina4",
+ "filename" : "Default-568h@2x.png",
+ "minimum-system-version" : "7.0",
+ "orientation" : "portrait",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "filename" : "Default-Portrait.png",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "filename" : "Default-Landscape.png",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "filename" : "Default-Portrait@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "filename" : "Default-Landscape@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "extent" : "full-screen",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "extent" : "full-screen",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "extent" : "full-screen",
+ "subtype" : "retina4",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "2x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
View
BIN  Images/Default-568h@2x.png → ...ssets/LaunchImage.launchimage/Default-568h@2x.png
Diff not rendered
View
BIN  Images/Media.xcassets/LaunchImage.launchimage/Default-Landscape.png
Diff not rendered
View
BIN  Images/Media.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png
Diff not rendered
View
BIN  Images/Media.xcassets/LaunchImage.launchimage/Default-Portrait.png
Diff not rendered
View
BIN  Images/Media.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png
Diff not rendered
View
BIN  Images/Media.xcassets/LaunchImage.launchimage/Default@2x.png
Diff not rendered
View
BIN  Images/Sales.png
Diff not rendered
View
BIN  Images/Sales@2x.png
Diff not rendered
View
BIN  Images/ShowMap.png
Diff not rendered
View
BIN  Images/ShowMap@2x.png
Diff not rendered
View
BIN  Images/TopBackground.png
Diff not rendered
View
BIN  Images/passcode_square_empty.png
Diff not rendered
View
BIN  Images/passcode_square_empty@2x.png 100755 → 100644
Diff not rendered
View
BIN  Images/passcode_square_filled.png 100755 → 100644
Diff not rendered
View
BIN  Images/passcode_square_filled@2x.png 100755 → 100644
Diff not rendered
View
6 Support/AppSales-Info.plist
@@ -10,12 +10,6 @@
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string>Icon57.png</string>
- <key>CFBundleIconFiles</key>
- <array>
- <string>Icon57.png</string>
- <string>Icon72.png</string>
- <string>Icon114.png</string>
- </array>
<key>CFBundleIdentifier</key>
<string>de.omzsoftware.${PRODUCT_NAME:identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
Please sign in to comment.
Something went wrong with that request. Please try again.