Show instance version

mlemgroup · Jan 14, 2024 · fe8c799 · fe8c799
1 parent 5cf1c2b
commit fe8c799
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Mlem/Models/Content/Instance/InstanceModel.swift b/Mlem/Models/Content/Instance/InstanceModel.swift
@@ -15,6 +15,7 @@ struct InstanceModel {
     var banner: URL?
     var administrators: [UserModel]?
     var url: URL!
+    var version: SiteVersion?
 
     init(from response: SiteResponse) {
         self.update(with: response)
@@ -30,6 +31,7 @@ struct InstanceModel {
             user.isAdmin = true
             return user
         }
+        self.version = SiteVersion(response.version)
         self.update(with: response.siteView.site)
     }
 

diff --git a/Mlem/Views/Shared/Instance/InstanceView.swift b/Mlem/Views/Shared/Instance/InstanceView.swift
@@ -44,6 +44,14 @@ struct InstanceView: View {
         _instance = State(wrappedValue: instance)
     }
 
+    var subtitleText: String {
+        if let version = instance?.version {
+            "\(domainName) • \(String(describing: version))"
+        } else {
+            domainName
+        }
+    }
+
     var body: some View {
         ScrollView {
             ScrollToView(appeared: $scrollToTopAppeared)
@@ -60,10 +68,10 @@ struct InstanceView: View {
                                 .fontWeight(.semibold)
                                 .lineLimit(1)
                                 .minimumScaleFactor(0.01)
-                            Text(domainName)
+
+                            Text(subtitleText)
                                 .font(.footnote)
                                 .foregroundStyle(.secondary)
-                                .padding(.bottom, 5)
                         }
                     } else {
                         Text(domainName)
@@ -73,9 +81,9 @@ struct InstanceView: View {
                             .minimumScaleFactor(0.01)
                             .padding(.bottom, 5)
                         Divider()
-
                     }
                 }
+                .padding(.bottom, 5)
                 if let instance {
                     VStack(spacing: 0) {
                         VStack(spacing: 4) {