diff --git a/app/package-lock.json b/app/package-lock.json index 8a0da590..f80b0bf5 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -5204,9 +5204,9 @@ } }, "react-native-vector-icons": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-4.6.0.tgz", - "integrity": "sha512-rpfhfPiXCK2PX1nrNhdxSMrEGB/Gw/SvKoPM0G2wAkSoqynnes19K0VYI+Up7DqR1rFIpE4hP2erpT1tNx2tfg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-5.0.0.tgz", + "integrity": "sha512-3ZmLGhQFk5QeHuttx0tOpghXhpVMGwXzb3pVaW/M8Qj0qkcg7koVyZmoR9vABQuxFC6KbM3l6/WLYZPh2aGfuQ==", "requires": { "lodash": "^4.0.0", "prop-types": "^15.5.10", diff --git a/app/package.json b/app/package.json index 72c1b095..2796b794 100644 --- a/app/package.json +++ b/app/package.json @@ -11,7 +11,7 @@ "react": "16.2.0", "react-native": "0.55.3", "react-native-image-zoom-viewer": "^2.2.5", - "react-native-vector-icons": "^4.5.0", + "react-native-vector-icons": "^5.0.0", "react-native-video": "2.0.0", "react-navigation": "^1.5.12", "react-navigation-redux-helpers": "^1.0.1", diff --git a/app/src/component/button/view.js b/app/src/component/button/view.js index 0f26c584..d0bdde34 100644 --- a/app/src/component/button/view.js +++ b/app/src/component/button/view.js @@ -2,7 +2,7 @@ import React from 'react'; import { Text, TouchableOpacity } from 'react-native'; import buttonStyle from '../../styles/button'; import Colors from '../../styles/colors'; -import Icon from 'react-native-vector-icons/FontAwesome'; +import Icon from 'react-native-vector-icons/FontAwesome5'; export default class Button extends React.PureComponent { render() { @@ -32,6 +32,7 @@ export default class Button extends React.PureComponent { if (icon && icon.trim().length > 0) { textStyles.push(buttonStyle.textWithIcon); } + if (theme === 'light') { textStyles.push(buttonStyle.textDark); } else { diff --git a/app/src/component/mediaPlayer/view.js b/app/src/component/mediaPlayer/view.js index 1108e3c5..1bb8f52d 100644 --- a/app/src/component/mediaPlayer/view.js +++ b/app/src/component/mediaPlayer/view.js @@ -9,7 +9,7 @@ import { TouchableOpacity } from 'react-native'; import Video from 'react-native-video'; -import Icon from 'react-native-vector-icons/FontAwesome'; +import Icon from 'react-native-vector-icons/FontAwesome5'; import FileItemMedia from '../fileItemMedia'; import mediaPlayerStyle from '../../styles/mediaPlayer'; diff --git a/src/main/assets/fonts/FontAwesome5_Brands.ttf b/src/main/assets/fonts/FontAwesome5_Brands.ttf new file mode 100644 index 00000000..2ffa92d4 Binary files /dev/null and b/src/main/assets/fonts/FontAwesome5_Brands.ttf differ diff --git a/src/main/assets/fonts/FontAwesome5_Regular.ttf b/src/main/assets/fonts/FontAwesome5_Regular.ttf new file mode 100644 index 00000000..43406e85 Binary files /dev/null and b/src/main/assets/fonts/FontAwesome5_Regular.ttf differ diff --git a/src/main/assets/fonts/FontAwesome5_Solid.ttf b/src/main/assets/fonts/FontAwesome5_Solid.ttf new file mode 100644 index 00000000..a1da1bbb Binary files /dev/null and b/src/main/assets/fonts/FontAwesome5_Solid.ttf differ