Skip to content

Commit ecf8f1e

Browse files
easydev991easydev991
authored
Feature/update screenshots generation (#135)
- Выполнил стандартную настройку fastlane - Переместил snapshothelper в папку fastlane - Удалил старые скриншоты - Обновил ридми - Настроил версию ruby (через rbenv) - Обновил gemfile.lock - Удалил неиспользуемый код - Сгенерировал новые скриншоты - Поднял версию до 3.4.0 (1)
1 parent a978530 commit ecf8f1e

35 files changed

+193
-138
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ screenshots/screenshots.html
33
SwiftUI-WorkoutApp.xcodeproj/project.xcworkspace/xcuserdata/oleg991.xcuserdatad/UserInterfaceState.xcuserstate
44
SwiftUI-WorkoutApp.xcodeproj/project.xcworkspace/xcuserdata/oleg991.xcuserdatad/IDEFindNavigatorScopes.plist
55
SwiftUI-WorkoutApp/.DS_Store
6+
fastlane/report.xml

‎.ruby-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.1.2

‎Gemfile.lock‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.5)
4+
CFPropertyList (3.0.6)
55
rexml
6-
addressable (2.8.1)
6+
addressable (2.8.5)
77
public_suffix (>= 2.0.2, < 6.0)
88
artifactory (3.0.15)
99
atomos (0.1.3)
1010
aws-eventstream (1.2.0)
11-
aws-partitions (1.693.0)
12-
aws-sdk-core (3.168.4)
11+
aws-partitions (1.834.0)
12+
aws-sdk-core (3.185.1)
1313
aws-eventstream (~> 1, >= 1.0.2)
1414
aws-partitions (~> 1, >= 1.651.0)
1515
aws-sigv4 (~> 1.5)
1616
jmespath (~> 1, >= 1.6.1)
17-
aws-sdk-kms (1.61.0)
18-
aws-sdk-core (~> 3, >= 3.165.0)
17+
aws-sdk-kms (1.72.0)
18+
aws-sdk-core (~> 3, >= 3.184.0)
1919
aws-sigv4 (~> 1.1)
20-
aws-sdk-s3 (1.117.2)
21-
aws-sdk-core (~> 3, >= 3.165.0)
20+
aws-sdk-s3 (1.136.0)
21+
aws-sdk-core (~> 3, >= 3.181.0)
2222
aws-sdk-kms (~> 1)
23-
aws-sigv4 (~> 1.4)
24-
aws-sigv4 (1.5.2)
23+
aws-sigv4 (~> 1.6)
24+
aws-sigv4 (1.6.0)
2525
aws-eventstream (~> 1, >= 1.0.2)
2626
babosa (1.0.4)
2727
claide (1.1.0)
@@ -30,14 +30,14 @@ GEM
3030
commander (4.6.0)
3131
highline (~> 2.0.0)
3232
declarative (0.0.20)
33-
digest-crc (0.6.4)
33+
digest-crc (0.6.5)
3434
rake (>= 12.0.0, < 14.0.0)
3535
domain_name (0.5.20190701)
3636
unf (>= 0.0.5, < 1.0.0)
3737
dotenv (2.8.1)
3838
emoji_regex (3.2.3)
39-
excon (0.97.1)
40-
faraday (1.10.2)
39+
excon (0.104.0)
40+
faraday (1.10.3)
4141
faraday-em_http (~> 1.0)
4242
faraday-em_synchrony (~> 1.0)
4343
faraday-excon (~> 1.1)
@@ -65,8 +65,8 @@ GEM
6565
faraday-retry (1.0.3)
6666
faraday_middleware (1.2.0)
6767
faraday (~> 1.0)
68-
fastimage (2.2.6)
69-
fastlane (2.211.0)
68+
fastimage (2.2.7)
69+
fastlane (2.216.0)
7070
CFPropertyList (>= 2.3, < 4.0.0)
7171
addressable (>= 2.8, < 3.0.0)
7272
artifactory (~> 3.0)
@@ -87,28 +87,29 @@ GEM
8787
google-apis-playcustomapp_v1 (~> 0.1)
8888
google-cloud-storage (~> 1.31)
8989
highline (~> 2.0)
90+
http-cookie (~> 1.0.5)
9091
json (< 3.0.0)
9192
jwt (>= 2.1.0, < 3)
9293
mini_magick (>= 4.9.4, < 5.0.0)
93-
multipart-post (~> 2.0.0)
94+
multipart-post (>= 2.0.0, < 3.0.0)
9495
naturally (~> 2.2)
9596
optparse (~> 0.1.1)
9697
plist (>= 3.1.0, < 4.0.0)
9798
rubyzip (>= 2.0.0, < 3.0.0)
9899
security (= 0.1.3)
99100
simctl (~> 1.6.3)
100101
terminal-notifier (>= 2.0.0, < 3.0.0)
101-
terminal-table (>= 1.4.5, < 2.0.0)
102+
terminal-table (~> 3)
102103
tty-screen (>= 0.6.3, < 1.0.0)
103104
tty-spinner (>= 0.8.0, < 1.0.0)
104105
word_wrap (~> 1.0.0)
105106
xcodeproj (>= 1.13.0, < 2.0.0)
106107
xcpretty (~> 0.3.0)
107108
xcpretty-travis-formatter (>= 0.0.3)
108109
gh_inspector (1.1.3)
109-
google-apis-androidpublisher_v3 (0.32.0)
110-
google-apis-core (>= 0.9.1, < 2.a)
111-
google-apis-core (0.9.5)
110+
google-apis-androidpublisher_v3 (0.50.0)
111+
google-apis-core (>= 0.11.0, < 2.a)
112+
google-apis-core (0.11.1)
112113
addressable (~> 2.5, >= 2.5.1)
113114
googleauth (>= 0.16.2, < 2.a)
114115
httpclient (>= 2.8.1, < 3.a)
@@ -117,18 +118,18 @@ GEM
117118
retriable (>= 2.0, < 4.a)
118119
rexml
119120
webrick
120-
google-apis-iamcredentials_v1 (0.16.0)
121-
google-apis-core (>= 0.9.1, < 2.a)
122-
google-apis-playcustomapp_v1 (0.12.0)
123-
google-apis-core (>= 0.9.1, < 2.a)
121+
google-apis-iamcredentials_v1 (0.17.0)
122+
google-apis-core (>= 0.11.0, < 2.a)
123+
google-apis-playcustomapp_v1 (0.13.0)
124+
google-apis-core (>= 0.11.0, < 2.a)
124125
google-apis-storage_v1 (0.19.0)
125126
google-apis-core (>= 0.9.0, < 2.a)
126127
google-cloud-core (1.6.0)
127128
google-cloud-env (~> 1.0)
128129
google-cloud-errors (~> 1.0)
129130
google-cloud-env (1.6.0)
130131
faraday (>= 0.17.3, < 3.0)
131-
google-cloud-errors (1.3.0)
132+
google-cloud-errors (1.3.1)
132133
google-cloud-storage (1.44.0)
133134
addressable (~> 2.8)
134135
digest-crc (~> 0.4)
@@ -137,10 +138,9 @@ GEM
137138
google-cloud-core (~> 1.6)
138139
googleauth (>= 0.16.2, < 2.a)
139140
mini_mime (~> 1.0)
140-
googleauth (1.3.0)
141+
googleauth (1.8.1)
141142
faraday (>= 0.17.3, < 3.a)
142143
jwt (>= 1.4, < 3.0)
143-
memoist (~> 0.16)
144144
multi_json (~> 1.11)
145145
os (>= 0.9, < 2.0)
146146
signet (>= 0.16, < 2.a)
@@ -150,40 +150,39 @@ GEM
150150
httpclient (2.8.3)
151151
jmespath (1.6.2)
152152
json (2.6.3)
153-
jwt (2.6.0)
154-
memoist (0.16.2)
153+
jwt (2.7.1)
155154
mini_magick (4.12.0)
156-
mini_mime (1.1.2)
155+
mini_mime (1.1.5)
157156
multi_json (1.15.0)
158-
multipart-post (2.0.0)
157+
multipart-post (2.3.0)
159158
nanaimo (0.3.0)
160159
naturally (2.2.1)
161160
optparse (0.1.1)
162161
os (1.1.4)
163-
plist (3.6.0)
164-
public_suffix (5.0.1)
162+
plist (3.7.0)
163+
public_suffix (5.0.3)
165164
rake (13.0.6)
166165
representable (3.2.0)
167166
declarative (< 0.1.0)
168167
trailblazer-option (>= 0.1.1, < 0.2.0)
169168
uber (< 0.2.0)
170169
retriable (3.1.2)
171-
rexml (3.2.5)
170+
rexml (3.2.6)
172171
rouge (2.0.7)
173172
ruby2_keywords (0.0.5)
174173
rubyzip (2.3.2)
175174
security (0.1.3)
176-
signet (0.17.0)
175+
signet (0.18.0)
177176
addressable (~> 2.8)
178177
faraday (>= 0.17.5, < 3.a)
179178
jwt (>= 1.5, < 3.0)
180179
multi_json (~> 1.10)
181-
simctl (1.6.8)
180+
simctl (1.6.10)
182181
CFPropertyList
183182
naturally
184183
terminal-notifier (2.0.0)
185-
terminal-table (1.8.0)
186-
unicode-display_width (~> 1.1, >= 1.1.1)
184+
terminal-table (3.0.2)
185+
unicode-display_width (>= 1.1.1, < 3)
187186
trailblazer-option (0.1.2)
188187
tty-cursor (0.7.1)
189188
tty-screen (0.8.1)
@@ -193,10 +192,10 @@ GEM
193192
unf (0.1.4)
194193
unf_ext
195194
unf_ext (0.0.8.2)
196-
unicode-display_width (1.8.0)
197-
webrick (1.7.0)
195+
unicode-display_width (2.5.0)
196+
webrick (1.8.1)
198197
word_wrap (1.0.0)
199-
xcodeproj (1.22.0)
198+
xcodeproj (1.23.0)
200199
CFPropertyList (>= 2.3.3, < 4.0)
201200
atomos (~> 0.1.3)
202201
claide (>= 1.0.2, < 2.0)
@@ -209,10 +208,11 @@ GEM
209208
xcpretty (~> 0.2, >= 0.0.7)
210209

211210
PLATFORMS
211+
arm64-darwin-22
212212
x86_64-darwin-22
213213

214214
DEPENDENCIES
215215
fastlane
216216

217217
BUNDLED WITH
218-
2.4.3
218+
2.4.20

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ chmod +x SwiftUI-WorkoutApp/githooks/pre-commit
5959

6060
### Скриншоты
6161
1. Генерируем скриншоты при помощи `Fastlane` ([документация](https://docs.fastlane.tools/getting-started/ios/setup/))
62-
2. Настройки для генерации скриншотов находятся в файле [Snapfile](Snapfile) ([документация](https://docs.fastlane.tools/actions/snapshot/))
63-
3. Генерация скриншотов выполняется командой в папке с проектом (команда может отличаться в зависимости от способа установки `fastlane`)
62+
2. Настройки для генерации скриншотов находятся в файле [Snapfile](./fastlane/Snapfile) ([документация](https://docs.fastlane.tools/actions/snapshot/))
63+
3. Генерация скриншотов выполняется командой в папке с проектом (команда может меняться в зависимости от способа установки `Ruby`/`fastlane`)
6464
```shell
6565
rbenv exec fastlane snapshot
6666
```

‎SwiftUI-WorkoutApp.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
6705E7EE283B703400DABCC8 /* JournalSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6705E7ED283B703400DABCC8 /* JournalSettingsView.swift */; };
1212
670CA19E280E8F09003914A3 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 670CA19D280E8F09003914A3 /* SettingsView.swift */; };
1313
67138D87297311BD00BBF450 /* WorkoutAppUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67138D86297311BD00BBF450 /* WorkoutAppUITests.swift */; };
14-
67138D90297323AE00BBF450 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67138D8F297323AE00BBF450 /* SnapshotHelper.swift */; };
1514
67138D922974851F00BBF450 /* XCUIElement+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67138D912974851F00BBF450 /* XCUIElement+.swift */; };
1615
67138D942974854F00BBF450 /* XCTestCase+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67138D932974854F00BBF450 /* XCTestCase+.swift */; };
16+
6718BCA42AD5327F002846A6 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6718BCA32AD5327F002846A6 /* SnapshotHelper.swift */; };
1717
671CD13929A2904200645678 /* SWModels in Frameworks */ = {isa = PBXBuildFile; productRef = 671CD13829A2904200645678 /* SWModels */; };
1818
671D7DEC28210D2F0068E728 /* EmptyContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 671D7DEB28210D2F0068E728 /* EmptyContentView.swift */; };
1919
672F2BE32832BC7C0000A193 /* oldEvents.json in Resources */ = {isa = PBXBuildFile; fileRef = 672F2BE22832BC7C0000A193 /* oldEvents.json */; };
@@ -100,9 +100,9 @@
100100
670CA19D280E8F09003914A3 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
101101
67138D84297311BD00BBF450 /* WorkoutAppUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WorkoutAppUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
102102
67138D86297311BD00BBF450 /* WorkoutAppUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkoutAppUITests.swift; sourceTree = "<group>"; };
103-
67138D8F297323AE00BBF450 /* SnapshotHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SnapshotHelper.swift; sourceTree = SOURCE_ROOT; };
104103
67138D912974851F00BBF450 /* XCUIElement+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCUIElement+.swift"; sourceTree = "<group>"; };
105104
67138D932974854F00BBF450 /* XCTestCase+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCTestCase+.swift"; sourceTree = "<group>"; };
105+
6718BCA32AD5327F002846A6 /* SnapshotHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SnapshotHelper.swift; path = fastlane/SnapshotHelper.swift; sourceTree = SOURCE_ROOT; };
106106
671CD13729A28CB800645678 /* SWModels */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = SWModels; path = "SwiftUI-WorkoutApp/SWModels"; sourceTree = "<group>"; };
107107
671D7DEB28210D2F0068E728 /* EmptyContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyContentView.swift; sourceTree = "<group>"; };
108108
672F2BE22832BC7C0000A193 /* oldEvents.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = oldEvents.json; sourceTree = "<group>"; };
@@ -213,7 +213,7 @@
213213
67138D85297311BD00BBF450 /* WorkoutAppUITests */ = {
214214
isa = PBXGroup;
215215
children = (
216-
67138D8F297323AE00BBF450 /* SnapshotHelper.swift */,
216+
6718BCA32AD5327F002846A6 /* SnapshotHelper.swift */,
217217
67138D86297311BD00BBF450 /* WorkoutAppUITests.swift */,
218218
67138D912974851F00BBF450 /* XCUIElement+.swift */,
219219
67138D932974854F00BBF450 /* XCTestCase+.swift */,
@@ -761,7 +761,7 @@
761761
67138D87297311BD00BBF450 /* WorkoutAppUITests.swift in Sources */,
762762
67138D922974851F00BBF450 /* XCUIElement+.swift in Sources */,
763763
67138D942974854F00BBF450 /* XCTestCase+.swift in Sources */,
764-
67138D90297323AE00BBF450 /* SnapshotHelper.swift in Sources */,
764+
6718BCA42AD5327F002846A6 /* SnapshotHelper.swift in Sources */,
765765
);
766766
runOnlyForDeploymentPostprocessing = 0;
767767
};
@@ -1066,7 +1066,7 @@
10661066
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
10671067
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
10681068
CODE_SIGN_STYLE = Automatic;
1069-
CURRENT_PROJECT_VERSION = 2;
1069+
CURRENT_PROJECT_VERSION = 1;
10701070
DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
10711071
DEVELOPMENT_TEAM = CR68PP2Z3F;
10721072
ENABLE_PREVIEWS = YES;
@@ -1084,7 +1084,7 @@
10841084
"$(inherited)",
10851085
"@executable_path/Frameworks",
10861086
);
1087-
MARKETING_VERSION = 3.3.4;
1087+
MARKETING_VERSION = 3.4.0;
10881088
PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
10891089
PRODUCT_NAME = WorkoutApp;
10901090
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1102,7 +1102,7 @@
11021102
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
11031103
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
11041104
CODE_SIGN_STYLE = Automatic;
1105-
CURRENT_PROJECT_VERSION = 2;
1105+
CURRENT_PROJECT_VERSION = 1;
11061106
DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
11071107
DEVELOPMENT_TEAM = CR68PP2Z3F;
11081108
ENABLE_PREVIEWS = YES;
@@ -1120,7 +1120,7 @@
11201120
"$(inherited)",
11211121
"@executable_path/Frameworks",
11221122
);
1123-
MARKETING_VERSION = 3.3.4;
1123+
MARKETING_VERSION = 3.4.0;
11241124
PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
11251125
PRODUCT_NAME = WorkoutApp;
11261126
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

‎SwiftUI-WorkoutApp.xcodeproj/xcshareddata/xcschemes/SwiftUI-WorkoutApp.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
ignoresPersistentStateOnLaunch = "NO"
6868
debugDocumentVersioning = "YES"
6969
debugServiceExtension = "internal"
70-
allowLocationSimulation = "NO">
70+
allowLocationSimulation = "YES">
7171
<BuildableProductRunnable
7272
runnableDebuggingMode = "0">
7373
<BuildableReference

‎SwiftUI-WorkoutApp.xcodeproj/xcshareddata/xcschemes/WorkoutAppUITests.xcscheme‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,10 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES"
30-
language = "ru"
31-
region = "RU">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3230
<Testables>
3331
<TestableReference
34-
skipped = "NO"
35-
parallelizable = "YES">
32+
skipped = "NO">
3633
<BuildableReference
3734
BuildableIdentifier = "primary"
3835
BlueprintIdentifier = "67138D83297311BD00BBF450"

‎SwiftUI-WorkoutApp/SWModels/Sources/SWModels/UserModel.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ public extension UserModel {
9191
}
9292

9393
var hasJournals: Bool { journalsCount > 0 }
94-
94+
9595
var hasFriends: Bool { friendsCount > 0 }
96-
96+
9797
var hasAddedGrounds: Bool { !addedSportsGrounds.isEmpty }
98-
98+
9999
/// Тренируется на каких-нибудь площадках
100100
var hasUsedGrounds: Bool { usesSportsGrounds > 0 }
101-
101+
102102
var journalsCountString: String {
103103
String.localizedStringWithFormat(
104104
NSLocalizedString("journalsCount", comment: ""),

‎SwiftUI-WorkoutApp/Screens/Profile/Detail/UserDetailsView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ private extension UserDetailsView {
237237
}
238238
}
239239
}
240-
240+
241241
@ViewBuilder
242242
var logoutButtonIfNeeded: some View {
243243
if isMainUser {

‎SwiftUI-WorkoutApp/Screens/Profile/Journals/JournalsList/JournalsListView.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ private extension JournalsListView {
191191
newJournalTitle = ""
192192
isCreatingJournal.toggle()
193193
defaults.setUserNeedUpdate(true)
194-
let userID = (defaults.mainUserInfo?.userID).valueOrZero
195194
await askForJournals(refresh: true)
196195
}
197196
} catch {

0 commit comments

Comments
 (0)