カスタムタブバーに変更

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Ads.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "export-document.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Bookmarks.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Bookmarks.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Home.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Home.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Light.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Light.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Lists.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Lists.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Logo.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Logo.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Message.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Message.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Moments.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Moments.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Monetization.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "monetization.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Notifications.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Notifications.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Profile.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Profile.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Purchases.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "shopping-cart.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/QR.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "QR.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Search.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Search.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Sparkles.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Sparkles.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/Topics.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Topics.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Assets.xcassets/Twitter Icon Set/xlogo.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "xlogo.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TwitterSwiftUI/Core/Components/PagerTabView.swift

@@ -21,6 +21,7 @@ struct PagerTabView<Tab: View, Content: View>: View {
 
     @Binding var selectedTab: Int
 
+
     init(selected: Binding<Int>,
          tabs: [Tab],
          @ViewBuilder content: @escaping () -> Content) {
@@ -52,6 +53,8 @@ struct PagerTabView<Tab: View, Content: View>: View {
             }
         }
         .onChange(of: offset) { _ in
+
+
             // SwipeでPagingする時のみ、UnderlineViewを移動させる
             if isScrolling {
                 underlineViewOffset = offset / CGFloat(tabs.count)
@@ -161,9 +164,7 @@ fileprivate struct OffsetPageTabView<Content: View>: UIViewRepresentable {
         scrollView.isPagingEnabled = true
         scrollView.showsVerticalScrollIndicator = false
         scrollView.showsHorizontalScrollIndicator = false
-
         scrollView.delegate = context.coordinator
-
         return scrollView
     }
 
@@ -188,7 +189,8 @@ extension OffsetPageTabView {
         }
 
         func scrollViewDidScroll(_ scrollView: UIScrollView) {
-            parent.offset = scrollView.contentOffset.x
+            let offsetX = scrollView.contentOffset.x
+            parent.offset = offsetX
             parent.isScrolling = (scrollView.isDragging || scrollView.isTracking || scrollView.isDecelerating)
         }
 

TwitterSwiftUI/Core/FeedView.swift

@@ -22,38 +22,23 @@ struct FeedView: View {
 
             headerView
 
-            ZStack(alignment: .bottomTrailing) {
-
-                PagerTabView(selected: $viewModel.currentTab, tabs:
-                                [
-                                    TabLabel(type: .recommend),
-                                    TabLabel(type: .following),
-                                ]) {
-                                    ForEach(FeedTabFilter.allCases) { type in
-                                        FeedTabListView()
-                                            .environmentObject(self.viewModel)
-                                            .frame(width: UIScreen.main.bounds.width)
-                                    }
-                                }
-                                .refreshable {
-                                    Task {
-                                        try await viewModel.fetchTweets()
-                                    }
-                                }
-                Button {
-                    showNewTweetView.toggle()
-                } label: {
-                    Image(systemName: "square.and.pencil")
-                        .font(.title2)
-                        .foregroundColor(.white)
+            PagerTabView(
+                selected: $viewModel.currentTab, tabs:
+                    [
+                        TabLabel(type: .recommend),
+                        TabLabel(type: .following),
+                    ]
+            ) {
+                ForEach(FeedTabFilter.allCases) { type in
+                    FeedTabListView()
+                        .environmentObject(self.viewModel)
+                        .frame(width: UIScreen.main.bounds.width)
+                }
+            }
+            .refreshable {
+                Task {
+                    try await viewModel.fetchTweets()
                 }
-                .background(
-                    Circle()
-                        .fill(Color(.systemBlue))
-                        .frame(width: 54, height: 54)
-                )
-                .padding(.trailing, 32)
-                .padding(.bottom, 32)
             }
         }
         .toolbar(.hidden, for: .navigationBar)