Skip to content

Commit

Permalink
dark mode fix
Browse files Browse the repository at this point in the history
  • Loading branch information
pinocchio-life-like committed Apr 24, 2024
1 parent 8d8bf2d commit 500946a
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ const PlaceItem = ({ item }) => {
const { currentTheme } = useTheme();
return (
<RStack style={{ flexDirection: 'row' }}>
<RText fontWeight="400">{item.properties.name}</RText>
<RText fontWeight="400" color={currentTheme.colors.textDarkGrey}>
{item.properties.name}
</RText>
<RText
color={currentTheme.colors.textDarkGrey}
opacity={100}
Expand Down
7 changes: 6 additions & 1 deletion packages/app/components/itemtable/itemTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,19 @@ export const ItemsTable = ({
setPage(page - 1);
};

console.log('data', currentTheme.colors.background);

return (
<ScrollView>
<View
style={{
paddingVertical: 16,
flex: 1,
paddingTop: 30,
backgroundColor: '#fff',
backgroundColor:
currentTheme.colors.background === '#0284c7'
? 'white'
: currentTheme.colors.background,
marginTop: 20,
}}
>
Expand Down
15 changes: 11 additions & 4 deletions packages/app/components/pack_table/packtable.style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { FlatList, Platform, View } from 'react-native';
const isWeb = Platform.OS === 'web';
const loadStyles = (theme) => {
const { currentTheme } = theme;
console.log('currentTheme', currentTheme);
return {
container: {
flex: 1,
Expand All @@ -28,13 +29,13 @@ const loadStyles = (theme) => {
title: {
height: 50,
backgroundColor: currentTheme.colors.primary,
borderRadius: 10,
borderRadius: 2,
justifyContent: 'center',
paddingLeft: 15,
},
titleText: {
fontWeight: 'bold',
color: currentTheme.colors.text,
color: 'white',
},
head: {
height: 50,
Expand All @@ -45,15 +46,21 @@ const loadStyles = (theme) => {
},
headerText: {
fontWeight: 'bold',
color: '#000000',
color:
currentTheme.colors.background === '#1A1A1D'
? currentTheme.colors.text
: 'black',
fontSize: Platform.OS === 'web' ? 12 : 8,
},
row: {
flexDirection: 'row',
height: 60,
alignItems: 'center',
// color: currentTheme.colors.text,
backgroundColor: currentTheme.colors.white,
backgroundColor:
currentTheme.colors.background === '#1A1A1D'
? currentTheme.colors.black
: currentTheme.colors.white,
borderBottomWidth: 1,
borderBottomColor: currentTheme.colors.border,
},
Expand Down
4 changes: 3 additions & 1 deletion packages/app/components/user/UserDataCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ const UserDataCard = ({
fontWeight: 'bold',
}}
>
<RText style={{ fontSize: 16 }}>{truncatedName}</RText>
<RText style={{ fontSize: 16, color: 'black' }}>
{truncatedName}
</RText>
{state[index] ? (
<RText style={{ fontSize: 16 }}>Loading....</RText>
) : (
Expand Down
3 changes: 2 additions & 1 deletion packages/app/components/user/UserDataContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,12 @@ export default function UserDataContainer({
}}
>
<RText
color={currentTheme.colors.textColor}
// color={currentTheme.colors.black}
style={{
textTransform: 'capitalize',
fontSize: 24,
fontWeight: 'bold',
color: currentTheme.colors.textColor,
}}
>
{differentUser ? `${typeUppercase}` : `Your ${typeUppercase}`}
Expand Down

0 comments on commit 500946a

Please sign in to comment.