Merge pull request #30 from Aloso/dev

Align square with text vertically

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+- Align square vertically with text
+
 ## [0.3.0] - 2020-11-04
 
 This release completely revamped the command line options, now using subcommands (see [`#21`](https://github.com/Aloso/colo/pull/21)):

src/main.rs

@@ -56,6 +56,7 @@ fn main() -> Result<()> {
                 size,
             } = cli::get_show(&matches)?;
 
+            println!();
             for (color, input) in colors {
                 show_color::show(color, input, output, size)?;
             }

src/show_color.rs

@@ -115,6 +115,7 @@ where
         }
         writeln!(stdout)?;
     }
+    writeln!(stdout)?;
     Ok(())
 }
 
@@ -158,28 +159,14 @@ pub fn show_text(
 
 /// Generates an ASCII square with the given size
 fn make_square(size: u32) -> String {
-    if size == 0 {
-        return String::new();
-    }
-
-    let mut s = String::from(" ");
+    let mut s = String::new();
     for _ in 0..size {
-        s.push('▄');
-        s.push('▄');
-    }
-    s.push('\n');
-    s.push(' ');
-    for _ in 0..size - 1 {
+        s.push(' ');
         for _ in 0..size {
             s.push('█');
             s.push('█');
         }
         s.push('\n');
-        s.push(' ');
-    }
-    for _ in 0..size {
-        s.push('▀');
-        s.push('▀');
     }
     s
 }