chore: allow usage of size style attrs w/o ->dp

cem2ran · Apr 19, 2020 · 92717ca · 92717ca
1 parent 1dd1dd0
commit 92717ca
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@baransu/graphql_ppx_re": "0.7.1",
-    "@cem2ran/ppx_style": "0.0.3",
+    "@cem2ran/ppx_style": "0.0.4",
     "@react-native-community/masked-view": "0.1.6",
     "@react-navigation/core": "^5.3.3",
     "@react-navigation/native": "^5.1.5",

diff --git a/src/Post/components/ImageActions.re b/src/Post/components/ImageActions.re
@@ -6,12 +6,11 @@ let make = (~liked=true) => {
     style={
       ViewStyle({
         justifyContent: spaceBetween,
-        paddingHorizontal: 12.->dp,
-        paddingVertical: 10.->dp,
+        paddingHorizontal: 12.,
+        paddingVertical: 10.,
       })
     }>
-    <Horizontal
-      style={ViewStyle({width: 90.->dp, justifyContent: spaceBetween})}>
+    <Horizontal style={ViewStyle({width: 90., justifyContent: spaceBetween})}>
       <Icons.Ionicons
         name={liked ? "md-heart" : "md-heart-empty"}
         size=26

diff --git a/src/Post/components/ImageDescription.re b/src/Post/components/ImageDescription.re
@@ -4,7 +4,7 @@ open Styles;
 
 [@react.component]
 let make = (~username, ~description) =>
-  <View style={ViewStyle({paddingHorizontal: 12.->dp})}>
+  <View style={ViewStyle({paddingHorizontal: 12.})}>
     <T4>
       <T4_Bold value={j|$username |j} />
       Option.(description or "")->React.string

diff --git a/src/Post/components/ImageHeader.re b/src/Post/components/ImageHeader.re
@@ -9,8 +9,8 @@ let make = (~image as uri, ~location, ~username) => {
     style={
       ViewStyle({
         justifyContent: spaceBetween,
-        paddingHorizontal: 7.->dp,
-        paddingVertical: 10.->dp,
+        paddingHorizontal: 7.,
+        paddingVertical: 10.,
       })
     }>
     <Horizontal>
@@ -20,7 +20,7 @@ let make = (~image as uri, ~location, ~username) => {
           source=Image.(Source.fromUriSource(uriSource(~uri, ())))
         />
       </TouchableWithoutFeedback>
-      <View style={ViewStyle({paddingLeft: 7.->dp, justifyContent: center})}>
+      <View style={ViewStyle({paddingLeft: 7., justifyContent: center})}>
         <T2 value=username />
         <T3
           value={

diff --git a/src/Post/components/ImageLikes.re b/src/Post/components/ImageLikes.re
@@ -31,8 +31,8 @@ let make = (~likes, ~likedByUsers=[|"a", "b", "c"|]) => {
   };
 
   <Horizontal
-    style={ViewStyle({paddingHorizontal: 12.->dp, paddingVertical: 5.->dp})}>
-    <Horizontal style={ViewStyle({width: 50.->dp})}>
+    style={ViewStyle({paddingHorizontal: 12., paddingVertical: 5.})}>
+    <Horizontal style={ViewStyle({width: 50.})}>
       images->React.array
     </Horizontal>
     <T4>

diff --git a/src/Profile/Profile.re b/src/Profile/Profile.re
@@ -38,8 +38,8 @@ let make = () => {
               <TouchableOpacity
                 style={
                   ViewStyle({
-                    width: 32.->dp,
-                    height: 32.->dp,
+                    width: 32.,
+                    height: 32.,
                     alignItems: center,
                     justifyContent: center,
                   })

diff --git a/src/Profile/components/ProfileInfo.re b/src/Profile/components/ProfileInfo.re
@@ -25,8 +25,8 @@ let make = (~id) => {
       style={
         ViewStyle({
           justifyContent: spaceBetween,
-          paddingHorizontal: 12.->dp,
-          paddingVertical: 12.->dp,
+          paddingHorizontal: 12.,
+          paddingVertical: 12.,
         })
       }>
       <Horizontal>

diff --git a/src/components/EditButton.re b/src/components/EditButton.re
@@ -7,7 +7,7 @@ let style =
       borderColor: "#E6E6E6",
       borderRadius: 4.,
       borderWidth: 1.5,
-      padding: 5.->dp,
+      padding: 5.,
     })
   );
 

diff --git a/src/components/Styled.re b/src/components/Styled.re
@@ -118,4 +118,4 @@ module type TextT = {
       },
       React.element,
     );
-};
+};
diff --git a/src/config/Typography.re b/src/config/Typography.re
@@ -3,6 +3,8 @@ open ReactNative;
 module Edit = {
   include Text;
 
+  let make = Text.make;
+
   let makeProps =
     Styled.text(style =>
       style(~fontSize=13., ~fontWeight=`_700, ~color="#333", ())

diff --git a/yarn.lock b/yarn.lock
@@ -1160,10 +1160,10 @@
   resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.0.tgz#860ce718b0b73f4009e153541faff2cb6b85d047"
   integrity sha512-4Th98KlMHr5+JkxfcoDT//6vY8vM+iSPrLNpHhRyLx2CFYi8e2RfqPLdpbnpo0Q5lQC5hNB79yes07zb02fvCw==
 
-"@cem2ran/[email protected].3":
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/@cem2ran/ppx_style/-/ppx_style-0.0.3.tgz#db582e0b959618eefdde2601ca8c07bdce76e593"
-  integrity sha512-wmZji0IJJxg6JUwwQjqMDcZtCws0DiZZVfWXMA2NhYQ012nVGMbnayTr2tO1rkrH6oGrzky/vh3tcS4jOfKsHQ==
+"@cem2ran/[email protected].4":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@cem2ran/ppx_style/-/ppx_style-0.0.4.tgz#c5149c089ab2797dac5589bfe08553ff949e4c5a"
+  integrity sha512-viw3N23Pnn1EedXWXpab9UTTmy5zePZry2jKjxr6lsmrP02bJuWrDAKJ2MjgO+EQMIMwKPvkUkIPkZZzbrxhZA==
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
-Original file line number
+Diff line change
@@ Expand Up / @@ -118,4 +118,4 @@ module type TextT = { @@
           },
           React.element,
         );
-    };
+    };