Skip to content
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

Jump to bottom

Light Color Tweak, SimpleTableView tweaks #503

Merged
merged 2 commits into from
Jul 8, 2023
Merged

Light Color Tweak, SimpleTableView tweaks #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a54bc9
light color tweak and messing with the tables
sgriff96 Jul 8, 2023
edccef2
Merge branch 'main' into sgriff96/light-theme-fix
sgriff96 Jul 8, 2023
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
2 changes: 1 addition & 1 deletion src/components/common/Table/MTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function MTable({ header, children }: IProps) {
p={3}
borderRadius={10}
space={3}
divider={<Divider height={0.4} />}
divider={<Divider backgroundColor={theme.colors.app.border} />}
>
{children}
</VStack>
Expand Down
21 changes: 21 additions & 0 deletions src/components/screens/Settings/About/AboutScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ function AboutScreen({
cellStyle="RightDetail"
title="Version"
detail={`${getVersion()} (${getBuildNumber()})`}
backgroundColor={theme.colors.app.fg}
titleTextColor={theme.colors.app.textPrimary}
rightDetailColor={theme.colors.app.textSecondary}
/>
<CCell
cellStyle="Basic"
Expand All @@ -38,6 +41,9 @@ function AboutScreen({
type: "license",
})
}
backgroundColor={theme.colors.app.fg}
titleTextColor={theme.colors.app.textPrimary}
rightDetailColor={theme.colors.app.textSecondary}
/>
<CCell
cellStyle="Basic"
Expand All @@ -48,6 +54,9 @@ function AboutScreen({
type: "acknowledgements",
});
}}
backgroundColor={theme.colors.app.fg}
titleTextColor={theme.colors.app.textPrimary}
rightDetailColor={theme.colors.app.textSecondary}
/>
<CCell
cellStyle="Basic"
Expand All @@ -56,6 +65,9 @@ function AboutScreen({
onPress={() => {
WebBrowser.openBrowserAsync("https://memmy.app/privacy.txt");
}}
backgroundColor={theme.colors.app.fg}
titleTextColor={theme.colors.app.textPrimary}
rightDetailColor={theme.colors.app.textSecondary}
/>
<CCell
cellStyle="Basic"
Expand All @@ -66,6 +78,9 @@ function AboutScreen({
type: "terms",
});
}}
backgroundColor={theme.colors.app.fg}
titleTextColor={theme.colors.app.textPrimary}
rightDetailColor={theme.colors.app.textSecondary}
/>
<CCell
cellStyle="Basic"
Expand All @@ -74,11 +89,17 @@ function AboutScreen({
onPress={() => {
WebBrowser.openBrowserAsync("https://github.com/gkasdorf/memmy");
}}
backgroundColor={theme.colors.app.fg}
titleTextColor={theme.colors.app.textPrimary}
rightDetailColor={theme.colors.app.textSecondary}
/>
<CCell
cellStyle="Basic"
title="Delete Account"
accessory="DisclosureIndicator"
backgroundColor={theme.colors.app.fg}
titleTextColor={theme.colors.app.textPrimary}
rightDetailColor={theme.colors.app.textSecondary}
onPress={() => {
Alert.alert(
"Delete Account",
Expand Down
6 changes: 6 additions & 0 deletions src/components/screens/Settings/Account/ViewAccountsScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,18 @@ function ViewAccountsScreen({ navigation }: ViewAccountsScreenProps) {
cellStyle="Basic"
title="Edit Account"
accessory="DisclosureIndicator"
backgroundColor={theme.colors.app.fg}
titleTextColor={theme.colors.app.textPrimary}
rightDetailColor={theme.colors.app.textSecondary}
onPress={() => onAccountPress(a)}
/>
{accounts.length > 1 && (
<CCell
cellStyle="Basic"
title="Delete Account"
backgroundColor={theme.colors.app.fg}
titleTextColor={theme.colors.app.textPrimary}
rightDetailColor={theme.colors.app.textSecondary}
accessory="DisclosureIndicator"
onPress={() => onAccountDeletePress(a)}
/>
Expand Down
3 changes: 3 additions & 0 deletions src/components/screens/Settings/Content/ContentScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,9 @@ function ContentScreen({
/>
<CCell
title="Mark Post Read On..."
backgroundColor={theme.colors.app.fg}
titleTextColor={theme.colors.app.textPrimary}
rightDetailColor={theme.colors.app.textSecondary}
accessory="DisclosureIndicator"
onPress={() => navigation.push("ReadSettings")}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/theme/lightColors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const lightThemeColors: IColors = {
accentHighlight: "#E7F2FF",

textPrimary: "#393939",
textSecondary: "#979BA2",
textSecondary: "#5C5F63",

fg: "#FFFFFF",
bg: "#F2F2F2",
Expand Down