Fastlaneの修正・マップ配色変更 (#687)

* update * update screenshot * fix * fix: fastlane * fix: mapcolor * Restyle Fastlaneの修正・マップ配色変更 (#688) Restyled by prettier-markdown Co-authored-by: Restyled.io <[email protected]> --------- Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com> Co-authored-by: Restyled.io <[email protected]>
YumNumm · May 18, 2024 · 5113692 · 5113692
1 parent 605c690
commit 5113692
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 29 deletions.
diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj
@@ -553,7 +553,7 @@
  CODE_SIGN_IDENTITY = "Apple Development";
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Ryotaro Onoue (CPL7H8SHVM)";
  CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 1163;
+ CURRENT_PROJECT_VERSION = 1166;
  DEVELOPMENT_TEAM = "";
  "DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
  ENABLE_BITCODE = NO;
@@ -589,7 +589,7 @@
  CODE_SIGN_IDENTITY = "Apple Development";
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
  CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 1163;
+ CURRENT_PROJECT_VERSION = 1166;
  DEVELOPMENT_TEAM = "";
  "DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
  ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -632,7 +632,7 @@
  CODE_SIGN_IDENTITY = "Apple Development";
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
  CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 1163;
+ CURRENT_PROJECT_VERSION = 1166;
  DEVELOPMENT_TEAM = "";
  "DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
  ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -674,7 +674,7 @@
  CODE_SIGN_IDENTITY = "Apple Development";
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
  CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 1163;
+ CURRENT_PROJECT_VERSION = 1166;
  DEVELOPMENT_TEAM = "";
  "DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
  ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -821,7 +821,7 @@
  CODE_SIGN_IDENTITY = "Apple Development";
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Ryotaro Onoue (7PWJ49VWRZ)";
  CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 1163;
+ CURRENT_PROJECT_VERSION = 1166;
  DEVELOPMENT_TEAM = "";
  "DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
  ENABLE_BITCODE = NO;
@@ -854,7 +854,7 @@
  CODE_SIGN_IDENTITY = "Apple Development";
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Ryotaro Onoue (CPL7H8SHVM)";
  CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 1163;
+ CURRENT_PROJECT_VERSION = 1166;
  DEVELOPMENT_TEAM = "";
  "DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
  ENABLE_BITCODE = NO;

diff --git a/app/ios/Runner/Info.plist b/app/ios/Runner/Info.plist
@@ -23,7 +23,7 @@
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>
- <string>1163</string>
+ <string>1166</string>
  <key>LSApplicationCategoryType</key>
  <string></string>
  <key>LSApplicationQueriesSchemes</key>

diff --git a/app/ios/fastlane/Fastfile b/app/ios/fastlane/Fastfile
@@ -65,11 +65,9 @@ platform :ios do
 
  # Upload the project
  changelog = changelog_from_git_commits(
- date_format: "%Y-%m-%d",
- between: [last_git_tag, "HEAD"],
- pretty: "- %s",
- match_lightweight_tag: false,
- merge_commit_filtering: "exclude_merges"
+ between: [last_git_tag , "HEAD"],
+ pretty: "- [%ad] %an: %s %h",
+ date_format: "short",
  )
  upload_to_testflight(
  ipa: "./Runner.ipa",
@@ -83,11 +81,9 @@ platform :ios do
  setup_ci if ENV['CI']
  # Upload the project
  changelog = changelog_from_git_commits(
- date_format: "%Y-%m-%d",
- between: [last_git_tag, "HEAD"],
- pretty: "- %s",
- match_lightweight_tag: false,
- merge_commit_filtering: "exclude_merges"
+ between: [last_git_tag , "HEAD"],
+ pretty: "- [%ad] %an: %s %h",
+ date_format: "short",
  )
  upload_to_testflight(
  ipa: "./Runner.ipa",
@@ -125,17 +121,15 @@ platform :ios do
 
  # Upload the project
  changelog = changelog_from_git_commits(
- date_format: "%Y-%m-%d",
- between: [last_git_tag, "HEAD"],
- pretty: "- %s",
- match_lightweight_tag: false,
- merge_commit_filtering: "exclude_merges"
+ between: [last_git_tag , "HEAD"],
+ pretty: "- [%ad] %an: %s %h",
+ date_format: "short",
  )
  firebase_app_distribution(
  app: FIREBASE_APP_ID,
  ipa_path: "Runner.ipa",
  groups: "main",
- release_notes_file: changelog,
+ release_notes: changelog,
  service_credentials_file: "./credentials.json",
  )
  end

diff --git a/app/lib/core/component/container/bordered_container.dart b/app/lib/core/component/container/bordered_container.dart
@@ -54,11 +54,11 @@ class BorderedContainer extends StatelessWidget {
  return Card(
  clipBehavior: Clip.antiAlias,
  elevation: elevation,
- color: accentColor ?? theme.cardColor,
+ color: accentColor ?? theme.colorScheme.surfaceContainer,
  // border
  shape: RoundedRectangleBorder(
  side: BorderSide(
- color: theme.colorScheme.onSurface.withOpacity(0.2),
+ color: theme.colorScheme.onSurfaceVariant.withOpacity(0.3),
  ),
  borderRadius: borderRadius,
  ),

diff --git a/app/lib/core/component/sheet/basic_modal_sheet.dart b/app/lib/core/component/sheet/basic_modal_sheet.dart
@@ -53,7 +53,7 @@ class BasicModalSheet extends HookWidget {
  decoration: BoxDecoration(
  borderRadius:
  const BorderRadius.vertical(top: Radius.circular(28)),
- color: theme.colorScheme.surface,
+ color: theme.colorScheme.surfaceContainerLowest,
  border: Border.all(
  color: theme.colorScheme.onSurface.withOpacity(0.1),
  ),

diff --git a/app/lib/core/provider/map/map_config.dart b/app/lib/core/provider/map/map_config.dart
@@ -40,7 +40,7 @@ class MapColorScheme with _$MapColorScheme {
 
  factory MapColorScheme.light({required ColorScheme colorScheme}) =>
  MapColorScheme(
- backgroundColor: colorScheme.surfaceContainerHighest,
+ backgroundColor: colorScheme.surfaceContainerLowest,
  worldLandColor: colorScheme.surface,
  worldLineColor: colorScheme.onSurfaceVariant,
  japanLandColor: colorScheme.surface,
@@ -65,7 +65,7 @@ class MapColorScheme with _$MapColorScheme {
  japanLineColor: colorScheme.onSurfaceVariant,
  );*/
  MapColorScheme(
- backgroundColor: colorScheme.surface,
+ backgroundColor: colorScheme.surfaceContainerLowest,
  worldLandColor: colorScheme.surfaceContainerHighest,
  worldLineColor: colorScheme.onSurfaceVariant,
  japanLandColor: colorScheme.surfaceContainerHighest,

diff --git a/app/pubspec.yaml b/app/pubspec.yaml
@@ -2,7 +2,7 @@ name: eqmonitor
 description: An earthquake monitoring Application
 publish_to: "none"
 
-version: 2.4.3+1115
+version: 2.5.0+1170
 
 environment:
  sdk: ^3.4.0