[UI] Move color variables
This commit is contained in:
parent
3f3bfcb78c
commit
d6a8dd6710
4 changed files with 11 additions and 11 deletions
|
@ -6,7 +6,7 @@ import { constants } from "@metro/hoist";
|
|||
const colorModule = findByProps("SemanticColorsByThemeTable");
|
||||
|
||||
//? SemanticColor is effectively ThemeColorMap
|
||||
export const map = (colorModule?.SemanticColor ?? constants.ThemeColorMap);
|
||||
export const semanticColors = (constants.ThemeColorMap ?? colorModule?.SemanticColor);
|
||||
|
||||
//? RawColor is effectively Colors
|
||||
export const raw = (colorModule?.RawColor ?? constants.Colors);
|
||||
export const rawColors = (constants.Colors ?? colorModule?.RawColor);
|
|
@ -4,7 +4,7 @@ import { Forms, General } from "@ui/components";
|
|||
import { Plugin } from "@types";
|
||||
import { getAssetIDByName } from "@ui/assets";
|
||||
import { showToast } from "@ui/toasts";
|
||||
import { map as colorMap } from "@ui/color";
|
||||
import { semanticColors } from "@ui/color";
|
||||
import { removePlugin, startPlugin, stopPlugin, getSettings } from "@lib/plugins";
|
||||
import copyText from "@utils/copyText";
|
||||
|
||||
|
@ -17,14 +17,14 @@ const { TouchableOpacity, Image } = General;
|
|||
// TODO: These styles work weirdly. iOS has cramped text, Android with low DPI probably does too. Fix?
|
||||
const styles = stylesheet.createThemedStyleSheet({
|
||||
card: {
|
||||
backgroundColor: colorMap?.BACKGROUND_SECONDARY,
|
||||
backgroundColor: semanticColors?.BACKGROUND_SECONDARY,
|
||||
borderRadius: 5,
|
||||
marginHorizontal: 10,
|
||||
marginBottom: 10,
|
||||
},
|
||||
header: {
|
||||
padding: 0,
|
||||
backgroundColor: colorMap?.BACKGROUND_TERTIARY,
|
||||
backgroundColor: semanticColors?.BACKGROUND_TERTIARY,
|
||||
borderTopLeftRadius: 5,
|
||||
borderTopRightRadius: 5,
|
||||
},
|
||||
|
@ -36,7 +36,7 @@ const styles = stylesheet.createThemedStyleSheet({
|
|||
width: 22,
|
||||
height: 22,
|
||||
marginLeft: 5,
|
||||
tintColor: colorMap?.INTERACTIVE_NORMAL,
|
||||
tintColor: semanticColors?.INTERACTIVE_NORMAL,
|
||||
}
|
||||
})
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue