Skip to content

Commit ce9a84e

Browse files
easydev991easydev991
authored
iOS 26 (#18)
* Обновляю стиль кнопок * Поправил команды в makefile * Обновил зависимости * Обновил скриншоты * Поднял версию до 1.10 * swift 6.2 * Доработал форматирование Убрал запятые в конце
1 parent e5adf05 commit ce9a84e

33 files changed

+47
-31
lines changed

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.0
1+
6.2.0

‎.swiftformat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
--ifdef no-indent
22
--header strip
3+
--trailingCommas never
34

45
--exclude SwiftUI-DaysUITests/SnapshotHelper.swift

‎Gemfile.lock‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,27 @@ GEM
1010
artifactory (3.0.17)
1111
atomos (0.1.3)
1212
aws-eventstream (1.4.0)
13-
aws-partitions (1.1131.0)
14-
aws-sdk-core (3.226.3)
13+
aws-partitions (1.1166.0)
14+
aws-sdk-core (3.233.0)
1515
aws-eventstream (~> 1, >= 1.3.0)
1616
aws-partitions (~> 1, >= 1.992.0)
1717
aws-sigv4 (~> 1.9)
1818
base64
19+
bigdecimal
1920
jmespath (~> 1, >= 1.6.1)
2021
logger
21-
aws-sdk-kms (1.106.0)
22-
aws-sdk-core (~> 3, >= 3.225.0)
22+
aws-sdk-kms (1.113.0)
23+
aws-sdk-core (~> 3, >= 3.231.0)
2324
aws-sigv4 (~> 1.5)
24-
aws-sdk-s3 (1.193.0)
25-
aws-sdk-core (~> 3, >= 3.225.0)
25+
aws-sdk-s3 (1.199.1)
26+
aws-sdk-core (~> 3, >= 3.231.0)
2627
aws-sdk-kms (~> 1)
2728
aws-sigv4 (~> 1.5)
2829
aws-sigv4 (1.12.1)
2930
aws-eventstream (~> 1, >= 1.0.2)
3031
babosa (1.0.4)
3132
base64 (0.3.0)
33+
bigdecimal (3.2.3)
3234
claide (1.1.0)
3335
colored (1.2)
3436
colored2 (3.1.2)
@@ -157,7 +159,7 @@ GEM
157159
httpclient (2.9.0)
158160
mutex_m
159161
jmespath (1.6.2)
160-
json (2.13.0)
162+
json (2.15.0)
161163
jwt (2.10.2)
162164
base64
163165
logger (1.7.0)
@@ -179,15 +181,15 @@ GEM
179181
trailblazer-option (>= 0.1.1, < 0.2.0)
180182
uber (< 0.2.0)
181183
retriable (3.1.2)
182-
rexml (3.4.1)
184+
rexml (3.4.4)
183185
rouge (3.28.0)
184186
ruby2_keywords (0.0.5)
185187
rubyzip (2.4.1)
186188
security (0.1.5)
187-
signet (0.20.0)
189+
signet (0.21.0)
188190
addressable (~> 2.8)
189191
faraday (>= 0.17.5, < 3.a)
190-
jwt (>= 1.5, < 3.0)
192+
jwt (>= 1.5, < 4.0)
191193
multi_json (~> 1.10)
192194
simctl (1.6.10)
193195
CFPropertyList

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RESET=\033[0m
1111
RUBY_VERSION=3.2.2
1212

1313
# Версия Swift в проекте
14-
SWIFT_VERSION=6.0
14+
SWIFT_VERSION=6.2.0
1515

1616
# Глобальные настройки шелла
1717
SHELL := /bin/bash
@@ -301,11 +301,11 @@ format:
301301

302302
## build: Сборка проекта в терминале
303303
build:
304-
xcodebuild -project SwiftUI-Days.xcodeproj -scheme SwiftUI-Days -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16 Pro' build
304+
xcodebuild -project SwiftUI-Days.xcodeproj -scheme SwiftUI-Days -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 17' build
305305

306306
## test: Запускает unit-тесты в терминале
307307
test:
308-
xcodebuild -project SwiftUI-Days.xcodeproj -scheme SwiftUI-Days -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16 Pro' test -testPlan SwiftUI-DaysTests
308+
xcodebuild -project SwiftUI-Days.xcodeproj -scheme SwiftUI-Days -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 17' test -testPlan SwiftUI-DaysTests
309309

310310
## screenshots: Запустить fastlane snapshot для генерации скриншотов приложения
311311
screenshots:

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# SwiftUI-Days
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-17-blue">
2+
[<img alt="Xcode Version" src="https://img.shields.io/badge/Xcode_Version-26.0-blue">](https://developer.apple.com/xcode/)
3+
[<img alt="Swift Version" src="https://img.shields.io/badge/Swift_Version-6.2-orange">](https://swift.org/)
4+
[<img alt="iOS Version" src="https://img.shields.io/badge/iOS_Version-17-blue">](https://developer.apple.com/ios/)
35

46
- Идея приложения в том, чтобы было удобно запоминать события в указанные даты, а потом легко проверить, сколько прошло дней с момента события.
57
- Это вторая версия моего пет-проекта. Первая версия находится [тут](https://github.com/easydev991/Days), и я не публиковал ее в `AppStore`.

‎SwiftUI-Days.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@
534534
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
535535
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
536536
MACOSX_DEPLOYMENT_TARGET = 14.0;
537-
MARKETING_VERSION = 1.9;
537+
MARKETING_VERSION = 1.10;
538538
PRODUCT_BUNDLE_IDENTIFIER = "com.oleg991.SwiftUI-Days";
539539
PRODUCT_NAME = "$(TARGET_NAME)";
540540
SDKROOT = auto;
@@ -582,7 +582,7 @@
582582
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
583583
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
584584
MACOSX_DEPLOYMENT_TARGET = 14.0;
585-
MARKETING_VERSION = 1.9;
585+
MARKETING_VERSION = 1.10;
586586
PRODUCT_BUNDLE_IDENTIFIER = "com.oleg991.SwiftUI-Days";
587587
PRODUCT_NAME = "$(TARGET_NAME)";
588588
SDKROOT = auto;

‎SwiftUI-Days/Extensions/View+.swift‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import SwiftUI
2+
3+
extension View {
4+
@ViewBuilder
5+
func daysButtonStyle() -> some View {
6+
if #available(iOS 26.0, *) {
7+
buttonStyle(.glassProminent)
8+
.foregroundStyle(.buttonTint)
9+
} else {
10+
buttonStyle(.borderedProminent)
11+
.foregroundStyle(.buttonTint)
12+
}
13+
}
14+
}

‎SwiftUI-Days/Preview Content/Item+.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ extension Item {
117117
details: ("Плановое хирургическое вмешательство в клинике", "Scheduled surgical procedure at clinic"),
118118
timestamp: 1_538_352_000, // 2018-10-01
119119
colorTag: nil
120-
),
120+
)
121121
]
122122

123123
return items.map { item in

‎SwiftUI-Days/Screens/CommonViews/SectionTitleView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct SectionTitleView: View {
2020
let titleStringKeys: [LocalizedStringKey] = [
2121
"Title",
2222
"Details",
23-
"Add color tag",
23+
"Add color tag"
2424
]
2525
VStack(spacing: 20) {
2626
ForEach(

‎SwiftUI-Days/Screens/Main/MainScreen.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ struct MainScreen: View {
8585
description: { Text("Create your first item") },
8686
actions: {
8787
addItemButton
88-
.buttonStyle(.borderedProminent)
89-
.foregroundStyle(.buttonTint)
88+
.daysButtonStyle()
9089
}
9190
)
9291
.accessibilityElement(children: .contain)

0 commit comments

Comments
 (0)