Skip to content

Commit 504e65d

Browse files
Made moderateScale safe for Android
1 parent 84e252a commit 504e65d

49 files changed

Lines changed: 92 additions & 56 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

aliases.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"@theme": "./src/theme",
55
"@config": "./src/config",
66
"@hooks": "./src/hooks",
7-
"@contexts": "./src/contexts"
7+
"@contexts": "./src/contexts",
8+
"@utils": "./src/utils"
89
}

src/components/Accordion.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { Animated, StyleSheet } from "react-native";
99

1010
import { Down } from "@bigbinary/neeto-icons-rn";
1111
import PropTypes from "prop-types";
12-
import { moderateScale } from "react-native-size-matters";
1312
import styled, { ThemeContext } from "styled-components/native";
1413
import {
1514
buttonStyle,
@@ -20,6 +19,8 @@ import {
2019
layout,
2120
} from "styled-system";
2221

22+
import { moderateScale } from "@utils/scale";
23+
2324
import { Container } from "./Container";
2425

2526
const TouchableOpacity = styled.TouchableOpacity`

src/components/ActionIcon.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React from "react";
22

33
import PropTypes from "prop-types";
4-
import { moderateScale } from "react-native-size-matters";
54

65
import { theme } from "@theme";
6+
import { moderateScale } from "@utils/scale";
77

88
import { Loader } from "./Loader";
99
import { Touchable } from "./Touchable";

src/components/Alert.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import React, { useState } from "react";
22
import { StyleSheet } from "react-native";
33

44
import Modal from "react-native-modal";
5-
import { moderateScale } from "react-native-size-matters";
5+
6+
import { moderateScale } from "@utils/scale";
67

78
import { Button } from "./Button";
89
import { Container } from "./Container";
@@ -71,7 +72,7 @@ let rootLevelRef = null;
7172
* ## Usage
7273
* ```js
7374
*import * as React from "react";
74-
*import { moderateScale } from "react-native-size-matters";
75+
*import { moderateScale } from "@utils/scale";
7576
*import { Alert } from "@bigbinary/neetoui-rn";
7677
*export function App(props) {
7778
* return (
@@ -83,7 +84,7 @@ let rootLevelRef = null;
8384
*}
8485
*
8586
*import * as React from "react";
86-
*import { moderateScale } from "react-native-size-matters";
87+
*import { moderateScale } from "@utils/scale";
8788
*import { Alert, Button } from "@bigbinary/neetoui-rn";
8889
*
8990
*export default function Main() {

src/components/Avatar.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import Animated, {
88
useSharedValue,
99
withTiming,
1010
} from "react-native-reanimated";
11-
import { moderateScale } from "react-native-size-matters";
11+
12+
import { moderateScale } from "@utils/scale";
1213

1314
import { Container } from "./Container";
1415
import { Typography } from "./Typography";

src/components/Badge.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import React from "react";
22

33
import PropTypes from "prop-types";
4-
import { moderateScale } from "react-native-size-matters";
4+
5+
import { moderateScale } from "@utils/scale";
56

67
import { Container } from "./Container";
78
import { Typography } from "./Typography";

src/components/BottomSheet.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import {
99
import PropTypes from "prop-types";
1010
import Modal from "react-native-modal";
1111
import { SafeAreaView } from "react-native-safe-area-context";
12-
import { moderateScale } from "react-native-size-matters";
12+
13+
import { moderateScale } from "@utils/scale";
1314

1415
import { Container } from "./Container";
1516
import { Divider } from "./Divider";

src/components/BottomTabBar.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import Animated, {
1010
Extrapolation,
1111
} from "react-native-reanimated";
1212
import { useSafeAreaInsets } from "react-native-safe-area-context";
13-
import { moderateScale } from "react-native-size-matters";
13+
14+
import { moderateScale } from "@utils/scale";
1415

1516
import { Container } from "./Container";
1617
import { Typography } from "./Typography";
@@ -118,7 +119,7 @@ const styles = StyleSheet.create({
118119
* import { NavigationContainer } from '@react-navigation/native';
119120
* import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
120121
* import { ThemeContext } from "styled-components/native";
121-
* import { moderateScale } from "react-native-size-matters";
122+
* import { moderateScale } from "@utils/scale";
122123
*
123124
* const Tab = createBottomTabNavigator();
124125
*

src/components/Button.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ import React, { useContext } from "react";
22

33
import propTypes from "@styled-system/prop-types";
44
import PropTypes from "prop-types";
5-
import { moderateScale } from "react-native-size-matters";
65
import { ThemeContext } from "styled-components/native";
76

7+
import { moderateScale } from "@utils/scale";
8+
89
import { Container } from "./Container";
910
import { Loader } from "./Loader";
1011
import { Touchable } from "./Touchable";

src/components/ButtonGroup.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import * as React from "react";
22

33
import PropTypes from "prop-types";
4-
import { moderateScale } from "react-native-size-matters";
4+
5+
import { moderateScale } from "@utils/scale";
56

67
import { Container } from "./Container";
78
import { Touchable } from "./Touchable";

0 commit comments

Comments
 (0)