diff --git a/ios/Podfile b/ios/Podfile
index 6681052..6f71b24 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
-# platform :ios, '12.0'
+platform :ios, '12.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index ffa70b0..344575e 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -23,7 +23,7 @@ PODS:
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- - permission_handler_apple (9.1.1):
+ - permission_handler_apple (9.3.0):
- Flutter
- pointer_interceptor_ios (0.0.1):
- Flutter
@@ -103,13 +103,13 @@ SPEC CHECKSUMS:
image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
- permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
+ permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
pointer_interceptor_ios: 9280618c0b2eeb80081a343924aa8ad756c21375
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
sqflite: 50a33e1d72bd59ee092a519a35d107502757ebed
url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
-PODFILE CHECKSUM: fd4b34215e7c57e79d347e509d4d64bfebe797fc
+PODFILE CHECKSUM: 7a34d5e980f9e05ecf4e24c79da64ca020615638
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 604a8c4..2ed4b50 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -139,6 +139,7 @@
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
CD1CB185AC38B6B245F9A672 /* [CP] Embed Pods Frameworks */,
+ 4D62FB08D65E9D3D4D84B418 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
@@ -213,6 +214,23 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
};
+ 4D62FB08D65E9D3D4D84B418 /* [CP] Copy Pods Resources */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+ );
+ name = "[CP] Copy Pods Resources";
+ outputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+ showEnvVarsInLog = 0;
+ };
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
@@ -360,15 +378,20 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = ECMVJVB7LV;
+ CURRENT_PROJECT_VERSION = 453;
+ DEVELOPMENT_TEAM = UMNEWT25JR;
ENABLE_BITCODE = NO;
+ FLUTTER_BUILD_NAME = 4.5.0;
+ FLUTTER_BUILD_NUMBER = 453;
INFOPLIST_FILE = Runner/Info.plist;
+ INFOPLIST_KEY_CFBundleDisplayName = "岐阜ナビ";
+ INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
+ MARKETING_VERSION = 4.5.0;
PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -494,15 +517,20 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = ECMVJVB7LV;
+ CURRENT_PROJECT_VERSION = 453;
+ DEVELOPMENT_TEAM = UMNEWT25JR;
ENABLE_BITCODE = NO;
+ FLUTTER_BUILD_NAME = 4.5.0;
+ FLUTTER_BUILD_NUMBER = 453;
INFOPLIST_FILE = Runner/Info.plist;
+ INFOPLIST_KEY_CFBundleDisplayName = "岐阜ナビ";
+ INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
+ MARKETING_VERSION = 4.5.0;
PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -521,15 +549,20 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = ECMVJVB7LV;
+ CURRENT_PROJECT_VERSION = 453;
+ DEVELOPMENT_TEAM = UMNEWT25JR;
ENABLE_BITCODE = NO;
+ FLUTTER_BUILD_NAME = 4.5.0;
+ FLUTTER_BUILD_NUMBER = 453;
INFOPLIST_FILE = Runner/Info.plist;
+ INFOPLIST_KEY_CFBundleDisplayName = "岐阜ナビ";
+ INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
+ MARKETING_VERSION = 4.5.0;
PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index a9c4d95..a1fd8ff 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -65,5 +65,7 @@
UIApplicationSupportsIndirectInputEvents
+ FLTEnableImpeller
+
diff --git a/lib/pages/login/login_page.dart b/lib/pages/login/login_page.dart
index ff1c687..83719a8 100644
--- a/lib/pages/login/login_page.dart
+++ b/lib/pages/login/login_page.dart
@@ -16,6 +16,12 @@ class LoginPage extends StatelessWidget {
return Scaffold(
resizeToAvoidBottomInset: false,
backgroundColor: Colors.white,
+ appBar: AppBar(
+ elevation: 0,
+ backgroundColor: Colors.white,
+ automaticallyImplyLeading: false,
+ ),
+/* 2024-04-03 Updated by Akira . See https://wiki.sumasen.net/issues/2796?issue_count=1&issue_position=1
appBar: AppBar(
elevation: 0,
backgroundColor: Colors.white,
@@ -29,6 +35,7 @@ class LoginPage extends StatelessWidget {
color: Colors.black,
)),
),
+*/
body: indexController.currentUser.isEmpty
? SizedBox(
width: double.infinity,
@@ -88,7 +95,7 @@ class LoginPage extends StatelessWidget {
MaterialButton(
minWidth: double.infinity,
height: 40,
- onPressed: () {
+ onPressed: () async {
if (emailController.text.isEmpty ||
passwordController
.text.isEmpty) {
@@ -116,6 +123,30 @@ class LoginPage extends StatelessWidget {
emailController.text,
passwordController.text,
context);
+/*
+ try {
+ bool isLoggedIn = await indexController.login(emailController.text, passwordController.text,context);
+ if (isLoggedIn) {
+ Get.offAllNamed(AppPages.INDEX);
+ } else {
+ Get.snackbar(
+ "Login Failed",
+ "Invalid email or password",
+ icon: const Icon(Icons.error, color: Colors.red),
+ snackPosition: SnackPosition.BOTTOM,
+ );
+ }
+ } catch (e) {
+ Get.snackbar(
+ "Error",
+ "An error occurred during login",
+ icon: const Icon(Icons.error, color: Colors.red),
+ snackPosition: SnackPosition.BOTTOM,
+ );
+ } finally {
+ indexController.isLoading.value = false;
+ }
+*/ // ここまで
},
color: Colors.indigoAccent[400],
shape: RoundedRectangleBorder(
@@ -128,6 +159,16 @@ class LoginPage extends StatelessWidget {
fontSize: 16,
color: Colors.white70),
),
+/*
+ child: Obx(
+ () => indexController.isLoading.value
+ ? const CircularProgressIndicator(color: Colors.white)
+ : const Text(
+ "ログイン",
+ style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16, color: Colors.white70),
+ ),
+ ),
+*/ // ここまで
),
const SizedBox(
height: 5.0,
diff --git a/lib/utils/string_values.dart b/lib/utils/string_values.dart
index b3a6fa7..89734e2 100644
--- a/lib/utils/string_values.dart
+++ b/lib/utils/string_values.dart
@@ -129,7 +129,7 @@ class StringValues extends Translations{
'finishing_rogaining' : 'ロゲイニングを終えて',
'cp_pls_take_photo' : "CPです。撮影してください。",
'take_photo of the clock' : '時計の写真を撮る',
- 'finish_goal': 'フィニッシュゴール',
+ 'finish_goal': 'ゴール完了',
'goal_saved': "目標を保存しました",
'goal_added_successfuly' : '目標が正常に追加されました',
'goal_not_added' : '目標が追加されていません',
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
index ebe0977..baa7580 100644
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -5,9 +5,9 @@ PODS:
- file_selector_macos (0.0.1):
- FlutterMacOS
- FlutterMacOS (1.0.0)
- - FMDB (2.7.5):
- - FMDB/standard (= 2.7.5)
- - FMDB/standard (2.7.5)
+ - FMDB (2.7.10):
+ - FMDB/standard (= 2.7.10)
+ - FMDB/standard (2.7.10)
- geolocator_apple (1.2.0):
- FlutterMacOS
- isar_flutter_libs (1.0.0):
@@ -15,7 +15,7 @@ PODS:
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- - ReachabilitySwift (5.0.0)
+ - ReachabilitySwift (5.2.1)
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
@@ -65,15 +65,15 @@ SPEC CHECKSUMS:
connectivity_plus: 18d3c32514c886e046de60e9c13895109866c747
file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
- FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+ FMDB: eae540775bf7d0c87a5af926ae37af69effe5a19
geolocator_apple: 72a78ae3f3e4ec0db62117bd93e34523f5011d58
isar_flutter_libs: 43385c99864c168fadba7c9adeddc5d38838ca6a
- path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
- ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
- shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
- sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea
+ path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+ ReachabilitySwift: 5ae15e16814b5f9ef568963fb2c87aeb49158c66
+ shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+ sqflite: d0307f984e859ce2bd39b230d672a448ea3f47b4
url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95
PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
index 727369a..bf509a6 100644
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -195,7 +195,6 @@
DB3AD6E65B5CC8A5A9E2767E /* Pods-RunnerTests.release.xcconfig */,
6114E0F2A0E1D978BBC23F48 /* Pods-RunnerTests.profile.xcconfig */,
);
- name = Pods;
path = Pods;
sourceTree = "";
};
@@ -259,7 +258,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
- LastUpgradeCheck = 1430;
+ LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
331C80D4294CF70F00263BE5 = {
@@ -342,6 +341,7 @@
};
33CC111E2044C6BF0003C045 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -358,7 +358,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
+ shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire\n";
};
427A05FAB0ED774C4EAAB828 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 8af8f32..b8fd570 100644
--- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@