Viktoriia 1 неделя назад
Родитель
Сommit
5904967f72

+ 2 - 2
src/components/RegionPopup/index.tsx

@@ -272,7 +272,7 @@ const RegionPopup: React.FC<RegionPopupProps> = ({
                 {(userData?.visited || userData?.edit_in_trips === 1) && !disabled && (
                   <TouchableOpacity
                     onPress={openEditModal}
-                    style={[styles.btn, styles.visitedButton]}
+                    style={[styles.btn, styles.visitedButton, isSmallScreen ? { paddingHorizontal: 10 } : {}]}
                   >
                     <View style={styles.visitedContainer}>
                       <EditSvg width={14} height={14} />
@@ -282,7 +282,7 @@ const RegionPopup: React.FC<RegionPopupProps> = ({
                 )}
                 {!disabled && (
                   <TouchableOpacity
-                    style={[styles.btn, styles.markVisitedButton, { width: 110 }]}
+                    style={[styles.btn, styles.markVisitedButton, { maxWidth: 110 }, isSmallScreen ? { paddingHorizontal: 10 } : {}]}
                     onPress={() => setIsAddVisitModalVisible(true)}
                   >
                     <Text style={[styles.markVisitedButtonText, { textAlign: 'center' }]}>Add visit</Text>

+ 1 - 1
src/screens/InAppScreens/MapScreen/RegionViewScreen/index.tsx

@@ -485,7 +485,7 @@ const RegionViewScreen: FC<Props> = ({ navigation, route }) => {
                       </TouchableOpacity>
                     )}
                     <TouchableOpacity
-                      style={[ButtonStyles.btn, ButtonStyles.markVisitedButton, { width: 110 }]}
+                      style={[ButtonStyles.btn, ButtonStyles.markVisitedButton, { maxWidth: 110 }]}
                       onPress={() => setIsAddVisitModalVisible(true)}
                     >
                       <Text style={[ButtonStyles.markVisitedButtonText, { textAlign: 'center' }]}>Add visit</Text>

+ 5 - 3
src/screens/InAppScreens/TravelsScreen/Components/MyRegionsItems/NmRegionItem.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { View, Text, TouchableOpacity, Image } from 'react-native';
+import { View, Text, TouchableOpacity, Image, Dimensions } from 'react-native';
 
 import { NmRegion } from '../../utils/types';
 import { Colors } from 'src/theme';
@@ -34,6 +34,8 @@ export const NmRegionItem = React.memo(
     const regionImg = regionData ? JSON.parse(regionData?.region_photos)[0] : '';
     const formattedCount = formatNumber(regionData?.visitors_count ?? 0);
 
+    const isSmallScreen = Dimensions.get('window').width < 383;
+
     return (
       <View style={styles.regionItem}>
         <View style={styles.regionItemHeader}>
@@ -115,7 +117,7 @@ export const NmRegionItem = React.memo(
                 {(item.visits > 0 || item.edit_in_trips === 1) && (
                   <TouchableOpacity
                     onPress={() => openEditModal(item)}
-                    style={[styles.btn, styles.visitedButton, { flex: 0, paddingHorizontal: 12 }]}
+                    style={[styles.btn, styles.visitedButton, { flex: 0, paddingHorizontal: 12 }, isSmallScreen ? { paddingHorizontal: 10 } : {}]}
                   >
                     <View style={styles.visitedContainer}>
                       <EditSvg width={14} height={14} />
@@ -124,7 +126,7 @@ export const NmRegionItem = React.memo(
                   </TouchableOpacity>
                 )}
                 <TouchableOpacity
-                  style={[styles.btn, styles.markVisitedButton, { width: 110 }]}
+                  style={[styles.btn, styles.markVisitedButton, { maxWidth: 110 }, isSmallScreen ? { paddingHorizontal: 10 } : {}]}
                   onPress={() => onAddVisitPress(item)}
                 >
                   <Text style={[styles.markVisitedButtonText, { textAlign: 'center' }]}>Add visit</Text>