Skip to content

* added fontAwesome5 vector icon support #1

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

Open
artsnr1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

* added fontAwesome5 vector icon support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"dependencies": {
"prop-types": "^15.7.2",
"react-native-pose": "^0.9.1",
"react-native-status-bar-height": "^2.5.0"
"react-native-status-bar-height": "^2.5.0",
"react-native-vector-icons": "^8.1.0"
},
"devDependencies": {
"@types/react": "^16.8.13",
Expand Down
45 changes: 30 additions & 15 deletions src/Alert/Alert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import posed from "react-native-pose";
//Mics Constants
import { styles } from "./AlertStyle";
import { Colors, Constants, Images, Responsive } from "../Theme";
import Icon from 'react-native-vector-icons/FontAwesome5';

//Pose View
let Modal = posed.View({
Expand All @@ -25,7 +26,7 @@ let Modal = posed.View({
ease: "linear",
duration: 500,
type: "spring",
stiffness: 30,
// stiffness: 30,
},
},
},
Expand All @@ -36,7 +37,7 @@ let Modal = posed.View({
ease: "linear",
duration: 500,
type: "spring",
stiffness: 30,
// stiffness: 30,
},
},
},
Expand Down Expand Up @@ -227,10 +228,10 @@ class RNAlerter extends Component {
//onPress Method
onPressAlertView = () => {
const { onPressAlert, alertLoadingVisible, alertTapToDismiss } = this.props;
const { alertTitle } = this.state;
if (alertTapToDismiss && !alertLoadingVisible && alertTitle.length <= 0) {
// const { alertTitle } = this.state;
if (alertTapToDismiss && !alertLoadingVisible) {
this.onHideAlert();
} else if (!alertLoadingVisible && alertTitle.length <= 0 && onPressAlert) {
} else if (!alertLoadingVisible && onPressAlert) {
onPressAlert();
}
};
Expand Down Expand Up @@ -267,6 +268,7 @@ class RNAlerter extends Component {
alertIconVisible,
alertLoadingVisible,
alertIconSource,
alertVectorIcon,
alertIconSize,
alertAnimatedIcon,
alertIconTintColor,
Expand Down Expand Up @@ -313,17 +315,28 @@ class RNAlerter extends Component {
pose={
alertAnimatedIcon ? (isBig ? "big" : "normal") : "normal"
}
>
<Image
style={[
styles.imageMainStyle,
alertIconTintColor !== "" && {
tintColor: alertIconTintColor,
},
]}
resizeMode={alertIconResizeMode}
source={alertIconSource}
>{
alertVectorIcon ?
<Icon
name={alertVectorIcon.name || "check"}
size={alertVectorIcon.size || 25}
color={alertVectorIcon.color || "white"}
style={{
width: alertVectorIcon.size || 25,
height: alertVectorIcon.size || 25
}}
/>
: <Image
style={[
styles.imageMainStyle,
alertIconTintColor !== "" && {
tintColor: alertIconTintColor,
},
]}
resizeMode={alertIconResizeMode}
source={alertIconSource}
/>
}
</Circle>
)
)}
Expand Down Expand Up @@ -400,6 +413,7 @@ RNAlerter.propTypes = {
alertIconVisible: PropTypes.bool,
alertLoadingVisible: PropTypes.bool,
alertIconSource: Image.propTypes.source,
alertVectorIcon: PropTypes.object,
alertIconSize: PropTypes.number,
alertIconTintColor: PropTypes.string,
alertIconResizeMode: PropTypes.oneOf([
Expand Down Expand Up @@ -457,6 +471,7 @@ RNAlerter.defaultProps = {
alertTitle: "",
alertMessage: "",
alertIconSource: Images.bell,
alertVectorIcon: null,
alertIconSize: 24,
alertIconTintColor: "",
alertIconResizeMode: Constants.center,
Expand Down