glimmer_wordle 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18a1772cb458e49ced9e103096f736c307ae5b4e100457ea5e19ba04e4f4d28a
-  data.tar.gz: 9e341e855c03fb9a587f0b537988b60fe8771e9e4d3ba19d38a9678f98bee849
+  metadata.gz: 450dbdcb851754bb9e443dce3511a31fe46d275ecc4db7edcbd1b4eca30322f0
+  data.tar.gz: 5f8e3c63f36d914e2b15ab21eb386c2b7bbb4bbd897172dcf19b454d0a901dd4
 SHA512:
-  metadata.gz: 370bc2a11daa444256e6dcd7fb43129d3f09fe17fdd0f6db4b972ce2455e1437ad3473682ac54c71cbf208c81f6490a93a6d1978d3b0fe4ede55b6ab7ae39e3d
-  data.tar.gz: 53ee100edcbacaa594ed6adf5b97a8041d44f1a25f281722093c1c9159df445c8bb4deb5b292186dfa5910e22e70665668378a4a514e8a3e587ba92f820cc564
+  metadata.gz: 961b5ec85887d1fe92a444dfc292985ef60ac4ebcd04916702c8bc66c4afe861bce3c958380ce3179913789fecd961507f73cdcecdfe663b06dad228f16c280e
+  data.tar.gz: 35055490ab7a0ceb7e5c6001cd814478fc181f648a7fa6ed2ab815e04182859d3695c0ee327cdf8266998eb741e9c8db0fda1cd5cbc66f6da387e9037c7180b5

data/README.md

@@ -1,5 +1,5 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer_wordle/master/icons/linux/Glimmer Wordle.png' height=85 /> Wordle
-## Word Game
+# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer_wordle/master/icons/linux/Glimmer Wordle.png' height=85 /> Glimmer Wordle 1.1.0
+## Play Wordle Endlessly with No Limit!
 [![Gem Version](https://badge.fury.io/rb/glimmer_wordle.svg)](http://badge.fury.io/rb/glimmer_wordle)
 
 [Wordle](https://en.wikipedia.org/wiki/Wordle) word game desktop GUI app written [test-first](https://github.com/AndyObtiva/wordle/blob/master/spec/app/model/five_letter_word_spec.rb) using [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Framework) as inspiration by [Kevin Newton's blog post](https://kddnewton.com/2022/01/29/solving-wordle-in-ruby.html).
@@ -14,9 +14,9 @@
 
 ### Download
 
-[<img src='https://raw.githubusercontent.com/AndyObtiva/glimmer_wordle/master/icons/linux/Glimmer Wordle.png' height=40 /> Download Glimmer Wordle DMG for Mac ARM64 Monterey and Older](https://www.dropbox.com/s/t77si617tsaxe0c/Glimmer%20Wordle-arm64-1.0.0.dmg?dl=1)
+[<img src='https://raw.githubusercontent.com/AndyObtiva/glimmer_wordle/master/icons/linux/Glimmer Wordle.png' height=40 /> Download Glimmer Wordle 1.1.0 DMG for Mac ARM64 Monterey and Older](https://www.dropbox.com/s/j2j5cyor90jr7rj/Glimmer%20Wordle-ARM64-1.1.0.dmg?dl=1)
 
-[<img src='https://raw.githubusercontent.com/AndyObtiva/glimmer_wordle/master/icons/linux/Glimmer Wordle.png' height=40 /> Download Glimmer Wordle DMG for Mac x86_64 Catalina and Older](https://www.dropbox.com/s/amlrm4nufdlzlb1/Glimmer%20Wordle-1.0.0.dmg?dl=1)
+[<img src='https://raw.githubusercontent.com/AndyObtiva/glimmer_wordle/master/icons/linux/Glimmer Wordle.png' height=40 /> Download Glimmer Wordle 1.1.0 DMG for Mac x86_64 Catalina and Older](https://www.dropbox.com/s/t6tjuzp4dhmuls9/Glimmer%20Wordle-1.1.0.dmg?dl=1)
 
 ### Install Ruby Gem
 

data/VERSION

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

data/app/wordle/view/app_view.rb

@@ -4,9 +4,9 @@ class Wordle
       include Glimmer::UI::CustomShell
       
       COLOR_TO_BACKGROUND_COLOR_MAP = {
-        green:  :dark_green,
-        yellow: :dark_yellow,
-        gray:   :dark_gray,
+        green:  rgb(106, 170, 100),
+        yellow: rgb(201, 180, 88),
+        gray:   rgb(120, 124, 126),
       }
       
       COLOR_TO_TEXT_COLOR_MAP = {
@@ -15,10 +15,20 @@ class Wordle
         gray:   :white,
       }
       
-      ALPHABET_ROW1 = %w[Q W E R T Y U I O P]
-      ALPHABET_ROW2 = %w[A S D F G H J K L]
-      ALPHABET_ROW3 = %w[Z X C V B N M]
-
+      ALPHABET_LAYOUTS = {
+        alphabetical: [
+          %w[A B C D E F G H I J],
+          %w[K L M N O P Q R S],
+          %w[T U V W X Y Z],
+        ],
+        querty: [
+          %w[Q W E R T Y U I O P],
+          %w[A S D F G H J K L],
+          %w[Z X C V B N M],
+        ],
+      }
+      
+      CONFIG_FILE = File.join(Dir.home, '.glimmer_wordle')
     
       before_body do
         @display = display {
@@ -31,6 +41,10 @@ class Wordle
           on_swt_keydown do |key_event|
             if key_event.keyCode == 8
               do_backspace
+            elsif key_event.keyCode == swt(:arrow_left)
+              do_left
+            elsif key_event.keyCode == swt(:arrow_right)
+              do_right
             elsif key_event.keyCode == swt(:cr)
               if @five_letter_word.status == :in_progress
                 do_guess
@@ -43,6 +57,8 @@ class Wordle
           end
         }
         @five_letter_word = Model::FiveLetterWord.new
+        config = load_config
+        @alphabet_layout = config[:alphabet_layout] || :alphabetical
       end
   
       ## Add widget content inside custom shell body
@@ -65,7 +81,7 @@ class Wordle
           
           app_menu_bar
           
-          alphabets
+          alphabet_container
           
           label {
             layout_data :center, :center, true, false
@@ -100,11 +116,47 @@ class Wordle
             }
           }
           
+          menu {
+            text '&View'
+            
+            menu {
+              text 'Alphabet &Layout'
+              
+              menu_item(:radio) {
+                text '&Alphabetical'
+                selection @alphabet_layout == :alphabetical
+                
+                on_widget_selected {
+                  self.alphabet_layout = :alphabetical
+                  rebuild_alphabet_container
+                }
+              }
+              
+              menu_item(:radio) {
+                text '&Querty'
+                selection @alphabet_layout == :querty
+                
+                on_widget_selected {
+                  self.alphabet_layout = :querty
+                  rebuild_alphabet_container
+                }
+              }
+            }
+          }
+          
           menu {
             text '&Help'
             
             menu_item {
-              text '&About...'
+              text '&Instructions'
+              
+              on_widget_selected {
+                display_instructions_dialog
+              }
+            }
+            
+            menu_item {
+              text '&About'
               
               on_widget_selected {
                 display_about_dialog
@@ -114,6 +166,33 @@ class Wordle
         }
       end
   
+      def display_instructions_dialog
+        message_box(body_root) {
+          text 'Instructions'
+          message <<~MULTI_LINE_STRING
+            Glimmer Wordle Instructions
+            
+            Make 6 guesses for a 5-letter word.
+            
+            If you enter a letter that is part of the word,
+            and at the right location in the word,
+            the letter will become green.
+            
+            If you enter a letter that is part of the word,
+            but at the wrong location in the word,
+            the letter will become yellow.
+            
+            If you enter a letter that is not part of the word,
+            the letter will become red.
+            
+            If you win or lose, you get to see the answer,
+            and share the result emojis.
+            
+            Happy Glimmer Wordle!
+          MULTI_LINE_STRING
+        }.open
+      end
+      
       def display_about_dialog
         message_box(body_root) {
           text 'About'
@@ -121,22 +200,38 @@ class Wordle
         }.open
       end
       
+      def alphabet_container
+        @alphabet_container = composite {
+          layout_data(:center, :center, true, false)
+          
+          grid_layout {
+            margin_width 0
+            margin_height 0
+            vertical_spacing 0
+          }
+          
+          background :white
+        
+          alphabets
+        }
+      end
+      
       def alphabets
-        alphabet_row(ALPHABET_ROW1) {
+        alphabet_row(ALPHABET_LAYOUTS[@alphabet_layout][0]) {
           layout_data(:center, :center, true, false) {
             width_hint 318
             height_hint 50
           }
         }
         
-        alphabet_row(ALPHABET_ROW2) {
+        alphabet_row(ALPHABET_LAYOUTS[@alphabet_layout][1]) {
           layout_data(:center, :center, true, false) {
             width_hint 288
             height_hint 50
           }
         }
         
-        alphabet_row(ALPHABET_ROW3) {
+        alphabet_row(ALPHABET_LAYOUTS[@alphabet_layout][2]) {
           layout_data(:center, :center, true, false) {
             width_hint 222
             height_hint 50
@@ -169,6 +264,10 @@ class Wordle
         }
       end
       
+      def alphabet_layout_alphabets
+        ALPHABET_LAYOUTS[@alphabet_layout].reduce(:+)
+      end
+      
       def word_guesser
         @canvasses ||= []
         margin_x = 5
@@ -214,13 +313,11 @@ class Wordle
       
       def do_backspace
         @letter = @letters.find {|letter| letter.string == ''}
-        index = @letter ? @letters.index(@letter) - 1 : 4
+        index = @letter ? [@letters.index(@letter) - 1, 0].max : 4
         @letter = @letters[index]
         @letter.string = ''
-        if index > 0
-          @borders.each { |caret| caret.foreground = :gray}
-          @borders[index - 1].foreground = :title_background
-        end
+        @borders.each { |caret| caret.foreground = :gray}
+        @borders[index].foreground = :title_background
       end
       
       def do_guess
@@ -261,26 +358,47 @@ class Wordle
         body_root.pack(true)
       end
       
+      def highlighted_letter_index
+        @borders.each_with_index.find {|border, i| border.foreground.first == color(:title_background).swt_color }.last
+      end
+      
       def do_type(character)
-        @letter = @letters.find {|letter| letter.string == ''}
-        index = @letters.index(@letter)
-        if @letter
+        index = highlighted_letter_index
+        @letter = @letters[index]
+        @letter.string = character.upcase
+        if @letters.any? {|letter| letter.string == ''}
           @borders.each { |caret| caret.foreground = :gray}
           @borders[index == 4 ? 4 : index + 1].foreground = :title_background
-          @letter.string = character.upcase
         end
       end
       
+      def do_left
+        index = [highlighted_letter_index - 1, 0].max
+        @borders.each { |caret| caret.foreground = :gray}
+        @borders[index].foreground = :title_background
+      end
+      
+      def do_right
+        index = [highlighted_letter_index + 1, @letters.count - 1].min
+        @borders.each { |caret| caret.foreground = :gray}
+        @borders[index].foreground = :title_background
+      end
+      
       def do_restart
-        (ALPHABET_ROW1 + ALPHABET_ROW2 + ALPHABET_ROW3).each_with_index do |alphabet_character, i|
+        @share_text_dialog&.close
+        alphabet_layout_alphabets.each_with_index do |alphabet_character, i|
           @alphabet_borders[i].foreground = :gray
           @alphabet_rectangles[i].background = :white
           @alphabet_letters[i].foreground = :black
         end
-        @restart_button.dispose
+        @restart_button&.dispose
         @canvasses.dup.each(&:dispose)
         @canvasses.clear
-        body_root.content { word_guesser }
+        @guess_button&.dispose
+        body_root.content {
+          word_guesser
+          guess_button
+        }
         body_root.layout(true, true)
         body_root.pack(true)
         @five_letter_word.refresh
@@ -297,7 +415,7 @@ class Wordle
       end
       
       def update_alphabet_background_colors
-        (ALPHABET_ROW1 + ALPHABET_ROW2 + ALPHABET_ROW3).each_with_index do |alphabet_character, i|
+        alphabet_layout_alphabets.each_with_index do |alphabet_character, i|
           result_color = @five_letter_word.colored_alphabets[alphabet_character.downcase]
           if result_color
             background_color = COLOR_TO_BACKGROUND_COLOR_MAP[result_color]
@@ -321,27 +439,16 @@ class Wordle
       end
       
       def display_share_text_dialog
-        result = ''
-        @five_letter_word.guess_results.each do |row|
-          row.each do |result_color|
-            case result_color
-            when :green
-              result << "🟩"
-            when :yellow
-              result << "🟨"
-            when :gray
-              result << "⬜"
-            end
-          end
-          result << "\n"
-        end
-  
+        result = "#{@five_letter_word.answer.upcase}\n\n#{emoji_result}"
+          
         Clipboard.copy(result)
 
-        dialog(body_root) {
+        @share_text_dialog = dialog(body_root) {
           grid_layout
           text 'Share Result'
           
+          app_menu_bar
+          
           label {
             layout_data :center, :center, true, false
             text 'Result is copied to clipboard!'
@@ -354,7 +461,66 @@ class Wordle
             alignment :center
             text result
           }
-        }.open
+        }
+        @share_text_dialog.open
+      end
+      
+      def dispose_alphabet_container_children
+        @alphabet_rectangles.clear
+        @alphabet_borders.clear
+        @alphabet_letters.clear
+        @alphabet_container.children.each(&:dispose)
+      end
+      
+      def rebuild_alphabet_container
+        dispose_alphabet_container_children
+        @alphabet_container.content {
+          alphabets
+        }
+        @alphabet_container.layout(true, true)
+        @alphabet_container.pack(true)
+      end
+      
+      def alphabet_layout=(value)
+         @alphabet_layout = value
+         save_config
+      end
+      
+      def new_config
+        {
+          alphabet_layout: @alphabet_layout
+        }
+      end
+      
+      def save_config
+        File.write(CONFIG_FILE, YAML.dump(new_config))
+      rescue => e
+        puts e.full_message
+      end
+      
+      def load_config
+        File.exist?(CONFIG_FILE) ? YAML.load(File.read(CONFIG_FILE)) : {}
+      rescue => e
+        puts e.full_message
+        {}
+      end
+      
+      def emoji_result
+        result = ''
+        @five_letter_word.guess_results.each do |row|
+          row.each do |result_color|
+            case result_color
+            when :green
+              result << "🟩"
+            when :yellow
+              result << "🟨"
+            when :gray
+              result << "⬜"
+            end
+          end
+          result << "\n"
+        end
+        result
       end
     end
   end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer_wordle
 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-02-07 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.22.2.3
+        version: 4.22.2.6
   name: glimmer-dsl-swt
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.22.2.3
+        version: 4.22.2.6
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Glimmer Wordle - Word Game Desktop GUI App Written in Glimmer DSL for
-  SWT (requires JRuby)
+  SWT (requires JRuby) - Play Wordle Endlessly with No Limit!
 email: andy.am@gmail.com
 executables:
 - glimmer_wordle