Skip to content

Commit

Permalink
Merge pull request #52 from joaocarmo/next
Browse files Browse the repository at this point in the history
[Release] v1.2.0
  • Loading branch information
joaocarmo authored Apr 10, 2022
2 parents 9576849 + fae2b4b commit b2f8ffe
Show file tree
Hide file tree
Showing 8 changed files with 131 additions and 85 deletions.
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ PODS:
- React-jsi (= 0.68.0)
- React-logger (= 0.68.0)
- React-perflogger (= 0.68.0)
- RNBackgroundFetch (4.0.5):
- RNBackgroundFetch (4.1.0):
- React-Core
- RNBootSplash (4.1.4):
- React-Core
Expand Down Expand Up @@ -1318,7 +1318,7 @@ SPEC CHECKSUMS:
React-RCTVibration: 82fc52d3d96549b8c59a6c8c017d5a1a11457049
React-runtimeexecutor: 9b1304f48e344c55bb3c36e13bf11461cb4da5d8
ReactCommon: fab89a13b52f1ac42b59a0e4b4f76f21aea9eebe
RNBackgroundFetch: f61b5eb62e86e76ec6302c3ba9798966a14aa312
RNBackgroundFetch: 1f47e8f793ad7a1ae7f0e3db5437f4feaf887a03
RNBootSplash: de2c568373a9c79a66e9918b8929eb6c9a35246f
RNCAsyncStorage: 005c0e2f09575360f142d0d1f1f15e4ec575b1af
RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
Expand Down
98 changes: 49 additions & 49 deletions ios/litten.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions lib/components/add-photo/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ComponentType, useCallback, useMemo } from 'react'
import { Alert } from 'react-native'
import type { ImageProps } from 'react-native'
import ImagePicker from 'react-native-image-crop-picker'
import type { ImageOrVideo } from 'react-native-image-crop-picker'
Expand Down Expand Up @@ -46,6 +47,10 @@ const AddPhoto = ({
}
} catch (err) {
debugLog(err)

if (err.message.includes('permission')) {
Alert.alert(translate('feedback.errorMessages.noCameraPermissions'))
}
}
}, [onChange])

Expand All @@ -55,6 +60,10 @@ const AddPhoto = ({
onChange(image)
} catch (err) {
debugLog(err)

if (err.message.includes('permission')) {
Alert.alert(translate('feedback.errorMessages.noLibraryPermissions'))
}
}
}, [onChange])

Expand Down
8 changes: 8 additions & 0 deletions lib/forms/register/steps/photo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ const StepPhoto = ({
}
} catch (err) {
debugLog(err)

if (err.message.includes('permission')) {
Alert.alert(translate('feedback.errorMessages.noCameraPermissions'))
}
}
}, [setAvatar])

Expand All @@ -54,6 +58,10 @@ const StepPhoto = ({
})
} catch (err) {
debugLog(err)

if (err.message.includes('permission')) {
Alert.alert(translate('feedback.errorMessages.noLibraryPermissions'))
}
}
}, [setAvatar])

Expand Down
2 changes: 2 additions & 0 deletions lib/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,8 @@
"networkProblem": "There is a network problem",
"newErrorTitle": "Error creating",
"newUnverifiefEmail": "You need to verify your email address before you can create a new litten! This can be done in your profile settings. You can click this message to go there now.",
"noCameraPermissions": "We can't access your camera. Please give Litten access to your camera. You can do so on your device's definitions.",
"noLibraryPermissions": "We can't access your library. Please give Litten access to your library. You can do so on your device's definitions.",
"noPhoneNumberDesc": "You haven't specified a phone number yet, but you can do so in your profile.",
"noPhoneNumberTitle": "No Phone Number",
"notImplemented": "That feature isn't active yet",
Expand Down
2 changes: 2 additions & 0 deletions lib/translations/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,8 @@
"networkProblem": "Existe um problema de ligação",
"newErrorTitle": "Erro ao criar",
"newUnverifiefEmail": "Precisas de verificar o teu endereço de email antes de criar um novo litten! Isto pode ser feito nas tuas definições de perfil.",
"noCameraPermissions": "Sem permissões de acesso à câmara. Por favor, verifica as definições de acesso da Litten à tua câmara.",
"noLibraryPermissions": "Sem permissões de acesso à galeria de fotografias. Por favor, verifica as definições de acesso da Litten à tua galeria de fotografias.",
"noPhoneNumberDesc": "Ainda não introduziste um número de telemóvel, mas podes fazê-lo no teu perfil",
"noPhoneNumberTitle": "Sem telemóvel",
"notImplemented": "Essa funcionalidade está inactiva",
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"libphonenumber-js": "^1.9.49",
"react": "17.0.2",
"react-native": "0.68.0",
"react-native-background-fetch": "^4.0.5",
"react-native-background-fetch": "^4.1.0",
"react-native-bootsplash": "^4.1.3",
"react-native-device-info": "^8.5.0",
"react-native-dialog": "^9.2.1",
Expand Down Expand Up @@ -157,8 +157,8 @@
"@types/i18n-js": "^3.8.2",
"@types/jest": "^27.4.1",
"@types/lodash": "^4.14.180",
"@types/react": "^17.0.40",
"@types/react-native": "^0.67.3",
"@types/react": "^17.0.44",
"@types/react-native": "^0.67.4",
"@types/react-test-renderer": "^17.0.1",
"@typescript-eslint/eslint-plugin": "^5.15.0",
"@typescript-eslint/parser": "^5.15.0",
Expand All @@ -169,13 +169,13 @@
"babel-plugin-macros": "^3.0.1",
"babel-plugin-module-resolver": "^4.1.0",
"camelcase": "^6.3.0",
"eslint": "^8.11.0",
"eslint": "^8.13.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-custom-alias": "^1.3.0",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.1.1",
"eslint-plugin-jest": "^26.1.4",
"eslint-plugin-jsx-a11y": "^6.5.1",
"firebase": "^9.6.8",
"firebase-admin": "^10.0.2",
Expand All @@ -187,15 +187,15 @@
"jsonschema": "^1.4.0",
"lint-staged": "^12.3.6",
"lodash": "^4.17.21",
"metro-react-native-babel-preset": "^0.70.0",
"metro-react-native-babel-preset": "^0.70.1",
"papaparse": "^5.3.2",
"patch-package": "^6.4.6",
"pinst": "^3.0.0",
"pod-install": "^0.1.32",
"postinstall-postinstall": "^2.1.0",
"prettier": "^2.6.0",
"preval.macro": "^5.0.0",
"react-devtools": "^4.24.1",
"react-devtools": "^4.24.4",
"react-native-svg-transformer": "^1.0.0",
"react-native-version": "^4.0.0",
"react-test-renderer": "17.0.2",
Expand Down
79 changes: 52 additions & 27 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,13 @@
"@babel/helper-simple-access" "^7.17.7"
babel-plugin-dynamic-import-node "^2.3.3"

"@babel/plugin-transform-named-capturing-groups-regex@^7.0.0":
version "7.16.8"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
dependencies:
"@babel/helper-create-regexp-features-plugin" "^7.16.7"

"@babel/plugin-transform-object-assign@^7.0.0", "@babel/plugin-transform-object-assign@^7.16.7":
version "7.16.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.16.7.tgz#5fe08d63dccfeb6a33aa2638faf98e5c584100f8"
Expand Down Expand Up @@ -3258,10 +3265,10 @@
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==

"@types/react-native@^0.67.3":
version "0.67.3"
resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.67.3.tgz#baba111c8ce1a45a6034c15f6f0ad98826239780"
integrity sha512-hF4uOZFl2PPQtGWOtLoafrlCJeU815X3PgfVePM+7EhOIZhYXKH7+p3R3cZSnwVnrU5Ep/JfiHimMDliY3o8oQ==
"@types/react-native@^0.67.4":
version "0.67.4"
resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.67.4.tgz#97a8d3cff2a7606f247008e93d9fe2a3879bc84e"
integrity sha512-L81CB6W1m0s7d+TH/loP318+VKPwwjWQBUTVYQ1+lQTWiE5jHxyihgCmd7JbwLICo708FRSDwJW7pJoiZHy6yg==
dependencies:
"@types/react" "*"

Expand Down Expand Up @@ -3289,7 +3296,7 @@
dependencies:
"@types/react" "*"

"@types/react@*", "@types/react@^17.0.40", "@types/react@^17.0.43":
"@types/react@*", "@types/react@^17.0.43":
version "17.0.43"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.43.tgz#4adc142887dd4a2601ce730bc56c3436fdb07a55"
integrity sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A==
Expand All @@ -3298,6 +3305,15 @@
"@types/scheduler" "*"
csstype "^3.0.2"

"@types/react@^17.0.44":
version "17.0.44"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.44.tgz#c3714bd34dd551ab20b8015d9d0dbec812a51ec7"
integrity sha512-Ye0nlw09GeMp2Suh8qoOv0odfgCoowfM/9MG6WeRD60Gq9wS90bdkdRtYbRkNhXOpG4H+YXGvj4wOWhAC0LJ1g==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
csstype "^3.0.2"

"@types/redux-devtools-themes@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@types/redux-devtools-themes/-/redux-devtools-themes-1.0.0.tgz#4d22d3e8be499fc7eec220e020b0640d4bfb17bd"
Expand Down Expand Up @@ -6475,10 +6491,10 @@ eslint-plugin-jest@22.4.1:
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.4.1.tgz#a5fd6f7a2a41388d16f527073b778013c5189a9c"
integrity sha512-gcLfn6P2PrFAVx3AobaOzlIEevpAEf9chTpFZz7bYfc7pz8XRv7vuKTIE4hxPKZSha6XWKKplDQ0x9Pq8xX2mg==

eslint-plugin-jest@^26.1.1:
version "26.1.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-26.1.3.tgz#e722e5efeea18aa9dec7c7349987b641db19feb7"
integrity sha512-Pju+T7MFpo5VFhFlwrkK/9jRUu18r2iugvgyrWOnnGRaVTFFmFXp+xFJpHyqmjjLmGJPKLeEFLVTAxezkApcpQ==
eslint-plugin-jest@^26.1.4:
version "26.1.4"
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-26.1.4.tgz#8e3410093ff4439d0c3a371add5bf9e05623a57a"
integrity sha512-wgqxujmqc2qpvZqMFWCh6Cniqc8lWpapvXt9j/19DmBDqeDaYhJrSRezYR1SKyemvjx+9e9kny/dgRahraHImA==
dependencies:
"@typescript-eslint/utils" "^5.10.0"

Expand Down Expand Up @@ -6583,10 +6599,10 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==

eslint@^8.11.0:
version "8.12.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.12.0.tgz#c7a5bd1cfa09079aae64c9076c07eada66a46e8e"
integrity sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==
eslint@^8.13.0:
version "8.13.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.13.0.tgz#6fcea43b6811e655410f5626cfcf328016badcd7"
integrity sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==
dependencies:
"@eslint/eslintrc" "^1.2.1"
"@humanwhocodes/config-array" "^0.9.2"
Expand Down Expand Up @@ -10637,10 +10653,10 @@ metro-react-native-babel-preset@0.67.0:
"@babel/template" "^7.0.0"
react-refresh "^0.4.0"

metro-react-native-babel-preset@^0.70.0:
version "0.70.0"
resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.70.0.tgz#e1eaafdc4552ac52a9b46696a25a68bacc28c426"
integrity sha512-MoOK5/rdDE2bABA+KpbXV6w0Q96sZeZiE9Ct89NYp9nPwXIaY7ylulLsjW3+rT6BdecKuNPUVwvtO0vYIQwvRw==
metro-react-native-babel-preset@^0.70.1:
version "0.70.1"
resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.70.1.tgz#d71c3630645014c7095fe94655f4c003a6a457ff"
integrity sha512-E7jCbHyb+HTA00AqO/XxURCNFc68KU9nJo7zMDGt4EjwcUP80RaBzK1O4/GborQzkWM4wjIuQMnYX6xWYuV5ag==
dependencies:
"@babel/core" "^7.14.0"
"@babel/plugin-proposal-async-generator-functions" "^7.0.0"
Expand All @@ -10666,6 +10682,7 @@ metro-react-native-babel-preset@^0.70.0:
"@babel/plugin-transform-function-name" "^7.0.0"
"@babel/plugin-transform-literals" "^7.0.0"
"@babel/plugin-transform-modules-commonjs" "^7.0.0"
"@babel/plugin-transform-named-capturing-groups-regex" "^7.0.0"
"@babel/plugin-transform-parameters" "^7.0.0"
"@babel/plugin-transform-react-display-name" "^7.0.0"
"@babel/plugin-transform-react-jsx" "^7.0.0"
Expand Down Expand Up @@ -12374,24 +12391,32 @@ react-base16-styling@^0.9.1:
csstype "^3.0.10"
lodash.curry "^4.1.1"

react-devtools-core@4.24.3, react-devtools-core@^4.23.0:
react-devtools-core@4.24.4:
version "4.24.4"
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.24.4.tgz#adaa54569f87ce7c08384d12e0b35122a755cbae"
integrity sha512-jbX8Yqyq4YvFEobHyXVlGaH0Cs/+EOdb3PL911bxaR5BnzbB5TE4RFHC1iOgT4vRH3VxIIrVQ7lR9vsiFFCYCA==
dependencies:
shell-quote "^1.6.1"
ws "^7"

react-devtools-core@^4.23.0:
version "4.24.3"
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.24.3.tgz#371fef3f5c639db0dc59eeef334dd5e10ac61661"
integrity sha512-+htKZxLxDN14jhRG3+IXRiJqNSGHUiPYrMtv9e7qlZxcbKeJjVs+C/hd8kZF5rydp3faBwFN6ZpTaZnLA3/ZGA==
dependencies:
shell-quote "^1.6.1"
ws "^7"

react-devtools@^4.24.1:
version "4.24.3"
resolved "https://registry.yarnpkg.com/react-devtools/-/react-devtools-4.24.3.tgz#9982e2958a029227bba9602b427f7de5fe97ac51"
integrity sha512-N9N4oiaePi2zYBNg2YXP2JlkQt1kWS2NfrYNtxlhR/IXKJeSBfGwOFFVRe5b7bxEroStzTD4xEa8Bqk2ieeTKA==
react-devtools@^4.24.4:
version "4.24.4"
resolved "https://registry.yarnpkg.com/react-devtools/-/react-devtools-4.24.4.tgz#cbc299ca0100755721d002ca4eb0b72743a0baef"
integrity sha512-r2/HZo1LAYrSm1EpJL2NAJZFxWuSgIXTciAICuBhgXlDW5WvZrJpsFa2gaPnVNACFnjRUzDebpSR1gYy2oGdeQ==
dependencies:
cross-spawn "^5.0.1"
electron "^11.1.0"
ip "^1.1.4"
minimist "^1.2.3"
react-devtools-core "4.24.3"
react-devtools-core "4.24.4"
update-notifier "^2.1.0"

react-dom@^17.0.2:
Expand Down Expand Up @@ -12441,10 +12466,10 @@ react-json-tree@^0.16.1:
prop-types "^15.8.1"
react-base16-styling "^0.9.1"

react-native-background-fetch@^4.0.5:
version "4.0.5"
resolved "https://registry.yarnpkg.com/react-native-background-fetch/-/react-native-background-fetch-4.0.5.tgz#cf59466440d66585313d7fcb718a30ba1461a7be"
integrity sha512-RZx51NRtGX+BFQXW026HUbXzOvCsQX76uBjU2QbikrtE0BefDbhpUPkM8VwufYod0aN5IQ480UF+D9bwUpsxmg==
react-native-background-fetch@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/react-native-background-fetch/-/react-native-background-fetch-4.1.0.tgz#6b5a4a85c9fcf18d3108bdca1d15a92c1166fe9a"
integrity sha512-LWl1xuLNfHbD9MQXV31RvpCia9hMxOW+gwjp5yzW7BbiZWTWV2TQ9szuHaPn4NBWHDdh+MtI5pb6JV9P/LCaOQ==

react-native-bootsplash@^4.1.3:
version "4.1.4"
Expand Down

0 comments on commit b2f8ffe

Please sign in to comment.