From 3b29799e70f08c5a1f3f0438e998a3185fddcea3 Mon Sep 17 00:00:00 2001
From: Kenta Kubo <601636+kkebo@users.noreply.github.com>
Date: Mon, 5 May 2025 01:19:22 +0900
Subject: [PATCH] fix: refine layout of the bottom bar on the sidebar

---
 DNSecure/Views/ContentView.swift | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/DNSecure/Views/ContentView.swift b/DNSecure/Views/ContentView.swift
index 55c5c9a..2077087 100644
--- a/DNSecure/Views/ContentView.swift
+++ b/DNSecure/Views/ContentView.swift
@@ -310,21 +310,21 @@ extension ContentView: View {
             EditButton()
         }
         ToolbarItem(placement: .status) {
-            VStack {
+            VStack(spacing: 0) {
                 HStack {
                     Circle()
                         .frame(width: 10, height: 10)
                         .foregroundStyle(self.isEnabled ? .green : .secondary)
                     Text(self.isEnabled ? "Active" : "Inactive")
-                    #if targetEnvironment(macCatalyst)
-                        Text("-")
-                        Button("Refresh", action: self.updateStatus)
-                    #endif
                 }
                 if !self.isEnabled {
-                    Button("How to Activate") {
+                    Button {
                         self.guideIsPresented = true
+                    } label: {
+                        Label("How to Activate", systemImage: "questionmark.circle")
                     }
+                    .labelStyle(.titleAndIcon)
+                    .font(.caption)
                     .sheet(isPresented: self.$guideIsPresented) {
                         NavigationView {
                             HowToActivateView()
@@ -345,6 +345,14 @@ extension ContentView: View {
                 }
             }
         }
+        #if targetEnvironment(macCatalyst)
+            ToolbarItemGroup(placement: .bottomBar) {
+                Spacer()
+                Button(action: self.updateStatus) {
+                    Label("Refresh", systemImage: "arrow.clockwise")
+                }
+            }
+        #endif
     }
 
     private func sidebarRow(at i: Int) -> some View {