Merge pull request #72 from ZeroGachis/fixdesign

Fixdesign
ZeroGachis · Aug 29, 2023 · 88ed496 · 88ed496
2 parents 36fa9cd + 09d7641
commit 88ed496
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 45 deletions.
diff --git a/example/src/CardShadow/CardShadowPage.tsx b/example/src/CardShadow/CardShadowPage.tsx
@@ -16,35 +16,8 @@ export const CardShadowPage = () => {
     const theme = useTheme();
     const customCardStyle: ViewStyle = {
         marginTop: theme.sw.spacing.xxl,
-        backgroundColor: theme.sw.colors.neutral[50],
-        borderColor: theme.sw.colors.neutral[900],
-        borderWidth: 1,
-        borderRadius: 8,
-        width: '100%',
-        elevation: val,
     };
-    const bigShadowTransparency = '1F';
-    const smallShadowTransparency = '33';
 
-    const bigShadowStyle: ViewStyle = {
-        shadowColor: theme.sw.colors.neutral[500] + bigShadowTransparency,
-        shadowOffset: {
-            width: valX,
-            height: valY,
-        },
-        shadowOpacity: 0.5,
-        shadowRadius: 10,
-        elevation: val,
-    };
-    const smallShadowStyle: ViewStyle = {
-        shadowColor: theme.sw.colors.neutral[500] + smallShadowTransparency,
-        shadowOffset: {
-            width: 0,
-            height: 0,
-        },
-        shadowOpacity: 0.2,
-        shadowRadius: 2,
-    };
     const style = StyleSheet.create({
         container: {
             paddingTop: theme.sw.spacing.m,
@@ -106,11 +79,7 @@ export const CardShadowPage = () => {
                 </View>
             </View>
             <View>
-                <CustomCard
-                    style={customCardStyle}
-                    bigShadowStyle={bigShadowStyle}
-                    smallShadowStyle={smallShadowStyle}
-                >
+                <CustomCard style={customCardStyle}>
                     <View style={style.textContent}>
                         <Headline size="h3" style={style.title}>
                             Some very interesting title

diff --git a/src/components/card/Card.tsx b/src/components/card/Card.tsx
@@ -13,39 +13,35 @@ interface Props {
 export const Card = ({ children, style, bigShadowStyle, smallShadowStyle }: Props) => {
     const theme = useTheme();
 
-    const bigShadowTransparency = '1F';
-    const smallShadowTransparency = '33';
-
     const styles = StyleSheet.create({
         container: {
             backgroundColor: theme.sw.colors.neutral[50],
+            borderColor: theme.sw.colors.neutral[50],
+            borderWidth: 0,
             width: '100%',
             alignItems: 'center',
-            borderRadius: 20,
             padding: theme.sw.spacing.m,
-            elevation: 1,
+            borderRadius: 20,
             ...style,
         },
         bigShadow: {
-            shadowColor: theme.sw.colors.neutral[500] + bigShadowTransparency,
+            shadowColor: theme.sw.colors.neutral[500],
             shadowOffset: {
                 width: 0,
                 height: 12,
             },
             shadowOpacity: 0.12,
             shadowRadius: 24,
-            elevation: 200,
             ...bigShadowStyle,
         },
         smallShadow: {
-            shadowColor: theme.sw.colors.neutral[500] + smallShadowTransparency,
+            shadowColor: theme.sw.colors.neutral[500],
             shadowOffset: {
                 width: 0,
-                height: 0,
+                height: 2,
             },
-            shadowOpacity: 0.2,
+            shadowOpacity: 0.01,
             shadowRadius: 2,
-            elevation: 200,
             ...smallShadowStyle,
         },
     });

diff --git a/src/components/numberField/NumberField.tsx b/src/components/numberField/NumberField.tsx
@@ -139,7 +139,7 @@ export const NumberField = React.forwardRef<TextInput, NumberFieldProps>(
                 if (parsedValue !== undefined) {
                     setError(
                         (minValue !== undefined && parsedValue < minValue) ||
-                            (maxValue !== undefined && parsedValue > maxValue),
+                            (maxValue !== undefined && parsedValue >= maxValue),
                     );
                 }
             }

diff --git a/src/components/numberSelector/NumberSelector.tsx b/src/components/numberSelector/NumberSelector.tsx
@@ -65,7 +65,7 @@ export const NumberSelector = ({
             ...style,
         },
         inputContainer: {
-            marginHorizontal: 5,
+            marginHorizontal: 8,
             flex: 0,
         },
     });

diff --git a/src/styles/themes.tsx b/src/styles/themes.tsx
@@ -32,7 +32,9 @@ const theme = {
             48: '7A',
             32: '52',
             24: '3D',
+            20: '33',
             16: '29',
+            12: '1F',
             8: '14',
         },
         iconbuttonsize: {
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,9 @@ const theme = { @@
 : '7A',
 : '52',
 : '3D',
+: '33',
 : '29',
+: '1F',
 : '14',
             },
             iconbuttonsize: {
@@ Expand Down @@