diff --git a/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/Contents.json b/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/Contents.json new file mode 100644 index 00000000..8f5c1540 --- /dev/null +++ b/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "tomato.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "tomato-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/tomato-1.png b/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/tomato-1.png new file mode 100644 index 00000000..f25cfc07 Binary files /dev/null and b/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/tomato-1.png differ diff --git a/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/tomato.png b/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/tomato.png new file mode 100644 index 00000000..f25cfc07 Binary files /dev/null and b/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/tomato.png differ diff --git a/SQIntervalTimer/SQIntervalTimer/Base.lproj/Main.storyboard b/SQIntervalTimer/SQIntervalTimer/Base.lproj/Main.storyboard index 04c53e44..cd44fb99 100644 --- a/SQIntervalTimer/SQIntervalTimer/Base.lproj/Main.storyboard +++ b/SQIntervalTimer/SQIntervalTimer/Base.lproj/Main.storyboard @@ -16,10 +16,7 @@ - - - - + @@ -31,48 +28,50 @@ - - - + + + + - - + - - - + + + + - - + - - - - - - - - - - - - - + - - - - @@ -201,4 +187,7 @@ + + + diff --git a/SQIntervalTimer/SQIntervalTimer/ViewController.m b/SQIntervalTimer/SQIntervalTimer/ViewController.m index 8c0775c7..3fb0629a 100644 --- a/SQIntervalTimer/SQIntervalTimer/ViewController.m +++ b/SQIntervalTimer/SQIntervalTimer/ViewController.m @@ -11,9 +11,7 @@ @interface ViewController () @property (strong, nonatomic) IBOutletCollection(UIView) NSArray *circles; @property (strong, nonatomic) IBOutletCollection(UIView) NSArray *operators; -@property (strong, nonatomic) IBOutletCollection(UILabel) NSArray *labels; @property (weak, nonatomic) IBOutlet UIPickerView *pickView; -@property (weak, nonatomic) IBOutlet UISegmentedControl *segmentedControl; @property (weak, nonatomic) IBOutlet UILabel *countDownLabel; @property (strong, nonatomic) NSMutableArray *dataSource; @property (strong, nonatomic) NSMutableArray *numbers; @@ -24,7 +22,6 @@ @implementation ViewController - (void)viewDidLoad { [super viewDidLoad]; [self initialData]; - [self configureView]; } - (void)initialData { @@ -48,12 +45,6 @@ - (void)initialData { self.numbers = @[@0, @0, @0].mutableCopy; } -- (void)configureView { - [self.segmentedControl addTarget:self action:@selector(segmentedControlValueChanged:) forControlEvents:(UIControlEventValueChanged)]; - self.segmentedControl.selectedSegmentIndex = 1; - [self segmentedControlValueChanged:self.segmentedControl]; -} - - (UIStatusBarStyle)preferredStatusBarStyle { return UIStatusBarStyleLightContent; } @@ -75,12 +66,6 @@ - (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComp self.numbers[component] = self.dataSource[component][row]; } -- (void)segmentedControlValueChanged:(UISegmentedControl *)sender { - for (UILabel *label in self.labels) { - label.text = @[@"时", @"分", @"秒"][sender.selectedSegmentIndex]; - } -} - - (IBAction)operatorEventTouchUpInside:(UIButton *)sender { [self operatorsStyleToggle];