diff --git a/android/app/build.gradle b/android/app/build.gradle index 3f46af7c..ac67c83a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -13,12 +13,12 @@ if (flutterRoot == null) { def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { - flutterVersionCode = '24' + flutterVersionCode = '25' } def flutterVersionName = localProperties.getProperty('flutter.versionName') if (flutterVersionName == null) { - flutterVersionName = '3.5.0' + flutterVersionName = '3.6.0' } def keystoreProperties = new Properties() diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index b5c8c484..e03c0a3a 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -376,7 +376,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.5.0; + MARKETING_VERSION = 3.6.0; PRODUCT_BUNDLE_IDENTIFIER = com.osj.lotura; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -516,7 +516,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.5.0; + MARKETING_VERSION = 3.6.0; PRODUCT_BUNDLE_IDENTIFIER = com.osj.lotura; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -546,7 +546,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.5.0; + MARKETING_VERSION = 3.6.0; PRODUCT_BUNDLE_IDENTIFIER = com.osj.lotura; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/lib/presentation/apply_page/ui/view/apply_page.dart b/lib/presentation/apply_page/ui/view/apply_page.dart index cbf76bb4..fe6f505f 100644 --- a/lib/presentation/apply_page/ui/view/apply_page.dart +++ b/lib/presentation/apply_page/ui/view/apply_page.dart @@ -19,13 +19,13 @@ class ApplyPage extends StatelessWidget { ApplyPage({super.key}); final TextStyle bigStyle = TextStyle( - fontSize: 30.0.sp, + fontSize: 32.0.sp, color: LoturaColors.black, fontWeight: FontWeight.bold, ); final TextStyle smallStyle = TextStyle( - fontSize: 16.0.sp, + fontSize: 18.0.sp, color: LoturaColors.gray500, ); @@ -140,7 +140,7 @@ class ApplyPage extends StatelessWidget { children: [ Row( mainAxisAlignment: - MainAxisAlignment.spaceBetween, + MainAxisAlignment.spaceAround, children: [ MachineCard( deviceId: state.value @@ -185,7 +185,7 @@ class ApplyPage extends StatelessWidget { state: CurrentState.working) ], ), - SizedBox(height: 10.0.r), + SizedBox(height: 20.0.r), ], ); }, diff --git a/lib/presentation/notice_page/ui/widget/notice_list_tile.dart b/lib/presentation/notice_page/ui/widget/notice_list_tile.dart index f7b58224..ec27f0ed 100644 --- a/lib/presentation/notice_page/ui/widget/notice_list_tile.dart +++ b/lib/presentation/notice_page/ui/widget/notice_list_tile.dart @@ -1,7 +1,9 @@ import 'package:flutter/material.dart'; +import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:lotura/domain/notice/entity/notice_entity.dart'; import 'package:lotura/presentation/utils/lotura_colors.dart'; +import 'package:url_launcher/url_launcher.dart'; class NoticeListTile extends StatefulWidget { final NoticeEntity noticeEntity; @@ -47,16 +49,18 @@ class _NoticeListTileState extends State { ], ), _tap - ? ListView( + ? Markdown( padding: EdgeInsets.only(top: 10.0.r), shrinkWrap: true, physics: const NeverScrollableScrollPhysics(), - children: [ - Text( - widget.noticeEntity.contents, - style: TextStyle(fontSize: 16.0.sp), - ), - ], + data: widget.noticeEntity.contents, + onTapLink: (text, href, title) async { + await launchUrl(Uri.parse(href!), + mode: LaunchMode.externalApplication); + }, + styleSheet: MarkdownStyleSheet( + a: const TextStyle(color: Colors.blue), + ), ) : const SizedBox.shrink(), ], diff --git a/pubspec.lock b/pubspec.lock index 6c58accc..f0da8105 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -246,6 +246,14 @@ packages: url: "https://pub.dev" source: hosted version: "7.0.0+1" + flutter_markdown: + dependency: "direct main" + description: + name: flutter_markdown + sha256: "9921f9deda326f8a885e202b1e35237eadfc1345239a0f6f0f1ff287e047547f" + url: "https://pub.dev" + source: hosted + version: "0.7.1" flutter_screenutil: dependency: "direct main" description: @@ -352,6 +360,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -686,5 +702,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0-0 <4.0.0" - flutter: ">=3.13.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.19.0" diff --git a/pubspec.yaml b/pubspec.yaml index 3eca217f..54b2767e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 3.5.0+24 +version: 3.6.0+25 environment: sdk: '>=3.1.3 <4.0.0' @@ -53,6 +53,7 @@ dependencies: http: ^1.1.0 web_socket_channel: ^2.4.0 package_info_plus: ^4.2.0 + flutter_markdown: ^0.7.1 dev_dependencies: