fln-espranza 0.0.4 → 0.0.5

package/components/Avatar.tsx

@@ -36,7 +36,7 @@ export default function Avatar({ size, source, nameFirstLetter, textColor }: Ava
       )}
     >
       {source ? <Image style={tw`w-full h-full `} source={source} /> : 
-      <EText style={tw`text-2xl font-extrabold text-white`}>{nameFirstLetter}</EText>}
+      <EText style={tw`text-xl font-bold text-white`}>{nameFirstLetter}</EText>}
     </View>
   );
 }

package/components/Drawer.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { ScrollView, View, TouchableOpacity } from "react-native";
-import { HomeIcon,CalendarIcon, TemplateIcon, ViewBoardsIcon } from 'react-native-heroicons/solid';
+import { HomeIcon, CalendarIcon, TemplateIcon, ViewBoardsIcon } from 'react-native-heroicons/solid';
 import { StyleSheet } from 'react-native';
 import tw from "../lib/tailwind";
 import EText from "./EText";
@@ -10,19 +10,20 @@ import { Colors } from "../utils/Color";
 import MenuItems from "./MenuItems";
 
 type menuItems = {
-    title: string,
-    icon: any,
-    screen: string,
-} 
+  title: string,
+  icon: any,
+  screen: string,
+}
 
-interface IProps{
-    name: string,
-    profile: string,
-    menuItems: menuItems[];
-    navigation: any;
+interface IProps {
+  name: string,
+  profile: string,
+  menuItems: menuItems[];
+  menuItems2?: menuItems[];
+  navigation: any;
 }
 
-const Drawer = ({name,profile, menuItems,navigation }: IProps) => {
+const Drawer = ({ name, profile, menuItems, menuItems2, navigation }: IProps) => {
   return (
     <ScrollView
       scrollEnabled={true}
@@ -67,7 +68,7 @@ const Drawer = ({name,profile, menuItems,navigation }: IProps) => {
         }
         <Spacer />
         <Spacer />
-        <MenuItems
+        {/* <MenuItems
           title="Profile"
           onPress={() => navigation.navigate("ProfileScreen")}
         />
@@ -76,7 +77,20 @@ const Drawer = ({name,profile, menuItems,navigation }: IProps) => {
         />
         <MenuItems
           title="Logout"
-        />
+        /> */}
+        {
+          menuItems2?.map((item, index) => {
+            return (
+              <MenuItems
+                key={index}
+                title={item.title}
+                icon={item.icon}
+                onPress={() => navigation.navigate(item.screen)}
+              />
+            )
+          })
+        }
+
       </View>
     </ScrollView>
   );

package/components/EButton.tsx

@@ -12,7 +12,6 @@ import { Colors } from "../utils/Color";
 interface EButtonProps extends TouchableOpacityProps {
   iconL?: JSX.Element;
   iconR?: JSX.Element;
-  secondary?: boolean;
   inline?: boolean;
   small?: boolean;
   type?: "secondary" | "clear" | "primary";
@@ -25,7 +24,6 @@ export default function EButton({
   children,
   iconL,
   iconR,
-  secondary,
   inline,
   small,
   type,
@@ -41,7 +39,7 @@ export default function EButton({
     >
       <View
         style={[
-          tw`h-14 flex-row justify-center items-center px-8 rounded-full ${disabled ? "opacity-60" : ""} ${
+          tw`flex-row justify-center items-center px-8 rounded-full ${small ? 'h-10' : 'h-14'} ${disabled ? "opacity-40" : ""} ${
             type === "clear"
               ? "bg-transparent"
               : type === "secondary"
@@ -54,7 +52,7 @@ export default function EButton({
         {iconL ? <View style={tw`mr-1 -ml-2`}>{iconL}</View> : null}
         {/* LABEL */}
         <EText
-          size={"base"}
+          size={"sm"}
           style={[
             tw`font-semibold ${
               type === "clear" ? `text-[${Colors["primary-base"]}]` : "text-white"

package/components/ELabel.tsx

@@ -8,7 +8,7 @@ interface IProps{
 
 export default function ELabel( {label }: IProps ) {
   return (
-    <EText style={tw`text-sm font-semibold text-slate-500`}>
+    <EText size="sm" style={[tw`font-semibold text-slate-800`, {}]}>
         {label}
     </EText>
   )

package/components/EListPerson.tsx

@@ -19,7 +19,7 @@ export default function EListPerson({
 }: IProps) {
   return (
     <View style={[tw`flex-row items-center justify-between`]}>
-      <Avatar size="sm" source={""} nameFirstLetter={firstLetter} />
+      <Avatar size="sm" source={""} nameFirstLetter={name.split(" ")[0].charAt(0)} />
       <View
         style={tw` ml-3 py-3 flex-1 ${
           noBorder ? "" : "border-b border-slate-200"

package/components/EPillButton.tsx

@@ -1,26 +1,33 @@
-import React from 'react'
-import { TouchableOpacity, View } from 'react-native'
-import tw from '../lib/tailwind'
-import { Colors } from '../utils/Color';
-import EText from './EText';
+import React from "react";
+import { TouchableOpacity, View } from "react-native";
+import tw from "../lib/tailwind";
+import { Colors } from "../utils/Color";
+import EText from "./EText";
 
 interface IProps {
-    title: string;
-    active?: boolean;
-    onPress?: () => void;
+  title: string;
+  active?: boolean;
+  onPress?: () => void;
 }
 
-export default function EPillButton( { title, active, onPress }: IProps) {
+export default function EPillButton({ title, active, onPress }: IProps) {
   return (
-      <TouchableOpacity style={[tw`px-4 py-3 mr-2 border rounded-lg border-slate-300`, {
-        backgroundColor: active ? Colors['secondary-base'] : "transparent",
-        borderColor: active ? Colors['secondary-base'] : Colors['border'],
-      }]}
+    <TouchableOpacity
+      style={[
+        tw`px-4 py-3 mr-2 border rounded-lg border-slate-300`,
+        {
+          backgroundColor: active ? Colors["secondary-base"] : "transparent",
+          borderColor: active ? Colors["secondary-base"] : Colors["border"],
+        },
+      ]}
       onPress={onPress}
+    >
+      <EText
+        size={"base"}
+        style={tw`font-normal ${active ? "text-white" : "text-slate-500"}`}
       >
-        <EText size={"sm"} style={tw`font-normal ${active ? "text-white" : "text-slate-500"}`}>
-       {title}
-        </EText>
+        {title}
+      </EText>
     </TouchableOpacity>
-  )
+  );
 }

package/components/{ProgressBar.tsx → EProgressBar.tsx}

@@ -1,13 +1,13 @@
 import React, { useEffect, useRef, useState } from 'react'
 import { Animated,StyleSheet, View } from 'react-native';
-import tw from "../lib/tailwind";
-import { Colors } from "../utils/Color";
+import tw from "fln-espranza/lib/tailwind";
+import { Colors } from "fln-espranza/utils/Color";
 
 interface IProps{
     progress: number;
 }
 
-export default function ProgressBar( {progress}: IProps) {
+export default function EProgressBar( {progress}: IProps) {
 
 
     const barWidth = useRef(new Animated.Value(0)).current;
@@ -21,7 +21,7 @@ export default function ProgressBar( {progress}: IProps) {
         }).start();
     }, [progress]);
     return (
-        <View style={[tw`h-2 w-14 bg-[${Colors['primary-light']}] overflow-hidden mr-2`, {
+        <View style={[tw`h-2 w-14 bg-slate-200 overflow-hidden mr-2`, {
             borderRadius: 40,
         }]}>
             <Animated.View

package/components/EText.tsx

@@ -30,7 +30,7 @@ export default function EText({
           size === "2xl" && "font-bold text-2xl",
           size === "3xl" && "font-bold text-3xl",
           size === "title" && "font-extrabold text-title text-2xl",
-          muted && "opacity-40"
+          muted && "opacity-60"
         ),
         style,
       ]}

package/components/SecondaryBaseLayout.tsx

@@ -61,7 +61,7 @@ export default function SecondaryBaseLayout({
         tw`flex-1 bg-white`,
         {
           paddingBottom: Platform.OS === "ios" ? insets.bottom : 0,
-          paddingTop: Platform.OS === "ios" ? 20 : 0,
+          paddingTop: Platform.OS === "ios" ? 12 : 24,
         },
       ]}
     >
@@ -111,7 +111,7 @@ export default function SecondaryBaseLayout({
         {children}
       </ScrollView>
       {bottomButton ? (
-        <View style={tw` px-4 mb-6 `}>{bottomButton}</View>
+        <View style={[tw` px-4 `, {paddingBottom: Platform.OS ==='android' ? 8 : 0}]}>{bottomButton}</View>
       ) : (
         <></>
       )}

package/components/index.tsx

@@ -26,7 +26,7 @@ import ModalLayout from "./ModalLayout";
 import PageHeader from "./PageHeader";
 import PageHeaderSecondary from "./PageHeaderSecondary";
 import Spacer from "./Spacer";
-import ProgressBar from "./ProgressBar";
+import ProgressBar from "./EProgressBar";
 import Loader from "./Loader";
 
 export {

package/index.ts

@@ -27,7 +27,7 @@ import PageHeader from "./components/PageHeader";
 import PageHeaderSecondary from "./components/PageHeaderSecondary";
 import Spacer from "./components/Spacer";
 import { Colors } from "./utils/Color";
-import ProgressBar from "./components/ProgressBar";
+import ProgressBar from "./components/EProgressBar";
 import Loader from "./components/Loader";
 import ETimeInput from "./components/ETimeInput";
 import EDateInput from "./components/EDateInput";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fln-espranza",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "All components used inside FLN Project of Espranza Innovations",
   "main": "index.ts",
   "scripts": {