Skip to content

Commit

Permalink
fix: daily-term-box qa
Browse files Browse the repository at this point in the history
  • Loading branch information
Jun99uu committed Oct 12, 2023
1 parent 21538f6 commit a18b40c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions TERMTERM/src/components/common/Bookmark.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const BookmarkButtonComponent = ({ fill, ...props }: Props) => {

return (
<BookmarkWrapper
style={{ backgroundColor: mode ? "#e2e2e279" : "#2c2c2c7a" }}
style={{ backgroundColor: mode ? "#e2e2e279" : "#00000058" }}
{...props}
>
{fill ? (
Expand All @@ -58,7 +58,7 @@ export const BookmarkButtonComponent = ({ fill, ...props }: Props) => {
<Ionicons
name="ios-bookmark-outline"
size={22}
color={mode ? "white" : " #DEE0E2"}
color={mode ? "white" : "#DEE0E2"}
/>
)}
</BookmarkWrapper>
Expand Down
12 changes: 9 additions & 3 deletions TERMTERM/src/components/home/DailyTermBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import { useWordReg } from "@hooks/useWordReg";
import { RootStackParamList } from "@interfaces/RootStackParamList";
import { useNavigation } from "@react-navigation/native";
import { StackNavigationProp } from "@react-navigation/stack";
import { TEXT_STYLES, colorTheme, TYPO_STYLE } from "@style/designSystem";
import { colorTheme, TYPO_STYLE } from "@style/designSystem";
import { booleanConverter } from "@utils/booleanConverter";
import { truncateString } from "@utils/wordCutter";
import styled from "styled-components/native";
import styled, { css } from "styled-components/native";

/**
* 오늘의 용어 박스
Expand All @@ -25,6 +25,8 @@ const DailyTermBox = ({ bookmarked, id, name, description }: Preview) => {

return (
<Container
COLOR={COLOR}
mode={mode}
style={{ borderWidth: 1, borderColor: COLOR.Background.onSurface }}
onPress={() => navigation.push("TermDetail", { id: `${id}` })}
>
Expand Down Expand Up @@ -54,10 +56,14 @@ const DailyTermBox = ({ bookmarked, id, name, description }: Preview) => {
);
};

const Container = styled.TouchableOpacity`
const Container = styled.TouchableOpacity<{ COLOR: colorTheme; mode: boolean }>`
min-width: 165px;
width: 49%;
height: 205px;
background-color: ${(props) =>
props.mode
? props.COLOR.Background.surface
: props.COLOR.Background.onSurface};
border-radius: 10px;
display: flex;
flex-direction: column;
Expand Down

0 comments on commit a18b40c

Please sign in to comment.