kita 0.5.1 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc52ea1433292c7a3c9146792e73117217f6d1ab6c640524489c0f22a30158a6
-  data.tar.gz: 32f74e1b6261250a6c36a9124f5ac4c5f651f9866c6665c7f949b2b43b50e6f3
+  metadata.gz: 65792a880b15d5034614c329d66ffd741f76af6cec3d8b70079675296b911170
+  data.tar.gz: facfc0980b75a217513991ae019cba86a21185389f832b52e7f78ea37a1f1b98
 SHA512:
-  metadata.gz: 79062cb37ecc657c208445d7a074d8fb3a8bacb32d84b1d5b94f8edbed3423e37e0d56b7cf6ad1563e7fe8daeb764d9838c8214f4d80c10cf66ee2cd70785372
-  data.tar.gz: e59ae6841712228838da590cf17eb093a18746f1b0073308d5b0160fa52d6dfd5659e2c649a8e753cf30158dc71f73424d72607d2925f7ff3cb7376b1863d3b7
+  metadata.gz: 711858ba735bf5c14e7ef006598d3957205cf04752138edd487af4a8432f2f843532b1de83d78c358769ce3e0aa6623b03a7d1405359890d44084f01ff8514ef
+  data.tar.gz: 95a46563053e6e80955b92b61f095e11bd5d7e1197000c2455ba62264170370a673d61381279f3d900a9b5c161b0ac31fe72049951027d9a6d7c69fa70005d86

data/.gitignore

@@ -1,12 +1,14 @@
 vendor
 *~
 *.gem
+*.snap
 /.bundle/
 /.yardoc
 /_yardoc/
 /coverage/
 /doc/
 /pkg/
+/prime/
 /spec/reports/
 /tmp/
 

data/CHANGELOG.md

@@ -6,10 +6,13 @@ 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-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,3 +1,14 @@
+PATH
+  remote: .
+  specs:
+    kita (0.5.5)
+      config (~> 2.2)
+      gir_ffi (~> 0.15.2)
+      gstreamer (~> 3.4)
+      gtk3 (~> 3.4)
+      mojinizer (~> 0.2.2)
+      pango (~> 3.4)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -107,12 +118,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  config (~> 2.2)
-  gir_ffi (~> 0.15.2)
-  gstreamer (~> 3.4)
-  gtk3 (~> 3.4)
-  mojinizer (~> 0.2.2)
-  pango (~> 3.4)
+  kita!
   rake (~> 13.0)
   rspec (~> 3.9)
 

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

@@ -7,6 +7,7 @@ Gem::Specification.new do |spec|
   spec.version       = Kita::VERSION
   spec.authors       = ['Dan Bishop']
   spec.email         = ['d@nbishop.uk']
+  spec.license       = 'GPLv3+'
 
   spec.summary       = 'A Japanese kana learning tool.'
   spec.description   = 'A simple tool to help Japanese language learners with hiragana and katakana.'
@@ -26,10 +27,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'config', '~> 2.2'
-  spec.add_dependency 'gir_ffi', '~> 0.15.2'
-  spec.add_dependency 'gstreamer', '~> 3.4'
-  spec.add_dependency 'gtk3', '~> 3.4'
-  spec.add_dependency 'mojinizer', '~> 0.2.2'
-  spec.add_dependency 'pango', '~> 3.4'
+  spec.add_runtime_dependency 'config', '~> 2.2'
+  spec.add_runtime_dependency 'gir_ffi', '~> 0.15.2'
+  spec.add_runtime_dependency 'gstreamer', '~> 3.4'
+  spec.add_runtime_dependency 'gtk3', '~> 3.4'
+  spec.add_runtime_dependency 'mojinizer', '~> 0.2.2'
+  spec.add_runtime_dependency 'pango', '~> 3.4'
 end

data/lib/kita.rb

@@ -37,6 +37,7 @@ module Kita
 
     def setup_about_box
       about_box = @builder.get_object('about_box')
+      about_box.version = VERSION
       about_button = @builder.get_object('menu_about')
       about_button.signal_connect('clicked') do
         about_box.run

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kita
-  VERSION = '0.5.1'
+  VERSION = '0.5.6'
 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

@@ -0,0 +1,63 @@
+name: kita
+version: '0.5.5'
+summary: Japanese learning tool
+description: |
+  A simple tool to help Japanese language learners.
+
+confinement: strict
+base: core18
+grade: stable
+license: GPL-3.0+
+
+parts:
+  kita:
+    source: .
+    plugin: ruby
+    gems:
+      - kita
+    ruby-version: 2.7.0
+    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
+      - 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
+
+slots:
+  dbus-daemon:
+    interface: dbus
+    bus: session
+    name: uk.danbishop.kita

data/ui/builder.ui

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 
+<!-- Generated with glade 3.22.2
 
 Copyright (C)
 
@@ -30,7 +30,7 @@ Author: Dan Bishop
     <property name="can_focus">False</property>
     <property name="type_hint">dialog</property>
     <property name="program_name">Kita</property>
-    <property name="version">0.5</property>
+    <property name="version"></property>
     <property name="copyright" translatable="yes">© 2020 Dan Bishop</property>
     <property name="comments" translatable="yes">A simple tool to help Japanese language learners.</property>
     <property name="website">danbishop.uk</property>
@@ -256,7 +256,7 @@ Author: Dan Bishop
               <object class="GtkImage">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="icon_name">audio-volume-high</property>
+                <property name="icon_name">audio-volume-high-symbolic</property>
               </object>
             </child>
           </object>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kita
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.6
 platform: ruby
 authors:
 - Dan Bishop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: config
@@ -119,10 +119,9 @@ files:
 - lib/kita/hiragana.rb
 - lib/kita/katakana.rb
 - lib/kita/version.rb
-- snapcraft.yaml
-- sounds/he.ogg
-- sounds/he2.ogg
-- sounds/tofix.txt
+- snap/gui/kita.desktop
+- snap/gui/kita.svg
+- snap/snapcraft.yaml
 - sounds/あ.ogg
 - sounds/あ2.ogg
 - sounds/い.ogg
@@ -270,7 +269,8 @@ files:
 - ui/builder.ui
 - ui/kita.svg
 homepage: https://www.danbishop.org
-licenses: []
+licenses:
+- GPLv3+
 metadata:
   homepage_uri: https://www.danbishop.org
   source_code_uri: https://github.com/danbishop/kita

data/snapcraft.yaml

@@ -1,18 +0,0 @@
-name: kita
-version: "0.5.0"
-summary: Japanese learning tool
-description: |
-  A simple tool to help Japanese language learners.
-
-confinement: devmode
-base: core18
-
-parts:
-  kita:
-    source: .
-    plugin: ruby
-    gems:
-      - kita
-apps:
-  kita:
-    command: bin/kita

data/sounds/tofix.txt

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