Skip to content

Improve UI of touch 2 #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sawa3030 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Improve UI of touch 2 #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b9cbfa
made the scroll bar not appear
sawa3030 Feb 17, 2024
4144c7d
added css for other devices
sawa3030 Feb 18, 2024
e589efb
added hiraganaTableForTouch
sawa3030 Feb 19, 2024
a89ea9c
coped with the hydration error
sawa3030 Feb 19, 2024
d1978b2
minor change
sawa3030 Feb 19, 2024
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
222 changes: 221 additions & 1 deletion learn/src/components/HiraganaTableDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import {
Button,
Table,
TableHead,
TableBody,
TableRow,
TableCell,
Paper,
} from "@mui/material";
import { hiraganaTable } from "@/utils/translateBraille";

export default function HiraganaTableDialog(): JSX.Element {
export function HiraganaTableDialog(): JSX.Element {
const [isHiraganaTableOpen, setIsHiraganaTableOpen] =
useState<boolean>(false);
return (
Expand Down Expand Up @@ -221,3 +222,222 @@ export default function HiraganaTableDialog(): JSX.Element {
</Box>
);
}

export function HiraganaTableDialogForTouch(): JSX.Element {
return (
<Box paddingTop={2}>
<Box paddingTop={2}>
<Paper elevation={2} sx={{ my: 2 }}>
<Typography variant="h6" component="h2" color="inherit" p={2}>
点字とひらがなの対応表
</Typography>
<Table>
<TableHead>
<TableRow>
<TableCell>行/列</TableCell>
<TableCell>あ</TableCell>
<TableCell>い</TableCell>
<TableCell>う</TableCell>
<TableCell>え</TableCell>
<TableCell>お</TableCell>
</TableRow>
</TableHead>
<TableBody>
<TableRow>
<TableCell>あ</TableCell>
<TableCell>{hiraganaTable.あ}</TableCell>
<TableCell>{hiraganaTable.い}</TableCell>
<TableCell>{hiraganaTable.う}</TableCell>
<TableCell>{hiraganaTable.え}</TableCell>
<TableCell>{hiraganaTable.お}</TableCell>
</TableRow>
<TableRow>
<TableCell>か</TableCell>
<TableCell>{hiraganaTable.か}</TableCell>
<TableCell>{hiraganaTable.き}</TableCell>
<TableCell>{hiraganaTable.く}</TableCell>
<TableCell>{hiraganaTable.け}</TableCell>
<TableCell>{hiraganaTable.こ}</TableCell>
</TableRow>
<TableRow>
<TableCell>さ</TableCell>
<TableCell>{hiraganaTable.さ}</TableCell>
<TableCell>{hiraganaTable.し}</TableCell>
<TableCell>{hiraganaTable.す}</TableCell>
<TableCell>{hiraganaTable.せ}</TableCell>
<TableCell>{hiraganaTable.そ}</TableCell>
<TableCell> </TableCell>
</TableRow>
<TableRow>
<TableCell>た</TableCell>
<TableCell>{hiraganaTable.た}</TableCell>
<TableCell>{hiraganaTable.ち}</TableCell>
<TableCell>{hiraganaTable.つ}</TableCell>
<TableCell>{hiraganaTable.て}</TableCell>
<TableCell>{hiraganaTable.と}</TableCell>
</TableRow>
<TableRow>
<TableCell>な</TableCell>
<TableCell>{hiraganaTable.な}</TableCell>
<TableCell>{hiraganaTable.に}</TableCell>
<TableCell>{hiraganaTable.ぬ}</TableCell>
<TableCell>{hiraganaTable.ね}</TableCell>
<TableCell>{hiraganaTable.の}</TableCell>
</TableRow>
<TableRow>
<TableCell>は</TableCell>
<TableCell>{hiraganaTable.は}</TableCell>
<TableCell>{hiraganaTable.ひ}</TableCell>
<TableCell>{hiraganaTable.ふ}</TableCell>
<TableCell>{hiraganaTable.へ}</TableCell>
<TableCell>{hiraganaTable.ほ}</TableCell>
</TableRow>
<TableRow>
<TableCell>ま</TableCell>
<TableCell>{hiraganaTable.ま}</TableCell>
<TableCell>{hiraganaTable.み}</TableCell>
<TableCell>{hiraganaTable.む}</TableCell>
<TableCell>{hiraganaTable.め}</TableCell>
<TableCell>{hiraganaTable.も}</TableCell>
</TableRow>
<TableRow>
<TableCell>や</TableCell>
<TableCell>{hiraganaTable.や}</TableCell>
<TableCell> </TableCell>
<TableCell>{hiraganaTable.ゆ}</TableCell>
<TableCell> </TableCell>
<TableCell>{hiraganaTable.よ}</TableCell>
</TableRow>
<TableRow>
<TableCell>ら</TableCell>
<TableCell>{hiraganaTable.ら}</TableCell>
<TableCell>{hiraganaTable.り}</TableCell>
<TableCell>{hiraganaTable.る}</TableCell>
<TableCell>{hiraganaTable.れ}</TableCell>
<TableCell>{hiraganaTable.ろ}</TableCell>
</TableRow>
<TableRow>
<TableCell>わ</TableCell>
<TableCell>{hiraganaTable.わ}</TableCell>
<TableCell> </TableCell>
<TableCell>{hiraganaTable.を}</TableCell>
<TableCell> </TableCell>
<TableCell>{hiraganaTable.ん} </TableCell>
</TableRow>
</TableBody>
</Table>
</Paper>
<Paper elevation={2} sx={{ my: 2 }}>
<Typography variant="h6" component="h2" color="inherit" p={2}>
拗音の対応表
</Typography>
<Table>
<TableHead>
<TableRow>
<TableCell> </TableCell>
<TableCell>ゃ</TableCell>
<TableCell>ゅ</TableCell>
<TableCell>ょ</TableCell>
</TableRow>
</TableHead>
<TableBody>
<TableRow>
<TableCell>き</TableCell>
<TableCell>⠈⠡</TableCell>
<TableCell>⠈⠩</TableCell>
<TableCell>⠈⠪</TableCell>
</TableRow>
<TableRow>
<TableCell>し</TableCell>
<TableCell>⠈⠱</TableCell>
<TableCell>⠈⠹</TableCell>
<TableCell>⠈⠺</TableCell>
</TableRow>
<TableRow>
<TableCell>ち</TableCell>
<TableCell>⠈⠕</TableCell>
<TableCell>⠈⠝</TableCell>
<TableCell>⠈⠞</TableCell>
</TableRow>
<TableRow>
<TableCell>ひ</TableCell>
<TableCell>⠈⠥</TableCell>
<TableCell>⠈⠭</TableCell>
<TableCell>⠈⠮</TableCell>
</TableRow>
<TableRow>
<TableCell>み</TableCell>
<TableCell>⠈⠵</TableCell>
<TableCell>⠈⠽</TableCell>
<TableCell>⠈⠾</TableCell>
</TableRow>
<TableRow>
<TableCell>り</TableCell>
<TableCell>⠈⠑</TableCell>
<TableCell>⠈⠙</TableCell>
<TableCell>⠈⠚</TableCell>
</TableRow>
<TableRow>
<TableCell>ぎ</TableCell>
<TableCell>⠘⠡</TableCell>
<TableCell>⠘⠩</TableCell>
<TableCell>⠘⠪</TableCell>
</TableRow>
<TableRow>
<TableCell>じ</TableCell>
<TableCell>⠘⠱</TableCell>
<TableCell>⠘⠹</TableCell>
<TableCell>⠘⠺</TableCell>
</TableRow>
<TableRow>
<TableCell>ぢ</TableCell>
<TableCell>⠘⠕</TableCell>
<TableCell>⠘⠝</TableCell>
<TableCell>⠘⠞</TableCell>
</TableRow>
<TableRow>
<TableCell>び</TableCell>
<TableCell>⠘⠥</TableCell>
<TableCell>⠘⠭</TableCell>
<TableCell>⠘⠮</TableCell>
</TableRow>
<TableRow>
<TableCell>ぴ</TableCell>
<TableCell>⠨⠥</TableCell>
<TableCell>⠨⠭</TableCell>
<TableCell>⠨⠮</TableCell>
</TableRow>
</TableBody>
</Table>
</Paper>
<Paper elevation={2} sx={{ my: 2 }}>
<Typography variant="h6" component="h2" color="inherit" p={2}>
その他の対応表
</Typography>
<Table>
<TableHead>
<TableRow>
<TableCell>他</TableCell>
<TableCell>ん</TableCell>
<TableCell>長音</TableCell>
<TableCell>促音(っ)</TableCell>
<TableCell>濁音</TableCell>
<TableCell>半濁音</TableCell>
</TableRow>
</TableHead>
<TableBody>
<TableRow>
<TableCell>点字</TableCell>
<TableCell>⠴</TableCell>
<TableCell>⠒</TableCell>
<TableCell>⠂</TableCell>
<TableCell>⠐</TableCell>
<TableCell>⠠</TableCell>
</TableRow>
</TableBody>
</Table>
</Paper>
</Box>
</Box>
);
}
44 changes: 31 additions & 13 deletions learn/src/components/TouchMain.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
.wrapper {
background-color: white;
}
.show_chart {
/* background-color: antiquewhite; */
margin-top: auto;
margin-bottom: auto;
float: left;
Expand All @@ -10,12 +8,14 @@
}

.hide_chart {
/* background-color: aquamarine; */
float: left;
margin-top: 150px;
width: 90%;
width: 100%;
}

.question {
/* background-color: skyblue; */
padding-top: 8px;
padding-bottom: 6px;
max-width: 100%;
Expand All @@ -29,6 +29,7 @@
}

.touch_field {
/* background-color: lightcoral; */
padding-top: 8px;
padding-bottom: 6px;
max-width: 100%;
Expand All @@ -38,7 +39,7 @@
}

.judge_and_next_question {
height: 60px;
/* background-color: lightgoldenrodyellow; */
max-width: 100%;
width: 800px;
margin-left: auto;
Expand All @@ -47,26 +48,29 @@
}

.judge {
/* background-color: lightseagreen; */
flex-basis: 60%;
display: flex;
}

.judge_icon {
.right_icon {
/* background-color: lightskyblue; */
padding-left: 20px;
margin-top: auto;
margin-bottom: auto;
margin-top: none;
font-size: 60px;
}

.right_icon {
color: rgba(130, 211, 102, 1);
}

.wrong_icon {
/* background-color: lightskyblue; */
padding-left: 20px;
margin-top: none;
font-size: 60px;
color: rgba(228, 99, 99, 1);
}

.judge_text {
/* background-color: lightgray; */
padding-left: 10px;
margin-top: auto;
margin-bottom: auto;
Expand All @@ -82,6 +86,7 @@
}

.btn {
/* background-color: lightpink; */
border-radius: 0.5rem;
color: white;
border-top: none;
Expand All @@ -95,11 +100,16 @@
font-family: sans-serif;
font-size: 24px;
font-weight: bold;

margin-bottom: 10px;
margin-right: 10px;
}

.btn:hover {
margin-top: 3px;
margin-left: 3px;
margin-bottom: 7px;
margin-right: 7px;
}

.judge_btn {
Expand Down Expand Up @@ -140,8 +150,8 @@
float: left;
left: 60%;
width: 40%;
height: 600px;
overflow: auto;
height: 80vh;
overflow: scroll;
}

.hidden_chart {
Expand All @@ -158,3 +168,11 @@
position: fixed;
left: 90%;
}

/* 959px以下に適用されるCSS（タブレット用） */
@media screen and (max-width: 959px) {
.question {
/* background-color: lightsteelblue; */
font-size: 25px;
}
}
Loading