デザイン調整

Seilassist/Sailassist.xcodeproj/project.pbxproj

@@ -47,6 +47,8 @@
 		02A1DE2F2AFB4AA0005BCF55 /* ChatInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A1DE2E2AFB4AA0005BCF55 /* ChatInputView.swift */; };
 		02A1DE312AFB61D8005BCF55 /* MyChatContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A1DE302AFB61D8005BCF55 /* MyChatContentView.swift */; };
 		02A1DE332AFB654A005BCF55 /* CustomCornerRadius.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A1DE322AFB654A005BCF55 /* CustomCornerRadius.swift */; };
+		02C3E5CE2AFCA04700AF7837 /* OtherChatContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C3E5CD2AFCA04700AF7837 /* OtherChatContentView.swift */; };
+		02C3E5D12AFCC16800AF7837 /* NavigationTitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C3E5D02AFCC16800AF7837 /* NavigationTitleView.swift */; };
 		02CD068F2AE6535F005F8D8F /* MapSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02CD068E2AE6535F005F8D8F /* MapSource.swift */; };
 		02CD06912AE6536B005F8D8F /* LayerEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02CD06902AE6536B005F8D8F /* LayerEnum.swift */; };
 		02CD06932AE88970005F8D8F /* ServerSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02CD06922AE88970005F8D8F /* ServerSession.swift */; };
@@ -141,6 +143,8 @@
 		02A1DE2E2AFB4AA0005BCF55 /* ChatInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ChatInputView.swift; path = Sailassist/Chat/View/ChatInputView.swift; sourceTree = SOURCE_ROOT; };
 		02A1DE302AFB61D8005BCF55 /* MyChatContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MyChatContentView.swift; path = Sailassist/Chat/View/MyChatContentView.swift; sourceTree = SOURCE_ROOT; };
 		02A1DE322AFB654A005BCF55 /* CustomCornerRadius.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CustomCornerRadius.swift; path = Sailassist/Chat/View/CustomCornerRadius.swift; sourceTree = SOURCE_ROOT; };
+		02C3E5CD2AFCA04700AF7837 /* OtherChatContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = OtherChatContentView.swift; path = Sailassist/Chat/View/OtherChatContentView.swift; sourceTree = SOURCE_ROOT; };
+		02C3E5D02AFCC16800AF7837 /* NavigationTitleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = NavigationTitleView.swift; path = Sailassist/Tab/View/NavigationTitleView.swift; sourceTree = SOURCE_ROOT; };
 		02CD068E2AE6535F005F8D8F /* MapSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapSource.swift; sourceTree = "<group>"; };
 		02CD06902AE6536B005F8D8F /* LayerEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayerEnum.swift; sourceTree = "<group>"; };
 		02CD06922AE88970005F8D8F /* ServerSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSession.swift; sourceTree = "<group>"; };
@@ -279,6 +283,7 @@
 		020B983E2AD8C3500029DE4C /* Tab */ = {
 			isa = PBXGroup;
 			children = (
+				02C3E5CF2AFCC15700AF7837 /* View */,
 				02CE4DC92ADF9D2E002E79BC /* ViewModel */,
 				020B98582AD92A4C0029DE4C /* MainTabView.swift */,
 			);
@@ -420,11 +425,20 @@
 			children = (
 				02A1DE2E2AFB4AA0005BCF55 /* ChatInputView.swift */,
 				02A1DE302AFB61D8005BCF55 /* MyChatContentView.swift */,
+				02C3E5CD2AFCA04700AF7837 /* OtherChatContentView.swift */,
 				02A1DE322AFB654A005BCF55 /* CustomCornerRadius.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
 		};
+		02C3E5CF2AFCC15700AF7837 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				02C3E5D02AFCC16800AF7837 /* NavigationTitleView.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		02CE4D7D2ADE4297002E79BC /* View */ = {
 			isa = PBXGroup;
 			children = (
@@ -663,10 +677,12 @@
 				020B98672ADD15050029DE4C /* MenuView.swift in Sources */,
 				020B98572AD924F50029DE4C /* CameraPreview.swift in Sources */,
 				02CD068F2AE6535F005F8D8F /* MapSource.swift in Sources */,
+				02C3E5CE2AFCA04700AF7837 /* OtherChatContentView.swift in Sources */,
 				020B98442AD8E4910029DE4C /* FontStyle.swift in Sources */,
 				02CE4D892ADF62E1002E79BC /* EcaSettingView.swift in Sources */,
 				02CE4D872ADF62A7002E79BC /* EcaListView.swift in Sources */,
 				020B986C2ADD3E810029DE4C /* InTextLib.swift in Sources */,
+				02C3E5D12AFCC16800AF7837 /* NavigationTitleView.swift in Sources */,
 				020B98472AD8FEE30029DE4C /* ColorSet.swift in Sources */,
 				020B98652ADD14F60029DE4C /* NotificationView.swift in Sources */,
 			);

Seilassist/Sailassist/Assets.xcassets/ColorSet/BackgroundColor/BottomNavColor.colorset/Contents.json

+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.700",
+          "blue" : "0xF5",
+          "green" : "0xF5",
+          "red" : "0xF5"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.850",
+          "blue" : "0x3C",
+          "green" : "0x38",
+          "red" : "0x38"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Seilassist/Sailassist/Assets.xcassets/ColorSet/BackgroundColor/ChatEmargencyColor1.colorset/Contents.json

+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x2E",
+          "green" : "0x2E",
+          "red" : "0xBD"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Seilassist/Sailassist/Assets.xcassets/ColorSet/BackgroundColor/ChatEmargencyColor2.colorset/Contents.json

+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x2E",
+          "green" : "0x2B",
+          "red" : "0x2B"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Seilassist/Sailassist/Assets.xcassets/ColorSet/BackgroundColor/FormBackColor.colorset/Contents.json

+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.400",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.080",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Seilassist/Sailassist/Assets.xcassets/ColorSet/BackgroundColor/ListActiveColor.colorset/Contents.json

+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.400",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.060",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Seilassist/Sailassist/Assets.xcassets/ColorSet/BackgroundColor/LoginbkColor03.colorset/Contents.json

+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x4F",
+          "green" : "0x48",
+          "red" : "0x29"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Seilassist/Sailassist/Assets.xcassets/ColorSet/BackgroundColor/ModalWindowFrontColor.colorset/Contents.json

+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xE7",
+          "green" : "0xE7",
+          "red" : "0xE7"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xE9",
+          "green" : "0xE3",
+          "red" : "0xE3"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Seilassist/Sailassist/Assets.xcassets/ColorSet/BackgroundColor/NoticebkColor.colorset/Contents.json

+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.200",
+          "blue" : "0x21",
+          "green" : "0x21",
+          "red" : "0xFB"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.200",
+          "blue" : "0x1D",
+          "green" : "0x1D",
+          "red" : "0xF8"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Seilassist/Sailassist/Assets.xcassets/ColorSet/ButtonColor/PrimaryDisableColor.colorset/Contents.json

@@ -4,7 +4,7 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "alpha" : "0.005",
+          "alpha" : "0.500",
           "blue" : "0xFF",
           "green" : "0xFF",
           "red" : "0xFF"
@@ -22,7 +22,7 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "alpha" : "0.005",
+          "alpha" : "0.050",
           "blue" : "0xFF",
           "green" : "0xFF",
           "red" : "0xFF"

Seilassist/Sailassist/Assets.xcassets/ColorSet/IconColor/EmargencyIconColor02.colorset/Contents.json

+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x2E",
+          "green" : "0x2E",
+          "red" : "0xBD"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x2E",
+          "green" : "0x2E",
+          "red" : "0xBD"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Seilassist/Sailassist/Assets.xcassets/ColorSet/IconColor/TaskStateIconColor.colorset/Contents.json

+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.200",
+          "blue" : "0x3C",
+          "green" : "0x38",
+          "red" : "0x38"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.200",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Seilassist/Sailassist/Assets.xcassets/ColorSet/NoticeColor/Contents.json

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Seilassist/Sailassist/Assets.xcassets/ColorSet/NoticeColor/NoticeColor.colorset/Contents.json

+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x21",
+          "green" : "0x21",
+          "red" : "0xFB"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x1D",
+          "green" : "0x1D",
+          "red" : "0xF8"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Seilassist/Sailassist/Chat/ChatView.swift

@@ -11,22 +11,38 @@ struct ChatView: View {
     @State var isEmargency: Bool = false
     var body: some View {
         ZStack {
-            VStack{
             if isEmargency{
-                    LinearGradient(gradient: Gradient(colors: [.red,  .black]), startPoint: .top, endPoint: .bottom)
+                LinearGradient(gradient: Gradient(colors: [.chatEmargencyColor1,  .chatEmargencyColor2]), startPoint: .top, endPoint: .bottom)
                     .ignoresSafeArea()
             }
-            }
-            VStack {
-                Text("Chat")
+            VStack{
+                ZStack{
+                    ScrollView(.vertical) {
+                        OtherChatContentView()
                         
-                Button("Change Emargency"){
+                        MyChatContentView()
+                    }
+                    HStack {
+                        Spacer()
+                        VStack{
+                            Button{
                                 isEmargency.toggle()
+                            }label: {
+                                Image(systemName: "exclamationmark.triangle.fill")
+                                    .foregroundColor(.white)
+                                    .frame(width: 48, height: 48)
+                                    .background(ColorSet.Notice.color)
+                                    .cornerRadius(50)
+                            }.padding(9)
+                            Spacer()
+                        }
                     }
                 }
 
+            }
             ChatInputView()
         }
+        .background(ColorSet.BackgroundPrimary.color)
     }
 }
 

Seilassist/Sailassist/Chat/View/ChatInputView.swift

@@ -12,20 +12,18 @@ struct ChatInputView: View {
     @State var inputText = ""
     @FocusState var isKeyboard : Bool
     var body: some View {
-        VStack{
+        VStack(spacing: 0){
             Spacer()
-                .onTapGesture {
-                    isKeyboard = false
-                }
+            Divider()
             
             HStack(spacing: 11){
                 TextField("", text: $inputText, onEditingChanged: { isEdit in
                     sceneDelegate.tabWindow?.isHidden = isEdit
                 })
                 .focused($isKeyboard)
-                .foregroundColor(.black)
+                .foregroundColor(ColorSet.BodyChat.color)
                 .padding(10)
-                .background(.white)
+                .background(ColorSet.ChatForm.color)
                 .cornerRadius(10)
                 .padding(.vertical, 10)
                 .padding(.leading, 20)

Seilassist/Sailassist/Chat/View/CustomCornerRadius.swift

@@ -8,8 +8,7 @@
 import Foundation
 import SwiftUI
 
-struct RoundedCorners: View {
-    var color: Color = .clear
+fileprivate struct RoundedCorners: View {
     var tl: CGFloat = 0.0
     var tr: CGFloat = 0.0
     var bl: CGFloat = 0.0
@@ -36,7 +35,6 @@ struct RoundedCorners: View {
                 path.addLine(to: CGPoint(x: 0, y: tl))
                 path.addArc(center: CGPoint(x: tl, y: tl), radius: tl, startAngle: Angle(degrees: 180), endAngle: Angle(degrees: 270), clockwise: false)
             }
-            .fill(color)
         }
     }
 }
@@ -44,14 +42,21 @@ struct RoundedCorners: View {
 enum Corners{
     case tl
     case tr
+    case bl
+    case br
 }
 
 
-//struct CustomCornerRadiusModifier: ViewModifier {
-//    let cornerRadius: CGFloat
-//    let maskedCorners: [Corners]
-//
-//    func body(content: Content) -> some View {
-//        content.mask(PartlyRoundedCornerView(cornerRadius: self.cornerRadius,
-//                                             maskedCorners: self.maskedCorners))}
-//}
+fileprivate struct CustomCornerRadiusModifier: ViewModifier {
+    let cornerRadius: CGFloat
+    let corners: [Corners]
+
+    func body(content: Content) -> some View {
+        content.mask(RoundedCorners(tl: corners.contains(.tl) ? cornerRadius : 0.0, tr: corners.contains(.tr) ? cornerRadius : 0.0, bl: corners.contains(.bl) ? cornerRadius : 0.0, br: corners.contains(.br) ? cornerRadius : 0.0))}
+}
+
+extension View{
+    func cornerRadius(_ radius: CGFloat, corners: [Corners]) -> some View {
+        self.modifier(CustomCornerRadiusModifier(cornerRadius: radius, corners: corners))
+    }
+}

Seilassist/Sailassist/Chat/View/MyChatContentView.swift

@@ -9,12 +9,31 @@ import SwiftUI
 
 struct MyChatContentView: View {
     var body: some View {
-        VStack {
-            Text("Hello, World!")
-                .padding()
-                .background(.black)
-                .cornerRadius(10, antialiased: false)
+        HStack {
+            Spacer()
+            VStack(alignment: .trailing, spacing: 6) {
+                Text("テキストメッセージテキストメッセージテキストメッセージテキストメッセージテキストメッセージテキストメッセージ")
+                    .font(FontStyle.DefaultText.font)
+                    .foregroundColor(ColorSet.BodyChat.color)
+                    .padding(15)
+                    .background(ColorSet.ChatBaloon.color)
+                    .cornerRadius(10, corners: [.tl, .tr, .bl])
+                
+                HStack(spacing: 8){
+                    Text("yyyy/MM/dd hh:mm")
+                        .font(FontStyle.DateText.font)
+                        .foregroundColor(ColorSet.ChatDate.color)
+                    
+                    Image(systemName: "eye.fill")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 17, height: 17)
+
+                }
+            }
+            .padding(.trailing, 20)
         }
+        .padding(.leading, 80)
     }
 }
 

Seilassist/Sailassist/Chat/View/OtherChatContentView.swift

+//
+//  OtherChatContentView.swift
+//  Sailassist
+//
+//  Created by Mamoru Sugita on 2023/11/09.
+//
+
+import SwiftUI
+
+struct OtherChatContentView: View {
+    var body: some View {
+        HStack {
+            VStack(alignment: .leading, spacing: 10) {
+                Text("テキストメッセージテキストメッセージテキストメッセージテキストメッセージテキストメッセージテキストメッセージ")
+                    .font(FontStyle.DefaultText.font)
+                    .foregroundColor(ColorSet.BodyChat.color)
+                    .padding(15)
+                    .background(ColorSet.ChatBaloon.color)
+                    .cornerRadius(10, corners: [.tl, .tr, .br])
+                
+                HStack(alignment: .top){
+                    Text("yyyy/MM/dd hh:mm")
+                        .font(FontStyle.DateText.font)
+                        .foregroundColor(ColorSet.ChatDate.color)
+                }
+            }
+            .padding(.leading, 20)
+            
+            Spacer()
+        }
+        .padding(.trailing, 80)
+    }
+}
+
+#Preview {
+    OtherChatContentView()
+}

Seilassist/Sailassist/Constants/ColorSet.swift

@@ -37,24 +37,30 @@ enum ColorSet: String, CaseIterable{
     case BodyChat
     /// Text - Body notice
     case BodyNotice
-    /// Text - Chat data
-    case ChatData
+    /// Text - Chat date
+    case ChatDate
 
     // MARK: Background Color
     /// Background - Primary
     case BackgroundPrimary
     /// Background - Secondary
     case BackgroundSecondary
+    /// Background - Bottom Nav
+    case BottomNav
     /// Background - Teriary
     case BackgroundTeriary
     /// Background - Chat baloon
     case ChatBaloon
     /// Background - Modal window back
     case ModalWindowBack
+    /// Background - Modal window front
+    case ModalWindowFront
     /// Background - Login bk 01
     case LoginBk01
     /// Background - Login bk 02
     case LoginBk02
+    /// Background - Login bk 03
+    case LoginBk03
     /// Background - Splash
     case Splash
     /// Background - Acordion inner
@@ -63,6 +69,18 @@ enum ColorSet: String, CaseIterable{
     case EmargencyBtn
     /// Background - Chat form
     case ChatForm
+    /// Background - Chat Emargency - red
+    case ChatEmargency1
+    /// Background - Chat Emargency - red
+    case ChatEmargency2
+    /// Background - Form Text
+    case FormText
+    /// Background - Notice bk
+    case NoticeBk
+    /// Background - List Active
+    case ListActive
+
+    
     
     // MARK: Button Color
     /// Button - Primary active
@@ -78,7 +96,7 @@ enum ColorSet: String, CaseIterable{
     /// Button - Toggle on
     case ToggleOn
     /// Button - Slidebar
-    case Slider
+    case Slidebar
     /// Button - Coning active
     case ConingActive
 
@@ -95,6 +113,10 @@ enum ColorSet: String, CaseIterable{
     case ShipSetting
     /// Icon - Emargency icon
     case EmargencyIcon
+    /// Icon - Emargency icon 02
+    case EmargencyIcon02
+    /// Icon - Task State Icon
+    case TaskStateIcon
 
 
     // MARK: Line Color
@@ -111,6 +133,7 @@ enum ColorSet: String, CaseIterable{
 
     // MARK: Notice Color
     /// Notice - Notice
+    case Notice
 
     // MARK: Status ship Color
     /// Status -
@@ -156,22 +179,28 @@ extension ColorSet{
             "BodyChatColor"
         case .BodyNotice:
             "BodyNoticeColor"
-        case .ChatData:
-            "ChatDataColor"
+        case .ChatDate:
+            "ChatDateColor"
         case .BackgroundPrimary:
             "PrimaryColor"
         case .BackgroundSecondary:
             "SecondaryColor"
+        case .BottomNav:
+            "BottomNavColor"
         case .BackgroundTeriary:
             "TeriaryColor"
         case .ChatBaloon:
             "ChatBaloonColor"
         case .ModalWindowBack:
             "ModalWindowBackColor"
+        case .ModalWindowFront:
+            "ModalWindowFrontColor"
         case .LoginBk01:
             "LoginbkColor01"
         case .LoginBk02:
             "LoginbkColor02"
+        case .LoginBk03:
+            "LoginbkColor03"
         case .Splash:
             "SplashColor"
         case .AcordionInner:
@@ -180,6 +209,16 @@ extension ColorSet{
             "EmargencyBtnColor"
         case .ChatForm:
             "ChatFormColor"
+        case .ChatEmargency1:
+            "ChatEmargencyColor1"
+        case .ChatEmargency2:
+            "ChatEmargencyColor2"
+        case .FormText:
+            "FormBackColor"
+        case .NoticeBk:
+            "NoticeBkColor"
+        case .ListActive:
+            "ListActiveColor"
         case .PrimaryActiveButton:
             "PrimaryActiveButtonColor"
         case .PrimaryDisable:
@@ -192,7 +231,7 @@ extension ColorSet{
             "ToggleOffColor"
         case .ToggleOn:
             "ToggleOnColor"
-        case .Slider:
+        case .Slidebar:
             "SliderColor"
         case .ConingActive:
             "ConingActiveColor"
@@ -208,6 +247,10 @@ extension ColorSet{
             "ShipSettingColor"
         case .EmargencyIcon:
             "EmargencyIconColor"
+        case .EmargencyIcon02:
+            "EmargencyIconColor02"
+        case .TaskStateIcon:
+            "TaskStateIconColor"
         case .ScrollBarColor:
             "ScrollBarColor"
         case .SearchBarColor:
@@ -218,6 +261,8 @@ extension ColorSet{
             "LineColor02"
         case .LineColor03:
             "LineColor03"
+        case .Notice:
+            "NoticeColor"
         }
     }
 }

Seilassist/Sailassist/Constants/FontStyle.swift

@@ -33,6 +33,9 @@ enum FontStyle: String, CaseIterable{
     ///アイコン付きラジオボタン
     case RadioButtonText
     
+    ///日付
+    case DateText
+    
 }
 
 extension FontStyle{
@@ -60,6 +63,8 @@ extension FontStyle{
             return .medium
         case .RadioButtonText:
             return .regular
+        case .DateText:
+            return .bold
         }
     }
     
@@ -91,6 +96,8 @@ extension FontStyle{
             return 10
         case .RadioButtonText:
             return 10
+        case .DateText:
+            return 12
         }
     }
 }

Seilassist/Sailassist/Login/LoginView.swift

@@ -41,7 +41,7 @@ struct LoginView: View {
     var body: some View {
         ZStack{
             Triangle()
-                .fill(Color.red)
+                .fill(ColorSet.LoginBk03.color)
                 .ignoresSafeArea()
             VStack{
                 //ロゴ
@@ -108,6 +108,7 @@ struct LoginView: View {
                 }
             }
         }
+        .background(ColorSet.LoginBk01.color)
         .fullScreenCover(isPresented: $scannerViewModel.isShowing, onDismiss: {LoginCheckQR()}, content: {
             QRReadView(viewMode: .constant(.SelectType), viewModel: scannerViewModel)
         })

Seilassist/Sailassist/Map/Task/View/EcaListView.swift

@@ -14,7 +14,8 @@ struct EcaListView: View {
         ForEach(sharingData.ecaArea.map{ $0.1 }, id: \.name){ eca in
             HStack {
                 Text(eca.name)
-                    .padding(17)
+                    .font(FontStyle.DefaultText.font)
+                    .foregroundColor(ColorSet.Body.color)
                 Spacer()
                 if !eca.isEnable{
                     Button(action: {
@@ -23,22 +24,31 @@ struct EcaListView: View {
                         sharingData.editEcaArea(key: eca.name, value: newData)
                     }, label: {
                         Image("icon_plus")
-                            .padding()
+                            .resizable()
+                            .frame(width: 12, height: 12)
+                            .padding(8)
                     })
+                    .frame(width: 28, height: 28)
                     .background(.primaryActiveIcon)
                     .cornerRadius(50)
                     .padding()
                 }else{
                     Text("Registerd")
-                        .frame(height: 24)
-                        .background(.primaryDisable)
-                        .cornerRadius(12)
-                        .padding()
+                        .font(FontStyle.SupplementText2.font)
+                        .frame(height: 25)
+                        .foregroundColor(ColorSet.ButtonDisable.color)
+                        .padding(.vertical, 4)
+                        .padding(.horizontal, 10)
+                        .background(ColorSet.PrimaryDisable.color)
+                        .cornerRadius(99)
                 }
                 
             }
+            .frame(height: 62)
+            .padding(.horizontal, 30)
             
             Divider()
+                .background(.white)
         }
     }
 }

Seilassist/Sailassist/Map/Task/View/MapTaskView.swift

@@ -29,7 +29,7 @@ struct MapTaskView: View {
     var body: some View {
         VStack{
             Capsule()
-                .foregroundColor(Color(.systemGray5))
+                .foregroundColor(ColorSet.ScrollBarColor.color)
                 .frame(width: 45, height: 3)
                 .padding(.top, 10)
 
@@ -49,6 +49,7 @@ struct MapTaskView: View {
                 Spacer()
                 
                 Text(viewMode.title)
+                    .font(FontStyle.TitleL.font)
                     .frame(height: 20)
                     .padding(.vertical, 14)
                 
@@ -84,8 +85,6 @@ struct MapTaskView: View {
                 }
                 
             }
-            .padding(.leading, 20)
-            .padding(.trailing, 10)
             
             Spacer()
                 .frame(height: 55)

Seilassist/Sailassist/Map/Task/View/TaskSwitchingMenuView.swift

@@ -30,14 +30,20 @@ struct TaskSwitchingMenuView: View {
                             newData.isRunning = true
                             sharingData.editEcaArea(key: eca.name, value: newData)
                         } label: {
+                            HStack {
                                 Circle()
+                                    .frame(width: 14, height: 14)
+                                    .foregroundColor(eca.isRunning ? ColorSet.PrimaryActiveIcon.color : ColorSet.TaskStateIcon.color)
+                                Spacer()
                                     .frame(width: 10)
-                                .foregroundColor(eca.isRunning ? .red : .blue)
-                            
                                 Text(eca.name)
+                                    .font(FontStyle.DefaultText.font)
                                     .foregroundColor(ColorSet.Body.color)
                             }
                             
+                            
+                        }
+                        
                         Spacer()
                         
                         Menu {
@@ -58,7 +64,8 @@ struct TaskSwitchingMenuView: View {
                             }
                         } label: {
                             Image(systemName: "ellipsis")
-                                .padding()
+                                .frame(width: 22, height: 22)
+//                                .padding()
                         }
                         .disabled(eca.isRunning)
                         .alert("delete", isPresented: $isDeleteAlert) {
@@ -83,9 +90,11 @@ struct TaskSwitchingMenuView: View {
                             Text("eca delete")
                         }
                     }
-                    .frame(height: 50)
+                    .frame(height: 60)
+                    .padding(.horizontal, 30)
                     
                     Divider()
+                        .background(.white)
                 }
             }
             //AddECAボタン
@@ -93,14 +102,17 @@ struct TaskSwitchingMenuView: View {
                 viewMode = .EcaList
             }, label: {
                 Text("Add ECA Task")
+                    .font(FontStyle.DefaultText.font)
                     .padding()
             })
+            .frame(width: 153, height: 42)
+            .foregroundColor(ColorSet.ButtonText.color)
             .background(ColorSet.PrimaryActiveIcon.color)
             .cornerRadius(30)
             
             Spacer()
         }
-        .padding()
+//        .padding()
     }
 }
 

Seilassist/Sailassist/Tab/MainTabView.swift

@@ -25,7 +25,7 @@ struct MainTabView: View {
     @EnvironmentObject private var sceneDelegate: SceneDelegate
     init() {
         let appearance: UITabBarAppearance = UITabBarAppearance()
-        appearance.backgroundColor = UIColor(ColorSet.BackgroundPrimary.color) 
+        appearance.backgroundColor = .clear
         UITabBar.appearance().scrollEdgeAppearance = appearance
         UITabBar.appearance().standardAppearance = appearance
     }
@@ -41,6 +41,7 @@ struct MainTabView: View {
             
             NavigationStack{
                 MapRepresentable()
+                    .ignoresSafeArea()
             }
             .tag(Tab.task)
             
@@ -62,10 +63,10 @@ struct MainTabView: View {
             }
             .zIndex(0)
             .presentationDragIndicator(.hidden)
-            .presentationDetents([.height(155), .medium, .fraction(0.99)])
+            .presentationDetents([.height(150), .medium, .fraction(0.99)])
             .presentationCornerRadius(15)
             .presentationBackgroundInteraction(.enabled(upThrough: .medium))
-            .presentationBackground(ColorSet.ModalWindowBack.color)
+            .presentationBackground(ColorSet.BackgroundSecondary.color)
             .interactiveDismissDisabled()
         })
     }
@@ -96,9 +97,9 @@ struct CustomTabBar: View {
                         
                 }
             }
-            .frame(height: 55)
+            .frame(height: 50)
         }
-        .background(.regularMaterial)
+        .background(ColorSet.BottomNav.color)
         
     }
 }
@@ -106,4 +107,6 @@ struct CustomTabBar: View {
 
 #Preview {
     MainTabView()
+        .environmentObject(SelectedTabModel())
+        .environmentObject(SceneDelegate())
 }

Seilassist/Sailassist/Tab/View/NavigationTitleView.swift

+//
+//  NavigationTitleView.swift
+//  Sailassist
+//
+//  Created by Mamoru Sugita on 2023/11/09.
+//
+
+import SwiftUI
+
+struct NavigationTitleView: View {
+    var body: some View {
+        
+        VStack {
+            HStack {
+                Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
+            }
+            
+            Divider()
+            
+            Spacer()
+        }
+    }
+}
+
+#Preview {
+    NavigationTitleView()
+}