Add few backgrounds and fonts

owaiswiz · Nov 30, 2019 · 635b787 · 635b787
1 parent 94b7711
commit 635b787
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 5 deletions.
diff --git a/lib/assets/backgrounds/1.jpeg b/lib/assets/backgrounds/1.jpeg
diff --git a/lib/assets/backgrounds/2.jpeg b/lib/assets/backgrounds/2.jpeg
diff --git a/lib/assets/backgrounds/3.jpeg b/lib/assets/backgrounds/3.jpeg
diff --git a/lib/assets/backgrounds/4.jpeg b/lib/assets/backgrounds/4.jpeg
diff --git a/lib/assets/backgrounds/5.jpeg b/lib/assets/backgrounds/5.jpeg
diff --git a/lib/assets/fonts/CANDY.TTF b/lib/assets/fonts/CANDY.TTF
diff --git a/lib/assets/fonts/PlatonickNF.ttf b/lib/assets/fonts/PlatonickNF.ttf
diff --git a/lib/assets/fonts/UndergroundNF.ttf b/lib/assets/fonts/UndergroundNF.ttf
diff --git a/lib/assets/fonts/nauvo___.ttf b/lib/assets/fonts/nauvo___.ttf
diff --git a/lib/kawaii_text/generator.rb b/lib/kawaii_text/generator.rb
@@ -8,16 +8,16 @@ class Generator
     PRIMARY_TEXT_LAYER_FILENAME = "primary"
     OFFSET_TEXT_LAYER_FILENAME = "offset"
     MERGED_TEXT_LAYER_FILENAME = "merged"
-    FINAL_OUTUT_FILENAME = "output"
 
-    def initialize text:, font_path: nil, backgrounds_folder: nil, background_filepath: nil, supported_formats: nil, working_directory: nil, primary_text_layer_config: nil, offset_text_layer_config: nil
+    def initialize text:, font_path: nil, backgrounds_folder: nil, background_filepath: nil, supported_formats: nil, working_directory: nil, primary_text_layer_config: nil, offset_text_layer_config: nil, output_file_name: nil
       @text = text
       @font_path = font_path || get_random_font_from_fonts_folder
       @backgrounds_folder = backgrounds_folder || KawaiiText.backgrounds_dir
       @background_filepath = background_filepath
       @working_directory = working_directory
       @supported_formats = supported_formats || SUPPORTED_BACKGROUND_FILEFORMATS
-      @working_directory = working_directory || "live_image_preview"
+      @working_directory = working_directory || "."
+      @output_file_name = output_file_name || "output"
 
       @primary_text_layer_config = primary_text_layer_config || PrimaryTextLayerConfig.default
       @offset_text_layer_config = offset_text_layer_config || OffsetTextLayerConfig.default
@@ -42,7 +42,7 @@ def get_random_background_from_backgrounds_folder
     end
 
     def get_random_font_from_fonts_folder
-      fonts = Dir["#{KawaiiText.fonts_dir}/**/**.ttf"]
+      fonts = Dir["#{KawaiiText.fonts_dir}/**/**.{ttf,TTF}"]
       fonts.sample
     end
 
@@ -84,7 +84,7 @@ def merge_text_layers
     def merge_text_and_background_layers
       file_1_path = "#{@working_directory}/#{MERGED_TEXT_LAYER_FILENAME}.png" 
       file_2_path = @background_filepath
-      file_output_path = "#{@working_directory}/#{FINAL_OUTUT_FILENAME}.png"
+      file_output_path = "#{@working_directory}/#{@output_file_name}.png"
       merge_images file_1_path: file_1_path, file_2_path: file_2_path, file_output_path: file_output_path
     end