upodate for login system and app name, icon

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()

android/app/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
    <application
-        android:label="rogapp"
+        android:label="岐阜ナビ"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -68,7 +68,6 @@
 				DD65EA52DB6CFBB8714C0EF7 /* Pods-Runner.release.xcconfig */,
 				97E3BC3A3B281D91C83B77D2 /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -374,13 +373,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = D5SL68ATB9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.rogapp;
+				PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -502,13 +502,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = D5SL68ATB9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.rogapp;
+				PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -524,13 +525,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = D5SL68ATB9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.rogapp;
+				PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

ios/Runner/Info.plist

@@ -2,12 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>io.flutter.embedded_views_preview</key>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Rogapp</string>
+	<string>岐阜ナビ</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -15,7 +15,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>rogapp</string>
+	<string>岐阜ナビ</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -26,6 +26,18 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>Camera access to take photo</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>This app need location access</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>This app needs access to location when in the background.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>This app needs access to location when open.</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>Post videos to profile</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Photo Library Access Warning</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -45,21 +57,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-		<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-		<string>This app need location access</string>
-		<key>NSLocationWhenInUseUsageDescription</key>
-		<string>This all need location access</string>
-		<key>NSLocationWhenInUseUsageDescription</key>
-        <string>This app needs access to location when open.</string>
-        <key>NSLocationAlwaysUsageDescription</key>
-        <string>This app needs access to location when in the background.</string>
-        <key>NSPhotoLibraryUsageDescription</key>
-        <string>Photo Library Access Warning</string>
-        <key>NSCameraUsageDescription</key>
-        <string>Camera access to take photo</string>
-		<key>NSMicrophoneUsageDescription</key>
-  		<string>Post videos to profile</string>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<key>io.flutter.embedded_views_preview</key>
 	<true/>
 </dict>
 </plist>

lib/pages/destination/destination_page.dart

@@ -65,12 +65,12 @@ class _DestinationPageState extends State<DestinationPage> {
         return false;
       },
       child: Scaffold(
-        drawer: const DrawerPage(),
+        drawer: DrawerPage(),
         bottomNavigationBar: BottomAppBar(
           child: Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
-              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);

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<IndexController>();
 
   @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: (){},
+            // ),
           ],
         ),
       ),

lib/pages/index/index_page.dart

@@ -37,7 +37,7 @@ class IndexPage extends GetView<IndexController> {
               },
             ),
             //automaticallyImplyLeading: false,
-            title: Text("Add locations"),
+            title: Text("add_location".tr),
             actions: [
               InkWell(
                   onTap: (){
@@ -61,7 +61,7 @@ class IndexPage extends GetView<IndexController> {
           child: Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
-              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);

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,
+                        ),),
+                      ),
                     ),
                   ],
                 )

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,
 
                           ),),