From d56c72f4ab9044011b11be08b8b71b6412c6d9fb Mon Sep 17 00:00:00 2001 From: sergiotarxz Date: Sun, 7 Jul 2024 04:05:57 +0200 Subject: [PATCH] Major refactor because it was getting very hard to maintain. Menus before entering and lesson and after leaving it. --- lib/JapaChar.pm | 341 ++---------------- lib/JapaChar/DB/Migrations.pm | 1 + lib/JapaChar/Schema/Result/Option.pm | 28 ++ lib/JapaChar/Score.pm | 34 ++ lib/JapaChar/View/HiraganaKatakanaLesson.pm | 215 +++++++++++ .../View/HiraganaKatakanaTestExercise.pm | 337 +++++++++++++++++ lib/JapaChar/View/MainMenu.pm | 117 ++++++ style.css | 2 +- t/all-learned-basic-characters.db | Bin 40960 -> 40960 bytes 9 files changed, 756 insertions(+), 319 deletions(-) create mode 100644 lib/JapaChar/Schema/Result/Option.pm create mode 100644 lib/JapaChar/Score.pm create mode 100644 lib/JapaChar/View/HiraganaKatakanaLesson.pm create mode 100644 lib/JapaChar/View/HiraganaKatakanaTestExercise.pm create mode 100644 lib/JapaChar/View/MainMenu.pm diff --git a/lib/JapaChar.pm b/lib/JapaChar.pm index ca868fc..5fc9231 100644 --- a/lib/JapaChar.pm +++ b/lib/JapaChar.pm @@ -15,6 +15,8 @@ use JapaChar::DB; use JapaChar::Characters; use Pango; use JapaChar::Random; +use JapaChar::Score; +use JapaChar::View::MainMenu; use Glib::IO; @@ -44,16 +46,12 @@ Glib::Object::Introspection->setup( package => 'Adw', ); -has _counter => ( is => 'rw', ); - -has _headerbar => ( is => 'rw', ); +has headerbar => ( is => 'rw', ); has _on_resize_lesson => ( is => 'rw', ); has _gresources_path => ( is => 'lazy', ); -has _first_press_continue => ( is => 'rw' ); -has _final_answer => ( is => 'rw' ); -has _continue_button => ( is => 'rw' ); -has _on_resize_continue_button => ( is => 'rw' ); +has _window => ( is => 'rw' ); +has _on_resize_triggers => ( is => 'ro', default => sub { {}; } ); sub _build__gresources_path($self) { my $root = path(__FILE__)->parent->parent; @@ -68,321 +66,30 @@ sub _build__gresources_path($self) { return $gresources; } +sub get_width($self) { + return $self->_window->get_property('default-width'); +} + sub config($class) { my $ypp = YAML::PP->new; $ypp->load_file( '' . path(__FILE__)->parent->parent->child('config.yml') ); } -sub _start_lesson( $self, $window, $type = undef ) { - $self->_counter(11); - $self->_new_challenge( $window, $type ); +sub on_resize( $self, $sub ) { + $self->_on_resize_triggers->{$sub} = $sub; } -sub _new_challenge( $self, $window, $type = undef ) { - $self->_counter( $self->_counter - 1 ); - if ( $self->_counter < 1 ) { - $self->_create_main_menu($window); - return; - } - my $rng = JapaChar::Random->new->get( 1, 100 ); - if ( $rng > 50 ) { - $self->_new_challenge_romanji( $window, $type ); - return; - } - $self->_new_challenge_kana( $window, $type ); +sub delete_on_resize( $self, $sub ) { + return if !defined $sub; + delete $self->_on_resize_triggers->{$sub}; } -sub _new_challenge_romanji( $self, $window, $type = undef ) { - my $show = 'romanji'; - my $guess = 'kana'; - $self->_new_challenge_generic_code( $window, $type, $show, $guess ); +sub present_dialog( $self, $dialog ) { + $dialog->present( $self->_window ); } -sub _new_typing_romanji_challenge( $self, $window, $char, $type ) { - my $grid = $self->_create_grid_challenge; - my $kana_label = $self->_get_label_featured_character( $char->get('kana') ); - $kana_label->set_halign('center'); - $kana_label->set_valign('center'); - $grid->attach( $kana_label, 0, 0, 12, 1 ); - $self->_window_set_child( $window, $grid ); - my $back_button = $self->_create_exit_lesson_back_button($window); - $self->_headerbar->pack_start($back_button); - my $romanji_entry = Gtk::Entry->new; - my $attr_list = Pango::AttrList->new; - my $size_number = 60 * $window->get_property('default-width'); - my $size_pango_number = PANGO_SCALE * 60; - my $size = Pango::AttrSize->new($size_number); - - if ( $size_pango_number < $size_number ) { - $size = Pango::AttrSize->new($size_pango_number); - } - $attr_list->insert($size); - $romanji_entry->set_attributes($attr_list); - my $buffer = $romanji_entry->get_buffer; - $self->_first_press_continue(1); - my $continue_button = - $self->_create_continue_lesson_button( $window, $grid, $char, $type, - 'romanji' ); - my $on_change_buffer = sub { - my $text = $buffer->get_text; - if ( !$text ) { - $continue_button->set_sensitive(0); - return; - } - $self->_final_answer( lc($text) ); - $continue_button->set_sensitive(1); - }; - $buffer->signal_connect( - 'inserted-text', - sub { - $on_change_buffer->(); - } - ); - $buffer->signal_connect( - 'deleted-text', - sub { - $on_change_buffer->(); - } - ); - - $romanji_entry->set_valign('center'); - $romanji_entry->set_halign('center'); - $grid->attach( $romanji_entry, 2, 1, 8, 1 ); - - $grid->attach( $continue_button, 6, 2, 5, 1 ); -} - -sub _create_exit_lesson_back_button( $self, $window ) { - my $back_button = Gtk::Button->new_from_icon_name('go-previous-symbolic'); - $back_button->signal_connect( - 'clicked', - sub { - my $dialog = Adw::AlertDialog->new( 'Exit the lessson', - 'On exit you will lose your progress' ); - $dialog->add_response( 'close', 'Continue' ); - my $exit_the_lesson_id = 'exit-the-lesson'; - $dialog->add_response( $exit_the_lesson_id, 'Exit' ); - $dialog->set_response_appearance( $exit_the_lesson_id, - 'destructive' ); - $dialog->present($window); - $dialog->signal_connect( - 'response', - sub( $obj, $response ) { - if ( $response eq $exit_the_lesson_id ) { - $self->_create_main_menu($window); - return; - } - } - ); - } - ); - return $back_button; -} - -sub _new_challenge_generic_code( $self, $window, $type, $show, $guess, - $can_be_typed = 0 ) -{ - my $grid = $self->_create_grid_challenge; - my $char = JapaChar::Characters->new->next_char($type); - my $kana_label = $self->_get_label_featured_character( $char->get($show) ); - my $rng = JapaChar::Random->new->get( 1, 100 ); - if ( $char->score > 60 && $can_be_typed && $rng > 30 ) { - $self->_new_typing_romanji_challenge( $window, $char, $type ); - return; - } - $kana_label->set_halign('center'); - $kana_label->set_valign('center'); - $grid->attach( $kana_label, 0, 0, 12, 1 ); - $self->_window_set_child( $window, $grid ); - my $back_button = $self->_create_exit_lesson_back_button($window); - $self->_headerbar->pack_start($back_button); - my $incorrect_chars = - JapaChar::Characters->new->get_4_incorrect_answers($char); - my @buttons; - my $continue_button = - $self->_create_continue_lesson_button( $window, $grid, $char, $type, - $guess ); - my $on_answer = sub { - $continue_button->set_sensitive(1); - }; - my $correct_answer_button = - Gtk::ToggleButton->new_with_label( $char->get($guess) ); - $correct_answer_button->signal_connect( - 'clicked', - sub { - $self->_final_answer( $char->get($guess) ); - $on_answer->(); - } - ); - push @buttons, $correct_answer_button; - for my $char (@$incorrect_chars) { - my $incorrect_button = - Gtk::ToggleButton->new_with_label( $char->get($guess) ); - $incorrect_button->set_group($correct_answer_button); - $incorrect_button->signal_connect( - 'clicked', - sub { - $self->_final_answer( $char->get($guess) ); - $on_answer->(); - } - ); - push @buttons, $incorrect_button; - } - @buttons = sort { rand() <=> rand() } @buttons; - my $box = Gtk::Box->new( 'horizontal', 10 ); - $box->set_valign('center'); - $box->set_halign('center'); - my $resize_buttons = sub { - my $window_size = $window->get_property('default-width'); - $box->set_spacing( 5 * $window_size / 420 ); - for my $button (@buttons) { - my $attr_list = Pango::AttrList->new; - my $size_number = 45 * $window_size; - my $size_pango_number = PANGO_SCALE * 60; - my $size = Pango::AttrSize->new($size_number); - if ( $size_pango_number < $size_number ) { - $size = Pango::AttrSize->new($size_pango_number); - } - $attr_list->insert($size); - $button->get_child->set_attributes($attr_list); - } - }; - $resize_buttons->(); - for my $button (@buttons) { - $box->append($button); - } - $self->_on_resize_lesson($resize_buttons); - $self->_first_press_continue(1); - $grid->attach( $box, 0, 1, 12, 1 ); - $grid->attach( $continue_button, 6, 2, 5, 1 ); -} - -sub _create_continue_lesson_button( $self, $window, $grid, $char, $type, - $guess ) -{ - my $continue_button = Gtk::Button->new_with_label('Continue'); - $continue_button->set_valign('center'); - $continue_button->set_halign('end'); - $continue_button->set_sensitive(0); - $continue_button->add_css_class('accent'); - $self->_on_resize_continue_button( - sub { - my $attr_list = Pango::AttrList->new; - my $size = Pango::AttrSize->new( - 40 * $window->get_property('default-width') ); - - $attr_list->insert($size); - $continue_button->get_child->set_attributes($attr_list); - } - ); - $self->_on_resize_continue_button->(); - $continue_button->signal_connect( - 'clicked', - sub { - if ( !$self->_first_press_continue ) { - $self->_new_challenge( $window, $type ); - return; - } - $self->_first_press_continue(0); - my $label_feedback; - { - if ( $self->_final_answer eq $char->get($guess) ) { - $label_feedback = - Gtk::Label->new('You are doing it great.'); - $label_feedback->add_css_class('success'); - $char->success; - next; - } - $label_feedback = Gtk::Label->new( - 'Meck!! The correct answer is ' . $char->get($guess) ); - $label_feedback->add_css_class('error'); - $char->fail; - } - my $attr_list = Pango::AttrList->new; - my $size = Pango::AttrSize->new( - 23 * $window->get_property('default-width') ); - $attr_list->insert($size); - $label_feedback->set_halign('center'); - $label_feedback->set_attributes($attr_list); - $grid->attach( $label_feedback, 0, 2, 7, 1 ); - } - ); - return $continue_button; -} - -sub _new_challenge_kana( $self, $window, $type = undef ) { - my $show = 'kana'; - my $guess = 'romanji'; - $self->_new_challenge_generic_code( $window, $type, $show, $guess, 1 ); -} - -sub _create_grid_challenge($self) { - my $grid = Gtk::Grid->new; - $grid->set_column_homogeneous(1); - $grid->set_row_homogeneous(1); - return $grid; -} - -sub _get_label_featured_character( $self, $text ) { - my $label = Gtk::Label->new($text); - my $attr_list = Pango::AttrList->new; - my $size = Pango::AttrSize->new( 72 * PANGO_SCALE ); - $attr_list->insert($size); - $label->set_attributes($attr_list); - $label->set_halign('center'); - return $label; -} - -sub _create_main_menu( $self, $window ) { - my $grid = Gtk::Grid->new; - my $button_start_basic_lesson = - Gtk::Button->new_with_label('Basic Characters'); - $self->_on_resize_lesson(undef); - $self->_on_resize_continue_button(undef); - $button_start_basic_lesson->signal_connect( - 'clicked', - sub { - $self->_start_lesson($window); - } - ); - $grid->set_column_homogeneous(1); - $grid->set_row_homogeneous(1); - my $button_start_hiragana_lesson = Gtk::Button->new_with_label('Hiragana'); - $button_start_hiragana_lesson->signal_connect( - 'clicked', - sub { - $self->_start_lesson( $window, 'hiragana' ); - } - ); - my $button_start_katakana_lesson = Gtk::Button->new_with_label('Katakana'); - $button_start_katakana_lesson->signal_connect( - 'clicked', - sub { - $self->_start_lesson( $window, 'katakana' ); - } - ); - for my $button ( $button_start_basic_lesson, $button_start_hiragana_lesson, - $button_start_katakana_lesson ) - { - my $attr_list = Pango::AttrList->new; - my $size = Pango::AttrSize->new( 25 * PANGO_SCALE ); - $attr_list->insert($size); - $button->get_child->set_attributes($attr_list); - } - my $box = Gtk::Box->new( 'horizontal', 10 ); - $grid->attach( $button_start_basic_lesson, 0, 0, 5, 1 ); - $button_start_basic_lesson->set_valign('end'); - $button_start_basic_lesson->set_halign('center'); - $box->set_margin_top(40); - $box->append($button_start_hiragana_lesson); - $box->append($button_start_katakana_lesson); - $box->set_valign('start'); - $box->set_halign('center'); - $grid->attach( $box, 0, 1, 5, 1 ); - $self->_window_set_child( $window, $grid ); -} - -sub _window_set_child( $self, $window, $child ) { +sub window_set_child( $self, $child ) { + my $window = $self->_window; my $box = Gtk::Box->new( 'vertical', 0 ); my $headerbar = Adw::HeaderBar->new; $headerbar->set_title_widget( Gtk::Label->new('Japachar') ); @@ -390,26 +97,24 @@ sub _window_set_child( $self, $window, $child ) { $box->append($child); $child->set_vexpand(1); $window->set_content($box); - $self->_headerbar($headerbar); + $self->headerbar($headerbar); } sub _application_start( $self, $app ) { my $main_window = Adw::ApplicationWindow->new($app); + $self->_window($main_window); $main_window->set_default_size( 1200, 600 ); $main_window->signal_connect( notify => sub( $object, $param ) { if ( $param->{name} eq 'default-width' ) { - if ( defined $self->_on_resize_lesson ) { - $self->_on_resize_lesson->(); - } - if ( defined $self->_on_resize_continue_button ) { - $self->_on_resize_continue_button->(); + for my $resize_key ( keys $self->_on_resize_triggers->%* ) { + $self->_on_resize_triggers->{$resize_key}->(); } } } ); my $display = $main_window->get_property('display'); - $self->_create_main_menu($main_window); + JapaChar::View::MainMenu->new( app => $self )->run; $main_window->present; } diff --git a/lib/JapaChar/DB/Migrations.pm b/lib/JapaChar/DB/Migrations.pm index 6238be2..001d79e 100644 --- a/lib/JapaChar/DB/Migrations.pm +++ b/lib/JapaChar/DB/Migrations.pm @@ -23,6 +23,7 @@ sub MIGRATIONS { score INTEGER NOT NULL DEFAULT 0, consecutive_success INTEGER NOT NULL DEFAULT 0 );', + 'INSERT INTO options (name, value) VALUES (\'user_score\', \'0\');', ); } 1; diff --git a/lib/JapaChar/Schema/Result/Option.pm b/lib/JapaChar/Schema/Result/Option.pm new file mode 100644 index 0000000..29d6416 --- /dev/null +++ b/lib/JapaChar/Schema/Result/Option.pm @@ -0,0 +1,28 @@ +package JapaChar::Schema::Result::Option; + +use v5.38.2; + +use strict; +use warnings; + +use feature 'signatures'; + +use parent 'DBIx::Class::Core'; + +use Encode qw/decode/; + +__PACKAGE__->table('options'); + +__PACKAGE__->add_columns( + name => { + data_type => 'TEXT', + is_nullable => 0, + }, + value => { + data_type => 'TEXT', + is_nullable => 0, + }, +); + +__PACKAGE__->set_primary_key('name'); +1; diff --git a/lib/JapaChar/Score.pm b/lib/JapaChar/Score.pm new file mode 100644 index 0000000..bec75f5 --- /dev/null +++ b/lib/JapaChar/Score.pm @@ -0,0 +1,34 @@ +package JapaChar::Score; + +use v5.38.2; + +use strict; +use warnings; + +use Moo; + +my $option_name = 'user_score'; + +require JapaChar::DB; +require JapaChar::Schema; + +sub _get_row($self) { + my ($result) = JapaChar::Schema->Schema->resultset('Option')->search({ name => $option_name }); + return $result; +} + +sub get($self) { + return 0 + $self->_get_row->value; +} + +sub update($self, $new_value) { + return $self->_get_row->update({value => $new_value}); +} + +sub sum($self, $to_sum) { + if ($to_sum < 0) { + die "\$to_sum is negative: $to_sum"; + } + return $self->update($self->get+$to_sum); +} +1; diff --git a/lib/JapaChar/View/HiraganaKatakanaLesson.pm b/lib/JapaChar/View/HiraganaKatakanaLesson.pm new file mode 100644 index 0000000..064d9db --- /dev/null +++ b/lib/JapaChar/View/HiraganaKatakanaLesson.pm @@ -0,0 +1,215 @@ +package JapaChar::View::HiraganaKatakanaLesson; + +use v5.38.2; + +use strict; +use warnings; + +use feature 'signatures'; + +use Moo; +use Path::Tiny; +use Glib::Object::Introspection; +use YAML::PP; +use JapaChar::DB; +use JapaChar::Characters; +use Pango; +use JapaChar::Random; +use JapaChar::Score; + +use Glib::IO; + +use constant PANGO_SCALE => 1024; + +Glib::Object::Introspection->setup( + basename => 'Gtk', + version => '4.0', + package => 'Gtk', +); + +Glib::Object::Introspection->setup( + basename => 'Gdk', + version => '4.0', + package => 'Gtk::Gdk', +); + +Glib::Object::Introspection->setup( + basename => 'Gsk', + version => '4.0', + package => 'Gtk::Gsk', +); + +Glib::Object::Introspection->setup( + basename => 'Adw', + version => '1', + package => 'Adw', +); + +has app => ( is => 'ro' ); +has type => ( is => 'ro' ); +has counter => ( is => 'rw' ); +has _successes => ( is => 'rw' ); + +sub run($self) { + $self->counter(11); + $self->_show_start_lesson; +} + +sub _show_start_lesson($self) { + my $type = $self->type; + my $box = Gtk::Box->new( 'vertical', 0 ); + my $back_button = Gtk::Button->new_from_icon_name('go-previous-symbolic'); + my $intro = Gtk::Label->new('This lesson has 10 exercises.'); + my $intro2 = Gtk::Label->new('10 points on completion.'); + my $intro3 = Gtk::Label->new('10 extra points if you do it very well'); + $intro->set_margin_top(50); + $box->append($intro); + $box->append($intro2); + $box->append($intro3); + my $continue_button = Gtk::Button->new_with_label('Continue'); + $continue_button->add_css_class('accent'); + my $resize = sub { + my $attr_list = Pango::AttrList->new; + my $size_number = 30 * $self->app->get_width; + my $size_pango_number = PANGO_SCALE * 60; + my $size = Pango::AttrSize->new($size_number); + + if ( $size_pango_number < $size_number ) { + $size = Pango::AttrSize->new($size_pango_number); + } + $attr_list->insert($size); + $intro->set_attributes($attr_list); + $intro2->set_attributes($attr_list); + $intro3->set_attributes($attr_list); + $continue_button->get_child->set_attributes($attr_list); + }; + $resize->(); + $self->app->on_resize($resize); + $continue_button->signal_connect( + 'clicked', + sub { + $self->app->delete_on_resize($resize); + $continue_button->set_sensitive(0); + $self->_successes(0); + require JapaChar::View::HiraganaKatakanaTestExercise; + JapaChar::View::HiraganaKatakanaTestExercise->new( lesson => $self ) + ->run; + } + ); + $box->append($continue_button); + $continue_button->set_halign('end'); + $continue_button->set_valign('end'); + $continue_button->set_vexpand(1); + $back_button->signal_connect( + 'clicked', + sub { + $self->app->delete_on_resize($resize); + require JapaChar::View::MainMenu; + JapaChar::View::MainMenu->new( app => $self->app )->run; + } + ); + $continue_button->set_margin_end(50); + $continue_button->set_margin_bottom(50); + $self->app->window_set_child($box); + $self->app->headerbar->pack_start($back_button); +} + +sub create_continue_lesson_button( $self, $on_click ) { + my $type = $self->type; + my $continue_button = Gtk::Button->new_with_label('Continue'); + $continue_button->set_valign('center'); + $continue_button->set_halign('end'); + $continue_button->set_sensitive(0); + $continue_button->add_css_class('accent'); + $continue_button->signal_connect( 'clicked', $on_click, ); + return $continue_button; +} + +sub add_one_success($self) { + $self->_successes( $self->_successes + 1 ); +} + +sub create_exit_lesson_back_button( $self, $on_exit ) { + my $back_button = Gtk::Button->new_from_icon_name('go-previous-symbolic'); + $back_button->signal_connect( + 'clicked', + sub { + $back_button->set_sensitive(0); + my $dialog = Adw::AlertDialog->new( 'Exit the lessson', + 'On exit you will lose your progress' ); + $dialog->add_response( 'close', 'Continue' ); + my $exit_the_lesson_id = 'exit-the-lesson'; + $dialog->add_response( $exit_the_lesson_id, 'Exit' ); + $dialog->set_response_appearance( $exit_the_lesson_id, + 'destructive' ); + $self->app->present_dialog($dialog); + $dialog->signal_connect( + 'response', + sub( $obj, $response ) { + if ( $response eq $exit_the_lesson_id ) { + $on_exit->(); + require JapaChar::View::MainMenu; + JapaChar::View::MainMenu->new( app => $self )->run; + return; + } + } + ); + } + ); + return $back_button; +} + +sub finish_lesson_screen($self) { + my $notable_lesson = $self->_successes >= 7; + my $feedback_label; + my $box = Gtk::Box->new( 'vertical', 10 ); + if ($notable_lesson) { + $feedback_label = + Gtk::Label->new('You did it great, here you have your 20 points.'); + } + else { + $feedback_label = Gtk::Label->new( + 'You need to continue improving, we have 10 points for you'); + } + + my $continue_button = Gtk::Button->new_with_label('Continue'); + $continue_button->add_css_class('accent'); + $continue_button->set_halign('end'); + $continue_button->set_valign('end'); + $continue_button->set_vexpand(1); + $feedback_label->set_valign('center'); + $feedback_label->set_halign('center'); + $feedback_label->set_vexpand(1); + my $resize = sub { + my $attr_list = Pango::AttrList->new; + my $size_number = 20 * $self->app->get_width; + my $size_pango_number = PANGO_SCALE * 35; + my $size = Pango::AttrSize->new($size_number); + + if ( $size_pango_number < $size_number ) { + $size = Pango::AttrSize->new($size_pango_number); + } + $attr_list->insert($size); + $feedback_label->set_attributes($attr_list); + $continue_button->get_child->set_attributes($attr_list); + }; + $self->app->on_resize($resize); + $continue_button->set_margin_end(50); + $continue_button->set_margin_bottom(50); + $resize->(); + $box->append($feedback_label); + $box->append($continue_button); + $continue_button->signal_connect( + 'clicked', + sub { + $self->app->delete_on_resize($resize); + JapaChar::Score->sum( $notable_lesson ? 20 : 10 ); + $continue_button->set_sensitive(0); + require JapaChar::View::MainMenu; + JapaChar::View::MainMenu->new( app => $self->app )->run; + } + ); + $self->app->window_set_child($box); +} + +1; diff --git a/lib/JapaChar/View/HiraganaKatakanaTestExercise.pm b/lib/JapaChar/View/HiraganaKatakanaTestExercise.pm new file mode 100644 index 0000000..3caa911 --- /dev/null +++ b/lib/JapaChar/View/HiraganaKatakanaTestExercise.pm @@ -0,0 +1,337 @@ +package JapaChar::View::HiraganaKatakanaTestExercise; + +use v5.38.2; + +use strict; +use warnings; + +use feature 'signatures'; + +use Moo; +use Path::Tiny; +use Glib::Object::Introspection; +use YAML::PP; +use JapaChar::DB; +use JapaChar::Characters; +use Pango; +use JapaChar::Random; +use JapaChar::Score; + +use Glib::IO; + +use constant PANGO_SCALE => 1024; + +Glib::Object::Introspection->setup( + basename => 'Gtk', + version => '4.0', + package => 'Gtk', +); + +Glib::Object::Introspection->setup( + basename => 'Gdk', + version => '4.0', + package => 'Gtk::Gdk', +); + +Glib::Object::Introspection->setup( + basename => 'Gsk', + version => '4.0', + package => 'Gtk::Gsk', +); + +Glib::Object::Introspection->setup( + basename => 'Adw', + version => '1', + package => 'Adw', +); + +has lesson => ( is => 'rw' ); +has _type => ( is => 'lazy' ); +has _app => ( is => 'lazy' ); +has _buttons => ( is => 'rw' ); +has _buttons_box => ( is => 'rw' ); +has _first_press_continue => ( is => 'rw', default => sub { 1 } ); +has _continue_button => ( is => 'rw' ); +has _on_resize_continue_button => ( is => 'lazy' ); +has _final_answer => ( is => 'rw' ); +has _on_resize_buttons => ( is => 'lazy' ); + +sub _counter($self) { + return $self->lesson->counter; +} + +sub _build__type($self) { + return $self->lesson->type; +} + +sub _build__app($self) { + return $self->lesson->app; +} + +sub run($self) { + $self->lesson->counter( $self->_counter - 1 ); + if ( $self->_counter < 1 ) { + $self->lesson->finish_lesson_screen(); + return; + } + my $rng = JapaChar::Random->new->get( 1, 100 ); + if ( $rng > 50 ) { + $self->_new_challenge_romanji(); + return; + } + $self->_new_challenge_kana(); +} + +sub _new_challenge_kana($self) { + my $show = 'kana'; + my $guess = 'romanji'; + $self->_new_challenge_generic_code( $show, $guess, 1 ); +} + +sub _new_challenge_romanji($self) { + my $show = 'romanji'; + my $guess = 'kana'; + $self->_new_challenge_generic_code( $show, $guess ); +} + +sub _new_challenge_generic_code( $self, $show, $guess, $can_be_typed = 0 ) { + my $type = $self->_type; + my $grid = $self->_create_grid_challenge; + my $char = JapaChar::Characters->new->next_char($type); + my $kana_label = $self->_get_label_featured_character( $char->get($show) ); + my $rng = JapaChar::Random->new->get( 1, 100 ); + + if ( $char->score > 60 && $can_be_typed && $rng > 30 ) { + $self->_new_typing_romanji_challenge($char); + return; + + } + $kana_label->set_halign('center'); + $kana_label->set_valign('center'); + my $box_kana = Gtk::Box->new( 'vertical', 10 ); + $box_kana->append( $self->_new_exercise_number_label ); + $box_kana->append($kana_label); + $grid->attach( $box_kana, 0, 0, 12, 1 ); + $self->_app->window_set_child($grid); + my $back_button = $self->lesson->create_exit_lesson_back_button( + sub { + $self->_app->delete_on_resize( $self->_on_resize_continue_button ); + } + ); + $self->_app->headerbar->pack_start($back_button); + my $incorrect_chars = + JapaChar::Characters->new->get_4_incorrect_answers($char); + $self->_app->on_resize( $self->_on_resize_continue_button ); + my @buttons; + my $continue_button = $self->lesson->create_continue_lesson_button( + sub { + $self->_on_click_continue_button( $grid, $char, $guess ); + } + ); + $self->_continue_button($continue_button); + $self->_on_resize_continue_button->(); + my $on_answer = sub { + $continue_button->set_sensitive(1); + }; + my $correct_answer_button = + Gtk::ToggleButton->new_with_label( $char->get($guess) ); + $correct_answer_button->signal_connect( + 'clicked', + sub { + $self->_final_answer( $char->get($guess) ); + $on_answer->(); + } + ); + push @buttons, $correct_answer_button; + $self->_buttons( \@buttons ); + for my $char (@$incorrect_chars) { + my $incorrect_button = + Gtk::ToggleButton->new_with_label( $char->get($guess) ); + $incorrect_button->set_group($correct_answer_button); + $incorrect_button->signal_connect( + 'clicked', + sub { + $self->_final_answer( $char->get($guess) ); + $on_answer->(); + } + ); + push @buttons, $incorrect_button; + } + @buttons = sort { rand() <=> rand() } @buttons; + my $box = Gtk::Box->new( 'horizontal', 10 ); + $box->set_valign('center'); + $box->set_halign('center'); + my $resize_buttons = sub { + }; + $resize_buttons->(); + + for my $button (@buttons) { + $box->append($button); + } + $self->_buttons_box($box); + $self->_on_resize_buttons->(); + $self->_app->on_resize($resize_buttons); + $grid->attach( $box, 0, 2, 12, 1 ); + $grid->attach( $continue_button, 6, 3, 5, 1 ); +} + +sub _build__on_resize_buttons($self) { + return sub { + return if !defined $self->_buttons_box; + my @buttons = $self->_buttons->@*; + my $window_size = $self->_app->get_width; + for my $button (@buttons) { + my $attr_list = Pango::AttrList->new; + my $size_number = 45 * $window_size; + my $size_pango_number = PANGO_SCALE * 60; + my $size = Pango::AttrSize->new($size_number); + if ( $size_pango_number < $size_number ) { + $size = Pango::AttrSize->new($size_pango_number); + } + $attr_list->insert($size); + $button->get_child->set_attributes($attr_list); + } + }; +} + +sub _create_grid_challenge($self) { + my $grid = Gtk::Grid->new; + $grid->set_column_homogeneous(1); + $grid->set_row_homogeneous(1); + return $grid; +} + +sub _get_label_featured_character( $self, $text ) { + my $label = Gtk::Label->new($text); + my $attr_list = Pango::AttrList->new; + my $size = Pango::AttrSize->new( 72 * PANGO_SCALE ); + $attr_list->insert($size); + $label->set_attributes($attr_list); + $label->set_halign('center'); + return $label; +} + +sub _new_typing_romanji_challenge( $self, $char ) { + my $grid = $self->_create_grid_challenge; + my $kana_label = $self->_get_label_featured_character( $char->get('kana') ); + $kana_label->set_halign('center'); + $kana_label->set_valign('center'); + my $box_kana = Gtk::Box->new( 'vertical', 10 ); + $box_kana->append( $self->_new_exercise_number_label ); + $box_kana->append($kana_label); + $grid->attach( $box_kana, 0, 0, 12, 1 ); + $self->_app->window_set_child($grid); + my $back_button = $self->lesson->create_exit_lesson_back_button( + sub { + $self->_on_exit; + } + ); + $self->_app->headerbar->pack_start($back_button); + my $romanji_entry = Gtk::Entry->new; + my $attr_list = Pango::AttrList->new; + my $size_number = 60 * $self->_app->get_width; + my $size_pango_number = PANGO_SCALE * 60; + my $size = Pango::AttrSize->new($size_number); + + if ( $size_pango_number < $size_number ) { + $size = Pango::AttrSize->new($size_pango_number); + } + $attr_list->insert($size); + $romanji_entry->set_attributes($attr_list); + my $buffer = $romanji_entry->get_buffer; + $self->_app->on_resize( $self->_on_resize_continue_button ); + my $continue_button = $self->lesson->create_continue_lesson_button( + sub { + $self->_on_click_continue_button( $grid, $char, 'romanji' ); + } + ); + $self->_continue_button($continue_button); + $self->_on_resize_continue_button->(); + my $on_change_buffer = sub { + my $text = $buffer->get_text; + if ( !$text ) { + $continue_button->set_sensitive(0); + return; + } + $self->_final_answer( lc($text) ); + $continue_button->set_sensitive(1); + }; + $buffer->signal_connect( + 'inserted-text', + sub { + $on_change_buffer->(); + } + ); + $buffer->signal_connect( + 'deleted-text', + sub { + $on_change_buffer->(); + } + ); + + $romanji_entry->set_valign('center'); + $romanji_entry->set_halign('center'); + $grid->attach( $romanji_entry, 2, 1, 8, 1 ); + + $grid->attach( $continue_button, 6, 3, 5, 1 ); +} + +sub _new_exercise_number_label($self) { + my $exercise_number = abs( $self->_counter - 11 ); + my $return = Gtk::Label->new( 'Exercise: ' . $exercise_number ); + $return->set_halign('start'); + return $return; +} + +sub _build__on_resize_continue_button($self) { + return sub { + my $continue_button = $self->_continue_button; + my $attr_list = Pango::AttrList->new; + my $size = Pango::AttrSize->new( 40 * $self->_app->get_width ); + + $attr_list->insert($size); + $continue_button->get_child->set_attributes($attr_list); + }; +} + +sub _on_exit($self) { + $self->_app->delete_on_resize( $self->_on_resize_buttons ); + $self->_app->delete_on_resize( $self->_on_resize_continue_button ); +} + +sub _on_click_continue_button( $self, $grid, $char, $guess ) { + my $continue_button = $self->_continue_button; + if ( defined $self->_buttons ) { + for my $button ( $self->_buttons->@* ) { + $button->set_sensitive(0); + } + } + if ( !$self->_first_press_continue ) { + $self->_on_exit; + $continue_button->set_sensitive(0); + $self->new( lesson => $self->lesson )->run; + return; + } + $self->_first_press_continue(0); + my $label_feedback; + { + if ( $self->_final_answer eq $char->get($guess) ) { + $label_feedback = Gtk::Label->new('You are doing it great.'); + $label_feedback->add_css_class('success'); + $self->lesson->add_one_success; + $char->success; + next; + } + $label_feedback = Gtk::Label->new( + 'Meck!! The correct answer is ' . $char->get($guess) ); + $label_feedback->add_css_class('error'); + $char->fail; + } + my $attr_list = Pango::AttrList->new; + my $size = Pango::AttrSize->new( 23 * $self->_app->get_width ); + $attr_list->insert($size); + $label_feedback->set_halign('center'); + $label_feedback->set_attributes($attr_list); + $grid->attach( $label_feedback, 0, 3, 7, 1 ); +} +1; diff --git a/lib/JapaChar/View/MainMenu.pm b/lib/JapaChar/View/MainMenu.pm new file mode 100644 index 0000000..cdb34e9 --- /dev/null +++ b/lib/JapaChar/View/MainMenu.pm @@ -0,0 +1,117 @@ +package JapaChar::View::MainMenu; + +use v5.38.2; + +use strict; +use warnings; + +use feature 'signatures'; + +use Moo; +use Path::Tiny; +use Glib::Object::Introspection; +use YAML::PP; +use JapaChar::DB; +use JapaChar::Characters; +use Pango; +use JapaChar::Random; +use JapaChar::Score; +use JapaChar::View::HiraganaKatakanaLesson; + +use Glib::IO; + +use constant PANGO_SCALE => 1024; + +Glib::Object::Introspection->setup( + basename => 'Gtk', + version => '4.0', + package => 'Gtk', +); + +Glib::Object::Introspection->setup( + basename => 'Gdk', + version => '4.0', + package => 'Gtk::Gdk', +); + +Glib::Object::Introspection->setup( + basename => 'Gsk', + version => '4.0', + package => 'Gtk::Gsk', +); + +Glib::Object::Introspection->setup( + basename => 'Adw', + version => '1', + package => 'Adw', +); + +has app => ( is => 'ro' ); + +sub run($self) { + my $grid = Gtk::Grid->new; + my $button_start_basic_lesson = + Gtk::Button->new_with_label('Basic Characters'); + $button_start_basic_lesson->signal_connect( + 'clicked', + sub { + my $lesson = + JapaChar::View::HiraganaKatakanaLesson->new( app => $self->app ); + $lesson->run; + } + ); + $grid->set_column_homogeneous(1); + $grid->set_row_homogeneous(1); + my $button_start_hiragana_lesson = Gtk::Button->new_with_label('Hiragana'); + $button_start_hiragana_lesson->signal_connect( + 'clicked', + sub { + my $lesson = JapaChar::View::HiraganaKatakanaLesson->new( + app => $self->app, + type => 'hiragana' + ); + $lesson->run; + } + ); + my $button_start_katakana_lesson = Gtk::Button->new_with_label('Katakana'); + $button_start_katakana_lesson->signal_connect( + 'clicked', + sub { + my $lesson = JapaChar::View::HiraganaKatakanaLesson->new( + app => $self->app, + type => 'katakana' + ); + $lesson->run; + } + ); + for my $button ( $button_start_basic_lesson, $button_start_hiragana_lesson, + $button_start_katakana_lesson ) + { + my $attr_list = Pango::AttrList->new; + my $size = Pango::AttrSize->new( 25 * PANGO_SCALE ); + $attr_list->insert($size); + $button->get_child->set_attributes($attr_list); + } + my $box = Gtk::Box->new( 'horizontal', 10 ); + my $box_score_basic_lesson = Gtk::Box->new( 'vertical', 10 ); + my $score_label = + Gtk::Label->new("Total Score: @{[JapaChar::Score->new->get]}"); + $box_score_basic_lesson->append($score_label); + $box_score_basic_lesson->append($button_start_basic_lesson); + $score_label->set_halign('start'); + $score_label->set_valign('start'); + $box_score_basic_lesson->set_vexpand(1); + $button_start_basic_lesson->set_vexpand(1); + $button_start_basic_lesson->set_valign('end'); + $grid->attach( $box_score_basic_lesson, 0, 0, 5, 1 ); + $button_start_basic_lesson->set_valign('end'); + $button_start_basic_lesson->set_halign('center'); + $box->set_margin_top(40); + $box->append($button_start_hiragana_lesson); + $box->append($button_start_katakana_lesson); + $box->set_valign('start'); + $box->set_halign('center'); + $grid->attach( $box, 0, 1, 5, 1 ); + $self->app->window_set_child($grid); +} +1; diff --git a/style.css b/style.css index f49cbec..c672d77 100644 --- a/style.css +++ b/style.css @@ -3,5 +3,5 @@ headerbar box { } button { - min-width: 5px; + min-width: 0; } diff --git a/t/all-learned-basic-characters.db b/t/all-learned-basic-characters.db index 2bd93f20046ec712af89345968078e4656522f0d..42c4d852987293143f7c05544b79d0f4107b262f 100644 GIT binary patch delta 111 zcmZoTz|?SnX@WFk!bBNo)&vH{H4XI zMe)VS`9-M)a!kyQ{F5)}OHF-qWlm=zfjI+!<~ I(Kjgo0BQvxzW@LL delta 81 zcmZoTz|?SnX@WFk+(a2?);I>es)CIv3-~#h_)jwMzvMr;Sx{jO|HKJ`ta41uj{K7^ h=u1t0AurBr#KpkCz{G!sf&VrC8K@eO&1dvY3IGHZ88-j`