Skip to content
This repository was archived by the owner on Oct 30, 2018. It is now read-only.

Commit f49bf06

Browse files
author
Ignacio Romero Zurbuchen
committed
Merge branch 'master' into keyboard-panning-v2
2 parents 797b232 + c8730ca commit f49bf06

File tree

84 files changed

+987
-1345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+987
-1345
lines changed

‎.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ DerivedData
1717
*.hmap
1818
.gutter.json
1919

20-
Tests/Pods
21-
Tests/Podfile.lock
20+
SlackTextViewController/Pods
21+
SlackTextViewController/Podfile.lock
22+
SlackTextViewController/*.xcworkspace

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ notifications:
1111
slack:
1212
secure: DOv3x21M1pnyrZ5jT5bZyHG0lg2E2tnj+6TVNHUD2ZYjab3X9oYz6PzL0YaC0M2S0rtiJtjO7jd1hdXHPg9CTUg04oGLSWe43Fmt2WAprszSXwyvNnqHNilBHFwhuM7MqcbV1uu3R/5CZVuHA0MKZqLQtDx2N4ep/5Lg6ehmuoA=
1313
after_success:
14-
- bundle exec slather
14+
- bundle exec slather

‎.xctool-args

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
[
2-
"-workspace", "Tests/SlackTextViewControllerTests.xcworkspace",
3-
"-scheme", "Tests",
2+
"-workspace", "SlackTextViewController/SlackTextViewController.xcworkspace",
3+
"-scheme", "SnapshotTests",
44
"-sdk", "iphonesimulator",
55
"-configuration", "Debug",
6-
"-destination", "name=iPhone 4s,OS=8.1",
7-
"-destination", "name=iPhone 5s,OS=8.1",
6+
"-destination", "name=iPhone 6s,OS=9.2",
87
]

‎Examples/Messenger-Storyboard/Base.lproj/Main.storyboard

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="0WO-Kt-Oxc">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="0WO-Kt-Oxc">
33
<dependencies>
44
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
66
</dependencies>
77
<scenes>
88
<!--Message View Controller-->
99
<scene sceneID="tne-QT-ifu">
1010
<objects>
11-
<viewController id="BYZ-38-t0r" customClass="MessageViewController" sceneMemberID="viewController">
11+
<viewController hidesBottomBarWhenPushed="YES" id="BYZ-38-t0r" customClass="MessageViewController" sceneMemberID="viewController">
1212
<layoutGuides>
1313
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
1414
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>

‎README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#SlackTextViewController
22

3+
**IMPORTANT NOTICE: Please update to >= `1.9` to avoid any risk of app rejection.
4+
More details in [#361](https://github.com/slackhq/SlackTextViewController/issues/361)**
5+
36
[![Build Status](https://img.shields.io/travis/slackhq/SlackTextViewController.svg?style=flat-square)](https://travis-ci.org/slackhq/SlackTextViewController)
47
[![Coverage Status](https://img.shields.io/coveralls/slackhq/SlackTextViewController/master.svg?style=flat-square)](https://coveralls.io/r/slackhq/SlackTextViewController)
5-
68
[![Pod Version](https://img.shields.io/cocoapods/v/SlackTextViewController.svg?style=flat-square)](http://cocoadocs.org/docsets/SlackTextViewController/1.8/)
79
[![Carthage compatible](https://img.shields.io/badge/carthage-compatible-F5B369.svg?style=flat-square)](https://github.com/Carthage/Carthage)
810
[![License](https://img.shields.io/badge/license-apache%202.0-blue.svg?style=flat-square)](http://opensource.org/licenses/Apache2.0)
@@ -56,11 +58,11 @@ This library is used in Slack's iOS app. It was built to fit our needs, but is f
5658

5759
###### With [Cocoa Pods](https://cocoapods.org/):
5860
```ruby
59-
pod 'SlackTextViewController'
61+
pod "SlackTextViewController"
6062
```
6163

6264
###### With [Carthage](https://github.com/Carthage/Carthage):
63-
```
65+
```swift
6466
github "slackhq/SlackTextViewController"
6567
```
6668

‎SlackTextViewController/HostApp/AppDelegate.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
//
2+
// AppDelegate.h
3+
// HostApp
4+
//
5+
// Created by Ignacio Romero on 1/18/16.
6+
// Copyright © 2016 Slack Technologies, Inc. All rights reserved.
7+
//
8+
9+
#import <UIKit/UIKit.h>
10+
11+
@interface AppDelegate : UIResponder <UIApplicationDelegate>
12+
13+
@property (strong, nonatomic) UIWindow *window;
14+
15+
16+
@end
17+

‎SlackTextViewController/HostApp/AppDelegate.m

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
//
2+
// AppDelegate.m
3+
// HostApp
4+
//
5+
// Created by Ignacio Romero on 1/18/16.
6+
// Copyright © 2016 Slack Technologies, Inc. All rights reserved.
7+
//
8+
9+
#import "AppDelegate.h"
10+
11+
@interface AppDelegate ()
12+
@end
13+
14+
@implementation AppDelegate
15+
16+
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
17+
// Override point for customization after application launch.
18+
return YES;
19+
}
20+
21+
@end

‎SlackTextViewController/HostApp/Base.lproj/LaunchScreen.storyboard

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
3+
<dependencies>
4+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
5+
</dependencies>
6+
<scenes>
7+
<!--View Controller-->
8+
<scene sceneID="EHf-IW-A2E">
9+
<objects>
10+
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
11+
<layoutGuides>
12+
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
13+
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
14+
</layoutGuides>
15+
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
16+
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
17+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18+
<animations/>
19+
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
20+
</view>
21+
</viewController>
22+
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
23+
</objects>
24+
<point key="canvasLocation" x="53" y="375"/>
25+
</scene>
26+
</scenes>
27+
</document>

‎SlackTextViewController/HostApp/Base.lproj/Main.storyboard

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
3+
<dependencies>
4+
<deployment identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
6+
</dependencies>
7+
<scenes>
8+
<!--View Controller-->
9+
<scene sceneID="tne-QT-ifu">
10+
<objects>
11+
<viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
12+
<layoutGuides>
13+
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
14+
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
15+
</layoutGuides>
16+
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
17+
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
18+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
19+
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
20+
</view>
21+
</viewController>
22+
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
23+
</objects>
24+
</scene>
25+
</scenes>
26+
</document>

‎Tests/Supporting Files/Application-Info.plist renamed to ‎SlackTextViewController/HostApp/Info.plist

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.slack.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>
@@ -22,6 +22,10 @@
2222
<string>1</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
25+
<key>UILaunchStoryboardName</key>
26+
<string>LaunchScreen</string>
27+
<key>UIMainStoryboardFile</key>
28+
<string>Main</string>
2529
<key>UIRequiredDeviceCapabilities</key>
2630
<array>
2731
<string>armv7</string>
@@ -32,5 +36,12 @@
3236
<string>UIInterfaceOrientationLandscapeLeft</string>
3337
<string>UIInterfaceOrientationLandscapeRight</string>
3438
</array>
39+
<key>UISupportedInterfaceOrientations~ipad</key>
40+
<array>
41+
<string>UIInterfaceOrientationPortrait</string>
42+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
43+
<string>UIInterfaceOrientationLandscapeLeft</string>
44+
<string>UIInterfaceOrientationLandscapeRight</string>
45+
</array>
3546
</dict>
3647
</plist>

‎SlackTextViewController/HostApp/ViewController.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//
2+
// ViewController.h
3+
// HostApp
4+
//
5+
// Created by Ignacio Romero on 1/18/16.
6+
// Copyright © 2016 Slack Technologies, Inc. All rights reserved.
7+
//
8+
9+
#import <UIKit/UIKit.h>
10+
11+
@interface ViewController : UIViewController
12+
13+
@end
14+

‎SlackTextViewController/HostApp/ViewController.m

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
//
2+
// ViewController.m
3+
// HostApp
4+
//
5+
// Created by Ignacio Romero on 1/18/16.
6+
// Copyright © 2016 Slack Technologies, Inc. All rights reserved.
7+
//
8+
9+
#import "ViewController.h"
10+
11+
@interface ViewController ()
12+
@end
13+
14+
@implementation ViewController
15+
16+
- (void)viewDidLoad {
17+
[super viewDidLoad];
18+
// Do any additional setup after loading the view, typically from a nib.
19+
}
20+
21+
- (void)didReceiveMemoryWarning {
22+
[super didReceiveMemoryWarning];
23+
// Dispose of any resources that can be recreated.
24+
}
25+
26+
@end

‎SlackTextViewController/HostApp/main.m

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//
2+
// main.m
3+
// HostApp
4+
//
5+
// Created by Ignacio Romero on 1/18/16.
6+
// Copyright © 2016 Slack Technologies, Inc. All rights reserved.
7+
//
8+
9+
#import <UIKit/UIKit.h>
10+
#import "AppDelegate.h"
11+
12+
int main(int argc, char * argv[]) {
13+
@autoreleasepool {
14+
return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
15+
}
16+
}

‎SlackTextViewController/Podfile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
source 'https://github.com/CocoaPods/Specs.git'
2+
3+
xcodeproj 'SlackTextViewController.xcodeproj'
4+
inhibit_all_warnings!
5+
6+
platform :ios, '7.0'
7+
8+
target 'SnapshotTests', :exclusive => true do
9+
pod 'Expecta+Snapshots'
10+
pod 'Specta'
11+
end

0 commit comments

Comments
 (0)