Skip to content

Commit

Permalink
Merge pull request #2882 from ecency/nt/recover-lint
Browse files Browse the repository at this point in the history
removed conflicting eslint parser
  • Loading branch information
feruzm authored May 31, 2024
2 parents d25a0d6 + 2df3ec4 commit 64d9a86
Show file tree
Hide file tree
Showing 72 changed files with 1,475 additions and 1,678 deletions.
6 changes: 5 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@
"ts": "never",
"tsx": "never"
}
]
],
"class-methods-use-this": "off",
"react/jsx-wrap-multilines": "off",
"jsx-one-expression-per-line": "off",
"react/jsx-one-expression-per-line": "off"
}
}
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@
"@babel/preset-env": "^7.20.0",
"@babel/runtime": "^7.20.0",
"@bugsnag/source-maps": "^2.3.1",
"@react-native-community/eslint-config": "^2.0.0",
"@react-native/babel-preset": "0.73.19",
"@react-native/eslint-config": "0.73.2",
"@react-native/metro-config": "0.73.3",
Expand Down
8 changes: 1 addition & 7 deletions src/components/autoHeightImage/autoHeightImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export const AutoHeightImage = ({
const _initialHeight = useMemo(() => {
let _height = contentWidth / (16 / 9);
if (metadata && metadata.image && metadata.image_ratios) {

metadata.image_ratios.forEach((_ratio, index) => {
const url = metadata.image[index];

Expand Down Expand Up @@ -75,12 +74,7 @@ export const AutoHeightImage = ({

return (
<TouchableOpacity onPress={onPress} disabled={isAnchored} activeOpacity={activeOpacity || 1}>
<ExpoImage
style={imgStyle}
source={{ uri: imgUrl }}
contentFit={"contain"}
onLoad={_onLoad}
/>
<ExpoImage style={imgStyle} source={{ uri: imgUrl }} contentFit="contain" onLoad={_onLoad} />
</TouchableOpacity>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { useSelector } from 'react-redux';
import styles from './listItemPlaceHolderStyles';

const CommentPlaceHolderView = () => {

const _width = 300;

const animationStyle = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const PostCardPlaceHolder = () => {

const animationStyle = {
width: _width,
height: _width * 2
height: _width * 2,
};

const isDarkTheme = useSelector((state) => state.application.isDarkTheme);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ const PostPlaceHolder = () => {
const isDarkTheme = useSelector((state) => state.application.isDarkTheme);
const color = isDarkTheme ? '#2e3d51' : '#f5f5f5';


const width = getWindowDimensions().nativeWidth - 36;
const height = width * 1.65 ;
const height = width * 1.65;

return (
<View>
Expand Down
8 changes: 4 additions & 4 deletions src/components/checkbox/view/checkboxView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ interface CheckBoxProps {
locked?: boolean;
isRound?: boolean;
style?: ViewStyle;
clicked: (val: string, isChecked: boolean) => void,
clicked: (val: string, isChecked: boolean) => void;
}

const CheckBoxView = ({ clicked, value, isChecked, style, locked, isRound }: CheckBoxProps) => {
Expand All @@ -27,12 +27,12 @@ const CheckBoxView = ({ clicked, value, isChecked, style, locked, isRound }: Che
}
};

const containerStyle = [styles.bigSquare, style, isRound && { borderRadius: 10 }]
const containerStyle = [styles.bigSquare, style, isRound && { borderRadius: 10 }];
const innerStyle = [
styles.smallSquare,
isCheck && styles.checked,
isRound && { borderRadius: 5 }
]
isRound && { borderRadius: 5 },
];

return (
<TouchableOpacity disabled={locked} onPress={_checkClicked}>
Expand Down
6 changes: 1 addition & 5 deletions src/components/draftListItem/view/draftListItemView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,7 @@ const DraftListItemView = ({
<View style={styles.body}>
<TouchableOpacity onPress={_onItemPress} onLongPress={_onItemLongPress}>
{image !== null && (
<ExpoImage
source={image}
style={styles.thumbnail}
contentFit="cover"
/>
<ExpoImage source={image} style={styles.thumbnail} contentFit="cover" />
)}
<View style={styles.postDescripton}>
{title !== '' && <Text style={styles.title}>{title}</Text>}
Expand Down
2 changes: 1 addition & 1 deletion src/components/editAvatar/editAvatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const EditAvatar = ({ username, avatarUrl, showImageUploadActions, isUploading }
/>
<IconButton
isLoading={isUploading}
color={'white'}
color="white"
iconStyle={styles.addIcon}
style={styles.addButton}
iconType="MaterialIcons"
Expand Down
8 changes: 4 additions & 4 deletions src/components/imageViewer/imageViewer.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ export default EStyleSheet.create({
},
leftContainer: {
position: 'absolute',
flexDirection:'row',
alignItems:'center',
flexDirection: 'row',
alignItems: 'center',
left: 8,
},
rightContainer: {
position: 'absolute',
flexDirection:'row',
flexDirection: 'row',
right: 8,
},
imageGalleryHeaderText: {
color: '$iconColor',
fontSize: 16
fontSize: 16,
},
});
Loading

0 comments on commit 64d9a86

Please sign in to comment.