Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat: Share QR Code #18636

Merged
merged 44 commits into from
May 15, 2023
Merged

Feat: Share QR Code #18636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
a3a9677
add qr code library
May 9, 2023
fdca05f
add ShareCodePage and add references to relevant files
May 9, 2023
75fccc4
add QRShare component
May 9, 2023
c036f17
add basic QR UI
May 9, 2023
7d1fc59
add react-native-qrcode-svg to "includeModules" in webpack config
May 9, 2023
281a8be
re-structure QRShare component
May 9, 2023
fe000c0
update ShareCodePage
May 9, 2023
fdd3473
finish implementing qr share card
May 10, 2023
68f3aaa
add separate "ReportDetailsShareCodePage" so we can use "withOnyx" to…
May 10, 2023
102272c
fix linking for report qr code
May 10, 2023
bd07e97
improve "Share Code" buttons
May 10, 2023
a140135
add locale translations
May 10, 2023
7b4d503
update props of "QRShare"
May 10, 2023
f14dc93
improve margin in ProfilePage
May 10, 2023
27c3c7d
Merge branch 'main' into @chrispader/feat/qr-codes
May 10, 2023
61b53c8
implement qr code download and improve styling
May 10, 2023
028920f
remove unused prop
May 10, 2023
11720da
disable eslint rule
May 10, 2023
559d07f
add react-native-view-shot to includeModules in webpack config
May 10, 2023
a71af62
update pods
May 10, 2023
de34b77
Merge branch 'main' into @chrispader/feat/qr-codes
May 11, 2023
789cc26
implement qr code download on native (web-support not available)
May 11, 2023
9790639
simplify propTypes
May 11, 2023
370875e
allow local files to be stored to camera roll on android
May 11, 2023
cd333e9
extract download logic from main qr code component
May 11, 2023
0bdf350
add qrcode expensicon
May 11, 2023
7bcd3b5
remove unused import
May 11, 2023
1974f62
extract download logic and differentiate between native and web
May 11, 2023
6d29e43
wrap ShareCodePage in ScrollView
May 11, 2023
6f7b6d3
make "Share code" button text sentence case
May 11, 2023
1256766
update button style
May 11, 2023
aada906
only show Download button on native platforms
May 11, 2023
39cc960
pass url to QRShare component
May 11, 2023
156d963
move share code button to MenuItem
May 12, 2023
d1f1080
move ShareCode page
May 12, 2023
630849e
move profile page
May 12, 2023
a15bac6
Merge branch 'main' into @chrispader/feat/qr-codes
May 12, 2023
8e20231
move share code button to SettingsPage
May 12, 2023
4569da0
improve propTypes structure
May 12, 2023
01e8334
Update src/pages/ShareCodePage.js
chrispader May 12, 2023
acc8b11
remove unused comment
May 12, 2023
ad0db00
fix comment
May 12, 2023
cb00561
convert ReportDetailsShareCodePage to functional component
May 12, 2023
707f6b0
Merge branch 'main' into @chrispader/feat/qr-codes
May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/images/avatars/room.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions assets/images/expensify_wordmark_white.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/images/qrcode.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions config/webpack/webpack.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ const includeModules = [
'react-native-flipper',
'react-native-google-places-autocomplete',
'@react-navigation/drawer',
'react-native-qrcode-svg',
'react-native-view-shot',
].join('|');

const envToLogoSuffixMap = {
Expand Down
10 changes: 8 additions & 2 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,8 @@ PODS:
- RCTTypeSafety
- React-Core
- ReactCommon/turbomodule/core
- react-native-view-shot (3.6.0):
- React-Core
- react-native-webview (11.23.0):
- React-Core
- React-perflogger (0.71.2-alpha.3)
Expand Down Expand Up @@ -698,7 +700,7 @@ PODS:
- RNScreens (3.17.0):
- React-Core
- React-RCTImage
- RNSVG (13.5.0):
- RNSVG (13.9.0):
- React-Core
- SDWebImage (5.11.1):
- SDWebImage/Core (= 5.11.1)
Expand Down Expand Up @@ -781,6 +783,7 @@ DEPENDENCIES:
- react-native-quick-sqlite (from `../node_modules/react-native-quick-sqlite`)
- react-native-render-html (from `../node_modules/react-native-render-html`)
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
- react-native-view-shot (from `../node_modules/react-native-view-shot`)
- react-native-webview (from `../node_modules/react-native-webview`)
- React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
- React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
Expand Down Expand Up @@ -944,6 +947,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-render-html"
react-native-safe-area-context:
:path: "../node_modules/react-native-safe-area-context"
react-native-view-shot:
:path: "../node_modules/react-native-view-shot"
react-native-webview:
:path: "../node_modules/react-native-webview"
React-perflogger:
Expand Down Expand Up @@ -1089,6 +1094,7 @@ SPEC CHECKSUMS:
react-native-quick-sqlite: bcc7a7a250a40222f18913a97cd356bf82d0a6c4
react-native-render-html: 96c979fe7452a0a41559685d2f83b12b93edac8c
react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
react-native-view-shot: 705f999ac2a24e4e6c909c0ca65c732ed33ca2ff
react-native-webview: e771bc375f789ebfa02a26939a57dbc6fa897336
React-perflogger: 9f7c5a9d22d104ae0348f38235ee636d156b5938
React-RCTActionSheet: 43e74f3a54967bb1d0e9ff261bc076843fb50ca1
Expand Down Expand Up @@ -1120,7 +1126,7 @@ SPEC CHECKSUMS:
RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c
RNReanimated: fbc356493970e3acddc15586b1bccb5eab3ff1ec
RNScreens: 0df01424e9e0ed7827200d6ed1087ddd06c493f9
RNSVG: 38ca962c970dbce1ca38991a5aebf26d163f9efb
RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
Expand Down
Loading