Skip to content

Commit 39ed28c

Browse files
committed
Merge pull request #24 from mitrenegade/1.0.2/release
version bump to 1.0.2; paypal environment set to production; text size r...
2 parents 1b3c816 + b5dfbb3 commit 39ed28c

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

snailGram/BackEditorViewController.m

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ - (void)viewDidLoad
5454
[keyboardDoneButtonView setItems:@[[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"Done") style:UIBarButtonItemStyleBordered target:self action:@selector(closeKeyboardInput:)]]];
5555
self.textViewMessage.inputAccessoryView = keyboardDoneButtonView;
5656

57-
[self.textViewMessage setFont:FONT_REGULAR(14)];
58-
[self.labelTo setFont:FONT_REGULAR(14)];
57+
[self.textViewMessage setFont:FONT_REGULAR(12)];
58+
[self.labelTo setFont:FONT_REGULAR(13)];
5959

6060
[self.labelFrom setFont:FONT_REGULAR(6)];
6161
[self.labelFrom setHidden:YES];
@@ -152,9 +152,6 @@ -(void)textViewDidBeginEditing:(UITextView *)textView {
152152
if (textView == self.textViewMessage) {
153153
textView.text = _currentPostCard.message;
154154
}
155-
156-
textView.font = [UIFont systemFontOfSize:15];
157-
textView.textColor = [UIColor darkGrayColor];
158155
}
159156

160157
-(void)textViewDidEndEditing:(UITextView *)textView {

snailGram/Base.lproj/Main.storyboard

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
<rect key="frame" x="8" y="37" width="167" height="166"/>
236236
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
237237
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
238-
<fontDescription key="fontDescription" type="system" pointSize="14"/>
238+
<fontDescription key="fontDescription" type="system" pointSize="12"/>
239239
<textInputTraits key="textInputTraits" autocapitalizationType="sentences" autocorrectionType="no"/>
240240
<connections>
241241
<outlet property="delegate" destination="qBy-bk-JQz" id="51t-P8-HL7"/>

snailGram/Constants.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#define DebugLog(...) NSLog(__VA_ARGS__)
2525
#define AIRPLANE_MODE 0
2626
#define CAN_LOAD_POSTCARD 0
27+
#define TESTING 0
2728

2829
#define FONT_ITALIC(x) [UIFont fontWithName:@"OpenSansLight-Italic" size:x]
2930
#define FONT_BOLD(x) [UIFont fontWithName:@"OpenSans-Bold" size:x]

snailGram/PayPalHelper.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ +(void)initializePayPal {
4242

4343
+(UIViewController *)showPayPalLoginWithDelegate:(id)_delegate {
4444
PayPalHelper *helper = [PayPalHelper sharedPayPalHelper];
45-
[PayPalMobile preconnectWithEnvironment:PayPalEnvironmentNoNetwork];
45+
#if TESTING
46+
[PayPalMobile preconnectWithEnvironment:PayPalEnvironmentSandbox];
47+
#else
48+
[PayPalMobile preconnectWithEnvironment:PayPalEnvironmentProduction];
49+
#endif
4650
helper.delegate = _delegate;
4751

4852
// obtain consent

snailGram/snailGram-Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.0.1</string>
20+
<string>1.0.2</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>1.0.1</string>
24+
<string>1.0.2</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
2727
<key>UIAppFonts</key>

0 commit comments

Comments
 (0)