Skip to content

Commit fb090d5

Browse files
committed
Display short version strings by default
1 parent 1a143d8 commit fb090d5

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

FurAffinity/FurAffinityApp.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ struct FurAffinityApp: App {
5858

5959
init() {
6060
let device = UIDevice.current
61-
logger.info("Launched FurAffinity \(Bundle.main.version, privacy: .public) on \(device.systemName, privacy: .public) \(device.systemVersion, privacy: .public), \(buildConfiguration, privacy: .public) build")
61+
logger.info("Launched FurAffinity \(Bundle.main.version.shortDescription, privacy: .public) on \(device.systemName, privacy: .public) \(device.systemVersion, privacy: .public), \(buildConfiguration, privacy: .public) build")
6262
_ = amplitude
6363
logger.info("Amplitude is \(amplitude == nil ? "left uninitialized" : "initialized", privacy: .public)")
6464
}

FurAffinity/Helpers/AppInformation.swift

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import Version
1010

1111
struct Release: Decodable {
1212
let html_url: String
13-
let draft: Bool
14-
let prerelease: Bool
15-
let published_at: String
16-
let tag_name: String
13+
private let draft: Bool
14+
private let prerelease: Bool
15+
private let published_at: String
16+
private let tag_name: String
1717
let name: String
1818
let body: String
1919

@@ -22,6 +22,16 @@ struct Release: Decodable {
2222
}
2323
}
2424

25+
extension Version {
26+
var shortDescription: String {
27+
if patch != 0 {
28+
"\(major).\(minor).\(patch)"
29+
} else {
30+
"\(major).\(minor)"
31+
}
32+
}
33+
}
34+
2535
@MainActor
2636
class AppInformation: ObservableObject {
2737
let currentVersion = Bundle.main.version

FurAffinity/Settings/SettingsView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ struct SettingsView: View {
3030
Link("Website", destination: URL(string: "https://furaffinity.app")!)
3131
Link("Privacy policy", destination: URL(string: "https://github.com/Ceylo/FurAffinityApp/blob/main/Privacy%20Policy.md")!)
3232
Link("Feature request & bug report", destination: URL(string: "https://github.com/Ceylo/FurAffinityApp/issues")!)
33-
Text("Current version: " + model.appInfo.currentVersion.description)
33+
Text("Current version: " + model.appInfo.currentVersion.shortDescription)
3434
Text("Latest available version: "
35-
+ (model.appInfo.latestRelease?.tag_name ?? ""))
35+
+ (model.appInfo.latestRelease?.version.shortDescription ?? ""))
3636

3737
if let latestRelease = model.appInfo.latestRelease,
3838
let isUpToDate = model.appInfo.isUpToDate,

0 commit comments

Comments
 (0)