Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions mobile-app/app/(tabs)/about.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { Image } from "@/components/ui/image";
import { Center } from "@/components/ui/center";
import DataList from "@/components/data-list";
import { Link, LinkText } from "@/components/ui/link";
import Credit from "@/components/credit";
import { Box } from "@/components/ui/box";

export default function AboutScreen() {
return (
Expand Down Expand Up @@ -49,6 +51,10 @@ export default function AboutScreen() {
/>
</Link>
</Center>

<Box className="py-16">
<Credit />
</Box>
</ScrollView>
</SafeAreaView>
);
Expand Down
10 changes: 3 additions & 7 deletions mobile-app/app/(tabs)/index.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ import { $api } from "@/api-client/api";
import { Box } from "@/components/ui/box";
import type { components } from "@/schema/api";
import Search from "@/components/search";
import { Text } from "@/components/ui/text";
import { Link, LinkText } from "@/components/ui/link";
import Score from "@/components/score";
import Result from "@/components/result";
import Mode from "@/components/mode";
import Marker from "@/components/marker";
import Credit from "@/components/credit";

export default function MapsScreen() {
const { data: currentLocation, isLoading } = useCurrentLocation();
Expand Down Expand Up @@ -373,11 +372,8 @@ export default function MapsScreen() {
destination={!!destination}
/>

<Box className="flex flex-row items-center justify-center p-1 bg-white/80 text-center mt-1">
<Text className="text-sm text-gray-500">&copy;&nbsp;</Text>
<Link href="https://www.openstreetmap.org/copyright">
<LinkText size="sm">OpenStreetMap contributors</LinkText>
</Link>
<Box className="max-w-[250px]">
<Credit />
</Box>
</Box>

Expand Down
33 changes: 33 additions & 0 deletions mobile-app/components/credit/constants.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { Link, LinkText } from "../ui/link";
import { Text } from "../ui/text";
import { Box } from "../ui/box";

const SIZE = "xs";

export const CREDITS = [
<>
<Text size={SIZE} className="text-gray-500" key={"osm-copyright"}>
&copy;&nbsp;
</Text>
<Link href="https://www.openstreetmap.org/copyright" key={"osm-link"}>
<LinkText size={SIZE}>OpenStreetMap contributors</LinkText>
</Link>
</>,
<Box
key={"bus-stop-information"}
className="flex flex-row flex-wrap border-t-gray-300 border-t pt-1 mt-1"
>
<Text size={SIZE} className="text-gray-500 w-full">
このアプリケーションは、以下の著作物を改変して利用しています。
</Text>
<Text size={SIZE} className="text-gray-500">
東京都交通局・公共交通オープンデータ協議会、バス停情報 / Bus stop
information、
</Text>
<Link href="https://creativecommons.org/licenses/by/4.0/deed.ja">
<LinkText size={SIZE}>
クリエイティブ・コモンズ・ライセンス 表示4.0国際
</LinkText>
</Link>
</Box>,
];
13 changes: 13 additions & 0 deletions mobile-app/components/credit/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Box } from "../ui/box";
import Item from "./item";
import { CREDITS } from "./constants";

export default function Credit() {
return (
<Box className="flex flex-col p-1 bg-white/80 text-center mt-1">
{CREDITS.map((credit) => (
<Item key={credit.key}>{credit}</Item>
))}
</Box>
);
}
10 changes: 10 additions & 0 deletions mobile-app/components/credit/item.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import type { ReactNode } from "react";
import { Box } from "../ui/box";

interface Props {
children: ReactNode;
}

export default function Item({ children }: Props) {
return <Box className="flex flex-row items-center">{children}</Box>;
}
5 changes: 5 additions & 0 deletions mobile-app/components/data-list/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,9 @@ export const DATA_LIST: Data[] = [
label: `${openDataSiteName} - 交通量統計表`,
link: "https://catalog.data.metro.tokyo.lg.jp/dataset/t000022d0000000035",
},
{
label:
"東京都交通局・公共交通オープンデータ協議会 - バス停情報 / Bus stop information",
link: "https://ckan.odpt.org/dataset/b_busstop-toei/resource/f340278d-aefe-47ea-bc8f-15ebe48c286d",
},
];
Loading