kylefang/MosaicUI
1
0
Fork 0
mirror of https://github.com/zhigang1992/MosaicUI.git synced 2026-01-12 17:32:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary files + fixed merge code

Browse Source
This commit is contained in:
Ezequiel Alejandro Becerra
2013-01-05 20:45:27 -03:00
parent bf12b75d2d
commit cde9326784
6 changed files with 1 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MosaicUI.xcodeproj/project.pbxproj
View File

@@ -11,7 +11,6 @@
6731CA551698DC660059EA97 /* TwoDimentionalArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 6731CA481698DC660059EA97 /* TwoDimentionalArray.m */; };
6731CA561698DC660059EA97 /* MosaicDataView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6731CA4F1698DC660059EA97 /* MosaicDataView.m */; };
6731CA571698DC660059EA97 /* MosaicView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6731CA511698DC660059EA97 /* MosaicView.m */; };
6731CA581698DC660059EA97 /* OverlayImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6731CA531698DC660059EA97 /* OverlayImageView.m */; };
6731CA6E1698E8C50059EA97 /* 001.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 6731CA671698E8C50059EA97 /* 001.jpg */; };
6731CA6F1698E8C50059EA97 /* 002.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 6731CA681698E8C50059EA97 /* 002.jpg */; };
6731CA701698E8C50059EA97 /* 003.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 6731CA691698E8C50059EA97 /* 003.jpg */; };
@@ -47,8 +46,6 @@
6731CA4F1698DC660059EA97 /* MosaicDataView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MosaicDataView.m; sourceTree = "<group>"; };
6731CA501698DC660059EA97 /* MosaicView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MosaicView.h; sourceTree = "<group>"; };
6731CA511698DC660059EA97 /* MosaicView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MosaicView.m; sourceTree = "<group>"; };
6731CA521698DC660059EA97 /* OverlayImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverlayImageView.h; sourceTree = "<group>"; };
6731CA531698DC660059EA97 /* OverlayImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OverlayImageView.m; sourceTree = "<group>"; };
6731CA671698E8C50059EA97 /* 001.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 001.jpg; sourceTree = "<group>"; };
6731CA681698E8C50059EA97 /* 002.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 002.jpg; sourceTree = "<group>"; };
6731CA691698E8C50059EA97 /* 003.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 003.jpg; sourceTree = "<group>"; };
@@ -138,8 +135,6 @@
6731CA4F1698DC660059EA97 /* MosaicDataView.m */,
6731CA501698DC660059EA97 /* MosaicView.h */,
6731CA511698DC660059EA97 /* MosaicView.m */,
6731CA521698DC660059EA97 /* OverlayImageView.h */,
6731CA531698DC660059EA97 /* OverlayImageView.m */,
);
path = Views;
sourceTree = "<group>";
@@ -336,7 +331,6 @@
6731CA551698DC660059EA97 /* TwoDimentionalArray.m in Sources */,
6731CA561698DC660059EA97 /* MosaicDataView.m in Sources */,
6731CA571698DC660059EA97 /* MosaicView.m in Sources */,
6731CA581698DC660059EA97 /* OverlayImageView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

BIN
MosaicUI.xcodeproj/project.xcworkspace/xcuserdata/betzerra.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

1
MosaicUI/Classes/MosaicUI/Entities/MosaicData.h
View File

@@ -7,7 +7,6 @@
//
#import <Foundation/Foundation.h>
#import <MediaPlayer/MediaPlayer.h>
@interface MosaicData : NSObject{
NSString *imageFilename;

6
MosaicUI/Classes/MosaicUI/Views/MosaicDataView.m
View File

@@ -41,6 +41,7 @@
-(void)mosaicViewDidTouch:(NSNotification *)aNotification{
MosaicDataView *aView = [aNotification.userInfo objectForKey:@"mosaicDataView"];
if (aView != self){
// This gets called when another MosaicDataView gets selected
}
}
@@ -197,9 +198,4 @@
return retVal;
}
-(void)removeFromSuperview{
[[NSNotificationCenter defaultCenter] removeObserver:self];
[super removeFromSuperview];
}
@end

18
MosaicUI/Classes/MosaicUI/Views/OverlayImageView.h
View File

@@ -1,18 +0,0 @@
//
// OverlayImageView.h
// Mosaic
//
// Created by Ezequiel A Becerra on 12/10/12.
// Copyright (c) 2012 Betzerra. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface OverlayImageView : UIView{
UIColor *overlayColor;
}
@property (strong) UIColor *overlayColor;
@property (strong) UIImage *image;
@end

64
MosaicUI/Classes/MosaicUI/Views/OverlayImageView.m
View File

@@ -1,64 +0,0 @@
//
// OverlayImageView.m
// Mosaic
//
// Created by Ezequiel A Becerra on 12/10/12.
// Copyright (c) 2012 Betzerra. All rights reserved.
//
#import "OverlayImageView.h"
@implementation OverlayImageView
@synthesize image;
-(id)initWithFrame:(CGRect)frame{
self = [super initWithFrame:frame];
if (self){
}
return self;
}
- (void)drawRect:(CGRect)rect{
CGContextRef context = UIGraphicsGetCurrentContext();
float scale = 1;
if (self.image.size.width < self.image.size.height){
scale = self.frame.size.width / self.image.size.width;
}else{
scale = self.frame.size.height / self.image.size.height;
}
CGSize imageScaledSize = CGSizeMake(self.image.size.width * scale, self.image.size.height * scale);
CGRect imageFrame = CGRectMake(self.frame.size.width/2 - imageScaledSize.width/2,
self.frame.size.height/2 - imageScaledSize.height/2,
imageScaledSize.width,
imageScaledSize.height);
CGContextSaveGState(context);
CGContextTranslateCTM(context, 0.0f, imageFrame.size.height);
CGContextScaleCTM(context, 1.0f, -1.0f);
// Draw picture first
CGContextDrawImage(context, imageFrame, image.CGImage);
CGContextRestoreGState(context);
// Blend mode could be any of CGBlendMode values. Now draw filled rectangle
// over top of image.
CGContextSetBlendMode (context, kCGBlendModeMultiply);
CGContextSetFillColor(context, CGColorGetComponents(overlayColor.CGColor));
CGContextFillRect (context, self.bounds);
}
-(void)setOverlayColor:(UIColor *)newOverlayColor{
overlayColor = newOverlayColor;
}
-(UIColor *)overlayColor{
return overlayColor;
}
@end