Add light theme to json, clean out chan colors from dark theme

This commit is contained in:
likho 2023-04-27 14:17:33 +02:00
parent dd213bb950
commit 29a5a98063
3 changed files with 105 additions and 129 deletions

View file

@ -1987,10 +1987,7 @@ class ThemeAssets {
final String send;
final String sendPending;
final String sendCancelled;
final String themeDark;
final String themeDarkChan;
final String chanEasy;
final String chanIncognito;
final String themePreview;
final String bitcoin;
final String litecoin;
final String bitcoincash;
@ -2028,10 +2025,7 @@ class ThemeAssets {
required this.send,
required this.sendPending,
required this.sendCancelled,
required this.themeDark,
required this.themeDarkChan,
required this.chanEasy,
required this.chanIncognito,
required this.themePreview,
required this.bitcoin,
required this.litecoin,
required this.bitcoincash,
@ -2084,14 +2078,8 @@ class ThemeAssets {
"$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["send_pending"] as String}",
sendCancelled:
"$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["send_cancelled"] as String}",
themeDark:
"$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["theme_dark"] as String}",
themeDarkChan:
"$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["theme_dark_chan"] as String}",
chanEasy:
"$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["png"]["chan_persona_easy"] as String}",
chanIncognito:
"$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["png"]["chan_persona_incognito"] as String}",
themePreview:
"$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["theme_preview"] as String}",
bitcoin:
"$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['small']["bitcoin"] as String}",
litecoin:

View file

@ -256,13 +256,7 @@ final Map<String, dynamic> darkJson = {
"send": "svg/tx-icon-send.svg",
"send_pending": "svg/tx-icon-send-pending.svg",
"send_cancelled": "svg/tx-icon-send-failed.svg",
"theme_dark": "svg/dark-theme.svg",
"theme_dark_chan": "svg/darkChansTheme.svg",
"theme_preview": "svg/dark-theme.svg",
},
"png": {
//Move these into the Chan theme
"chan_persona_easy": "images/chan-persona-easy.png",
"chan_persona_incognito": "images/chan-persona-incognito.png"
}
}
};

View file

@ -1,4 +1,4 @@
final Map<String, dynamic> darkJson = {
final Map<String, dynamic> lightJson = {
"name": "Light",
"asset_bundle_url": "",
"brightness": "light",
@ -39,34 +39,34 @@ final Map<String, dynamic> darkJson = {
},
"button_text": {
"primary": "0xFFFFFFFF",
"secondary": "0xFFFFFFFF",
"primary_disabled": "0xFFFFFFFF",
"secondary_disabled": "0xFF6A6C71",
"border": "0xFF4C86E9",
"disabled": "0xFF314265",
"borderless": "0xFF4C86E9",
"secondary": "0xFF232323",
"primary_disabled": "0xFFF8F8F8",
"secondary_disabled": "0xFFB7B7B7",
"border": "0xFF232323",
"disabled": "0xFFB6B6B6",
"borderless": "0xFF0052DF",
"borderless_disabled": "0xFFB6B6B6"
},
"switch": {
"bg_on": "0xFF4C86E9",
"bg_off": "0xFFC1D9FF",
"bg_disabled": "0xFFB5B7BA",
"circle_on": "0xFFC9DDFF",
"circle_off": "0xFFFFFFFF",
"circle_disabled": "0xFFFFFFFF"
"bg_on": "0xFF0052DF",
"bg_off": "0xFFD8E4FB",
"bg_disabled": "0xFFC5C6C9",
"circle_on": "0xFFDAE2FF",
"circle_off": "0xFFFBFCFF",
"circle_disabled": "0xFFFBFCFF"
},
"button_back_colors": {
"primary": "0xFF4C86E9",
"secondary": "0xFF444E5C",
"primary_disabled": "0xFF38517C",
"secondary_disabled": "0xFF3B3F46",
"border": "0xFF4C86E9",
"border_disabled": "0xFF314265",
"border_secondary": "0xFF444E5C",
"border_secondary_disabled": "0xFF3B3F46",
"number": "0xFF484B51",
"numpad": "0xFF4C86E9",
"nav": "0xFF3E4148",
"primary": "0xFF232323",
"secondary": "0xFFE0E3E3",
"primary_disabled": "0xFFD7D7D7",
"secondary_disabled": "0xFFF0F1F1",
"border": "0xFF232323",
"border_disabled": "0xFFB6B6B6",
"border_secondary": "0xFFE0E3E3",
"border_secondary_disabled": "0xFFF0F1F1",
"number": "0xFFFFFFFF",
"numpad": "0xFF232323",
"nav": "0xFFFFFFFF",
},
},
"overlay": "0xFF111215",
@ -79,20 +79,20 @@ final Map<String, dynamic> darkJson = {
"subtitle_five": "0xFFEEEFF1",
"subtitle_six": "0xFFF5F5F5"
},
"number_text_default": "0xFFFFFFFF",
"number_text_default": "0xFF232323",
"numpad_text_default": "0xFFFFFFFF",
"bottom_nav_text": "0xFFFFFFFF",
"custom_text_button_enabled_text": "0xFF4C86E9",
"custom_text_button_disabled_text": "0xFF9E9E9E",
"bottom_nav_text": "0xFF232323",
"custom_text_button_enabled_text": "0xFF0052DF",
"custom_text_button_disabled_text": "0xFF8E9192",
"step_indicator": {
"bg_check": "0xFF4C86E9",
"bg_number": "0xFF4C86E9",
"bg_inactive": "0xFF3B3F46",
"bg_lines": "0xFF4C86E9",
"bg_lines_inactive": "0xFF3B3F46",
"icon_text": "0xFFFFFFFF",
"icon_number": "0xFFFFFFFF",
"icon_inactive": "0xFF747474"
"bg_check": "0xFFD9E2FF",
"bg_number": "0xFFD9E2FF",
"bg_inactive": "0xFFCDCDCD",
"bg_lines": "0xFF0056D2",
"bg_lines_inactive": "0xFFCDCDCD",
"icon_text": "0xFF0056D2",
"icon_number": "0xFF0056D2",
"icon_inactive": "0xFFF7F7F7"
},
"checkbox": {
"bg_checked": "0xFF4C86E9",
@ -100,107 +100,107 @@ final Map<String, dynamic> darkJson = {
"bg_disabled": "0xFFADC7EC",
"icon_checked": "0xFFFFFFFF",
"icon_disabled": "0xFFFFFFFF",
"text_label": "0xFFFFFFFF"
"text_label": "0xFF232323"
},
"snack_bar": {
"back_success": "0xFF8EF5C3",
"back_error": "0xFFFFB4A9",
"back_info": "0xFFB4C4FF",
"text_success": "0xFF003921",
"text_error": "0xFF690001",
"text_info": "0xFF00297A"
"back_success": "0xFFB9E9D4",
"back_error": "0xFFFFDAD4",
"back_info": "0xFFDAE2FF",
"text_success": "0xFF006C4D",
"text_error": "0xFF930006",
"text_info": "0xFF002A78"
},
"icons": {
"bottom_nav_icon_back": "0xFF7F8185",
"bottom_nav_icon_icon": "0xFFFFFFFF",
"top_nav_icon_primary": "0xFFFFFFFF",
"top_nav_icon_green": "0xFF4CC0A0",
"top_nav_icon_yellow": "0xFFF7D65D",
"top_nav_icon_red": "0xFFD34E50",
"bottom_nav_icon_back": "0xFFA2A2A2",
"bottom_nav_icon_icon": "0xFF232323",
"top_nav_icon_primary": "0xFF232323",
"top_nav_icon_green": "0xFF00A578",
"top_nav_icon_yellow": "0xFFF4C517",
"top_nav_icon_red": "0xFFC00205",
"settings_icon_back": "0xFFE0E3E3",
"settings_icon_icon": "0xFF232323",
"settings_icon_back_two": "0xFF94D6C4",
"settings_icon_element": "0xFF00A578"
},
"text_field": {
"active_bg": "0xFF4C5360",
"default_bg": "0xFF444953",
"error_bg": "0xFFFFB4A9",
"success_bg": "0xFF8EF5C3",
"error_border": "0xFFFFB4A9",
"success_border": "0xFF8EF5C3",
"active_bg": "0xFFEEEFF1",
"default_bg": "0xFFEEEFF1",
"error_bg": "0xFFFFDAD4",
"success_bg": "0xFFB9E9D4",
"error_border": "0xFFFFDAD4",
"success_border": "0xFFB9E9D4",
"active_search_icon_left": "0xFFA9ACAC",
"default_search_icon_left": "0xFFA9ACAC",
"error_search_icon_left": "0xFF690001",
"success_search_icon_left": "0xFF003921",
"active_text": "0xFFFFFFFF",
"error_search_icon_left": "0xFF930006",
"success_search_icon_left": "0xFF006C4D",
"active_text": "0xFF232323",
"default_text": "0xFFA9ACAC",
"error_text": "0xFF000000",
"success_text": "0xFF000000",
"active_label": "0xFFA9ACAC",
"error_label": "0xFF690001",
"success_label": "0xFF003921",
"active_search_icon_right": "0xFFC4C7C7",
"error_label": "0xFF930006",
"success_label": "0xFF006C4D",
"active_search_icon_right": "0xFF747778",
"default_search_icon_right": "0xFF747778",
"error_search_icon_right": "0xFF690001",
"success_search_icon_right": "0xFF003921"
"error_search_icon_right": "0xFF930006",
"success_search_icon_right": "0xFF006C4D"
},
"settings_item_level_two": {
"active_bg": "0xFF484B51",
"active_text": "0xFFFFFFFF",
"active_sub": "0xFF9E9E9E"
"active_bg": "0xFFFFFFFF",
"active_text": "0xFF232323",
"active_sub": "0xFF8E9192"
},
"radio_button": {
"icon_border": "0xFF4C86E9",
"icon_border_disabled": "0xFF9E9E9E",
"border_enabled": "0xFF4C86E9",
"border_disabled": "0xFFCDCDCD",
"icon_circle": "0xFF9E9E9E",
"icon_enabled": "0xFF4C86E9",
"icon_border": "0xFF0056D2",
"icon_border_disabled": "0xFF8F909A",
"border_enabled": "0xFF0056D2",
"border_disabled": "0xFF8F909A",
"icon_circle": "0xFF0056D2",
"icon_enabled": "0xFF0056D2",
"text_enabled": "0xFF44464E",
"text_disabled": "0xFF44464E",
"label_enabled": "0xFF8E9192",
"label_disabled": "0xFF8E9192"
},
"info_text": {
"item_bg": "0xFF333942",
"item_label": "0xFF9E9E9E",
"item_text": "0xFFFFFFFF",
"item_icons": "0xFF4C86E9"
"item_bg": "0xFFFFFFFF",
"item_label": "0xFF8E9192",
"item_text": "0xFF232323",
"item_icons": "0xFF0056D2"
},
"popup_bg": "0xFF333942",
"currency_list_item_bg": "0xFF484B51",
"popup_bg": "0xFFFFFFFF",
"currency_list_item_bg": "0xFFF9F9FC",
"bottom_nav": {
"sw_bg": "0xFF35383D",
"sw_mid": "0xFF292D34",
"sw_bottom": "0xFFFFFFFF",
"sw_bg": "0xFFFFFFFF",
"sw_mid": "0xFFFFFFFF",
"sw_bottom": "0xFF232323",
"shadow": "0xFF282E33",
"splash": "0x358E9192",
"highlight": "0x44A9ACAC",
"warning_foreground": "0xFF690001",
"warning_background": "0xFFFFB4A9",
"warning_foreground": "0xFF232323",
"warning_background": "0xFFFFDAD3",
"loading_overlay_text_color": "0xFFF7F7F7",
"my_stack_contact_icon_bg": "0x88747778",
"text_confirm_total_amount": "0xFF003921",
"text_selected_word_table_iterm": "0xFF00297A"
"my_stack_contact_icon_bg": "0xFFEEEFF1",
"text_confirm_total_amount": "0xFF232323",
"text_selected_word_table_iterm": "0xFF232323"
},
"favorite_star": {"active": "0xFFF7D65D", "inactive": "0xFF969696"},
"favorite_star": {"active": "0xFF0056D2", "inactive": "0xFFC4C7C7"},
"rate_type_toggle": {
"color_on": "0xFF444953",
"color_off": "0xFF333942",
"desktop_color_on": "0xFF444953",
"desktop_color_off": "0xFF444E5C"
"color_on": "0xFFEEEFF1",
"color_off": "0xFFFFFFFF",
"desktop_color_on": "0xFFEEEFF1",
"desktop_color_off": "0xFFE0E3E3"
},
"token_view": {
"eth_tag_text": "0xFFFFFFFF",
"eth_tag_bg": "0xFF5761A2",
"eth_wallet_tag_text": "0xFFE7EBFF",
"eth_wallet_tag_bg": "0xFF414868",
"token_summary_text_primary": "0xFFFFFFFF",
"token_summary_text_secondary": "0xFFC9D0FF",
"token_summary_bg": "0xFF464C73",
"token_summary_button_bg": "0xFFC9D0FF",
"token_summary_icon": "0xFF252C78"
"eth_tag_bg": "0xFF4D5798",
"eth_wallet_tag_text": "0xFF4D5798",
"eth_wallet_tag_bg": "0xFFF0F3FD",
"token_summary_text_primary": "0xFF232323",
"token_summary_text_secondary": "0xFF8488AB",
"token_summary_bg": "0xFFE9EAFF",
"token_summary_button_bg": "0xFFFFFFFF",
"token_summary_icon": "0xFF424A97"
},
"box_shadows": {
"standard": {
@ -256,13 +256,7 @@ final Map<String, dynamic> darkJson = {
"send": "svg/tx-icon-send.svg",
"send_pending": "svg/tx-icon-send-pending.svg",
"send_cancelled": "svg/tx-icon-send-failed.svg",
"theme_dark": "svg/dark-theme.svg",
"theme_dark_chan": "svg/darkChansTheme.svg",
"theme_preview": "svg/light-mode.svg",
},
"png": {
//Move these into the Chan theme
"chan_persona_easy": "images/chan-persona-easy.png",
"chan_persona_incognito": "images/chan-persona-incognito.png"
}
}
};