Merge pull request #538 from synonymdev/feat/os-widgets

feat: OS widgets foundation + price widget

Author: jvsena42

.gitignore

@@ -25,3 +25,4 @@ buildServer.json
 .ai/
 .codex/
 .claude/*.local*
+.claude/scheduled_tasks.lock

Bitkit.xcodeproj/project.pbxproj

@@ -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/AppScene.swift

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "bitcoin-symbol.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Bitkit/Assets.xcassets/icons/bitcoin-symbol.imageset/Contents.json

@@ -85,7 +85,6 @@ struct BaseWidget<Content: View>: View {
     @EnvironmentObject private var navigation: NavigationViewModel
     @EnvironmentObject private var widgets: WidgetsViewModel
     @EnvironmentObject private var currency: CurrencyViewModel
-    @EnvironmentObject private var settings: SettingsViewModel
 
     /// Widget metadata computed from type
     private var metadata: WidgetMetadata {
@@ -127,7 +126,7 @@ struct BaseWidget<Content: View>: View {
     var body: some View {
         Button {} label: {
             VStack(spacing: 0) {
-                if type == .suggestions ? isEditing : (settings.showWidgetTitles || isEditing) {
+                if isEditing {
                     HStack {
                         HStack(spacing: 16) {
                             Image(metadata.icon)
@@ -185,12 +184,6 @@ struct BaseWidget<Content: View>: View {
                             }
                         }
                     }
-
-                    // Add spacer only when showing title and not editing
-                    if settings.showWidgetTitles && !isEditing {
-                        Spacer()
-                            .frame(height: 16)
-                    }
                 }
 
                 // Widget content (only shown when not editing)

Bitkit/Assets.xcassets/icons/bitcoin-symbol.imageset/bitcoin-symbol.pdf

@@ -1,34 +1,16 @@
 import SwiftUI
 
-/// Options for configuring the BlocksWidget
-struct BlocksWidgetOptions: Codable, Equatable {
-    var height: Bool = true
-    var time: Bool = true
-    var date: Bool = true
-    var transactionCount: Bool = false
-    var size: Bool = false
-    var weight: Bool = false
-    var difficulty: Bool = false
-    var hash: Bool = false
-    var merkleRoot: Bool = false
-    var showSource: Bool = false
-}
+// MARK: - Widget
 
-/// A widget that displays Bitcoin block information
+/// In-app Bitcoin Blocks widget (v61). Renders the wide layout — used inside the home feed
+/// and the wide carousel page on the preview screen.
 struct BlocksWidget: View {
-    /// Configuration options for the widget
     var options: BlocksWidgetOptions = .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 block data
     @StateObject private var viewModel = BlocksViewModel.shared
 
-    /// Initialize the widget
     init(
         options: BlocksWidgetOptions = BlocksWidgetOptions(),
         isEditing: Bool = false,
@@ -39,96 +21,29 @@ struct BlocksWidget: View {
         self.onEditingEnd = onEditingEnd
     }
 
-    /// Mapping of block data keys to display labels
-    private let blocksMapping: [String: String] = [
-        "height": "Block",
-        "time": "Time",
-        "date": "Date",
-        "transactionCount": "Transactions",
-        "size": "Size",
-        "weight": "Weight",
-        "difficulty": "Difficulty",
-        "hash": "Hash",
-        "merkleRoot": "Merkle Root",
-    ]
-
     var body: some View {
         BaseWidget(
             type: .blocks,
             isEditing: isEditing,
             onEditingEnd: onEditingEnd
         ) {
-            VStack(spacing: 0) {
-                if viewModel.isLoading {
-                    WidgetContentBuilder.loadingView()
-                } else if viewModel.error != nil {
-                    WidgetContentBuilder.errorView(t("widgets__blocks__error"))
-                } else if let data = viewModel.blockData {
-                    VStack(spacing: 0) {
-                        // Display block data rows based on options
-                        ForEach(getDisplayableData(data), id: \.key) { item in
-                            HStack(spacing: 0) {
-                                HStack {
-                                    BodySSBText(item.label, textColor: .textSecondary)
-                                        .lineLimit(1)
-                                }
-                                .frame(maxWidth: .infinity, alignment: .leading)
-
-                                HStack {
-                                    BodyMSBText(item.value)
-                                        .lineLimit(1)
-                                        .truncationMode(.middle)
-                                }
-                                .frame(maxWidth: .infinity, alignment: .trailing)
-                            }
-                            .frame(minHeight: 28)
-                        }
-
-                        if options.showSource {
-                            WidgetContentBuilder.sourceRow(source: "mempool.space")
-                        }
-                    }
-                }
-            }
+            content
         }
-        .onAppear {
+        .task {
             viewModel.startUpdates()
         }
     }
 
-    /// Get displayable data based on current options
-    private func getDisplayableData(_ data: BlockData) -> [(key: String, label: String, value: String)] {
-        var items: [(key: String, label: String, value: String)] = []
-
-        if options.height {
-            items.append((key: "height", label: blocksMapping["height"]!, value: data.height))
-        }
-        if options.time {
-            items.append((key: "time", label: blocksMapping["time"]!, value: data.time))
+    @ViewBuilder
+    private var content: some View {
+        if viewModel.isLoading && viewModel.blockData == nil {
+            WidgetContentBuilder.loadingView()
+        } else if viewModel.error != nil && viewModel.blockData == nil {
+            WidgetContentBuilder.errorView(t("widgets__blocks__error"))
+        } else if let data = viewModel.blockData {
+            BlocksWidgetWideContent(data: data, options: options)
+                .frame(height: BlocksWidgetWideContent.inAppContentHeight)
         }
-        if options.date {
-            items.append((key: "date", label: blocksMapping["date"]!, value: data.date))
-        }
-        if options.transactionCount {
-            items.append((key: "transactionCount", label: blocksMapping["transactionCount"]!, value: data.transactionCount))
-        }
-        if options.size {
-            items.append((key: "size", label: blocksMapping["size"]!, value: data.size))
-        }
-        if options.weight {
-            items.append((key: "weight", label: blocksMapping["weight"]!, value: data.weight))
-        }
-        if options.difficulty {
-            items.append((key: "difficulty", label: blocksMapping["difficulty"]!, value: data.difficulty))
-        }
-        if options.hash {
-            items.append((key: "hash", label: blocksMapping["hash"]!, value: data.hash))
-        }
-        if options.merkleRoot {
-            items.append((key: "merkleRoot", label: blocksMapping["merkleRoot"]!, value: data.merkleRoot))
-        }
-
-        return items
     }
 }
 

Bitkit/Components/Widgets/BaseWidget.swift

@@ -0,0 +1,95 @@
+import SwiftUI
+import WidgetKit
+
+// Shared Bitcoin Blocks widget content, reused by the in-app feed, the carousel preview, and the
+// home-screen WidgetKit extension. Colors adapt to `widgetRenderingMode` via ``WidgetPalette``.
+
+// MARK: - Wide layout (in-app + 343-wide carousel page + .systemMedium / .systemLarge OS widget)
+
+struct BlocksWidgetWideContent: View {
+    static let inAppContentHeight: CGFloat = 124
+
+    let data: CachedBlock
+    let options: BlocksWidgetOptions
+
+    @Environment(\.widgetRenderingMode) private var renderingMode
+
+    var body: some View {
+        let palette = WidgetPalette(renderingMode: renderingMode)
+        VStack(alignment: .leading, spacing: 0) {
+            ForEach(Array(options.enabledFields.enumerated()), id: \.element) { index, field in
+                if index > 0 {
+                    Spacer(minLength: 8)
+                }
+                BlocksWidgetWideRow(field: field, value: field.value(from: data), palette: palette)
+            }
+        }
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
+    }
+}
+
+private struct BlocksWidgetWideRow: View {
+    let field: BlocksWidgetField
+    let value: String
+    let palette: WidgetPalette
+
+    var body: some View {
+        HStack(alignment: .center, spacing: 8) {
+            BlocksWidgetIcon(field: field, palette: palette)
+
+            BodyMText(field.label, textColor: palette.label)
+                .lineLimit(1)
+                .frame(maxWidth: .infinity, alignment: .leading)
+
+            BodyMSBText(value, textColor: palette.title)
+                .lineLimit(1)
+                .truncationMode(.middle)
+                .widgetAccentable()
+        }
+    }
+}
+
+// MARK: - Compact layout (small carousel preview + .systemSmall OS widget)
+
+struct BlocksWidgetCompactContent: View {
+    let data: CachedBlock
+    let options: BlocksWidgetOptions
+
+    @Environment(\.widgetRenderingMode) private var renderingMode
+
+    var body: some View {
+        let palette = WidgetPalette(renderingMode: renderingMode)
+        VStack(alignment: .leading, spacing: 0) {
+            ForEach(Array(options.enabledFields.enumerated()), id: \.element) { index, field in
+                if index > 0 {
+                    Spacer(minLength: 8)
+                }
+                HStack(alignment: .center, spacing: 8) {
+                    BlocksWidgetIcon(field: field, palette: palette)
+
+                    BodySSBText(field.value(from: data), textColor: palette.title)
+                        .lineLimit(1)
+                        .truncationMode(.middle)
+                        .widgetAccentable()
+                }
+            }
+        }
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
+    }
+}
+
+// MARK: - Shared row icon
+
+private struct BlocksWidgetIcon: View {
+    let field: BlocksWidgetField
+    let palette: WidgetPalette
+
+    var body: some View {
+        Image(field.iconName)
+            .resizable()
+            .renderingMode(.template)
+            .foregroundColor(palette.accent)
+            .frame(width: 20, height: 20)
+            .widgetAccentable()
+    }
+}

Bitkit/Components/Widgets/BlocksWidget.swift

@@ -1,77 +1,34 @@
 import SwiftUI
 
-/// Options for configuring the FactsWidget
-struct FactsWidgetOptions: Codable, Equatable {
-    var showSource: Bool = true
-}
-
 struct FactsWidget: View {
-    /// Configuration options for the widget
-    var options: FactsWidgetOptions = .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 facts data
     @StateObject private var viewModel = FactsViewModel.shared
 
-    /// Initialize the widget
     init(
-        options: FactsWidgetOptions = FactsWidgetOptions(),
         isEditing: Bool = false,
         onEditingEnd: (() -> Void)? = nil
     ) {
-        self.options = options
         self.isEditing = isEditing
         self.onEditingEnd = onEditingEnd
     }
 
-    /// Initialize with a custom view model (for previews)
-    init(
-        viewModel: FactsViewModel,
-        options: FactsWidgetOptions = FactsWidgetOptions(),
-        isEditing: Bool = false,
-        onEditingEnd: (() -> Void)? = nil
-    ) {
-        self.options = options
-        self.isEditing = isEditing
-        self.onEditingEnd = onEditingEnd
-        _viewModel = StateObject(wrappedValue: viewModel)
-    }
-
     var body: some View {
         BaseWidget(
             type: .facts,
             isEditing: isEditing,
             onEditingEnd: onEditingEnd
         ) {
-            VStack(spacing: 0) {
-                TitleText(viewModel.fact)
-                    .lineLimit(2)
-                    .frame(maxWidth: .infinity, alignment: .leading)
-
-                if options.showSource {
-                    WidgetContentBuilder.sourceRow(source: "synonym.to")
-                }
-            }
+            FactsWidgetWideContent(fact: viewModel.fact)
         }
     }
 }
 
 #Preview {
     VStack(spacing: 16) {
         FactsWidget()
-
-        FactsWidget(
-            options: FactsWidgetOptions(showSource: false)
-        )
-
-        FactsWidget(
-            isEditing: true
-        )
+        FactsWidget(isEditing: true)
     }
     .padding()
     .background(Color.black)