feat: v61 in-app widgets (sheets + grid)

Bitkit/Assets.xcassets/icons/arrows-out-cardinal.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "arrows-out-cardinal.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Bitkit/Components/DrawerView.swift

@@ -70,6 +70,8 @@ enum DrawerMenuItem: Int, CaseIterable, Identifiable, Hashable {
 struct DrawerView: View {
     @EnvironmentObject private var app: AppViewModel
     @EnvironmentObject private var navigation: NavigationViewModel
+    @EnvironmentObject private var settings: SettingsViewModel
+    @EnvironmentObject private var sheets: SheetViewModel
     @EnvironmentObject private var wallet: WalletViewModel
 
     @State private var currentDragOffset: CGFloat = 0
@@ -97,13 +99,14 @@ struct DrawerView: View {
     }
 
     /// Route to push when selecting this drawer item (nil for Wallet = pop to root).
+    /// `.wallet` and `.widgets` are handled separately in `selectWallet()` / `selectWidgets()`.
     private func route(for item: DrawerMenuItem) -> Route? {
         switch item {
         case .wallet: return nil
         case .activity: return .activityList
         case .contacts: return .contacts
         case .profile: return .profile
-        case .widgets: return app.hasSeenWidgetsIntro ? .widgetsList : .widgetsIntro
+        case .widgets: return nil
         case .shop: return app.hasSeenShopIntro ? .shopDiscover : .shopIntro
         case .support: return .support
         case .settings: return .settings
@@ -112,6 +115,18 @@ struct DrawerView: View {
     }
 
     private func selectDrawerItem(_ item: DrawerMenuItem) {
+        if item == .widgets {
+            selectWidgets()
+            closeMenu()
+            return
+        }
+
+        if item == .wallet {
+            selectWallet()
+            closeMenu()
+            return
+        }
+
         if let route = route(for: item) {
             navigation.path = [route]
         } else {
@@ -120,6 +135,25 @@ struct DrawerView: View {
         closeMenu()
     }
 
+    private func selectWallet() {
+        navigation.path = []
+        app.requestedHomePage = 0
+    }
+
+    private func selectWidgets() {
+        guard app.hasSeenWidgetsIntro else {
+            navigation.path = [.widgetsIntro]
+            return
+        }
+
+        navigation.path = []
+        if settings.showWidgets {
+            app.requestedHomePage = 1
+        } else {
+            sheets.showSheet(.widgets, data: WidgetsConfig(initialRoute: .list))
+        }
+    }
+
     var body: some View {
         ZStack {
             if showBackdrop {

Bitkit/Components/ProfileEditFormView.swift

@@ -109,7 +109,6 @@ struct ProfileEditFormView<Avatar: View>: View {
 
     // MARK: - Pubky Key Section
 
-    @ViewBuilder
     private var pubkyKeySection: some View {
         VStack(spacing: 8) {
             CaptionMText(publicKeyLabel, textColor: .white64)
@@ -126,7 +125,6 @@ struct ProfileEditFormView<Avatar: View>: View {
 
     // MARK: - Bio Section
 
-    @ViewBuilder
     private var bioSection: some View {
         VStack(alignment: .leading, spacing: 8) {
             CaptionMText(t("profile__create_bio_label"), textColor: .white64)
@@ -144,7 +142,6 @@ struct ProfileEditFormView<Avatar: View>: View {
 
     // MARK: - Links Section
 
-    @ViewBuilder
     private var linksSection: some View {
         VStack(alignment: .leading, spacing: 8) {
             ForEach(links.indices, id: \.self) { index in
@@ -224,7 +221,6 @@ struct ProfileEditFormView<Avatar: View>: View {
 
     // MARK: - Delete Section
 
-    @ViewBuilder
     private func deleteSection(label: String, action: @escaping () -> Void) -> some View {
         VStack(alignment: .leading, spacing: 8) {
             CaptionMText(t("profile__edit_delete_section"), textColor: .white64)
@@ -259,7 +255,6 @@ struct ProfileEditFormView<Avatar: View>: View {
 
     // MARK: - Footnote Section
 
-    @ViewBuilder
     private func footnoteSection(_ note: String) -> some View {
         BodySText(note, textColor: .white64)
             .fixedSize(horizontal: false, vertical: true)
@@ -268,7 +263,6 @@ struct ProfileEditFormView<Avatar: View>: View {
 
     // MARK: - Tags Section
 
-    @ViewBuilder
     private var tagsSection: some View {
         VStack(alignment: .leading, spacing: 8) {
             if !tags.isEmpty {
@@ -294,7 +288,6 @@ struct ProfileEditFormView<Avatar: View>: View {
         }
     }
 
-    @ViewBuilder
     private var footerBar: some View {
         VStack(spacing: 0) {
             LinearGradient(

Bitkit/Components/PubkyImage.swift

@@ -31,7 +31,6 @@ struct PubkyImage: View {
         }
     }
 
-    @ViewBuilder
     private var placeholder: some View {
         Circle()
             .fill(Color.gray5)

Bitkit/Components/SuggestionCard.swift

@@ -35,7 +35,7 @@ struct SuggestionCard: View {
                         .resizable()
                         .scaledToFit()
                         .frame(width: 96, height: 96)
-                        .frame(maxWidth: .infinity, alignment: .center)
+                        .frame(maxWidth: .infinity, alignment: .leading)
 
                     Text(title)
                         .font(.custom(Fonts.black, size: 20))