Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Loop/Accent Color/AccentColorOption.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ enum AccentColorOption: Int, Codable, Defaults.Serializable, CaseIterable {

var text: String {
switch self {
case .system: .init(localized: "Accent color option: System", defaultValue: "System")
case .wallpaper: .init(localized: "Accent color option: Wallpaper", defaultValue: "Wallpaper")
case .custom: .init(localized: "Accent color option: Custom", defaultValue: "Custom")
case .system: String(localized: "System", comment: "Accent color option")
case .wallpaper: String(localized: "Wallpaper", comment: "Accent color option")
case .custom: String(localized: "Custom", comment: "Accent color option")
}
}
}
2 changes: 1 addition & 1 deletion Loop/App/AppDelegate+UNNotifications.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
private static func registerNotificationCategories() {
let setIconAction = UNNotificationAction(
identifier: "setIconAction",
title: .init(localized: .init("Notification/Set Icon: Action", defaultValue: "Set Current Icon")),
title: String(localized: "Set Current Icon", comment: "Label for a button that lets the user set their icon for Loop"),
options: .destructive
)
let notificationCategory = UNNotificationCategory(
Expand Down
2 changes: 1 addition & 1 deletion Loop/App/LoopApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct LoopApp: App {
} label: {
HStack {
Image(systemName: "heart")
Text("Donate")
Text("Donate")
}
}

Expand Down
2 changes: 1 addition & 1 deletion Loop/Core/Triggers/KeybindObserver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ final class KeybindObserver {
lastKeyReleaseTime = Date.now
}

return true
return false
}

if type != .keyDown, !containsTrigger {
Expand Down
22 changes: 10 additions & 12 deletions Loop/Icon/Icon.swift
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,12 @@ extension Icon {
name: .init(localized: .init("Icon Name: Holo", defaultValue: "Holo")),
assetName: "AppIcon-Holo",
unlockTime: 25,
unlockMessage: .init(
localized: .init(
"Icon Unlock Message: Holo",
defaultValue: """
You've already looped 25 times! As a reward, here's new icon: \(.init(localized: .init("Icon Name: Holo", defaultValue: "Holo"))). Continue to loop more to unlock new icons!
"""
)
unlockMessage: String(
localized: "Icon Unlock Message: Holo",
defaultValue: """
You've already looped 25 times! As a reward, here's new icon: \(.init(localized: .init("Icon Name: Holo", defaultValue: "Holo"))). Continue to loop more to unlock new icons!
""",
comment: "Message that is shown when a new icon is unlocked"
)
)
static let rosePine = Icon(
Expand Down Expand Up @@ -124,11 +123,10 @@ extension Icon {
name: .init(localized: .init("Icon Name: Loop Master", defaultValue: "Loop Master")),
assetName: "AppIcon-Loop Master",
unlockTime: 5000,
unlockMessage: .init(
localized: .init(
"Icon Unlock Message: Loop Master",
defaultValue: "5000 loops conquered! The universe has witnessed the birth of a Loop master! Enjoy your well-deserved reward: a brand-new icon!"
)
unlockMessage: String(
localized: "Icon Unlock Message: Loop Master",
defaultValue: "5000 loops conquered! The universe has witnessed the birth of a Loop master! Enjoy your well-deserved reward: a brand-new icon!",
comment: "Message that is shown when a new icon is unlocked"
)
)
}
Expand Down
9 changes: 4 additions & 5 deletions Loop/Icon/IconManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,10 @@ enum IconManager {
if let message = icon.unlockMessage {
content.body = message
} else {
content.body = .init(
localized: .init(
"Icon Unlock Message",
defaultValue: "You've unlocked a new icon: \(icon.name)!"
)
content.body = String(
localized: "Icon Unlock Message",
defaultValue: "You've unlocked a new icon: \(icon.name)!",
comment: "Default message shown when a new icon is unlocked"
)
}

Expand Down
Loading