harukin/jrshikoku
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '7bd7d951048357c4c0b81d9048906275066e8526' into develop

Browse Source
This commit is contained in:
harukin-expo-dev-env 2024-03-12 16:35:36 +00:00
commit eec7d7fb45
2 changed files with 99 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
Apps.js
View File

@ -338,16 +338,108 @@ export default function Apps({ navigation, webview, stationData }) {
top={Platform.OS == "ios" ? Constants.statusBarHeight : 0}
/>
)}
{mapSwitch == "true" ? (
<ReloadButton
onPress={() => webview.current.reload()}
onPress={() => Updates.reloadAsync()}
top={Platform.OS == "ios" ? Constants.statusBarHeight : 0}
right={isLandscape && trainInfo.trainNum ? (width / 100) * 40 : 0}
LoadError={LoadError}
/>
) : (
<NewMenu
webview={webview}
isLandscape={isLandscape}
LoadError={LoadError}
mapSwitch={mapSwitch}
/>
)}
</View>
);
}
const NewMenu = ({ webview, LoadError }) => {
const { width } = useWindowDimensions();
return (
<View
style={{
position: "absolute",
top: 0,
width: width,
height: 54,
backgroundColor: "#0099CC",
borderColor: "white",
borderStyle: "solid",
borderWidth: 1,
alignContent: "center",
alignSelf: "center",
alignItems: "center",
flexDirection: "row",
}}
>
<TouchableOpacity
activeOpacity={1}
style={{
flex: 1,
height: 54,
backgroundColor: "#0099CC",
borderColor: "white",
borderStyle: "solid",
borderWidth: 1,
borderRightWidth: 0,
alignContent: "center",
alignSelf: "center",
alignItems: "center",
flexDirection: "row",
}}
onPress={() => {
webview.current?.injectJavaScript(`AccordionClassEvent()`);
}}
>
<>
<View
style={{
width: 54,
height: 54,
backgroundColor: "#0099CC",
borderColor: "white",
borderStyle: "solid",
borderWidth: 1,
alignContent: "center",
alignSelf: "center",
alignItems: "center",
}}
>
<View style={{ flex: 1 }} />
<Ionicons name="menu" color="white" size={30} />
<View style={{ flex: 1 }} />
</View>
<View style={{ flex: 1 }} />
<Text style={{ color: "white", fontSize: 20 }}>メニュー</Text>
<View style={{ flex: 1 }}></View>
</>
</TouchableOpacity>
<TouchableOpacity
onPress={() => Updates.reloadAsync()}
style={{
width: 54,
height: 54,
backgroundColor: LoadError ? "red" : "#0099CC",
borderColor: "white",
borderStyle: "solid",
borderWidth: 1,
alignContent: "center",
alignSelf: "center",
alignItems: "center",
}}
>
<View style={{ flex: 1 }} />
<Ionicons name="reload" color="white" size={30} />
<View style={{ flex: 1 }} />
</TouchableOpacity>
</View>
);
};
const MapsButton = ({ onPress, top, mapSwitch }) => {
const styles = {
touch: {

2
components/settings.js
View File

@ -174,7 +174,7 @@ export default function Setting(props) {
textAlignVertical: "center",
}}
>
内部バージョン: 5.0.1
内部バージョン: 5.0.2
</Text>
<View style={{ flex: 1 }} />
</View>