meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Additional map form consistancy cleanup

Browse source
This commit is contained in:
Garth Vander Houwen 2025-07-28 09:33:04 -07:00
parent 5b1061503d
commit 0e65ef68b2
4 changed files with 6 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Localizable.xcstrings
View file

@ -1391,40 +1391,6 @@
}
}
},
"%lld overlays" : {
"localizations" : {
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "%lld sovrapposizioni"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "%lldオーバーレイ"
}
},
"sr" : {
"stringUnit" : {
"state" : "translated",
"value" : "%lld slojeva"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "%lld覆盖层"
}
},
"zh-Hant-TW" : {
"stringUnit" : {
"state" : "translated",
"value" : "%lld覆蓋層"
}
}
}
},
"%lld Readings Total" : {
"localizations" : {
"it" : {
@ -1589,9 +1555,6 @@
}
}
},
"•" : {
"shouldTranslate" : false
},
"• %@" : {
"shouldTranslate" : false
},

2
Meshtastic.xcodeproj/project.pbxproj
View file

@ -807,7 +807,6 @@
DDD6EEAE29BC024700383354 /* Firmware.swift */,
DD33DB612B3D27C7003E1EA0 /* FirmwareApi.swift */,
DD1B8F3F2B35E2F10022AABC /* GPSStatus.swift */,
3D3417D32E2DC293006A988B /* MapDataFiles.swift */,
DDAB580C2B0DAA9E00147258 /* Routes.swift */,
DDE9659B2B1C3B6A00531070 /* RouteRecorder.swift */,
DD86D40B287F401000BAEB7A /* SaveChannelQRCode.swift */,
@ -961,6 +960,7 @@
isa = PBXGroup;
children = (
DDDC22362BA9232C002C44F1 /* MapContent */,
3D3417D32E2DC293006A988B /* MapDataFiles.swift */,
DD94B73F2ACCE3BE00DCD1D1 /* MapSettingsForm.swift */,
DDB6CCFA2AAF805100945AF6 /* NodeMapSwiftUI.swift */,
DD13AA482AB73BF400BA0C98 /* PositionPopover.swift */,

7
Meshtastic/Helpers/MapDataManager.swift
View file

@ -415,13 +415,6 @@ struct MapDataMetadata: Codable, Identifiable {
formatter.countStyle = .file
return formatter.string(fromByteCount: fileSize)
}
var uploadDateString: String {
let formatter = DateFormatter()
formatter.dateStyle = .medium
formatter.timeStyle = .short
return formatter.string(from: uploadDate)
}
}
/// Errors that can occur during map data operations

15
Meshtastic/Views/Settings/MapDataFiles.swift → Meshtastic/Views/Nodes/Helpers/Map/MapDataFiles.swift
View file

@ -179,6 +179,9 @@ struct MapDataFileRow: View {
.lineLimit(1)
Spacer()
Text(file.fileSizeString)
.font(.caption)
.foregroundColor(.secondary)
Button(action: onDelete) {
Image(systemName: "trash")
.foregroundColor(.red)
@ -196,19 +199,11 @@ struct MapDataFileRow: View {
.background(Color.secondary.opacity(0.2))
.cornerRadius(4)
Text(file.fileSizeString)
.font(.caption)
.foregroundColor(.secondary)
Text("•")
.font(.caption)
.foregroundColor(.secondary)
Text("\(file.overlayCount) overlays")
Text("\(file.overlayCount) \(file.overlayCount > 1 ? "features".localized : "feature".localized)")
.font(.caption)
.foregroundColor(.secondary)
Spacer()
Text(file.uploadDateString)
Text(file.uploadDate.formatted())
.font(.caption)
.foregroundColor(.secondary)
}