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

Rebrand Lockbox to new Lockwise brand, name, colors, etc. #958

Merged
merged 54 commits into from
May 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
333fe6e
update URLs to point to new brand domain
devinreams May 7, 2019
061616d
now this is on iPad, not just iPhone
devinreams May 7, 2019
ab1e77d
autofill copy changes
devinreams May 7, 2019
d420109
change entries to logins in strings
devinreams May 7, 2019
c3e38cf
welcomeview for iphone
sashei May 7, 2019
934f5bf
app icon, navbar
sashei May 7, 2019
fb2ba3d
change old references to lockbox in docs and tests
devinreams May 7, 2019
e0e188d
settings updates
sashei May 7, 2019
f8eebff
leftover url references
devinreams May 7, 2019
6a359e7
lefteover references to entries
devinreams May 7, 2019
2e32cfa
launch screen + buttons
sashei May 7, 2019
3710234
fix locked screen display
sashei May 7, 2019
c6cc2dc
set localization team to review strings
devinreams May 7, 2019
f05957d
start on welcome for ipad
sashei May 7, 2019
a004c8a
onboarding updates
sashei May 7, 2019
6b43bea
fix unitspecs
sashei May 7, 2019
1de0b69
typo
devinreams May 8, 2019
6b494c7
uispecs fixes, autofill instructions
sashei May 8, 2019
8efa7db
title for fxaview
sashei May 8, 2019
e7a2253
datastorespec fix
sashei May 8, 2019
6ed1ae8
double-white launch screen
sashei May 8, 2019
d0f9b75
fxa login uispec update
sashei May 8, 2019
db94c9d
fxa title color
sashei May 8, 2019
eced968
ipad tweaks
sashei May 8, 2019
2378122
autofillonboarding for ipad
sashei May 8, 2019
9d89d5b
accountsetting avatar margin
sashei May 8, 2019
0cde2d7
autolock setting copy change
sashei May 8, 2019
2fb499a
welcome logo placement
sashei May 8, 2019
e9e1bd1
update settings copy
sashei May 8, 2019
a097f89
privacy screen, starting itemdetail
sashei May 8, 2019
7aaa422
update confirm icon
sashei May 8, 2019
3da5141
select password autofill color
sashei May 8, 2019
6499ac8
simpler Unlock button, no product name needed
devinreams May 8, 2019
e2ee877
center and size the button sanely to work on big screens too
devinreams May 8, 2019
65c041b
remove the autofill video
devinreams May 8, 2019
a643dad
change search bar color while searching
sashei May 8, 2019
eecd26a
add 2px to the left side of each for more breathing room
devinreams May 8, 2019
0d2e27c
optimize images
devinreams May 8, 2019
d6758a4
fix uispecs
sashei May 8, 2019
2abe268
better explanation of the subtitle
devinreams May 9, 2019
909e98b
add Welcome and ItemList string comments
devinreams May 9, 2019
b339fb7
add autofill onboarding and setting list localizer notes
devinreams May 9, 2019
53da75a
add item detail and setup autofill translator notes
devinreams May 9, 2019
146547c
add account setting and onboarding localization notes
devinreams May 9, 2019
292aba8
ignore paths and files added if you follow the l10n export docs
devinreams May 9, 2019
4f90423
add back interpolation context
devinreams May 9, 2019
190d965
add note on use of hard-coded Lockwise
devinreams May 9, 2019
83ca5ff
move confirmation items closer
sashei May 9, 2019
ae0089e
autofill onboarding button at bottom
sashei May 10, 2019
b182f69
onboarding confirmation button at bottom
sashei May 10, 2019
248a478
asset cleanup
sashei May 10, 2019
41ba362
Bump version to 1.6.0 for rebrand
devinreams May 10, 2019
880de6a
second pass of image optimizations
devinreams May 10, 2019
ab4fd48
Merge branch 'master' into 921-rebrand
devinreams May 10, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ xcuserdata
lockbox-ios/binaries/
site/
fastlane/screenshots/
export-locales-env
lockwiseios-l10n
2 changes: 1 addition & 1 deletion CredentialProvider/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.5.0</string>
<string>1.6.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>MozDevelopmentTeam</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<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">
<textField opaque="NO" contentMode="center" horizontalHuggingPriority="248" verticalHuggingPriority="249" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Search logins" 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="44"/>
<accessibility key="accessibilityConfiguration" identifier="filterEntries.textField"/>
<constraints>
Expand Down Expand Up @@ -172,7 +172,7 @@
<constraints>
<constraint firstAttribute="width" constant="280" id="WcY-qh-pBg"/>
</constraints>
<string key="text">Firefox Lockbox lets you access passwords you’ve already saved to Firefox. To view your entries here, you’ll need to sign in and sync with Firefox for desktop.</string>
<string key="text">Lockwise lets you access passwords you’ve already saved to Firefox. To view your logins here, you’ll need to sign in and sync with Firefox.</string>
<fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
<color key="textColor" red="0.45098039215686275" green="0.45098039215686275" blue="0.45098039215686275" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand All @@ -190,7 +190,7 @@
<color key="titleColor" red="0.0" green="0.37647058823529411" blue="0.87450980392156863" alpha="1" colorSpace="calibratedRGB"/>
</state>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No entries found." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gQr-4J-xpv">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No logins found." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gQr-4J-xpv">
<rect key="frame" x="128.5" y="156" width="118.5" height="18"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
<color key="textColor" red="0.047058823529411764" green="0.047058823529411764" blue="0.050980392156862744" alpha="1" colorSpace="calibratedRGB"/>
Expand Down Expand Up @@ -224,7 +224,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="299.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To see more entries here, you’ll need to save them to Firefox for desktop." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JpV-eG-grp">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To see more logins here, you’ll need to save them to Firefox." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JpV-eG-grp">
<rect key="frame" x="47.5" y="56" width="280" height="31.5"/>
<constraints>
<constraint firstAttribute="width" constant="280" id="gFp-Ms-L2p"/>
Expand All @@ -246,7 +246,7 @@
<color key="titleColor" red="0.0" green="0.37647058820000001" blue="0.87450980389999999" alpha="1" colorSpace="calibratedRGB"/>
</state>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No matching entries." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qZc-w1-SRT">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No matching logins." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qZc-w1-SRT">
<rect key="frame" x="116.5" y="30" width="142.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.047058823530000002" green="0.047058823530000002" blue="0.050980392159999999" alpha="1" colorSpace="calibratedRGB"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
/* Class = "UILabel"; text = "Take your passwords everywhere"; ObjectID = "hwO-wS-oS4"; */
"hwO-wS-oS4.text" = "Take your passwords everywhere";

/* Class = "UILabel"; text = "To use Firefox Lockbox, you’ll need a Firefox Account with saved logins."; ObjectID = "xyY-bk-Xw8"; */
"xyY-bk-Xw8.text" = "To use Firefox Lockbox, you’ll need a Firefox Account with saved logins.";
/* Class = "UILabel"; text = "To use Firefox Lockwise, you’ll need a Firefox Account with saved logins."; ObjectID = "xyY-bk-Xw8"; */
"xyY-bk-Xw8.text" = "To use Firefox Lockwise, you’ll need a Firefox Account with saved logins.";
8 changes: 1 addition & 7 deletions CredentialProvider/View/CredentialWelcomeView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ import RxCocoa

class CredentialWelcomeView: UIViewController {
internal var presenter: CredentialWelcomePresenter?
@IBOutlet private weak var oceanView: UIImageView!

override var preferredStatusBarStyle: UIStatusBarStyle {
return .default
return .lightContent
}

required init?(coder aDecoder: NSCoder) {
Expand All @@ -31,11 +30,6 @@ class CredentialWelcomeView: UIViewController {

override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews()
self.oceanView.image = UIImage.createGradientImage(
frame: self.oceanView.frame,
colors: [Constant.color.lockBoxTeal, Constant.color.lockBoxBlue],
locations: [0, 0.85]
)
}
}

Expand Down
Loading