Merge pull request #133 from diogocavilha/feat/human-dracula-color-scheme

✨ Add human dracula color scheme

Author: diogocavilha

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 > Any trouble, please visit the [troubleshooting page](https://github.com/diogocavilha/fancy-git/blob/master/TROUBLESHOOTING.md)
 
+## v7.5.0
+- Add `fancygit --color-scheme-human-dracula` command to select the color scheme human dracula. (Available for theme-human).
+
+## v7.4.0
+- Add `fancygit --enable-host-name` command to show host name on prompt.
+- Add `fancygit --disable-host-name` command to hide host name on prompt.
+- Add `fancygit --enable-user-symbol` command to show user symbol on prompt (human theme).
+- Add `fancygit --disable-user-symbol` command to hide user symbol on prompt (human theme).
+
 ## v7.3.0
 - Add `fancygit --enable-bold-prompt` command to show prompt in bold font.
 - Add `fancygit --disable-bold-prompt` command to show prompt in regular font.

color_schemes/human_dracula

@@ -0,0 +1,38 @@
+# Use color values in the range [0-255] for 256 bit colors.
+# Themes will handle the color values properly.
+# You can check how that works here: https://misc.flogisoft.com/bash/tip_colors_and_formatting
+
+# Blank variables are not used. They are assigned to blank because when we switch
+# between themes all colors must be reset.
+
+# TIME
+FANCYGIT_COLOR_SCHEME_TIME_BACKGROUND=""
+FANCYGIT_COLOR_SCHEME_TIME_FOREGROUND="201"
+
+# USER AT HOST
+FANCYGIT_COLOR_SCHEME_USER_AT_HOST_BACKGROUND=""
+FANCYGIT_COLOR_SCHEME_USER_FOREGROUND="221"
+FANCYGIT_COLOR_SCHEME_AT_FOREGROUND="250"
+FANCYGIT_COLOR_SCHEME_HOST_FOREGROUND="177"
+
+# USER SYMBOL
+FANCYGIT_COLOR_SCHEME_USER_SYMBOL_BACKGROUND=""
+FANCYGIT_COLOR_SCHEME_USER_SYMBOL_FOREGROUND="231"
+
+# PATH
+FANCYGIT_COLOR_SCHEME_WORKDIR_BACKGROUND=""
+FANCYGIT_COLOR_SCHEME_WORKDIR_FOREGROUND="81"
+
+# BRANCH
+FANCYGIT_COLOR_SCHEME_BRANCH_BACKGROUND=""
+FANCYGIT_COLOR_SCHEME_BRANCH_FOREROUND="190"
+
+# BRANCH WITH STAGED FILES
+FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_BACKGROUND=""
+FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_FOREGROUND="220"
+
+# BRANCH WITH CHANGED FILES
+FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_BACKGROUND=""
+FANCYGIT_COLOR_SCHEME_BRANCH_CHANGED_FILES_FOREGROUND="202"
+
+FANCYGIT_COLOR_SCHEME_PREPOSITION_FOREGROUND="250"

commands-handler.sh

@@ -68,6 +68,7 @@ case "$1" in
     # Color schemes.
     "--color-scheme-simple") fancygit_theme_color_scheme_set "simple_simple";;
     "--color-scheme-human") fancygit_theme_color_scheme_set "human_human";;
+    "--color-scheme-human-dracula") fancygit_theme_color_scheme_set "human_dracula";;
     "--color-scheme-default") fancygit_theme_color_scheme_set "default_default";;
     "--color-scheme-dracula") fancygit_theme_color_scheme_set "default_dracula";;
     "--color-scheme-batman") fancygit_theme_color_scheme_set "default_batman";;

fancygit-completion

@@ -48,6 +48,7 @@ _fancygit() {
         --theme-simple \
         --color-scheme-simple \
         --color-scheme-human \
+        --color-scheme-human-dracula \
         --color-scheme-default \
         --color-scheme-dracula \
         --color-scheme-batman \

help.sh

@@ -46,6 +46,7 @@ THEME COMMANDS:
 COLOR SCHEME COMMANDS:
    fancygit --color-scheme-simple                 Available for theme-simple.
    fancygit --color-scheme-human                  Available for theme-human.
+   fancygit --color-scheme-human-dracula          Available for theme-human.
    fancygit --color-scheme-default                Available for theme-default.
    fancygit --color-scheme-dracula                Available for theme-default.
    fancygit --color-scheme-batman                 Available for theme-default.

themes/human.sh

@@ -27,6 +27,7 @@ fancygit_theme_builder() {
     local user_color_font_tag="\\[\\e[38;5;${FANCYGIT_COLOR_SCHEME_USER_FOREGROUND}m\\]"
     local host_color_font_tag="\\[\\e[38;5;${FANCYGIT_COLOR_SCHEME_HOST_FOREGROUND}m\\]"
     local at_color_font_tag="\\[\\e[38;5;${FANCYGIT_COLOR_SCHEME_AT_FOREGROUND}m\\]"
+    local preposition_color="\\[\\e[38;5;${FANCYGIT_COLOR_SCHEME_PREPOSITION_FOREGROUND}m\\]"
     local user_symbol_color_font_tag="\\[\\e[38;5;${FANCYGIT_COLOR_SCHEME_USER_SYMBOL_FOREGROUND}m\\]"
     local workdir_color_font_tag="\\[\\e[38;5;${FANCYGIT_COLOR_SCHEME_WORKDIR_FOREGROUND}m\\]"
     local branch_color_staged_files_font_tag="\\[\\e[38;5;${FANCYGIT_COLOR_SCHEME_BRANCH_STAGED_FILES_FOREGROUND}m\\]"
@@ -113,7 +114,7 @@ fancygit_theme_builder() {
 
     if fancygit_config_is "show_host_prompt" "false"
     then
-        prompt_user_at_host="${user}${user_name}${color_reset} in "
+        prompt_user_at_host="${user}${user_name}${color_reset}${preposition_color} in "
     fi
 
     if fancygit_config_is "bold_prompt" "true"
@@ -134,7 +135,7 @@ fancygit_theme_builder() {
     then
         prompt_path="${path_git}${path_sign}${path_end}"
         prompt_branch="${branch}${branch_name}${branch_end}"
-        PS1="${prompt_time}${prompt_user_at_host}${prompt_path}${venv_name} on ${prompt_branch} $(fancygit_get_notification_area "$is_rich_notification")"
+        PS1="${prompt_time}${prompt_user_at_host}${prompt_path}${venv_name}${preposition_color} on ${prompt_branch} $(fancygit_get_notification_area "$is_rich_notification")"
         PS1="${bold_prompt}${PS1}${prompt_symbol}${is_double_line}${normal_prompt} "
         return
     fi