feat: weather widget v61 + OS widget

Bitkit.xcodeproj/project.pbxproj

@@ -190,6 +190,7 @@
 				Fonts/InterTight-Regular.ttf,
 				Constants/WidgetEnv.swift,
 				Fonts/InterTight-SemiBold.ttf,
+				Components/Widgets/WeatherWidgetContent.swift,
 				Models/BlocksWidgetData.swift,
 				Models/BlocksWidgetFields.swift,
 				Models/BlocksWidgetOptions.swift,
@@ -198,12 +199,17 @@
 				Models/NewsWidgetOptions.swift,
 				Models/PriceWidgetData.swift,
 				Models/PriceWidgetOptions.swift,
+				Models/WeatherWidgetData.swift,
+				Models/WeatherWidgetOptions.swift,
 				Services/Widgets/BlocksHomeScreenWidgetOptionsStore.swift,
+				Services/Widgets/MempoolWeatherAPI.swift,
 				Services/Widgets/NewsHomeScreenWidgetOptionsStore.swift,
 				Services/Widgets/PriceHomeScreenWidgetOptionsStore.swift,
+				Services/Widgets/WeatherHomeScreenWidgetOptionsStore.swift,
 				Styles/Colors.swift,
 				Styles/Fonts.swift,
 				Styles/TextStyle.swift,
+				Utilities/LocalizeHelpers.swift,
 			);
 			target = 4A319B4E2E8F24F2002B9AC9 /* BitkitWidgetExtension */;
 		};

Bitkit/AppScene.swift

@@ -27,6 +27,7 @@ struct AppScene: View {
     @StateObject private var transferTracking: TransferTrackingManager
     @StateObject private var channelDetails = ChannelDetailsViewModel.shared
     @StateObject private var migrations = MigrationsService.shared
+    @StateObject private var languageManager = LanguageManager.shared
     @StateObject private var pubkyProfile = PubkyProfileManager()
     @StateObject private var contactsManager = ContactsManager()
     @State private var keyboardManager = KeyboardManager()

Bitkit/Components/Widgets/WeatherWidget.swift

@@ -1,78 +1,13 @@
 import SwiftUI
 
-/// Options for configuring the WeatherWidget
-struct WeatherWidgetOptions: Codable, Equatable {
-    var showStatus: Bool = true
-    var showText: Bool = true
-    var showMedian: Bool = true
-    var showNextBlockFee: Bool = true
-}
-
-/// Fee condition enum matching the React Native implementation
-enum FeeCondition: String, Codable {
-    case good
-    case average
-    case poor
-
-    var title: String {
-        switch self {
-        case .good:
-            return t("widgets__weather__condition__good__title")
-        case .average:
-            return t("widgets__weather__condition__average__title")
-        case .poor:
-            return t("widgets__weather__condition__poor__title")
-        }
-    }
-
-    var description: String {
-        switch self {
-        case .good:
-            return t("widgets__weather__condition__good__description")
-        case .average:
-            return t("widgets__weather__condition__average__description")
-        case .poor:
-            return t("widgets__weather__condition__poor__description")
-        }
-    }
-
-    var icon: String {
-        switch self {
-        case .good:
-            return "☀️"
-        case .average:
-            return "⛅"
-        case .poor:
-            return "⛈️"
-        }
-    }
-}
-
-/// Weather widget data model
-struct WeatherData: Codable {
-    let condition: FeeCondition
-    let currentFee: String
-    let nextBlockFee: Int
-}
-
-/// A widget that displays Bitcoin fee weather information
 struct WeatherWidget: View {
-    /// Configuration options for the widget
     var options: WeatherWidgetOptions = .init()
-
-    /// Flag indicating if the widget is in editing mode
     var isEditing: Bool = false
-
-    /// Callback to signal when editing should end
     var onEditingEnd: (() -> Void)?
 
-    /// View model for handling weather data
     @StateObject private var viewModel = WeatherViewModel.shared
-
-    /// Currency view model for currency conversion
     @EnvironmentObject private var currency: CurrencyViewModel
 
-    /// Initialize the widget
     init(
         options: WeatherWidgetOptions = WeatherWidgetOptions(),
         isEditing: Bool = false,
@@ -89,96 +24,29 @@ struct WeatherWidget: View {
             isEditing: isEditing,
             onEditingEnd: onEditingEnd
         ) {
-            VStack(spacing: 0) {
-                if viewModel.isLoading {
-                    WidgetContentBuilder.loadingView()
-                } else if viewModel.error != nil {
-                    WidgetContentBuilder.errorView(t("widgets__weather__error"))
-                } else if let data = viewModel.weatherData {
-                    VStack(spacing: 16) {
-                        // Status condition with icon
-                        if options.showStatus {
-                            HStack(spacing: 16) {
-                                WeatherTitleText(data.condition.title)
-                                    .fixedSize(horizontal: false, vertical: true)
-                                    .frame(maxWidth: .infinity, alignment: .leading)
-
-                                Text(data.condition.icon)
-                                    .font(.system(size: 52))
-                                    .frame(width: 52, height: 52)
-                            }
-                        }
-
-                        // Description text
-                        if options.showText {
-                            BodyMText(data.condition.description, textColor: .textPrimary)
-                                .frame(maxWidth: .infinity, alignment: .leading)
-                        }
-
-                        // Fee information rows
-                        if options.showMedian || options.showNextBlockFee {
-                            VStack(spacing: 8) {
-                                if options.showMedian {
-                                    HStack(spacing: 0) {
-                                        HStack {
-                                            BodySSBText(t("widgets__weather__current_fee"), textColor: .textSecondary)
-                                                .lineLimit(1)
-                                        }
-                                        .frame(maxWidth: .infinity, alignment: .leading)
-
-                                        HStack {
-                                            BodySSBText(data.currentFee)
-                                                .lineLimit(1)
-                                        }
-                                        .frame(maxWidth: .infinity, alignment: .trailing)
-                                    }
-                                    .frame(minHeight: 20)
-                                }
-
-                                if options.showNextBlockFee {
-                                    HStack(spacing: 0) {
-                                        HStack {
-                                            BodySSBText(t("widgets__weather__next_block"), textColor: .textSecondary)
-                                                .lineLimit(1)
-                                        }
-                                        .frame(maxWidth: .infinity, alignment: .leading)
-
-                                        HStack {
-                                            BodySSBText("\(data.nextBlockFee) ₿/vByte")
-                                                .lineLimit(1)
-                                        }
-                                        .frame(maxWidth: .infinity, alignment: .trailing)
-                                    }
-                                    .frame(minHeight: 20)
-                                }
-                            }
-                        }
-                    }
-                }
-            }
+            content
         }
-        .onAppear {
-            // Inject currency dependency into view model
+        .task {
             viewModel.setCurrencyViewModel(currency)
-            // Start data updates
             viewModel.startUpdates()
         }
     }
-}
 
-struct WeatherTitleText: View {
-    let text: String
-
-    init(_ text: String) {
-        self.text = text
-    }
-
-    var body: some View {
-        Text(text)
-            .font(Fonts.bold(size: 22))
-            .foregroundColor(.textPrimary)
-            .kerning(0)
-            .environment(\._lineHeightMultiple, 0.85)
+    @ViewBuilder
+    private var content: some View {
+        if viewModel.isLoading && viewModel.weatherData == nil {
+            WidgetContentBuilder.loadingView()
+        } else if viewModel.error != nil && viewModel.weatherData == nil {
+            WidgetContentBuilder.errorView(t("widgets__weather__error"))
+        } else if let data = viewModel.weatherData {
+            WeatherWidgetWideContent(
+                data: data,
+                metric: options.selectedMetric,
+                conditionTitle: t(data.condition.titleKey),
+                conditionDescription: t(data.condition.descriptionKey),
+                metricLabel: t(options.selectedMetric.labelKey)
+            )
+        }
     }
 }
 

Bitkit/Components/Widgets/WeatherWidgetContent.swift

@@ -0,0 +1,138 @@
+import SwiftUI
+import WidgetKit
+
+// MARK: - Display metric helpers
+
+extension WeatherDisplayMetric {
+    var labelKey: String {
+        switch self {
+        case .fiatFee, .satsFee:
+            return "widgets__weather__current_fee"
+        case .nextBlockFee:
+            return "widgets__weather__next_block"
+        }
+    }
+
+    func value(from data: CachedWeather) -> String {
+        switch self {
+        case .fiatFee:
+            return data.currentFeeFiat
+        case .satsFee:
+            return "₿ \(data.currentFeeSats)"
+        case .nextBlockFee:
+            return "\(data.nextBlockFee) ₿/VBYTE"
+        }
+    }
+
+    var fallbackPreviewValue: String {
+        switch self {
+        case .fiatFee: return "$ 0.52"
+        case .satsFee: return "₿ 520"
+        case .nextBlockFee: return "6 ₿/VBYTE"
+        }
+    }
+}
+
+// MARK: - Shared metric block
+
+struct WeatherFeeMetric: View {
+    let label: String
+    let value: String
+    var valueColor: Color = .greenAccent
+    var valueSize: CGFloat = 30
+    /// Use a smaller label (`FootnoteText`) so the caption doesn't dominate the value
+    /// in the space-constrained compact widget.
+    var compactLabel: Bool = false
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 4) {
+            labelView
+            Text(value)
+                .font(Fonts.bold(size: valueSize))
+                .foregroundColor(valueColor)
+                .kerning(-1)
+                .lineLimit(1)
+                .minimumScaleFactor(0.9)
+                .widgetAccentable()
+        }
+    }
+
+    @ViewBuilder
+    private var labelView: some View {
+        if compactLabel {
+            FootnoteText(label, textColor: .white64)
+                .textCase(.uppercase)
+                .lineLimit(1)
+                .minimumScaleFactor(0.7)
+        } else {
+            CaptionMText(label, textColor: .white64)
+                .textCase(.uppercase)
+                .lineLimit(1)
+        }
+    }
+}
+
+struct WeatherWidgetWideContent: View {
+    let data: CachedWeather
+    let metric: WeatherDisplayMetric
+    let conditionTitle: String
+    let conditionDescription: String
+    let metricLabel: String
+
+    var body: some View {
+        HStack(alignment: .top, spacing: 16) {
+            VStack(alignment: .leading, spacing: 16) {
+                VStack(alignment: .leading, spacing: 4) {
+                    SubtitleText(conditionTitle, textColor: .white)
+                    BodySText(conditionDescription, textColor: .white80)
+                        .lineLimit(2)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+
+                WeatherFeeMetric(
+                    label: metricLabel,
+                    value: metric.value(from: data),
+                    valueColor: data.condition.valueColor
+                )
+            }
+            .frame(maxWidth: .infinity, alignment: .leading)
+
+            Text(data.condition.icon)
+                .font(.system(size: 82))
+                .frame(width: 82, height: 82)
+                .widgetAccentable()
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+    }
+}
+
+struct WeatherWidgetCompactContent: View {
+    let data: CachedWeather
+    let metric: WeatherDisplayMetric
+    let conditionTitle: String
+    let metricLabel: String
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 8) {
+            VStack(alignment: .leading) {
+                Text(data.condition.icon)
+                    .font(.system(size: 58))
+                    .minimumScaleFactor(0.85)
+                    .widgetAccentable()
+                SubtitleText(conditionTitle, textColor: .white)
+                    .lineLimit(1)
+                    .minimumScaleFactor(0.6)
+            }
+            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
+
+            WeatherFeeMetric(
+                label: metricLabel,
+                value: metric.value(from: data),
+                valueColor: data.condition.valueColor,
+                valueSize: 28,
+                compactLabel: true
+            )
+        }
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .leading)
+    }
+}

Bitkit/MainNavView.swift

@@ -447,6 +447,8 @@ struct MainNavView: View {
                         BlocksWidgetPreviewView()
                     case .facts:
                         FactsWidgetPreviewView()
+                    case .weather:
+                        WeatherWidgetPreviewView()
                     default:
                         WidgetDetailView(id: widgetType)
                     }