Skip to content

Commit 29b7043

Browse files
authored
v64.3.1 (#24)
* v64.3 -> v64.3.1 * improved settings * Fixed watchOS crashes * localization fixes
1 parent bd26846 commit 29b7043

5 files changed

Lines changed: 17 additions & 12 deletions

File tree

Glucosy.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@
689689
GCC_WARN_UNUSED_FUNCTION = YES;
690690
GCC_WARN_UNUSED_VARIABLE = YES;
691691
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
692-
MARKETING_VERSION = 64.3;
692+
MARKETING_VERSION = 64.3.1;
693693
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
694694
MTL_FAST_MATH = YES;
695695
ONLY_ACTIVE_ARCH = YES;
@@ -751,7 +751,7 @@
751751
GCC_WARN_UNUSED_FUNCTION = YES;
752752
GCC_WARN_UNUSED_VARIABLE = YES;
753753
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
754-
MARKETING_VERSION = 64.3;
754+
MARKETING_VERSION = 64.3.1;
755755
MTL_ENABLE_DEBUG_INFO = NO;
756756
MTL_FAST_MATH = YES;
757757
STRING_CATALOG_GENERATE_SYMBOLS = YES;

iOS/Localizable.xcstrings

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2005,7 +2005,7 @@
20052005
"ru" : {
20062006
"stringUnit" : {
20072007
"state" : "translated",
2008-
"value" : "Сообщения об ошибках, запросы функций и вклад всегда приветствуются!"
2008+
"value" : "Сообщения об ошибках, запросы фич и контрибуции всегда приветствуются!"
20092009
}
20102010
},
20112011
"tr" : {
@@ -2017,7 +2017,7 @@
20172017
"uk" : {
20182018
"stringUnit" : {
20192019
"state" : "translated",
2020-
"value" : "Звіти про помилки, запити функцій і внески завжди вітаються!"
2020+
"value" : "Звіти про помилки, запити фіч і контрибуції завжди вітаються!"
20212021
}
20222022
}
20232023
}
@@ -12216,4 +12216,4 @@
1221612216
}
1221712217
},
1221812218
"version" : "1.1"
12219-
}
12219+
}

iOS/Settings/SettingsView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ struct SettingsView: View {
3535
.tint(.primary)
3636
} footer: {
3737
Text("Bug reports, feature requests & contributions are always welcome!")
38+
.secondary()
3839
}
3940
}
4041
.navigationTitle("Settings")

watchOS/HomeView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ struct HomeView: View {
88
List {
99
ForEach(WatchRecordKind.allCases) { recordKind in
1010
NavigationLink {
11-
RecordList(recordKind: recordKind)
11+
RecordList(recordKind)
12+
.environment(vm)
1213
} label: {
1314
Label(recordKind.title, systemImage: recordKind.systemImage)
1415
}
1516
}
1617
}
1718
.navigationTitle("Records")
1819
}
19-
.environment(vm)
2020
.task {
2121
await vm.prepare()
2222
}

watchOS/RecordList.swift

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ import ScrechKit
33
struct RecordList: View {
44
@Environment(WatchRecordsVM.self) private var vm
55

6-
let recordKind: WatchRecordKind
6+
private let recordKind: WatchRecordKind
7+
8+
init(_ recordKind: WatchRecordKind) {
9+
self.recordKind = recordKind
10+
}
711

812
private var entries: [WatchRecordEntry] {
913
vm.entries(for: recordKind)
@@ -14,23 +18,23 @@ struct RecordList: View {
1418
if let authorizationMessage = vm.authorizationMessage, entries.isEmpty {
1519
Text(authorizationMessage)
1620
.secondary()
21+
1722
} else if vm.isLoading(recordKind), entries.isEmpty {
1823
ProgressView()
1924
.frame(maxWidth: .infinity)
25+
2026
} else if entries.isEmpty {
2127
Text(recordKind.emptyState)
2228
.secondary()
29+
2330
} else {
2431
ForEach(entries) {
2532
WatchRecordRow(entry: $0)
2633
}
2734
}
2835
}
2936
.navigationTitle(recordKind.title)
30-
.task {
31-
await vm.loadIfNeeded(recordKind)
32-
}
33-
.refreshable {
37+
.refreshableTask {
3438
await vm.refresh(recordKind)
3539
}
3640
}

0 commit comments

Comments
 (0)