震源・震度アイコン描画バグの修正 (#579)

* update: flutter 3.20.0-1.1.pre-beta * fix: 地震履歴詳細画面 * fix: kmoni, home * fix: EEW表示領域調整
YumNumm · Feb 21, 2024 · aea17c8 · aea17c8
1 parent f48bee0
commit aea17c8
Show file tree

Hide file tree

Showing 47 changed files with 1,429 additions and 410 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
diff --git a/.fvmrc b/.fvmrc
@@ -0,0 +1,3 @@
+{
+  "flutter": "3.20.0-1.1.pre@beta"
+}
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-.fvm/flutter_sdk
 .crashlytics
 
 .env
@@ -129,7 +128,6 @@ app.*.symbols
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
 
-
 # Web related
 
 # Obfuscation related
@@ -168,3 +166,6 @@ ios/*.p8
 
 *.pem
 *_old
+
+# FVM Version Cache
+.fvm/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-  "dart.flutterSdkPath": ".fvm/flutter_sdk",
+  "dart.flutterSdkPath": ".fvm/versions/3.20.0-1.1.pre@beta",
   "search.exclude": {
     "**/.fvm": true,
     "*.geojson": true
@@ -14,4 +14,4 @@
     "*.dart": "${capture}.g.dart, ${capture}.freezed.dart, ${capture}.viewmodel.dart"
   },
   "cmake.sourceDirectory": "/Users/r_onoue/dev/EQMonitor/windows/flutter"
-}
+}
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.8.20'
+    ext.kotlin_version = '1.9.22'
     repositories {
         google()
         mavenCentral()

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -517,7 +517,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1127;
+				CURRENT_PROJECT_VERSION = 1128;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_BITCODE = NO;
@@ -552,7 +552,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1127;
+				CURRENT_PROJECT_VERSION = 1128;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -594,7 +594,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1127;
+				CURRENT_PROJECT_VERSION = 1128;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -635,7 +635,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1127;
+				CURRENT_PROJECT_VERSION = 1128;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -779,7 +779,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1127;
+				CURRENT_PROJECT_VERSION = 1128;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_BITCODE = NO;
@@ -811,7 +811,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1127;
+				CURRENT_PROJECT_VERSION = 1128;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_BITCODE = NO;

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1127</string>
+	<string>1128</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>

diff --git a/lib/core/component/sheet/sheet_floating_action_buttons.dart b/lib/core/component/sheet/sheet_floating_action_buttons.dart
@@ -23,14 +23,13 @@ class SheetFloatingActionButtons extends HookWidget {
   final SheetController controller;
   @override
   Widget build(BuildContext context) {
-    final theme = Theme.of(context);
     final size = MediaQuery.sizeOf(context);
     final padding = MediaQuery.paddingOf(context);
     // safearea取得
     final height = size.height -
         (padding.top +
             // SafeAreaのtop部分, AppBarの高さ
-            (hasAppBar ? AppBar().preferredSize.height ?? 0 : 0));
+            (hasAppBar ? AppBar().preferredSize.height : 0));
     return AnimatedBuilder(
       animation: controller.animation,
       builder: (BuildContext context, Widget? child) {

diff --git a/lib/core/provider/user_id/user_id_provider.dart b/lib/core/provider/user_id/user_id_provider.dart
@@ -12,7 +12,7 @@ class UserId extends _$UserId {
     if (previousUserId != null) {
       return previousUserId;
     }
-    final newUserId = Uuid().v8();
+    final newUserId = const Uuid().v8();
     save(newUserId);
     return newUserId;
   }

diff --git a/lib/feature/earthquake_history_details/component/earthquake_map.dart b/lib/feature/earthquake_history_details/component/earthquake_map.dart
@@ -718,10 +718,10 @@ class _StationAction extends _Action {
             'interpolate',
             ['linear'],
             ['zoom'],
-            6,
-            1,
+            3,
+            0.3,
             20,
-            2,
+            1,
           ],
           iconOpacity: [
             'step',
@@ -752,9 +752,9 @@ class _StationAction extends _Action {
             ['linear'],
             ['zoom'],
             3,
-            0.3,
-            20,
-            2,
+            0.1,
+            7,
+            0.4,
           ],
           textAllowOverlap: true,
           iconAllowOverlap: true,
@@ -766,6 +766,7 @@ class _StationAction extends _Action {
           intensity.type,
         ],
         sourceLayer: 'station-intensity',
+        belowLayerId: 'hypocenter',
       );
     }
 
@@ -848,7 +849,7 @@ class _HypocenterAction extends _Action {
               3,
               0.3,
               20,
-              5,
+              1,
             ],
             iconOpacity: [
               'interpolate',
@@ -857,7 +858,7 @@ class _HypocenterAction extends _Action {
               6,
               1.0,
               10,
-              0.5,
+              0.8,
             ],
             iconAllowOverlap: true,
           ),
@@ -1046,6 +1047,7 @@ class _StationIntensityLpgmAction extends _Action {
             20,
             2,
           ],
+          iconOptional: 0.8,
           textAllowOverlap: true,
           iconAllowOverlap: true,
         ),

diff --git a/lib/feature/earthquake_history_details/screen/earthquake_history_details.dart b/lib/feature/earthquake_history_details/screen/earthquake_history_details.dart
@@ -111,46 +111,43 @@ class EarthquakeHistoryDetailsPage extends HookConsumerWidget {
                   IgnorePointer(
                     child: AnimatedSwitcher(
                       duration: const Duration(milliseconds: 250),
-                      child: Visibility(
-                        visible: !config.showIntensityIcon,
-                        child: BorderedContainer(
-                          key: ValueKey(
-                            (config, maxIntensity, maxLgIntensity),
-                          ),
-                          margin: const EdgeInsets.all(4),
-                          padding: const EdgeInsets.all(4),
-                          borderRadius: BorderRadius.circular((25 / 5) + 5),
-                          child: Wrap(
-                            spacing: 8,
-                            runSpacing: 8,
-                            children: [
-                              if (config.showingLpgmIntensity &&
-                                  maxLgIntensity != null)
-                                for (final intensity in [
-                                  ...JmaLgIntensity.values,
-                                ].where(
-                                  (e) =>
-                                      e != JmaLgIntensity.zero &&
-                                      e <= maxLgIntensity,
-                                ))
-                                  JmaLgIntensityIcon(
-                                    type: IntensityIconType.filled,
-                                    intensity: intensity,
-                                    size: 25,
-                                  )
-                              else
-                                for (final intensity in [
-                                  ...JmaIntensity.values,
-                                ].where(
-                                  (e) => e <= maxIntensity!,
-                                ))
-                                  JmaIntensityIcon(
-                                    type: IntensityIconType.filled,
-                                    intensity: intensity,
-                                    size: 25,
-                                  ),
-                            ],
-                          ),
+                      child: BorderedContainer(
+                        key: ValueKey(
+                          (config, maxIntensity, maxLgIntensity),
+                        ),
+                        margin: const EdgeInsets.all(4),
+                        padding: const EdgeInsets.all(4),
+                        borderRadius: BorderRadius.circular((25 / 5) + 5),
+                        child: Wrap(
+                          spacing: 8,
+                          runSpacing: 8,
+                          children: [
+                            if (config.showingLpgmIntensity &&
+                                maxLgIntensity != null)
+                              for (final intensity in [
+                                ...JmaLgIntensity.values,
+                              ].where(
+                                (e) =>
+                                    e != JmaLgIntensity.zero &&
+                                    e <= maxLgIntensity,
+                              ))
+                                JmaLgIntensityIcon(
+                                  type: IntensityIconType.filled,
+                                  intensity: intensity,
+                                  size: 25,
+                                )
+                            else
+                              for (final intensity in [
+                                ...JmaIntensity.values,
+                              ].where(
+                                (e) => e <= maxIntensity!,
+                              ))
+                                JmaIntensityIcon(
+                                  type: IntensityIconType.filled,
+                                  intensity: intensity,
+                                  size: 25,
+                                ),
+                          ],
                         ),
                       ),
                     ),