Merge commit 'dc413894ab02f20170467842c46b49aaa156066e' into feature/update-tetsudou-lod-database
This commit is contained in:
commit
b93b41c415
@ -1,6 +1,6 @@
|
|||||||
import React, { CSSProperties, FC } from "react";
|
import React, { CSSProperties, FC } from "react";
|
||||||
import { widthPercentageToDP as wp } from "react-native-responsive-screen";
|
import { widthPercentageToDP as wp } from "react-native-responsive-screen";
|
||||||
import { Text, TextStyle, View, ViewStyle } from "react-native";
|
import { Platform, Text, TextStyle, View, ViewStyle } from "react-native";
|
||||||
import { StationName } from "./StationName";
|
import { StationName } from "./StationName";
|
||||||
import lineColorList from "../../assets/originData/lineColorList";
|
import lineColorList from "../../assets/originData/lineColorList";
|
||||||
export const NextPreStationLine = ({ nexStation, preStation, isMatsuyama }) => {
|
export const NextPreStationLine = ({ nexStation, preStation, isMatsuyama }) => {
|
||||||
@ -65,7 +65,7 @@ const BottomStationNumberView: FC<FCimport> = ({ isMatsuyama, children }) => {
|
|||||||
<View style={{ flex: 1 }} />
|
<View style={{ flex: 1 }} />
|
||||||
<Text
|
<Text
|
||||||
style={{
|
style={{
|
||||||
fontSize: parseInt("10%"),
|
fontSize: parseInt(Platform.OS === "ios" ? "8%" : "10%"),
|
||||||
color: "black",
|
color: "black",
|
||||||
textAlign: "center",
|
textAlign: "center",
|
||||||
fontWeight: "bold",
|
fontWeight: "bold",
|
||||||
|
@ -121,7 +121,11 @@ export default function Sign(props) {
|
|||||||
setTestButtonStatus(!testButtonStatus);
|
setTestButtonStatus(!testButtonStatus);
|
||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
<TouchableOpacity style={styleSheet.外枠} onPress={oP} onLongPress={oLP}>
|
<TouchableOpacity
|
||||||
|
style={styleSheet[isMatsuyama ? "外枠B" : "外枠"]}
|
||||||
|
onPress={oP}
|
||||||
|
onLongPress={oLP}
|
||||||
|
>
|
||||||
{isMatsuyama && (
|
{isMatsuyama && (
|
||||||
<LottieView
|
<LottieView
|
||||||
autoPlay
|
autoPlay
|
||||||
@ -172,6 +176,11 @@ const styleSheet = {
|
|||||||
borderWidth: 1,
|
borderWidth: 1,
|
||||||
backgroundColor: "white",
|
backgroundColor: "white",
|
||||||
},
|
},
|
||||||
|
外枠B: {
|
||||||
|
width: wp("80%"),
|
||||||
|
height: (wp("80%") / 20) * 9,
|
||||||
|
borderWidth: 0,
|
||||||
|
},
|
||||||
下帯: {
|
下帯: {
|
||||||
position: "absolute",
|
position: "absolute",
|
||||||
bottom: "8%",
|
bottom: "8%",
|
||||||
|
Loading…
Reference in New Issue
Block a user