fln-espranza 0.0.14 → 0.0.15

package/components/Loader.tsx

@@ -1,31 +1,31 @@
-import { SCREEN_WIDTH, SCREEN_HEIGHT } from '@gorhom/bottom-sheet'
-// import { Colors, EText } from 'fln-espranza'
-import EText from './EText';
-import React from 'react'
-import { View, ActivityIndicator } from 'react-native'
-import tw from '../lib/tailwind';
-import { Colors } from '../utils/Color';
-
-interface IProps{
-    show: boolean
-}
-
-export default function Loader({show}: IProps) {
-    return (
-        <>
-            {show ? <View style={[tw`absolute justify-center items-center z-10 bg-slate-100  `, {
-                opacity: 0.9,
-                width: SCREEN_WIDTH,
-                height: SCREEN_HEIGHT,
-            }]}>
-                <View style={[tw`h-24 w-32 bg-white px-2 py-3 justify-center items-center rounded-xl`]}>
-                    <ActivityIndicator size="large" color={Colors['primary-base']} />
-                    <EText size="base" style={tw`text-black`}>Loading...</EText>
-                </View>
-            </View>
-                :
-                <></>
-            }
-        </>
-    )
-}
+import { SCREEN_WIDTH, SCREEN_HEIGHT } from '@gorhom/bottom-sheet'
+// import { Colors, EText } from 'fln-espranza'
+import EText from './EText';
+import React from 'react'
+import { View, ActivityIndicator } from 'react-native'
+import tw from '../lib/tailwind';
+import { Colors } from '../utils/Color';
+
+interface IProps{
+    show: boolean
+}
+
+export default function Loader({show}: IProps) {
+    return (
+        <>
+            {show ? <View style={[tw`absolute justify-center items-center z-10 bg-slate-100  `, {
+                opacity: 0.9,
+                width: SCREEN_WIDTH,
+                height: SCREEN_HEIGHT,
+            }]}>
+                <View style={[tw`h-24 w-32 bg-white px-2 py-3 justify-center items-center rounded-xl`]}>
+                    <ActivityIndicator size="large" color={Colors['primary-base']} />
+                    <EText size="base" style={tw`text-black`}>Loading...</EText>
+                </View>
+            </View>
+                :
+                <></>
+            }
+        </>
+    )
+}

package/components/MenuItems.tsx

@@ -1,46 +1,46 @@
-import React from "react";
-import { TouchableOpacity, View } from "react-native";
-import { HomeIcon } from "react-native-heroicons/solid";
-import tw from "../lib/tailwind";
-import { Colors } from "../utils/Color";
-import EText from "./EText";
-
-interface IProps {
-  title?: string;
-  icon?: JSX.Element;
-  onPress?: () => void;
-}
-
-export default function MenuItems({ title, icon, onPress }: IProps) {
-  return (
-    <TouchableOpacity style={tw`flex-row items-center`} onPress={onPress}>
-      {/* <HomeIcon style={[tw`w-6 h-6`, { color: Colors["primary-base"] }]} /> */}
-      {icon ? (
-        icon
-      ) : (
-        <HomeIcon style={[tw`w-6 h-6`, { color: Colors["primary-base"] }]} />
-      )}
-      <View
-        style={[
-          tw`py-4 ml-4 mr-8 w-[80%]`,
-          {
-            borderBottomWidth: 1,
-            borderBottomColor: Colors.border,
-          },
-        ]}
-      >
-        <EText
-          size="base"
-          style={[
-            tw`font-medium `,
-            {
-              color: Colors["text-primary"],
-            },
-          ]}
-        >
-          {title ? title : "Dashboard"}
-        </EText>
-      </View>
-    </TouchableOpacity>
-  );
-}
+import React from "react";
+import { TouchableOpacity, View } from "react-native";
+import { HomeIcon } from "react-native-heroicons/solid";
+import tw from "../lib/tailwind";
+import { Colors } from "../utils/Color";
+import EText from "./EText";
+
+interface IProps {
+  title?: string;
+  icon?: JSX.Element;
+  onPress?: () => void;
+}
+
+export default function MenuItems({ title, icon, onPress }: IProps) {
+  return (
+    <TouchableOpacity style={tw`flex-row items-center`} onPress={onPress}>
+      {/* <HomeIcon style={[tw`w-6 h-6`, { color: Colors["primary-base"] }]} /> */}
+      {icon ? (
+        icon
+      ) : (
+        <HomeIcon style={[tw`w-6 h-6`, { color: Colors["primary-base"] }]} />
+      )}
+      <View
+        style={[
+          tw`py-4 ml-4 mr-8 w-[80%]`,
+          {
+            borderBottomWidth: 1,
+            borderBottomColor: Colors.border,
+          },
+        ]}
+      >
+        <EText
+          size="base"
+          style={[
+            tw`font-semibold `,
+            {
+              color: Colors["text-primary"],
+            },
+          ]}
+        >
+          {title ? title : "Dashboard"}
+        </EText>
+      </View>
+    </TouchableOpacity>
+  );
+}

package/components/PageHeader.tsx

@@ -1,129 +1,115 @@
-import { View, Animated, Dimensions, Image } from "react-native";
-import React, { useEffect, useRef } from "react";
-import tw from "../lib/tailwind";
-import { useNavigation } from "@react-navigation/native";
-import EButtonIcon from "./EButtonIcon";
-import EText from "./EText";
-import Constants from "expo-constants";
-import { MenuIcon } from "react-native-heroicons/outline";
-
-const SCREEN_WIDTH = Dimensions.get("window").width;
-const HEADER_HEIGHT = 90;
-
-interface PageHeaderProps {
-  title: string;
-  subtitle?: string;
-  curved?: boolean;
-  children?: JSX.Element;
-  iconEnd?: JSX.Element;
-  border?: boolean;
-  menuButton?: boolean;
-}
-
-export default function PageHeader({
-  title,
-  subtitle,
-  curved,
-  children,
-  iconEnd,
-  border,
-  menuButton,
-}: PageHeaderProps) {
-  const navigation = useNavigation();
-
-  const translateX = useRef(new Animated.Value(60)).current;
-  const opacity = useRef(new Animated.Value(0)).current;
-
-  useEffect(() => {
-    Animated.spring(translateX, {
-      toValue: 0,
-      stiffness: 40,
-      damping: 10,
-      useNativeDriver: true,
-    }).start();
-    Animated.spring(opacity, {
-      toValue: 1,
-      delay: 250,
-      useNativeDriver: true,
-    }).start();
-  });
-  return (
-    <View style={[tw`${curved ? "-mb-2" : ""} ${border ? "border-b border-slate-300" : ""} `, {}]}>
-      <View style={tw`overflow-hidden`}>
-        <Animated.View
-          style={[
-            tw`flex-row pr-4 pl-3 pb-3`,
-            {
-              paddingTop: Constants.statusBarHeight + 8,
-              transform: [{ translateX }],
-              opacity,
-            },
-          ]}
-        >
-          <Animated.View
-            style={[tw`-mt-2 left-3 absolute `, { transform: [{ translateX }], opacity, paddingTop: Constants.statusBarHeight + 8 }]}
-          >
-            {menuButton ?
-              <MenuIcon
-                onPress={() => navigation?.openDrawer()}
-                size={24}
-                // onPress={() => navigation.navigate("Dashboard")}
-                style={tw`text-slate-900 mt-2`}
-              />
-              :
-
-              <EButtonIcon
-                iconColor={curved ? "white" : "tint-slate-900"}
-                size={24}
-                // onPress={() => navigation.navigate("Dashboard")}
-                onPress={() => navigation.goBack()}
-              />
-            }
-          </Animated.View>
-          <View style={tw`flex-1 items-center`}>
-            <EText
-              size="base"
-              style={tw.style("text-black font-semibold ", curved && "text-white ")}
-            >
-              {title}
-            </EText>
-            {subtitle ? (
-              <EText
-                style={tw.style(
-                  "text-slate-800 opacity-40 font-semibold mt-0.25",
-                  curved && "text-white "
-                )}
-              >
-                {subtitle}
-              </EText>
-            ) : null}
-          </View>
-
-          {iconEnd ? (
-            <View style={[tw`mt-0.5 items-center justify-center`, {}]}>
-              {iconEnd}
-            </View>
-          ) : null}
-        </Animated.View>
-        {children ? <View style={tw.style("pb-6")}>{children}</View> : null}
-      </View>
-
-      {/* MASK */}
-      {curved ? (
-        <View
-          style={[
-            tw``,
-            { height: 32, width: SCREEN_WIDTH, backgroundColor: "#0547FA" },
-          ]}
-        >
-          <View
-            style={[
-              tw`bg-white -z-0`,
-              { height: 64, width: SCREEN_WIDTH, borderTopLeftRadius: 32 },
-            ]}
-          />
-        </View>
-      ) : null}
-    </View>
-  );
-}
+import { View, Animated, Dimensions, TouchableOpacity } from "react-native";
+import React, { useEffect, useRef } from "react";
+import tw from "../lib/tailwind";
+import { useNavigation } from "@react-navigation/native";
+import EText from "./EText";
+import Constants from "expo-constants";
+import { EIconArrowLeft, EIconMenu } from "fln-espranza";
+
+const SCREEN_WIDTH = Dimensions.get("window").width;
+const HEADER_HEIGHT = 90;
+
+interface PageHeaderProps {
+  title: string;
+  subtitle?: string;
+  curved?: boolean;
+  children?: JSX.Element;
+  iconEnd?: JSX.Element;
+  border?: boolean;
+  menuButton?: boolean;
+}
+
+export default function PageHeader({
+  title,
+  subtitle,
+  curved,
+  children,
+  iconEnd,
+  border,
+  menuButton,
+}: PageHeaderProps) {
+  const navigation = useNavigation();
+
+  const translateX = useRef(new Animated.Value(60)).current;
+  const opacity = useRef(new Animated.Value(0)).current;
+
+  useEffect(() => {
+    Animated.spring(translateX, {
+      toValue: 0,
+      stiffness: 40,
+      damping: 10,
+      useNativeDriver: true,
+    }).start();
+    Animated.spring(opacity, {
+      toValue: 1,
+      delay: 250,
+      useNativeDriver: true,
+    }).start();
+  });
+  return (
+    <View style={[tw`${"border-none border-slate-300 bg-white shadow-lg py-3"} `, {}]}>
+      <View style={tw`overflow-hidden`}>
+        <View
+          style={[
+            tw`flex-row items-center px-3`,
+            {
+              paddingTop: Constants.statusBarHeight + 8,
+            },
+          ]}
+        >
+          {/* LEFT ICON */}
+          <View
+            style={[tw`` ]}
+          >
+            {menuButton ?
+            <TouchableOpacity activeOpacity={0.6} 
+            onPress={() => navigation?.openDrawer()}>
+              <EIconMenu
+                size={24}
+                style={tw`text-slate-800`}
+              />
+            </TouchableOpacity>
+              
+              :
+              <TouchableOpacity  activeOpacity={0.6}
+              onPress={() => navigation.goBack()}>
+              <EIconArrowLeft
+                iconColor={curved ? "white" : "tint-slate-900"}
+                size={24}
+                // onPress={() => navigation.navigate("Dashboard")}
+                style={tw`text-slate-800`}
+              />
+              </TouchableOpacity>
+            }
+          </View>
+          {/* TITLE */}
+          <View style={tw`flex-1 items-start px-3`}>
+            <EText
+              size="lg"
+              style={tw.style("text-slate-800 font-bold")}
+            >
+              {title}
+            </EText>
+            {subtitle ? (
+              <EText
+                style={tw.style(
+                  "text-slate-800 opacity-40 font-semibold mt-0.25"
+                )}
+              >
+                {subtitle}
+              </EText>
+            ) : null}
+          </View>
+          
+          {/* RIGHT ICON */}
+          {iconEnd ? (
+            <View style={[tw``, {}]}>
+              {iconEnd}
+            </View>
+          ) : null}
+        </View>
+        {children ? <View style={tw.style("pb-6")}>{children}</View> : null}
+      </View>
+    </View>
+  );
+}

package/components/SecondaryBaseLayout.tsx

@@ -1,120 +1,102 @@
-import {
-  View,
-  ImageBackground,
-  Dimensions,
-  Animated,
-  ScrollView,
-  Platform,
-} from "react-native";
-import React, { useEffect, useRef, useState } from "react";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import tw from "../lib/tailwind";
-import EText from "./EText";
-import { StatusBar } from "expo-status-bar";
-import {
-  Container,
-  EButton,
-  EButtonIcon,
-  PageHeader,
-  PageHeaderSecondary,
-} from ".";
-import Constants from "expo-constants";
-import { useNavigation } from "@react-navigation/native";
-
-const SCREEN_WIDTH = Dimensions.get("window").width;
-const SCREEN_HEIGHT = Dimensions.get("window").height;
-const HEADER_HEIGHT = Constants.statusBarHeight + 60;
-const SCROLL_PADDING_BOTTOM = 100;
-
-interface BaseLayoutProps {
-  title: string;
-  subtitle?: string;
-  curved?: boolean;
-  headerContent?: JSX.Element;
-  children?: JSX.Element | JSX.Element[];
-  iconEnd?: JSX.Element;
-  noScroll?: boolean;
-  bottomButton?: JSX.Element;
-  border?: boolean;
-  menuButton?: boolean;
-}
-
-export default function SecondaryBaseLayout({
-  title,
-  subtitle,
-  curved,
-  headerContent,
-  children,
-  noScroll,
-  iconEnd,
-  bottomButton,
-  border,
-  menuButton,
-}: BaseLayoutProps) {
-  const insets = useSafeAreaInsets();
-
-  const navigation = useNavigation();
-
-  return (
-    <View
-      style={[
-        tw`flex-1 bg-white`,
-        {
-          paddingBottom: Platform.OS === "ios" ? insets.bottom : 0,
-          paddingTop: Platform.OS === "ios" ? 12 : 24,
-        },
-      ]}
-    >
-      <StatusBar style="dark" animated />
-
-      {/* HEADER */}
-      <View
-        style={[
-          tw`absolute top-0 right-0 left-0 pt-2 z-10 w-full bg-white  ${
-            title ? "mb-1" : "pb-0"
-          }`,
-        ]}
-      >
-        {/* <PageHeaderSecondary
-          title={title}
-          subtitle={subtitle}
-          button={
-            <EButtonIcon
-              type="close"
-              iconColor="slate-800"
-              onPress={() => navigation.goBack()}
-            />
-          }
-        /> */}
-        <PageHeader
-          border={border}
-          title={title}
-          subtitle={subtitle}
-          curved={curved}
-          iconEnd={iconEnd}
-          menuButton={menuButton}
-        >
-          {headerContent}
-        </PageHeader>
-      </View>
-      <ScrollView
-        style={[
-          tw`flex-1`,
-          { paddingBottom: insets.bottom, paddingTop: !title ? 80 : 80 },
-        ]}
-        showsVerticalScrollIndicator={false}
-        decelerationRate={"fast"}
-        contentContainerStyle={{
-          paddingBottom: SCROLL_PADDING_BOTTOM,
-        }}
-      >
-        {children}
-      </ScrollView>
-      {bottomButton ? (
-        <View style={[tw` px-4 `, {paddingBottom: Platform.OS ==='android' ? 8 : 0}]}>{bottomButton}</View>
-      ) : (
-        <></>
-      )}
-    </View>
-  );
-}
+import { View, Dimensions, ScrollView, Platform } from "react-native";
+import React from "react";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import tw from "../lib/tailwind";
+import { StatusBar } from "expo-status-bar";
+import { PageHeader } from ".";
+import Constants from "expo-constants";
+import { useNavigation } from "@react-navigation/native";
+
+const SCREEN_WIDTH = Dimensions.get("window").width;
+const SCREEN_HEIGHT = Dimensions.get("window").height;
+const HEADER_HEIGHT = Constants.statusBarHeight + 60;
+const SCROLL_PADDING_BOTTOM = 100;
+
+interface BaseLayoutProps {
+  title: string;
+  subtitle?: string;
+  curved?: boolean;
+  headerContent?: JSX.Element;
+  children?: JSX.Element | JSX.Element[];
+  iconEnd?: JSX.Element;
+  noScroll?: boolean;
+  bottomButton?: JSX.Element;
+  border?: boolean;
+  menuButton?: boolean;
+}
+
+export default function SecondaryBaseLayout({
+  title,
+  subtitle,
+  curved,
+  headerContent,
+  children,
+  noScroll,
+  iconEnd,
+  bottomButton,
+  border,
+  menuButton,
+}: BaseLayoutProps) {
+  const insets = useSafeAreaInsets();
+
+  const navigation = useNavigation();
+
+  return (
+    <View
+      style={[
+        tw`flex-1 bg-white`,
+        {
+          paddingBottom: Platform.OS === "ios" ? insets.bottom : 0,
+          paddingTop: Platform.OS === "ios" ? 44 : 24,
+        },
+      ]}
+    >
+      <StatusBar style="dark" animated />
+
+      {/* HEADER */}
+      <View
+        style={[
+          tw`absolute top-0 right-0 left-0 pt-0 z-10 w-full bg-white  ${
+            title ? "mb-1" : "pb-0"
+          }`,
+        ]}
+      >
+        <PageHeader
+          border={border}
+          title={title}
+          subtitle={subtitle}
+          curved={curved}
+          iconEnd={iconEnd}
+          menuButton={menuButton}
+        >
+          {headerContent}
+        </PageHeader>
+      </View>
+      <ScrollView
+        style={[
+          tw`flex-1`,
+          { paddingBottom: insets.bottom, paddingTop: !title ? 80 : 80 },
+        ]}
+        showsVerticalScrollIndicator={false}
+        decelerationRate={"fast"}
+        contentContainerStyle={{
+          paddingBottom: SCROLL_PADDING_BOTTOM,
+        }}
+      >
+        {children}
+      </ScrollView>
+      {bottomButton ? (
+        <View
+          style={[
+            tw` px-4 `,
+            { paddingBottom: Platform.OS === "android" ? 8 : 0 },
+          ]}
+        >
+          {bottomButton}
+        </View>
+      ) : (
+        <></>
+      )}
+    </View>
+  );
+}