fln-espranza 0.0.48 → 0.0.49
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -27,9 +27,9 @@ export default function EButtonIcon({
|
|
|
27
27
|
}`}
|
|
28
28
|
>
|
|
29
29
|
{type === "close" ? (
|
|
30
|
-
<XMarkIcon size={
|
|
30
|
+
<XMarkIcon size={24} style={tw`text-${iconColor? iconColor: ""}`} />
|
|
31
31
|
) : (
|
|
32
|
-
<ArrowLeftIcon size={
|
|
32
|
+
<ArrowLeftIcon size={24} style={tw`text-${iconColor? iconColor : ""}`} />
|
|
33
33
|
)}
|
|
34
34
|
</View>
|
|
35
35
|
</TouchableOpacity>
|
package/components/EProfile.tsx
CHANGED
|
@@ -35,6 +35,7 @@ export default function EProfile({
|
|
|
35
35
|
/>
|
|
36
36
|
<View style={tw`ml-3`}>
|
|
37
37
|
<EText
|
|
38
|
+
size={"lg"}
|
|
38
39
|
style={[
|
|
39
40
|
tw`font-bold text-slate-800 mb-0.5 capitalize`,
|
|
40
41
|
{ color: Colors["text-primary"] },
|
|
@@ -43,10 +44,7 @@ export default function EProfile({
|
|
|
43
44
|
{name}
|
|
44
45
|
</EText>
|
|
45
46
|
{subjectName ? (
|
|
46
|
-
<EText
|
|
47
|
-
size="sm"
|
|
48
|
-
style={[tw` `, { color: Colors["text-body"] }]}
|
|
49
|
-
>
|
|
47
|
+
<EText size="sm" style={[tw` `, { color: Colors["text-body"] }]}>
|
|
50
48
|
{subjectName}
|
|
51
49
|
</EText>
|
|
52
50
|
) : null}
|
package/components/EStat.tsx
CHANGED
|
@@ -21,7 +21,7 @@ export default function EStat({
|
|
|
21
21
|
}: IProps) {
|
|
22
22
|
|
|
23
23
|
const percentage = Math.round((parseFloat(stat) / parseFloat(target)) * 100);
|
|
24
|
-
const pending = parseFloat(target) - parseFloat(stat);
|
|
24
|
+
const pending = Number(stat) <= Number(target) ? parseFloat(target) - parseFloat(stat) : 0;
|
|
25
25
|
|
|
26
26
|
return (
|
|
27
27
|
<TouchableOpacity
|
|
@@ -44,7 +44,7 @@ export default function ModalLayout({
|
|
|
44
44
|
{/* HEADER */}
|
|
45
45
|
<View
|
|
46
46
|
style={[
|
|
47
|
-
tw`absolute top-0 right-0 left-0 px-6 pr-3 pt-2 z-10 w-full bg-white
|
|
47
|
+
tw`absolute top-0 right-0 left-0 px-6 pr-3 pt-2 z-10 w-full bg-white ${title ? 'pb-2 shadow-md' : 'pb-0'}`,
|
|
48
48
|
// {height: 64},
|
|
49
49
|
]}
|
|
50
50
|
>
|
|
@@ -54,7 +54,7 @@ export default function ModalLayout({
|
|
|
54
54
|
button={
|
|
55
55
|
<EButtonIcon
|
|
56
56
|
type="close"
|
|
57
|
-
iconColor="slate-
|
|
57
|
+
iconColor="slate-900"
|
|
58
58
|
onPress={() => navigation.goBack()}
|
|
59
59
|
/>
|
|
60
60
|
}
|
|
@@ -73,7 +73,7 @@ export default function ModalLayout({
|
|
|
73
73
|
>
|
|
74
74
|
{children}
|
|
75
75
|
</ScrollView>
|
|
76
|
-
{bottomButton ? <View style={tw` px-6 mb-4 `}>
|
|
76
|
+
{bottomButton ? <View style={tw` px-6 mb-4 pt-2 border-t border-slate-300`}>
|
|
77
77
|
{bottomButton}
|
|
78
78
|
</View> : <></>}
|
|
79
79
|
</View>
|
|
@@ -26,7 +26,9 @@ export default function PageHeaderSecondary({
|
|
|
26
26
|
>
|
|
27
27
|
<View style={tw` flex-1 justify-center items-center`}>
|
|
28
28
|
{title ? (
|
|
29
|
-
<EText
|
|
29
|
+
<EText
|
|
30
|
+
size="lg"
|
|
31
|
+
style={tw`text-slate-800 font-bold`}>
|
|
30
32
|
{title}
|
|
31
33
|
</EText>
|
|
32
34
|
) : null}
|
|
@@ -36,7 +38,7 @@ export default function PageHeaderSecondary({
|
|
|
36
38
|
</EText>
|
|
37
39
|
) : null}
|
|
38
40
|
</View>
|
|
39
|
-
<View style={[tw`absolute right-
|
|
41
|
+
<View style={[tw`absolute right-0`, {
|
|
40
42
|
paddingTop: Platform.OS === "android" ? insets.top + 8 : 8,
|
|
41
43
|
}]}>{button}</View>
|
|
42
44
|
</View>
|
|
@@ -25,6 +25,7 @@ interface BaseLayoutProps {
|
|
|
25
25
|
menuButton?: boolean;
|
|
26
26
|
paddingTop?: number;
|
|
27
27
|
hideBackBtn?: boolean;
|
|
28
|
+
scrollViewRef?: any;
|
|
28
29
|
}
|
|
29
30
|
|
|
30
31
|
export default function SecondaryBaseLayout({
|
|
@@ -39,7 +40,8 @@ export default function SecondaryBaseLayout({
|
|
|
39
40
|
border,
|
|
40
41
|
menuButton,
|
|
41
42
|
paddingTop,
|
|
42
|
-
hideBackBtn
|
|
43
|
+
hideBackBtn,
|
|
44
|
+
scrollViewRef
|
|
43
45
|
}: BaseLayoutProps) {
|
|
44
46
|
const insets = useSafeAreaInsets();
|
|
45
47
|
|
|
@@ -77,6 +79,7 @@ export default function SecondaryBaseLayout({
|
|
|
77
79
|
</PageHeader>
|
|
78
80
|
</View>
|
|
79
81
|
<ScrollView
|
|
82
|
+
ref={scrollViewRef}
|
|
80
83
|
style={[
|
|
81
84
|
tw`flex-1`,
|
|
82
85
|
{ paddingBottom: insets.bottom, paddingTop: !title ? 80 : 80 },
|