kita 0.6.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9711a0da8f810049a096344ec961730fd5dd80f65c5cf651c5af7921c3a13fd3
-  data.tar.gz: d3edfe79eedc16dc3fb35d5758c9476d3a71e5e102c68e6ed09be906d4ee3587
+  metadata.gz: 374e9343d1932d06ba3aaf1c3fad9aa24a198ac091df0d18578b9c2abc2c67ee
+  data.tar.gz: e8be7430c81d1a69ded809b65f0d9ceda82700a101ba27b789d8f2fe914900cf
 SHA512:
-  metadata.gz: b342a9ba97d484c52b2ab8500f21560be2be295868784d5e5dc015f37af2a9f466e3a2966ddae4c69572bb035fc7b0575918f22701a0b687412ba0463e23ba1e
-  data.tar.gz: d1024783d109e846e817d7c8a55ab0812062fd0f6c2171d83a0e2b4931d6a3867e0ad9617aaf2021053443a5465f799d903e5af7e708c9f61e46af5f688c6ac2
+  metadata.gz: dc77d4e0d1141c774462a6dce08a47150b8ae6615db8ed538bbc539bb645a665f77aff07070a9b8f740c225cdce197c23d30bcafe9bde91040153bc8ee48c082
+  data.tar.gz: 3d4c9c5907482bf6347cd6e972a56b463af6dc40bd59b67a33fc5dc8d3dd55e7aa076137bd7f7764b3246bf52d53bf9491b8d507825a72ba4e967b288a0d12e3

data/Gemfile.lock

@@ -1,11 +1,7 @@
 PATH
   remote: .
   specs:
-<<<<<<< Updated upstream
-    kita (0.6.0)
-=======
     kita (0.6.1)
->>>>>>> Stashed changes
       config (~> 2.2)
       gir_ffi (~> 0.15.2)
       gstreamer (~> 3.4)

data/README.md

@@ -1,3 +1,5 @@
 # <img width="60" height="60" alt="Kita Logo" src="https://raw.githubusercontent.com/danbishop/kita/master/ui/kita-bordered.svg?sanitize=true"> Kita
 
 A small GTK app to help learn the Japanese kana systems.
+
+[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/kita)

data/lib/kita.rb

@@ -3,16 +3,22 @@
 require 'gtk3'
 require_relative 'kita/audio'
 require_relative 'kita/config'
+require_relative 'kita/menu'
 require_relative 'kita/question'
 require_relative 'kita/version'
 
 module Kita
   # Main application class
   class Application < Gtk::Application
+    include Menu
+
     def initialize
       super 'uk.danbishop.kita', :handles_open
-      # Construct a Gtk::Builder instance and load our UI description
+      # Construct a Gtk::Builder instance
       @builder = Gtk::Builder.new(file: "#{File.expand_path(File.dirname(__dir__))}/ui/builder.ui")
+      # Set menu toggles to match settings
+      menu_load
+      # Now connect signals
       @builder.connect_signals { |handler| method(handler) }
       # Initiate Question class
       @question = Question.new
@@ -40,15 +46,18 @@ module Kita
     def toggle_katakana
       Settings.katakana = !Settings.katakana
       (@builder['hiragana_switch'].set_active(true) && Settings.hiragana = true) if !Settings.katakana && !Settings.hiragana
+      save_settings
     end
 
     def toggle_hiragana
       Settings.hiragana = !Settings.hiragana
       (@builder['katakana_switch'].set_active(true) && Settings.katakana = true) if !Settings.katakana && !Settings.hiragana
+      save_settings
     end
 
     def toggle_sound
-      Settings.speak = !Settings.speak
+      Settings.sound = !Settings.sound
+      save_settings
     end
 
     def ee
@@ -72,7 +81,7 @@ module Kita
       buttons = %w[a b c d]
       correct_button(buttons, question)
       wrong_buttons(buttons, question)
-      @sound.play("#{question[:question].hiragana}#{[1, 2].sample}") if Settings.speak
+      @sound.play("#{question[:question].hiragana}#{[1, 2].sample}") if Settings.sound
     end
 
     def correct_button(buttons, question)

data/lib/kita/menu.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# Menu Related Functions
+module Menu
+  def menu_load
+    puts 'Setting up menu'
+    @builder['hiragana_switch'].set_active(Settings.hiragana)
+    @builder['katakana_switch'].set_active(Settings.katakana)
+    @builder['sound_switch'].set_active(Settings.sound)
+  end
+end

data/lib/kita/version.rb

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

data/snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: kita
-version: '0.6.1'
+version: '0.9.0'
 summary: Japanese learning tool
 description: |
   A simple tool to help Japanese language learners.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kita
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Dan Bishop
@@ -120,6 +120,7 @@ files:
 - lib/kita/config.rb
 - lib/kita/hiragana.rb
 - lib/kita/katakana.rb
+- lib/kita/menu.rb
 - lib/kita/question.rb
 - lib/kita/version.rb
 - snap/gui/kita.desktop