地図色をMaterial Color利用へ変更 (#534)

* update flutter * fix: 初期化バグ * fix: 地図色をMaterial Color利用へ変更
YumNumm · Jan 21, 2024 · e30edbd · e30edbd
1 parent 39a705e
commit e30edbd
Show file tree

Hide file tree

Showing 14 changed files with 173 additions and 197 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.16.7",
+  "flutterSdkVersion": "3.19.0-0.2.pre@beta",
   "flavors": {}
 }
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -243,7 +243,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1500;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					85145B1D2B1F5A0100784C85 = {

diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/lib/core/provider/map/map_config.dart b/lib/core/provider/map/map_config.dart
@@ -28,45 +28,31 @@ class MapColorScheme with _$MapColorScheme {
     @JsonKey(fromJson: colorFromJson, toJson: colorToJson)
     required Color worldLandColor,
     @JsonKey(fromJson: colorFromJson, toJson: colorToJson)
-    required Color worldCoastlineColor,
-    @JsonKey(fromJson: colorFromJson, toJson: colorToJson)
-    required Color worldBorderLineColor,
+    required Color worldLineColor,
     @JsonKey(fromJson: colorFromJson, toJson: colorToJson)
     required Color japanLandColor,
     @JsonKey(fromJson: colorFromJson, toJson: colorToJson)
-    required Color japanCoastlineColor,
-    @JsonKey(fromJson: colorFromJson, toJson: colorToJson)
-    required Color japanBorderLineColor,
+    required Color japanLineColor,
   }) = _MapColorScheme;
 
   factory MapColorScheme.fromJson(Map<String, dynamic> json) =>
       _$MapColorSchemeFromJson(json);
 
-  factory MapColorScheme.light() => MapColorScheme(
-        backgroundColor: Color.lerp(
-          const Color.fromARGB(255, 253, 252, 255),
-          Colors.blueAccent,
-          0.3,
-        )!,
-        worldLandColor: Colors.white.withOpacity(0.8),
-        worldCoastlineColor: Colors.black.withOpacity(0.15),
-        worldBorderLineColor: Colors.black.withOpacity(0.3),
-        japanLandColor: Colors.white,
-        japanCoastlineColor: Colors.grey.withOpacity(0.5),
-        japanBorderLineColor: Colors.grey,
+  factory MapColorScheme.light({required ColorScheme colorScheme}) =>
+      MapColorScheme(
+        backgroundColor: colorScheme.surfaceVariant,
+        worldLandColor: colorScheme.surface,
+        worldLineColor: colorScheme.onSurfaceVariant,
+        japanLandColor: colorScheme.surface,
+        japanLineColor: colorScheme.onSurfaceVariant,
       );
 
-  factory MapColorScheme.dark() => MapColorScheme(
-        backgroundColor: Color.lerp(
-          const Color(0xff0a0a0a),
-          Colors.blueAccent,
-          0.3,
-        )!,
-        worldLandColor: Colors.blueGrey.shade900.withOpacity(0.9),
-        worldCoastlineColor: Colors.white.withOpacity(0.3),
-        worldBorderLineColor: Colors.white.withOpacity(0.3),
-        japanLandColor: const Color(0xFF1a1c1e),
-        japanCoastlineColor: Colors.grey.shade400,
-        japanBorderLineColor: Colors.grey,
+  factory MapColorScheme.dark({required ColorScheme colorScheme}) =>
+      MapColorScheme(
+        backgroundColor: colorScheme.surfaceVariant,
+        worldLandColor: colorScheme.surface,
+        worldLineColor: colorScheme.onSurfaceVariant,
+        japanLandColor: colorScheme.surface,
+        japanLineColor: colorScheme.onSurfaceVariant,
       );
 }
diff --git a/lib/core/provider/map/map_config.freezed.dart b/lib/core/provider/map/map_config.freezed.dart