diff --git a/android/app/build.gradle b/android/app/build.gradle index 0edf7a4a..3531398f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -143,8 +143,8 @@ android { applicationId "com.dropy.project" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 3 - versionName "0.0.4" + versionCode 4 + versionName "0.0.5" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() vectorDrawables.useSupportLibrary = true diff --git a/app.json b/app.json index 54a33013..41a26c0b 100644 --- a/app.json +++ b/app.json @@ -2,12 +2,12 @@ "name": "Dropy", "displayName": "Dropy", - "version": "0.0.4", + "version": "0.0.5", "versionFlag": "private-alpha", - "requiredServerVersion": "0.0.4", + "requiredServerVersion": "0.0.5", "customAPI": null, "customSocket": null, - "productionMode": false + "productionMode": true } diff --git a/ios/dropy.xcodeproj/project.pbxproj b/ios/dropy.xcodeproj/project.pbxproj index 836e67fd..03bc1534 100644 --- a/ios/dropy.xcodeproj/project.pbxproj +++ b/ios/dropy.xcodeproj/project.pbxproj @@ -453,7 +453,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.0.4; + MARKETING_VERSION = 0.0.5; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -483,7 +483,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.0.4; + MARKETING_VERSION = 0.0.5; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/ios/dropy.xcodeproj/xcshareddata/xcschemes/dropy.xcscheme b/ios/dropy.xcodeproj/xcshareddata/xcschemes/dropy.xcscheme index 57c781a7..f7ba27bd 100644 --- a/ios/dropy.xcodeproj/xcshareddata/xcschemes/dropy.xcscheme +++ b/ios/dropy.xcodeproj/xcshareddata/xcschemes/dropy.xcscheme @@ -41,7 +41,7 @@ diff --git a/src/screens/BlockedUsersScreen.js b/src/screens/BlockedUsersScreen.js index 90492f0c..42f41c9d 100644 --- a/src/screens/BlockedUsersScreen.js +++ b/src/screens/BlockedUsersScreen.js @@ -59,7 +59,7 @@ const BlockedUsersScreen = ({ navigation }) => { try { const response = await API.unblockUser(userId); - console.log('Delete API response', response); + console.log('Unblock API response', response.data); setBlockedUsers(old => old.filter((user) => user.id !== userId)); } catch (error) { sendAlert({ @@ -80,7 +80,7 @@ const BlockedUsersScreen = ({ navigation }) => { ) : ( - + {blockedUsers.length === 0 && ( {'You don\'t have blocked anyone yet'} diff --git a/src/screens/HomeScreen.js b/src/screens/HomeScreen.js index 2a418fd2..e52bdbda 100644 --- a/src/screens/HomeScreen.js +++ b/src/screens/HomeScreen.js @@ -60,14 +60,13 @@ const HomeScreen = ({ navigation, route }) => { Animated.timing(backIconAnimatedValue, { toValue: 1, duration: 500, - delay: 500, + delay: 1000, useNativeDriver: false, }), - Animated.delay(1500), + Animated.delay(2000), Animated.timing(backIconAnimatedValue, { toValue: 0, duration: 500, - delay: 500, useNativeDriver: false, }) ]); @@ -102,10 +101,12 @@ const HomeScreen = ({ navigation, route }) => { transform: [{ scale: iconScale }], width: iconMinWidth, }}> - - + + + Background location {backgroundGeolocationEnabled ? 'enabled' : 'disabled'} - + + @@ -137,22 +138,27 @@ const styles = StyleSheet.create({ width: '90%', }, backgroundGeolocIconContainer: { - ...Styles.center, - ...Styles.hardShadows, + ...Styles.softShadows, position: 'absolute', - flexDirection: 'row', height: ICON_OPENED_SIZE, justifyContent: 'space-between', bottom: -10, left: 40, - borderRadius: 100, - padding: 10, backgroundColor: Colors.white, - overflow: 'hidden', + borderRadius: 100, }, backgroundGeolocationText: { position: 'absolute', ...Fonts.regular(12, Colors.darkGrey), marginLeft: ICON_OPENED_SIZE + 5, }, + backgroundGeolocIconInnerContainer: { + ...StyleSheet.absoluteFillObject, + overflow: 'hidden', + borderRadius: 100, + padding: 10, + backgroundColor: Colors.white, + flexDirection: 'row', + alignItems: 'center', + }, }); diff --git a/src/screens/SettingScreen.js b/src/screens/SettingScreen.js index b1475387..938fa688 100644 --- a/src/screens/SettingScreen.js +++ b/src/screens/SettingScreen.js @@ -135,7 +135,7 @@ const styles = StyleSheet.create({ scrollViewContent: { width: responsiveWidth(100), alignItems: 'center', - paddingBottom: 10, + paddingBottom: 25, }, titleText: { ...Fonts.bold(13, Colors.darkGrey), diff --git a/src/screens/UserDropiesScreen.js b/src/screens/UserDropiesScreen.js index d67ed442..2f1b4f8a 100644 --- a/src/screens/UserDropiesScreen.js +++ b/src/screens/UserDropiesScreen.js @@ -61,7 +61,7 @@ const UserDropiesScreen = ({ navigation }) => { try { const response = await API.deleteUserDropy(dropyId); - console.log('Delete API response', response); + console.log('Delete API response', response.data); setDropies(old => old.filter((dropy) => dropy.id !== dropyId)); } catch (error) { sendAlert({ @@ -82,7 +82,7 @@ const UserDropiesScreen = ({ navigation }) => { ) : ( - + {dropies.length === 0 && ( {'You don\'t have dropped anything yet'}