Refactor UI & Enhance Statistics/Controls for Moshi (#10)

* Improve the layout of the ModelView screen

* Better handling of stats

* Further improvements to the UI

* Default to stats being expanded

Author: coder543

Moshi/ContentView.swift

@@ -26,52 +26,70 @@ enum ModelSelect: String, CaseIterable, Identifiable {
     case helium
 
     var id: Self { return self }
+    
+    var name: String {
+        switch self {
+        case .hibiki:
+            return "Hibiki 1B"
+        default:
+            return rawValue.capitalized
+        }
+    }
+    
+    var description: String {
+        switch self {
+        case .hibiki:
+            return "A French to English simultaneous translation model designed for real-time speech translation."
+        default:
+            return ""
+        }
+    }
 }
 
 struct ContentView: View {
     @State var model = Evaluator()
     @State var selectedModel: ModelSelect = .mimi
     @State var sendToSpeaker = false
     @Environment(DeviceStat.self) private var deviceStat
-    @State private var displayStats = false
-
+    
+    // Currently available models
+    private let availableModels: [ModelSelect] = [.hibiki]
     var body: some View {
-        NavigationSplitView(
-            sidebar: {
-                VStack {
-                List {
-                    ForEach([ModelSelect.hibiki]) { modelType in
-                        NavigationLink(
-                            modelType.rawValue,
-                            destination: {
-                                ModelView(
-                                    model: $model, modelType: modelType, displayStats: $displayStats
+        Group {
+            if availableModels.count == 1 {
+                // Skip navigation if only one model
+                ModelView(
+                    model: $model,
+                    modelType: availableModels[0]
+                )
+            } else {
+                NavigationSplitView(
+                    sidebar: {
+                        VStack {
+                            ForEach(availableModels) { modelType in
+                                NavigationLink(
+                                    modelType.rawValue,
+                                    destination: {
+                                        ModelView(
+                                            model: $model,
+                                            modelType: modelType
+                                        )
+                                    }
                                 )
-                            })
-                    }
-                }
-                Toggle("speaker", isOn: $sendToSpeaker)
-                    .toggleStyle(.button)
-                    .padding()
-                    .onChange(of: sendToSpeaker) { newValue in
-                        if newValue {
-                            setDefaultToSpeaker()
-                        } else {
-                            setDefaultToStd()
+                            }
                         }
+                        .navigationTitle("Available Models")
+                        #if os(iOS)
+                            .navigationBarTitleDisplayMode(.inline)
+                        #endif
+                    },
+                    detail: {
+                        Text("Please choose a model type")
                     }
-                }
-                .navigationTitle("Available Models")
-                #if os(iOS)
-                    .navigationBarTitleDisplayMode(.inline)
-                #endif
-
-            },
-            detail: {
-                Text("Please choose a model type")
-            })
+                )
+            }
+        }
     }
-
 }
 
 #Preview {

Moshi/DeviceStat.swift

@@ -1,13 +1,21 @@
 import Foundation
 import MLX
 
+enum ThermalState: String {
+    case nominal = "Nominal"
+    case fair = "Fair"
+    case serious = "Serious"
+    case critical = "Critical"
+    case unknown = "Unknown"
+}
+
 @Observable
 final class DeviceStat: @unchecked Sendable {
 
     @MainActor
     var gpuUsage = GPU.snapshot()
     @MainActor
-    var thermalState: ProcessInfo.ThermalState = .nominal
+    var thermalState: ThermalState = .nominal
 
     private let initialGPUSnapshot = GPU.snapshot()
     private var timer: Timer?
@@ -27,7 +35,18 @@ final class DeviceStat: @unchecked Sendable {
         let thermalState = ProcessInfo.processInfo.thermalState
         DispatchQueue.main.async { [weak self] in
             self?.gpuUsage = gpuSnapshotDelta
-            self?.thermalState = thermalState
+            switch thermalState {
+                case .nominal:
+                    self?.thermalState = .nominal
+                case .fair:
+                    self?.thermalState = .fair
+                case .serious:
+                    self?.thermalState = .serious
+                case .critical:
+                    self?.thermalState = .critical
+                default:
+                    self?.thermalState = .unknown
+            }
         }
     }