Skip to content

S
Sailassist
Commit c8ea3a7d authored by shigemi miura's avatar shigemi miura
Browse files
Options

不具合修正 No.89/90/92

parent 4292324a
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 17 deletions
Seilassist/Sailassist.xcodeproj/project.pbxproj
View file @ c8ea3a7d
......@@ -1299,7 +1299,7 @@
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 25;
CURRENT_PROJECT_VERSION = 29;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES;
......@@ -1345,7 +1345,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 25;
CURRENT_PROJECT_VERSION = 29;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES;
......@@ -1529,7 +1529,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 25;
CURRENT_PROJECT_VERSION = 29;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES;
......
Seilassist/Sailassist/Assets.xcassets/IconImage/Chat/chat_company.imageset/Contents.json
View file @ c8ea3a7d
......@@ -6,12 +6,43 @@
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "icon_company_1.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Seilassist/Sailassist/Assets.xcassets/IconImage/Chat/chat_company.imageset/icon_company.svg
View file @ c8ea3a7d
<svg viewBox="0 0 30 30" fill="none"
<svg viewBox="0 0 30 30" fill="#38383c"
xmlns="http://www.w3.org/2000/svg">
<path d="M22.1438 7.87501V2.13751H7.85626V7.85626H2.13751V27.8625H13.575V22.1438H16.425V27.8625H27.8625V7.87501H22.1438ZM7.85626 25.0125H5.00626V22.1625H7.85626V25.0125ZM7.85626 19.2938H5.00626V16.4438H7.85626V19.2938ZM7.85626 13.575H5.00626V10.725H7.85626V13.575ZM13.575 19.2938H10.725V16.4438H13.575V19.2938ZM13.575 13.575H10.725V10.725H13.575V13.575ZM13.575 7.85626H10.725V5.00626H13.575V7.85626ZM19.2938 19.2938H16.4438V16.4438H19.2938V19.2938ZM19.2938 13.575H16.4438V10.725H19.2938V13.575ZM24.9938 13.575H22.1438V10.725H24.9938V13.575ZM19.2938 7.85626H16.4438V5.00626H19.2938V7.85626ZM25.0125 24.9938H22.1625V22.1438H25.0125V24.9938ZM25.0125 19.275H22.1625V16.425H25.0125V19.275Z" fill="black"/>
</svg>
Seilassist/Sailassist/Assets.xcassets/IconImage/Chat/chat_company.imageset/icon_company_1.svg 0 → 100644
View file @ c8ea3a7d
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 30 30" fill="non"
xmlns="http://www.w3.org/2000/svg">
<path d="M22.1438 7.87501V2.13751H7.85626V7.85626H2.13751V27.8625H13.575V22.1438H16.425V27.8625H27.8625V7.87501H22.1438ZM7.85626 25.0125H5.00626V22.1625H7.85626V25.0125ZM7.85626 19.2938H5.00626V16.4438H7.85626V19.2938ZM7.85626 13.575H5.00626V10.725H7.85626V13.575ZM13.575 19.2938H10.725V16.4438H13.575V19.2938ZM13.575 13.575H10.725V10.725H13.575V13.575ZM13.575 7.85626H10.725V5.00626H13.575V7.85626ZM19.2938 19.2938H16.4438V16.4438H19.2938V19.2938ZM19.2938 13.575H16.4438V10.725H19.2938V13.575ZM24.9938 13.575H22.1438V10.725H24.9938V13.575ZM19.2938 7.85626H16.4438V5.00626H19.2938V7.85626ZM25.0125 24.9938H22.1625V22.1438H25.0125V24.9938ZM25.0125 19.275H22.1625V16.425H25.0125V19.275Z" fill="#FFF"/>
</svg>
Seilassist/Sailassist/Assets.xcassets/IconImage/Chat/chat_ship.imageset/Contents.json
View file @ c8ea3a7d
......@@ -6,12 +6,43 @@
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "icon_ship_1.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
......
Seilassist/Sailassist/Assets.xcassets/IconImage/Chat/chat_ship.imageset/icon_ship.svg
View file @ c8ea3a7d
<svg viewBox="0 0 30 30" fill="none"
<svg viewBox="0 0 30 30" fill="#38383c"
xmlns="http://www.w3.org/2000/svg">
<path d="M26.9812 16.2375L25.8937 8.36251C25.8562 8.06251 25.6125 7.85626 25.3125 7.85626H23.2687V5.23126H19.4625L18.45 7.85626H12.3375C11.8875 7.85626 11.475 8.11876 11.2687 8.53126L9.05622 13.1813L1.55622 11.7188C1.06872 11.625 0.562472 11.8313 0.262471 12.2438C-0.0375285 12.6563 -0.0187785 13.05 0.112471 13.65C0.487471 15.3375 1.12497 17.6625 2.69997 20.0438C3.71247 21.5813 5.71872 24.75 8.32497 24.7875H27.45C28.4437 24.7875 29.2875 24.0375 29.4 23.025L30.0375 16.7813L27.0187 16.2375H26.9812ZM10.575 13.425L12.075 9.82501C12.2625 9.39376 12.6937 9.09376 13.1625 9.09376H23.9437C24.2437 9.09376 24.4875 9.31876 24.525 9.60001L25.3875 15.8813L10.575 13.4063V13.425Z" fill="black"/>
<path d="M16.2375 13.05C16.8484 13.05 17.3437 12.5547 17.3437 11.9437C17.3437 11.3328 16.8484 10.8375 16.2375 10.8375C15.6265 10.8375 15.1312 11.3328 15.1312 11.9437C15.1312 12.5547 15.6265 13.05 16.2375 13.05Z" fill="black"/>
......
Seilassist/Sailassist/Assets.xcassets/IconImage/Chat/chat_ship.imageset/icon_ship_1.svg 0 → 100644
View file @ c8ea3a7d
<svg viewBox="0 0 30 30" fill="non"
xmlns="http://www.w3.org/2000/svg">
<path d="M26.9812 16.2375L25.8937 8.36251C25.8562 8.06251 25.6125 7.85626 25.3125 7.85626H23.2687V5.23126H19.4625L18.45 7.85626H12.3375C11.8875 7.85626 11.475 8.11876 11.2687 8.53126L9.05622 13.1813L1.55622 11.7188C1.06872 11.625 0.562472 11.8313 0.262471 12.2438C-0.0375285 12.6563 -0.0187785 13.05 0.112471 13.65C0.487471 15.3375 1.12497 17.6625 2.69997 20.0438C3.71247 21.5813 5.71872 24.75 8.32497 24.7875H27.45C28.4437 24.7875 29.2875 24.0375 29.4 23.025L30.0375 16.7813L27.0187 16.2375H26.9812ZM10.575 13.425L12.075 9.82501C12.2625 9.39376 12.6937 9.09376 13.1625 9.09376H23.9437C24.2437 9.09376 24.4875 9.31876 24.525 9.60001L25.3875 15.8813L10.575 13.4063V13.425Z" fill="#FFF"/>
<path d="M16.2375 13.05C16.8484 13.05 17.3437 12.5547 17.3437 11.9437C17.3437 11.3328 16.8484 10.8375 16.2375 10.8375C15.6265 10.8375 15.1312 11.3328 15.1312 11.9437C15.1312 12.5547 15.6265 13.05 16.2375 13.05Z" fill="#FFF"/>
<path d="M20.5125 13.05C21.1235 13.05 21.6187 12.5547 21.6187 11.9437C21.6187 11.3328 21.1235 10.8375 20.5125 10.8375C19.9015 10.8375 19.4062 11.3328 19.4062 11.9437C19.4062 12.5547 19.9015 13.05 20.5125 13.05Z" fill="#FFF"/>
</svg>
Seilassist/Sailassist/Assets.xcassets/IconImage/Chat/company_black.imageset/Contents.json 0 → 100644
View file @ c8ea3a7d
{
"images" : [
{
"filename" : "icon_company.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Seilassist/Sailassist/Assets.xcassets/IconImage/Chat/company_black.imageset/icon_company.svg 0 → 100644
View file @ c8ea3a7d
<svg viewBox="0 0 30 30" fill="none"
xmlns="http://www.w3.org/2000/svg">
<path d="M22.1438 7.87501V2.13751H7.85626V7.85626H2.13751V27.8625H13.575V22.1438H16.425V27.8625H27.8625V7.87501H22.1438ZM7.85626 25.0125H5.00626V22.1625H7.85626V25.0125ZM7.85626 19.2938H5.00626V16.4438H7.85626V19.2938ZM7.85626 13.575H5.00626V10.725H7.85626V13.575ZM13.575 19.2938H10.725V16.4438H13.575V19.2938ZM13.575 13.575H10.725V10.725H13.575V13.575ZM13.575 7.85626H10.725V5.00626H13.575V7.85626ZM19.2938 19.2938H16.4438V16.4438H19.2938V19.2938ZM19.2938 13.575H16.4438V10.725H19.2938V13.575ZM24.9938 13.575H22.1438V10.725H24.9938V13.575ZM19.2938 7.85626H16.4438V5.00626H19.2938V7.85626ZM25.0125 24.9938H22.1625V22.1438H25.0125V24.9938ZM25.0125 19.275H22.1625V16.425H25.0125V19.275Z" fill="black"/>
</svg>
Seilassist/Sailassist/Assets.xcassets/IconImage/Chat/ship_black.imageset/Contents.json 0 → 100644
View file @ c8ea3a7d
{
"images" : [
{
"filename" : "icon_ship.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Seilassist/Sailassist/Assets.xcassets/IconImage/Chat/ship_black.imageset/icon_ship.svg 0 → 100644
View file @ c8ea3a7d
<svg viewBox="0 0 30 30" fill="none"
xmlns="http://www.w3.org/2000/svg">
<path d="M26.9812 16.2375L25.8937 8.36251C25.8562 8.06251 25.6125 7.85626 25.3125 7.85626H23.2687V5.23126H19.4625L18.45 7.85626H12.3375C11.8875 7.85626 11.475 8.11876 11.2687 8.53126L9.05622 13.1813L1.55622 11.7188C1.06872 11.625 0.562472 11.8313 0.262471 12.2438C-0.0375285 12.6563 -0.0187785 13.05 0.112471 13.65C0.487471 15.3375 1.12497 17.6625 2.69997 20.0438C3.71247 21.5813 5.71872 24.75 8.32497 24.7875H27.45C28.4437 24.7875 29.2875 24.0375 29.4 23.025L30.0375 16.7813L27.0187 16.2375H26.9812ZM10.575 13.425L12.075 9.82501C12.2625 9.39376 12.6937 9.09376 13.1625 9.09376H23.9437C24.2437 9.09376 24.4875 9.31876 24.525 9.60001L25.3875 15.8813L10.575 13.4063V13.425Z" fill="black"/>
<path d="M16.2375 13.05C16.8484 13.05 17.3437 12.5547 17.3437 11.9437C17.3437 11.3328 16.8484 10.8375 16.2375 10.8375C15.6265 10.8375 15.1312 11.3328 15.1312 11.9437C15.1312 12.5547 15.6265 13.05 16.2375 13.05Z" fill="black"/>
<path d="M20.5125 13.05C21.1235 13.05 21.6187 12.5547 21.6187 11.9437C21.6187 11.3328 21.1235 10.8375 20.5125 10.8375C19.9015 10.8375 19.4062 11.3328 19.4062 11.9437C19.4062 12.5547 19.9015 13.05 20.5125 13.05Z" fill="black"/>
</svg>
Seilassist/Sailassist/Chat/ChatView.swift
View file @ c8ea3a7d
......@@ -11,6 +11,7 @@ struct ChatView: View {
@EnvironmentObject private var selectedTabModel: SelectedTabModel
@ObservedObject var message = SharingData.message
@State var isShowMember: Bool = false
@State var isNotification = Preferences.ChatNotification
var body: some View {
ZStack {
......@@ -19,7 +20,7 @@ struct ChatView: View {
.ignoresSafeArea()
}
VStack(spacing: 0){
ChatTitleView(isShowMember: $isShowMember)
ChatTitleView(isShowMember: $isShowMember, isNotification: $isNotification)
ZStack{
ScrollViewReader { proxy in
......
Seilassist/Sailassist/Chat/View/ChatMemberView.swift
View file @ c8ea3a7d
......@@ -9,22 +9,21 @@ import SwiftUI
struct ChatMemberView: View {
@ObservedObject var message = SharingData.message
// var members = ["Yokoyama", "Nogami", "Arahira", "Enokido"]
var body: some View {
VStack {
List {
ForEach(message.users, id: \.id) { user in
HStack {
if user.location == 1 {
Image("chat_company")
Image("company_black")
.resizable()
.scaledToFill()
.frame(width: 12, height: 12)
} else {
Image("chat_ship")
Image("ship_black")
.resizable()
.scaledToFill()
.frame(width: 10, height: 10)
.frame(width: 12, height: 12)
}
Text(user.name)
......
Seilassist/Sailassist/Chat/View/ChatTitleView.swift
View file @ c8ea3a7d
......@@ -9,6 +9,7 @@ import SwiftUI
struct ChatTitleView: View {
@Binding var isShowMember: Bool
@Binding var isNotification: Bool
@ObservedObject var message = SharingData.message
var body: some View {
......@@ -53,9 +54,9 @@ struct ChatTitleView: View {
Spacer()
Button{
isNotification = chatNotification()
}label: {
Image("chat_alert")
Image(isNotification ? "chat_alert" : "chat_alert_none")
.resizable()
.scaledToFit()
.frame(width: 30, height: 30)
......@@ -80,8 +81,20 @@ struct ChatTitleView: View {
}
return usersName
}
/**
* チャット通知のON/OFF
*/
func chatNotification() -> Bool {
var isNotification = Preferences.ChatNotification
isNotification.toggle()
Preferences.ChatNotification = isNotification
print(debug: "Test: \(isNotification)")
return isNotification
}
}
#Preview {
ChatTitleView(isShowMember: .constant(false))
ChatTitleView(isShowMember: .constant(false), isNotification: .constant(false))
}
Seilassist/Sailassist/Chat/View/MyChatContentView.swift
View file @ c8ea3a7d
......@@ -43,7 +43,7 @@ struct MyChatContentView: View {
HStack(spacing: 5){
//既読マーク
Text(DateTextLib.ISO86012FormatText(message.time, format: "yyyy/MM/dd hh:mm", errFormat: ""))
Text(DateTextLib.ISO86012FormatText(message.time, format: "yyyy/MM/dd HH:mm", errFormat: ""))
.padding(.trailing, 8)
let viewerCnt = viewerCnt()
......@@ -51,7 +51,7 @@ struct MyChatContentView: View {
Image("chat_company")
.resizable()
.scaledToFit()
.frame(width: 17, height: 17)
.frame(width: 12, height: 12)
.padding(.trailing, 4)
Text(String(viewerCnt.0))
......@@ -59,7 +59,7 @@ struct MyChatContentView: View {
Image("chat_ship")
.resizable()
.scaledToFit()
.frame(width: 17, height: 17)
.frame(width: 12, height: 12)
.padding(.trailing, 4)
Text(String(viewerCnt.1))
......
Seilassist/Sailassist/Chat/View/OtherChatContentView.swift
View file @ c8ea3a7d
......@@ -45,7 +45,7 @@ struct OtherChatContentView: View {
}
HStack(alignment: .top) {
Text(DateTextLib.ISO86012FormatText(message.time, format: "yyyy/MM/dd hh:mm", errFormat: ""))
Text(DateTextLib.ISO86012FormatText(message.time, format: "yyyy/MM/dd HH:mm", errFormat: ""))
.font(FontStyle.DateText.font)
.foregroundColor(ColorSet.ChatDate.color)
}
......
Seilassist/Sailassist/Preferences/Preferences.swift
View file @ c8ea3a7d
......@@ -67,6 +67,8 @@ class Preferences{
@AppStorage(PreferencesKey.TypeString.InmalsatC.rawValue) static var InmalsatCManualVer: String?
@AppStorage(PreferencesKey.TypeString.InternationalVHF.rawValue) static var InternationalVHFManualVer: String?
@AppStorage(PreferencesKey.TypeString.VDR.rawValue) static var VDRManualVer: String?
@AppStorage(wrappedValue:true, PreferencesKey.TypeBool.chatNotification.rawValue) static var ChatNotification: Bool
}
......
Seilassist/Sailassist/Preferences/PreferencesKey.swift
View file @ c8ea3a7d
......@@ -39,5 +39,8 @@ class PreferencesKey{
case PrivacyPolicyAgreeDate
}
enum TypeBool: String{
case chatNotification
}
}
Seilassist/Sailassist/SailassistApp.swift
View file @ c8ea3a7d
......@@ -333,6 +333,11 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
if subtitle == Preferences.UserName {
return
}
//チャット通知OFF
if Preferences.ChatNotification == false {
return
}
case "sailassist":
print(debug: "sailassist")
let getPushHistory = GetPushHistory()
......@@ -383,6 +388,11 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
let message = GetMessage()
message.start()
//チャット通知OFF
if Preferences.ChatNotification == false {
return
}
case "sailassist":
print(debug: "sailassist")
SharingData.pushHistory.viewCnt += 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment