pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #4053 from wallabag/feature/manual-input-reading-speed

Browse Source 
Add ability to manually define the reading speed
This commit is contained in:
Jérémy Benoist
2019-07-09 11:53:20 +02:00
committed by GitHub
parent 8effd6e99e 41022cb289
commit 4f46330087
22 changed files with 50 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Wallabag/CoreBundle/Form/Type/ConfigType.php
View File

@ -4,6 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\IntegerType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
@ -37,19 +38,13 @@ class ConfigType extends AbstractType
'choices' => array_flip($this->themes),
'label' => 'config.form_settings.theme_label',
])
->add('items_per_page', null, [
->add('items_per_page', IntegerType::class, [
'label' => 'config.form_settings.items_per_page_label',
'property_path' => 'itemsPerPage',
])
->add('reading_speed', ChoiceType::class, [
->add('reading_speed', IntegerType::class, [
'label' => 'config.form_settings.reading_speed.label',
'property_path' => 'readingSpeed',
'choices' => [
'config.form_settings.reading_speed.100_word' => '0.5',
'config.form_settings.reading_speed.200_word' => '1',
'config.form_settings.reading_speed.300_word' => '1.5',
'config.form_settings.reading_speed.400_word' => '2',
],
])
->add('action_mark_as_read', ChoiceType::class, [
'label' => 'config.form_settings.action_mark_as_read.label',

4
src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
View File

@ -54,8 +54,8 @@ class EntryFilterType extends AbstractType
$lower = $values['value']['left_number'][0];
$upper = $values['value']['right_number'][0];
$min = (int) ($lower * $this->user->getConfig()->getReadingSpeed());
$max = (int) ($upper * $this->user->getConfig()->getReadingSpeed());
$min = (int) ($lower * $this->user->getConfig()->getReadingSpeed() / 200);
$max = (int) ($upper * $this->user->getConfig()->getReadingSpeed() / 200);
if (null === $lower && null === $upper) {
// no value? no filter