Skip to content

Commit 3c5a484

Browse files
SubvertDevSubvertDev
authored
Release v0.5.4
2 parents cd94042 + 5f4325e commit 3c5a484

File tree

5 files changed

+52
-32
lines changed

5 files changed

+52
-32
lines changed

‎ForPDA.xcodeproj/project.pbxproj

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,18 +1158,18 @@
11581158
);
11591159
mainGroup = B8D351EC293CABB6008A84EA;
11601160
packageReferences = (
1161-
B8D35219293CBE46008A84EA /* XCRemoteSwiftPackageReference "SwiftSoup.git" */,
1162-
B8099259293CBF5C0053202C /* XCRemoteSwiftPackageReference "SnapKit.git" */,
1163-
B8BD2D77293E1C3F00E12E29 /* XCRemoteSwiftPackageReference "MarqueeLabel.git" */,
1164-
B89301172947CF5500D14141 /* XCRemoteSwiftPackageReference "SwiftRichString.git" */,
1165-
B84CCC50294A6EDA0001EB24 /* XCRemoteSwiftPackageReference "Nuke.git" */,
1166-
B83E8AC3294A75DA000D59E7 /* XCRemoteSwiftPackageReference "SwiftyGif.git" */,
1161+
B8D35219293CBE46008A84EA /* XCRemoteSwiftPackageReference "SwiftSoup" */,
1162+
B8099259293CBF5C0053202C /* XCRemoteSwiftPackageReference "SnapKit" */,
1163+
B8BD2D77293E1C3F00E12E29 /* XCRemoteSwiftPackageReference "MarqueeLabel" */,
1164+
B89301172947CF5500D14141 /* XCRemoteSwiftPackageReference "SwiftRichString" */,
1165+
B84CCC50294A6EDA0001EB24 /* XCRemoteSwiftPackageReference "Nuke" */,
1166+
B83E8AC3294A75DA000D59E7 /* XCRemoteSwiftPackageReference "SwiftyGif" */,
11671167
B8495D40294CCE1E00F60171 /* XCRemoteSwiftPackageReference "SwiftMessages" */,
1168-
B8FEA1C029676FC3002DFAA4 /* XCRemoteSwiftPackageReference "R.swift" */,
1169-
B884AFF629FD9D6F00BC1AA1 /* XCRemoteSwiftPackageReference "YouTubePlayerKit.git" */,
1168+
B8FEA1C029676FC3002DFAA4 /* XCRemoteSwiftPackageReference "R" */,
1169+
B884AFF629FD9D6F00BC1AA1 /* XCRemoteSwiftPackageReference "YouTubePlayerKit" */,
11701170
B8B55B002A07C948008C93D3 /* XCRemoteSwiftPackageReference "Factory" */,
11711171
B88D3F572A098C600061C6C4 /* XCRemoteSwiftPackageReference "SFSafeSymbols" */,
1172-
B82B2EB12A87D58D00CB067C /* XCRemoteSwiftPackageReference "sentry-cocoa.git" */,
1172+
B82B2EB12A87D58D00CB067C /* XCRemoteSwiftPackageReference "sentry-cocoa" */,
11731173
B82EFA232A896CBD00C8B2AC /* XCRemoteSwiftPackageReference "route-composer" */,
11741174
B85EC41D2B0AC6D000659A04 /* XCRemoteSwiftPackageReference "mixpanel-swift" */,
11751175
);
@@ -1400,7 +1400,7 @@
14001400
/* Begin PBXTargetDependency section */
14011401
B834034D296770C300C3CF37 /* PBXTargetDependency */ = {
14021402
isa = PBXTargetDependency;
1403-
productRef = B834034C296770C300C3CF37 /* plugin:RswiftGenerateInternalResources */;
1403+
productRef = B834034C296770C300C3CF37 /* RswiftGenerateInternalResources */;
14041404
};
14051405
B8A85A912AA10CF500EDFE58 /* PBXTargetDependency */ = {
14061406
isa = PBXTargetDependency;
@@ -1788,15 +1788,15 @@
17881788
/* End XCConfigurationList section */
17891789

17901790
/* Begin XCRemoteSwiftPackageReference section */
1791-
B8099259293CBF5C0053202C /* XCRemoteSwiftPackageReference "SnapKit.git" */ = {
1791+
B8099259293CBF5C0053202C /* XCRemoteSwiftPackageReference "SnapKit" */ = {
17921792
isa = XCRemoteSwiftPackageReference;
17931793
repositoryURL = "https://github.com/SnapKit/SnapKit.git";
17941794
requirement = {
17951795
kind = upToNextMajorVersion;
17961796
minimumVersion = 5.6.0;
17971797
};
17981798
};
1799-
B82B2EB12A87D58D00CB067C /* XCRemoteSwiftPackageReference "sentry-cocoa.git" */ = {
1799+
B82B2EB12A87D58D00CB067C /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {
18001800
isa = XCRemoteSwiftPackageReference;
18011801
repositoryURL = "https://github.com/getsentry/sentry-cocoa.git";
18021802
requirement = {
@@ -1812,7 +1812,7 @@
18121812
minimumVersion = 2.10.4;
18131813
};
18141814
};
1815-
B83E8AC3294A75DA000D59E7 /* XCRemoteSwiftPackageReference "SwiftyGif.git" */ = {
1815+
B83E8AC3294A75DA000D59E7 /* XCRemoteSwiftPackageReference "SwiftyGif" */ = {
18161816
isa = XCRemoteSwiftPackageReference;
18171817
repositoryURL = "https://github.com/kirualex/SwiftyGif.git";
18181818
requirement = {
@@ -1828,7 +1828,7 @@
18281828
minimumVersion = 9.0.6;
18291829
};
18301830
};
1831-
B84CCC50294A6EDA0001EB24 /* XCRemoteSwiftPackageReference "Nuke.git" */ = {
1831+
B84CCC50294A6EDA0001EB24 /* XCRemoteSwiftPackageReference "Nuke" */ = {
18321832
isa = XCRemoteSwiftPackageReference;
18331833
repositoryURL = "https://github.com/kean/Nuke.git";
18341834
requirement = {
@@ -1844,7 +1844,7 @@
18441844
minimumVersion = 4.2.0;
18451845
};
18461846
};
1847-
B884AFF629FD9D6F00BC1AA1 /* XCRemoteSwiftPackageReference "YouTubePlayerKit.git" */ = {
1847+
B884AFF629FD9D6F00BC1AA1 /* XCRemoteSwiftPackageReference "YouTubePlayerKit" */ = {
18481848
isa = XCRemoteSwiftPackageReference;
18491849
repositoryURL = "https://github.com/SvenTiigi/YouTubePlayerKit.git";
18501850
requirement = {
@@ -1860,7 +1860,7 @@
18601860
minimumVersion = 4.1.1;
18611861
};
18621862
};
1863-
B89301172947CF5500D14141 /* XCRemoteSwiftPackageReference "SwiftRichString.git" */ = {
1863+
B89301172947CF5500D14141 /* XCRemoteSwiftPackageReference "SwiftRichString" */ = {
18641864
isa = XCRemoteSwiftPackageReference;
18651865
repositoryURL = "https://github.com/malcommac/SwiftRichString.git";
18661866
requirement = {
@@ -1876,23 +1876,23 @@
18761876
minimumVersion = 2.1.5;
18771877
};
18781878
};
1879-
B8BD2D77293E1C3F00E12E29 /* XCRemoteSwiftPackageReference "MarqueeLabel.git" */ = {
1879+
B8BD2D77293E1C3F00E12E29 /* XCRemoteSwiftPackageReference "MarqueeLabel" */ = {
18801880
isa = XCRemoteSwiftPackageReference;
18811881
repositoryURL = "https://github.com/cbpowell/MarqueeLabel.git";
18821882
requirement = {
18831883
kind = upToNextMajorVersion;
18841884
minimumVersion = 4.3.0;
18851885
};
18861886
};
1887-
B8D35219293CBE46008A84EA /* XCRemoteSwiftPackageReference "SwiftSoup.git" */ = {
1887+
B8D35219293CBE46008A84EA /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
18881888
isa = XCRemoteSwiftPackageReference;
18891889
repositoryURL = "https://github.com/scinfu/SwiftSoup.git";
18901890
requirement = {
18911891
kind = upToNextMajorVersion;
18921892
minimumVersion = 2.6.0;
18931893
};
18941894
};
1895-
B8FEA1C029676FC3002DFAA4 /* XCRemoteSwiftPackageReference "R.swift" */ = {
1895+
B8FEA1C029676FC3002DFAA4 /* XCRemoteSwiftPackageReference "R" */ = {
18961896
isa = XCRemoteSwiftPackageReference;
18971897
repositoryURL = "https://github.com/mac-cain13/R.swift";
18981898
requirement = {
@@ -1905,26 +1905,26 @@
19051905
/* Begin XCSwiftPackageProductDependency section */
19061906
B809925A293CBF5C0053202C /* SnapKit */ = {
19071907
isa = XCSwiftPackageProductDependency;
1908-
package = B8099259293CBF5C0053202C /* XCRemoteSwiftPackageReference "SnapKit.git" */;
1908+
package = B8099259293CBF5C0053202C /* XCRemoteSwiftPackageReference "SnapKit" */;
19091909
productName = SnapKit;
19101910
};
19111911
B82B2EB22A87D58D00CB067C /* Sentry */ = {
19121912
isa = XCSwiftPackageProductDependency;
1913-
package = B82B2EB12A87D58D00CB067C /* XCRemoteSwiftPackageReference "sentry-cocoa.git" */;
1913+
package = B82B2EB12A87D58D00CB067C /* XCRemoteSwiftPackageReference "sentry-cocoa" */;
19141914
productName = Sentry;
19151915
};
19161916
B82EFA242A896CBD00C8B2AC /* RouteComposer */ = {
19171917
isa = XCSwiftPackageProductDependency;
19181918
package = B82EFA232A896CBD00C8B2AC /* XCRemoteSwiftPackageReference "route-composer" */;
19191919
productName = RouteComposer;
19201920
};
1921-
B834034C296770C300C3CF37 /* plugin:RswiftGenerateInternalResources */ = {
1921+
B834034C296770C300C3CF37 /* RswiftGenerateInternalResources */ = {
19221922
isa = XCSwiftPackageProductDependency;
19231923
productName = "plugin:RswiftGenerateInternalResources";
19241924
};
19251925
B83E8AC4294A75DA000D59E7 /* SwiftyGif */ = {
19261926
isa = XCSwiftPackageProductDependency;
1927-
package = B83E8AC3294A75DA000D59E7 /* XCRemoteSwiftPackageReference "SwiftyGif.git" */;
1927+
package = B83E8AC3294A75DA000D59E7 /* XCRemoteSwiftPackageReference "SwiftyGif" */;
19281928
productName = SwiftyGif;
19291929
};
19301930
B8495D41294CCE1E00F60171 /* SwiftMessages */ = {
@@ -1934,12 +1934,12 @@
19341934
};
19351935
B84CCC51294A6EDA0001EB24 /* Nuke */ = {
19361936
isa = XCSwiftPackageProductDependency;
1937-
package = B84CCC50294A6EDA0001EB24 /* XCRemoteSwiftPackageReference "Nuke.git" */;
1937+
package = B84CCC50294A6EDA0001EB24 /* XCRemoteSwiftPackageReference "Nuke" */;
19381938
productName = Nuke;
19391939
};
19401940
B84CCC53294A6EDA0001EB24 /* NukeExtensions */ = {
19411941
isa = XCSwiftPackageProductDependency;
1942-
package = B84CCC50294A6EDA0001EB24 /* XCRemoteSwiftPackageReference "Nuke.git" */;
1942+
package = B84CCC50294A6EDA0001EB24 /* XCRemoteSwiftPackageReference "Nuke" */;
19431943
productName = NukeExtensions;
19441944
};
19451945
B85EC41E2B0AC6D000659A04 /* Mixpanel */ = {
@@ -1949,7 +1949,7 @@
19491949
};
19501950
B884AFF729FD9D6F00BC1AA1 /* YouTubePlayerKit */ = {
19511951
isa = XCSwiftPackageProductDependency;
1952-
package = B884AFF629FD9D6F00BC1AA1 /* XCRemoteSwiftPackageReference "YouTubePlayerKit.git" */;
1952+
package = B884AFF629FD9D6F00BC1AA1 /* XCRemoteSwiftPackageReference "YouTubePlayerKit" */;
19531953
productName = YouTubePlayerKit;
19541954
};
19551955
B88D3F582A098C600061C6C4 /* SFSafeSymbols */ = {
@@ -1959,7 +1959,7 @@
19591959
};
19601960
B89301182947CF5500D14141 /* SwiftRichString */ = {
19611961
isa = XCSwiftPackageProductDependency;
1962-
package = B89301172947CF5500D14141 /* XCRemoteSwiftPackageReference "SwiftRichString.git" */;
1962+
package = B89301172947CF5500D14141 /* XCRemoteSwiftPackageReference "SwiftRichString" */;
19631963
productName = SwiftRichString;
19641964
};
19651965
B8B55B012A07C948008C93D3 /* Factory */ = {
@@ -1969,17 +1969,17 @@
19691969
};
19701970
B8BD2D78293E1C3F00E12E29 /* MarqueeLabel */ = {
19711971
isa = XCSwiftPackageProductDependency;
1972-
package = B8BD2D77293E1C3F00E12E29 /* XCRemoteSwiftPackageReference "MarqueeLabel.git" */;
1972+
package = B8BD2D77293E1C3F00E12E29 /* XCRemoteSwiftPackageReference "MarqueeLabel" */;
19731973
productName = MarqueeLabel;
19741974
};
19751975
B8D3521A293CBE46008A84EA /* SwiftSoup */ = {
19761976
isa = XCSwiftPackageProductDependency;
1977-
package = B8D35219293CBE46008A84EA /* XCRemoteSwiftPackageReference "SwiftSoup.git" */;
1977+
package = B8D35219293CBE46008A84EA /* XCRemoteSwiftPackageReference "SwiftSoup" */;
19781978
productName = SwiftSoup;
19791979
};
19801980
B8FEA1C129676FC3002DFAA4 /* RswiftLibrary */ = {
19811981
isa = XCSwiftPackageProductDependency;
1982-
package = B8FEA1C029676FC3002DFAA4 /* XCRemoteSwiftPackageReference "R.swift" */;
1982+
package = B8FEA1C029676FC3002DFAA4 /* XCRemoteSwiftPackageReference "R" */;
19831983
productName = RswiftLibrary;
19841984
};
19851985
/* End XCSwiftPackageProductDependency section */

‎ForPDA.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ForPDA/Resources/en.lproj/Localizable.strings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,4 @@
102102
"captcha.uploading.failed" = "Captcha uploading failed";
103103
"login.failed.unknown.reasons" = "Something went wrong, try again later";
104104
"login" = "Log In";
105+
"done" = "Done";

‎ForPDA/Resources/ru.lproj/Localizable.strings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,4 @@
102102
"captcha.uploading.failed" = "Не получилось отправить капчу";
103103
"login.failed.unknown.reasons" = "Что-то пошло не так, попробуйте позже";
104104
"login" = "Войти";
105+
"done" = "Готово";

‎ForPDA/Sources/Modules/Login/LoginView.swift

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ final class LoginView: UIView {
9191

9292
addSubviews()
9393
makeConstraints()
94+
setupToolbar()
9495

9596
let tap = UITapGestureRecognizer(target: self, action: #selector(captchaImageTapped))
9697
captchaImageView.addGestureRecognizer(tap)
@@ -111,6 +112,10 @@ final class LoginView: UIView {
111112
delegate?.captchaImageTapped()
112113
}
113114

115+
@objc private func doneButtonTapped() {
116+
endEditing(true)
117+
}
118+
114119
// MARK: - Layout
115120

116121
private func addSubviews() {
@@ -125,9 +130,10 @@ final class LoginView: UIView {
125130
}
126131

127132
private func makeConstraints() {
133+
let isSE = UIScreen.main.bounds.height <= 667
128134
loginTextField.snp.makeConstraints { make in
129135
make.leading.trailing.equalToSuperview().inset(16)
130-
make.top.equalTo(safeAreaLayoutGuide).inset(64)
136+
make.top.equalTo(safeAreaLayoutGuide).inset(isSE ? 16 : 64)
131137
}
132138

133139
passwordTextField.snp.makeConstraints { make in
@@ -161,6 +167,17 @@ final class LoginView: UIView {
161167
make.height.equalTo(100)
162168
}
163169
}
170+
171+
private func setupToolbar() {
172+
let toolbar = UIToolbar()
173+
toolbar.sizeToFit()
174+
let flexibleSpace = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
175+
let doneButton = UIBarButtonItem(title: R.string.localizable.done(), style: .done, target: self, action: #selector(doneButtonTapped))
176+
toolbar.items = [flexibleSpace, doneButton]
177+
captchaTextField.inputAccessoryView = toolbar
178+
loginTextField.inputAccessoryView = toolbar
179+
passwordTextField.inputAccessoryView = toolbar
180+
}
164181
}
165182

166183
final class LoadingButton: UIButton {

0 commit comments

Comments
 (0)