diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 683d87bc..f2d35597 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -72,12 +72,12 @@ 520D584A2C5504790019366D /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/Main.strings; sourceTree = ""; }; 520D584B2C5504790019366D /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/LaunchScreen.strings; sourceTree = ""; }; 5228AD5A2C2EE45D007635F5 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; - 529BD5D12C48C28B00EFE088 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Main.strings"; sourceTree = ""; }; - 529BD5D22C48C28B00EFE088 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/LaunchScreen.strings"; sourceTree = ""; }; + 529BD5D12C48C28B00EFE088 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/Main.strings; sourceTree = ""; }; + 529BD5D22C48C28B00EFE088 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/LaunchScreen.strings; sourceTree = ""; }; 529C27C92C93F7B900AAFAB6 /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/InfoPlist.strings; sourceTree = ""; }; 529C27CC2C93F7BC00AAFAB6 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/InfoPlist.strings; sourceTree = ""; }; - 529C27CE2C947EE800AAFAB6 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = ""; }; 529C27CF2C947EFB00AAFAB6 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = ""; }; + 529C27DC2C97019E00AAFAB6 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/InfoPlist.strings; sourceTree = ""; }; 52E010A32C7C5DDC00C87792 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Main.strings; sourceTree = ""; }; 52E010A42C7C5DDC00C87792 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/LaunchScreen.strings; sourceTree = ""; }; 632125282C2EA17900A088F8 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; @@ -292,11 +292,11 @@ }; buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; compatibilityVersion = "Xcode 9.3"; - developmentRegion = "zh-Hant"; + developmentRegion = zh_TW; hasScannedForEncodings = 0; knownRegions = ( Base, - "zh-Hant", + zh_TW, en, ja, ko, @@ -495,8 +495,8 @@ children = ( 529C27C92C93F7B900AAFAB6 /* zh */, 529C27CC2C93F7BC00AAFAB6 /* ko */, - 529C27CE2C947EE800AAFAB6 /* zh-Hant */, 529C27CF2C947EFB00AAFAB6 /* ja */, + 529C27DC2C97019E00AAFAB6 /* zh_TW */, ); name = InfoPlist.strings; sourceTree = ""; @@ -505,7 +505,7 @@ isa = PBXVariantGroup; children = ( 97C146FB1CF9000F007C117D /* Base */, - 529BD5D12C48C28B00EFE088 /* zh-Hant */, + 529BD5D12C48C28B00EFE088 /* zh_TW */, 520D58442C5504340019366D /* en */, 520D58462C55043C0019366D /* ja */, 520D58482C5504590019366D /* ko */, @@ -519,7 +519,7 @@ isa = PBXVariantGroup; children = ( 97C147001CF9000F007C117D /* Base */, - 529BD5D22C48C28B00EFE088 /* zh-Hant */, + 529BD5D22C48C28B00EFE088 /* zh_TW */, 520D58452C5504340019366D /* en */, 520D58472C55043C0019366D /* ja */, 520D58492C5504590019366D /* ko */, diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 909d61a3..09cf51d8 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -2,22 +2,36 @@ - BGTaskSchedulerPermittedIdentifiers - - dev.flutter.background.refresh - + LSRequiresIPhoneOS + + UIApplicationSupportsIndirectInputEvents + + ITSAppUsesNonExemptEncryption + + CFBundleSignature + ???? + CFBundleDisplayName + DPIP + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleName + dpip + CFBundlePackageType + APPL + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) CADisableMinimumFrameDurationOnPhone CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - DPIP CFBundleExecutable $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 + UILaunchStoryboardName + LaunchScreen CFBundleLocalizations zh_TW @@ -27,20 +41,12 @@ ko vi - CFBundleName - dpip - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleSignature - ???? - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - ITSAppUsesNonExemptEncryption - - LSRequiresIPhoneOS - + UIMainStoryboardFile + Main + BGTaskSchedulerPermittedIdentifiers + + dev.flutter.background.refresh + NSLocationAlwaysAndWhenInUseUsageDescription DPIP 將利用你的位置資訊，用以自動設定所在地並在地震發生時能較準確地預估所在地的最大震度。 NSLocationAlwaysUsageDescription @@ -51,18 +57,12 @@ 用於儲存地震報告圖片。 NSPhotoLibraryUsageDescription 用於儲存地震報告圖片。 - UIApplicationSupportsIndirectInputEvents - UIBackgroundModes fetch location remote-notification - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/ios/Runner/zh-Hant.lproj/InfoPlist.strings b/ios/Runner/zh_TW.lproj/InfoPlist.strings similarity index 100% rename from ios/Runner/zh-Hant.lproj/InfoPlist.strings rename to ios/Runner/zh_TW.lproj/InfoPlist.strings diff --git a/ios/Runner/zh-Hant.lproj/LaunchScreen.strings b/ios/Runner/zh_TW.lproj/LaunchScreen.strings similarity index 100% rename from ios/Runner/zh-Hant.lproj/LaunchScreen.strings rename to ios/Runner/zh_TW.lproj/LaunchScreen.strings diff --git a/ios/Runner/zh-Hant.lproj/Main.strings b/ios/Runner/zh_TW.lproj/Main.strings similarity index 100% rename from ios/Runner/zh-Hant.lproj/Main.strings rename to ios/Runner/zh_TW.lproj/Main.strings diff --git a/lib/app/page/map/tsunami/tsunami.dart b/lib/app/page/map/tsunami/tsunami.dart index 89b39fb7..920cd345 100644 --- a/lib/app/page/map/tsunami/tsunami.dart +++ b/lib/app/page/map/tsunami/tsunami.dart @@ -386,7 +386,6 @@ class _TsunamiMapState extends State { style: TextStyle( fontSize: 28, fontWeight: FontWeight.bold, - letterSpacing: 2, color: context.colors.onSurface, ), ), @@ -400,7 +399,6 @@ class _TsunamiMapState extends State { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - letterSpacing: 1, color: context.colors.onSurface.withOpacity(0.8), ), ), @@ -411,7 +409,6 @@ class _TsunamiMapState extends State { : "${getTime()} 更新", style: TextStyle( fontSize: 14, - letterSpacing: 1, color: context.colors.onSurfaceVariant, ), ), @@ -478,7 +475,6 @@ class _TsunamiMapState extends State { "${tsunami?.content}", style: TextStyle( fontSize: 18, - letterSpacing: 2, color: context.colors.onSurface, ), ), @@ -494,7 +490,6 @@ class _TsunamiMapState extends State { style: TextStyle( fontSize: 22, fontWeight: FontWeight.bold, - letterSpacing: 2, color: context.colors.onSurface, ), ), @@ -512,7 +507,6 @@ class _TsunamiMapState extends State { style: TextStyle( fontSize: 22, fontWeight: FontWeight.bold, - letterSpacing: 2, color: context.colors.onSurface, ), ), @@ -530,7 +524,6 @@ class _TsunamiMapState extends State { style: TextStyle( fontSize: 22, fontWeight: FontWeight.bold, - letterSpacing: 2, color: context.colors.onSurface, ), ), @@ -544,16 +537,19 @@ class _TsunamiMapState extends State { context.i18n.occurrence_time, style: TextStyle( fontSize: 18, - letterSpacing: 2, color: context.colors.onSurface, ), ), + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ Text( convertTimestamp(tsunami!.eq.time), style: TextStyle( fontSize: 18, fontWeight: FontWeight.bold, - letterSpacing: 2, color: context.colors.onSurface, ), ), @@ -569,19 +565,22 @@ class _TsunamiMapState extends State { context.i18n.report_location, style: TextStyle( fontSize: 18, - letterSpacing: 2, color: context.colors.onSurface, ), ), + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ Column( - crossAxisAlignment: CrossAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( tsunami!.eq.loc, style: TextStyle( fontSize: 18, fontWeight: FontWeight.bold, - letterSpacing: 2, color: context.colors.onSurface, ), ), @@ -590,7 +589,6 @@ class _TsunamiMapState extends State { style: TextStyle( fontSize: 14, fontWeight: FontWeight.bold, - letterSpacing: 2, color: context.colors.onSurface, ), ), @@ -611,7 +609,6 @@ class _TsunamiMapState extends State { context.i18n.scale, style: TextStyle( fontSize: 18, - letterSpacing: 2, color: context.colors.onSurface, ), ), @@ -620,7 +617,6 @@ class _TsunamiMapState extends State { style: TextStyle( fontSize: 18, fontWeight: FontWeight.bold, - letterSpacing: 2, color: context.colors.onSurface, ), ), @@ -638,7 +634,6 @@ class _TsunamiMapState extends State { context.i18n.depth, style: TextStyle( fontSize: 18, - letterSpacing: 2, color: context.colors.onSurface, ), ), @@ -647,7 +642,6 @@ class _TsunamiMapState extends State { style: TextStyle( fontSize: 18, fontWeight: FontWeight.bold, - letterSpacing: 2, color: context.colors.onSurface, ), ), diff --git a/lib/core/notify.dart b/lib/core/notify.dart index def0a5c8..71f688ef 100644 --- a/lib/core/notify.dart +++ b/lib/core/notify.dart @@ -232,14 +232,17 @@ Future notifyInit() async { channelKey: "tsunami-important", channelName: "海嘯資訊(重大)", channelDescription: "海嘯警報發布時，沿海地區鄉鎮", - importance: NotificationImportance.High, + importance: NotificationImportance.Max, defaultPrivacy: NotificationPrivacy.Public, + criticalAlerts: true, playSound: true, soundSource: 'resource://raw/tsunami', + defaultRingtoneType: DefaultRingtoneType.Alarm, defaultColor: Colors.red, ledColor: Colors.red, enableVibration: true, - vibrationPattern: mediumVibrationPattern), + vibrationPattern: highVibrationPattern, + locked: true), NotificationChannel( channelGroupKey: 'group_tsunami', channelKey: "tsunami-general", @@ -248,7 +251,7 @@ Future notifyInit() async { importance: NotificationImportance.Default, defaultPrivacy: NotificationPrivacy.Public, playSound: true, - soundSource: 'resource://raw/warn', + soundSource: 'resource://raw/normal', defaultColor: Colors.red, ledColor: Colors.red, enableVibration: true,