kita 0.5.2 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe0fd7f04327305a031aca0a2563141fcb80917b16a413c83047baec25bf562e
-  data.tar.gz: 9ef30212fbe2fb7e6f895f43311bfcaaa7e0f206d8d6e62e618613c392d70234
+  metadata.gz: 5b9ab67c3c2be81e1c63d0e5bba5ce903f27c5228b0dd6fe6b4051a032fa5371
+  data.tar.gz: 32021b813755a63059f0d4cb1464b636b374a6a758094bd86d448ba81c5f88dc
 SHA512:
-  metadata.gz: d979ad149e0782b4e7ea705e0d1eca590c3d3b06b0fbd90c7ff5b057de21144b38a2c225a2fd78cf8b425f173c69d5e82b855405a41c5877518ddbbea884a4a4
-  data.tar.gz: 3cb5a9979c7b7f01b003ac53c37657176b93382e39d75e29720028a28ee2d09a1fd64918ece4e2533acc1d945323f4b34fcd4539de140170cfea0ab15f2c5b76
+  metadata.gz: d22c59c1e32b34cab29475370dd7bac3d12a486be5d6c404008647d5c27a2374ce07a1caa7ac027c0512969034427e5019f9df4229e809c42b9841e32ff3f3ba
+  data.tar.gz: b39f7cce3e1d969f72603c1e3aeb2edc1b0d440f4effa7fc16706d6d6b0d61c76dc5aa9ddfb585a4b3122b1bf3416e2ea09cd86b5d48128e610bb152a93165e8

data/.gitignore

@@ -8,6 +8,7 @@ vendor
 /coverage/
 /doc/
 /pkg/
+/prime/
 /spec/reports/
 /tmp/
 

data/CHANGELOG.md

@@ -6,10 +6,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
-- Marketing banner to prompt users to upgrade to a free account
 
 ### 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).
+
 ## 2020-05-24
 ### Added
 - First release

data/Gemfile.lock

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

data/bin/kita

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-application_root_path = File.expand_path(__dir__)
-require File.join(application_root_path, '../lib/kita.rb')
+RootPath = File.expand_path('../', __dir__)
+require File.join(RootPath, '/lib/kita.rb')
 
 app = Kita::Application.new
 

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/audio.rb

@@ -22,7 +22,7 @@ class Audio
 
   def play(uri)
     @playbin.stop
-    @playbin.uri = Gst.filename_to_uri("./sounds/#{uri}.ogg")
+    @playbin.uri = Gst.filename_to_uri("#{RootPath}/sounds/#{uri}.ogg")
     @playbin.play
   end
 

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.2'
+  VERSION = '0.5.7'
 end

data/snap/gui/kita.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Kita
+GenericName=Kita
+X-GNOME-FullName=Kita
+Comment=Learn the Japanese kana
+Keywords=Japanese;kana;hiragana;katakana;learn;
+Exec=kita
+Terminal=false
+Type=Application
+Icon=${SNAP}/meta/gui/kita.svg

data/snap/gui/kita.svg

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="50mm"
+   height="50mm"
+   viewBox="0 0 50 50"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="kita.svg">
+  <defs
+     id="defs2">
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter987"
+       inkscape:label="filter0" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Noise Fill"
+       id="filter1667">
+      <feTurbulence
+         type="fractalNoise"
+         baseFrequency="0.02 0.04"
+         numOctaves="5"
+         seed="1"
+         result="turbulence"
+         id="feTurbulence1651" />
+      <feComposite
+         in="SourceGraphic"
+         in2="turbulence"
+         operator="in"
+         result="composite1"
+         id="feComposite1653" />
+      <feColorMatrix
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 3 -1 "
+         result="color"
+         id="feColorMatrix1655" />
+      <feFlood
+         flood-opacity="1"
+         flood-color="rgb(21,40,57)"
+         result="flood"
+         id="feFlood1657" />
+      <feMerge
+         result="merge"
+         id="feMerge1663">
+        <feMergeNode
+           in="flood"
+           id="feMergeNode1659" />
+        <feMergeNode
+           in="color"
+           id="feMergeNode1661" />
+      </feMerge>
+      <feComposite
+         in2="SourceGraphic"
+         operator="in"
+         result="composite2"
+         id="feComposite1665" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="337.63766"
+     inkscape:cy="-256.1795"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="3368"
+     inkscape:window-height="1376"
+     inkscape:window-x="72"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:pagecheckerboard="true" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-25.905403,-105.02035)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:1.25;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="46.869045"
+       y="115.57143"
+       id="text817"><tspan
+         sodipodi:role="line"
+         id="tspan815"
+         x="46.869045"
+         y="125.4403"
+         style="stroke-width:0.26458332" /></text>
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path3017"
+       cx="50.905403"
+       cy="130.02036"
+       r="25" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38.4786377px;line-height:1.25;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:0.96196598"
+       x="31.512171"
+       y="144.46909"
+       id="text2913"><tspan
+         sodipodi:role="line"
+         id="tspan2911"
+         x="31.512171"
+         y="144.46909"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:'Ubuntu Bold';fill:#d40000;stroke-width:0.96196598">北</tspan></text>
+  </g>
+</svg>

data/snap/snapcraft.yaml

@@ -1,10 +1,10 @@
 name: kita
-version: '0.5.3'
+version: '0.5.6'
 summary: Japanese learning tool
 description: |
   A simple tool to help Japanese language learners.
 
-confinement: devmode
+confinement: strict
 base: core18
 grade: stable
 license: GPL-3.0+
@@ -15,30 +15,25 @@ 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
 
 apps:
   kita:
     command: bin/kita
     extensions: [gnome-3-28]
     plugs:
-      - desktop
-      - wayland
       - audio-playback
-      - pulseaudio
+    slots:
+      - dbus-daemon
     common-id: uk.danbishop.kita
+
+slots:
+  dbus-daemon:
+    interface: dbus
+    bus: session
+    name: uk.danbishop.kita

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kita
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.7
 platform: ruby
 authors:
 - Dan Bishop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-24 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,11 +120,11 @@ 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
 - snap/snapcraft.yaml
-- sounds/he.ogg
-- sounds/he2.ogg
-- sounds/tofix.txt
 - sounds/あ.ogg
 - sounds/あ2.ogg
 - sounds/い.ogg
@@ -284,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:
   - - ">="

data/sounds/tofix.txt

@@ -1,2 +0,0 @@
-su
-he - pronounced as particle (e)