Skip to content
This repository was archived by the owner on May 1, 2019. It is now read-only.

Adjusting fonts vertically #2

Closed
defagos wants to merge 13 commits into from
Closed

Adjusting fonts vertically #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
83298bd
Baseline auto-alignment of replacement font and original font
defagos Jan 13, 2012
f1af4d0
Remove dictionary instead of calling private method
defagos Jan 13, 2012
d45a06a
Font size adjustment slider
defagos Jan 13, 2012
3da06d1
Offset adjustments
defagos Jan 13, 2012
d217199
Fixed offest adjustment text drawing
defagos Jan 14, 2012
83bf3f9
Merged replacement font name and offset dictionaries into a single one
defagos Jan 14, 2012
68dab5c
Using plist dictionary for the demo
defagos Jan 14, 2012
1c96ff8
Only one font adjusted at a time
defagos Jan 15, 2012
dddcb52
Adjusting fonts individually
defagos Jan 15, 2012
a7ebd6d
Loading from and saving to a plist
defagos Jan 16, 2012
a8f9cb8
Ensuring that fonts are replaced on selected screens only
defagos Jan 16, 2012
9f92bbe
Simulator: Saving setting plist to the desktop
defagos Jan 16, 2012
678c96d
Just some polishing (coding style, naming, comments)
defagos Jan 16, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions FontReplacer Demo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
objects = {

/* Begin PBXBuildFile section */
6FB0365D14BFFEC900626500 /* AdjustmentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB0365C14BFFEC900626500 /* AdjustmentViewController.m */; };
6FB0366014BFFEF500626500 /* AdjustmentViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6FB0365F14BFFEF500626500 /* AdjustmentViewController.xib */; };
6FB0366414C0030200626500 /* OBSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB0366314C0030200626500 /* OBSlider.m */; };
DA336B6B13F01F5D00A60EA6 /* DemoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA336B6A13F01F5D00A60EA6 /* DemoViewController.xib */; };
DA4C182113F446120015A600 /* FontsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4C181F13F446110015A600 /* FontsViewController.m */; };
DA4C182813F4506A0015A600 /* ComparatorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4C182613F450680015A600 /* ComparatorViewController.m */; };
DA6C855713F02703007060AF /* CaviarDreams.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DA6C855213F02703007060AF /* CaviarDreams.ttf */; };
DA6C855813F02703007060AF /* CaviarDreams_Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DA6C855313F02703007060AF /* CaviarDreams_Bold.ttf */; };
DA6C855913F02703007060AF /* CaviarDreams_BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DA6C855413F02703007060AF /* CaviarDreams_BoldItalic.ttf */; };
Expand All @@ -20,15 +22,17 @@
DA98620913F01BCE006DEC9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DA98620813F01BCE006DEC9A /* main.m */; };
DA98620D13F01BCE006DEC9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DA98620C13F01BCE006DEC9A /* AppDelegate.m */; };
DA98621C13F01E63006DEC9A /* UIFont+Replacement.m in Sources */ = {isa = PBXBuildFile; fileRef = DA98621B13F01E63006DEC9A /* UIFont+Replacement.m */; };
DADAB65A13F5DDB0000301E6 /* ComparisonResult.m in Sources */ = {isa = PBXBuildFile; fileRef = DADAB65913F5DDB0000301E6 /* ComparisonResult.m */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
6FB0365B14BFFEC900626500 /* AdjustmentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdjustmentViewController.h; sourceTree = "<group>"; };
6FB0365C14BFFEC900626500 /* AdjustmentViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdjustmentViewController.m; sourceTree = "<group>"; };
6FB0365F14BFFEF500626500 /* AdjustmentViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AdjustmentViewController.xib; sourceTree = "<group>"; };
6FB0366214C0030200626500 /* OBSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OBSlider.h; sourceTree = "<group>"; };
6FB0366314C0030200626500 /* OBSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OBSlider.m; sourceTree = "<group>"; };
DA336B6A13F01F5D00A60EA6 /* DemoViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DemoViewController.xib; sourceTree = "<group>"; };
DA4C181E13F446110015A600 /* FontsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontsViewController.h; sourceTree = "<group>"; };
DA4C181F13F446110015A600 /* FontsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FontsViewController.m; sourceTree = "<group>"; };
DA4C182513F450680015A600 /* ComparatorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComparatorViewController.h; sourceTree = "<group>"; };
DA4C182613F450680015A600 /* ComparatorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ComparatorViewController.m; sourceTree = "<group>"; };
DA6C855213F02703007060AF /* CaviarDreams.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = CaviarDreams.ttf; sourceTree = "<group>"; };
DA6C855313F02703007060AF /* CaviarDreams_Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = CaviarDreams_Bold.ttf; sourceTree = "<group>"; };
DA6C855413F02703007060AF /* CaviarDreams_BoldItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = CaviarDreams_BoldItalic.ttf; sourceTree = "<group>"; };
Expand All @@ -44,8 +48,6 @@
DA98620C13F01BCE006DEC9A /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
DA98621A13F01E63006DEC9A /* UIFont+Replacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIFont+Replacement.h"; sourceTree = "<group>"; };
DA98621B13F01E63006DEC9A /* UIFont+Replacement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIFont+Replacement.m"; sourceTree = "<group>"; };
DADAB65813F5DDAF000301E6 /* ComparisonResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComparisonResult.h; sourceTree = "<group>"; };
DADAB65913F5DDB0000301E6 /* ComparisonResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ComparisonResult.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -61,6 +63,16 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
6FB0366114C0030200626500 /* OBSlider */ = {
isa = PBXGroup;
children = (
6FB0366214C0030200626500 /* OBSlider.h */,
6FB0366314C0030200626500 /* OBSlider.m */,
);
name = OBSlider;
path = "FontReplacer Demo/OBSlider";
sourceTree = "<group>";
};
DA6C855113F02703007060AF /* CaviarDreams */ = {
isa = PBXGroup;
children = (
Expand All @@ -75,12 +87,14 @@
DA9861EF13F01BCD006DEC9A = {
isa = PBXGroup;
children = (
6FB0366114C0030200626500 /* OBSlider */,
DA98621913F01E55006DEC9A /* UIFont+Replacement */,
DA98620213F01BCE006DEC9A /* FontReplacer Demo */,
DA9861FD13F01BCE006DEC9A /* Frameworks */,
DA9861FB13F01BCE006DEC9A /* Products */,
);
sourceTree = "<group>";
usesTabs = 1;
};
DA9861FB13F01BCE006DEC9A /* Products */ = {
isa = PBXGroup;
Expand All @@ -102,15 +116,14 @@
DA98620213F01BCE006DEC9A /* FontReplacer Demo */ = {
isa = PBXGroup;
children = (
6FB0365B14BFFEC900626500 /* AdjustmentViewController.h */,
6FB0365C14BFFEC900626500 /* AdjustmentViewController.m */,
6FB0365F14BFFEF500626500 /* AdjustmentViewController.xib */,
DA98620B13F01BCE006DEC9A /* AppDelegate.h */,
DA98620C13F01BCE006DEC9A /* AppDelegate.m */,
DA336B6A13F01F5D00A60EA6 /* DemoViewController.xib */,
DA4C181E13F446110015A600 /* FontsViewController.h */,
DA4C181F13F446110015A600 /* FontsViewController.m */,
DA4C182513F450680015A600 /* ComparatorViewController.h */,
DA4C182613F450680015A600 /* ComparatorViewController.m */,
DADAB65813F5DDAF000301E6 /* ComparisonResult.h */,
DADAB65913F5DDB0000301E6 /* ComparisonResult.m */,
DA6C855113F02703007060AF /* CaviarDreams */,
DA98620313F01BCE006DEC9A /* Supporting Files */,
);
Expand Down Expand Up @@ -194,6 +207,7 @@
DA6C855913F02703007060AF /* CaviarDreams_BoldItalic.ttf in Resources */,
DA6C855A13F02703007060AF /* CaviarDreams_Italic.ttf in Resources */,
DA6C856513F035EA007060AF /* Icon@2x.png in Resources */,
6FB0366014BFFEF500626500 /* AdjustmentViewController.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -208,8 +222,8 @@
DA98620D13F01BCE006DEC9A /* AppDelegate.m in Sources */,
DA98621C13F01E63006DEC9A /* UIFont+Replacement.m in Sources */,
DA4C182113F446120015A600 /* FontsViewController.m in Sources */,
DA4C182813F4506A0015A600 /* ComparatorViewController.m in Sources */,
DADAB65A13F5DDB0000301E6 /* ComparisonResult.m in Sources */,
6FB0365D14BFFEC900626500 /* AdjustmentViewController.m in Sources */,
6FB0366414C0030200626500 /* OBSlider.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
35 changes: 35 additions & 0 deletions FontReplacer Demo/AdjustmentViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
//
// AdjustmentViewController.h
// FontReplacer Demo
//
// Created by Samuel Défago on 13.01.12.
// Copyright (c) 2012 Cédric Lüthi. All rights reserved.
//

#import <UIKit/UIKit.h>

#import "OBSlider.h"

@interface AdjustmentViewController : UIViewController

- (id) initWithReplacedFontName:(NSString *)replacedFontName replacementFontName:(NSString *)replacementFontName;

@property (nonatomic, retain) IBOutlet UILabel *replacementFontFirstLabel;
@property (nonatomic, retain) IBOutlet UILabel *replacedFontFirstLabel;
@property (nonatomic, retain) IBOutlet UILabel *replacementFontSecondLabel;
@property (nonatomic, retain) IBOutlet UILabel *replacedFontSecondLabel;
@property (nonatomic, retain) IBOutlet UILabel *replacementFontThirdLabel;
@property (nonatomic, retain) IBOutlet UILabel *replacedFontThirdLabel;
@property (nonatomic, retain) IBOutlet UILabel *replacementFontFourthLabel;
@property (nonatomic, retain) IBOutlet UILabel *replacedFontFourthLabel;

@property (nonatomic, retain) IBOutlet OBSlider *offsetSlider;
@property (nonatomic, retain) IBOutlet UILabel *offsetLabel;

@property (nonatomic, retain) IBOutlet UISlider *pointSizeSlider;
@property (nonatomic, retain) IBOutlet UILabel *pointSizeLabel;

- (IBAction) settingsChanged:(id)sender;
- (IBAction) save:(id)sender;

@end
Loading