From 789af1aa37550568fdc3b242ebb51e5743d7c84b Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Fri, 29 Dec 2023 01:36:37 +0900 Subject: [PATCH 1/4] =?UTF-8?q?ActionSheet=E3=81=AEScrollView=E3=81=AE?= =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=81?= =?UTF-8?q?=E5=90=8C=E6=99=82=E3=81=AB=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActionSheetComponents/EachTrainInfo.js | 34 +++++++++++-------- .../ActionSheetComponents/JRSTraInfo.js | 18 ++++++---- .../StationDeteilView.js | 2 +- 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js index 71599d4..ecaa412 100644 --- a/components/ActionSheetComponents/EachTrainInfo.js +++ b/components/ActionSheetComponents/EachTrainInfo.js @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from "react"; +import React, { useEffect, useState, useRef } from "react"; import { View, LayoutAnimation, @@ -11,7 +11,10 @@ import { Platform, } from "react-native"; import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"; -import ActionSheet, { SheetManager } from "react-native-actions-sheet"; +import ActionSheet, { + SheetManager, + useScrollHandlers, +} from "react-native-actions-sheet"; import { AS } from "../../storageControl"; import LottieView from "lottie-react-native"; import trainList from "../../assets/originData/trainList"; @@ -239,13 +242,18 @@ export const EachTrainInfo = (props) => { .replace("マリン", "マリンライナー") .replace("ライナーライナー", "ライナー"); }; - + const actionSheetRef = useRef(null); + const scrollHandlers = useScrollHandlers("scrollview-1", actionSheetRef); return ( - }> + } + ref={actionSheetRef} + > { )} { if (!Platform.OS !== "android") return; setIsTop(e.nativeEvent.contentOffset.y < 0); }} > - + {/* { const { getTime, delayData, loadingDelayData, setLoadingDelayData } = useTrainDelayData(); + const actionSheetRef = useRef(null); + const scrollHandlers = useScrollHandlers("scrollview-1", actionSheetRef); return ( - }> + } + ref={actionSheetRef} + > { }} /> - + {loadingDelayData ? ( diff --git a/components/ActionSheetComponents/StationDeteilView.js b/components/ActionSheetComponents/StationDeteilView.js index 9d33582..5d45976 100644 --- a/components/ActionSheetComponents/StationDeteilView.js +++ b/components/ActionSheetComponents/StationDeteilView.js @@ -50,7 +50,7 @@ export const StationDeteilView = (props) => { key={currentStation} style={{ backgroundColor: "white", - borderRadius: 5, + borderTopRadius: 5, borderColor: "dark", borderWidth: 1, }} From e4ce671e67a1c4f63de6ac6a78eb7e927e428a5f Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Fri, 29 Dec 2023 01:36:56 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=84=E3=83=87?= =?UTF-8?q?=E3=82=B6=E3=82=A4=E3=83=B3=E5=B4=A9=E3=82=8C=E3=82=84=E6=A9=9F?= =?UTF-8?q?=E8=83=BD=E6=B6=88=E6=BB=85=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.js | 20 ++++++++++---------- components/atom/TextBox.js | 4 ++-- menu.js | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/App.js b/App.js index eb21052..05c16c5 100644 --- a/App.js +++ b/App.js @@ -45,17 +45,17 @@ export default function App() { return ( - - - - - + + + + + - - - - - + + + + + ); diff --git a/components/atom/TextBox.js b/components/atom/TextBox.js index 9b3f3a7..f9101fd 100644 --- a/components/atom/TextBox.js +++ b/components/atom/TextBox.js @@ -7,8 +7,8 @@ export const TextBox = (props) => { style={{ flex: flex, backgroundColor: backgroundColor, - padding: 10, - height: 70, + padding: 5, + minHeight: 70, alignItems: "center", alignContent: "center", margin: 2, diff --git a/menu.js b/menu.js index fb4ce4a..108fa29 100644 --- a/menu.js +++ b/menu.js @@ -678,7 +678,7 @@ const FixedContentBottom = (props) => { 列番探索 - データベースに存在する全列車のダイヤを確認できる機能です。 + データベースに存在する全列車のダイヤを探索 From 23402aef793ed9a085b92f1376e5d973658ab25f Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Fri, 29 Dec 2023 02:08:24 +0900 Subject: [PATCH 3/4] =?UTF-8?q?ScrollView=E3=81=8B=E3=82=89FlatList?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/AllTrainDiagramView.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/components/AllTrainDiagramView.js b/components/AllTrainDiagramView.js index b056230..66e422a 100644 --- a/components/AllTrainDiagramView.js +++ b/components/AllTrainDiagramView.js @@ -5,6 +5,7 @@ import { TouchableOpacity, Linking, ScrollView, + FlatList, } from "react-native"; import MapView, { Marker } from "react-native-maps"; import { MaterialCommunityIcons } from "@expo/vector-icons"; @@ -58,12 +59,14 @@ export default function AllTrainDiagramView({ navigation: { navigate } }) { }; return ( - - {keyList && - keyList.map((key) => ( - - ))} - + ( + + )} + keyExtractor={(item) => item} + initialNumToRender={100} + /> Date: Fri, 29 Dec 2023 02:08:29 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/settings.js b/components/settings.js index da43860..7f7b871 100644 --- a/components/settings.js +++ b/components/settings.js @@ -165,7 +165,7 @@ export default function Setting(props) { textAlignVertical: "center", }} > - 内部バージョン: 4.6 + 内部バージョン: 4.6.1