diff --git a/src/screens/Auth/LoginScreen.js b/src/screens/Auth/LoginScreen.js index fc689c6..0768830 100644 --- a/src/screens/Auth/LoginScreen.js +++ b/src/screens/Auth/LoginScreen.js @@ -3,7 +3,6 @@ import { View, Text, StyleSheet, - SafeAreaView, KeyboardAvoidingView, ScrollView, Platform, @@ -12,6 +11,7 @@ import { TouchableWithoutFeedback, Keyboard, } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { StatusBar } from 'expo-status-bar'; import { useAuth } from '../../contexts/AuthContext'; import Button from '../../components/Button'; diff --git a/src/screens/Auth/RegisterScreen.js b/src/screens/Auth/RegisterScreen.js index d403cb4..206138c 100644 --- a/src/screens/Auth/RegisterScreen.js +++ b/src/screens/Auth/RegisterScreen.js @@ -3,7 +3,6 @@ import { View, Text, StyleSheet, - SafeAreaView, KeyboardAvoidingView, ScrollView, Platform, @@ -11,6 +10,7 @@ import { TouchableWithoutFeedback, Keyboard, } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { StatusBar } from 'expo-status-bar'; import { useAuth } from '../../contexts/AuthContext'; import Button from '../../components/Button'; diff --git a/src/screens/Auth/VerificationScreen.js b/src/screens/Auth/VerificationScreen.js index 944e621..5c91bf7 100644 --- a/src/screens/Auth/VerificationScreen.js +++ b/src/screens/Auth/VerificationScreen.js @@ -3,7 +3,6 @@ import { View, Text, StyleSheet, - SafeAreaView, Alert, TouchableOpacity, TouchableWithoutFeedback, @@ -12,6 +11,7 @@ import { Platform, KeyboardAvoidingView, } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { StatusBar } from 'expo-status-bar'; import { useFocusEffect } from '@react-navigation/native'; import { useAuth } from '../../contexts/AuthContext'; diff --git a/src/screens/Card/CardBalanceOrderDetailsScreen.js b/src/screens/Card/CardBalanceOrderDetailsScreen.js index 3130611..5ec5ca8 100644 --- a/src/screens/Card/CardBalanceOrderDetailsScreen.js +++ b/src/screens/Card/CardBalanceOrderDetailsScreen.js @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react'; -import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Alert, ScrollView, SafeAreaView, Modal } from 'react-native'; +import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Alert, ScrollView, Modal } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useRoute } from '@react-navigation/native'; import apiService from '../../services/apiService'; diff --git a/src/screens/Card/CardBalanceOrdersScreen.js b/src/screens/Card/CardBalanceOrdersScreen.js index 3e97f68..071141c 100644 --- a/src/screens/Card/CardBalanceOrdersScreen.js +++ b/src/screens/Card/CardBalanceOrdersScreen.js @@ -1,5 +1,6 @@ import React, { useState, useCallback } from 'react'; -import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl, SafeAreaView } from 'react-native'; +import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useFocusEffect } from '@react-navigation/native'; import apiService from '../../services/apiService'; diff --git a/src/screens/Card/CardOrderDetailsScreen.js b/src/screens/Card/CardOrderDetailsScreen.js index d6c214f..af36ebc 100644 --- a/src/screens/Card/CardOrderDetailsScreen.js +++ b/src/screens/Card/CardOrderDetailsScreen.js @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react'; -import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, ScrollView, SafeAreaView, Image, Alert, Linking } from 'react-native'; +import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, ScrollView, Image, Alert, Linking } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useRoute } from '@react-navigation/native'; import { StatusBar } from 'expo-status-bar'; diff --git a/src/screens/Card/CardOrdersScreen.js b/src/screens/Card/CardOrdersScreen.js index 02f9979..3822108 100644 --- a/src/screens/Card/CardOrdersScreen.js +++ b/src/screens/Card/CardOrdersScreen.js @@ -1,5 +1,6 @@ import React, { useCallback, useState } from 'react'; -import { View, Text, StyleSheet, FlatList, TouchableOpacity, ActivityIndicator, RefreshControl, SafeAreaView } from 'react-native'; +import { View, Text, StyleSheet, FlatList, TouchableOpacity, ActivityIndicator, RefreshControl } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useFocusEffect } from '@react-navigation/native'; import { StatusBar } from 'expo-status-bar'; diff --git a/src/screens/Card/CardPinOrderDetailsScreen.js b/src/screens/Card/CardPinOrderDetailsScreen.js index 15a10e6..e6ecddb 100644 --- a/src/screens/Card/CardPinOrderDetailsScreen.js +++ b/src/screens/Card/CardPinOrderDetailsScreen.js @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react'; -import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Alert, ScrollView, SafeAreaView, Image, Linking } from 'react-native'; +import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Alert, ScrollView, Image, Linking } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useRoute } from '@react-navigation/native'; import { StatusBar } from 'expo-status-bar'; diff --git a/src/screens/Card/CardPinOrdersScreen.js b/src/screens/Card/CardPinOrdersScreen.js index eb7e353..a3c8496 100644 --- a/src/screens/Card/CardPinOrdersScreen.js +++ b/src/screens/Card/CardPinOrdersScreen.js @@ -1,5 +1,6 @@ import React, { useState, useCallback } from 'react'; -import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl, SafeAreaView } from 'react-native'; +import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useFocusEffect } from '@react-navigation/native'; import { StatusBar } from 'expo-status-bar'; diff --git a/src/screens/Card/CardRequisiteOrderDetailsScreen.js b/src/screens/Card/CardRequisiteOrderDetailsScreen.js index b1493fb..cb4da57 100644 --- a/src/screens/Card/CardRequisiteOrderDetailsScreen.js +++ b/src/screens/Card/CardRequisiteOrderDetailsScreen.js @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react'; -import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Alert, ScrollView, SafeAreaView, Image } from 'react-native'; +import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Alert, ScrollView, Image } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useRoute } from '@react-navigation/native'; import { StatusBar } from 'expo-status-bar'; diff --git a/src/screens/Card/CardRequisiteOrdersScreen.js b/src/screens/Card/CardRequisiteOrdersScreen.js index c7c1501..db3fd1f 100644 --- a/src/screens/Card/CardRequisiteOrdersScreen.js +++ b/src/screens/Card/CardRequisiteOrdersScreen.js @@ -1,5 +1,6 @@ import React, { useState, useCallback, useRef } from 'react'; -import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl, SafeAreaView } from 'react-native'; +import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useFocusEffect } from '@react-navigation/native'; import { StatusBar } from 'expo-status-bar'; diff --git a/src/screens/Card/CardTransactionOrderDetailsScreen.js b/src/screens/Card/CardTransactionOrderDetailsScreen.js index 5623052..b1707a4 100644 --- a/src/screens/Card/CardTransactionOrderDetailsScreen.js +++ b/src/screens/Card/CardTransactionOrderDetailsScreen.js @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react'; -import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Alert, ScrollView, SafeAreaView, Modal } from 'react-native'; +import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Alert, ScrollView, Modal } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useRoute } from '@react-navigation/native'; import apiService from '../../services/apiService'; diff --git a/src/screens/Card/CardTransactionOrdersScreen.js b/src/screens/Card/CardTransactionOrdersScreen.js index 56e9523..37202f1 100644 --- a/src/screens/Card/CardTransactionOrdersScreen.js +++ b/src/screens/Card/CardTransactionOrdersScreen.js @@ -1,5 +1,6 @@ import React, { useState, useCallback } from 'react'; -import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl, SafeAreaView } from 'react-native'; +import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useFocusEffect } from '@react-navigation/native'; import apiService from '../../services/apiService'; diff --git a/src/screens/Card/CreateCardBalanceOrderScreen.js b/src/screens/Card/CreateCardBalanceOrderScreen.js index 9925c6e..fc27cf4 100644 --- a/src/screens/Card/CreateCardBalanceOrderScreen.js +++ b/src/screens/Card/CreateCardBalanceOrderScreen.js @@ -1,5 +1,6 @@ import React, { useState, useEffect } from 'react'; -import { View, Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, SafeAreaView, ScrollView } from 'react-native'; +import { View, Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, ScrollView } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation } from '@react-navigation/native'; import apiService from '../../services/apiService'; diff --git a/src/screens/Card/CreateCardOrderScreen.js b/src/screens/Card/CreateCardOrderScreen.js index e68500e..f3aaa63 100644 --- a/src/screens/Card/CreateCardOrderScreen.js +++ b/src/screens/Card/CreateCardOrderScreen.js @@ -1,5 +1,6 @@ import React, { useState, useEffect, useRef } from 'react'; -import { View, Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, SafeAreaView, ScrollView, Modal } from 'react-native'; +import { View, Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, ScrollView, Modal } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation } from '@react-navigation/native'; import { StatusBar } from 'expo-status-bar'; diff --git a/src/screens/Card/CreateCardPinOrderScreen.js b/src/screens/Card/CreateCardPinOrderScreen.js index 3d2a0c5..dc79981 100644 --- a/src/screens/Card/CreateCardPinOrderScreen.js +++ b/src/screens/Card/CreateCardPinOrderScreen.js @@ -1,5 +1,6 @@ import React, { useState, useEffect } from 'react'; -import { View, Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, SafeAreaView, ScrollView } from 'react-native'; +import { View, Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, ScrollView } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation } from '@react-navigation/native'; import { StatusBar } from 'expo-status-bar'; diff --git a/src/screens/Card/CreateCardRequisiteOrderScreen.js b/src/screens/Card/CreateCardRequisiteOrderScreen.js index 195d251..57d3623 100644 --- a/src/screens/Card/CreateCardRequisiteOrderScreen.js +++ b/src/screens/Card/CreateCardRequisiteOrderScreen.js @@ -1,5 +1,6 @@ import React, { useState, useEffect } from 'react'; -import { View, Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, SafeAreaView, ScrollView } from 'react-native'; +import { View, Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, ScrollView } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation } from '@react-navigation/native'; import { StatusBar } from 'expo-status-bar'; diff --git a/src/screens/Card/CreateCardTransactionOrderScreen.js b/src/screens/Card/CreateCardTransactionOrderScreen.js index fbd33fa..64b3e1e 100644 --- a/src/screens/Card/CreateCardTransactionOrderScreen.js +++ b/src/screens/Card/CreateCardTransactionOrderScreen.js @@ -1,5 +1,6 @@ import React, { useState, useEffect } from 'react'; -import { View, Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, SafeAreaView, ScrollView } from 'react-native'; +import { View, Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, ScrollView } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation } from '@react-navigation/native'; import apiService from '../../services/apiService'; diff --git a/src/screens/Loan/CreateLoanOrderScreen.js b/src/screens/Loan/CreateLoanOrderScreen.js index 3674115..6bcd132 100644 --- a/src/screens/Loan/CreateLoanOrderScreen.js +++ b/src/screens/Loan/CreateLoanOrderScreen.js @@ -1,5 +1,6 @@ import React, { useState, useEffect } from 'react'; -import { Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, ScrollView, SafeAreaView, View } from 'react-native'; +import { Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, ScrollView, View } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation } from '@react-navigation/native'; import { COLORS } from '../../constants/colors'; diff --git a/src/screens/Loan/CreateLoanPaidOffLetterOrderScreen.js b/src/screens/Loan/CreateLoanPaidOffLetterOrderScreen.js index 92777ff..83ccea3 100644 --- a/src/screens/Loan/CreateLoanPaidOffLetterOrderScreen.js +++ b/src/screens/Loan/CreateLoanPaidOffLetterOrderScreen.js @@ -1,5 +1,6 @@ import React, { useState, useEffect } from 'react'; -import { Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, ScrollView, SafeAreaView } from 'react-native'; +import { Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, ScrollView } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation } from '@react-navigation/native'; import { COLORS } from '../../constants/colors'; diff --git a/src/screens/Loan/CreateLoanRemainingOrderScreen.js b/src/screens/Loan/CreateLoanRemainingOrderScreen.js index ca876c7..a3e8c8f 100644 --- a/src/screens/Loan/CreateLoanRemainingOrderScreen.js +++ b/src/screens/Loan/CreateLoanRemainingOrderScreen.js @@ -1,5 +1,6 @@ import React, { useState, useEffect } from 'react'; -import { View, Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert, SafeAreaView } from 'react-native'; +import { View, Text, StyleSheet, TouchableOpacity, ActivityIndicator, Alert } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation } from '@react-navigation/native'; import apiService from '../../services/apiService'; diff --git a/src/screens/Loan/LoanOrderDetailsScreen.js b/src/screens/Loan/LoanOrderDetailsScreen.js index 10de04d..2ce299c 100644 --- a/src/screens/Loan/LoanOrderDetailsScreen.js +++ b/src/screens/Loan/LoanOrderDetailsScreen.js @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react'; -import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Alert, ScrollView, SafeAreaView } from 'react-native'; +import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Alert, ScrollView } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useRoute } from '@react-navigation/native'; import apiService from '../../services/apiService'; diff --git a/src/screens/Loan/LoanOrdersScreen.js b/src/screens/Loan/LoanOrdersScreen.js index 2dbb84d..2ac1847 100644 --- a/src/screens/Loan/LoanOrdersScreen.js +++ b/src/screens/Loan/LoanOrdersScreen.js @@ -1,5 +1,6 @@ import React, { useState, useCallback } from 'react'; -import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl, SafeAreaView, Alert } from 'react-native'; +import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl, Alert } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useFocusEffect } from '@react-navigation/native'; import apiService from '../../services/apiService'; diff --git a/src/screens/Loan/LoanPaidOffLetterOrderDetailsScreen.js b/src/screens/Loan/LoanPaidOffLetterOrderDetailsScreen.js index 07069a2..4359d87 100644 --- a/src/screens/Loan/LoanPaidOffLetterOrderDetailsScreen.js +++ b/src/screens/Loan/LoanPaidOffLetterOrderDetailsScreen.js @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react'; -import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Alert, ScrollView, SafeAreaView } from 'react-native'; +import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Alert, ScrollView } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useRoute } from '@react-navigation/native'; import apiService from '../../services/apiService'; diff --git a/src/screens/Loan/LoanPaidOffLetterOrdersScreen.js b/src/screens/Loan/LoanPaidOffLetterOrdersScreen.js index cda876b..70ba03e 100644 --- a/src/screens/Loan/LoanPaidOffLetterOrdersScreen.js +++ b/src/screens/Loan/LoanPaidOffLetterOrdersScreen.js @@ -1,5 +1,6 @@ import React, { useState, useCallback } from 'react'; -import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl, SafeAreaView, Alert } from 'react-native'; +import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl, Alert } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useFocusEffect } from '@react-navigation/native'; import apiService from '../../services/apiService'; diff --git a/src/screens/Loan/LoanRemainingOrderDetailsScreen.js b/src/screens/Loan/LoanRemainingOrderDetailsScreen.js index 0f078ac..208aef9 100644 --- a/src/screens/Loan/LoanRemainingOrderDetailsScreen.js +++ b/src/screens/Loan/LoanRemainingOrderDetailsScreen.js @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react'; import { View, Text, StyleSheet, ActivityIndicator, TouchableOpacity, Alert } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useRoute } from '@react-navigation/native'; import apiService from '../../services/apiService'; @@ -63,7 +64,7 @@ const LoanRemainingOrderDetailsScreen = () => { } return ( - + navigation.goBack()}> @@ -82,7 +83,7 @@ const LoanRemainingOrderDetailsScreen = () => { Poz - + ); }; diff --git a/src/screens/Loan/LoanRemainingOrdersScreen.js b/src/screens/Loan/LoanRemainingOrdersScreen.js index c34f437..b44f002 100644 --- a/src/screens/Loan/LoanRemainingOrdersScreen.js +++ b/src/screens/Loan/LoanRemainingOrdersScreen.js @@ -1,5 +1,6 @@ import React, { useState, useCallback } from 'react'; -import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl, Modal, ScrollView, Alert, SafeAreaView, Pressable } from 'react-native'; +import { View, Text, StyleSheet, FlatList, ActivityIndicator, TouchableOpacity, RefreshControl, Modal, ScrollView, Alert, Pressable } from 'react-native'; +import { SafeAreaView } from 'react-native-safe-area-context'; import { Ionicons } from '@expo/vector-icons'; import { useNavigation, useFocusEffect } from '@react-navigation/native'; import apiService from '../../services/apiService'; @@ -133,7 +134,7 @@ const LoanRemainingOrdersScreen = () => { renderItem={renderItem} contentContainerStyle={orders.length === 0 && styles.emptyContainer} refreshControl={} - ListEmptyComponent={No orders yet} + ListEmptyComponent={Sargyt ýok} /> {/* Floating Action Button */}