kita 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65792a880b15d5034614c329d66ffd741f76af6cec3d8b70079675296b911170
-  data.tar.gz: facfc0980b75a217513991ae019cba86a21185389f832b52e7f78ea37a1f1b98
+  metadata.gz: 5b9ab67c3c2be81e1c63d0e5bba5ce903f27c5228b0dd6fe6b4051a032fa5371
+  data.tar.gz: 32021b813755a63059f0d4cb1464b636b374a6a758094bd86d448ba81c5f88dc
 SHA512:
-  metadata.gz: 711858ba735bf5c14e7ef006598d3957205cf04752138edd487af4a8432f2f843532b1de83d78c358769ce3e0aa6623b03a7d1405359890d44084f01ff8514ef
-  data.tar.gz: 95a46563053e6e80955b92b61f095e11bd5d7e1197000c2455ba62264170370a673d61381279f3d900a9b5c161b0ac31fe72049951027d9a6d7c69fa70005d86
+  metadata.gz: d22c59c1e32b34cab29475370dd7bac3d12a486be5d6c404008647d5c27a2374ce07a1caa7ac027c0512969034427e5019f9df4229e809c42b9841e32ff3f3ba
+  data.tar.gz: b39f7cce3e1d969f72603c1e3aeb2edc1b0d440f4effa7fc16706d6d6b0d61c76dc5aa9ddfb585a4b3122b1bf3416e2ea09cd86b5d48128e610bb152a93165e8

data/CHANGELOG.md

@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## 2020-05-27
+### Changed
+- Selecting an incorrect answer for a Katakana question, shows the correct Katakana, rather than
+just repeating the Hiragana
+
 ## 2020-05-25
 ### Changed
 - Improved sounds, neither へ nor は are pronounced in their particle form (e and wa).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kita (0.5.5)
+    kita (0.5.6)
       config (~> 2.2)
       gir_ffi (~> 0.15.2)
       gstreamer (~> 3.4)

data/kita.gemspec

@@ -10,9 +10,13 @@ Gem::Specification.new do |spec|
   spec.license       = 'GPLv3+'
 
   spec.summary       = 'A Japanese kana learning tool.'
-  spec.description   = 'A simple tool to help Japanese language learners with hiragana and katakana.'
+  spec.description   = <<-DESC
+    A simple GTK3 app to help Japanese language learners with Hiragana and Katakana. It introduces
+    users to the sounds of the kana and teaches basic recognition of both writing systems.
+  DESC
+
   spec.homepage      = 'https://www.danbishop.org'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/danbishop/kita'

data/lib/kita.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require 'gtk3'
 require_relative 'kita/audio'
 require_relative 'kita/config'
-require_relative 'kita/hiragana'
-require_relative 'kita/katakana'
+require_relative 'kita/question'
 require_relative 'kita/version'
 
 module Kita
@@ -14,11 +14,8 @@ module Kita
       builder_file = "#{File.expand_path(File.dirname(__dir__))}/ui/builder.ui"
       # Construct a Gtk::Builder instance and load our UI description
       @builder = Gtk::Builder.new(file: builder_file)
-      # Initiate Hiragana class
-      @hiragana = Hiragana.new
-      # Initiate Katakana class
-      @katakana = Katakana.new
-      @types = [@hiragana]
+      # Initiate Question class
+      @question = Question.new
       @button_signals = {}
       @sound = Audio.new
       new_question
@@ -81,19 +78,13 @@ module Kita
     end
 
     def toggle_katakana
-      # TODO: Switch this to using Settings
-      @types = []
-      @types << @hiragana if @hiragana_switch.active?
-      @types << @katakana if @katakana_switch.active?
-      (@hiragana_switch.set_active(true) && @types = [@hiragana]) if @types.empty?
+      Settings.katakana = !Settings.katakana
+      (@hiragana_switch.set_active(true) && Settings.hiragana = true) if !Settings.katakana && !Settings.hiragana
     end
 
     def toggle_hiragana
-      # TODO: Switch this to using Settings
-      @types = []
-      @types << @hiragana if @hiragana_switch.active?
-      @types << @katakana if @katakana_switch.active?
-      (@katakana_switch.set_active(true) && @types = [@katakana]) if @types.empty?
+      Settings.hiragana = !Settings.hiragana
+      (@katakana_switch.set_active(true) && Settings.katakana = true) if !Settings.katakana && !Settings.hiragana
     end
 
     def toggle_sound
@@ -111,7 +102,7 @@ module Kita
 
     def new_question
       reset_buttons
-      question = @types.sample.question
+      question = @question.new_question
       question_label = @builder.get_object('question')
       question_label.set_markup("<span font='72'>#{question[:question]}</span>")
       buttons = %w[a b c d]
@@ -144,7 +135,10 @@ module Kita
     def wrong_button_click(button)
       button.set_sensitive(false)
       label = button.child
-      label.set_markup("<span color='#d40000'>#{button.label} #{button.label.hiragana}</span>")
+      correction = @question.type == 'hiragana' ? button.label.hiragana : button.label.katakana
+      label.set_markup(
+        "<span color='#d40000'>#{button.label} #{correction}</span>"
+      )
     end
 
     def reset_buttons

data/lib/kita/hiragana.rb

@@ -48,6 +48,7 @@ class Hiragana
   def build_question(chars)
     {
       question: chars[0],
+      type: 'hiragana',
       answer: chars[0].romaji,
       choices: [
         chars[1].romaji,

data/lib/kita/katakana.rb

@@ -48,6 +48,7 @@ class Katakana
   def build_question(chars)
     {
       question: chars[0],
+      type: 'katakana',
       answer: chars[0].hiragana,
       choices: [
         chars[1].hiragana,

data/lib/kita/question.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative 'hiragana'
+require_relative 'katakana'
+
+# Question Class
+class Question
+  attr_accessor :type
+
+  def initialize
+    @hiragana = Hiragana.new
+    @katakana = Katakana.new
+  end
+
+  def new_question
+    question_types = []
+    question_types.push @hiragana if Settings.hiragana
+    question_types.push @katakana if Settings.katakana
+    question = question_types.sample.question
+    @type = question[:type]
+    question
+  end
+end

data/lib/kita/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kita
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 end

data/snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: kita
-version: '0.5.5'
+version: '0.5.6'
 summary: Japanese learning tool
 description: |
   A simple tool to help Japanese language learners.
@@ -15,43 +15,19 @@ parts:
     plugin: ruby
     gems:
       - kita
-    ruby-version: 2.7.0
+    ruby-version: 2.7.1
     stage-packages:
-      - gobject-introspection
-      - gir1.2-atk-1.0
-      - gir1.2-atspi-2.0
-      - gir1.2-freedesktop
-      - gir1.2-gdkpixbuf-2.0
-      - gir1.2-glib-2.0
-      - gir1.2-gtk-3.0
-      - gir1.2-pango-1.0
-      - libcanberra-gtk3-0
       - libgstreamer1.0-0
-      - libglib2.0-0
+      - gstreamer1.0-plugins-base
       - libgirepository-1.0-1
       - gir1.2-gstreamer-1.0
-      - gstreamer1.0-plugins-base
-      # Just trying these to see if it makes sound work
-      - libpulse0
-      - libpulse-mainloop-glib0
-      - libslang2
-      - libgpm2
-      - libasound2
 
 apps:
   kita:
     command: bin/kita
     extensions: [gnome-3-28]
-    environment:
-      LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
     plugs:
-      - desktop
-      - desktop-legacy
-      - gsettings
-      - wayland
-      - x11
       - audio-playback
-      - home
     slots:
       - dbus-daemon
     common-id: uk.danbishop.kita

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kita
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Dan Bishop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: config
@@ -94,7 +94,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description: A simple tool to help Japanese language learners with hiragana and katakana.
+description: |2
+      A simple GTK3 app to help Japanese language learners with Hiragana and Katakana. It introduces
+      users to the sounds of the kana and teaches basic recognition of both writing systems.
 email:
 - d@nbishop.uk
 executables:
@@ -118,6 +120,7 @@ files:
 - lib/kita/config.rb
 - lib/kita/hiragana.rb
 - lib/kita/katakana.rb
+- lib/kita/question.rb
 - lib/kita/version.rb
 - snap/gui/kita.desktop
 - snap/gui/kita.svg
@@ -283,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="