fix: 軽微なバグ修正

YumNumm · Nov 30, 2023 · 5a30bf6 · 5a30bf6
1 parent 82ee7d0
commit 5a30bf6
Show file tree

Hide file tree

Showing 21 changed files with 84 additions and 358 deletions.
diff --git a/.github/workflows/android-release.yaml b/.github/workflows/android-release.yaml
@@ -13,6 +13,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: restore signkey
+        run: |
+          echo 'LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQWNtZ0F3SUJBZ0lVYjhsdEJFTVEzTFdEZnNnakIrcmExUjVMWGVzd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0FEQWVGdzB5TXpFeE16QXhORFUxTXpkYUZ3MHlNekV5TXpBeE5EVTFNemRhTUFBd2dnRWlNQTBHQ1NxRwpTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFESVA1eFIrZjdVQUxTV0dXN3dEaXg2RWEzZ0ZGWGF2Vy9aCnBINGVTNGFHSVFSMFpDaC85YlY3K1dNd0NPV1lFZHg0WDVMdTVnYzliWXlQVDFRMXFBYWtkOC9CU3BzeC93K3IKQ2Y2aUlxb3BhQWRHU3kwNmVOODhHMENSSFluRk5Neno3TnVLeFdDR2ZGUWJMdm9VMFRGUUVIblREbkZ0Q0ZMZApRMU5uR0pxU2Y1b2xXRm5aOFhQOUV4cVlBQzI0eEtFcjRKVTBWbDlQMnF3ZHVoZG5vMkpZTGwrbFc1eW5FYmxaCkpyOTFqbGJGYW5jeVBUU29zeCt6dnpLcnJHOTZYdzlHSnpxaFhod0UvVTREdnFRQmM5V1RiQjk4N0JpeVNtNWsKVzBUZkEvQzRhNkg5OWhKanJsMDkyaXRlZVdXWVQzQS8rbGtySmNMVjZXdFhGeVhDT3ZENUFnTUJBQUdqVXpCUgpNQjBHQTFVZERnUVdCQlNHaUc5Q3B3Ni90bmVHWTNDNjRWWHYwajJwc2pBZkJnTlZIU01FR0RBV2dCU0dpRzlDCnB3Ni90bmVHWTNDNjRWWHYwajJwc2pBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUEwR0NTcUdTSWIzRFFFQkN3VUEKQTRJQkFRQ2RrRzlhR2FQWW1CZGp0TVBBVFpnV3BlaU5Pb2d5SlFOU2c5TXFNR3JxRjlzRUVUNHJxYkJjbzNKRQplaHdxVytGMjVpODJJV2pGZWY0V291YnVMS05hUFZ5elRWSEU2VlhTdVlrVVp1Tlh6N3E5VnVFNVkzeXhpN2hmClJacjE1cFNQdE92dlJYRnpieUFxT0lpTzB1R3ZZbXhBUW9VN2ZGb3A0WXppQWdSQVd3NnF5Y1ZWQWJUR1R3bWUKVFJRVEswT3kxc1JVcEgxZ2pXYldCblVMUi9nZ0RPNVk2RjBIVVdlcXA0ZVFkMTU4bU5aZGNRSE1rTlI4d21HNwo4R2N5VmExWHBhTktya2tzQURwblpqMGQ4UldLWUJ6Y0ZVRS9HUlhwbWNVWERVMmdHdVcyYWhGZjZSdm0wVE5ZCkpnWm9jVndLaUpVYkwvQUdyV0JtRkRIU2JmRSsKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=' | base64 -d > public_key.pem
+          cat public_key.pem
+          echo "${{ secrets.SIGNING_KEY}}" > SIGNING_KEY
+
+          openssl smime -encrypt -aes256 -in SIGNING_KEY -binary -outform DEM -out SIGNING_KEY.enc public_key.pem
+          cat SIGNING_KEY.enc | base64
+
       - name: Set up ssh
         run: |
           mkdir -p ~/.ssh
@@ -80,10 +89,8 @@ jobs:
         run: |
           echo '${{ secrets.SIGNING_KEY }}' | base64 -d > android/app/key.jks
           echo '${{ secrets.FIREBASE_ANDROID }}' | base64 -d > android/app/google-services.json
-          export KEYSTORE_PASSWORD='${{ secrets.KEYSTORE_PASSWORD }}'
-          export KEY_ALIAS='${{ secrets.KEY_ALIAS }}'
-          export KEY_PASSWORD='${{ secrets.KEY_PASSWORD }}'
-          flutter build apk --release #--obfuscate --split-debug-info=obfuscate/android
+          flutter build appbundle --release
+          flutter build apk --release
         env:
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
           KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}

diff --git a/.github/workflows/ios-beta.yaml b/.github/workflows/ios-beta.yaml
@@ -6,8 +6,8 @@ on:
 
 jobs:
   build:
-    runs-on: macos-13
-    #timeout-minutes: 60
+    runs-on: macos-latest
+    timeout-minutes: 60
     env:
       TZ: Asia/Tokyo
 

diff --git a/.gitignore b/.gitignore
@@ -169,3 +169,6 @@ macos/GoogleService-Info.plist
 ios/*.p8
 
 /pubspec_overrides.yaml
+
+
+*.pem
diff --git a/.metadata b/.metadata
@@ -1,38 +1,23 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled.
+# This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 4b12645012342076800eb701bcdfe18f87da21cf
-  channel: stable
+  revision: "7f20e5d18ce4cb80c621533090a7c5113f5bdc52"
+  channel: "stable"
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: 4b12645012342076800eb701bcdfe18f87da21cf
-      base_revision: 4b12645012342076800eb701bcdfe18f87da21cf
+      create_revision: 7f20e5d18ce4cb80c621533090a7c5113f5bdc52
+      base_revision: 7f20e5d18ce4cb80c621533090a7c5113f5bdc52
     - platform: android
-      create_revision: 4b12645012342076800eb701bcdfe18f87da21cf
-      base_revision: 4b12645012342076800eb701bcdfe18f87da21cf
-    - platform: ios
-      create_revision: 4b12645012342076800eb701bcdfe18f87da21cf
-      base_revision: 4b12645012342076800eb701bcdfe18f87da21cf
-    - platform: linux
-      create_revision: 4b12645012342076800eb701bcdfe18f87da21cf
-      base_revision: 4b12645012342076800eb701bcdfe18f87da21cf
-    - platform: macos
-      create_revision: 4b12645012342076800eb701bcdfe18f87da21cf
-      base_revision: 4b12645012342076800eb701bcdfe18f87da21cf
-    - platform: web
-      create_revision: 4b12645012342076800eb701bcdfe18f87da21cf
-      base_revision: 4b12645012342076800eb701bcdfe18f87da21cf
-    - platform: windows
-      create_revision: 4b12645012342076800eb701bcdfe18f87da21cf
-      base_revision: 4b12645012342076800eb701bcdfe18f87da21cf
+      create_revision: 7f20e5d18ce4cb80c621533090a7c5113f5bdc52
+      base_revision: 7f20e5d18ce4cb80c621533090a7c5113f5bdc52
 
   # User provided section
 

diff --git a/README.md b/README.md
@@ -2,46 +2,37 @@
 
 ### 地震速報・監視アプリケーション
 
-[![45BD36DF-05A4-4875-B913-2F53FDAA48FF](https://user-images.githubusercontent.com/73390859/183258345-ac71c9ca-b794-4c00-bd7d-a9a20693464e.png)](https://github.com/EQMonitor/EQMonitor)
+[![45BD36DF-05A4-4875-B913-2F53FDAA48FF](https://github.com/YumNumm/EQMonitor/blob/develop/assets/header.png?raw=true)](https://github.com/EQMonitor/EQMonitor)
 
 [![Github All Releases](https://img.shields.io/github/downloads/EQMonitor/EQMonitor/total.svg)](https://github.com/EQMonitor/EQMonitor/tags)
 [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/EQMonitor/EQMonitor?color=blue&include_prereleases&label=Release)](https://github.com/EQMonitor/EQMonitor/releases/latest)
 [![Flutter build Android](https://github.com/EQMonitor/EQMonitor/actions/workflows/android-release.yaml/badge.svg)](https://github.com/EQMonitor/EQMonitor/actions/workflows/android-release.yaml)
 
 > **Warning** [利用規約](https://github.com/EQMonitor/EQMonitor/blob/main/assets/docs/term_of_service.md)を必ずご確認の上ご利用ください。
 
-|                                                                                                                                                |                                                                                                                                                |                                                                                                                                                |
-|------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|
-| ![Screenshot_20221114-171045_EQMonitor](https://user-images.githubusercontent.com/73390859/201656094-c98e6942-489d-48dc-9ff5-80aa6d9e6247.png) | ![Screenshot_20221114-210650_EQMonitor](https://user-images.githubusercontent.com/73390859/201656208-87ae0eed-bf39-47d4-8003-9745ffba56c2.png) | ![Screenshot_20221114-210658_EQMonitor](https://user-images.githubusercontent.com/73390859/201656236-70d20f7c-6870-4d0f-a7d0-17777e6b276b.png) |
+![iPad 2](https://github.com/YumNumm/EQMonitor/assets/73390859/127f88f5-9e4f-40b5-a7f2-48efe0932c0c)
 
-## 支援のお願い
+## 概要
 
-本アプリケーションは、緊急地震速報などの地震情報を迅速に配信するために、外部サービス([Project DM-D.S.S](https://dmdata.jp/))や VPS を契約しています。
-そのため、開発者([@YumNumm](https://github.com/YumNumm))は、月数千円負担する必要があります。
-ご支援頂けると幸いです。
-**(本アプリは無料でご利用いただけます。)**
+EQMonitorは、日本全国の地震情報をいち早く受信できるアプリケーションです。
 
-[![](https://user-images.githubusercontent.com/73390859/201659680-63768eda-b774-4709-9c89-0e71771f6135.jpeg)](https://www.buymeacoffee.com/mgmg)
+***機能***
 
-## HOW TO BUILD
+* **地震情報・緊急地震速報の通知**
 
-`android/app/google-service.json`に Firebase 証明書を配置してください。
+  気象庁により発表された地震情報や、緊急地震速報を受信し、通知します。
 
-```bash
-# リポジトリをクローン
-git clone https://github.com/YumNumm/EQMonitor.git
-cd EQMonitor
+* **過去の地震履歴の閲覧**
 
-# FVMをインストール
-brew tap leoafarias/fvm
-brew install fvm
-fvm use
+  過去に発表された地震情報を遡って確認できます。
 
+* **緊急地震速報のリアルタイム表示**
 
-# Lefthookをインストール(コミット時にフォーマットを実行するため)
-brew install lefthook
-lefthook install
+  緊急地震速報が発表された際に、P波・S波の予想到達範囲、予想最大震度、震央地を表示します。
+  緊急地震速報は、リアルタイムに更新され、インターネットに接続されていれば、どこからでも確認できます。
 
-# パッケージをインストール
-fvm flutter pub get
-```
+* **強震モニタの表示**
+
+  防災科学技術研究所の提供するWebサービス 強震モニタ を表示します。
+  (※ 強震モニタは、揺れの様子を直感的に捉えることを目的としています。また、リアルタイムで観測値を処理しているため、ノイズ等により観測値が変動します。
+  そのため、本アプリケーションで表示される観測値は、あくまで参考値としてご利用ください。)
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -29,7 +29,6 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
-        coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
@@ -62,7 +61,7 @@ android {
     buildTypes {
         release {
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
             minifyEnabled true
             shrinkResources true
             multiDexEnabled true

diff --git a/android/build.gradle b/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath 'com.google.gms:google-services:4.3.14'
 
         classpath 'com.google.firebase:perf-plugin:1.4.2'

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat May 20 21:55:30 JST 2023
+#Thu Nov 30 22:37:33 JST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -427,7 +427,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1072;
+				CURRENT_PROJECT_VERSION = 1075;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_BITCODE = NO;
@@ -579,7 +579,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1072;
+				CURRENT_PROJECT_VERSION = 1075;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_BITCODE = NO;
@@ -618,7 +618,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1072;
+				CURRENT_PROJECT_VERSION = 1075;
 				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>1072</string>
+	<string>1075</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/fastlane/.gitignore b/ios/fastlane/.gitignore
@@ -1,3 +1,4 @@
 report.xml
+Preview.html
 screenshots
 metadata
Original file line number	Diff line number	Diff line change
Expand Up		@@ -169,3 +169,6 @@ macos/GoogleService-Info.plist
		ios/*.p8

		/pubspec_overrides.yaml


		*.pem