fastlane-plugin-polidea 3.0.0.pre.1 → 3.0.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e49b978d0f9ccc23f99bed241bf7c23c4a02a5742b8ef3497388268c267e245
-  data.tar.gz: 0b2a0731c0a81b86e32a37b46444f9d79f55758e86bb3b00e4c68f453dc2e83a
+  metadata.gz: 317d3aa45968f0355417ab13df0a4da7049597e819c77972b1021e30ee7ef0d9
+  data.tar.gz: 23e604adeb790bdd1adfc74712b49818302beb1286da7dbdf6ea8332b7bf05fd
 SHA512:
-  metadata.gz: 8efd5143e60704460f492e8c55fea1130005d20f4f57a1c1019155eed99d43f9d5e33096e59234bca9d3226106f801cc488aa45ed0b122e9f108b95d70baeaad
-  data.tar.gz: 47028dd656853ddebf7dc589a8bcfbd69f7f49603a1f65a8eeef6bf697aae41388178709a801750d8920820392b2ee8697ef077c982cfb32a3149db84c3616ee
+  metadata.gz: d6ea02463c20ddd33fc9632cb4d7b8885be1a5d270107b83d4a39c8b59823f044c894925ea97a12a12f2d5597ee3a8211ad03a15571a5d5f5aff82b4ec209cc0
+  data.tar.gz: 765387f1eb7e99316a021a741d524783bf69f943e1d2e92058ac86b4f3b9f3102d8906baa53e45398699958ba0c87429eafd903339eeb2a1a2545ad6e1f6b013

data/lib/fastlane/plugin/polidea/actions/fota_mail.rb

@@ -118,7 +118,7 @@ module Fastlane
 
       def self.qr_code(installation_link)
         qr_code_path = "/tmp/qr_code.png"
-        QRGenerator.new(installation_link, false, ::ChunkyPNG::Color.rgb(21, 18, 126)).generate(qr_code_path)
+        QRGenerator.new(installation_link, ::ChunkyPNG::Color.rgb(21, 18, 126)).generate(qr_code_path)
         File.new(qr_code_path)
       end
 

data/lib/fastlane/plugin/polidea/helper/page_generator.rb

@@ -2,6 +2,8 @@ require 'json'
 
 module Fastlane
   module PageGenerator
+    PLACEHOLDER_URL = "https://s3.eu-central-1.amazonaws.com/fota.polidea.com/mails/images/icon-placeholder.jpg"
+
     def self.mail(config)
       UI.message("Generating e-mail...")
       eth = Fastlane::ErbTemplateHelper
@@ -12,7 +14,7 @@ module Fastlane
         author: config[:author],
         last_commit: config[:last_commit],
         is_android: config[:is_android],
-        app_icon: app_icon_or_placholder(config[:app_icon]),
+        app_icon: mail_app_icon_or_placholder(config[:app_icon]),
         app_name: config[:app_name],
         app_version: config[:app_version],
         build_number: config[:build_number],
@@ -56,13 +58,22 @@ module Fastlane
     end
     private_class_method :parse_release_notes
 
-    def self.app_icon_or_placholder(app_icon)
+    def self.mail_app_icon_or_placholder(app_icon)
       if app_icon.nil?
-        "https://s3.eu-central-1.amazonaws.com/fota.polidea.com/mails/images/icon-placeholder.jpg"
+        PLACEHOLDER_URL
       else
         "cid:#{app_icon}"
       end
     end
+    private_class_method :mail_app_icon_or_placholder
+
+    def self.app_icon_or_placholder(app_icon)
+      if app_icon.nil?
+        PLACEHOLDER_URL
+      else
+        app_icon
+      end
+    end
     private_class_method :app_icon_or_placholder
   end
 end

data/lib/fastlane/plugin/polidea/helper/qr_generator.rb

@@ -2,34 +2,22 @@ require 'rqrcode_png'
 
 module Fastlane
   class QRGenerator
-    def initialize(data, auto_awesome = false, dark_color = ::ChunkyPNG::Color::BLACK)
+    def initialize(data, dark_color = ::ChunkyPNG::Color::BLACK)
       @qr_code = RQRCode::QRCode.new(data, size: 10, level: :m)
-      @auto_awesome = auto_awesome
       @dark_color = dark_color
+      @light_color = ::ChunkyPNG::Color::WHITE
 
       @margin = 20
-      @image = ::ChunkyPNG::Image.new(2 * @margin + @qr_code.qrcode.module_count * 5, 2 * @margin + @qr_code.qrcode.module_count * 5, ::ChunkyPNG::Color::WHITE)
-
-      @logo = ::ChunkyPNG::Image.from_file("#{path_to_resources}/polidea-logo.png")
-      @logo = @logo.resize(2 * @margin + @qr_code.qrcode.module_count * 5, 2 * @margin + @qr_code.qrcode.module_count * 5)
+      @image = ::ChunkyPNG::Image.new(2 * @margin + @qr_code.qrcode.module_count * 5, 2 * @margin + @qr_code.qrcode.module_count * 5, @light_color)
     end
 
     def generate(path)
-      white = ::ChunkyPNG::Color::WHITE
-      blue = ::ChunkyPNG::Color.rgb(26, 159, 217)
-
-      if !@auto_awesome
-        dark_color = @dark_color
-      else
-        dark_color = blue
-      end
-
       @qr_code.modules.each_index do |row|
         @qr_code.modules[row].each_index do |column|
           if @qr_code.modules[row][column]
-            print_symbol(dark_color, column, row, (column < 8 && row < 8) || (column < 8 && row >= @qr_code.qrcode.module_count - 8) || (column >= @qr_code.qrcode.module_count - 8 && row < 8))
+            print_symbol(@dark_color, column, row, (column < 8 && row < 8) || (column < 8 && row >= @qr_code.qrcode.module_count - 8) || (column >= @qr_code.qrcode.module_count - 8 && row < 8))
           else
-            print_symbol(white, column, row, (column < 8 && row < 8) || (column < 8 && row >= @qr_code.qrcode.module_count - 8) || (column >= @qr_code.qrcode.module_count - 8 && row < 8))
+            print_symbol(@light_color, column, row, (column < 8 && row < 8) || (column < 8 && row >= @qr_code.qrcode.module_count - 8) || (column >= @qr_code.qrcode.module_count - 8 && row < 8))
           end
         end
       end
@@ -40,37 +28,14 @@ module Fastlane
 
     def print_symbol(color, column, row, interpolate)
       (0..4).each do |i|
-        if i < 4 && i > 0
-          print_symbol_row(interpolated_color(color, 5 * column + i, 5 * row, true), 5 * column + i, row, interpolate)
-        else
-          print_symbol_row(interpolated_color(color, 5 * column + i, 5 * row, interpolate), 5 * column + i, row, interpolate)
-        end
+        print_symbol_row(color, 5 * column + i, row, interpolate)
       end
     end
 
-    def interpolated_color(color, column, row, interpolate)
-      if !@auto_awesome
-        interpolated_color = color
-      elsif interpolate
-        interpolated_color = ::ChunkyPNG::Color.interpolate_quick(color, @logo[@margin + column, @margin + row], 255)
-      else
-        interpolated_color = ::ChunkyPNG::Color.interpolate_quick(color, @logo[@margin + column, @margin + row], 40)
-      end
-      interpolated_color
-    end
-
     def print_symbol_row(color, column, row, interpolate)
       (0..4).each do |i|
-        if i < 4 && i > 0
-          @image[@margin + column, @margin + 5 * row + i] = interpolated_color(color, column, 5 * row + i, true)
-        else
-          @image[@margin + column, @margin + 5 * row + i] = interpolated_color(color, column, 5 * row + i, interpolate)
-        end
+        @image[@margin + column, @margin + 5 * row + i] = color
       end
     end
-
-    def path_to_resources
-      File.expand_path("templates/images", Polidea.root)
-    end
   end
 end

data/lib/fastlane/plugin/polidea/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Polidea
-    VERSION = "3.0.0.pre.1"
+    VERSION = "3.0.0.pre.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-polidea
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.1
+  version: 3.0.0.pre.2
 platform: ruby
 authors:
 - Piotrek Dubiel