Skip to content

Commit

Permalink
ライセンス周りの調整 (#626)
Browse files Browse the repository at this point in the history
* add: android notification icon
`ic_notification_icon`

* fix: Info.plist conflict miss

* remove: unused useAnimation

* fix: Tipのありがとう文字列

* fix: license

* fix: docs

* fix: buildnum

* fix: bunner color

* fix: remove unused repaintboundary

* add: about_app

* remove: debug

* fix: 予想震度の凡例を調整
  • Loading branch information
YumNumm authored Apr 7, 2024
1 parent 096a730 commit f1d5ac6
Show file tree
Hide file tree
Showing 28 changed files with 370 additions and 176 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions app/assets/docs/about_this_app.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#### **緊急地震速報のP, S波到達予想円について**

[JMA2001走時表]に対し、線形補間を行い、揺れの到達予想円を算出しています。
走時表の仕様により、以下の場合到達予想円が表示されない場合があります。

- P, S波の到達範囲が半径2,001km以上
- 震源の深さが701km以上

強震モニタで表示される揺れ・実際の揺れ・到達予想円はそれぞれ差異が生じる場合があります。

#### **地震情報(緊急地震速報を含む)について**

[Project DM(Disaster Mitigation)-Data Send Service] (以降 Project DM-D.S.S)を利用し、各種地震情報の取得を行っています。
Project DM-D.S.Sから受信したデータを、EQMonitor用に開発者が用意したプライベートAPI(HTTP, WebSocket)で再配信しています。

- 緊急地震速報の再配信については、Project DM-D.S.Sの[再配信ポリシー](https://dmdata.jp/docs/eew#%E5%86%8D%E9%85%8D%E4%BF%A1%E3%83%9D%E3%83%AA%E3%82%B7%E3%83%BC)に基づき、事前の許可を得ています。(2022年12月3日承認済み)
- ※本アプリケーションの開発に、Project DM-D.S.Sの運営者は一切関係がありません。したがって、本アプリケーションに関するお問い合わせをProject DM-D.S.Sの運営者にすることはお控えください。

[JMA2001走時表]: https://www.data.jma.go.jp/eqev/data/bulletin/catalog/appendix/trtime/trt_j.html
[Project DM(Disaster Mitigation)-Data Send Service]: https://dmdata.jp/

#### **著作権関連**

- 地図データ
- 日本: 国土数値情報 行政区域
- 日本以外: Natural Earth
- 強震モニタの観測点データ
- 防災科学技術研究所(NIED)
- 各種地震情報
- 気象庁

#### **Special Thanks**

- [JQuake(フランソワ) 様]
- 強震モニタ画像解析手法 [多項式補間を使用して強震モニタ画像から数値データを決定する](https://qiita.com/NoneType1/items/a4d2cf932e20b56ca444)
- [ingen084 様]
- 各種処理の参考 [KyoshinEewViewerIngen]
- 強震モニタの観測点データ [KyoshinMonitorLib]
- 強震モニタ画像解析手法 [強震モニタの画像から震度と地点を特定するまで](https://qiita.com/ingen084/items/7e91f8da2996972ac586)
- [Laddge 様] ウェブサイトの制作
- [ともりん 様] 通知音・効果音の制作

[JQuake(フランソワ) 様]: https://twitter.com/NoneType1
[KyoshinEewViewerIngen]: https://github.com/ingen084/KyoshinEewViewerIngen
[ingen084 様]: https://twitter.com/ingen084
[KyoshinMonitorLib]: https://github.com/ingen084/KyoshinMonitorLib
[Laddge 様]: https://twitter.com/laddge_
[ともりん 様]: https://twitter.com/tomorin1223

#### **本アプリの開発者**

EQMonitorは、もぐもぐ (Ryotaro Onoue)によって開発されました。
MIT License に基づき、ソースコードを公開しています。(GitHub: [YumNumm/EQMonitor](https://github.com/YumNumm/EQMonitor))

- Twitter: [@YumNumm](https://twitter.com/YumNumm), [@EQMonitorApp](https://twitter.com/EQMonitorApp)
- GitHub: [@YumNumm](https://github.com/YumNumm)
- Mail: [[email protected]]([email protected]) もしくは [[email protected]]([email protected])
12 changes: 6 additions & 6 deletions app/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1152;
CURRENT_PROJECT_VERSION = 1157;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -560,7 +560,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1152;
CURRENT_PROJECT_VERSION = 1157;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -602,7 +602,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1152;
CURRENT_PROJECT_VERSION = 1157;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -643,7 +643,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1152;
CURRENT_PROJECT_VERSION = 1157;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand Down Expand Up @@ -787,7 +787,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1152;
CURRENT_PROJECT_VERSION = 1157;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -819,7 +819,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1152;
CURRENT_PROJECT_VERSION = 1157;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
ENABLE_BITCODE = NO;
Expand Down
43 changes: 2 additions & 41 deletions app/ios/Runner/Info.plist
Original file line number Diff line number Diff line change
@@ -1,43 +1,6 @@
<?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>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>EQMonitor</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>eqmonitor</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(FLUTTER_BUILD_NAME)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1152</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UIBackgroundModes</key>
<array>
<string>fetch</string>
<string>remote-notification</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true />
Expand All @@ -60,9 +23,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1154</string>
<key>UIViewControllerBasedStatusBarAppearance</key>
<true />
<string>1157</string>
<key>LSRequiresIPhoneOS</key>
<true />
<key>UIApplicationSupportsIndirectInputEvents</key>
Expand Down Expand Up @@ -95,4 +56,4 @@
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
</dict>
</plist>
</plist>
1 change: 0 additions & 1 deletion app/lib/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ class App extends HookConsumerWidget {
child: Banner(
message: 'v${packageInfo.version}-${packageInfo.buildNumber}',
location: BannerLocation.bottomStart,
color: Colors.red.shade900,
child: app,
),
);
Expand Down
34 changes: 16 additions & 18 deletions app/lib/core/component/sheet/basic_modal_sheet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,27 +63,25 @@ class BasicModalSheet extends HookWidget {
child: SafeArea(
top: hasAppBar,
bottom: false,
child: RepaintBoundary(
child: Column(
children: <Widget>[
barWidget,
if (useColumn)
Expanded(
child: SingleChildScrollView(
child: Column(
children: children,
),
),
)
else
Expanded(
child: ListView(
padding: const EdgeInsets.all(2),
child: Column(
children: <Widget>[
barWidget,
if (useColumn)
Expanded(
child: SingleChildScrollView(
child: Column(
children: children,
),
),
],
),
)
else
Expanded(
child: ListView(
padding: const EdgeInsets.all(2),
children: children,
),
),
],
),
),
),
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions app/lib/core/router/router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import 'package:eqmonitor/feature/earthquake_history_details/screen/earthquake_h
import 'package:eqmonitor/feature/home/view/home_view.dart';
import 'package:eqmonitor/feature/information_history/page/information_history_page.dart';
import 'package:eqmonitor/feature/information_history_details/information_history_details_page.dart';
import 'package:eqmonitor/feature/settings/children/application_info/about_this_app.dart';
import 'package:eqmonitor/feature/settings/children/application_info/license_page.dart';
import 'package:eqmonitor/feature/settings/children/application_info/privacy_policy_screen.dart';
import 'package:eqmonitor/feature/settings/children/application_info/term_of_service_screen.dart';
Expand Down Expand Up @@ -152,6 +153,9 @@ class KmoniRoute extends GoRouteData {
TypedGoRoute<EarthquakeHistoryConfigRoute>(
path: 'earthquake-history',
),
TypedGoRoute<AboutThisAppRoute>(
path: 'about-this-app',
),
TypedGoRoute<DonationRoute>(
path: 'donation',
routes: [
Expand Down Expand Up @@ -263,6 +267,14 @@ class LicenseRoute extends GoRouteData {
const LicensePage();
}

class AboutThisAppRoute extends GoRouteData {
const AboutThisAppRoute();

@override
Widget build(BuildContext context, GoRouterState state) =>
const AboutThisAppScreen();
}

class NotificationSettingsRoute extends GoRouteData {
const NotificationSettingsRoute();

Expand Down
22 changes: 22 additions & 0 deletions app/lib/core/router/router.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions app/lib/core/theme/build_theme.dart
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
import 'package:eqmonitor/core/theme/custom_colors.dart';
import 'package:eqmonitor/gen/fonts.gen.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';

ThemeData buildTheme({
ColorScheme? colorScheme,
CustomColors? customColors,
}) {
final notoSansJp = GoogleFonts.notoSansJp().fontFamily;
final robotoMono = GoogleFonts.robotoMono().fontFamily;
return ThemeData(
colorScheme: colorScheme,
extensions: [if (customColors != null) customColors],
useMaterial3: true,
fontFamily: robotoMono,
fontFamilyFallback: [
if (notoSansJp != null) notoSansJp,
],
fontFamily: FontFamily.notoSansJP,
);
}

final monoFont = GoogleFonts.fragmentMono().fontFamily;
Loading

0 comments on commit f1d5ac6

Please sign in to comment.