Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #12 from mgrebenets/master

Changes to use on iPad
  • Loading branch information...
commit 39fc76a58f08b6af6ccea27d9175579a3f56071c 2 parents 8ba2187 + 96b99f5
@brandonhamilton authored
View
48 UIInputToolbarSample.xcodeproj/project.pbxproj
@@ -18,12 +18,12 @@
CA3A7B9F13708CDE00CF5E6B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CA3A7B9E13708CDE00CF5E6B /* main.m */; };
CA3A7BA513708CDF00CF5E6B /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CA3A7BA313708CDF00CF5E6B /* MainWindow.xib */; };
CADA5F07137891FD0046E8AA /* UIInputToolbarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CADA5F06137891FD0046E8AA /* UIInputToolbarViewController.m */; };
- CAEE6247137AF7F00064987F /* buttonbg@2x~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = CAEE6241137AF7F00064987F /* buttonbg@2x~iphone.png */; };
- CAEE6248137AF7F00064987F /* buttonbg~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = CAEE6242137AF7F00064987F /* buttonbg~iphone.png */; };
- CAEE6249137AF7F00064987F /* textbg@2x~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = CAEE6243137AF7F00064987F /* textbg@2x~iphone.png */; };
- CAEE624A137AF7F00064987F /* textbg~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = CAEE6244137AF7F00064987F /* textbg~iphone.png */; };
- CAEE624B137AF7F00064987F /* toolbarbg@2x~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = CAEE6245137AF7F00064987F /* toolbarbg@2x~iphone.png */; };
- CAEE624C137AF7F00064987F /* toolbarbg~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = CAEE6246137AF7F00064987F /* toolbarbg~iphone.png */; };
+ FF4851E815C67D47003829EC /* buttonbg.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4851E215C67D47003829EC /* buttonbg.png */; };
+ FF4851E915C67D47003829EC /* buttonbg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4851E315C67D47003829EC /* buttonbg@2x.png */; };
+ FF4851EA15C67D47003829EC /* textbg.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4851E415C67D47003829EC /* textbg.png */; };
+ FF4851EB15C67D47003829EC /* textbg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4851E515C67D47003829EC /* textbg@2x.png */; };
+ FF4851EC15C67D47003829EC /* toolbarbg.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4851E615C67D47003829EC /* toolbarbg.png */; };
+ FF4851ED15C67D47003829EC /* toolbarbg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4851E715C67D47003829EC /* toolbarbg@2x.png */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -46,12 +46,12 @@
CA3A7BA413708CDF00CF5E6B /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = "<group>"; };
CADA5F05137891FD0046E8AA /* UIInputToolbarViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIInputToolbarViewController.h; sourceTree = "<group>"; };
CADA5F06137891FD0046E8AA /* UIInputToolbarViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIInputToolbarViewController.m; sourceTree = "<group>"; };
- CAEE6241137AF7F00064987F /* buttonbg@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "buttonbg@2x~iphone.png"; path = "Resources/buttonbg@2x~iphone.png"; sourceTree = "<group>"; };
- CAEE6242137AF7F00064987F /* buttonbg~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "buttonbg~iphone.png"; path = "Resources/buttonbg~iphone.png"; sourceTree = "<group>"; };
- CAEE6243137AF7F00064987F /* textbg@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "textbg@2x~iphone.png"; path = "Resources/textbg@2x~iphone.png"; sourceTree = "<group>"; };
- CAEE6244137AF7F00064987F /* textbg~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "textbg~iphone.png"; path = "Resources/textbg~iphone.png"; sourceTree = "<group>"; };
- CAEE6245137AF7F00064987F /* toolbarbg@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "toolbarbg@2x~iphone.png"; path = "Resources/toolbarbg@2x~iphone.png"; sourceTree = "<group>"; };
- CAEE6246137AF7F00064987F /* toolbarbg~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "toolbarbg~iphone.png"; path = "Resources/toolbarbg~iphone.png"; sourceTree = "<group>"; };
+ FF4851E215C67D47003829EC /* buttonbg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = buttonbg.png; path = Resources/buttonbg.png; sourceTree = "<group>"; };
+ FF4851E315C67D47003829EC /* buttonbg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "buttonbg@2x.png"; path = "Resources/buttonbg@2x.png"; sourceTree = "<group>"; };
+ FF4851E415C67D47003829EC /* textbg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = textbg.png; path = Resources/textbg.png; sourceTree = "<group>"; };
+ FF4851E515C67D47003829EC /* textbg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "textbg@2x.png"; path = "Resources/textbg@2x.png"; sourceTree = "<group>"; };
+ FF4851E615C67D47003829EC /* toolbarbg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = toolbarbg.png; path = Resources/toolbarbg.png; sourceTree = "<group>"; };
+ FF4851E715C67D47003829EC /* toolbarbg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "toolbarbg@2x.png"; path = "Resources/toolbarbg@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -145,12 +145,12 @@
CA3A7BAC13708CF700CF5E6B /* Resources */ = {
isa = PBXGroup;
children = (
- CAEE6241137AF7F00064987F /* buttonbg@2x~iphone.png */,
- CAEE6242137AF7F00064987F /* buttonbg~iphone.png */,
- CAEE6243137AF7F00064987F /* textbg@2x~iphone.png */,
- CAEE6244137AF7F00064987F /* textbg~iphone.png */,
- CAEE6245137AF7F00064987F /* toolbarbg@2x~iphone.png */,
- CAEE6246137AF7F00064987F /* toolbarbg~iphone.png */,
+ FF4851E215C67D47003829EC /* buttonbg.png */,
+ FF4851E315C67D47003829EC /* buttonbg@2x.png */,
+ FF4851E415C67D47003829EC /* textbg.png */,
+ FF4851E515C67D47003829EC /* textbg@2x.png */,
+ FF4851E615C67D47003829EC /* toolbarbg.png */,
+ FF4851E715C67D47003829EC /* toolbarbg@2x.png */,
CA3A7BA313708CDF00CF5E6B /* MainWindow.xib */,
);
name = Resources;
@@ -205,12 +205,12 @@
files = (
CA3A7B9C13708CDE00CF5E6B /* InfoPlist.strings in Resources */,
CA3A7BA513708CDF00CF5E6B /* MainWindow.xib in Resources */,
- CAEE6247137AF7F00064987F /* buttonbg@2x~iphone.png in Resources */,
- CAEE6248137AF7F00064987F /* buttonbg~iphone.png in Resources */,
- CAEE6249137AF7F00064987F /* textbg@2x~iphone.png in Resources */,
- CAEE624A137AF7F00064987F /* textbg~iphone.png in Resources */,
- CAEE624B137AF7F00064987F /* toolbarbg@2x~iphone.png in Resources */,
- CAEE624C137AF7F00064987F /* toolbarbg~iphone.png in Resources */,
+ FF4851E815C67D47003829EC /* buttonbg.png in Resources */,
+ FF4851E915C67D47003829EC /* buttonbg@2x.png in Resources */,
+ FF4851EA15C67D47003829EC /* textbg.png in Resources */,
+ FF4851EB15C67D47003829EC /* textbg@2x.png in Resources */,
+ FF4851EC15C67D47003829EC /* toolbarbg.png in Resources */,
+ FF4851ED15C67D47003829EC /* toolbarbg@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
BIN  ...codeproj/project.xcworkspace/xcuserdata/i4niac.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown
View
85 ...barSample.xcodeproj/xcuserdata/i4niac.xcuserdatad/xcschemes/UIInputToolbarSample.xcscheme
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "CA3A7B8C13708CDE00CF5E6B"
+ BuildableName = "UIInputToolbarSample.app"
+ BlueprintName = "UIInputToolbarSample"
+ ReferencedContainer = "container:UIInputToolbarSample.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Debug">
+ <Testables>
+ </Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "CA3A7B8C13708CDE00CF5E6B"
+ BuildableName = "UIInputToolbarSample.app"
+ BlueprintName = "UIInputToolbarSample"
+ ReferencedContainer = "container:UIInputToolbarSample.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "CA3A7B8C13708CDE00CF5E6B"
+ BuildableName = "UIInputToolbarSample.app"
+ BlueprintName = "UIInputToolbarSample"
+ ReferencedContainer = "container:UIInputToolbarSample.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "CA3A7B8C13708CDE00CF5E6B"
+ BuildableName = "UIInputToolbarSample.app"
+ BlueprintName = "UIInputToolbarSample"
+ ReferencedContainer = "container:UIInputToolbarSample.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
View
22 ...tToolbarSample.xcodeproj/xcuserdata/i4niac.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,22 @@
+<?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>SchemeUserState</key>
+ <dict>
+ <key>UIInputToolbarSample.xcscheme</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>0</integer>
+ </dict>
+ </dict>
+ <key>SuppressBuildableAutocreation</key>
+ <dict>
+ <key>CA3A7B8C13708CDE00CF5E6B</key>
+ <dict>
+ <key>primary</key>
+ <true/>
+ </dict>
+ </dict>
+</dict>
+</plist>
View
1  UIInputToolbarSample/Classes/UIInputToolbar/UIInputToolbar.m
@@ -72,6 +72,7 @@ -(void)setupToolbar:(NSString *)buttonLabel
/* Create UIExpandingTextView input */
self.textView = [[[UIExpandingTextView alloc] initWithFrame:CGRectMake(7, 7, 236, 26)] autorelease];
self.textView.internalTextView.scrollIndicatorInsets = UIEdgeInsetsMake(4.0f, 0.0f, 10.0f, 0.0f);
+ self.textView.autoresizingMask = UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleWidth;
self.textView.delegate = self;
[self addSubview:self.textView];
View
0  ...olbarSample/Resources/buttonbg~iphone.png → UIInputToolbarSample/Resources/buttonbg.png 100644 → 100755
File renamed without changes
View
0  ...arSample/Resources/buttonbg@2x~iphone.png → ...utToolbarSample/Resources/buttonbg@2x.png 100644 → 100755
File renamed without changes
View
0  ...ToolbarSample/Resources/textbg~iphone.png → UIInputToolbarSample/Resources/textbg.png 100644 → 100755
File renamed without changes
View
0  ...lbarSample/Resources/textbg@2x~iphone.png → UIInputToolbarSample/Resources/textbg@2x.png 100644 → 100755
File renamed without changes
View
0  ...lbarSample/Resources/toolbarbg~iphone.png → UIInputToolbarSample/Resources/toolbarbg.png 100644 → 100755
File renamed without changes
View
0  ...rSample/Resources/toolbarbg@2x~iphone.png → ...tToolbarSample/Resources/toolbarbg@2x.png 100644 → 100755
File renamed without changes

0 comments on commit 39fc76a

Please sign in to comment.
Something went wrong with that request. Please try again.