Merge branch 'release/1.2.1'

android/app/build.gradle

@@ -20,7 +20,7 @@ def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 27
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -33,9 +33,9 @@ android {
     defaultConfig {
         applicationId "com.benoitletondor.beermeup"
         minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 12
-        versionName "1.2"
+        targetSdkVersion 27
+        versionCode 13
+        versionName "1.2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -70,13 +70,11 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:cardview-v7:27.1.1'
 
-    // Forced dependencies to 28
-    implementation 'com.android.support:customtabs:28.0.0'
-    implementation 'com.android.support:support-media-compat:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
+    // Fix for Firebase dependencies
+    implementation 'android.arch.core:runtime:1.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.3.0'
     repositories {
         google()
         jcenter()
@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 

ios/Podfile.lock

@@ -104,8 +104,6 @@ PODS:
     - "GoogleUtilities/NSData+zlib (~> 5.2)"
     - Protobuf (~> 3.5)
   - Flutter (1.0.0)
-  - flutter_custom_tabs (0.0.1):
-    - Flutter
   - flutter_facebook_login (0.0.1):
     - FBSDKLoginKit (~> 4.29)
     - Flutter
@@ -196,10 +194,6 @@ PODS:
   - Protobuf (3.6.1)
   - shared_preferences (0.0.1):
     - Flutter
-  - url_launcher (0.0.1):
-    - Flutter
-  - video_player (0.0.1):
-    - Flutter
 
 DEPENDENCIES:
   - cloud_firestore (from `Pods/.symlinks/plugins/cloud_firestore/ios`)
@@ -208,13 +202,10 @@ DEPENDENCIES:
   - 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`)
-  - 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`)
   - path_provider (from `Pods/.symlinks/plugins/path_provider/ios`)
   - shared_preferences (from `Pods/.symlinks/plugins/shared_preferences/ios`)
-  - url_launcher (from `Pods/.symlinks/plugins/url_launcher/ios`)
-  - video_player (from `Pods/.symlinks/plugins/video_player/ios`)
 
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
@@ -260,8 +251,6 @@ EXTERNAL SOURCES:
     :path: Pods/.symlinks/plugins/firebase_remote_config/ios
   Flutter:
     :path: Pods/.symlinks/flutter/ios
-  flutter_custom_tabs:
-    :path: Pods/.symlinks/plugins/flutter_custom_tabs/ios
   flutter_facebook_login:
     :path: Pods/.symlinks/plugins/flutter_facebook_login/ios
   google_sign_in:
@@ -270,10 +259,6 @@ EXTERNAL SOURCES:
     :path: Pods/.symlinks/plugins/path_provider/ios
   shared_preferences:
     :path: Pods/.symlinks/plugins/shared_preferences/ios
-  url_launcher:
-    :path: Pods/.symlinks/plugins/url_launcher/ios
-  video_player:
-    :path: Pods/.symlinks/plugins/video_player/ios
 
 SPEC CHECKSUMS:
   Bolts: ac6567323eac61e203f6a9763667d0f711be34c8
@@ -296,7 +281,6 @@ SPEC CHECKSUMS:
   FirebaseInstanceID: 78ba376fcd5b94c001f9999b2cbd3d1f1e56e78d
   FirebaseRemoteConfig: 2e3c434293906cdf9710ac593f87a75214c140a0
   Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
-  flutter_custom_tabs: 8dcb85ffe874ee8fd8139bb3960743efeaf521ee
   flutter_facebook_login: e3d2f0a348889fe0f49c302bc044b8cc66c691be
   google_sign_in: cbeb57b96679823d14df6b2240b629b983a42d79
   GoogleAppMeasurement: 2b3a023a61239c8d002e6e4fcf4abce8eddce0e0
@@ -315,8 +299,6 @@ SPEC CHECKSUMS:
   path_provider: 09407919825bfe3c2deae39453b7a5b44f467873
   Protobuf: 1eb9700044745f00181c136ef21b8ff3ad5a0fd5
   shared_preferences: 5a1d487c427ee18fcd3ea1f2a131569481834b53
-  url_launcher: 92b89c1029a0373879933c21642958c874539095
-  video_player: 906796a841943c8d370ac7c13b18039aa9b56498
 
 PODFILE CHECKSUM: 8e313a2c02406808061b90670d33ba78f9fe2930
 

ios/Runner.xcodeproj/project.pbxproj

@@ -288,7 +288,6 @@
 				"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
 				"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
 				"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
-				"${BUILT_PRODUCTS_DIR}/flutter_custom_tabs/flutter_custom_tabs.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_facebook_login/flutter_facebook_login.framework",
 				"${BUILT_PRODUCTS_DIR}/gRPC/GRPCClient.framework",
 				"${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework",
@@ -299,8 +298,6 @@
 				"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
 				"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
 				"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
-				"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
-				"${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -314,7 +311,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_custom_tabs.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_facebook_login.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRPCClient.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework",
@@ -325,8 +321,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

ios/Runner/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2</string>
+	<string>1.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 	<key>FacebookAppID</key>
 	<string>204596980298393</string>
 	<key>FacebookDisplayName</key>

lib/page/tos/tospage.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_html_view/flutter_html_view.dart';
+import 'package:flutter_html/flutter_html.dart';
 
 import 'package:beer_me_up/localization/localization.dart';
 
@@ -25,11 +25,13 @@ class TOSPage extends StatelessWidget {
         child: ListView(
           children: <Widget>[
             const Padding(padding: EdgeInsets.only(top: 8.0)),
-            HtmlView(
+            Html(
+              padding: EdgeInsets.symmetric(horizontal: 10.0),
               data: "<h2>Terms and Conditions</h2><p>By downloading or using the app, these terms will automatically apply to you – you should make sure therefore that you read them carefully before using the app. You’re not allowed to copy, or modify the app, any part of the app, or our trademarks in any way. You’re not allowed to attempt to extract the source code of the app, and you also shouldn’t try to translate the app into other languages, or make derivative versions. The app itself, and all the trade marks, copyright, database rights and other intellectual property rights related to it, still belong to Benoit Letondor.</p><p><b>Benoit Letondor or the Beer Me Up app is not responsible of your alcohol consumption:</b> Beer Me Up doesn't encourage you to drink more or more often and we remind you that alcohol is dangerous for you and other people: <b>drink responsibly.</b></p><p>Benoit Letondor is committed to ensuring that the app is as useful and efficient as possible. For that reason, we reserve the right to make changes to the app or to charge for its services, at any time and for any reason. We will never charge you for the app or its services without making it very clear to you exactly what you’re paying for.</p><p>The Beer Me Up app stores and processes personal data that you have provided to us, in order to provide the service. It’s your responsibility to keep your phone and access to the app secure. We therefore recommend that you do not jailbreak or root your phone, which is the process of removing software restrictions and limitations imposed by the official operating system of your device. It could make your phone vulnerable to malware/viruses/malicious programs, compromise your phone’s security features and it could mean that the Beer Me Up app won’t work properly or at all. </p><p>You should be aware that there are certain things that Benoit Letondor will not take responsibility for. Certain functions of the app will require the app to have an active internet connection. The connection can be Wi-Fi, or provided by your mobile network provider, but Benoit Letondor cannot take responsibility for the app not working at full functionality if you don’t have access to Wi-Fi, and you don’t have any of your data allowance left.</p><p></p><p>If you’re using the app outside of an area with Wi-Fi, you should remember that your terms of the agreement with your mobile network provider will still apply. As a result, you may be charged by your mobile provider for the cost of data for the duration of the connection while accessing the app, or other third party charges. In using the app, you’re accepting responsibility for any such charges, including roaming data charges if you use the app outside of your home territory (i.e. region or country) without turning off data roaming. If you are not the bill payer for the device on which you’re using the app, please be aware that we assume that you have received permission from the bill payer for using the app.</p><p>Along the same lines, Benoit Letondor cannot always take responsibility for the way you use the app i.e. You need to make sure that your device stays charged – if it runs out of battery and you can’t turn it on to avail the Service, Benoit Letondor cannot accept responsibility</p><p>With respect to Benoit Letondor’s responsibility for your use of the app, when you’re using the app, it’s important to bear in mind that although we endeavour to ensure that it is updated and correct at all times, we do rely on third parties to provide information to us so that we can make it available to you. Benoit Letondor accepts no liability for any loss, direct or indirect, you experience as a result of relying wholly on this functionality of the app.</p><p>At some point, we may wish to update the app. The app is currently available on Android and iOS – the requirements for both systems (and for any additional systems we decide to extend the availability of the app to) may change, and you’ll need to download the updates if you want to keep using the app. Benoit Letondor does not promise that it will always update the app so that it is relevant to you and/or works with the iOS/Android version that you have installed on your device. However, you promise to always accept updates to the application when offered to you, We may also wish to stop providing the app, and may terminate use of it at any time without giving notice of termination to you. Unless we tell you otherwise, upon any termination, (a) the rights and licenses granted to you in these terms will end; (b) you must stop using the app, and (if needed) delete it from your device.</p><p><strong>Changes to This Terms and Conditions</strong></p><p> We may update our Terms and Conditions from time to time. Thus, you are advised to review this page periodically for any changes. We will notify you of any changes by posting the new Terms and Conditions on this page. These changes are effective immediately after they are posted on this page. </p>",
             ),
             const Padding(padding: EdgeInsets.only(top: 15.0)),
-            HtmlView(
+            Html(
+              padding: EdgeInsets.symmetric(horizontal: 10.0),
               data: "<h2>Privacy policy</h2><p>Benoit Letondor built the Beer Me Up app as an Open Source app. This service is provided by Benoit Letondor at no cost and is intended for use as is. </p><p>This page is used to inform website visitors regarding our policies with the collection, use, and disclosure of Personal Information if anyone decided to use the service. </p><p>If you choose to use the service, then you agree to the collection and use of information in relation to this policy. The Personal Information that we collect is used for providing and improving the Service. We will not use or share your information with anyone except as described in this Privacy Policy. </p><p>The terms used in this Privacy Policy have the same meanings as in our Terms and Conditions, which is accessible into Beer Me Up app unless otherwise defined in this Privacy Policy. </p><p><strong>Information Collection and Use</strong></p><p>For a better experience, while using our Service, we may require you to provide us with certain personally identifiable information, including but not limited to Email and Advertising ID (IDFA or AAID). The information that we request is retained on your account and is not shared in any way </p><p>Link to privacy policy of third party service providers used by the app: </p><p><a href=\"https://firebase.google.com/policies/analytics\" target=\"blank\">Firebase Analytics</a></p><p><a href=\"https://sentry.io/privacy\" target=\"blank\">Sentry</a></p><p><a href=\"https://www.google.com/policies/privacy/\" target=\"blank\">Google Play Services</a></p><br /><p><strong>Log Data</strong></p><p> We want to inform you that whenever you use the service, in a case of an error in the app we collect data and information (through third party product) on your phone called Error Log Data. This Log Data may include information such as your device Internet Protocol (“IP”) address, device name, operating system version, the configuration of the app when utilizing the service, the tim<p><strong>Service Providers</strong></p><p> We may employ third-party companies and individuals due to the following reasons:</p><ul><li>To facilitate our Service;</li><li>To provide the Service on our behalf;</li><li>To perform Service-related services; or</li><li>To assist us in analyzing how our Service is used.</li></ul><p><strong>Security</strong></p><p> We value your trust in providing us your Personal Information, thus we are striving to use commercially acceptable means of protecting it. But remember that no method of transmission over the internet, or method of electronic storage is 100% secure and reliable, and we cannot guarantee its absolute security. </p><p><strong>Links to Other Sites</strong></p><p>This Service may contain links to other sites. If you click on a third-party link, you will be directed to that site. Note that these external sites are not operated by me. Therefore, we strongly advise you to review the Privacy Policy of these websites. We have no control over and assume no responsibility for the content, privacy policies, or practices of any third-party sites or services. </p><p><strong>Legal age</strong></p><p>This app does not address anyone under the legal drinking age (18 or 21 depending on your country). We prohibit usage of this app and do not knowingly collect personally identifiable information from anyone under legal drinking age. In the case we discover that someone under legal drinking age has provided us with personal information, we will immediately delete this from our servers and ban them from the app. If you are a parent or guardian and you are aware that your child has provided us with personal information, please contact us so that we will be able to do necessary actions. </p><p><strong>Changes to This Privacy Policy</strong></p><p> We may update our Privacy Policy from time to time. Thus, you are advised to review this page periodically for any changes. We will notify you of any changes by posting the new Privacy Policy on this page. These changes are effective immediately after they are posted on this page. </p><p><strong>Contact Us</strong></p><p>If you have any questions or suggestions about our Privacy Policy, do not hesitate to contact us: </p>",
             ),
             const Padding(padding: EdgeInsets.only(top: 5.0)),