rufio 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38a3f174b672b93170b943705a2273d9d059fe25c30617654e510679e54d6b8
-  data.tar.gz: df79412f9a76d3043b11de5d3a01c57d62cd88cd3074cf2ce9fb1cab638810b7
+  metadata.gz: 9201391f4316c4c09afabccefe7d81bb919acb11fd895981f87ebb5ad4592858
+  data.tar.gz: 0e801a038eb4c50fc170a6ce0838903cf8905b4edeb5dacbbcfaf2c04ceaf7be
 SHA512:
-  metadata.gz: b4385e2844d0c5c806facec4ac6e0c7841a9a9a332ef476b66af04812ced251f20b3904c95d94fcfb47da59f43f43138bde36d03bbf15a60784e3b1001062547
-  data.tar.gz: e1005adf29e7eaaadb2d7d01a742a74b43c2eb1415de10af521944c9d52bc663da9b1e39bd6611f12f88af85734e5345fefa2bc0d9637379ab6ef772b9852bc2
+  metadata.gz: 9b7ab89aeed58a0af7f9d3fe617a7e71c13a9ea13f934a97ee6c607de6b30314b7ad6a769bf52d7adb617aa8be8a12f87dc674ee08d0da348c9617a24aab1521
+  data.tar.gz: 702f4a988028b4dd69f2a4610ab8393c5bd65d7eaabdaa8a6cd4432917d71a91f96179f2ba226d6a6e4a64e0bdcbed1076db6f0740296fe144fb2298332a8f86

data/CHANGELOG.md

@@ -7,6 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.10.0] - 2025-01-XX
+
+### 🎨 Enhanced - Bookmark UI Overhaul
+- **Floating input dialogs**: All bookmark operations now use modern floating window interface
+- **Add Bookmark dialog**: Blue-bordered floating input with automatic whitespace trimming
+- **List Bookmark dialog**: Interactive selection with direct navigation support
+- **Remove Bookmark dialog**: Two-stage confirmation with color-coded warnings
+- **Improved input handling**: Better cursor positioning, no border overlap, proper padding
+
+### Added
+- **DialogRenderer#show_input_dialog**: Unified floating input interface with ESC support
+- **Color-coded feedback dialogs**: 🔵 Blue (info), 🔴 Red (warning/error), 🟡 Yellow (confirm), 🟢 Green (success)
+- **Automatic input trimming**: Leading/trailing spaces removed from bookmark names
+- **Path truncation**: Long paths display with `~` for home directory
+
+### Fixed
+- **Input field positioning**: Text no longer overlaps with dialog borders
+- **Bookmark list navigation**: Users can now navigate to bookmarks from list view
+- **Dialog layout**: Proper spacing between all dialog elements
+
+### Technical Details
+- New input dialog system with multi-byte character support
+- Enhanced BookmarkManager with private helper methods for dialogs
+- Improved cursor positioning calculations
+- **Detailed changelog**: [CHANGELOG_v0.10.0.md](./CHANGELOG_v0.10.0.md)
+
+## [0.9.0] - 2025-01-XX
+
 ### Added
 - **Escape key support for file/directory creation**: Press `Esc` to cancel file (`a`) or directory (`A`) creation prompts and return to the main view
 - **Interactive input improvements**: Backspace support and better character handling for Japanese input

data/CHANGELOG_v0.10.0.md

@@ -0,0 +1,145 @@
+# Changelog v0.10.0 - Bookmark UI Enhancement
+
+## [0.10.0] - 2025-01-XX
+
+### 🎨 Enhanced - Bookmark UI Overhaul
+
+Complete redesign of bookmark operations with modern floating window dialogs for improved user experience and consistency.
+
+### Added
+
+#### Floating Input Dialog System
+- **New `DialogRenderer#show_input_dialog` method**: Unified floating window input interface
+  - Centered floating dialog with customizable colors
+  - Real-time character input with visual feedback
+  - Multi-byte character support (Japanese, Chinese, etc.)
+  - Automatic input trimming (leading/trailing spaces)
+  - ESC key support for cancellation
+  - Input width validation to prevent overflow
+
+#### Enhanced Bookmark Operations
+
+**Add Bookmark (`b` → `[A]`)**
+- Floating input dialog with blue border
+- Clear prompt: "Enter bookmark name:"
+- Input indicator: `> ` for better visibility
+- Automatic whitespace trimming
+- Success/error feedback with colored dialogs
+  - Green border for success
+  - Red border for errors
+
+**List Bookmarks (`b` → `[L]`)**
+- Interactive selection from floating dialog
+- Blue-bordered bookmark list
+- Path truncation with `~` for home directory
+- 1-9 number key selection
+- Direct navigation to selected bookmark
+- ESC key to cancel
+
+**Remove Bookmark (`b` → `[R]`)**
+- Two-stage confirmation process for safety
+- Red-bordered selection dialog (warning color)
+- Yellow-bordered confirmation dialog (caution color)
+- Displays bookmark name in confirmation
+- Success/error feedback dialogs
+- ESC key support at all stages
+
+### Changed
+
+#### UI/UX Improvements
+- **Consistent floating window interface** across all bookmark operations
+- **Color-coded dialogs** for different operation types:
+  - 🔵 Blue: Information and input (Add, List)
+  - 🔴 Red: Warning and removal (Remove selection)
+  - 🟡 Yellow: Confirmation (Remove confirmation)
+  - 🟢 Green: Success messages
+  - 🔴 Red: Error messages
+
+#### Input Handling
+- **Improved cursor positioning** in input dialogs
+  - Proper padding from dialog borders
+  - Correct vertical alignment accounting for title and separators
+- **Better input field layout**
+  - Input line positioned with `> ` prompt indicator
+  - Adequate spacing between prompt and input area
+  - No text overlapping with dialog borders
+
+### Fixed
+
+- **Input field positioning**: Text no longer overlaps with dialog borders
+  - Fixed `input_y` calculation: `y + 4` → `y + 6`
+  - Fixed `input_x` calculation: `x + 2` → `x + 4`
+  - Fixed `max_input_width`: `dialog_width - 4` → `dialog_width - 8`
+- **Bookmark list navigation**: Users can now navigate to bookmarks from the list view
+- **Input trimming**: Leading and trailing spaces automatically removed from bookmark names
+- **Dialog height**: Adjusted to prevent input line from touching bottom border
+
+### Technical Details
+
+#### New Components
+```ruby
+# DialogRenderer enhancements
+- show_input_dialog(title, prompt, options)
+- read_input_in_dialog(x, y, width, height, input_x, input_y, options)
+
+# BookmarkManager enhancements
+- show_result_dialog(title, message, type)
+- show_remove_confirmation(bookmark_name)
+```
+
+#### Dialog Layout Improvements
+```
+Old layout (7 lines):
+┌─────────────────────┐
+│   Add Bookmark      │
+├─────────────────────┤
+│ Enter bookmark name:│ ← overlapped with border
+└─────────────────────┘
+
+New layout (8 lines):
+┌─────────────────────┐
+│   Add Bookmark      │
+├─────────────────────┤
+│                     │
+│ Enter bookmark name:│
+│                     │
+│ >                   │ ← proper spacing
+│                     │
+└─────────────────────┘
+```
+
+#### Code Quality
+- Removed unused variable warnings
+- Consistent error handling across all bookmark operations
+- Proper screen refresh after dialog operations
+- All tests passing (261 runs, 1141 assertions, 0 failures)
+
+### Migration Notes
+
+**User-facing changes:**
+- All bookmark operations now use floating dialogs
+- No more bottom-of-screen input prompts
+- Improved visual feedback for all operations
+- More intuitive navigation and selection
+
+**Developer notes:**
+- `BookmarkManager` methods now return different types:
+  - `add_interactive`: Still returns `Boolean`
+  - `list_interactive`: Now returns `Hash` (selected bookmark) or `nil`
+  - `remove_interactive`: Still returns `Boolean`
+- `KeybindHandler` updated to handle new return types
+- Dialog renderer supports input fields via `show_input_dialog`
+
+### Dependencies
+
+No new dependencies added. All changes use existing gems:
+- `io-console` for character input
+- Existing `dialog_renderer` infrastructure
+
+---
+
+**Full Diff Stats:**
+- Modified: `lib/rufio/dialog_renderer.rb`
+- Modified: `lib/rufio/bookmark_manager.rb`
+- Modified: `lib/rufio/keybind_handler.rb`
+- Tests: All passing ✅

data/lib/rufio/bookmark_manager.rb

@@ -68,15 +68,25 @@ module Rufio
     # @param path [String] Path to bookmark
     # @return [Boolean] Success status
     def add_interactive(path)
-      print ConfigLoader.message('bookmark.input_name') || 'Enter bookmark name: '
-      name = STDIN.gets.chomp
-      return false if name.empty?
+      return false unless @dialog_renderer
 
+      # Show floating input dialog
+      title = 'Add Bookmark'
+      prompt = 'Enter bookmark name:'
+      name = @dialog_renderer.show_input_dialog(title, prompt, {
+        border_color: "\e[34m",    # Blue
+        title_color: "\e[1;34m",   # Bold blue
+        content_color: "\e[37m"    # White
+      })
+
+      return false if name.nil? || name.empty?
+
+      # Add bookmark (name is already trimmed in show_input_dialog)
       if @bookmark.add(path, name)
-        puts "\n#{ConfigLoader.message('bookmark.added') || 'Bookmark added'}: #{name}"
+        show_result_dialog('Bookmark Added', "Added: #{name}", :success)
         true
       else
-        puts "\n#{ConfigLoader.message('bookmark.add_failed') || 'Failed to add bookmark'}"
+        show_result_dialog('Add Failed', 'Failed to add bookmark', :error)
         false
       end
     end
@@ -87,50 +97,132 @@ module Rufio
       bookmarks = @bookmark.list
 
       if bookmarks.empty?
-        puts "\n#{ConfigLoader.message('bookmark.no_bookmarks') || 'No bookmarks found'}"
+        show_result_dialog('No Bookmarks', 'No bookmarks found', :error)
         return false
       end
 
-      puts "\nBookmarks:"
+      return false unless @dialog_renderer
+
+      # Build content lines for bookmark selection
+      content_lines = ['', 'Select bookmark to remove:', '']
       bookmarks.each_with_index do |bookmark, index|
-        puts "  #{index + 1}. #{bookmark[:name]} (#{bookmark[:path]})"
+        # Truncate path if too long
+        display_path = bookmark[:path]
+        if display_path.start_with?(Dir.home)
+          display_path = display_path.sub(Dir.home, '~')
+        end
+        if display_path.length > 35
+          display_path = "...#{display_path[-32..]}"
+        end
+        content_lines << "  #{index + 1}. #{bookmark[:name]}"
+        content_lines << "      #{display_path}"
       end
+      content_lines << ''
+      content_lines << 'Press 1-9 to select, ESC to cancel'
+
+      title = 'Remove Bookmark'
+      width = 60
+      height = [content_lines.length + 4, 20].min
+      x, y = @dialog_renderer.calculate_center(width, height)
 
-      print ConfigLoader.message('bookmark.input_number') || 'Enter number to remove: '
-      input = STDIN.gets.chomp
-      number = input.to_i
+      @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
+        border_color: "\e[31m",    # Red (warning)
+        title_color: "\e[1;31m",   # Bold red
+        content_color: "\e[37m"    # White
+      })
 
-      if number > 0 && number <= bookmarks.length
-        bookmark_to_remove = bookmarks[number - 1]
+      # Wait for selection
+      selected_number = nil
+      loop do
+        input = STDIN.getch.downcase
+
+        if input >= '1' && input <= '9'
+          number = input.to_i
+          if number > 0 && number <= bookmarks.length
+            selected_number = number
+            break
+          end
+        elsif input == "\e" # ESC
+          @dialog_renderer.clear_area(x, y, width, height)
+          return false
+        end
+      end
+
+      @dialog_renderer.clear_area(x, y, width, height)
+
+      # Confirm deletion
+      bookmark_to_remove = bookmarks[selected_number - 1]
+      if show_remove_confirmation(bookmark_to_remove[:name])
         if @bookmark.remove(bookmark_to_remove[:name])
-          puts "\n#{ConfigLoader.message('bookmark.removed') || 'Bookmark removed'}: #{bookmark_to_remove[:name]}"
+          show_result_dialog('Bookmark Removed', "Removed: #{bookmark_to_remove[:name]}", :success)
           true
         else
-          puts "\n#{ConfigLoader.message('bookmark.remove_failed') || 'Failed to remove bookmark'}"
+          show_result_dialog('Remove Failed', 'Failed to remove bookmark', :error)
           false
         end
       else
-        puts "\n#{ConfigLoader.message('bookmark.invalid_number') || 'Invalid number'}"
         false
       end
     end
 
     # List all bookmarks interactively
-    # @return [Boolean] Success status
+    # @return [Hash, nil] Selected bookmark path or nil
     def list_interactive
       bookmarks = @bookmark.list
 
       if bookmarks.empty?
-        puts "\n#{ConfigLoader.message('bookmark.no_bookmarks') || 'No bookmarks found'}"
-        return false
+        show_result_dialog('No Bookmarks', 'No bookmarks found', :error)
+        return nil
       end
 
-      puts "\nBookmarks:"
+      return nil unless @dialog_renderer
+
+      # Build content lines
+      content_lines = ['', 'Select a bookmark:','']
       bookmarks.each_with_index do |bookmark, index|
-        puts "  #{index + 1}. #{bookmark[:name]} (#{bookmark[:path]})"
+        # Truncate path if too long
+        display_path = bookmark[:path]
+        if display_path.start_with?(Dir.home)
+          display_path = display_path.sub(Dir.home, '~')
+        end
+        if display_path.length > 35
+          display_path = "...#{display_path[-32..]}"
+        end
+        content_lines << "  #{index + 1}. #{bookmark[:name]}"
+        content_lines << "      #{display_path}"
+      end
+      content_lines << ''
+      content_lines << 'Press 1-9 to select, ESC to cancel'
+
+      title = 'Bookmarks'
+      width = 60
+      height = [content_lines.length + 4, 20].min
+      x, y = @dialog_renderer.calculate_center(width, height)
+
+      @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
+        border_color: "\e[34m",    # Blue
+        title_color: "\e[1;34m",   # Bold blue
+        content_color: "\e[37m"    # White
+      })
+
+      # Wait for selection
+      selected_bookmark = nil
+      loop do
+        input = STDIN.getch.downcase
+
+        if input >= '1' && input <= '9'
+          number = input.to_i
+          if number > 0 && number <= bookmarks.length
+            selected_bookmark = bookmarks[number - 1]
+            break
+          end
+        elsif input == "\e" # ESC
+          break
+        end
       end
 
-      true
+      @dialog_renderer.clear_area(x, y, width, height)
+      selected_bookmark
     end
 
     # Get bookmark by number
@@ -169,5 +261,89 @@ module Rufio
     def remove(name)
       @bookmark.remove(name)
     end
+
+    private
+
+    # Show result dialog with success or error styling
+    # @param title [String] Dialog title
+    # @param message [String] Result message
+    # @param type [Symbol] :success or :error
+    def show_result_dialog(title, message, type)
+      return unless @dialog_renderer
+
+      # Set colors based on result type
+      if type == :success
+        border_color = "\e[32m"    # Green
+        title_color = "\e[1;32m"   # Bold green
+      else
+        border_color = "\e[31m"    # Red
+        title_color = "\e[1;31m"   # Bold red
+      end
+
+      content_lines = [
+        '',
+        message,
+        '',
+        'Press any key to continue...'
+      ]
+
+      width = 50
+      height = 6
+      x, y = @dialog_renderer.calculate_center(width, height)
+
+      @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
+        border_color: border_color,
+        title_color: title_color,
+        content_color: "\e[37m"
+      })
+
+      STDIN.getch
+      @dialog_renderer.clear_area(x, y, width, height)
+    end
+
+    # Show confirmation dialog for bookmark removal
+    # @param bookmark_name [String] Name of bookmark to remove
+    # @return [Boolean] true if confirmed, false if cancelled
+    def show_remove_confirmation(bookmark_name)
+      return false unless @dialog_renderer
+
+      content_lines = [
+        '',
+        "Remove bookmark '#{bookmark_name}'?",
+        '',
+        '  [Y]es - Remove',
+        '  [N]o  - Cancel',
+        ''
+      ]
+
+      title = 'Confirm Remove'
+      width = 50
+      height = content_lines.length + 4
+      x, y = @dialog_renderer.calculate_center(width, height)
+
+      @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
+        border_color: "\e[33m",    # Yellow (warning)
+        title_color: "\e[1;33m",   # Bold yellow
+        content_color: "\e[37m"    # White
+      })
+
+      # Wait for confirmation
+      confirmed = false
+      loop do
+        input = STDIN.getch.downcase
+
+        case input
+        when 'y'
+          confirmed = true
+          break
+        when 'n', "\e" # n or ESC
+          confirmed = false
+          break
+        end
+      end
+
+      @dialog_renderer.clear_area(x, y, width, height)
+      confirmed
+    end
   end
 end

data/lib/rufio/dialog_renderer.rb

@@ -123,5 +123,111 @@ module Rufio
 
       [width, height]
     end
+
+    # Show a floating input dialog and get user input
+    # @param title [String] Dialog title
+    # @param prompt [String] Prompt message
+    # @param options [Hash] Customization options
+    # @option options [String] :border_color Border color ANSI code
+    # @option options [String] :title_color Title color ANSI code
+    # @option options [String] :content_color Content color ANSI code
+    # @option options [Integer] :width Dialog width (default: 50)
+    # @return [String, nil] User input (nil if cancelled)
+    def show_input_dialog(title, prompt, options = {})
+      require 'io/console'
+
+      width = options[:width] || 50
+      height = 8 # title + separator + prompt + input line + blank + ESC message + borders
+
+      x, y = calculate_center(width, height)
+
+      content_lines = [
+        '',
+        prompt,
+        '',
+        '> ', # Input line with prompt indicator
+        '',
+        '',
+        'Press ESC to cancel'
+      ]
+
+      # Draw initial dialog
+      draw_floating_window(x, y, width, height, title, content_lines, options)
+
+      # Position cursor at input line
+      # y + 1 (top border) + 1 (title) + 1 (separator) + 1 (blank) + 1 (prompt) + 1 (blank) + 1 (input line) = y + 6
+      input_y = y + 6
+      input_x = x + 4 # Inside border with prompt '> ' (border 1 + space 1 + '> ' 2)
+      print "\e[#{input_y};#{input_x}H"
+      STDOUT.flush
+
+      # Read input with escape support
+      input = read_input_in_dialog(x, y, width, height, input_x, input_y, options)
+
+      # Clear dialog
+      clear_area(x, y, width, height)
+
+      input
+    end
+
+    private
+
+    # ASCII character range constants
+    ASCII_PRINTABLE_START = 32
+    ASCII_PRINTABLE_END = 127
+    MULTIBYTE_THRESHOLD = 1
+
+    # Read user input within a dialog
+    # @param dialog_x [Integer] Dialog X position
+    # @param dialog_y [Integer] Dialog Y position
+    # @param dialog_width [Integer] Dialog width
+    # @param dialog_height [Integer] Dialog height
+    # @param input_x [Integer] Input field X position
+    # @param input_y [Integer] Input field Y position
+    # @param options [Hash] Display options
+    # @return [String, nil] User input (nil if cancelled)
+    def read_input_in_dialog(dialog_x, dialog_y, dialog_width, dialog_height, input_x, input_y, options)
+      content_color = options[:content_color] || "\e[37m"
+      reset_color = "\e[0m"
+
+      input_chars = []
+      max_input_width = dialog_width - 8 # Leave space for borders and padding (border 2 + padding 4 + border 2)
+
+      loop do
+        char = STDIN.getch
+
+        case char
+        when "\e" # Escape - cancel
+          return nil
+        when "\r", "\n" # Enter - submit
+          return input_chars.join.strip
+        when "\u007F", "\b" # Backspace/Delete
+          unless input_chars.empty?
+            input_chars.pop
+            # Redraw input line - clear the entire input area
+            print "\e[#{input_y};#{input_x}H"
+            print "#{content_color}#{' ' * max_input_width}#{reset_color}"
+            print "\e[#{input_y};#{input_x}H"
+            print "#{content_color}#{input_chars.join}#{reset_color}"
+            STDOUT.flush
+          end
+        when "\u0003" # Ctrl+C
+          raise Interrupt
+        else
+          # Accept printable characters
+          if (char.ord >= ASCII_PRINTABLE_START && char.ord < ASCII_PRINTABLE_END) ||
+             char.bytesize > MULTIBYTE_THRESHOLD # Multibyte characters (Japanese, etc.)
+            current_width = TextUtils.display_width(input_chars.join)
+            char_width = TextUtils.display_width(char)
+
+            if current_width + char_width <= max_input_width
+              input_chars << char
+              print "#{content_color}#{char}#{reset_color}"
+              STDOUT.flush
+            end
+          end
+        end
+      end
+    end
   end
 end

data/lib/rufio/keybind_handler.rb

@@ -698,15 +698,24 @@ module Rufio
       case result[:action]
       when :add
         success = @bookmark_manager.add_interactive(result[:path])
-        wait_for_keypress
+        @terminal_ui&.refresh_display
         success
       when :list
-        @bookmark_manager.list_interactive
-        wait_for_keypress
-        true
+        selected_bookmark = @bookmark_manager.list_interactive
+        @terminal_ui&.refresh_display
+        if selected_bookmark
+          # Navigate to selected bookmark
+          if @bookmark_manager.path_exists?(selected_bookmark)
+            navigate_to_directory(selected_bookmark[:path])
+          else
+            show_error_and_wait('bookmark.path_not_exist', selected_bookmark[:path])
+          end
+        else
+          false
+        end
       when :remove
         @bookmark_manager.remove_interactive
-        wait_for_keypress
+        @terminal_ui&.refresh_display
         true
       when :navigate
         goto_bookmark(result[:number])

data/lib/rufio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rufio
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rufio
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - masisz
 bindir: bin
 cert_chain: []
-date: 2025-12-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- CHANGELOG_v0.10.0.md
 - CHANGELOG_v0.4.0.md
 - CHANGELOG_v0.5.0.md
 - CHANGELOG_v0.6.0.md
@@ -183,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.6
+rubygems_version: 4.0.2
 specification_version: 4
 summary: Ruby file manager
 test_files: []