[BUG FIX] login screen update ui and fixed logout issue

mustafal · May 27, 2020 · bf4d47f · bf4d47f
1 parent b0668d0
commit bf4d47f
Show file tree

Hide file tree

Showing 76 changed files with 36 additions and 34 deletions.
diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]}]}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"shared_preferences","path":"/home/serpentcs/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+3/","dependencies":[]}],"android":[{"name":"shared_preferences","path":"/home/serpentcs/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+3/","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"/home/serpentcs/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+9/","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"/home/serpentcs/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]}],"date_created":"2020-05-27 17:41:06.068478","version":"1.17.1"}
diff --git a/.gitignore b/.gitignore
diff --git a/.metadata b/.metadata
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/android/app/build.gradle b/android/app/build.gradle
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
diff --git a/android/app/src/main/kotlin/com/mtfa/odoo_client/MainActivity.kt b/android/app/src/main/kotlin/com/mtfa/odoo_client/MainActivity.kt
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
diff --git a/android/build.gradle b/android/build.gradle
diff --git a/android/gradle.properties b/android/gradle.properties
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/settings.gradle b/android/settings.gradle
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig
diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig
diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh
@@ -5,6 +5,7 @@ export "FLUTTER_APPLICATION_PATH=/home/serpentcs/Ankit/Odoo-JsonRpc-with-Flutter
 export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "SYMROOT=${SOURCE_ROOT}/../build/ios"
+export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
 export "FLUTTER_FRAMEWORK_DIR=/home/serpentcs/Ankit/flutter/bin/cache/artifacts/engine/ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard
diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h
diff --git a/lib/app/data/pojo/partners.dart b/lib/app/data/pojo/partners.dart
diff --git a/lib/app/data/pojo/user.dart b/lib/app/data/pojo/user.dart
diff --git a/lib/app/data/services/globals.dart b/lib/app/data/services/globals.dart
diff --git a/lib/app/data/services/odoo_api.dart b/lib/app/data/services/odoo_api.dart
diff --git a/lib/app/data/services/odoo_response.dart b/lib/app/data/services/odoo_response.dart
diff --git a/lib/app/data/services/odoo_version.dart b/lib/app/data/services/odoo_version.dart
diff --git a/lib/app/data/services/utils.dart b/lib/app/data/services/utils.dart
diff --git a/lib/app/pages/home.dart b/lib/app/pages/home.dart
diff --git a/lib/app/pages/login.dart b/lib/app/pages/login.dart
@@ -46,11 +46,17 @@ class _LoginState extends Base<Login> {
           odoo.authenticate(_email, _pass, _selectedDb).then(
             (http.Response auth) {
               if (auth.body != null) {
-                hideLoadingSuccess("Logged in successfully");
                 User user = User.fromJson(jsonDecode(auth.body));
-                saveUser(json.encode(user));
-                saveOdooUrl(odooURL);
-                pushReplacement(Home());
+                if (user != null && user.result != null) {
+                  print(auth.body.toString());
+                  hideLoadingSuccess("Logged in successfully");
+                  saveUser(json.encode(user));
+                  saveOdooUrl(odooURL);
+                  pushReplacement(Home());
+                } else {
+                  showMessage("Authentication Failed",
+                      "Please Enter Valid Email or Password");
+                }
               } else {
                 showMessage("Authentication Failed",
                     "Please Enter Valid Email or Password");
@@ -326,7 +332,7 @@ class _LoginState extends Base<Login> {
         child: ListView(
           padding: EdgeInsets.all(10.0),
           children: <Widget>[
-            !isLoggedIn() ? checkURLWidget : SizedBox(height: 0.0),
+            getURL() == null ? checkURLWidget : SizedBox(height: 0.0),
             loginWidget,
           ],
         ),

diff --git a/lib/app/pages/partner_details.dart b/lib/app/pages/partner_details.dart
diff --git a/lib/app/pages/profile.dart b/lib/app/pages/profile.dart
@@ -1,13 +1,8 @@
-import 'dart:convert';
 import 'package:flutter/material.dart';
-import 'package:odoo_client/app/data/services/odoo_api.dart';
 import 'package:odoo_client/app/data/services/odoo_response.dart';
-import 'package:odoo_client/app/data/services/utils.dart';
 import 'package:odoo_client/app/utility/constant.dart';
 import 'package:odoo_client/app/utility/strings.dart';
 import 'package:odoo_client/base.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:odoo_client/app/data/services/globals.dart';
 
 import 'login.dart';
 

diff --git a/lib/app/pages/settings.dart b/lib/app/pages/settings.dart
diff --git a/lib/app/utility/constant.dart b/lib/app/utility/constant.dart
diff --git a/lib/app/utility/strings.dart b/lib/app/utility/strings.dart
diff --git a/lib/base.dart b/lib/base.dart
diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart
diff --git a/lib/main.dart b/lib/main.dart
diff --git a/pubspec.lock b/pubspec.lock
@@ -7,42 +7,42 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.11"
+    version: "2.0.13"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.2"
+    version: "1.6.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "2.0.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.3"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.14.12"
   convert:
     dependency: transitive
     description:
@@ -56,7 +56,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -75,14 +75,14 @@ packages:
       name: flutter_easyloading
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.4"
   flutter_spinkit:
     dependency: transitive
     description:
       name: flutter_spinkit
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.1+1"
+    version: "4.1.2+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -99,21 +99,21 @@ packages:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.0+4"
+    version: "0.12.1"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.4"
   image:
     dependency: transitive
     description:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.12"
   matcher:
     dependency: transitive
     description:
@@ -141,7 +141,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0+1"
+    version: "1.9.0"
   petitparser:
     dependency: transitive
     description:
@@ -155,35 +155,35 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.1.3"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.6"
+    version: "0.5.7+3"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.1+3"
+    version: "0.0.1+9"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.4"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2+2"
+    version: "0.1.2+7"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -195,7 +195,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.7.0"
   sprintf:
     dependency: "direct main"
     description:
@@ -237,7 +237,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.11"
+    version: "0.2.15"
   typed_data:
     dependency: transitive
     description:
@@ -265,7 +265,7 @@ packages:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.5.0"
+    version: "3.6.1"
 sdks:
-  dart: ">=2.5.0 <3.0.0"
-  flutter: ">=1.12.13+hotfix.4 <2.0.0"
+  dart: ">=2.6.0 <3.0.0"
+  flutter: ">=1.12.13+hotfix.5 <2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
diff --git a/test/widget_test.dart b/test/widget_test.dart
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]}]}
		{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"shared_preferences","path":"/home/serpentcs/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+3/","dependencies":[]}],"android":[{"name":"shared_preferences","path":"/home/serpentcs/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+3/","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"/home/serpentcs/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+9/","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"/home/serpentcs/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]}],"date_created":"2020-05-27 17:41:06.068478","version":"1.17.1"}