Skip to content
This repository has been archived by the owner on Dec 14, 2021. It is now read-only.

Commit

Permalink
1.3 (Build 2320)
Browse files Browse the repository at this point in the history 
Merge branch 'master' into production
  • Loading branch information
@devinreams
devinreams committed Sep 14, 2018
2 parents 202296a + c3100e1 commit 234b014
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 34 deletions.
5 changes: 3 additions & 2 deletions CredentialProvider/Presenter/CredentialProviderPresenter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ class CredentialProviderPresenter {
self.dispatcher.dispatch(action: LifecycleAction.foreground)

self.dataStore.locked
.bind { [weak self] locked in
.asDriver(onErrorJustReturn: true)
.drive(onNext: { [weak self] locked in
if locked {
self?.dispatcher.dispatch(action: CredentialProviderAction.authenticationRequested)
self?.view?.displayWelcome()
Expand All @@ -138,7 +139,7 @@ class CredentialProviderPresenter {
// message: "Please check back later",
// style: .alert)
}
}
})
.disposed(by: self.disposeBag)
}
}
Expand Down
4 changes: 0 additions & 4 deletions CredentialProvider/View/CredentialProviderView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ class CredentialProviderView: ASCredentialProviderViewController {
currentViewController.view.frame = self.view.bounds
self.view.addSubview(currentViewController.view)
currentViewController.didMove(toParent: self)

if oldValue != nil {
self.view.sendSubviewToBack(currentViewController.view)
}
}

guard let oldViewController = oldValue else {
Expand Down
Binary file modified Shared/Common/Resources/Assets.xcassets/arrow-right.imageset/back.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Shared/Common/Resources/Assets.xcassets/arrow-right.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Shared/Common/Resources/Assets.xcassets/arrow-right.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 14 additions & 15 deletions Shared/Storyboard/Base.lproj/ItemList.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="2mk-ib-5TB">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="2mk-ib-5TB">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Item List View-->
<scene sceneID="5Zv-jH-AQ4">
<objects>
<viewController storyboardIdentifier="itemlist" useStoryboardIdentifierAsRestorationIdentifier="YES" id="2mk-ib-5TB" customClass="ItemListView" customModule="Lockbox" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="itemlist" useStoryboardIdentifierAsRestorationIdentifier="YES" id="2mk-ib-5TB" customClass="ItemListView" customModule="CredentialProvider" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="EWp-zW-Z4E">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand All @@ -28,15 +27,15 @@
<rect key="contentStretch" x="0.0" y="0.0" width="1" height="0.0"/>
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="filtercell" rowHeight="44" id="hEu-cd-CNd" customClass="FilterCell" customModule="Lockbox" customModuleProvider="target">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="filtercell" rowHeight="44" id="hEu-cd-CNd" customClass="FilterCell" customModule="CredentialProvider" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hEu-cd-CNd" id="0wm-do-QXQ">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField opaque="NO" contentMode="center" horizontalHuggingPriority="248" verticalHuggingPriority="249" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Search your entries" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="DEF-qU-5KB">
<rect key="frame" x="0.0" y="0.0" width="287" height="43.5"/>
<rect key="frame" x="0.0" y="0.0" width="287" height="44"/>
<accessibility key="accessibilityConfiguration" identifier="filterEntries.textField"/>
<constraints>
<constraint firstAttribute="height" priority="750" constant="44" id="fe1-O9-xUl"/>
Expand Down Expand Up @@ -90,11 +89,11 @@
<outlet property="filterTextField" destination="DEF-qU-5KB" id="mzd-ec-hdw"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="itemlistcell" preservesSuperviewLayoutMargins="YES" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="itemlistcell" rowHeight="60" id="js3-IG-n21" customClass="ItemListCell" customModule="Lockbox" customModuleProvider="target">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="itemlistcell" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="itemlistcell" rowHeight="60" id="js3-IG-n21" customClass="ItemListCell" customModule="CredentialProvider" customModuleProvider="target">
<rect key="frame" x="0.0" y="72" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="js3-IG-n21" id="R1R-SD-Nxb">
<rect key="frame" x="0.0" y="0.0" width="342" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3A5-nI-aV6">
Expand All @@ -104,7 +103,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n2T-XM-ua9">
<rect key="frame" x="14" y="30" width="31" height="17.5"/>
<rect key="frame" x="14" y="30" width="31" height="18"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -146,7 +145,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" image="item-list-placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="hbE-L4-UGB">
<rect key="frame" x="0.0" y="0.0" width="375" height="252.5"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="253"/>
</imageView>
</subviews>
<constraints>
Expand All @@ -158,7 +157,7 @@
</tableViewCellContentView>
<inset key="separatorInset" minX="15" minY="0.0" maxX="0.0" maxY="0.0"/>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="emptylistplaceholder" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="emptylistplaceholder" rowHeight="300" id="Zwa-yR-CR7" customClass="EmptyPlaceholderCell" customModule="Lockbox" customModuleProvider="target">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="emptylistplaceholder" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="emptylistplaceholder" rowHeight="300" id="Zwa-yR-CR7" customClass="EmptyPlaceholderCell" customModule="CredentialProvider" customModuleProvider="target">
<rect key="frame" x="0.0" y="385" width="375" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Zwa-yR-CR7" id="6wL-a0-kfc">
Expand All @@ -169,7 +168,7 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="128"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="249" verticalCompressionResistancePriority="749" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Smh-ku-Ub5">
<rect key="frame" x="47.5" y="182" width="280" height="62.5"/>
<rect key="frame" x="47.5" y="182" width="280" height="63"/>
<constraints>
<constraint firstAttribute="width" constant="280" id="WcY-qh-pBg"/>
</constraints>
Expand Down Expand Up @@ -218,7 +217,7 @@
<outlet property="learnMoreButton" destination="aQB-Vr-ObR" id="rtw-oq-uuY"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="noresultsplaceholder" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="noresultsplaceholder" rowHeight="300" id="k0g-dg-N0G" customClass="NoResultsCell" customModule="Lockbox" customModuleProvider="target">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="noresultsplaceholder" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="noresultsplaceholder" rowHeight="300" id="k0g-dg-N0G" customClass="NoResultsCell" customModule="CredentialProvider" customModuleProvider="target">
<rect key="frame" x="0.0" y="685" width="375" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="k0g-dg-N0G" id="CRM-Km-Zcb">
Expand All @@ -235,7 +234,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5gN-a0-N6V">
<rect key="frame" x="127.5" y="102.5" width="120" height="161.5"/>
<rect key="frame" x="127.5" y="102.5" width="120" height="162"/>
<accessibility key="accessibilityConfiguration" identifier="learnMore.button"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="XXw-4F-3gz"/>
Expand Down Expand Up @@ -293,7 +292,7 @@
</scene>
</scenes>
<resources>
<image name="arrow-right" width="6" height="10"/>
<image name="arrow-right" width="6.5" height="10"/>
<image name="empty-list-placeholder" width="414" height="128"/>
<image name="item-list-placeholder" width="414" height="255"/>
</resources>
Expand Down
4 changes: 4 additions & 0 deletions Shared/View/BaseItemListView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ extension BaseItemListView {

cell.titleLabel.text = title
cell.detailLabel.text = username

if (self.extensionContext == nil) {
cell.accessoryType = .disclosureIndicator
}

retCell = cell
case .SyncListPlaceholder:
Expand Down
2 changes: 1 addition & 1 deletion docs/release-notes.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release Notes

## 1.3 (Build 2259)
## 1.3 (Build 2294)

With iOS 12 you can automatically fill your usernames and passwords from Firefox Lockbox into apps and websites.

Expand Down
1 change: 1 addition & 0 deletions docs/releases.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ _Once a version has been merged or released, the major app version should be inc

- Update the value in `Common/Resources/Info.plist` for the Lockbox app, for example from `1.2` to `1.3`
- Also update the value in `CredentialProvider/Info.plist` for the extension to _the exact same version_
- Be sure to submit the new build to TestFlight Beta App Review ASAP so that review doesn't prevent external user testing

[1]: https://dashboard.buddybuild.com/apps/5a0ddb736e19370001034f85
[2]: https://developer.apple.com/testflight/testers/
Expand Down
Loading

0 comments on commit 234b014

Please sign in to comment.