Skip to content

Commit

Permalink
メイン画面のMapLibre化 (#517)
Browse files Browse the repository at this point in the history
* add: EEW震央表示

* add: protoc generator

* increment build num

* fix: code-snippets

* fix: debug時にCrashlyticsへ送信しないように

* fix: [ApiTypes] operatorの実装ミス

* fix: [extensions] 片付けの強化

* add

* fix: Homeボタンの挙動修正

* add: homeボタンのtooltip

* add: privacy manifests

* downgrade to 3.16.7

* fix: parameter loader elevation

* fix: EEW生存条件の引き下げ

* fix: debugger

* fix: TopoJson Mapを削除

* remove: topojson related files

* run melos bootstrap

* Restyle メイン画面のMapLibre化 (#518)

* Restyled by dart-format

* Restyled by prettier-yaml

* Restyled by shellcheck

* Restyled by shfmt

* Restyled by whitespace

---------

Co-authored-by: Restyled.io <[email protected]>

* fix: [ci] protoc install\

* fix: [ci] permission

* Auto format - ref: 517/merge (#519)

Auto format

Co-authored-by: YumNumm <[email protected]>

---------

Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com>
Co-authored-by: Restyled.io <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: YumNumm <[email protected]>
  • Loading branch information
5 people authored Jan 18, 2024
1 parent e18f76c commit 3394d8a
Showing 152 changed files with 4,185 additions and 8,406 deletions.
4 changes: 2 additions & 2 deletions .fvm/fvm_config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"flutterSdkVersion": "3.18.0-0.2.pre@beta",
"flutterSdkVersion": "3.16.7",
"flavors": {}
}
}
1 change: 1 addition & 0 deletions .github/workflows/android-release.yaml
Original file line number Diff line number Diff line change
@@ -79,6 +79,7 @@ jobs:
- name: build_runner
run: |
echo '${{ secrets.ENV }}' | base64 -d > .env
ln -s $FLUTTER_ROOT .fvm/flutter_sdk
melos generate
- name: Accept Android License
5 changes: 4 additions & 1 deletion .github/workflows/auto-format.yaml
Original file line number Diff line number Diff line change
@@ -46,7 +46,10 @@ jobs:
- name: Install dependencies
run: flutter pub get
- name: Install Melos
run: dart pub global activate melos && melos bootstrap
run: |
dart pub global activate melos
ln -s $FLUTTER_ROOT .fvm/flutter_sdk
melos bootstrap
- name: build_runner
run: |
4 changes: 3 additions & 1 deletion .github/workflows/check-pull-request.yaml
Original file line number Diff line number Diff line change
@@ -65,7 +65,9 @@ jobs:
run: dart pub global activate melos

- name: Melos bootstrap
run: melos bootstrap
run: |
ln -s $FLUTTER_ROOT .fvm/flutter_sdk
melos bootstrap
- name: flutter analyze
run: flutter analyze --write=flutter_analyze.log
6 changes: 3 additions & 3 deletions .github/workflows/ios-beta.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: iOS CD (TestFlight)
on:
workflow_dispatch:
#push:
# branches: [main, develop, release/*]
push:
branches: [main, develop, release/*]

jobs:
build:
@@ -21,7 +21,6 @@ jobs:
with:
fetch-depth: 1


- name: Set up ssh
run: |
mkdir -p ~/.ssh
@@ -82,6 +81,7 @@ jobs:
- name: Run build_runner
run: |
echo '${{ secrets.ENV }}' | base64 -d > .env
ln -s $FLUTTER_ROOT .fvm/flutter_sdk
melos generate
- name: Cache Pods
1 change: 1 addition & 0 deletions .github/workflows/tag-release.yaml
Original file line number Diff line number Diff line change
@@ -97,6 +97,7 @@ jobs:
- name: build_runner
run: |
echo '${{ secrets.ENV }}' | base64 -d > .env
ln -s $FLUTTER_ROOT .fvm/flutter_sdk
melos generate
- name: Accept Android License
45 changes: 45 additions & 0 deletions .github/workflows/update-proto.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Protocol Buffer Updator

on:
pull_request:

jobs:
check-update:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
# https://github.com/actions/checkout
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Fetch flutter config
uses: kuhnroyal/flutter-fvm-config-action@v1
# https://github.com/subosito/flutter-action
- name: Set up flutter
uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: ${{ env.FLUTTER_CHANNEL }}
cache: true
cache-key: ${{ env.FLUTTER_VERSION }}-${{ env.FLUTTER_CHANNEL }}
- name: Install protoc
run: sudo apt-get install -y protobuf-compiler
- name: Install protoc-gen-dart
run: dart pub global activate protoc_plugin
- name: Re-generate code
run: |
cd packages/jma_parameter_types
./util/update_proto.sh
# 変更が発生した場合は プルリクエストを作成
- name: Create pull request
uses: peter-evans/create-pull-request@v4
with:
delete-branch: true
commit-message: "Auto format"
committer: "GitHub Actions <[email protected]>"
base: ${{ github.head_ref }}
branch: "auto-format/${{ github.sha }}"
title: "Auto format - ref: ${{ github.ref_name }}"
body: "Auto format by GitHub Actions on ${{ github.sha }}\nby: ${{github.actor}}"
34 changes: 18 additions & 16 deletions .vscode/dart.json.code-snippets
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
{
"Freezed class with import": {
"prefix": "frzclass",
"description": "Create a Freezed class",
"description": "Create a Freezed class with import",
"body": [
"import 'package:freezed_annotation/freezed_annotation.dart';",
"",
"part '${TM_FILENAME_BASE}.freezed.dart';",
"part '${TM_FILENAME_BASE}.g.dart';",
"",
"@freezed",
"class ${1:DataClass} with _$${1:DataClass} {",
"\tconst factory ${1:DataClass}({",
"\t\t@Default(0) int counter, // Add your fields here",
"\t}) = _${1:DataClass};",
"\n",
"\tfactory ${1:DataClass}.fromJson(Map<String, dynamic> json) =>",
"\t\t_$${1:DataClass}FromJson(json);",
"class ${1:${TM_FILENAME_BASE/(.*)/${1:/pascalcase}/g}} with _$${1} {",
"\tconst factory ${1}({",
"\t\t// 必要フィールドを定義",
"\t\trequired String title,",
"\t}) = _${1};",
"",
"\tfactory ${1}.fromJson(Map<String, dynamic> json) =>",
"\t\t_$${1}FromJson(json);",
"}"
]
},
@@ -23,15 +25,15 @@
"description": "Create a Freezed class without import",
"body": [
"@freezed",
"class ${1:DataClass} with _$${1:DataClass} {",
"\tconst factory ${1:DataClass}({",
"\t\t@Default(0) int counter, // Add your fields here",
"\t}) = _${1:DataClass};",
"class ${1:${TM_FILENAME_BASE/(.*)/${1:/pascalcase}/g}} with _$${1} {",
"\tconst factory ${1}({",
"\t\t// 必要フィールドを定義",
"\t\trequired String title,",
"\t}) = _${1};",
"",
"\tfactory ${1:DataClass}.fromJson(Map<String, dynamic> json) =>",
"\t\t\t_$${1:DataClass}FromJson(json);",
"}",
""
"\tfactory ${1}.fromJson(Map<String, dynamic> json) =>",
"\t\t_$${1}FromJson(json);",
"}"
]
},
"JsonEnum": {
1 change: 0 additions & 1 deletion assets/maps/topology_maps.json

This file was deleted.

2 changes: 1 addition & 1 deletion ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
@@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
20 changes: 10 additions & 10 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -16,18 +16,18 @@ PODS:
- Firebase/Messaging (10.18.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 10.18.0)
- firebase_analytics (10.7.4):
- firebase_analytics (10.8.0):
- Firebase/Analytics (= 10.18.0)
- firebase_core
- Flutter
- firebase_core (2.24.2):
- Firebase/CoreOnly (= 10.18.0)
- Flutter
- firebase_crashlytics (3.4.8):
- firebase_crashlytics (3.4.9):
- Firebase/Crashlytics (= 10.18.0)
- firebase_core
- Flutter
- firebase_messaging (14.7.9):
- firebase_messaging (14.7.10):
- Firebase/Messaging (= 10.18.0)
- firebase_core
- Flutter
@@ -253,10 +253,10 @@ SPEC CHECKSUMS:
app_settings: 017320c6a680cdc94c799949d95b84cb69389ebc
device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
Firebase: 414ad272f8d02dfbf12662a9d43f4bba9bec2a06
firebase_analytics: 88c111412070acc2b05c1734151f58824f3db657
firebase_analytics: b3d6dd14c61549a29abb10e9843446a4d8bb53eb
firebase_core: 0af4a2b24f62071f9bf283691c0ee41556dcb3f5
firebase_crashlytics: 55714f63ae0973c54b3a721c451ae5f815086c1f
firebase_messaging: 875385354f623750aa03204a028d640108bc3412
firebase_crashlytics: 4b91b8ad60ee7c168fe88979f84c9573a729de7a
firebase_messaging: 90e8a6db84b6e1e876cebce4f30f01dc495e7014
FirebaseAnalytics: 4d310b35c48eaa4a058ddc04bdca6bdb5dc0fe80
FirebaseCore: 2322423314d92f946219c8791674d2f3345b598f
FirebaseCoreExtension: 62b201498aa10535801cdf3448c7f4db5e24ed80
@@ -265,7 +265,7 @@ SPEC CHECKSUMS:
FirebaseInstallations: e842042ec6ac1fd2e37d7706363ebe7f662afea4
FirebaseMessaging: 9bc34a98d2e0237e1b121915120d4d48ddcf301e
FirebaseSessions: f90fe9212ee2818641eda051c0835c9c4e30d9ae
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
GoogleAppMeasurement: 70ce9aa438cff1cfb31ea3e660bcc67734cb716e
GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe
@@ -275,13 +275,13 @@ SPEC CHECKSUMS:
nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
native_shared_preferences: 21a805f6149643c25a20a4f534692131faebadfe
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265
share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812

PODFILE CHECKSUM: ed004133a4fb69edf7b8ec637bafb0286877f367

60 changes: 60 additions & 0 deletions ios/PrivacyInfo.xcprivacy
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrivacyCollectedDataTypes</key>
<array>
<dict>
<key>NSPrivacyCollectedDataType</key>
<string>NSPrivacyCollectedDataTypeUserID</string>
<key>NSPrivacyCollectedDataTypeLinked</key>
<false/>
<key>NSPrivacyCollectedDataTypeTracking</key>
<false/>
<key>NSPrivacyCollectedDataTypePurposes</key>
<array>
<string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
</array>
</dict>
<dict>
<key>NSPrivacyCollectedDataType</key>
<string>NSPrivacyCollectedDataTypeCrashData</string>
<key>NSPrivacyCollectedDataTypeLinked</key>
<false/>
<key>NSPrivacyCollectedDataTypeTracking</key>
<false/>
<key>NSPrivacyCollectedDataTypePurposes</key>
<array>
<string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
</array>
</dict>
<dict>
<key>NSPrivacyCollectedDataType</key>
<string>NSPrivacyCollectedDataTypePerformanceData</string>
<key>NSPrivacyCollectedDataTypeLinked</key>
<false/>
<key>NSPrivacyCollectedDataTypeTracking</key>
<false/>
<key>NSPrivacyCollectedDataTypePurposes</key>
<array>
<string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
</array>
</dict>
</array>
<key>NSPrivacyTrackingDomains</key>
<array/>
<key>NSPrivacyAccessedAPITypes</key>
<array>
<dict>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>CA92.1</string>
</array>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
</dict>
</array>
<key>NSPrivacyTracking</key>
<false/>
</dict>
</plist>
14 changes: 8 additions & 6 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -71,6 +71,7 @@
85145B2E2B1F5BAC00784C85 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
855B7AF12B45A61A00B99B1C /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Main.strings; sourceTree = "<group>"; };
855B7AF22B45A61A00B99B1C /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
85DEC2D12B582FA000A4C6F4 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = /Users/r_onoue/dev/github.com/YumNumm/EQMonitor/ios/PrivacyInfo.xcprivacy; sourceTree = "<absolute>"; };
86D3A5225875F01D12D8F080 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
@@ -152,6 +153,7 @@
97C146E51CF9000F007C117D = {
isa = PBXGroup;
children = (
85DEC2D12B582FA000A4C6F4 /* PrivacyInfo.xcprivacy */,
85145B2E2B1F5BAC00784C85 /* GoogleService-Info.plist */,
9740EEB11CF90186004384FC /* Flutter */,
97C146F01CF9000F007C117D /* Runner */,
@@ -522,7 +524,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1100;
CURRENT_PROJECT_VERSION = 1106;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
ENABLE_BITCODE = NO;
@@ -557,7 +559,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1100;
CURRENT_PROJECT_VERSION = 1106;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -599,7 +601,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1100;
CURRENT_PROJECT_VERSION = 1106;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -640,7 +642,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1100;
CURRENT_PROJECT_VERSION = 1106;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -786,7 +788,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1100;
CURRENT_PROJECT_VERSION = 1106;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
ENABLE_BITCODE = NO;
@@ -818,7 +820,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1100;
CURRENT_PROJECT_VERSION = 1106;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
ENABLE_BITCODE = NO;
2 changes: 1 addition & 1 deletion ios/Runner/Info.plist
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1100</string>
<string>1106</string>
<key>LSApplicationCategoryType</key>
<string></string>
<key>LSApplicationQueriesSchemes</key>
Loading

0 comments on commit 3394d8a

Please sign in to comment.