Skip to content

Commit 8270d23

Browse files
krugerkkrugerk
authored
Merge branch 'master' into feature/68-ios14-style-widgets
2 parents 8e6a768 + cf9a774 commit 8270d23

File tree

11 files changed

+47
-114
lines changed

11 files changed

+47
-114
lines changed

‎BeeKit/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<key>CFBundleShortVersionString</key>
1818
<string>6.7</string>
1919
<key>CFBundleVersion</key>
20-
<string>53</string>
20+
<string>54</string>
2121
</dict>
2222
</plist>

‎BeeKitTests/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<key>CFBundleShortVersionString</key>
1818
<string>6.7</string>
1919
<key>CFBundleVersion</key>
20-
<string>53</string>
20+
<string>54</string>
2121
</dict>
2222
</plist>

‎BeeSwift.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,6 @@
193193
remoteGlobalIDString = A196CB131AE4142E00B90A3E;
194194
remoteInfo = BeeSwift;
195195
};
196-
E57BE6F32655EBE000BA540B /* PBXContainerItemProxy */ = {
197-
isa = PBXContainerItemProxy;
198-
containerPortal = A196CB0C1AE4142E00B90A3E /* Project object */;
199-
proxyType = 1;
200-
remoteGlobalIDString = E57BE6DF2655EBD900BA540B;
201-
remoteInfo = BeeKit;
202-
};
203196
E57BE7122655F00200BA540B /* PBXContainerItemProxy */ = {
204197
isa = PBXContainerItemProxy;
205198
containerPortal = A196CB0C1AE4142E00B90A3E /* Project object */;
@@ -847,7 +840,6 @@
847840
);
848841
dependencies = (
849842
E5F7C4A9260FC5300095684F /* PBXTargetDependency */,
850-
E57BE6F42655EBE000BA540B /* PBXTargetDependency */,
851843
E57BE7132655F00200BA540B /* PBXTargetDependency */,
852844
9B93301E2CE55C7F00720B19 /* PBXTargetDependency */,
853845
);
@@ -1342,11 +1334,6 @@
13421334
target = A196CB131AE4142E00B90A3E /* BeeSwift */;
13431335
targetProxy = E57BE6EC2655EBE000BA540B /* PBXContainerItemProxy */;
13441336
};
1345-
E57BE6F42655EBE000BA540B /* PBXTargetDependency */ = {
1346-
isa = PBXTargetDependency;
1347-
target = E57BE6DF2655EBD900BA540B /* BeeKit */;
1348-
targetProxy = E57BE6F32655EBE000BA540B /* PBXContainerItemProxy */;
1349-
};
13501337
E57BE7132655F00200BA540B /* PBXTargetDependency */ = {
13511338
isa = PBXTargetDependency;
13521339
target = E57BE6DF2655EBD900BA540B /* BeeKit */;
@@ -1492,7 +1479,7 @@
14921479
CODE_SIGN_IDENTITY = "iPhone Developer";
14931480
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
14941481
COPY_PHASE_STRIP = NO;
1495-
CURRENT_PROJECT_VERSION = 53;
1482+
CURRENT_PROJECT_VERSION = 54;
14961483
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
14971484
ENABLE_STRICT_OBJC_MSGSEND = YES;
14981485
ENABLE_TESTABILITY = YES;
@@ -1557,7 +1544,7 @@
15571544
CODE_SIGN_IDENTITY = "iPhone Distribution";
15581545
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
15591546
COPY_PHASE_STRIP = NO;
1560-
CURRENT_PROJECT_VERSION = 53;
1547+
CURRENT_PROJECT_VERSION = 54;
15611548
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
15621549
ENABLE_NS_ASSERTIONS = NO;
15631550
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1724,7 +1711,7 @@
17241711
DEFINES_MODULE = YES;
17251712
DEVELOPMENT_TEAM = 8TW9V9HVES;
17261713
DYLIB_COMPATIBILITY_VERSION = 1;
1727-
DYLIB_CURRENT_VERSION = 53;
1714+
DYLIB_CURRENT_VERSION = 54;
17281715
DYLIB_INSTALL_NAME_BASE = "@rpath";
17291716
ENABLE_MODULE_VERIFIER = YES;
17301717
EXCLUDED_ARCHS = "";
@@ -1771,7 +1758,7 @@
17711758
DEFINES_MODULE = YES;
17721759
DEVELOPMENT_TEAM = 8TW9V9HVES;
17731760
DYLIB_COMPATIBILITY_VERSION = 1;
1774-
DYLIB_CURRENT_VERSION = 53;
1761+
DYLIB_CURRENT_VERSION = 54;
17751762
DYLIB_INSTALL_NAME_BASE = "@rpath";
17761763
ENABLE_MODULE_VERIFIER = YES;
17771764
EXCLUDED_ARCHS = "";

‎BeeSwift/Base.lproj/Main.storyboard‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99
</dependencies>
1010
<scenes>
11-
<!--Gallery Navigation Controller-->
11+
<!--Navigation Controller-->
1212
<scene sceneID="qqJ-th-mte">
1313
<objects>
14-
<navigationController id="E0t-UY-3pO" customClass="GalleryNavigationController" customModule="BeeSwift" customModuleProvider="target" sceneMemberID="viewController">
14+
<navigationController id="E0t-UY-3pO" sceneMemberID="viewController">
1515
<navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="black" translucent="NO" id="Pjd-c5-Ja5">
1616
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
1717
<autoresizingMask key="autoresizingMask"/>

‎BeeSwift/Gallery/GalleryViewController.swift‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,17 @@ class GalleryViewController: UIViewController, UICollectionViewDelegateFlowLayou
207207
}
208208
}
209209

210+
override func viewWillAppear(_ animated: Bool) {
211+
super.viewWillAppear(animated)
212+
213+
self.collectionView!.snp.remakeConstraints { make in
214+
make.top.equalTo(self.searchBar.snp.bottom)
215+
make.left.equalTo(self.view.safeAreaLayoutGuide.snp.leftMargin)
216+
make.right.equalTo(self.view.safeAreaLayoutGuide.snp.rightMargin)
217+
make.bottom.equalTo(self.collectionView!.keyboardLayoutGuide.snp.top)
218+
}
219+
}
220+
210221
override func viewDidAppear(_ animated: Bool) {
211222
if !ServiceLocator.currentUserManager.signedIn(context: ServiceLocator.persistentContainer.viewContext) {
212223
let signInVC = SignInViewController()

‎BeeSwift/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</dict>
7171
</array>
7272
<key>CFBundleVersion</key>
73-
<string>53</string>
73+
<string>54</string>
7474
<key>ITSAppUsesNonExemptEncryption</key>
7575
<false/>
7676
<key>LSApplicationCategoryType</key>

‎BeeSwift/SignInViewController.swift‎

Lines changed: 1 addition & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,12 @@ import SafariServices
1212

1313
import BeeKit
1414

15-
class SignInViewController : UIViewController, UITextFieldDelegate, SFSafariViewControllerDelegate {
15+
class SignInViewController : UIViewController, UITextFieldDelegate {
1616

1717
var headerLabel = BSLabel()
1818
var emailTextField = BSTextField()
1919
var passwordTextField = BSTextField()
20-
var newEmailTextField = BSTextField()
21-
var newUsernameTextField = BSTextField()
22-
var newPasswordTextField = BSTextField()
23-
var chooseSignInButton = BSButton()
24-
var chooseSignUpButton = BSButton()
2520
var beeImageView = UIImageView()
26-
var signUpButton = BSButton()
27-
var backToSignInButton = BSButton()
28-
var backToSignUpButton = BSButton()
2921
var signInButton = BSButton()
3022
var divider = UIView()
3123

@@ -57,16 +49,6 @@ class SignInViewController : UIViewController, UITextFieldDelegate, SFSafariView
5749
make.centerX.equalToSuperview()
5850
}
5951

60-
scrollView.addSubview(self.chooseSignInButton)
61-
self.chooseSignInButton.setTitle("I have a Beeminder account", for: .normal)
62-
self.chooseSignInButton.snp.makeConstraints { (make) in
63-
make.centerX.equalToSuperview()
64-
make.top.equalTo(self.headerLabel.snp.bottom).offset(40)
65-
make.width.equalToSuperview().multipliedBy(0.75)
66-
make.height.equalTo(Constants.defaultTextFieldHeight)
67-
}
68-
self.chooseSignInButton.addTarget(self, action: #selector(SignInViewController.chooseSignInButtonPressed), for: .touchUpInside)
69-
7052
scrollView.addSubview(self.emailTextField)
7153
self.emailTextField.isHidden = true
7254
self.emailTextField.placeholder = "Email or username"
@@ -99,7 +81,6 @@ class SignInViewController : UIViewController, UITextFieldDelegate, SFSafariView
9981
scrollView.addSubview(self.signInButton)
10082
self.signInButton.isHidden = true
10183
self.signInButton.setTitle("Sign In", for: UIControl.State())
102-
self.signInButton.backgroundColor = UIColor.Beeminder.gray
10384
self.signInButton.titleLabel?.font = UIFont.beeminder.defaultFontPlain.withSize(20)
10485
self.signInButton.titleLabel?.textColor = UIColor.white
10586
self.signInButton.addTarget(self, action: #selector(SignInViewController.signInButtonPressed), for: UIControl.Event.touchUpInside)
@@ -114,87 +95,21 @@ class SignInViewController : UIViewController, UITextFieldDelegate, SFSafariView
11495
self.divider.isHidden = true
11596
self.divider.backgroundColor = UIColor.Beeminder.gray
11697

117-
scrollView.addSubview(self.newUsernameTextField)
118-
self.newUsernameTextField.isHidden = true
119-
self.newUsernameTextField.autocapitalizationType = .none
120-
self.newUsernameTextField.snp.makeConstraints { (make) in
121-
make.top.equalTo(self.headerLabel.snp.bottom).offset(15)
122-
make.centerX.equalTo(scrollView)
123-
make.height.equalTo(Constants.defaultTextFieldHeight)
124-
make.width.equalTo(self.view).multipliedBy(0.75)
125-
}
126-
self.newUsernameTextField.placeholder = "Username"
127-
128-
scrollView.addSubview(self.newEmailTextField)
129-
self.newEmailTextField.isHidden = true
130-
self.newEmailTextField.autocapitalizationType = .none
131-
self.newEmailTextField.snp.makeConstraints { (make) in
132-
make.top.equalTo(self.newUsernameTextField.snp.bottom).offset(15)
133-
make.centerX.equalTo(scrollView)
134-
make.height.equalTo(Constants.defaultTextFieldHeight)
135-
make.width.equalTo(self.view).multipliedBy(0.75)
136-
}
137-
self.newEmailTextField.placeholder = "Email"
138-
139-
scrollView.addSubview(self.newPasswordTextField)
140-
self.newPasswordTextField.isHidden = true
141-
self.newPasswordTextField.autocapitalizationType = .none
142-
self.newPasswordTextField.isSecureTextEntry = true
143-
self.newPasswordTextField.snp.makeConstraints { (make) in
144-
make.top.equalTo(self.newEmailTextField.snp.bottom).offset(15)
145-
make.centerX.equalTo(scrollView)
146-
make.height.equalTo(Constants.defaultTextFieldHeight)
147-
make.width.equalTo(self.view).multipliedBy(0.75)
148-
}
149-
150-
self.newPasswordTextField.placeholder = "Password"
151-
152-
scrollView.addSubview(self.signUpButton)
153-
self.signUpButton.isHidden = true
154-
self.signUpButton.setTitle("Sign Up", for: .normal)
155-
self.signUpButton.titleLabel?.font = UIFont.beeminder.defaultFontPlain.withSize(20)
156-
self.signUpButton.snp.makeConstraints { (make) in
157-
make.top.equalTo(self.newPasswordTextField.snp.bottom).offset(15)
158-
make.centerX.equalTo(self.view)
159-
make.height.equalTo(Constants.defaultTextFieldHeight)
160-
make.width.equalTo(self.view).multipliedBy(0.75)
161-
}
162-
163-
scrollView.addSubview(self.backToSignInButton)
164-
self.backToSignInButton.isHidden = true
165-
self.backToSignInButton.setTitle("Back to Sign In", for: .normal)
166-
self.backToSignInButton.snp.makeConstraints { (make) in
167-
make.top.equalTo(divider.snp.bottom).offset(15)
168-
make.height.equalTo(Constants.defaultTextFieldHeight)
169-
make.centerX.equalTo(self.view)
170-
make.width.equalTo(self.view).multipliedBy(0.75)
171-
}
172-
self.backToSignInButton.addTarget(self, action: #selector(SignInViewController.chooseSignInButtonPressed), for: .touchUpInside)
17398
self.chooseSignInButtonPressed()
17499
}
175100

176101
@objc func chooseSignInButtonPressed() {
177-
//self.divider.isHidden = false
178-
//self.backToSignUpButton.isHidden = false
179102
self.emailTextField.isHidden = false
180103
self.passwordTextField.isHidden = false
181-
self.backToSignInButton.isHidden = true
182-
self.newUsernameTextField.isHidden = true
183-
self.newPasswordTextField.isHidden = true
184-
self.newEmailTextField.isHidden = true
185-
self.chooseSignInButton.isHidden = true
186-
self.chooseSignUpButton.isHidden = true
187104
self.headerLabel.text = "Sign in to Beeminder"
188105
self.headerLabel.isHidden = false
189106
self.signInButton.isHidden = false
190-
self.signUpButton.isHidden = true
191107
self.divider.snp.remakeConstraints { (make) -> Void in
192108
make.left.equalTo(self.signInButton)
193109
make.right.equalTo(self.signInButton)
194110
make.height.equalTo(1)
195111
make.top.equalTo(self.signInButton.snp.bottom).offset(15)
196112
}
197-
198113
}
199114

200115
var missingDataOnSignIn: UIAlertController {

‎BeeSwiftIntents/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>6.7</string>
2121
<key>CFBundleVersion</key>
22-
<string>53</string>
22+
<string>54</string>
2323
<key>NSExtension</key>
2424
<dict>
2525
<key>NSExtensionAttributes</key>

‎BeeSwiftTests/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>53</string>
22+
<string>54</string>
2323
</dict>
2424
</plist>

‎BeeSwiftUITests/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<key>CFBundleShortVersionString</key>
1818
<string>6.7</string>
1919
<key>CFBundleVersion</key>
20-
<string>53</string>
20+
<string>54</string>
2121
</dict>
2222
</plist>

0 commit comments

Comments
 (0)