バグとレイアウトの崩壊修正

This commit is contained in:
harukin-expo-dev-env
2025-01-22 13:20:45 +00:00
parent f9e3b1d658
commit 837bd6eb4f
7 changed files with 185 additions and 180 deletions

View File

@@ -11,7 +11,8 @@ import {
import * as Updates from "expo-updates";
import { useWindowDimensions } from "react-native";
import { useNavigation } from "@react-navigation/native";
import { ListItem } from "native-base";
import { ListItem } from "@rneui/themed";
import TouchableScale from "react-native-touchable-scale";
import { SwitchArea } from "../atom/SwitchArea";
import { useNotification } from "../../stateBox/useNotifications";
@@ -120,178 +121,106 @@ export const SettingTopPage = ({
trueText={"列車位置情報"}
/>
<ListItem
style={{ flexDirection: "row" }}
onPress={() => navigation.navigate("setting",{screen:"FavoriteSettings"})}
activeScale={0.95}
Component={TouchableScale}
bottomDivider
onPress={() =>
navigation.navigate("setting", { screen: "FavoriteSettings" })
}
>
<Text
style={{
fontSize: 20,
alignItems: "center",
alignContent: "center",
textAlign: "center",
textAlignVertical: "center",
}}
>
お気に入り登録の並び替え
</Text>
<View style={{ flex: 1 }} />
<Text
style={{
fontSize: 20,
alignItems: "center",
alignContent: "center",
textAlign: "center",
textAlignVertical: "center",
}}
>
{">"}
</Text>
<ListItem.Content>
<ListItem.Title>お気に入り登録の並び替え</ListItem.Title>
</ListItem.Content>
<ListItem.Chevron />
</ListItem>
<ListItem
style={{ flexDirection: "row" }}
onPress={() => navigation.navigate("setting",{screen:"NotificationSettings"})}
activeScale={0.95}
Component={TouchableScale}
bottomDivider
onPress={() =>
navigation.navigate("setting", { screen: "NotificationSettings" })
}
disabled={expoPushToken == ""}
>
<Text
style={{
fontSize: 20,
alignItems: "center",
alignContent: "center",
textAlign: "center",
textAlignVertical: "center",
}}
>
通知設定{expoPushToken == "" ? "(通知設定をオンにしてください)" : "(β)"}
</Text>
<View style={{ flex: 1 }} />
<Text
style={{
fontSize: 20,
alignItems: "center",
alignContent: "center",
textAlign: "center",
textAlignVertical: "center",
}}
>
{">"}
</Text>
<ListItem.Content>
<ListItem.Title>
通知設定
{expoPushToken == "" ? "(通知設定をオンにしてください)" : "(β)"}
</ListItem.Title>
</ListItem.Content>
<ListItem.Chevron />
</ListItem>
<ListItem
style={{ flexDirection: "row" }}
onPress={() => navigation.navigate("setting",{screen:"LayoutSettings"})}
activeScale={0.95}
Component={TouchableScale}
bottomDivider
onPress={() =>
navigation.navigate("setting", { screen: "LayoutSettings" })
}
>
<Text
style={{
fontSize: 20,
alignItems: "center",
alignContent: "center",
textAlign: "center",
textAlignVertical: "center",
}}
>
レイアウト設定
</Text>
<View style={{ flex: 1 }} />
<Text
style={{
fontSize: 20,
alignItems: "center",
alignContent: "center",
textAlign: "center",
textAlignVertical: "center",
}}
>
{">"}
</Text>
<ListItem.Content>
<ListItem.Title>レイアウト設定</ListItem.Title>
</ListItem.Content>
<ListItem.Chevron />
</ListItem>
{Platform.OS === "android" ? (
<ListItem
style={{ flexDirection: "row" }}
onPress={() => navigation.navigate("setting",{screen:"WidgetSettings"})}
activeScale={0.95}
Component={TouchableScale}
bottomDivider
onPress={() =>
navigation.navigate("setting", { screen: "WidgetSettings" })
}
>
<Text
style={{
fontSize: 20,
alignItems: "center",
alignContent: "center",
textAlign: "center",
textAlignVertical: "center",
}}
>
ウィジェット設定
</Text>
<View style={{ flex: 1 }} />
<Text
style={{
fontSize: 20,
alignItems: "center",
alignContent: "center",
textAlign: "center",
textAlignVertical: "center",
}}
>
{">"}
</Text>
<ListItem.Content>
<ListItem.Title>ウィジェット設定</ListItem.Title>
</ListItem.Content>
<ListItem.Chevron />
</ListItem>
) : null}
<ListItem
style={{ flexDirection: "row" }}
activeScale={0.95}
Component={TouchableScale}
bottomDivider
onPress={() =>
Linking.openURL(
"https://nexcloud.haruk.in/sites/press-harukin/JRShikokuApps/policy"
)
}
>
<Text
style={{
fontSize: 20,
alignItems: "center",
alignContent: "center",
textAlign: "center",
textAlignVertical: "center",
}}
>
プライバシーポリシー
</Text>
<View style={{ flex: 1 }} />
<ListItem.Content>
<ListItem.Title>プライバシーポリシー</ListItem.Title>
</ListItem.Content>
<ListItem.Chevron />
</ListItem>
<ListItem
style={{ flexDirection: "row" }}
activeScale={0.95}
Component={TouchableScale}
bottomDivider
onPress={() =>
Linking.openURL("https://nexcloud.haruk.in/s/2WFEN5oLPGtrRqT")
}
>
<Text
style={{
fontSize: 20,
alignItems: "center",
alignContent: "center",
textAlign: "center",
textAlignVertical: "center",
}}
>
開発情報
</Text>
<View style={{ flex: 1 }} />
<ListItem.Content>
<ListItem.Title>開発情報</ListItem.Title>
</ListItem.Content>
<ListItem.Chevron />
</ListItem>
<ListItem
style={{ flexDirection: "row" }}
activeScale={0.95}
Component={TouchableScale}
bottomDivider
onPress={() => Linking.openURL("https://twitter.com/Xprocess_main")}
>
<Text
style={{
fontSize: 20,
alignItems: "center",
alignContent: "center",
textAlign: "center",
textAlignVertical: "center",
}}
>
運営Twitter
</Text>
<View style={{ flex: 1 }} />
<ListItem.Content>
<ListItem.Title>運営Twitter</ListItem.Title>
</ListItem.Content>
<ListItem.Chevron />
</ListItem>
{/* <ListItem style={{ flexDirection: "row" }} onPress={() => testNFC()}>
<Text
style={{