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