ruby-macrodroid 0.8.4 → 0.8.10

data/lib/ruby-macrodroid/triggers.rb

@@ -50,6 +50,19 @@ class Trigger < MacroObject
     detail.select {|k,v| @h.include? k }.all? {|key,value| @h[key] == value}
 
   end
+  
+  def to_s(colour: false)
+
+    h = @h.clone    
+    h.delete :macro
+    @s ||= "#<%s %s>" % [self.class, h.inspect]
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    constraints = @constraints.map \
+        {|x| 'c: ' + x.to_summary(colour: colour, indent: 1)}.join(" %s " % operator)
+    
+    @constraints.any? ? @s + "\n" + constraints : @s
+    
+  end  
 
 end
 
@@ -134,7 +147,9 @@ class ApplicationLaunchedTrigger < Trigger
   end
 
   def to_s(colour: false)
-    'ApplicationLaunchedTrigger ' + @h.inspect
+    a = @h[:application_name_list]
+    apps = a.length > 1 ? "[%s]" % a.join(', ')  : a.first
+    'Application Launched' + "\n  " + apps
   end
 
   alias to_summary to_s
@@ -966,10 +981,17 @@ class MusicPlayingTrigger < DeviceEventsTrigger
   end
 
   def to_s(colour: false)
-    'MusicPlayingTrigger ' + @h.inspect
+    
+    event = @h[:option] == 0 ? 'Started' : 'Stopped'
+    @s = 'Music/Sound Playing' + "\n  %s" % event #+ @h.inspect
+    super()
+    
   end
 
-  alias to_summary to_s
+  def to_summary(colour: false)
+    event = @h[:option] == 0 ? 'Started' : 'Stopped'
+    @s = 'Music/Sound Playing' + " (%s)" % event #+ @h.inspect    
+  end
 end
 
 
@@ -1130,7 +1152,7 @@ class NotificationTrigger < DeviceEventsTrigger
 
   def to_s(colour: false)
     s = (@h[:package_name_list] + @h[:application_name_list]).uniq.join(', ')
-    'Notification Received ' + "\n    Any Content (%s)" % s
+    'Notification Received ' + "\n  Any Content (%s)" % s
   end
 
   alias to_summary to_s
@@ -1377,7 +1399,8 @@ class ProximityTrigger < SensorsTrigger
       'Far'
     end
     
-    "Proximity Sensor (%s)" % distance
+    @s = "Proximity Sensor (%s)" % distance
+    super()
   end
   
   alias to_summary to_s
@@ -1404,6 +1427,10 @@ class ShakeDeviceTrigger < SensorsTrigger
   def to_s(colour: false)
     'Shake Device'
   end
+  
+  def to_summary(colour: false)
+    'Shake Device'
+  end  
 
 end
 
@@ -1602,3 +1629,34 @@ class SwipeTrigger < Trigger
 
   alias to_summary to_s
 end
+
+
+
+
+# Category: User Input
+#
+class WidgetPressedTrigger < Trigger
+
+  def initialize(h={})
+
+    options = {
+      :swipe_start_area=>0, :swipe_motion=>0, :cleared=>true, 
+      :image_id=>2130968576, :image_package_name=>"com.android.providers.settings",
+      :image_resource_name=>"com.android.providers.settings", :widget_label=>"", 
+      :widget_type=>4
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s(colour: false)
+    # 4 == cutom , 0 = green, 1 = blue, 2 = red, 3 = yellow
+    style = %w(Green Blue Red Yellow Custom)[@h[:widget_type]]
+    @s = "Widget Button (%s)" % [style] #+ @h.inspect
+    super()
+  end
+
+  alias to_summary to_s
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.10
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw
@@ -186,6 +186,7 @@ files:
 - lib/ruby-macrodroid.rb
 - lib/ruby-macrodroid/actions.rb
 - lib/ruby-macrodroid/base.rb
+- lib/ruby-macrodroid/macro.rb
 - lib/ruby-macrodroid/triggers.rb
 homepage: https://github.com/jrobertson/ruby-macrodroid
 licenses: