Skip to content

Commit 3627633

Browse files
committed
Release Authenticator 2.0.1
2 parents 40525fa + 76d4871 commit 3627633

File tree

45 files changed

+232
-145
lines changed

Some content is hidden

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

45 files changed

+232
-145
lines changed

.travis.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,25 @@ language: objective-c
55
xcode_workspace: Authenticator.xcworkspace
66
xcode_scheme: Authenticator
77

8-
osx_image: xcode8.3
8+
osx_image: xcode9
99

1010
env:
1111
- RUNTIME="iOS 9.0" DEVICE="iPhone 4s"
12-
- RUNTIME="iOS 9.1" DEVICE="iPhone 5"
13-
- RUNTIME="iOS 9.2" DEVICE="iPhone 5s"
1412
- RUNTIME="iOS 9.3" DEVICE="iPhone 6s"
15-
- RUNTIME="iOS 10.0" DEVICE="iPhone 6s Plus"
16-
- RUNTIME="iOS 10.1" DEVICE="iPhone SE"
17-
- RUNTIME="iOS 10.2" DEVICE="iPhone 7"
13+
- RUNTIME="iOS 10.0" DEVICE="iPhone SE"
1814
- RUNTIME="iOS 10.3" DEVICE="iPhone 7 Plus"
15+
- RUNTIME="iOS 11.0" DEVICE="iPhone X"
1916

2017
install:
2118
- git submodule update --init --recursive
2219

2320
before_script:
24-
- DEVICE_ID=com.apple.CoreSimulator.SimDeviceType.$(echo $DEVICE | sed -E -e "s/[ \-]+/ /g" -e "s/[^[:alnum:]]/-/g")
25-
- RUNTIME_ID=com.apple.CoreSimulator.SimRuntime.$(echo $RUNTIME | sed -E -e "s/[ \-]+/ /g" -e "s/[^[:alnum:]]/-/g")
26-
- DESTINATION_ID=$(xcrun simctl create Travis $DEVICE_ID $RUNTIME_ID)
27-
- xcrun simctl boot $DESTINATION_ID
21+
- DEVICE_ID=com.apple.CoreSimulator.SimDeviceType.$(echo $DEVICE | sed -E -e "s/[ \-]+/ /g" -e "s/[^[:alnum:]]/-/g")
22+
- RUNTIME_ID=com.apple.CoreSimulator.SimRuntime.$(echo $RUNTIME | sed -E -e "s/[ \-]+/ /g" -e "s/[^[:alnum:]]/-/g")
23+
- DESTINATION_ID=$(xcrun simctl create Travis $DEVICE_ID $RUNTIME_ID)
24+
- xcrun simctl boot $DESTINATION_ID
2825

29-
script: set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" -destination "id=$DESTINATION_ID" build test | xcpretty -c
26+
script: set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" -destination "id=$DESTINATION_ID" build-for-testing test-without-building | xcpretty -c
3027

3128
after_success:
3229
- bash <(curl -s https://codecov.io/bash)

Authenticator.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -740,11 +740,13 @@
740740
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
741741
BUNDLE_DISPLAY_NAME = "${PRODUCT_NAME} ∆";
742742
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
743+
CURRENT_PROJECT_VERSION = 0;
743744
DEVELOPMENT_TEAM = WD7ETSN9J9;
744745
INFOPLIST_FILE = Authenticator/Resources/Info.plist;
745746
PRODUCT_BUNDLE_IDENTIFIER = me.mattrubin.authenticator.dev;
746747
PRODUCT_NAME = Authenticator;
747748
TARGETED_DEVICE_FAMILY = 1;
749+
VERSIONING_SYSTEM = "apple-generic";
748750
};
749751
name = Debug;
750752
};
@@ -755,11 +757,13 @@
755757
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
756758
BUNDLE_DISPLAY_NAME = "${PRODUCT_NAME}";
757759
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
760+
CURRENT_PROJECT_VERSION = 0;
758761
DEVELOPMENT_TEAM = WD7ETSN9J9;
759762
INFOPLIST_FILE = Authenticator/Resources/Info.plist;
760763
PRODUCT_BUNDLE_IDENTIFIER = me.mattrubin.authenticator;
761764
PRODUCT_NAME = Authenticator;
762765
TARGETED_DEVICE_FAMILY = 1;
766+
VERSIONING_SYSTEM = "apple-generic";
763767
};
764768
name = Release;
765769
};

Authenticator/Resources/GenerateIcons.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ inkscape -z -e "${ICONSET}/Icon-120.png" -w 120 $ICON_SVG;
2727
inkscape -z -e "${ICONSET}/Icon-152.png" -w 152 $ICON_SVG;
2828
inkscape -z -e "${ICONSET}/Icon-167.png" -w 167 $ICON_SVG;
2929
inkscape -z -e "${ICONSET}/Icon-180.png" -w 180 $ICON_SVG;
30+
inkscape -z -e "${ICONSET}/Icon-1024.png" -w 1024 $ICON_SVG;
3031

3132
for ICON in $ICONSET/Icon-*.png; do
3233
pngcrush -rem alla -ow -res 144 $ICON;

Authenticator/Resources/Images.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@
101101
"idiom" : "ipad",
102102
"filename" : "Icon-167.png",
103103
"scale" : "2x"
104+
},
105+
{
106+
"size" : "1024x1024",
107+
"idiom" : "ios-marketing",
108+
"filename" : "Icon-1024.png",
109+
"scale" : "1x"
104110
}
105111
],
106112
"info" : {
Loading

Authenticator/Resources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>2.0.0</string>
20+
<string>2.0.1</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleURLTypes</key>

Authenticator/Source/ButtonHeaderView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ButtonHeaderView<Action>: UIButton {
5757

5858
private func configureSubviews() {
5959
titleLabel?.textAlignment = .center
60-
titleLabel?.textColor = UIColor.otpForegroundColor
60+
setTitleColor(.otpForegroundColor, for: UIControlState.normal)
6161
titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: UIFontWeightLight)
6262

6363
addTarget(self, action: #selector(ButtonHeaderView.buttonWasPressed), for: .touchUpInside)

Authenticator/Source/OTPAppDelegate.swift

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,17 @@ class OTPAppDelegate: UIResponder, UIApplicationDelegate {
3434
let app = AppController()
3535

3636
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
37-
let barButtonAttributes = [NSFontAttributeName: UIFont.systemFont(ofSize: 17, weight: UIFontWeightLight)]
38-
UIBarButtonItem.appearance().setTitleTextAttributes(barButtonAttributes, for: .normal)
37+
let barButtonItemFont = UIFont.systemFont(ofSize: 17, weight: UIFontWeightLight)
38+
let fontAttributes = [NSFontAttributeName: barButtonItemFont]
39+
UIBarButtonItem.appearance().setTitleTextAttributes(fontAttributes, for: .normal)
40+
UIBarButtonItem.appearance().setTitleTextAttributes(fontAttributes, for: .highlighted)
41+
UIBarButtonItem.appearance().setTitleTextAttributes(fontAttributes, for: .selected)
42+
43+
let disabledAttributes = [
44+
NSFontAttributeName: barButtonItemFont,
45+
NSForegroundColorAttributeName: UIColor.otpBarForegroundColor.withAlphaComponent(0.3),
46+
]
47+
UIBarButtonItem.appearance().setTitleTextAttributes(disabledAttributes, for: .disabled)
3948

4049
// Restore white-on-black style
4150
SVProgressHUD.setForegroundColor(.otpLightColor)

Authenticator/Source/TokenListViewController.swift

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,15 @@ extension TokenListViewController {
250250
override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
251251
return 85
252252
}
253+
254+
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
255+
let rowModel = viewModel.rowModels[indexPath.row]
256+
if isEditing {
257+
dispatchAction(rowModel.editAction)
258+
} else {
259+
dispatchAction(rowModel.selectAction)
260+
}
261+
}
253262
}
254263

255264
// MARK: TokenListPresenter

Authenticator/Source/TokenRowCell.swift

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,18 +140,6 @@ class TokenRowCell: UITableViewCell {
140140

141141
// MARK: - Actions
142142

143-
override func setSelected(_ selected: Bool, animated: Bool) {
144-
super.setSelected(selected, animated: animated)
145-
146-
if selected, let rowModel = rowModel {
147-
if self.isEditing {
148-
dispatchAction?(rowModel.editAction)
149-
} else {
150-
dispatchAction?(rowModel.selectAction)
151-
}
152-
}
153-
}
154-
155143
func generateNextPassword() {
156144
if let action = rowModel?.buttonAction {
157145
dispatchAction?(action)

0 commit comments

Comments
 (0)