ammar/cally
1
0
Fork 0
mirror of https://github.com/urosran/cally.git synced 2025-11-26 08:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Dejan
2024-12-15 17:05:30 +01:00
parent 5cafd10f09 0aec9c1ee8
commit b59a8bf97d
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/pages/brain_dump/BrainDumpPage.tsx
View File

@ -7,10 +7,12 @@ import {Feather, MaterialIcons} from "@expo/vector-icons";
import AddBrainDump from "./AddBrainDump"; import AddBrainDump from "./AddBrainDump";
import LinearGradient from "react-native-linear-gradient"; import LinearGradient from "react-native-linear-gradient";
import PlusIcon from "@/assets/svgs/PlusIcon"; import PlusIcon from "@/assets/svgs/PlusIcon";
import * as Device from 'expo-device'
import {DeviceType} from 'expo-device'
const BrainDumpPage = () => { const BrainDumpPage = () => {
const [searchText, setSearchText] = useState<string>(""); const [searchText, setSearchText] = useState<string>("");
const [isAddVisible, setIsAddVisible] = useState<boolean>(false); const [isAddVisible, setIsAddVisible] = useState<boolean>(false);
const isTablet: boolean = Device.deviceType === DeviceType.TABLET;
return ( return (
<View height={"100%"}> <View height={"100%"}>
@ -19,7 +21,7 @@ const BrainDumpPage = () => {
showsVerticalScrollIndicator={false} showsVerticalScrollIndicator={false}
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
> >
<View marginH-25> <View marginH-25 style={isTablet ? {alignItems: 'center'} : undefined}>
<HeaderTemplate <HeaderTemplate
message={"Welcome to your notes!"} message={"Welcome to your notes!"}
isWelcome={false} isWelcome={false}
@ -31,7 +33,7 @@ const BrainDumpPage = () => {
</Text> </Text>
} }
/> />
<View> <View style={isTablet ? {maxWidth: 390} : undefined}>
<View style={styles.searchField} centerV> <View style={styles.searchField} centerV>
<TextField <TextField
value={searchText} value={searchText}
@ -78,6 +80,7 @@ const BrainDumpPage = () => {
bottom: -10, bottom: -10,
borderRadius: 30, borderRadius: 30,
backgroundColor: "#fd1775", backgroundColor: "#fd1775",
maxWidth: 450,
}} }}
color="white" color="white"
enableShadow enableShadow

2
components/pages/brain_dump/DumpList.tsx
View File

@ -1,4 +1,4 @@
import { View } from "react-native-ui-lib"; import { View, Text } from "react-native-ui-lib";
import React from "react"; import React from "react";
import { useBrainDumpContext } from "@/contexts/DumpContext"; import { useBrainDumpContext } from "@/contexts/DumpContext";
import { FlatList } from "react-native"; import { FlatList } from "react-native";

10
components/pages/feedback/FeedbackPage.tsx
View File

@ -7,11 +7,13 @@ import LinearGradient from "react-native-linear-gradient";
import PlusIcon from "@/assets/svgs/PlusIcon"; import PlusIcon from "@/assets/svgs/PlusIcon";
import AddFeedback from "./AddFeedback"; import AddFeedback from "./AddFeedback";
import FeedbackList from "./FeedbackList"; import FeedbackList from "./FeedbackList";
import {DeviceType} from 'expo-device'
import * as Device from 'expo-device'
const FeedbackPage = () => { const FeedbackPage = () => {
const [searchText, setSearchText] = useState<string>(""); const [searchText, setSearchText] = useState<string>("");
const [isAddVisible, setIsAddVisible] = useState<boolean>(false); const [isAddVisible, setIsAddVisible] = useState<boolean>(false);
const isTablet: boolean = Device.deviceType === DeviceType.TABLET;
return ( return (
<View height={"100%"}> <View height={"100%"}>
<View> <View>
@ -19,7 +21,7 @@ const FeedbackPage = () => {
showsVerticalScrollIndicator={false} showsVerticalScrollIndicator={false}
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
> >
<View marginH-25> <View marginH-25 style={isTablet ? {alignItems: 'center'} : undefined}>
<HeaderTemplate <HeaderTemplate
message={"Welcome to your Feedback!"} message={"Welcome to your Feedback!"}
isWelcome={false} isWelcome={false}
@ -31,7 +33,7 @@ const FeedbackPage = () => {
</Text> </Text>
} }
/> />
<View> <View style={isTablet ? {maxWidth: 390} : undefined}>
<View style={styles.searchField} centerV> <View style={styles.searchField} centerV>
<TextField <TextField
value={searchText} value={searchText}
@ -49,6 +51,7 @@ const FeedbackPage = () => {
style={{ style={{
fontFamily: "Manrope_500Medium", fontFamily: "Manrope_500Medium",
fontSize: 15, fontSize: 15,
width: '100%'
}} }}
placeholder="Search your feedbacks..." placeholder="Search your feedbacks..."
/> />
@ -78,6 +81,7 @@ const FeedbackPage = () => {
bottom: -10, bottom: -10,
borderRadius: 30, borderRadius: 30,
backgroundColor: "#fd1775", backgroundColor: "#fd1775",
maxWidth: 450,
}} }}
color="white" color="white"
enableShadow enableShadow