From f2ac93ddb69b6558a3f36a759774aaf99a34f8e1 Mon Sep 17 00:00:00 2001 From: sumiyama <80329420+onakama@users.noreply.github.com> Date: Tue, 29 Aug 2023 11:44:28 +0900 Subject: [PATCH 1/3] add gradient color --- .../Contents.json | 38 +++++++++++++++++++ .../Contents.json | 38 +++++++++++++++++++ .../Sources/Timetable/TimetableView.swift | 6 ++- 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 app-ios/Modules/Sources/Theme/Resources/Colors.xcassets/Surface/Surface Gradient Bottom.colorset/Contents.json create mode 100644 app-ios/Modules/Sources/Theme/Resources/Colors.xcassets/Surface/Surface Gradient TOP.colorset/Contents.json diff --git a/app-ios/Modules/Sources/Theme/Resources/Colors.xcassets/Surface/Surface Gradient Bottom.colorset/Contents.json b/app-ios/Modules/Sources/Theme/Resources/Colors.xcassets/Surface/Surface Gradient Bottom.colorset/Contents.json new file mode 100644 index 000000000..48dcac8c4 --- /dev/null +++ b/app-ios/Modules/Sources/Theme/Resources/Colors.xcassets/Surface/Surface Gradient Bottom.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xD3", + "green" : "0xFF", + "red" : "0xF6" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x25", + "green" : "0x46", + "red" : "0x2D" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/app-ios/Modules/Sources/Theme/Resources/Colors.xcassets/Surface/Surface Gradient TOP.colorset/Contents.json b/app-ios/Modules/Sources/Theme/Resources/Colors.xcassets/Surface/Surface Gradient TOP.colorset/Contents.json new file mode 100644 index 000000000..b28a953b5 --- /dev/null +++ b/app-ios/Modules/Sources/Theme/Resources/Colors.xcassets/Surface/Surface Gradient TOP.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xE5", + "red" : "0xA9" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x10", + "green" : "0x0D", + "red" : "0x05" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/app-ios/Modules/Sources/Timetable/TimetableView.swift b/app-ios/Modules/Sources/Timetable/TimetableView.swift index 4444d66ce..ad553a150 100644 --- a/app-ios/Modules/Sources/Timetable/TimetableView.swift +++ b/app-ios/Modules/Sources/Timetable/TimetableView.swift @@ -14,6 +14,10 @@ enum TimetableRouting: Hashable { public struct TimetableView: View { @ObservedObject var viewModel: TimetableViewModel = .init() private let sessionViewBuilder: ViewProvider + let gradient = Gradient(stops: [ + .init(color: AssetColors.Surface.surfaceGradientTop.swiftUIColor, location: 0.0), + .init(color: AssetColors.Surface.surfaceGradientBottom.swiftUIColor, location: 0.2) + ]) // Determines whether or not to collapse. private let verticalOffsetThreshold = -142.0 @@ -90,7 +94,7 @@ public struct TimetableView: View { } } } - .background(AssetColors.Surface.surfaceVariant.swiftUIColor) + .background(LinearGradient(gradient: gradient, startPoint: .top, endPoint: .bottom)) .toolbarBackground(AssetColors.Surface.surfaceVariant.swiftUIColor, for: .navigationBar) .toolbar { Group { From b62b837eb5d96dbb50f2de3a776f6eabb4098727 Mon Sep 17 00:00:00 2001 From: sumiyama <80329420+onakama@users.noreply.github.com> Date: Tue, 29 Aug 2023 12:13:42 +0900 Subject: [PATCH 2/3] Adjusting the gradation location --- app-ios/Modules/Sources/Timetable/TimetableView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-ios/Modules/Sources/Timetable/TimetableView.swift b/app-ios/Modules/Sources/Timetable/TimetableView.swift index ad553a150..76504f102 100644 --- a/app-ios/Modules/Sources/Timetable/TimetableView.swift +++ b/app-ios/Modules/Sources/Timetable/TimetableView.swift @@ -16,7 +16,7 @@ public struct TimetableView: View { private let sessionViewBuilder: ViewProvider let gradient = Gradient(stops: [ .init(color: AssetColors.Surface.surfaceGradientTop.swiftUIColor, location: 0.0), - .init(color: AssetColors.Surface.surfaceGradientBottom.swiftUIColor, location: 0.2) + .init(color: AssetColors.Surface.surfaceGradientBottom.swiftUIColor, location: 0.15) ]) // Determines whether or not to collapse. From c600d3a596fcb9a547831a21904396f29298c73f Mon Sep 17 00:00:00 2001 From: sumiyama <80329420+onakama@users.noreply.github.com> Date: Tue, 5 Sep 2023 00:44:38 +0900 Subject: [PATCH 3/3] fix Gradient color name --- app-ios/Modules/Sources/Timetable/TimetableView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-ios/Modules/Sources/Timetable/TimetableView.swift b/app-ios/Modules/Sources/Timetable/TimetableView.swift index 76504f102..1441f82a1 100644 --- a/app-ios/Modules/Sources/Timetable/TimetableView.swift +++ b/app-ios/Modules/Sources/Timetable/TimetableView.swift @@ -15,7 +15,7 @@ public struct TimetableView: View { @ObservedObject var viewModel: TimetableViewModel = .init() private let sessionViewBuilder: ViewProvider let gradient = Gradient(stops: [ - .init(color: AssetColors.Surface.surfaceGradientTop.swiftUIColor, location: 0.0), + .init(color: AssetColors.Surface.surfaceGradientTOP.swiftUIColor, location: 0.0), .init(color: AssetColors.Surface.surfaceGradientBottom.swiftUIColor, location: 0.15) ])