ruby-macrodroid 0.9.16 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9789db9405136e821003060f52912072c11665303ab25a714c93d5dac058d8f
-  data.tar.gz: 7878f4f2c52b3450e2485e5b993cfe275269e88e125da647f89ddf73610c504e
+  metadata.gz: d2a2688ed5b9d38f47749aa2f3e2d08002d7250d2690189f6034dec81b5d2ee5
+  data.tar.gz: 95d917dc64a5322caeacd5abd64f2b1cb9013e34908536860424f9cc47de6d1f
 SHA512:
-  metadata.gz: 6a2f574bc7692cba9cf2cc31228c5c4e6cd4aa78de0bb3a73c5e73c1458fd6cdc0798ac31aebd9e1833738ce700819257a02242c13ed2c5bc91f4e977d171e27
-  data.tar.gz: ce58d73abe7f2583bd50a7c6fa0fda42c9aa2a0cf14b9fc370c066dad69fcb8263332f685da3f14aee447180fbfcd9cd5a25a59b81853748114e58e420c6f74c
+  metadata.gz: '0765669d573b157239bdb0ecfde3f34f1717160976e38e870fa1d20b105af0e5919370812e16e81232cb627bf32b2b833a732cf8ec4647ab2445e9aba0767014'
+  data.tar.gz: e1317255ded299969e64fef30d7f67b8706c1163202b032e190969f275b23524fa5ad81a1481eefc3c786153cd00a04d409a414316d3022674ae6e9fa5b7514a

data/lib/ruby-macrodroid/actions.rb

@@ -100,19 +100,28 @@ class LaunchActivityAction < ApplicationAction
 
   def initialize(h={})
 
+    # option 0 is by application name, 1 is launch by package name
+    #
     options = {
       application_name: 'Chrome',
       package_to_launch: 'com.android.chrome',
       exclude_from_recents: false,
-      start_new: false
+      start_new: false,
+      option: 0,
+      launch_by_package_name: ''
     }
 
     super(options.merge h)
+    
+    @list = %w(option launchByPackageName)
 
   end
   
   def to_s(colour: false, indent: 0)
-    'Launch ' + @h[:application_name]
+    option = @h[:option] == 0 ? @h[:application_name] : \
+        @h[:launch_by_package_name]
+    @s = 'Launch ' + option
+    super()
   end
 
 end
@@ -404,6 +413,61 @@ class TakePictureAction < CameraAction
 end
 
 
+class TakeScreenshotAction < CameraAction
+
+  def initialize(obj=nil)
+    
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      
+      e, macro = obj      
+      
+      a = [
+        'Save to device', 
+        'Send via email', 
+        'Share via intent'
+      ]
+      
+      s = e.text('item/description').to_s
+      index = a.map(&:downcase).index s.downcase
+    
+      {option: index}
+      
+    end 
+    
+    options = {
+      option: 0, 
+      use_smtp_email: false, 
+      mechanism_option: 0, 
+      save_to_jpeg: false
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s(colour: false, indent: 0)
+    
+    @s = 'Take Screenshot' #+ @h.inspect
+    
+    options = [
+      'Save to device', 
+      'Send via email', 
+      'Share via intent'
+    ]
+    
+    option = options[@h[:option]]
+    
+    @s += "\n" + option
+    super()
+    
+  end
+
+  alias to_summary to_s
+end
+
+
 # Conditions/Loops
 #
 class IfConfirmedThenAction < Action
@@ -1084,7 +1148,7 @@ class UIInteractionAction < DeviceAction
       e, macro = obj
       s = e.text('item/description').to_s
       
-      r = s.match(/^(Click|Long Click) \[([^\]]+)/)
+      r = s.match(/^(Click|Long Click) \[(.*)\]$/)
 
       # [Current focus] # Current focus
       # [0,0] # x,y location
@@ -1092,10 +1156,11 @@ class UIInteractionAction < DeviceAction
       # [fooo] # Text content
 
       h = {
-        ui_interaction_configuration: {}, :xy_point=>{:x=>0, :y=>0}, 
-        :type=>"Click"
+        ui_interaction_configuration: {
+                                       :xy_point=>{:x=>0, :y=>0},
+                                       :type=>"Click"} 
       }
-      h2 = {}
+      h2 = h[:ui_interaction_configuration]
 
       if r then
 
@@ -1105,7 +1170,7 @@ class UIInteractionAction < DeviceAction
         h2[:long_click] = false if click.downcase.to_sym == :click
 
         if detail == 'Current focus' then          
-          h2[:click_option] = 1
+          h2[:click_option] = 0
         elsif detail =~ /\d+,\d+/
           # to-do   
         else
@@ -1114,7 +1179,7 @@ class UIInteractionAction < DeviceAction
           h2[:text_content] = detail
         end
         
-        h[:ui_interaction_configuration] = h2
+        #h[:ui_interaction_configuration] = h2
       end
 
     end   
@@ -1126,6 +1191,8 @@ class UIInteractionAction < DeviceAction
 
 
     super(options.merge h) 
+    
+    @list = %w(uiInteractionConfiguration action xyPoint textContent  clickOption type longClick)
 
   end
 
@@ -1165,7 +1232,8 @@ class UIInteractionAction < DeviceAction
       "Gesture [%s]" % detail
     end
     
-    'UI Interaction' + "\n  " + s + ' ' + @h.inspect
+    @s = 'UI Interaction' + "\n" + s #+ ' ' + @h.inspect
+    super()
   end
 
   alias to_summary to_s
@@ -1185,7 +1253,10 @@ class VoiceSearchAction < DeviceAction
   end
 
   def to_s(colour: false, indent: 0)
-    'VoiceSearchAction ' + @h.inspect
+    
+    @s = 'Voice Search' # + @h.inspect
+    super()
+    
   end
 
   alias to_summary to_s

data/lib/ruby-macrodroid/actionsnlp.rb

@@ -86,7 +86,11 @@ class ActionsNlp
     
     get /^take_picture/i do
       [TakePictureAction, {}]
-    end           
+    end
+    
+    get /^Take Screenshot/i do
+      [TakeScreenshotAction, {}]
+    end               
     
     # -- DEVICE ACTIONS ------------------------------------------------------
     
@@ -114,6 +118,11 @@ class ActionsNlp
     get /^Vibrate$/i do |pattern|
       [VibrateAction, {pattern: 'short buzz'}]
     end       
+
+    get /^Voice Search$/i do
+      [VoiceSearchAction, {}]
+    end           
+    
     
     # e.g. Display Notification: Hi there: This is the body of the message
     get /^Display Notification: ([^:]+): [^$]+$/i do |subject, text|
@@ -141,14 +150,24 @@ class ActionsNlp
     end     
     
     # e.g. Launch Settings
-    get /^Launch (.*)$/i do |application|
+    get /^Launch (.*)$/i do |s|
 
-      app = APPS[application] || 'com.android.' + application.downcase.split()\
-          .join('.')
-      h = {
-        application_name: application,
-        package_to_launch: app
-      }
+      h = {}
+      
+      if s[0] == '[' then
+        
+        h[:launch_by_package_name] = s
+        h[:option] = 1
+        
+      else
+        application = s
+        h[:application_name] = application
+        h[:package_to_launch] = APPS[application] || 'com.android.' + 
+            application.downcase.split().join('.')
+        h[:option] = 0
+        
+      end
+      
       [LaunchActivityAction, h]
       
     end

data/lib/ruby-macrodroid/base.rb

@@ -195,6 +195,7 @@ class MacroObject
     
   end
   
+  
   private
   
   def hashify(h)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw