diff --git a/assets/relationLogo/elesite_logo.jpg b/assets/relationLogo/elesite_logo.jpg new file mode 100644 index 0000000..c0fe942 Binary files /dev/null and b/assets/relationLogo/elesite_logo.jpg differ diff --git a/components/ActionSheetComponents/TrainDataSources.tsx b/components/ActionSheetComponents/TrainDataSources.tsx index 29ad41a..30ceaa2 100644 --- a/components/ActionSheetComponents/TrainDataSources.tsx +++ b/components/ActionSheetComponents/TrainDataSources.tsx @@ -51,7 +51,7 @@ export type TrainDataSourcesPayload = { }; const HUB_LOGO_PNG = require("@/assets/relationLogo/unyohub_logo.webp"); -const ELESITE_LOGO_PNG = require("@/assets/relationLogo/elesite_logo.png"); +const ELESITE_LOGO_PNG = require("@/assets/relationLogo/elesite_logo.jpg"); /** ISO 8601 日時文字列を "HH:MM" 形式にフォーマット */ const formatHHMM = (iso: string): string => { diff --git a/components/Menu/RailScope/SearchUnitBox.tsx b/components/Menu/RailScope/SearchUnitBox.tsx index 8dbcf36..057a45d 100644 --- a/components/Menu/RailScope/SearchUnitBox.tsx +++ b/components/Menu/RailScope/SearchUnitBox.tsx @@ -1,9 +1,9 @@ -import React from "react"; +import React, { useState } from "react"; import { TouchableOpacity, Text, View, - Animated, + LayoutAnimation, TextInput, } from "react-native"; import Ionicons from "react-native-vector-icons/Ionicons"; @@ -34,29 +34,31 @@ export const SearchUnitBox = ({ const isSearch = stationSource.type === "search"; const query = isSearch ? stationSource.query : ""; const lineId = isSearch ? stationSource.lineId : undefined; - const { animatedOffset } = + const { keyboardHeight, measuredOffset: measuredBottom } = useKeyboardAvoid({ measureRef: parentRef, tabBarHeight }); return ( <> - 0 ? measuredBottom : 0) + : 60, right: 0, + padding: isSearch ? 5 : 10, margin: isSearch ? 0 : 10, + backgroundColor: fixed.primary, + borderRadius: isSearch ? 5 : 50, width: isSearch ? width : 50, zIndex: 1000, }} - > - { + LayoutAnimation.configureNext({ + duration: 100, + update: { type: "easeInEaseOut", springDamping: 0.6 }, + }); setStationSource({ type: "search", query: "", lineId: undefined }); }} > @@ -75,6 +77,10 @@ export const SearchUnitBox = ({ { + LayoutAnimation.configureNext({ + duration: 100, + update: { type: "easeInEaseOut", springDamping: 0.6 }, + }); closeSearch(); }} > @@ -169,7 +175,6 @@ export const SearchUnitBox = ({ )} - ); }; diff --git a/components/Settings/DataSourceSettings.tsx b/components/Settings/DataSourceSettings.tsx index 88dc093..cfaf226 100644 --- a/components/Settings/DataSourceSettings.tsx +++ b/components/Settings/DataSourceSettings.tsx @@ -10,7 +10,7 @@ import { useTrainMenu } from "@/stateBox/useTrainMenu"; import { useThemeColors } from "@/lib/theme"; const HUB_LOGO_PNG = require("@/assets/relationLogo/unyohub_logo.webp"); -const ELESITE_LOGO_PNG = require("@/assets/relationLogo/elesite_logo.png"); +const ELESITE_LOGO_PNG = require("@/assets/relationLogo/elesite_logo.jpg"); /* ------------------------------------------------------------------ */ /* DataSourceAccordionCard */ /* ------------------------------------------------------------------ */ diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts index 2dbb2ef..0119594 100644 --- a/lib/webViewInjectjavascript.ts +++ b/lib/webViewInjectjavascript.ts @@ -859,7 +859,7 @@ export const injectJavascriptData = ({ if(hasElesite) { const elesiteOffsetPx = _blueOffset + (hasUnyohub ? 20 : 0); const offsetStyle = badgeVerticalPos + ":" + elesiteOffsetPx + "px;"; - badgeHtml += "
E
"; + badgeHtml += "
"; } 行き先情報.insertAdjacentHTML('beforebegin', "
" + badgeHtml + "

" + (TrainNumberOverride ? TrainNumberOverride : TrainNumber) + "

" + (isWanman ? "ワンマン " : "") + "

" + viaData + "

" + optionalText + "

" + trainName + "

" + (ToData ? ToData + "行" : ToData) + "

" + trainType + "

" + (hasProblem ? "‼️停止中‼️" : "") + "

");