Add theming support

Closes #151

Author: aik099

CHANGELOG.md

@@ -4,7 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
-...
+- Added support for Terminal with a light theme. To enable specify `light` as a value of `theme` config setting in `~/.svn-buddy/config.json` file.
 
 ### Changed
 - Show executed SVN commands in real time (when started; how long was executed) in verbose mode (the `-v` flag).

src/SVNBuddy/Command/AbstractCommand.php

@@ -58,6 +58,13 @@ abstract class AbstractCommand extends BaseCommand
 	 */
 	protected $workingDirectory = null;
 
+	/**
+	 * Accent style.
+	 *
+	 * @var string
+	 */
+	protected $accentStyle;
+
 	/**
 	 * Working copy resolver.
 	 *
@@ -169,6 +176,8 @@ protected function prepareDependencies()
 		$this->workingDirectory = $container['working_directory'];
 		$this->_commandConfig = $container['command_config'];
 		$this->_updateManager = $container['update_manager'];
+
+		$this->accentStyle = $container['dark_theme'] ? 'fg=white;options=bold' : 'fg=cyan';
 	}
 
 	/**

src/SVNBuddy/Command/CommitCommand.php

@@ -183,7 +183,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 			$edited_commit_message = trim(substr($edited_commit_message, 0, $stop_line_pos));
 		}
 
-		$this->io->writeln(array('<fg=white;options=bold>Commit message:</>', $edited_commit_message, ''));
+		$this->io->writeln(array('<' . $this->accentStyle . '>Commit message:</>', $edited_commit_message, ''));
 
 		if ( !$this->io->askConfirmation('Run "svn commit"', false) ) {
 			throw new CommandException('Commit aborted by user.');
@@ -208,7 +208,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 		}
 
 		$this->repositoryConnector->getCommand('commit', $arguments)->runLive(array(
-			'/(Committed revision [\d]+\.)/' => '<fg=white;options=bold>$1</>',
+			'/(Committed revision [\d]+\.)/' => '<' . $this->accentStyle . '>$1</>',
 		));
 		$this->_workingCopyConflictTracker->erase($wc_path);
 		unlink($tmp_file);

src/SVNBuddy/Command/MergeCommand.php

@@ -673,7 +673,14 @@ protected function performMerge($source_url, $wc_path, array $revisions)
 		$revision_log = $this->getRevisionLog($source_url);
 		$revisions_data = $revision_log->getRevisionsData('summary', $revisions);
 
-		$revision_title_mask = $revision_log->getRevisionURLBuilder()->getMask('fg=white;options=bold,underscore');
+		if ( strpos($this->accentStyle, 'options') !== false ) {
+			$title_accent_style = $this->accentStyle . ',underscore';
+		}
+		else {
+			$title_accent_style = $this->accentStyle . ';options=underscore';
+		}
+
+		$revision_title_mask = $revision_log->getRevisionURLBuilder()->getMask($title_accent_style);
 
 		// Added " revision" text, when URL wasn't detected.
 		if ( strpos($revision_title_mask, '://') === false ) {
@@ -689,7 +696,7 @@ protected function performMerge($source_url, $wc_path, array $revisions)
 			$progress_bar = $this->createMergeProgressBar($used_revision_count + $index + 1, $revision_count);
 
 			// 1. Add revision link with a progress bar.
-			$merge_heading = PHP_EOL . '<fg=white;options=bold>';
+			$merge_heading = PHP_EOL . '<' . $this->accentStyle . '>';
 			$merge_heading .= '--- $1 ' . \str_replace('{revision}', $revision, $revision_title_mask);
 			$merge_heading .= " into '$2' " . $progress_bar . ':</>';
 
@@ -698,7 +705,7 @@ protected function performMerge($source_url, $wc_path, array $revisions)
 			$commit_message = wordwrap($commit_message, 68); // FIXME: Not UTF-8 safe solution.
 			$merge_heading .= PHP_EOL . $commit_message;
 			$merge_heading .= PHP_EOL;
-			$merge_heading .= PHP_EOL . '<fg=white;options=bold>Changed Paths:</>';
+			$merge_heading .= PHP_EOL . '<' . $this->accentStyle . '>Changed Paths:</>';
 
 			$command->runLive(array(
 				$wc_path => '.',

src/SVNBuddy/Container.php

@@ -93,8 +93,16 @@ public function __construct(array $values = array())
 			'repository-connector.password' => '',
 			'repository-connector.last-revision-cache-duration' => '10 minutes',
 			'update-channel' => 'stable',
+			'theme' => 'dark',
 		);
 
+		$this['dark_theme'] = function ($c) {
+			/** @var ConfigEditor $config_editor */
+			$config_editor = $c['config_editor'];
+
+			return $config_editor->get('theme', $c['config_defaults']['theme']) === 'dark';
+		};
+
 		$this->extend('output', function ($output) {
 			/** @var OutputInterface $output */
 			$output->getFormatter()->setStyle('debug', new OutputFormatterStyle('white', 'magenta'));
@@ -184,7 +192,7 @@ public function __construct(array $values = array())
 		};
 
 		$this['revision_printer'] = function ($c) {
-			return new RevisionPrinter($c['date_helper'], $c['output_helper']);
+			return new RevisionPrinter($c['date_helper'], $c['output_helper'], $c['dark_theme']);
 		};
 
 		$this['command_factory'] = function ($c) {

src/SVNBuddy/Repository/RevisionLog/RevisionPrinter.php

@@ -47,6 +47,13 @@ class RevisionPrinter
 	 */
 	private $_outputHelper;
 
+	/**
+	 * Accent style.
+	 *
+	 * @var string
+	 */
+	private $_accentStyle;
+
 	/**
 	 * Columns.
 	 *
@@ -87,11 +94,13 @@ class RevisionPrinter
 	 *
 	 * @param DateHelper   $date_helper   Date helper.
 	 * @param OutputHelper $output_helper Output helper.
+	 * @param boolean      $is_dark_theme Is dark theme.
 	 */
-	public function __construct(DateHelper $date_helper, OutputHelper $output_helper)
+	public function __construct(DateHelper $date_helper, OutputHelper $output_helper, $is_dark_theme)
 	{
 		$this->_dateHelper = $date_helper;
 		$this->_outputHelper = $output_helper;
+		$this->_accentStyle = $is_dark_theme ? 'fg=white;options=bold' : 'fg=cyan';
 
 		$this->_resetState();
 	}
@@ -302,7 +311,7 @@ public function printRevisions(RevisionLog $revision_log, array $revisions, Outp
 
 			if ( $revision === $this->_currentRevision ) {
 				foreach ( $row as $index => $cell ) {
-					$row[$index] = $this->applyStyle($cell, 'fg=white;options=bold');
+					$row[$index] = $this->applyStyle($cell, $this->_accentStyle);
 				}
 			}
 
@@ -558,11 +567,11 @@ private function _generateDetailsRowContent(
 		$details = '';
 
 		if ( $revision_url_mask ) {
-			$details .= '<fg=white;options=bold>Revision URL:</>' . PHP_EOL;
+			$details .= '<' . $this->_accentStyle . '>Revision URL:</>' . PHP_EOL;
 			$details .= str_replace('{revision}', $revision, $revision_url_mask) . PHP_EOL . PHP_EOL;
 		}
 
-		$details .= '<fg=white;options=bold>Changed Paths:</>';
+		$details .= '<' . $this->_accentStyle . '>Changed Paths:</>';
 		$path_cut_off_regexp = $this->getPathCutOffRegExp($project_path, $revisions_refs[$revision]);
 
 		foreach ( $revision_paths as $path_data ) {