Merge branch 'release/1.0.4'

benoitletondor · Jun 5, 2018 · 04e83d3 · 04e83d3
2 parents 9f04bef + 5a3a4cb
commit 04e83d3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.benoitletondor.beermeup"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 3
-        versionName "1.0.2"
+        versionCode 4
+        versionName "1.0.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -152,7 +152,7 @@ DEPENDENCIES:
   - firebase_auth (from `Pods/.symlinks/plugins/firebase_auth/ios`)
   - firebase_core (from `Pods/.symlinks/plugins/firebase_core/ios`)
   - firebase_remote_config (from `Pods/.symlinks/plugins/firebase_remote_config/ios`)
-  - Flutter (from `Pods/.symlinks/flutter/ios-release`)
+  - Flutter (from `Pods/.symlinks/flutter/ios`)
   - flutter_custom_tabs (from `Pods/.symlinks/plugins/flutter_custom_tabs/ios`)
   - flutter_facebook_login (from `Pods/.symlinks/plugins/flutter_facebook_login/ios`)
   - google_sign_in (from `Pods/.symlinks/plugins/google_sign_in/ios`)
@@ -199,7 +199,7 @@ EXTERNAL SOURCES:
   firebase_remote_config:
     :path: Pods/.symlinks/plugins/firebase_remote_config/ios
   Flutter:
-    :path: Pods/.symlinks/flutter/ios-release
+    :path: Pods/.symlinks/flutter/ios
   flutter_custom_tabs:
     :path: Pods/.symlinks/plugins/flutter_custom_tabs/ios
   flutter_facebook_login:

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -284,7 +284,7 @@
 				"${BUILT_PRODUCTS_DIR}/BoringSSL/openssl.framework",
 				"${BUILT_PRODUCTS_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework",
 				"${BUILT_PRODUCTS_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework",
-				"${PODS_ROOT}/.symlinks/flutter/ios-release/Flutter.framework",
+				"${PODS_ROOT}/.symlinks/flutter/ios/Flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/GTMOAuth2/GTMOAuth2.framework",
 				"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
 				"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.3</string>
+	<string>1.0.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 	<key>FacebookAppID</key>
 	<string>204596980298393</string>
 	<key>FacebookDisplayName</key>

diff --git a/lib/page/home/profile/model.dart b/lib/page/home/profile/model.dart
@@ -187,7 +187,7 @@ class ProfileData {
 
     return ProfileData(
       checkInsData.length >= 2,
-      checkIns.length >= 2,
+      checkIns.length > 0,
       totalPoints > 0,
       favouriteBeer,
       favouriteCategory,

diff --git a/lib/page/home/profile/profilepage.dart b/lib/page/home/profile/profilepage.dart
@@ -62,7 +62,7 @@ class _ProfilePageState extends ViewState<ProfilePage, ProfileViewModel, Profile
         return snapshot.data.join(
           (loading) => _buildLoadingWidget(),
           (empty) => _buildEmptyWidget(empty.hasAlreadyCheckedIn),
-          (loadNoAllTime) => _buildLoadWidget(loadNoAllTime.profileData),
+          (loadNoAllTime) => _buildEmptyWidget(true),
           (loadNoWeek) => _buildLoadWidget(loadNoWeek.profileData),
           (load) => _buildLoadWidget(load.profileData),
           (error) => _buildErrorWidget(error: error.error),