glimmer_metronome 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86a30af9f860b740e99b72b74866ef5501272b11a25ac806eb953082753fc257
-  data.tar.gz: 1cbdd332ec1059a063ced791d094d57b6d9daa627f72495ad0c20b17589ead2c
+  metadata.gz: 5df84bcda9c28fc2009d31f131928d7a26cf4f189b5a5fa7c184250bf5f6e376
+  data.tar.gz: 461d2c61ab3c31aff71e9ebd68c35d4cf96811ab5c3af5fa99b89915503f4698
 SHA512:
-  metadata.gz: 44dba5005950dbdd756925dc5fc9eeb065e3c94358943cedee902921a09dc4c36fa053cd4648907f2b3fa975015be21cf3d2164b7a823c55b1be27e469b1b633
-  data.tar.gz: 86f792b4b6c9a2d379c9f190ad36d3bc16c87dbf4f1343444f50def426ee011fcbc26cb97c716abf93aafb4eb5f7138120fffc4353f75cd64b6a0b02e745bb00
+  metadata.gz: 6aea3723aac6984d433041de739a09a9c1398e4dd814f1f15c599f6e59e41148f78289fbaf6e468434ee8b7c970fa91489b43db847b28b191ae9daf7f2fac6c7
+  data.tar.gz: 43d079be5622ad7035b9db8660236177724dfd300c2a2520018ec5cdab382e0bd3b10dc9ae33992335b405f5dc43d267dac97882c50dba41d69d281fe9bc8f0e

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 1.1.0
+
+- Tap-based calculation of tempo through hitting ENTER key
+- Mute metronome
+- Stop/Start metronome
+- Let user pick which beats are up or down by clicking on them (switching color between red [up] and yellow [down])
+- Show "play logo" triangle inside "ON" beat for accessibility support (e.g. color blind users)
+- Show only 8 beats max horizontally, creating lines of beats if beat count is greater than 8
+
 ## 1.0.0
 
 - Initial version with Beat Count and BPM options

data/README.md

@@ -1,8 +1,10 @@
-# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=85 /> Glimmer Metronome
+# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=85 /> Glimmer Metronome 1.1.0
 ## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer Application](https://github.com/AndyObtiva/glimmer-dsl-swt)
 [![Gem Version](https://badge.fury.io/rb/glimmer_metronome.svg)](http://badge.fury.io/rb/glimmer_metronome)
 
-<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=40 /> [Download Glimmer Metronome 1.0.0 DMG for Mac (X64 Catalina and Older)](https://www.dropbox.com/s/bjy4hie74gmxb5d/Glimmer%20Metronome-1.0.0.dmg?dl=1)
+<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/icons/linux/Glimmer%20Metronome.png" height=40 /> [Download Glimmer Metronome 1.1.0 DMG for Mac (X64 Catalina and Older)](https://www.dropbox.com/s/hbmztzi0q8ilca5/Glimmer%20Metronome-1.1.0.dmg?dl=1)
+
+![metronome demo](https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/screenshots/glimmer-metronome.gif)
 
 Metronome
 
@@ -12,20 +14,24 @@ Beat Count Change
 
 ![metronome beat count changed](https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/screenshots/glimmer-metronome-beat-count-changed.png)
 
-BPM Change
+Tempo Change
+
+![metronome tempo changed](https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/screenshots/glimmer-metronome-tempo-changed.png)
 
-![metronome bpm changed](https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/screenshots/glimmer-metronome-bpm-changed.png)
+Up Beat Change (via Mouse-Click on Beats To Toggle Up [Yellow] or Down [White])
+
+![metronome up beats changed](https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/screenshots/glimmer-metronome-up-beats-changed.png)
 
 ## Demo
 
-![metronome demo](https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/screenshots/glimmer-metronome.gif)
+[Video/Audio Demo](https://raw.githubusercontent.com/AndyObtiva/glimmer_metronome/master/screenshots/glimmer-metronome.mp4)
 
 ## Ruby Gem Instructions
 
 If you are a software engineer and would like to install this application as a [Ruby gem](https://guides.rubygems.org/what-is-a-gem/), then follow these instructions:
 
 - Ensure you have [Glimmer DSL for SWT 4.22.1.1 prerequisites setup (like JDK and JRuby)](https://github.com/AndyObtiva/glimmer-dsl-swt/tree/v4.22.1.1#pre-requisites).
-- Install gem via `gem install glimmer_metronome` command
+- Install gem via `gem install glimmer_metronome -v1.1.0` command
 - Run `glimmer_metronome` command to start application
 
 ## Contributing
@@ -52,4 +58,4 @@ Copyright (c) 2022 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for further detail
 
 --
 
-Glimmer Metronome icon made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a>
+Glimmer Metronome icons made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a>

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/app/glimmer_metronome/model/beat.rb

@@ -22,7 +22,22 @@
 class GlimmerMetronome
   module Model
     class Beat
-      attr_accessor :on
+      attr_accessor :on, :up
+      alias on? on
+      alias up? up
+      
+      def initialize(is_up)
+        self.up = is_up
+      end
+      
+      def off=(is_off)
+        self.on = !is_off
+      end
+      
+      def off
+        !on
+      end
+      alias off? off
       
       def off!
         self.on = false
@@ -31,6 +46,23 @@ class GlimmerMetronome
       def on!
         self.on = true
       end
+      
+      def down=(is_down)
+        self.up = !is_down
+      end
+      
+      def down
+        !up
+      end
+      alias down? down
+      
+      def up!
+        self.up = true
+      end
+      
+      def down!
+        self.down = true
+      end
     end
   end
 end

data/app/glimmer_metronome/model/rhythm.rb

@@ -19,17 +19,19 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require 'bigdecimal'
+
 require_relative 'beat'
 
 class GlimmerMetronome
   module Model
     class Rhythm
       attr_reader :beat_count
-      attr_accessor :beats, :bpm
+      attr_accessor :beats, :tempo
       
       def initialize(beat_count)
         self.beat_count = beat_count
-        @bpm = 120
+        @tempo = 120
       end
       
       def beat_count=(value)
@@ -37,9 +39,50 @@ class GlimmerMetronome
         reset_beats!
       end
       
+      def on_beat!(beat_index)
+        off!
+        beats[beat_index].on!
+      end
+      
+      def off!
+        beats.select(&:on).each(&:off!)
+      end
+      
       def reset_beats!
-        @beats = beat_count.times.map {Beat.new}
-        @beats.first.on!
+        if @beats
+          off!
+          if beat_count > @beats.count
+            @beats += (beat_count - @beats.count).times.map {Beat.new(false)}
+          elsif beat_count < @beats.count
+            @beats = @beats[0, @beats.count]
+          end
+        else
+          @beats = beat_count.times.map {|i| Beat.new(i == 0)}
+        end
+        on_beat!(0)
+      end
+      
+      def tap!
+        new_tap_time = Time.now
+        @tap_time ||= []
+        time_difference = nil
+        if @tap_time.any?
+          if @tap_time[-2]
+            time_difference1 = new_tap_time - @tap_time[-1]
+            time_difference2 = @tap_time[-1] - @tap_time[-2]
+            time_difference = BigDecimal((time_difference1 + time_difference2).to_s) / 2.0
+          else
+            time_difference = BigDecimal((new_tap_time - @tap_time[-1]).to_s)
+          end
+        end
+        if time_difference
+          if time_difference < 2
+            self.tempo = (BigDecimal('60.0') / time_difference)
+          else
+            @tap_time = []
+          end
+        end
+        @tap_time << Time.now
       end
     end
   end

data/app/glimmer_metronome/view/app_view.rb

@@ -30,9 +30,13 @@ class GlimmerMetronome
       
       FILE_SOUND_METRONOME_UP = File.join(APP_ROOT, 'sounds', 'metronome-up.wav')
       FILE_SOUND_METRONOME_DOWN = File.join(APP_ROOT, 'sounds', 'metronome-down.wav')
+      COLOR_BEAT_UP = :yellow
+      COLOR_BEAT_DOWN = :white
+          
+      attr_accessor :muted, :stopped
+      alias muted? muted
+      alias stopped? stopped
           
-      attr_accessor :rhythm
-      
       before_body do
         @rhythm = Model::Rhythm.new(4)
         
@@ -44,6 +48,10 @@ class GlimmerMetronome
           on_preferences do
             display_about_dialog
           end
+          
+          on_swt_keydown do |event|
+            @rhythm.tap! if event.keyCode == swt(:cr)
+          end
         }
       end
       
@@ -51,92 +59,170 @@ class GlimmerMetronome
         shell(:no_resize) {
           row_layout(:vertical) {
             center true
+            margin_width 20
+            margin_height 20
           }
           text 'Glimmer Metronome'
+          background :red
+          
+          tool_bar {
+            tool_item { |ti|
+              image ICON_STOP
+              hot_image ICON_HOT_STOP
+              
+              on_widget_selected do
+                toggle_metronome!
+                ti.image = @stopped ? ICON_PLAY : ICON_STOP
+                ti.hot_image = @stopped ? ICON_HOT_PLAY : ICON_HOT_STOP
+              end
+            }
+            
+            tool_item { |ti|
+              image ICON_SOUND
+              hot_image ICON_HOT_MUTE
+              
+              on_widget_selected do
+                self.muted = !@muted
+                ti.image = @muted ? ICON_MUTE : ICON_SOUND
+                ti.hot_image = @muted ? ICON_HOT_SOUND : ICON_HOT_MUTE
+              end
+            }
+          }
           
           label {
             text 'Beat Count'
             font height: 30, style: :bold
+            foreground :yellow
           }
           
           spinner {
             minimum 1
             maximum 64
-            selection <=> [self, 'rhythm.beat_count', after_write: ->(v) {restart_metronome}]
+            selection <=> [@rhythm, :beat_count, after_write: method(:build_beats)]
             font height: 30
           }
           
           label {
-            text 'BPM'
+            text 'Tempo'
             font height: 30, style: :bold
+            foreground :yellow
           }
           
           spinner {
             minimum 30
             maximum 1000
-            selection <=> [self, 'rhythm.bpm']
+            selection <=> [@rhythm, :tempo]
             font height: 30
           }
           
-          @beat_container = beat_container
+          @beat_container = composite {
+            grid_layout(@rhythm.beat_count, true)
+            
+            background :red
+            
+            @beats = @rhythm.beat_count.times.map { |n|
+              beat(n)
+            }
+          }
           
           on_swt_show {
-            start_metronome
+            build_beats
           }
           
           on_widget_disposed {
-            stop_metronome
+            stop_metronome!
           }
         }
       }
       
-      def beat_container
-        composite {
-          grid_layout(@rhythm.beat_count, true)
-          
-          @rhythm.beat_count.times { |n|
-            canvas {
-              layout_data {
-                width_hint 50
-                height_hint 50
-              }
-              rectangle(0, 0, :default, :default, 36, 36) {
-                background <= [self, "rhythm.beats[#{n}].on", on_read: ->(on) { on ? :red : :yellow}]
-              }
-            }
+      def beat(beat_index)
+        canvas {
+          layout_data {
+            width_hint 50
+            height_hint 50
+          }
+          
+          background :red
+          
+          rectangle(0, 0, :default, :default, 36, 36) {
+            background <= [@rhythm, "beats[#{beat_index}].up", on_read: ->(up) { up ? COLOR_BEAT_UP : COLOR_BEAT_DOWN}]
+          }
+          polygon(18, 16, 34, 25, 18, 34) {
+            background <= [@rhythm, "beats[#{beat_index}].on", on_read: ->(on) { on ? :black : (@rhythm.beats[beat_index].up? ? COLOR_BEAT_UP : COLOR_BEAT_DOWN)}]
+            background <= [@rhythm, "beats[#{beat_index}].up", on_read: ->(up) { @rhythm.beats[beat_index].on? ? :black : (up ? COLOR_BEAT_UP : COLOR_BEAT_DOWN)}]
           }
+          
+          on_mouse_up do
+            if @rhythm.beats[beat_index].up?
+              @rhythm.beats[beat_index].down!
+            else
+              @rhythm.beats[beat_index].up!
+            end
+          end
         }
       end
       
-      def start_metronome
-        @thread ||= Thread.new {
+      def start_metronome!
+        self.stopped = false
+        @thread ||= Thread.new do
           @rhythm.beat_count.times.cycle { |n|
-            sleep(60.0/@rhythm.bpm.to_f)
-            @rhythm.beats.each(&:off!)
-            @rhythm.beats[n].on!
-            sound_file = n == 0 ? FILE_SOUND_METRONOME_UP : FILE_SOUND_METRONOME_DOWN
+            begin
+              @rhythm.on_beat!(n)
+            rescue => e
+              puts e.full_message
+            end
+            sound_file = @rhythm.beats[n].up? ? FILE_SOUND_METRONOME_UP : FILE_SOUND_METRONOME_DOWN
             play_sound(sound_file)
+            sleep(60.0/@rhythm.tempo.to_f)
           }
-        }
-        if @beat_container.nil?
-          body_root.content {
-            @beat_container = beat_container
-          }
-          body_root.layout(true, true)
-          body_root.pack(true)
         end
       end
       
-      def stop_metronome
-        @thread&.kill # safe since no stored data is involved
+      def stop_metronome!
+        self.stopped = true
+        @thread&.kill # not dangerous in this case and is useful to stop sleep
         @thread = nil
-        @beat_container&.dispose
-        @beat_container = nil
+        @rhythm.off!
+      end
+      
+      def toggle_metronome!
+        if stopped?
+          start_metronome!
+        else
+          stop_metronome!
+        end
       end
       
-      def restart_metronome
-        stop_metronome
-        start_metronome
+      def build_beats
+        stop_metronome!
+        beat_container_layout_change = @rhythm.beat_count != @beats.count && (@rhythm.beat_count < 9 || @beats.count < 9)
+        if @rhythm.beat_count > @beats.count
+          index_start = @beats.count
+          @beat_container.content {
+            @beats += (@rhythm.beat_count - @beats.count).times.map do |n|
+              beat(index_start + n)
+            end
+          }
+        elsif @rhythm.beat_count < @beats.count
+          first_index_to_dispose = -(@beats.count - @rhythm.beat_count)
+          @beats[first_index_to_dispose..-1].each(&:dispose)
+          @beats = @beats[0...first_index_to_dispose]
+        end
+        update_beat_container_layout if beat_container_layout_change
+        start_metronome!
+      end
+      
+      def update_beat_container_layout
+        @beat_container.content {
+          if @rhythm.beat_count < 8
+            grid_layout(@rhythm.beat_count, true)
+          else
+            grid_layout(8, true)
+          end
+        }
+        body_root.layout(true, true)
+        body_root.pack(true)
+        body_root.center_within_display
       end
       
       # Play sound with the Java Sound library
@@ -146,7 +232,8 @@ class GlimmerMetronome
           audio_stream = AudioSystem.get_audio_input_stream(audio_input)
           clip = AudioSystem.clip
           clip.open(audio_stream)
-          clip.start
+          # TODO avoid starting if mute is on e.g. unless muted?
+          clip.start unless @muted
         rescue => e
           puts e.full_message
         end

data/app/glimmer_metronome.rb

@@ -9,11 +9,161 @@ rescue
   # add more gems if needed
 end
 
+require 'bigdecimal'
+
 class GlimmerMetronome
+  include Glimmer
+  
   APP_ROOT = File.expand_path('../..', __FILE__)
   VERSION = File.read(File.join(APP_ROOT, 'VERSION'))
   LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))
   ICON = File.join(APP_ROOT, 'icons/linux/Glimmer Metronome.png')
+  ICON_SOUND = image(36, 36) {
+    rectangle(0, 0, 36, 36) {
+      background :red # :widget_background
+    }
+    
+    oval(0, 0, 36, 36) {
+      background :red
+    }
+    
+    polygon(7, 14, 11, 14, 18, 10, 18, 26, 11, 22, 7, 22) {
+      background :white
+    }
+    
+    arc(8, 11, 14, 14, 40, -80) {
+      foreground :white
+      line_width 2
+      line_join :round
+      line_cap :round
+    }
+    
+    arc(6, 8, 20, 20, 40, -80) {
+      foreground :white
+      line_width 2
+      line_join :round
+      line_cap :round
+    }
+    
+    arc(4, 5, 26, 26, 40, -80) {
+      foreground :white
+      line_width 2
+      line_join :round
+      line_cap :round
+    }
+  }
+  ICON_HOT_SOUND = image(36, 36) {
+    rectangle(0, 0, 36, 36) {
+      background :red # :widget_background
+    }
+    
+    oval(0, 0, 36, 36) {
+      background :red
+    }
+    
+    polygon(7, 14, 11, 14, 18, 10, 18, 26, 11, 22, 7, 22) {
+      background :yellow
+    }
+    
+    arc(8, 11, 14, 14, 40, -80) {
+      foreground :yellow
+      line_width 2
+      line_join :round
+      line_cap :round
+    }
+    
+    arc(6, 8, 20, 20, 40, -80) {
+      foreground :yellow
+      line_width 2
+      line_join :round
+      line_cap :round
+    }
+    
+    arc(4, 5, 26, 26, 40, -80) {
+      foreground :yellow
+      line_width 2
+      line_join :round
+      line_cap :round
+    }
+  }
+  ICON_MUTE = image(36, 36) {
+    rectangle(0, 0, 36, 36) {
+      background :red # :widget_background
+    }
+    
+    oval(0, 0, 36, 36) {
+      background :red
+    }
+    
+    polygon(7, 14, 11, 14, 18, 10, 18, 26, 11, 22, 7, 22) {
+      background :white
+    }
+  }
+  ICON_HOT_MUTE = image(36, 36) {
+    rectangle(0, 0, 36, 36) {
+      background :red # :widget_background
+    }
+    
+    oval(0, 0, 36, 36) {
+      background :red
+    }
+    
+    polygon(7, 14, 11, 14, 18, 10, 18, 26, 11, 22, 7, 22) {
+      background :yellow
+    }
+  }
+  ICON_STOP = image(36, 36) {
+    rectangle(0, 0, 36, 36) {
+      background :red # :widget_background
+    }
+    
+    oval(0, 0, 36, 36) {
+      background :red
+    }
+    
+    rectangle(11, 11, 14, 14) {
+      background :white
+    }
+  }
+  ICON_HOT_STOP = image(36, 36) {
+    rectangle(0, 0, 36, 36) {
+      background :red # :widget_background
+    }
+    
+    oval(0, 0, 36, 36) {
+      background :red
+    }
+    
+    rectangle(11, 11, 14, 14) {
+      background :yellow
+    }
+  }
+  ICON_PLAY = image(36, 36) {
+    rectangle(0, 0, 36, 36) {
+      background :red # :widget_background
+    }
+    
+    oval(0, 0, 36, 36) {
+      background :red
+    }
+    
+    polygon(12, 10, 26, 18, 12, 26) {
+      background :white
+    }
+  }
+  ICON_HOT_PLAY = image(36, 36) {
+    rectangle(0, 0, 36, 36) {
+      background :red # :widget_background
+    }
+    
+    oval(0, 0, 36, 36) {
+      background :red
+    }
+    
+    polygon(12, 10, 26, 18, 12, 26) {
+      background :yellow
+    }
+  }
 end
 
 require 'glimmer_metronome/view/app_view'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer_metronome
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement