Browse Source

FIX | print layout, chat message styles

merge-requests/374/head
Yevhen Romanenko 2 years ago committed by Coder
parent
commit
a1763faad0
  1. 58
      ios/Podfile.lock
  2. 14
      package-lock.json
  3. 9
      src/modules/tasks/hooks/use-tasks-print.hook.ts
  4. 4
      src/shared/components/plugins/chat/chat-item-message.component.tsx
  5. 2
      src/shared/themes/dark/chat.ts
  6. 8
      yarn.lock

58
ios/Podfile.lock

@ -15,34 +15,34 @@ PODS: @@ -15,34 +15,34 @@ PODS:
- React-Core
- fmt (6.2.1)
- glog (0.3.5)
- libwebp (1.2.1):
- libwebp/demux (= 1.2.1)
- libwebp/mux (= 1.2.1)
- libwebp/webp (= 1.2.1)
- libwebp/demux (1.2.1):
- libwebp (1.2.4):
- libwebp/demux (= 1.2.4)
- libwebp/mux (= 1.2.4)
- libwebp/webp (= 1.2.4)
- libwebp/demux (1.2.4):
- libwebp/webp
- libwebp/mux (1.2.1):
- libwebp/mux (1.2.4):
- libwebp/demux
- libwebp/webp (1.2.1)
- OneSignal (3.11.1):
- OneSignal/OneSignalCore (= 3.11.1)
- OneSignal/OneSignalExtension (= 3.11.1)
- OneSignal/OneSignalOutcomes (= 3.11.1)
- OneSignal/OneSignalCore (3.11.1)
- OneSignal/OneSignalExtension (3.11.1):
- libwebp/webp (1.2.4)
- OneSignal (3.12.4):
- OneSignal/OneSignalCore (= 3.12.4)
- OneSignal/OneSignalExtension (= 3.12.4)
- OneSignal/OneSignalOutcomes (= 3.12.4)
- OneSignal/OneSignalCore (3.12.4)
- OneSignal/OneSignalExtension (3.12.4):
- OneSignal/OneSignalCore
- OneSignal/OneSignalOutcomes
- OneSignal/OneSignalOutcomes (3.11.1):
- OneSignal/OneSignalOutcomes (3.12.4):
- OneSignal/OneSignalCore
- OneSignalXCFramework (3.11.2):
- OneSignalXCFramework/OneSignalCore (= 3.11.2)
- OneSignalXCFramework/OneSignalExtension (= 3.11.2)
- OneSignalXCFramework/OneSignalOutcomes (= 3.11.2)
- OneSignalXCFramework/OneSignalCore (3.11.2)
- OneSignalXCFramework/OneSignalExtension (3.11.2):
- OneSignalXCFramework (3.12.4):
- OneSignalXCFramework/OneSignalCore (= 3.12.4)
- OneSignalXCFramework/OneSignalExtension (= 3.12.4)
- OneSignalXCFramework/OneSignalOutcomes (= 3.12.4)
- OneSignalXCFramework/OneSignalCore (3.12.4)
- OneSignalXCFramework/OneSignalExtension (3.12.4):
- OneSignalXCFramework/OneSignalCore
- OneSignalXCFramework/OneSignalOutcomes
- OneSignalXCFramework/OneSignalOutcomes (3.11.2):
- OneSignalXCFramework/OneSignalOutcomes (3.12.4):
- OneSignalXCFramework/OneSignalCore
- Permission-Camera (3.3.1):
- RNPermissions
@ -262,8 +262,8 @@ PODS: @@ -262,8 +262,8 @@ PODS:
- React-Core
- react-native-notification-badge (1.0.5):
- React
- react-native-onesignal (4.3.11):
- OneSignalXCFramework (= 3.11.2)
- react-native-onesignal (4.5.1):
- OneSignalXCFramework (= 3.12.4)
- React (< 1.0.0, >= 0.13.0)
- react-native-orientation-locker (1.5.0):
- React-Core
@ -433,7 +433,7 @@ PODS: @@ -433,7 +433,7 @@ PODS:
- SDWebImage (5.11.1):
- SDWebImage/Core (= 5.11.1)
- SDWebImage/Core (5.11.1)
- SDWebImageWebPCoder (0.8.4):
- SDWebImageWebPCoder (0.8.5):
- libwebp (~> 1.0)
- SDWebImage/Core (~> 5.10)
- TOCropViewController (2.6.1)
@ -676,9 +676,9 @@ SPEC CHECKSUMS: @@ -676,9 +676,9 @@ SPEC CHECKSUMS:
ffmpeg-kit-react-native: bc3c900af9f761b6fe30906ee1bd98000c79f9c9
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 5337263514dd6f09803962437687240c5dc39aa4
libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
OneSignal: 60902887c93f91e9b5599583e7df5f55b2144755
OneSignalXCFramework: 81ceac017a290f23793443323090cfbe888f74ea
libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
OneSignal: 441fa3fc7072f2b47f6ba5a8c6205b0323b46db4
OneSignalXCFramework: 087934ab0d4d7445fcf1c015c7c782359e26c020
Permission-Camera: bae27a8503530770c35aadfecbb97ec71823382a
Permission-PhotoLibrary: ddb5a158725b29cb12e9e477e8a5f5151c66cc3c
RCT-Folly: a21c126816d8025b547704b777a2ba552f3d9fa9
@ -701,7 +701,7 @@ SPEC CHECKSUMS: @@ -701,7 +701,7 @@ SPEC CHECKSUMS:
react-native-image-picker: cffb727cf2f59bd5c0408e30b3dbe0b935f88835
react-native-netinfo: 5b664b2945a8f02102b296f0f812bddd6827ed9c
react-native-notification-badge: c33673c5f9334703ba8c3ca599b6ba67a2eed2dc
react-native-onesignal: dfc675fafef0bfdda49b09a8e2099903e5e85f15
react-native-onesignal: 7bd44dbd031d8d57110c0203836ffc37ddead526
react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
react-native-pager-view: 95d0418c3c74279840abec6926653d32447bafb6
react-native-print: 1ae7a4ce4bf673b975f2ec9c4e00ad0c9b60e8aa
@ -743,7 +743,7 @@ SPEC CHECKSUMS: @@ -743,7 +743,7 @@ SPEC CHECKSUMS:
RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f
RNVectorIcons: f67a1abce2ec73e62fe4606e8110e95a832bc859
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
SDWebImageWebPCoder: f93010f3f6c031e2f8fb3081ca4ee6966c539815
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
Yoga: e7dc4e71caba6472ff48ad7d234389b91dadc280

14
package-lock.json generated

@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
"react-native-masked-text": "^1.13.0",
"react-native-modal": "^13.0.1",
"react-native-notification-badge": "^1.0.5",
"react-native-onesignal": "^4.3.7",
"react-native-onesignal": "^4.4.1",
"react-native-orientation-locker": "^1.3.1",
"react-native-pager-view": "^5.4.4",
"react-native-permissions": "^3.2.0",
@ -12780,9 +12780,9 @@ @@ -12780,9 +12780,9 @@
}
},
"node_modules/react-native-onesignal": {
"version": "4.3.11",
"resolved": "https://registry.npmjs.org/react-native-onesignal/-/react-native-onesignal-4.3.11.tgz",
"integrity": "sha512-sBIFu6/+I/fXeH+GAOP1zUYUy2eJmchPOPj7RRDsArURTGcSR5jcGgoFjo9b6BT2tHkIeo39GkeojQD7pIvPzA==",
"version": "4.5.1",
"resolved": "https://registry.npmjs.org/react-native-onesignal/-/react-native-onesignal-4.5.1.tgz",
"integrity": "sha512-9XtRwW/Hn3dTD7jxQiKIW4+o1bWNgm1jCUPK1SkjyPd7TiH4cnGuL9JGaAMCUvAWUAp9KC8ejShr6v8K0dGVGQ==",
"dependencies": {
"invariant": "^2.2.2"
}
@ -26008,9 +26008,9 @@ @@ -26008,9 +26008,9 @@
"requires": {}
},
"react-native-onesignal": {
"version": "4.3.11",
"resolved": "https://registry.npmjs.org/react-native-onesignal/-/react-native-onesignal-4.3.11.tgz",
"integrity": "sha512-sBIFu6/+I/fXeH+GAOP1zUYUy2eJmchPOPj7RRDsArURTGcSR5jcGgoFjo9b6BT2tHkIeo39GkeojQD7pIvPzA==",
"version": "4.5.1",
"resolved": "https://registry.npmjs.org/react-native-onesignal/-/react-native-onesignal-4.5.1.tgz",
"integrity": "sha512-9XtRwW/Hn3dTD7jxQiKIW4+o1bWNgm1jCUPK1SkjyPd7TiH4cnGuL9JGaAMCUvAWUAp9KC8ejShr6v8K0dGVGQ==",
"requires": {
"invariant": "^2.2.2"
}

9
src/modules/tasks/hooks/use-tasks-print.hook.ts

@ -30,7 +30,6 @@ export const useTasksPrint = () => { @@ -30,7 +30,6 @@ export const useTasksPrint = () => {
})
RNFetchBlob.ios.openDocument(result.filePath)
// Linking.openURL(result.filePath)
} catch (e) {
console.log('error', e)
}
@ -58,15 +57,15 @@ export const useTasksPrint = () => { @@ -58,15 +57,15 @@ export const useTasksPrint = () => {
}${task.executor.factoryName ? task.executor.factoryName : ''})</span>
<table >
<tr>
<td style="padding-right: 50px" ><strong>${
<td style="padding-right: 40px" ><strong>${
task.id
}</strong></td>
<td style="padding-right: 95px"><strong>Початок:</strong> <span style="font-size: 14">${moment(
<td style="padding-right: 85px"><strong>Початок:</strong> <span style="word-wrap: normal;font-size: 14">${moment(
new Date(task.startDate),
).format('DD-MM-YYYY')}</span></td>
<td><strong>Закінчення:</strong>${moment(
<td><strong>Закінчення:</strong> <span style="word-wrap: normal;font-size: 14">${moment(
new Date(task.endDate),
).format('DD-MM-YYYY')}</td>
).format('DD-MM-YYYY')}</span></td>
<td style="width:40px; padding-left: 95px">
<div
style="

4
src/shared/components/plugins/chat/chat-item-message.component.tsx

@ -80,10 +80,10 @@ export const ChatItemMessage: FC<ChatItemMessageProps> = props => { @@ -80,10 +80,10 @@ export const ChatItemMessage: FC<ChatItemMessageProps> = props => {
const createStyles = (theme: PartialTheme) =>
StyleSheet.create({
text: {
fontSize: $size(12, 11),
fontSize: $size(15, 13),
lineHeight: $size(20),
color: theme.chats.message.$content,
fontFamily: getFont('Gilroy', '400'),
fontFamily: getFont('Gilroy', '500'),
},
container: {
marginBottom: $size(7),

2
src/shared/themes/dark/chat.ts

@ -47,7 +47,7 @@ export const chatColors: ChatColors = { @@ -47,7 +47,7 @@ export const chatColors: ChatColors = {
message: {
$titleName: '#FFFFFF',
$bgPrimary: '#1F1F1F',
$bgSecondary: '#f5e9ec',
$bgSecondary: '#1F1F1F',
$content: '#FFFFFF',
$timeMessage: '#FFFFFF',
$ticks: '#7F7F7F',

8
yarn.lock

@ -7184,10 +7184,10 @@ @@ -7184,10 +7184,10 @@
"resolved" "https://registry.npmjs.org/react-native-notification-badge/-/react-native-notification-badge-1.0.5.tgz"
"version" "1.0.5"
"react-native-onesignal@^4.3.7":
"integrity" "sha512-sBIFu6/+I/fXeH+GAOP1zUYUy2eJmchPOPj7RRDsArURTGcSR5jcGgoFjo9b6BT2tHkIeo39GkeojQD7pIvPzA=="
"resolved" "https://registry.npmjs.org/react-native-onesignal/-/react-native-onesignal-4.3.11.tgz"
"version" "4.3.11"
"react-native-onesignal@^4.4.1":
"integrity" "sha512-9XtRwW/Hn3dTD7jxQiKIW4+o1bWNgm1jCUPK1SkjyPd7TiH4cnGuL9JGaAMCUvAWUAp9KC8ejShr6v8K0dGVGQ=="
"resolved" "https://registry.npmjs.org/react-native-onesignal/-/react-native-onesignal-4.5.1.tgz"
"version" "4.5.1"
dependencies:
"invariant" "^2.2.2"

Loading…
Cancel
Save