diff --git a/README.markdown b/README.markdown index 955155c..139e55b 100644 --- a/README.markdown +++ b/README.markdown @@ -28,7 +28,7 @@ Because the progress view uses Core Animation, your target must also link with t ## Compatibility ## -CERoundProgressView is compatible with iOS 5.0 (not tested on betas of iOS 6 yet). +CERoundProgressView is compatible with iOS 5 and iOS 6. #### Automatic Reference Counting #### ARC is not enabled in the sample project, and the classes manage memory the old way. diff --git a/RoundProgress.xcodeproj/project.xcworkspace/xcuserdata/renaud.xcuserdatad/UserInterfaceState.xcuserstate b/RoundProgress.xcodeproj/project.xcworkspace/xcuserdata/renaud.xcuserdatad/UserInterfaceState.xcuserstate index 224380a..abed3b2 100644 Binary files a/RoundProgress.xcodeproj/project.xcworkspace/xcuserdata/renaud.xcuserdatad/UserInterfaceState.xcuserstate and b/RoundProgress.xcodeproj/project.xcworkspace/xcuserdata/renaud.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/RoundProgress/CERoundProgressLayer.m b/RoundProgress/CERoundProgressLayer.m index 66fd426..2a7f8c2 100644 --- a/RoundProgress/CERoundProgressLayer.m +++ b/RoundProgress/CERoundProgressLayer.m @@ -25,6 +25,8 @@ if([layer isKindOfClass:[CERoundProgressLayer class]]) { CERoundProgressLayer *otherLayer = layer; + + self.progress = otherLayer.progress; self.startAngle = otherLayer.startAngle; self.tintColor = otherLayer.tintColor; diff --git a/RoundProgress/CERoundProgressView.m b/RoundProgress/CERoundProgressView.m index e583057..4a51818 100644 --- a/RoundProgress/CERoundProgressView.m +++ b/RoundProgress/CERoundProgressView.m @@ -46,6 +46,9 @@ self.opaque = NO; self.tintColor = [UIColor colorWithRed:0.2 green:0.45 blue:0.8 alpha:1.0]; self.trackColor = [UIColor whiteColor]; + + // On Retina displays, the layer must have its resolution doubled so it does not look blocky. + self.layer.contentsScale = [UIScreen mainScreen].scale; } diff --git a/RoundProgress/en.lproj/CEViewController.xib b/RoundProgress/en.lproj/CEViewController.xib index 91ea791..bd711ef 100644 --- a/RoundProgress/en.lproj/CEViewController.xib +++ b/RoundProgress/en.lproj/CEViewController.xib @@ -1,20 +1,20 @@ - 1296 - 11E53 - 2182 - 1138.47 - 569.00 + 1536 + 12C60 + 2844 + 1187.34 + 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1181 + 1930 - IBUISlider - IBUIButton - IBUIView IBProxyObject + IBUIButton + IBUISlider + IBUIView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -295,7 +295,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -303,6 +303,6 @@ {57, 57} {57, 57} - 1181 + 1930 diff --git a/RoundProgress/images/Pause@2x.png b/RoundProgress/images/Pause@2x.png index 28cd314..07a0788 100644 Binary files a/RoundProgress/images/Pause@2x.png and b/RoundProgress/images/Pause@2x.png differ diff --git a/RoundProgress/images/Play@2x.png b/RoundProgress/images/Play@2x.png index 8c7ce57..71f00f3 100644 Binary files a/RoundProgress/images/Play@2x.png and b/RoundProgress/images/Play@2x.png differ