Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
Sailassist
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
54
Merge Requests
54
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gr-ssv
Sailassist
Commits
61d961f1
Commit
61d961f1
authored
Aug 06, 2024
by
shigemi miura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ECA Startボタン連打対策
チャットOFF時のアイコン対応
parent
92a39654
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
91 additions
and
4 deletions
+91
-4
project.pbxproj
Seilassist/Sailassist.xcodeproj/project.pbxproj
+3
-3
Contents.json
...IconImage/TabItem/tab_chat_Invalid.imageset/Contents.json
+52
-0
chat_Dark_Invalid.svg
...e/TabItem/tab_chat_Invalid.imageset/chat_Dark_Invalid.svg
+12
-0
chat_Invalid.svg
...nImage/TabItem/tab_chat_Invalid.imageset/chat_Invalid.svg
+12
-0
FuelSwitchingView.swift
Seilassist/Sailassist/Map/Task/View/FuelSwitchingView.swift
+7
-1
MainTabView.swift
Seilassist/Sailassist/Tab/MainTabView.swift
+5
-0
No files found.
Seilassist/Sailassist.xcodeproj/project.pbxproj
View file @
61d961f1
...
@@ -1307,7 +1307,7 @@
...
@@ -1307,7 +1307,7 @@
CODE_SIGN_ENTITLEMENTS
=
Sailassist/Sailassist.entitlements
;
CODE_SIGN_ENTITLEMENTS
=
Sailassist/Sailassist.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
4
5
;
CURRENT_PROJECT_VERSION
=
4
6
;
DEVELOPMENT_ASSET_PATHS
=
"\"Sailassist/Preview Content\""
;
DEVELOPMENT_ASSET_PATHS
=
"\"Sailassist/Preview Content\""
;
DEVELOPMENT_TEAM
=
D2DC7QNNJ8
;
DEVELOPMENT_TEAM
=
D2DC7QNNJ8
;
ENABLE_PREVIEWS
=
YES
;
ENABLE_PREVIEWS
=
YES
;
...
@@ -1353,7 +1353,7 @@
...
@@ -1353,7 +1353,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME
=
AccentColor
;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME
=
AccentColor
;
CODE_SIGN_ENTITLEMENTS
=
Sailassist/Sailassist.entitlements
;
CODE_SIGN_ENTITLEMENTS
=
Sailassist/Sailassist.entitlements
;
CODE_SIGN_STYLE
=
Automatic
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
4
5
;
CURRENT_PROJECT_VERSION
=
4
6
;
DEVELOPMENT_ASSET_PATHS
=
"\"Sailassist/Preview Content\""
;
DEVELOPMENT_ASSET_PATHS
=
"\"Sailassist/Preview Content\""
;
DEVELOPMENT_TEAM
=
D2DC7QNNJ8
;
DEVELOPMENT_TEAM
=
D2DC7QNNJ8
;
ENABLE_PREVIEWS
=
YES
;
ENABLE_PREVIEWS
=
YES
;
...
@@ -1536,7 +1536,7 @@
...
@@ -1536,7 +1536,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME
=
AccentColor
;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME
=
AccentColor
;
CODE_SIGN_ENTITLEMENTS
=
Sailassist/Sailassist.entitlements
;
CODE_SIGN_ENTITLEMENTS
=
Sailassist/Sailassist.entitlements
;
CODE_SIGN_STYLE
=
Automatic
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
4
5
;
CURRENT_PROJECT_VERSION
=
4
6
;
DEVELOPMENT_ASSET_PATHS
=
"\"Sailassist/Preview Content\""
;
DEVELOPMENT_ASSET_PATHS
=
"\"Sailassist/Preview Content\""
;
DEVELOPMENT_TEAM
=
D2DC7QNNJ8
;
DEVELOPMENT_TEAM
=
D2DC7QNNJ8
;
ENABLE_PREVIEWS
=
YES
;
ENABLE_PREVIEWS
=
YES
;
...
...
Seilassist/Sailassist/Assets.xcassets/IconImage/TabItem/tab_chat_Invalid.imageset/Contents.json
0 → 100644
View file @
61d961f1
{
"images"
:
[
{
"filename"
:
"chat_Invalid.svg"
,
"idiom"
:
"universal"
,
"scale"
:
"1x"
},
{
"appearances"
:
[
{
"appearance"
:
"luminosity"
,
"value"
:
"dark"
}
],
"filename"
:
"chat_Dark_Invalid.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"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
Seilassist/Sailassist/Assets.xcassets/IconImage/TabItem/tab_chat_Invalid.imageset/chat_Dark_Invalid.svg
0 → 100644
View file @
61d961f1
<?xml version="1.0" encoding="UTF-8"?>
<svg
id=
"_レイヤー_2"
xmlns=
"http://www.w3.org/2000/svg"
viewBox=
"0 0 26 26"
fill=
"#fff"
fill-opacity=
"0.2"
>
<defs>
<style>
.cls-1,.cls-2{stroke-width:0px;}.cls-2{fill:none;opacity:.1;}
</style>
</defs>
<g
id=
"_レイヤー_4"
>
<rect
class=
"cls-2"
width=
"26"
height=
"26"
/>
<path
class=
"cls-1"
d=
"m20.79,3.26H5.21c-1.07,0-1.94.88-1.94,1.95v17.53s3.88-3.89,3.88-3.89h13.63c1.07,0,1.95-.88,1.95-1.95V5.21c0-1.07-.88-1.95-1.95-1.95Zm-10.71,8.76h-1.95v-1.95h1.95v1.95Zm3.89,0h-1.95v-1.95h1.95v1.95Zm3.89,0h-1.95v-1.95h1.95v1.95Z"
/>
</g>
</svg>
\ No newline at end of file
Seilassist/Sailassist/Assets.xcassets/IconImage/TabItem/tab_chat_Invalid.imageset/chat_Invalid.svg
0 → 100644
View file @
61d961f1
<?xml version="1.0" encoding="UTF-8"?>
<svg
id=
"_レイヤー_2"
xmlns=
"http://www.w3.org/2000/svg"
viewBox=
"0 0 26 26"
fill=
"#7e7e84"
fill-opacity=
"0.2"
>
<defs>
<style>
.cls-1,.cls-2{stroke-width:0px;}.cls-2{fill:none;opacity:.1;}
</style>
</defs>
<g
id=
"_レイヤー_4"
>
<rect
class=
"cls-2"
width=
"26"
height=
"26"
/>
<path
class=
"cls-1"
d=
"m20.79,3.26H5.21c-1.07,0-1.94.88-1.94,1.95v17.53s3.88-3.89,3.88-3.89h13.63c1.07,0,1.95-.88,1.95-1.95V5.21c0-1.07-.88-1.95-1.95-1.95Zm-10.71,8.76h-1.95v-1.95h1.95v1.95Zm3.89,0h-1.95v-1.95h1.95v1.95Zm3.89,0h-1.95v-1.95h1.95v1.95Z"
/>
</g>
</svg>
\ No newline at end of file
Seilassist/Sailassist/Map/Task/View/FuelSwitchingView.swift
View file @
61d961f1
...
@@ -11,6 +11,7 @@ struct FuelSwitchingView: View {
...
@@ -11,6 +11,7 @@ struct FuelSwitchingView: View {
@ObservedObject
var
taskViewModel
:
TaskViewModel
@ObservedObject
var
taskViewModel
:
TaskViewModel
@ObservedObject
var
ecaData
=
SharingData
.
eca
@ObservedObject
var
ecaData
=
SharingData
.
eca
@State
var
isRunningStopAlert
:
Bool
=
false
@State
var
isRunningStopAlert
:
Bool
=
false
@State
var
isRunningButton
:
Bool
=
false
var
body
:
some
View
{
var
body
:
some
View
{
VStack
{
VStack
{
...
@@ -29,6 +30,11 @@ struct FuelSwitchingView: View {
...
@@ -29,6 +30,11 @@ struct FuelSwitchingView: View {
newData
.
isRunning
=
true
newData
.
isRunning
=
true
newData
.
status
=
EcaState
.
running
newData
.
status
=
EcaState
.
running
SharingData
.
eca
.
editEcaArea
(
key
:
eca
.
areaId
,
value
:
newData
,
type
:
EcaOperation
.
Running
)
SharingData
.
eca
.
editEcaArea
(
key
:
eca
.
areaId
,
value
:
newData
,
type
:
EcaOperation
.
Running
)
isRunningButton
=
true
Timer
.
scheduledTimer
(
withTimeInterval
:
3.0
,
repeats
:
false
)
{
timer
in
isRunningButton
=
false
}
}
}
}
label
:
{
}
label
:
{
HStack
{
HStack
{
...
@@ -38,7 +44,7 @@ struct FuelSwitchingView: View {
...
@@ -38,7 +44,7 @@ struct FuelSwitchingView: View {
Spacer
()
Spacer
()
.
frame
(
width
:
10
)
.
frame
(
width
:
10
)
}
}
}
}
.
disabled
(
isRunningButton
)
Text
(
eca
.
name
)
Text
(
eca
.
name
)
.
font
(
FontStyle
.
DefaultText
.
font
)
.
font
(
FontStyle
.
DefaultText
.
font
)
...
...
Seilassist/Sailassist/Tab/MainTabView.swift
View file @
61d961f1
...
@@ -140,8 +140,13 @@ struct CustomTabBar: View {
...
@@ -140,8 +140,13 @@ struct CustomTabBar: View {
},
label
:
{
},
label
:
{
VStack
{
VStack
{
ZStack
(
alignment
:
.
bottomTrailing
)
{
ZStack
(
alignment
:
.
bottomTrailing
)
{
if
!
SharingData
.
my
.
isCommunication
&&
tab
==
Tab
.
chat
{
Image
(
"tab_chat_Invalid"
)
.
font
(
.
title2
)
}
else
{
Image
(
selectedTabModel
.
activeTab
==
tab
?
tab
.
rawValue
+
"_selected"
:
tab
.
rawValue
)
Image
(
selectedTabModel
.
activeTab
==
tab
?
tab
.
rawValue
+
"_selected"
:
tab
.
rawValue
)
.
font
(
.
title2
)
.
font
(
.
title2
)
}
//チャットTab上の既読マーク
//チャットTab上の既読マーク
if
tab
==
Tab
.
chat
{
if
tab
==
Tab
.
chat
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment