diff --git a/android/app/build.gradle b/android/app/build.gradle index 39b8e94..7d8e0f3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,12 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + + compileSdkVersion 33 + + lintOptions { + checkReleaseBuilds false + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -43,7 +48,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.rogapp" + applicationId "com.dvox.gifunavi" minSdkVersion 23 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 8512568..34187c1 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ - io.flutter.embedded_views_preview + CADisableMinimumFrameDurationOnPhone CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Rogapp + 岐阜ナビ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -15,7 +15,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - rogapp + 岐阜ナビ CFBundlePackageType APPL CFBundleShortVersionString @@ -26,6 +26,18 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + NSCameraUsageDescription + Camera access to take photo + NSLocationAlwaysAndWhenInUseUsageDescription + This app need location access + NSLocationAlwaysUsageDescription + This app needs access to location when in the background. + NSLocationWhenInUseUsageDescription + This app needs access to location when open. + NSMicrophoneUsageDescription + Post videos to profile + NSPhotoLibraryUsageDescription + Photo Library Access Warning UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -45,21 +57,7 @@ UIViewControllerBasedStatusBarAppearance - NSLocationAlwaysAndWhenInUseUsageDescription - This app need location access - NSLocationWhenInUseUsageDescription - This all need location access - NSLocationWhenInUseUsageDescription - This app needs access to location when open. - NSLocationAlwaysUsageDescription - This app needs access to location when in the background. - NSPhotoLibraryUsageDescription - Photo Library Access Warning - NSCameraUsageDescription - Camera access to take photo - NSMicrophoneUsageDescription - Post videos to profile - CADisableMinimumFrameDurationOnPhone + io.flutter.embedded_views_preview diff --git a/lib/pages/destination/destination_page.dart b/lib/pages/destination/destination_page.dart index d905409..d7a54cb 100644 --- a/lib/pages/destination/destination_page.dart +++ b/lib/pages/destination/destination_page.dart @@ -65,12 +65,12 @@ class _DestinationPageState extends State { return false; }, child: Scaffold( - drawer: const DrawerPage(), + drawer: DrawerPage(), bottomNavigationBar: BottomAppBar( child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Expanded(child: IconButton(icon: const Icon(Icons.camera_enhance), onPressed: (){},),), + Expanded(child: Container(width: 0, height: 0,),), const Expanded(child: Text('')), Expanded(child: IconButton(icon: const Icon(Icons.travel_explore), onPressed: (){ indexController.switchPage(AppPages.INITIAL); diff --git a/lib/pages/drawer/drawer_page.dart b/lib/pages/drawer/drawer_page.dart index 466cb42..422ad90 100644 --- a/lib/pages/drawer/drawer_page.dart +++ b/lib/pages/drawer/drawer_page.dart @@ -1,11 +1,13 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; +import 'package:rogapp/pages/index/index_controller.dart'; import 'package:rogapp/routes/app_pages.dart'; class DrawerPage extends StatelessWidget { - const DrawerPage({ Key? key }) : super(key: key); + DrawerPage({ Key? key }) : super(key: key); + final IndexController indexController = Get.find(); @override Widget build(BuildContext context) { @@ -19,49 +21,86 @@ class DrawerPage extends StatelessWidget { Container( height: 100, color: Colors.amber, + child: Obx(() => + Center( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: + indexController.currentUser.length == 0 ? + Flexible(child: Text("drawer_title".tr, style: TextStyle(color: Colors.black, fontSize: 20),)) + : + Text(indexController.currentUser[0]['user']['email'], style: TextStyle(color: Colors.black, fontSize: 20),), + ), + ) + ), ), - ListTile( - leading: const Icon(Icons.login), - title: Text("login".tr), - onTap: (){ - Get.toNamed(AppPages.LANDING); - }, + Obx(() => + indexController.currentUser.length == 0 ? + ListTile( + leading: const Icon(Icons.login), + title: Text("login".tr), + onTap: (){ + Get.toNamed(AppPages.LOGIN); + }, + ) : + ListTile( + leading: const Icon(Icons.login), + title: Text("logout".tr), + onTap: (){ + indexController.currentUser.clear(); + Get.toNamed(AppPages.TRAVEL); + }, + ) ), + indexController.currentUser.length > 0 ? ListTile( leading: const Icon(Icons.password), title: Text("change_password".tr), onTap: (){}, - ), + ) : + Container(width: 0, height: 0,), + indexController.currentUser.length == 0 ? ListTile( leading: const Icon(Icons.person), - title: Text("profile".tr), - onTap: (){}, - ), - ListTile( - leading: const Icon(Icons.route), - title: Text("recommended_route".tr), - onTap: (){}, - ), - ListTile( - leading: const Icon(Icons.favorite_rounded), - title: Text("point_rank".tr), - onTap: (){}, - ), + title: Text("sign_up".tr), + onTap: (){ + Get.toNamed(AppPages.REGISTER); + }, + ) : + Container(width: 0, height: 0,), + + // ListTile( + // leading: const Icon(Icons.person), + // title: Text("profile".tr), + // onTap: (){}, + // ), + // ListTile( + // leading: const Icon(Icons.route), + // title: Text("recommended_route".tr), + // onTap: (){}, + // ), + // ListTile( + // leading: const Icon(Icons.favorite_rounded), + // title: Text("point_rank".tr), + // onTap: (){}, + // ), + indexController.currentUser.length > 0 ? ListTile( leading: const Icon(Icons.featured_video), - title: Text("game_rank".tr), + title: Text("rog_web".tr), onTap: (){}, - ), - ListTile( - leading: const Icon(Icons.router), - title: Text("my_route".tr), - onTap: (){}, - ), - ListTile( - leading: const Icon(Icons.history_sharp), - title: Text("visit_history".tr), - onTap: (){}, - ), + ) : + Container(width: 0, height: 0,), + // ListTile( + // leading: const Icon(Icons.router), + // title: Text("my_route".tr), + // onTap: (){}, + // ), + // ListTile( + // leading: const Icon(Icons.history_sharp), + // title: Text("visit_history".tr), + // onTap: (){}, + // ), ], ), ), diff --git a/lib/pages/index/index_page.dart b/lib/pages/index/index_page.dart index 5828388..30bd5cb 100644 --- a/lib/pages/index/index_page.dart +++ b/lib/pages/index/index_page.dart @@ -37,7 +37,7 @@ class IndexPage extends GetView { }, ), //automaticallyImplyLeading: false, - title: Text("Add locations"), + title: Text("add_location".tr), actions: [ InkWell( onTap: (){ @@ -61,7 +61,7 @@ class IndexPage extends GetView { child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Expanded(child: IconButton(icon: const Icon(Icons.camera_enhance), onPressed: (){},),), + Expanded(child: Container(width: 0, height: 0,),), const Expanded(child: Text('')), Expanded(child: IconButton(icon: const Icon(Icons.travel_explore), onPressed: (){ indexController.switchPage(AppPages.TRAVEL); diff --git a/lib/pages/login/login_page.dart b/lib/pages/login/login_page.dart index 135fd55..d44f438 100644 --- a/lib/pages/login/login_page.dart +++ b/lib/pages/login/login_page.dart @@ -28,25 +28,22 @@ class LoginPage extends StatelessWidget { body: indexController.currentUser.length == 0 ? Container( - height: MediaQuery.of(context).size.height, width: double.infinity, child: Column( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, + mainAxisAlignment: MainAxisAlignment.start, children: [ Column( children: [ Column( children: [ - Text ("ログイン", style: TextStyle( - fontSize: 30, - fontWeight: FontWeight.bold, - ),), - SizedBox(height: 20,), - Text("お帰りなさい ！資格情報を使用してログインします",style: TextStyle( - fontSize: 15, - color: Colors.grey[700], - ),), - SizedBox(height: 30,) + Container( + height: MediaQuery.of(context).size.height/5, + decoration: BoxDecoration( + image:DecorationImage(image: AssetImage('assets/images/login_image.jpg')) + ), + ), + SizedBox(height: 5,), + ], ), Padding( @@ -55,8 +52,8 @@ class LoginPage extends StatelessWidget { ), child: Column( children: [ - makeInput(label: "Eメール", controller: emailController), - makeInput(label: "パスワード", controller: passwordController, obsureText: true), + makeInput(label: "email".tr, controller: emailController), + makeInput(label: "password".tr, controller: passwordController, obsureText: true), ], ), ), @@ -86,14 +83,16 @@ class LoginPage extends StatelessWidget { ), child: CircularProgressIndicator(), ) : - MaterialButton( + Column( + children: [ + MaterialButton( minWidth: double.infinity, height:60, onPressed: (){ if(emailController.text.isEmpty || passwordController.text.isEmpty){ Get.snackbar( - "No values", - "Email and password required", + "no_values".tr, + "email_and_password_required".tr, icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue), snackPosition: SnackPosition.TOP, duration: Duration(milliseconds: 800), @@ -113,7 +112,25 @@ class LoginPage extends StatelessWidget { fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70 ), ), - ) + ), + SizedBox(height: 10.0,), + MaterialButton( + minWidth: double.infinity, + height:60, + onPressed: (){ + Get.toNamed(AppPages.REGISTER); + }, + color: Colors.redAccent, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(40) + ), + child: Text("sign_up".tr,style: TextStyle( + fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70 + ), + ), + ) + ], + ) ), ), ) @@ -123,18 +140,12 @@ class LoginPage extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ Flexible( - child: Text("アカウントをお持ちではありませんか？", style: TextStyle( - overflow: TextOverflow.ellipsis, - ),), - ), - TextButton( - onPressed: (){ - Get.toNamed(AppPages.REGISTER); - }, - child: Text("サインアップ",style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: 18 - ),), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Text("rogaining_user_need_tosign_up".tr, style: TextStyle( + overflow: TextOverflow.ellipsis, + ),), + ), ), ], ) diff --git a/lib/pages/register/register_page.dart b/lib/pages/register/register_page.dart index 32693b8..c436701 100644 --- a/lib/pages/register/register_page.dart +++ b/lib/pages/register/register_page.dart @@ -94,8 +94,8 @@ class RegisterPage extends StatelessWidget { } if(emailController.text.isEmpty || passwordController.text.isEmpty){ Get.snackbar( - "No values", - "Email and password required", + "no_values".tr, + "email_and_password_required".tr, icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue), snackPosition: SnackPosition.TOP, duration: Duration(milliseconds: 800), @@ -111,7 +111,7 @@ class RegisterPage extends StatelessWidget { shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(40) ), - child: Text("サインアップ",style: TextStyle( + child: Text("sign_up".tr,style: TextStyle( fontWeight: FontWeight.w600,fontSize: 16, ),), diff --git a/lib/utils/const.dart b/lib/utils/const.dart index fdafdc3..e837171 100644 --- a/lib/utils/const.dart +++ b/lib/utils/const.dart @@ -4,9 +4,9 @@ class ConstValues{ static const server_uri = "http://container.intranet.sumasen.net:8100"; static const dev_server = "http://localhost:8100"; - static const dev_ip_server = "http://192.168.8.100:8100"; + static const dev_ip_server = "http://192.168.8.103:8100"; static String currentServer(){ - return server_uri; + return dev_ip_server; } } diff --git a/lib/utils/string_values.dart b/lib/utils/string_values.dart index 7d2edc0..e24954d 100644 --- a/lib/utils/string_values.dart +++ b/lib/utils/string_values.dart @@ -4,9 +4,11 @@ class StringValues extends Translations{ @override Map> get keys => { 'en_US': { + 'drawer_title':'Rogaining participants can view checkpoints by logging in', 'app_title': '- Rogaining -', 'address':'address', 'email':'Email', + 'password':'Password', 'web':'Web', 'wikipedia':'Wikipedia', 'video':'video', @@ -16,18 +18,27 @@ class StringValues extends Translations{ 'want_to_go': "Want to Go", 'schedule_point': "Schedule point", 'login': 'Login', + 'logout':'Logout', + 'sign_up':'Sign up', 'change_password': 'Change Password', 'profile': 'Profile', 'recommended_route': 'Recommended Route', 'point_rank': 'Point Rank', 'game_rank': 'Game Rank', 'my_route': 'My Route', - 'visit_history': 'Visit History' + 'visit_history': 'Visit History', + 'rog_web': 'rog website', + 'no_values': 'No Values', + 'email_and_password_required': 'Email and password required', + 'rogaining_user_need_tosign_up': "Rogaining participants do need to sign up.", + 'add_location': 'Add Location' }, 'ja_JP': { + 'drawer_title':'ロゲイニング参加者はログイン するとチェックポイントが参照 できます', 'app_title': '旅行工程表', 'address':'住所', - 'email':'Eメール', + 'email':'Eメール(ロゲではゼッケン番号)', + 'password':'パスワード', 'web':'ウェブ', 'wikipedia':'ウィキペディア', 'video':'ビデオ', @@ -38,14 +49,21 @@ class StringValues extends Translations{ 'like': 'お気に入り', 'checkin': 'チェックイン', 'schedule_point': '予定地点', - 'login': 'ログインする', + 'login': 'ログイン', + 'logout':'ログアウト', + 'sign_up': 'サインアップ', 'change_password': 'パスワード変更', 'profile': 'プロフィール', 'recommended_route': '推奨ルート', 'point_rank': '地点ランキング', 'game_rank': 'ゲームランキング', 'my_route': 'マイルート', - 'visit_history': '訪問履歴' + 'visit_history': '訪問履歴', + 'rog_web': 'ロゲイニングウェブサイト', + 'no_values': '値なし', + 'email_and_password_required': 'メールとパスワードが必要です', + 'rogaining_user_need_tosign_up': "ロゲイニング参加者はサインアップの必要はありません。", + 'add_location': '目的地選択' }, }; } \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index ecb0b92..d16bd9f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -8,6 +8,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.0.4" + archive: + dependency: transitive + description: + name: archive + url: "https://pub.dartlang.org" + source: hosted + version: "3.3.1" + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.1" async: dependency: "direct main" description: @@ -36,6 +50,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.3.1" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + cli_util: + dependency: transitive + description: + name: cli_util + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.5" clock: dependency: transitive description: @@ -56,7 +84,7 @@ packages: name: cross_file url: "https://pub.dartlang.org" source: hosted - version: "0.3.3" + version: "0.3.3+1" crypto: dependency: transitive description: @@ -70,7 +98,7 @@ packages: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.0.5" extra_pedantic: dependency: transitive description: @@ -91,14 +119,14 @@ packages: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.2.1" + version: "2.0.1" file: dependency: transitive description: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.2" + version: "6.1.4" flutter: dependency: "direct main" description: flutter @@ -124,7 +152,7 @@ packages: name: flutter_image url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.1.4" flutter_keyboard_visibility: dependency: transitive description: @@ -146,6 +174,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.0" + flutter_launcher_icons: + dependency: "direct main" + description: + name: flutter_launcher_icons + url: "https://pub.dartlang.org" + source: hosted + version: "0.10.0" flutter_lints: dependency: "direct dev" description: @@ -166,7 +201,7 @@ packages: name: flutter_map_location_marker url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.1.1" flutter_map_marker_cluster: dependency: "direct main" description: @@ -187,7 +222,7 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" + version: "2.0.7" flutter_polyline_points: dependency: "direct main" description: @@ -206,7 +241,7 @@ packages: name: flutter_typeahead url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.1.0" flutter_web_plugins: dependency: transitive description: flutter @@ -232,35 +267,35 @@ packages: name: geolocator url: "https://pub.dartlang.org" source: hosted - version: "8.2.1" + version: "9.0.1" geolocator_android: dependency: transitive description: name: geolocator_android url: "https://pub.dartlang.org" source: hosted - version: "3.2.1" + version: "4.1.0" geolocator_apple: dependency: transitive description: name: geolocator_apple url: "https://pub.dartlang.org" source: hosted - version: "2.1.3" + version: "2.2.1" geolocator_platform_interface: dependency: transitive description: name: geolocator_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.0.5" + version: "4.0.6" geolocator_web: dependency: transitive description: name: geolocator_web url: "https://pub.dartlang.org" source: hosted - version: "2.1.5" + version: "2.1.6" geolocator_windows: dependency: transitive description: @@ -302,14 +337,28 @@ packages: name: google_maps_flutter url: "https://pub.dartlang.org" source: hosted - version: "2.1.5" + version: "2.2.0" + google_maps_flutter_android: + dependency: transitive + description: + name: google_maps_flutter_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.0" + google_maps_flutter_ios: + dependency: transitive + description: + name: google_maps_flutter_ios + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.11" google_maps_flutter_platform_interface: dependency: transitive description: name: google_maps_flutter_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.6" + version: "2.2.2" google_maps_webservice: dependency: "direct main" description: @@ -323,7 +372,7 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.4" + version: "0.13.5" http_parser: dependency: transitive description: @@ -331,6 +380,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "4.0.1" + image: + dependency: transitive + description: + name: image + url: "https://pub.dartlang.org" + source: hosted + version: "3.2.0" image_picker: dependency: "direct main" description: @@ -344,7 +400,7 @@ packages: name: image_picker_android url: "https://pub.dartlang.org" source: hosted - version: "0.8.4+13" + version: "0.8.5+3" image_picker_for_web: dependency: transitive description: @@ -358,14 +414,14 @@ packages: name: image_picker_ios url: "https://pub.dartlang.org" source: hosted - version: "0.8.5+5" + version: "0.8.6" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.5.0" + version: "2.6.1" intl: dependency: transitive description: @@ -387,6 +443,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.6.4" + json_annotation: + dependency: transitive + description: + name: json_annotation + url: "https://pub.dartlang.org" + source: hosted + version: "4.6.0" latlong2: dependency: "direct main" description: @@ -408,6 +471,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.1" + logger: + dependency: transitive + description: + name: logger + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" matcher: dependency: transitive description: @@ -428,7 +498,7 @@ packages: name: material_design_icons_flutter url: "https://pub.dartlang.org" source: hosted - version: "5.0.6595" + version: "5.0.6996" meta: dependency: "direct main" description: @@ -456,28 +526,28 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.10" + version: "2.0.11" path_provider_android: dependency: transitive description: name: path_provider_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.14" + version: "2.0.20" path_provider_ios: dependency: transitive description: name: path_provider_ios url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.11" path_provider_linux: dependency: transitive description: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.6" + version: "2.1.7" path_provider_macos: dependency: transitive description: @@ -498,7 +568,7 @@ packages: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" + version: "2.1.3" pedantic: dependency: transitive description: @@ -541,6 +611,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.0" + petitparser: + dependency: transitive + description: + name: petitparser + url: "https://pub.dartlang.org" + source: hosted + version: "5.0.0" platform: dependency: transitive description: @@ -589,7 +666,7 @@ packages: name: proj4dart url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" quiver: dependency: transitive description: @@ -597,6 +674,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.0" + rename: + dependency: "direct main" + description: + name: rename + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" sky_engine: dependency: transitive description: flutter @@ -622,7 +706,7 @@ packages: name: sqflite url: "https://pub.dartlang.org" source: hosted - version: "2.0.2+1" + version: "2.0.3+1" sqflite_common: dependency: transitive description: @@ -664,7 +748,7 @@ packages: name: synchronized url: "https://pub.dartlang.org" source: hosted - version: "3.0.0+2" + version: "3.0.0+3" term_glyph: dependency: transitive description: @@ -706,7 +790,7 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" unicode: dependency: transitive description: @@ -720,14 +804,14 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.1.2" + version: "6.1.5" url_launcher_android: dependency: transitive description: name: url_launcher_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.17" + version: "6.0.19" url_launcher_ios: dependency: transitive description: @@ -755,14 +839,14 @@ packages: name: url_launcher_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.1.0" url_launcher_web: dependency: transitive description: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.11" + version: "2.0.13" url_launcher_windows: dependency: transitive description: @@ -783,7 +867,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.5.2" + version: "3.0.0" wkt_parser: dependency: transitive description: @@ -797,7 +881,21 @@ packages: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.2.0+1" + version: "0.2.0+2" + xml: + dependency: transitive + description: + name: xml + url: "https://pub.dartlang.org" + source: hosted + version: "6.1.0" + yaml: + dependency: transitive + description: + name: yaml + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.1" sdks: dart: ">=2.17.0 <3.0.0" flutter: ">=3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 14c91ee..a7d0f82 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -37,7 +37,7 @@ dependencies: sqflite: ^2.0.1 get: ^4.6.5 flutter_map: any - geolocator: ^8.0.1 + geolocator: ^9.0.1 permission_handler: ^10.0.0 google_api_availability: ^3.0.1 tuple: ^2.0.0 @@ -54,7 +54,7 @@ dependencies: flutter_map_location_marker: any flutter_map_marker_cluster: any material_design_icons_flutter: ^5.0.6595 - google_fonts: any + google_fonts: ^2.1.1 image_picker: ^0.8.4+4 #geojson_vi: ^2.0.7 geojson: ^1.0.0 @@ -66,6 +66,13 @@ dependencies: flutter_polyline_points: ^1.0.0 google_maps_webservice: ^0.0.19 flutter_typeahead: ^4.0.0 + flutter_launcher_icons: ^0.10.0 + rename: ^2.0.1 + +flutter_icons: + android: true + ios: true + image_path: "assets/icon.png" dev_dependencies: @@ -96,6 +103,8 @@ flutter: - assets/images/empty_image.png - assets/gradient_japanese_temple.jpg - assets/images/japanese_fun.jpeg + - assets/images/appicon.png + - assets/images/login_image.jpg # - images/a_dot_ham.jpeg # An image asset can refer to one or more resolution-specific "variants", see diff --git a/web/index.html b/web/index.html index 8043b3f..4c51063 100644 --- a/web/index.html +++ b/web/index.html @@ -29,7 +29,7 @@ - rogapp + 岐阜ナビ