Merge pull request #175 from makinosp/develop

Develop

Author: makinosp

README.md

@@ -3,32 +3,43 @@
 
 [![License](https://img.shields.io/github/license/makinosp/harmonie.svg)](https://img.shields.io/github/license/makinosp/harmonie.svg)
 [![Release](https://img.shields.io/github/release/makinosp/harmonie.svg)](https://img.shields.io/github/release/makinosp/harmonie.svg)
-![Swift](https://img.shields.io/badge/Swift%205.9+-F05138?logo=Swift&logoColor=white)
+![Swift](https://img.shields.io/badge/Swift%206.0+-F05138?logo=Swift&logoColor=white)
 ![Platform](https://img.shields.io/badge/platforms-iOS%2017.0%2b%20%7C%20iPadOS%2017.0%2b-lightgrey.svg)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/24e487375b114c83ae937e4e93f3a5c3)](https://app.codacy.com/gh/makinosp/harmonie/dashboard)
 
 <div align="center">
     <a href="https://github.com/makinosp/harmonie">
         <img
-        src="https://github.com/user-attachments/assets/fbc45e79-1822-4eb8-9098-6bed772409a8"
-        height="240"
+        src="https://github.com/user-attachments/assets/161ede10-b0bf-4796-966b-be1727f5fbc1"
+        height="128"
         alt="Harmonie Icon"
         >
     </a>
-    <p>A native iOS app for VRChat API made with SwiftUI</p>
+    <p>Unofficial VRChat Social Navigator for iOS</p>
 </div>
 
 ## Description
 
-This is a native iOS application developed entirely with Swift. The app allows users to manage friends, view friends' locations, and organize favorites, offering a seamless and efficient user experience.
+This is an unofficial VRChat social navigator application for iOS, built entirely with Swift/SwiftUI for a smooth and native experience.
+The app allows users to manage friends, view friends' locations, and organize favorites. Please note that this app is not affiliated with or endorsed by VRChat.
 
 ## Features
 
-### Locations
+### Location Tracking
 
-### Friends
+The location tracking feature lets users can see which VRChat worlds their friends are visiting. This allows users to stay informed about their friends’ activities and helps them discover new places to explore together within the VRChat environment.
 
-### Favorites
+### Friend Management
+
+The friend management feature lets users can view their friends’ online status and see where they are currently located in the VRChat universe. This feature helps users stay connected and engaged with their friends.
+
+### Favorites Management
+
+The favorites management feature lets users organize and access their preferred worlds and friends quickly. Users can easily add, remove, or browse their favorites.
+
+## System Requirements
+
+This app is compatible with iOS 17 or iPadOS 17 or later. It can run on iPhone and iPad models that support these operating systems. In addition, this app can run as an iPad app on a Mac with Apple silicon.
 
 ## License
 

harmonie/Components/ExternalLink.swift

@@ -0,0 +1,40 @@
+//
+//  ExternalLink.swift
+//  Harmonie
+//
+//  Created by makinosp on 2024/10/26.
+//
+
+import MemberwiseInit
+import SwiftUI
+
+@MemberwiseInit
+struct ExternalLink {
+    @State private var isPresentedAlert = false
+    @Init(.internal) private let title: String
+    @Init(.internal) private let url: URL
+    @Init(.internal) private let systemImage: String
+}
+
+extension ExternalLink: View {
+    var body: some View {
+        Button {
+            isPresentedAlert.toggle()
+        } label: {
+            LabeledContent {
+                IconSet.linkExternal.icon
+                    .imageScale(.small)
+                    .foregroundStyle(Color(.tertiaryLabel))
+            } label: {
+                Label(title, systemImage: systemImage)
+                    .lineLimit(1)
+            }
+        }
+        .alert("Opening URL", isPresented: $isPresentedAlert) {
+            Button("Cancel", role: .cancel) {}
+            Link("OK", destination: url)
+        } message: {
+            Text(verbatim: url.absoluteString)
+        }
+    }
+}

harmonie/Localization/Localizable.xcstrings

@@ -1284,16 +1284,6 @@
         }
       }
     },
-    "The URL below will be opened" : {
-      "localizations" : {
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "下記のURLを開きます"
-          }
-        }
-      }
-    },
     "Third Party Licence" : {
       "localizations" : {
         "ja" : {

harmonie/Views/Setting/AboutSection.swift

@@ -9,7 +9,6 @@ import SwiftUI
 
 extension SettingsView {
     struct AboutSection: View {
-        @State private var isPresentedAlert = false
         var body: some View {
             Section("About This App") {
                 NavigationLabel {
@@ -20,27 +19,12 @@ extension SettingsView {
                     }
                 }
                 .tag(SettingsDestination.about)
-                if let sourceCodeUrl = URL(string: "https://github.com/makinosp/harmonie") {
-                    Button {
-                        isPresentedAlert.toggle()
-                    } label: {
-                        LabeledContent {
-                            IconSet.linkExternal.icon
-                                .imageScale(.small)
-                                .foregroundStyle(Color(.tertiaryLabel))
-                        } label: {
-                            Label("Source Code", systemImage: IconSet.code.systemName)
-                        }
-                    }
-                    .alert("Opening URL", isPresented: $isPresentedAlert) {
-                        Button("Cancel", role: .cancel) {}
-                        Link("OK", destination: sourceCodeUrl)
-                    } message: {
-                        VStack {
-                            Text("The URL below will be opened")
-                            Text(sourceCodeUrl.absoluteString)
-                        }
-                    }
+                if let url = URL(string: "https://github.com/makinosp/harmonie") {
+                    ExternalLink(
+                        title: String(localized: "Source Code"),
+                        url: url,
+                        systemImage: IconSet.code.systemName
+                    )
                 }
                 NavigationLabel {
                     Label {

harmonie/Views/UserDetail/UserDetailView+SocialLinksSection.swift

@@ -12,22 +12,11 @@ extension UserDetailView {
     func socialLinksSection(_ urls: [URL]) -> some View {
         GroupBox("Social Links") {
             DividedVStack(alignment: .leading) {
-                ForEach(urls) { url in socialLink(url) }
+                ForEach(urls) { url in
+                    ExternalLink(title: url.description, url: url, systemImage: IconSet.link.systemName)
+                }
             }
         }
         .groupBoxStyle(.card)
     }
-
-    private func socialLink(_ url: URL) -> Link<some View> {
-        Link(destination: url) {
-            LabeledContent {
-                IconSet.linkExternal.icon
-                    .imageScale(.small)
-                    .foregroundStyle(Color(.tertiaryLabel))
-            } label: {
-                Label(url.description, systemImage: IconSet.link.systemName)
-                    .lineLimit(1)
-            }
-        }
-    }
 }