Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "My taskly",
"slug": "mytaskly",
"version": "1.0.0",
"orientation": "portrait",
"orientation": "default",
"icon": "./assets/icons/ios-light.png",
"userInterfaceStyle": "automatic",
"newArchEnabled": false,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"react-native-chat-ui": "^0.1.9",
"react-native-copilot": "^3.3.3",
"react-native-dotenv": "^3.4.11",
"react-native-edge-to-edge": "1.6.0",
"react-native-edge-to-edge": "1.8.1",
"react-native-gesture-handler": "~2.24.0",
"react-native-keyboard-aware-scrollview": "^2.1.0",
"react-native-markdown-display": "^7.0.2",
Expand Down
16 changes: 9 additions & 7 deletions src/components/BotChat/ChatHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import React from 'react';
import { StyleSheet, View, Text, TouchableOpacity, StatusBar } from 'react-native';
import { StyleSheet, View, Text, TouchableOpacity } from 'react-native';
import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { MaterialIcons } from '@expo/vector-icons';
import { ChatHeaderProps } from './types';

const ChatHeader: React.FC<ChatHeaderProps> = ({
modelType,
onModelChange,
const ChatHeader: React.FC<ChatHeaderProps> = ({
modelType,
onModelChange,
onNewChat,
style
style
}) => {
const insets = useSafeAreaInsets();
return (
<View style={[styles.header, style]}>
<View style={[styles.header, { paddingTop: insets.top + 5 }, style]}>
<View style={styles.actions}>
<TouchableOpacity
style={styles.modelSelector}
Expand Down Expand Up @@ -40,7 +42,7 @@ const styles = StyleSheet.create({
justifyContent: "flex-end",
width: "100%",
padding: 8,
paddingTop: StatusBar.currentHeight ? StatusBar.currentHeight + 5 : 15,
paddingTop: 15,
paddingBottom: 8,
backgroundColor: "#FFFFFF",
shadowColor: "#000",
Expand Down
4 changes: 2 additions & 2 deletions src/components/BotChat/VoiceCalendarModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import {
TouchableOpacity,
Animated,
Dimensions,
StatusBar,
StyleSheet,
Platform,
} from "react-native";
import { StatusBar } from 'expo-status-bar';
import { Ionicons } from "@expo/vector-icons";
import CalendarView from "../Calendar/CalendarView";

Expand Down Expand Up @@ -72,7 +72,7 @@ const VoiceCalendarModal: React.FC<VoiceCalendarModalProps> = ({ visible, onClos
statusBarTranslucent
onRequestClose={handleClose}
>
<StatusBar barStyle="dark-content" backgroundColor="#FFFFFF" />
<StatusBar style="dark" />

{/* Overlay sfondo scuro */}
<Animated.View style={[styles.backdrop, { opacity: fadeAnim }]} pointerEvents="none" />
Expand Down
3 changes: 2 additions & 1 deletion src/components/BotChat/VoiceChatExample.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { useState } from 'react';
import { View, Text, StyleSheet, TouchableOpacity, SafeAreaView } from 'react-native';
import { View, Text, StyleSheet, TouchableOpacity } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import { MaterialIcons } from '@expo/vector-icons';
import VoiceChatModal from './VoiceChatModal';
import VoiceCalendarModal from './VoiceCalendarModal';
Expand Down
10 changes: 6 additions & 4 deletions src/components/BotChat/VoiceChatModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import {
TouchableOpacity,
Animated,
Dimensions,
StatusBar,
Alert,
Platform,
ScrollView,
} from "react-native";
import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { StatusBar } from 'expo-status-bar';
import Svg, { Path, Defs, RadialGradient, Stop } from "react-native-svg";
import { Ionicons } from "@expo/vector-icons";
import { useVoiceChat, ActiveTool } from '../../hooks/useVoiceChat';
Expand Down Expand Up @@ -224,6 +225,7 @@ const VoiceChatModal: React.FC<VoiceChatModalProps> = ({
onClose,
onOpenCalendar,
}) => {
const insets = useSafeAreaInsets();
const {
state,
error,
Expand Down Expand Up @@ -383,7 +385,7 @@ const VoiceChatModal: React.FC<VoiceChatModalProps> = ({
statusBarTranslucent={true}
onRequestClose={handleClose}
>
<StatusBar barStyle="dark-content" backgroundColor="#FFFFFF" />
<StatusBar style="dark" />

<Animated.View
style={[
Expand All @@ -395,7 +397,7 @@ const VoiceChatModal: React.FC<VoiceChatModalProps> = ({
]}
>
{/* Header */}
<View style={styles.header}>
<View style={[styles.header, { paddingTop: insets.top + 16 }]}>
{isConnected ? (
<View style={styles.liveIndicator}>
<Animated.View style={[styles.liveDot, { opacity: liveDotOpacity }]} />
Expand Down Expand Up @@ -542,7 +544,7 @@ const styles = StyleSheet.create({

// Header
header: {
paddingTop: StatusBar.currentHeight ? StatusBar.currentHeight + 16 : 52,
paddingTop: 52,
paddingHorizontal: 20,
paddingBottom: 14,
flexDirection: "row",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Calendar20/TopBar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { View, Text, TouchableOpacity, StyleSheet, Platform, StatusBar } from 'react-native';
import { View, Text, TouchableOpacity, StyleSheet, Platform } from 'react-native';
import { Ionicons } from '@expo/vector-icons';
import { CalendarViewType } from './types';
import { useTranslation } from 'react-i18next';
Expand Down
6 changes: 3 additions & 3 deletions src/components/WelcomeCarousel/WelcomeCarouselScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import {
FlatList,
Dimensions,
Animated,
SafeAreaView,
StatusBar,
TouchableOpacity,
Text,
StyleSheet,
} from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import { StatusBar } from 'expo-status-bar';
import { useNavigation } from '@react-navigation/native';
import type { NavigationProp } from '@react-navigation/native';
import type { RootStackParamList } from '../../types.d';
Expand Down Expand Up @@ -79,7 +79,7 @@ export const WelcomeCarouselScreen = () => {

return (
<SafeAreaView style={styles.container}>
<StatusBar barStyle="dark-content" backgroundColor="#FFFFFF" />
<StatusBar style="dark" />

{/* Skip Button */}
<TouchableOpacity style={styles.skipButton} onPress={handleSkip} activeOpacity={0.7}>
Expand Down
6 changes: 4 additions & 2 deletions src/navigation/screens/About.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Text } from '@react-navigation/elements';
import React from 'react';
import { StyleSheet, View, SafeAreaView, StatusBar, ScrollView } from 'react-native';
import { StyleSheet, View, ScrollView } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import { StatusBar } from 'expo-status-bar';
import { Ionicons } from '@expo/vector-icons';
import { useTranslation } from 'react-i18next';

Expand All @@ -9,7 +11,7 @@ export default function About() {

return (
<SafeAreaView style={styles.container}>
<StatusBar barStyle="dark-content" backgroundColor="#ffffff" />
<StatusBar style="dark" />

{/* Content */}
<ScrollView style={styles.content}>
Expand Down
8 changes: 4 additions & 4 deletions src/navigation/screens/AccountSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import {
StyleSheet,
View,
TouchableOpacity,
SafeAreaView,
StatusBar,
ScrollView,
ActivityIndicator,
Alert,
Modal,
TextInput,
} from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import { StatusBar } from 'expo-status-bar';
import { Ionicons } from '@expo/vector-icons';
import { getValidToken, changeEmail, changeUsername } from '../../services/authService';
import axios from '../../services/axiosInstance';
Expand Down Expand Up @@ -167,7 +167,7 @@ export default function AccountSettings() {
if (loading) {
return (
<SafeAreaView style={styles.container}>
<StatusBar barStyle="dark-content" backgroundColor="#ffffff" />
<StatusBar style="dark" />
<View style={styles.loadingContainer}>
<ActivityIndicator size="large" color="#000000" />
<Text style={styles.loadingText}>{t('common.messages.loading')}</Text>
Expand All @@ -178,7 +178,7 @@ export default function AccountSettings() {

return (
<SafeAreaView style={styles.container}>
<StatusBar barStyle="dark-content" backgroundColor="#ffffff" />
<StatusBar style="dark" />

<ScrollView style={styles.content} showsVerticalScrollIndicator={false}>
{error ? (
Expand Down
3 changes: 2 additions & 1 deletion src/navigation/screens/BotChat.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { useState, useCallback, useEffect, useRef } from 'react';
import { View, KeyboardAvoidingView, Platform, SafeAreaView, Alert, Keyboard, Dimensions } from 'react-native';
import { View, KeyboardAvoidingView, Platform, Alert, Keyboard, Dimensions } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import { sendMessageToBot, createNewChat, formatMessage, clearChatHistory } from '../../services/textBotService';
import { getChatWithMessages, ChatMessage } from '../../services/chatHistoryService';
import { reconstructMessagesFromHistory } from '../../components/BotChat/utils/chatHistoryUtils';
Expand Down
6 changes: 4 additions & 2 deletions src/navigation/screens/BugReport.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Text } from '@react-navigation/elements';
import React, { useState } from 'react';
import { StyleSheet, View, TouchableOpacity, SafeAreaView, StatusBar, ScrollView, TextInput, Alert, ActivityIndicator, Platform } from 'react-native';
import { StyleSheet, View, TouchableOpacity, ScrollView, TextInput, Alert, ActivityIndicator, Platform } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import { StatusBar } from 'expo-status-bar';
import { useNavigation, NavigationProp } from '@react-navigation/native';
import { useTranslation } from 'react-i18next';
import { RootStackParamList } from '../../types';
Expand Down Expand Up @@ -75,7 +77,7 @@ export default function BugReport() {

return (
<SafeAreaView style={styles.container}>
<StatusBar barStyle="dark-content" backgroundColor="#ffffff" />
<StatusBar style="dark" />

<ScrollView style={styles.content} keyboardShouldPersistTaps="handled">
<View style={styles.headerSection}>
Expand Down
8 changes: 4 additions & 4 deletions src/navigation/screens/Calendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import {
View,
StyleSheet,
Text,
SafeAreaView,
StatusBar,
TouchableOpacity
} from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import { StatusBar } from 'expo-status-bar';
import { Ionicons } from '@expo/vector-icons';
import AsyncStorage from '@react-native-async-storage/async-storage';
import CalendarView from '../../components/Calendar/CalendarView';
Expand Down Expand Up @@ -51,14 +51,14 @@ export default function Calendar() {
if (isLoading) {
return (
<SafeAreaView style={styles.container}>
<StatusBar barStyle="dark-content" backgroundColor="#ffffff" />
<StatusBar style="dark" />
</SafeAreaView>
);
}

return (
<SafeAreaView style={styles.container}>
<StatusBar barStyle="dark-content" backgroundColor="#ffffff" />
<StatusBar style="dark" />

{/* Header con titolo principale e toggle button */}
<View style={styles.header}>
Expand Down
6 changes: 4 additions & 2 deletions src/navigation/screens/Calendar20.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import React from 'react';
import { SafeAreaView, StatusBar, StyleSheet } from 'react-native';
import { StyleSheet } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import { StatusBar } from 'expo-status-bar';
import Calendar20View from '../../components/Calendar20/Calendar20View';

export default function Calendar20() {
return (
<SafeAreaView style={styles.container}>
<StatusBar barStyle="dark-content" backgroundColor="#ffffff" />
<StatusBar style="dark" />
<Calendar20View />
</SafeAreaView>
);
Expand Down
6 changes: 3 additions & 3 deletions src/navigation/screens/Categories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import {
View,
StyleSheet,
Text,
SafeAreaView,
StatusBar,
TouchableOpacity,
} from "react-native";
import { SafeAreaView } from 'react-native-safe-area-context';
import { StatusBar } from 'expo-status-bar';
import { useFocusEffect } from "@react-navigation/native";
import CategoryList from "../../components/Category/CategoryList";
import AddCategoryButton from "../../components/Category/AddCategoryButton";
Expand Down Expand Up @@ -55,7 +55,7 @@ export default function Categories() {

return (
<SafeAreaView style={styles.container}>
<StatusBar barStyle="dark-content" backgroundColor="#ffffff" />
<StatusBar style="dark" />

{/* Header con titolo principale - stesso stile di Home20 */}
<View style={styles.header}>
Expand Down
6 changes: 4 additions & 2 deletions src/navigation/screens/ChangePassword.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Text } from '@react-navigation/elements';
import React, { useState } from 'react';
import { StyleSheet, View, TouchableOpacity, SafeAreaView, StatusBar, ScrollView, TextInput, ActivityIndicator, Alert } from 'react-native';
import { StyleSheet, View, TouchableOpacity, ScrollView, TextInput, ActivityIndicator, Alert } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import { StatusBar } from 'expo-status-bar';
import { Ionicons } from '@expo/vector-icons';
import { changePassword } from '../../services/authService';
import { useNavigation } from '@react-navigation/native';
Expand Down Expand Up @@ -58,7 +60,7 @@ export default function ChangePassword() {

return (
<SafeAreaView style={styles.container}>
<StatusBar barStyle="dark-content" backgroundColor="#ffffff" />
<StatusBar style="dark" />

<ScrollView style={styles.content} keyboardShouldPersistTaps="handled">
<View style={styles.formContainer}>
Expand Down
6 changes: 3 additions & 3 deletions src/navigation/screens/EmailVerification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import {
TouchableOpacity,
StyleSheet,
Dimensions,
StatusBar,
SafeAreaView,
Animated,
ActivityIndicator,
} from "react-native";
import { SafeAreaView } from 'react-native-safe-area-context';
import { StatusBar } from 'expo-status-bar';
import { FontAwesome, MaterialIcons } from "@expo/vector-icons";
import { useNavigation, useRoute } from "@react-navigation/native";
import type { StackNavigationProp } from "@react-navigation/stack";
Expand Down Expand Up @@ -179,7 +179,7 @@ const EmailVerificationScreen = () => {

return (
<SafeAreaView style={styles.container}>
<StatusBar barStyle="dark-content" backgroundColor="#ffffff" />
<StatusBar style="dark" />

<Animated.View
style={[
Expand Down
6 changes: 4 additions & 2 deletions src/navigation/screens/GoogleCalendar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React, { useEffect } from 'react';
import { StyleSheet, View, TouchableOpacity, SafeAreaView, StatusBar, Text, ActivityIndicator, Alert, ScrollView } from 'react-native';
import { StyleSheet, View, TouchableOpacity, Text, ActivityIndicator, Alert, ScrollView } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import { StatusBar } from 'expo-status-bar';
import { Ionicons } from '@expo/vector-icons';
import { useGoogleCalendar } from '../../hooks/useGoogleCalendar';

Expand Down Expand Up @@ -231,7 +233,7 @@ export default function GoogleCalendar() {

return (
<SafeAreaView style={styles.container}>
<StatusBar barStyle="dark-content" backgroundColor="#ffffff" />
<StatusBar style="dark" />

<View style={styles.wipBanner}>
<Ionicons name="flask-outline" size={15} color="#FF9800" />
Expand Down
6 changes: 4 additions & 2 deletions src/navigation/screens/Help.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Text } from '@react-navigation/elements';
import React from 'react';
import { StyleSheet, View, SafeAreaView, StatusBar, ScrollView } from 'react-native';
import { StyleSheet, View, ScrollView } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import { StatusBar } from 'expo-status-bar';
import { Ionicons } from '@expo/vector-icons';
import { useTranslation } from 'react-i18next';

Expand All @@ -9,7 +11,7 @@ export default function Help() {

return (
<SafeAreaView style={styles.container}>
<StatusBar barStyle="dark-content" backgroundColor="#ffffff" />
<StatusBar style="dark" />

{/* Content */}
<ScrollView style={styles.content}>
Expand Down
Loading
Loading