From 36ac66df3edf8aa8d6af739ecc3ae900dc86c955 Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Sat, 5 Jul 2025 16:20:53 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AB?= =?UTF-8?q?=E3=81=8A=E6=B0=97=E3=81=AB=E5=85=A5=E3=82=8A=E3=81=8C=E7=84=A1?= =?UTF-8?q?=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AE=E8=A6=81=E7=B4=A0=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Menu/Carousel/CarouselBox.tsx | 51 ++++++++++++++++++++---- menu.js | 3 +- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/components/Menu/Carousel/CarouselBox.tsx b/components/Menu/Carousel/CarouselBox.tsx index 950acec..f126278 100644 --- a/components/Menu/Carousel/CarouselBox.tsx +++ b/components/Menu/Carousel/CarouselBox.tsx @@ -1,7 +1,13 @@ import Sign from "@/components/駅名表/Sign"; import React, { useEffect, useRef, useState } from "react"; import { AS } from "@/storageControl"; -import { useWindowDimensions, View, LayoutAnimation } from "react-native"; +import { + useWindowDimensions, + View, + LayoutAnimation, + TouchableOpacity, + Text, +} from "react-native"; import Carousel, { ICarouselInstance } from "react-native-reanimated-carousel"; import { SheetManager } from "react-native-actions-sheet"; import { StationNumber } from "../StationPagination"; @@ -13,6 +19,7 @@ export const CarouselBox = ({ setListIndex, listIndex, navigate, + stationListMode }) => { const carouselRef = useRef(null); const { height, width } = useWindowDimensions(); @@ -66,12 +73,36 @@ export const CarouselBox = ({ key={item[0].StationNumber} > - + {item[0].StationNumber != "null" ? ( + + ) : ( + + + + {stationListMode == "position" ? "現在地の近くに駅がありません。" : "お気に入りリストがありません。お気に入りの駅を追加しよう!"} + + + + )} ); @@ -80,7 +111,11 @@ export const CarouselBox = ({ 0 + ? listUpStation + : [[{ StationNumber: "null" }]] + } height={(((width / 100) * 80) / 20) * 9 + 10} pagingEnabled={true} snapEnabled={true} diff --git a/menu.js b/menu.js index ac2491e..73df951 100644 --- a/menu.js +++ b/menu.js @@ -312,7 +312,7 @@ export default function Menu(props) { /> )} - {listUpStation.length != 0 && originalStationList.length != 0 && ( + {originalStationList.length != 0 && ( <> {listUpStation[listIndex] && (