From c6458985f00442a15df009902e75fe140953a398 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 8 Apr 2020 20:57:40 -0400 Subject: [PATCH 1/3] 0.5.13 --- android/app/build.gradle | 4 ++-- ios/PrivateKit/Info.plist | 4 ++-- ios/PrivateKitTests/Info.plist | 4 ++-- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 690cd29316..e26bad162b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -132,8 +132,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled true - versionCode 16 - versionName "0.5.11" + versionCode 17 + versionName "0.5.13" } splits { abi { diff --git a/ios/PrivateKit/Info.plist b/ios/PrivateKit/Info.plist index 35250c60b3..d833326bf0 100644 --- a/ios/PrivateKit/Info.plist +++ b/ios/PrivateKit/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.5.11 + 0.5.13 CFBundleSignature ???? CFBundleVersion - 16 + 17 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/ios/PrivateKitTests/Info.plist b/ios/PrivateKitTests/Info.plist index 10efe771c5..4f5c7ec713 100644 --- a/ios/PrivateKitTests/Info.plist +++ b/ios/PrivateKitTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.5.11 + 0.5.13 CFBundleSignature ???? CFBundleVersion - 16 + 17 diff --git a/package-lock.json b/package-lock.json index 4bb94c8959..2325e9c1ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "privatekit", - "version": "0.5.11", + "version": "0.5.13", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1b9ee40018..79b1ad7f4d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "privatekit", - "version": "0.5.11", + "version": "0.5.13", "private": true, "scripts": { "install:pod": "cd ios && pod install", From abcafa357310c91f9efeaefa1d5c268ba6244839 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 8 Apr 2020 20:58:22 -0400 Subject: [PATCH 2/3] 0.5.14 --- android/app/build.gradle | 4 ++-- ios/PrivateKit/Info.plist | 4 ++-- ios/PrivateKitTests/Info.plist | 4 ++-- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e26bad162b..909fba4f76 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -132,8 +132,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled true - versionCode 17 - versionName "0.5.13" + versionCode 18 + versionName "0.5.14" } splits { abi { diff --git a/ios/PrivateKit/Info.plist b/ios/PrivateKit/Info.plist index d833326bf0..98abb810be 100644 --- a/ios/PrivateKit/Info.plist +++ b/ios/PrivateKit/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.5.13 + 0.5.14 CFBundleSignature ???? CFBundleVersion - 17 + 18 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/ios/PrivateKitTests/Info.plist b/ios/PrivateKitTests/Info.plist index 4f5c7ec713..39bf128d6e 100644 --- a/ios/PrivateKitTests/Info.plist +++ b/ios/PrivateKitTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.5.13 + 0.5.14 CFBundleSignature ???? CFBundleVersion - 17 + 18 diff --git a/package-lock.json b/package-lock.json index 2325e9c1ca..586a24fb3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "privatekit", - "version": "0.5.13", + "version": "0.5.14", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 79b1ad7f4d..a8af2da271 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "privatekit", - "version": "0.5.13", + "version": "0.5.14", "private": true, "scripts": { "install:pod": "cd ios && pod install", From 5a65fe031259400c5dbc980d5c4c58e79b7955a0 Mon Sep 17 00:00:00 2001 From: Jince George Date: Thu, 9 Apr 2020 18:49:02 +0530 Subject: [PATCH 3/3] UI issue fix 337 --- app/views/LocationTracking.js | 121 +++++++++++++++++----------------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/app/views/LocationTracking.js b/app/views/LocationTracking.js index 488b48589e..10dc48c43a 100644 --- a/app/views/LocationTracking.js +++ b/app/views/LocationTracking.js @@ -161,65 +161,65 @@ class LocationTracking extends Component { {languages.t('label.private_kit')} - - {this.state.isLogging ? ( - <> - - this.setOptOut()} - style={styles.stopLoggingButtonTouchable}> - - {languages.t('label.stop_logging')} - - - this.overlap()} - style={styles.startLoggingButtonTouchable}> - - {languages.t('label.overlap')} - - - - ) : ( - <> - - this.willParticipate()} - style={styles.startLoggingButtonTouchable}> - - {languages.t('label.start_logging')} - - - - )} + {/* */} + {this.state.isLogging ? ( + <> + + this.setOptOut()} + style={styles.stopLoggingButtonTouchable}> + + {languages.t('label.stop_logging')} + + + this.overlap()} + style={styles.startLoggingButtonTouchable}> + + {languages.t('label.overlap')} + + + + ) : ( + <> + + this.willParticipate()} + style={styles.startLoggingButtonTouchable}> + + {languages.t('label.start_logging')} + + + + )} - {this.state.isLogging ? ( - - {languages.t('label.logging_message')} - - ) : ( - - {languages.t('label.not_logging_message')} - - )} - + {this.state.isLogging ? ( + + {languages.t('label.logging_message')} + + ) : ( + + {languages.t('label.not_logging_message')} + + )} + {/* */}