Skip to content

Commit 1801a7b

Browse files
authored
3.8.2 (#327)
* 3.8.2 - Обновил версию дизайн-системы - Переставил местами пару пунктов в "Настройках" и переименовал вкладку в "Ещё" * Update project.pbxproj
1 parent ea0c852 commit 1801a7b

File tree

6 files changed

+22
-31
lines changed

6 files changed

+22
-31
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# SW Площадки
2-
<img alt="Static Badge" src="https://img.shields.io/badge/Swift_Version-6.0-orange">
3-
<img alt="Static Badge" src="https://img.shields.io/badge/iOS_Version-15-blue">
2+
<img alt="Static Badge" src="https://img.shields.io/badge/Swift_Version-6.0-orange"> <img alt="Static Badge" src="https://img.shields.io/badge/iOS_Version-15-blue">
43

54
## Реализованный функционал
65
- Большинство возможностей требуют подключения к интернету, но некоторые фичи доступны оффлайн

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@
468468
"$(inherited)",
469469
"@executable_path/Frameworks",
470470
);
471-
MARKETING_VERSION = 3.8.1;
471+
MARKETING_VERSION = 3.8.2;
472472
PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
473473
PRODUCT_NAME = WorkoutApp;
474474
RUN_CLANG_STATIC_ANALYZER = YES;
@@ -522,7 +522,7 @@
522522
"$(inherited)",
523523
"@executable_path/Frameworks",
524524
);
525-
MARKETING_VERSION = 3.8.1;
525+
MARKETING_VERSION = 3.8.2;
526526
PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
527527
PRODUCT_NAME = WorkoutApp;
528528
RUN_CLANG_STATIC_ANALYZER = YES;
@@ -583,7 +583,7 @@
583583
repositoryURL = "https://github.com/OlegEremenko991/SWDesignSystem";
584584
requirement = {
585585
kind = upToNextMajorVersion;
586-
minimumVersion = 1.13.0;
586+
minimumVersion = 1.14.0;
587587
};
588588
};
589589
67F9534D2964A5700077DFDC /* XCRemoteSwiftPackageReference "ImagePicker" */ = {

SwiftUI-WorkoutApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

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

SwiftUI-WorkoutApp/Resources/Localizable.xcstrings

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,6 +1507,16 @@
15071507
}
15081508
}
15091509
},
1510+
"Ещё" : {
1511+
"localizations" : {
1512+
"en" : {
1513+
"stringUnit" : {
1514+
"state" : "translated",
1515+
"value" : "More"
1516+
}
1517+
}
1518+
}
1519+
},
15101520
"Женский" : {
15111521
"extractionState" : "manual",
15121522
"localizations" : {
@@ -2275,19 +2285,12 @@
22752285
}
22762286
},
22772287
"Настройки" : {
2278-
"extractionState" : "manual",
22792288
"localizations" : {
22802289
"en" : {
22812290
"stringUnit" : {
22822291
"state" : "translated",
22832292
"value" : "Settings"
22842293
}
2285-
},
2286-
"ru" : {
2287-
"stringUnit" : {
2288-
"state" : "translated",
2289-
"value" : "Настройки"
2290-
}
22912294
}
22922295
}
22932296
},

SwiftUI-WorkoutApp/Screens/Root/TabViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ extension TabViewModel {
3232
case .profile:
3333
"Профиль"
3434
case .settings:
35-
"Настройки"
35+
"Ещё"
3636
}
3737
}
3838

SwiftUI-WorkoutApp/Screens/Settings/SettingsScreen.swift

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ struct SettingsScreen: View {
1212
NavigationView {
1313
ScrollView {
1414
VStack(spacing: 0) {
15-
SectionView(header: "Внешний вид", mode: .regular) {
15+
SectionView(header: "Настройки", mode: .regular) {
1616
VStack(spacing: 0) {
1717
appThemeButton
1818
languagePicker
@@ -23,17 +23,16 @@ struct SettingsScreen: View {
2323
VStack(spacing: 4) {
2424
feedbackButton
2525
rateAppButton
26-
userAgreementButton
2726
officialSiteButton
2827
developerProfileButton
29-
githubButton
3028
shareAppButton
3129
appVersionView
3230
}
3331
}
3432
dividerView
3533
SectionView(header: "Поддержать проект", mode: .regular) {
3634
workoutShopButton
35+
githubButton
3736
}
3837
#if DEBUG
3938
dividerView
@@ -48,7 +47,7 @@ struct SettingsScreen: View {
4847
.padding()
4948
}
5049
.background(Color.swBackground)
51-
.navigationTitle("Настройки")
50+
.navigationTitle("Ещё")
5251
.navigationBarTitleDisplayMode(.inline)
5352
}
5453
.navigationViewStyle(.stack)
@@ -62,7 +61,6 @@ private extension SettingsScreen {
6261
static let developerBlog = URL(string: "https://t.me/easy_dev991")!
6362
static let githubLink = URL(string: "https://github.com/easydev991/SwiftUI-WorkoutApp")!
6463
static let officialSite = URL(string: "https://workout.su")!
65-
static let rulesOfService = URL(string: "https://workout.su/pravila")!
6664
static let appStoreLink = URL(string: "https://apps.apple.com/app/id1035159361")
6765
}
6866

@@ -152,15 +150,6 @@ private extension SettingsScreen {
152150
}
153151
}
154152

155-
var userAgreementButton: some View {
156-
Link(destination: Links.rulesOfService) {
157-
ListRowView(
158-
leadingContent: .text("Пользовательское соглашение"),
159-
trailingContent: .chevron
160-
)
161-
}
162-
}
163-
164153
var officialSiteButton: some View {
165154
Link(destination: Links.officialSite) {
166155
ListRowView(

0 commit comments

Comments
 (0)