cdricms/vnidrop
1
1
Fork 0
mirror of https://github.com/sudosylabs/vnidrop.git synced 2026-08-05 10:29:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(apple): generate type-safe L10n accessors and migrate all key literals

Browse Source 
Replaces every stringly-typed localization key in the Apple app with
compile-time-checked accessors generated from localization/strings.json.
A mistyped key is now a build error instead of a silent fallback to the
raw key at runtime. The runtime path is unchanged: plain keys are
String.LocalizationValue constants resolved with String(localized:) and
Apple's String Catalog still does the lookup; keys with arguments become
typed, named functions applying args through String(format:).

Generator: new renderSwiftAccessors emits apple/VniDrop/Generated/L10n.swift,
wired into generate. Renamed generic arg1/arg2 tokens on four keys to
semantic names (receiver, transferName, deviceId) and updated their context
notes; positional output is unchanged so .xcstrings (bar the 4 comments)
and the Android XML regenerate identical.

Migration: every key-carrying value flipped to String.LocalizationValue
end to end, resolved only at the leaf. Zero key literals and zero
LocalizedStringKey remain in app or test code. macOS build passes; iOS
test run pending.
This commit is contained in:
Cédric
2026-07-23 17:12:43 +02:00
parent 5939489432
commit ef42875ddb
28 changed files with 4465 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apple/VniDrop/UI/Feedback/UiMessage.swift
View File

@@ -4,14 +4,14 @@ import Combine
/// A localizable UI string: either a catalog key or dynamic text, ported from
/// `UiText` in `ui/feedback/UiMessageController.kt`.
enum UiText: Equatable {
case resource(String) // Localizable.xcstrings key
case resource(String.LocalizationValue) // Localizable.xcstrings key (use L10n.*)
case dynamic(String)
/// Resolves to display text. Keys go through the string catalog.
func resolved() -> String {
switch self {
case .dynamic(let value): return value
case .resource(let key): return String(localized: String.LocalizationValue(key))
case .resource(let value): return String(localized: value)
}
}
}

60
apple/VniDrop/UI/Feedback/UserFacingError.swift
View File

@@ -8,34 +8,34 @@ extension Error {
if let vni = self as? VnidropError {
switch vni {
case .Ticket:
return .resource("error_invalid_ticket")
return .resource(L10n.Error.invalidTicket)
case .Permission:
return .resource("error_permission")
return .resource(L10n.Error.permission)
case .Filesystem:
return .resource("error_filesystem")
return .resource(L10n.Error.filesystem)
case .FilesystemPermission:
return .resource("error_filesystem")
return .resource(L10n.Error.filesystem)
case .DestinationExists:
return .resource("error_destination_exists")
return .resource(L10n.Error.destinationExists)
case .StorageFull:
return .resource("error_storage_full")
return .resource(L10n.Error.storageFull)
case .Network:
return .resource("error_network")
return .resource(L10n.Error.network)
case .Transfer(let reason):
return transferUiText(reason)
case .Repository:
return .resource("error_repository")
return .resource(L10n.Error.repository)
case .Cancelled:
return .resource("error_generic")
return .resource(L10n.Error.generic)
case .InvalidInput:
return .resource("error_invalid_input")
return .resource(L10n.Error.invalidInput)
case .Initialization(let reason):
return initializationUiText(reason)
case .Internal(let reason):
return reasonHints(reason) ?? .resource("error_generic")
return reasonHints(reason) ?? .resource(L10n.Error.generic)
}
}
return reasonHints(technicalDetail) ?? .resource("error_generic")
return reasonHints(technicalDetail) ?? .resource(L10n.Error.generic)
}
/// True when the user intentionally backed out of a flow.
@@ -79,20 +79,20 @@ extension Error {
private func transferUiText(_ reason: String) -> UiText {
let detail = reason.lowercased()
if detail.contains("refused") || detail.contains("denied") || detail.contains("not approved") {
return .resource("error_permission")
return .resource(L10n.Error.permission)
}
return .resource("error_transfer")
return .resource(L10n.Error.transfer)
}
private func initializationUiText(_ reason: String) -> UiText {
let detail = reason.lowercased()
if detail.contains("native") && detail.contains("library") {
return .resource("error_missing_native_library")
return .resource(L10n.Error.missingNativeLibrary)
}
if detail.contains("socket") || detail.contains("bind") {
return .resource("error_socket_bind")
return .resource(L10n.Error.socketBind)
}
return .resource("error_initialization")
return .resource(L10n.Error.initialization)
}
private func reasonHints(_ detailRaw: String) -> UiText? {
@@ -100,50 +100,50 @@ private func reasonHints(_ detailRaw: String) -> UiText? {
if detail.isEmpty { return nil }
if detail.contains("still starting") || detail.contains("starting up") {
return .resource("error_starting_up")
return .resource(L10n.Error.startingUp)
}
if detail.contains("empty") && (detail.contains("invitation") || detail.contains("ticket") || detail.contains("qr")) {
return .resource("error_invitation_empty")
return .resource(L10n.Error.invitationEmpty)
}
if detail.contains("select at least one") || detail.contains("no files found") {
return .resource("error_share_empty")
return .resource(L10n.Error.shareEmpty)
}
if detail.contains("camera") {
return .resource("error_camera")
return .resource(L10n.Error.camera)
}
if detail.contains("nfc") || detail.contains("ndef")
|| (detail.contains("read-only") && detail.contains("tag"))
|| detail.contains("tag is too small") || detail.contains("no nfc tag") {
return .resource("error_nfc")
return .resource(L10n.Error.nfc)
}
if detail.contains("native") && detail.contains("library") {
return .resource("error_missing_native_library")
return .resource(L10n.Error.missingNativeLibrary)
}
if detail.contains("socket") || detail.contains("bind") {
return .resource("error_socket_bind")
return .resource(L10n.Error.socketBind)
}
if detail.contains("device information") || detail.contains("device info") {
return .resource("error_device_info")
return .resource(L10n.Error.deviceInfo)
}
if detail.contains("refused") || detail.contains("denied") || detail.contains("permission")
|| detail.contains("not approved") || detail.contains("waiting for approval") {
return .resource("error_permission")
return .resource(L10n.Error.permission)
}
if detail.contains("invalid ticket") || detail.contains("ticket error")
|| detail.contains("could not be read") || detail.contains("malformed")
|| detail.contains("invitation could not be opened") {
return .resource("error_invalid_ticket")
return .resource(L10n.Error.invalidTicket)
}
if detail.contains("selected")
&& (detail.contains("file") || detail.contains("folder") || detail.contains("document") || detail.contains("open")) {
return .resource("error_selection_failed")
return .resource(L10n.Error.selectionFailed)
}
if detail.contains("could not open the selected") || detail.contains("could not open selected") {
return .resource("error_selection_failed")
return .resource(L10n.Error.selectionFailed)
}
if detail.contains("document picker") || detail.contains("folder picker") || detail.contains("file descriptor")
|| detail.contains("view controller") {
return .resource("error_selection_failed")
return .resource(L10n.Error.selectionFailed)
}
return nil
}