From fa497185456ba0d78bcb169e02f6182267efe98b Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sat, 25 Jul 2020 14:59:18 +0400
Subject: [PATCH 001/117] Add android.yml (#58)

---
 .github/workflows/android.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/android.yml

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
new file mode 100644
index 00000000..897a252c
--- /dev/null
+++ b/.github/workflows/android.yml
@@ -0,0 +1,24 @@
+name: Android CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/checkout@v1
+
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Chmod .gradlew
+        run: chmod +x ./gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew assembleDebug
+        
+      - name: Run unit tests
+        run: ./gradlew testStageDebugUnitTest

From c7da83b5e1c7b4c9e19639030f29ea7a62ffd69e Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sun, 9 Aug 2020 16:25:42 +0400
Subject: [PATCH 002/117] Fix naming

---
 .../com/github/braillesystems/learnbraille/utils/_Kotlin.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
index 7c57b06d..735a35f6 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
@@ -44,7 +44,7 @@ fun <T, R> Rules<T, R>.matchF(key: T): ((T) -> R)? {
     return null
 }
 
-fun <T, R> Iterable<Rule<T, R>>.match(key: T): R? = matchF(key)?.invoke(key)
+fun <T, R> Rules<T, R>.match(key: T): R? = matchF(key)?.invoke(key)
 
 operator fun <T, R> Rules<T, R>.get(x: T): R? = match(x)
 

From c214d21cdc090891fcf669abe26e94c09c87f780 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sun, 9 Aug 2020 16:28:36 +0400
Subject: [PATCH 003/117] Force db preparation

---
 .../braillesystems/learnbraille/LearnBrailleApplication.kt   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
index a152f586..92c26699 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
@@ -6,6 +6,8 @@ import com.github.braillesystems.learnbraille.data.dsl.UsersCourse
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.data.repository.*
 import com.github.braillesystems.learnbraille.ui.screens.practice.CardViewModelFactory
+import com.github.braillesystems.learnbraille.utils.devnull
+import org.koin.android.ext.android.get
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.Koin
 import org.koin.core.context.startKoin
@@ -105,6 +107,9 @@ class LearnBrailleApplication : Application() {
             androidContext(this@LearnBrailleApplication)
             modules(koinModule)
         }.koin
+
+        // Touch database to force it's preparation
+        get<LearnBrailleDatabase>().devnull
     }
 }
 

From 8f7466f47f2a69a503d925ce72f5ef745317a1e4 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Mon, 17 Aug 2020 09:42:01 +0300
Subject: [PATCH 004/117] #223 refactor: reduce hardcode in BrailleDotsView

---
 app/src/main/res/layout/braille_dots_view.xml | 30 -------------------
 app/src/main/res/values/styles.xml            |  3 ++
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/layout/braille_dots_view.xml b/app/src/main/res/layout/braille_dots_view.xml
index 7a7bc894..0ff2a92b 100644
--- a/app/src/main/res/layout/braille_dots_view.xml
+++ b/app/src/main/res/layout/braille_dots_view.xml
@@ -8,16 +8,11 @@
     <com.github.braillesystems.learnbraille.ui.views.BrailleDotView
         android:id="@+id/dotButton1"
         style="@style/brailleDots"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginTop="@dimen/braille_dots_outer_vertical_margin"
         android:layout_marginEnd="@dimen/braille_dots_inner_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_inner_vertical_margin"
-        android:button="@drawable/round_checkbox"
         android:contentDescription="@string/braille_dot_1"
-        android:scaleX="@dimen/braille_dots_scale_of_one_dot"
-        android:scaleY="@dimen/braille_dots_scale_of_one_dot"
         app:layout_constraintBottom_toTopOf="@+id/dotButton2"
         app:layout_constraintEnd_toStartOf="@+id/dotButton4"
         app:layout_constraintHorizontal_bias="0.5"
@@ -28,16 +23,11 @@
     <com.github.braillesystems.learnbraille.ui.views.BrailleDotView
         android:id="@+id/dotButton2"
         style="@style/brailleDots"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginTop="@dimen/braille_dots_inner_vertical_margin"
         android:layout_marginEnd="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_inner_vertical_margin"
-        android:button="@drawable/round_checkbox"
         android:contentDescription="@string/braille_dot_2"
-        android:scaleX="@dimen/braille_dots_scale_of_one_dot"
-        android:scaleY="@dimen/braille_dots_scale_of_one_dot"
         app:layout_constraintBottom_toTopOf="@+id/dotButton3"
         app:layout_constraintEnd_toStartOf="@+id/dotButton5"
         app:layout_constraintHorizontal_bias="0.5"
@@ -47,16 +37,11 @@
     <com.github.braillesystems.learnbraille.ui.views.BrailleDotView
         android:id="@+id/dotButton3"
         style="@style/brailleDots"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginTop="@dimen/braille_dots_inner_vertical_margin"
         android:layout_marginEnd="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_outer_vertical_margin"
-        android:button="@drawable/round_checkbox"
         android:contentDescription="@string/braille_dot_3"
-        android:scaleX="@dimen/braille_dots_scale_of_one_dot"
-        android:scaleY="@dimen/braille_dots_scale_of_one_dot"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/dotButton6"
         app:layout_constraintHorizontal_bias="0.5"
@@ -66,16 +51,11 @@
     <com.github.braillesystems.learnbraille.ui.views.BrailleDotView
         android:id="@+id/dotButton4"
         style="@style/brailleDots"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginTop="@dimen/braille_dots_outer_vertical_margin"
         android:layout_marginEnd="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_inner_vertical_margin"
-        android:button="@drawable/round_checkbox"
         android:contentDescription="@string/braille_dot_4"
-        android:scaleX="@dimen/braille_dots_scale_of_one_dot"
-        android:scaleY="@dimen/braille_dots_scale_of_one_dot"
         app:layout_constraintBottom_toTopOf="@+id/dotButton5"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -85,16 +65,11 @@
     <com.github.braillesystems.learnbraille.ui.views.BrailleDotView
         android:id="@+id/dotButton5"
         style="@style/brailleDots"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/braille_dots_inner_horizontal_margin"
         android:layout_marginTop="@dimen/braille_dots_inner_vertical_margin"
         android:layout_marginEnd="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_inner_vertical_margin"
-        android:button="@drawable/round_checkbox"
         android:contentDescription="@string/braille_dot_5"
-        android:scaleX="@dimen/braille_dots_scale_of_one_dot"
-        android:scaleY="@dimen/braille_dots_scale_of_one_dot"
         app:layout_constraintBottom_toTopOf="@+id/dotButton6"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -104,16 +79,11 @@
     <com.github.braillesystems.learnbraille.ui.views.BrailleDotView
         android:id="@+id/dotButton6"
         style="@style/brailleDots"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/braille_dots_inner_horizontal_margin"
         android:layout_marginTop="@dimen/braille_dots_inner_vertical_margin"
         android:layout_marginEnd="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_outer_vertical_margin"
-        android:button="@drawable/round_checkbox"
         android:contentDescription="@string/braille_dot_6"
-        android:scaleX="@dimen/braille_dots_scale_of_one_dot"
-        android:scaleY="@dimen/braille_dots_scale_of_one_dot"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bf9a2db7..7b1e9151 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -41,6 +41,9 @@
     <style name="brailleDots">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="android:scaleX">2.6</item>
+        <item name="android:scaleY">2.6</item>
+        <item name="android:button">@drawable/round_checkbox</item>
     </style>
 
     <style name="SwitchPreferenceButton" parent="Theme.AppCompat.Light">

From c22ce265c4ce3a1cd7f55ee541a633513ed99625 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Mon, 17 Aug 2020 11:23:04 +0300
Subject: [PATCH 005/117] #223 add flip button (not functional) and side rule

---
 .../ui/screens/browser/SymbolViewFragment.kt   | 12 ++++++++++++
 .../ui/screens/practice/CardFragment.kt        | 11 +++++------
 .../main/res/drawable/ic_flip_white_24dp.xml   |  9 +++++++++
 app/src/main/res/drawable/left_border.xml      | 18 ++++++++++++++++++
 app/src/main/res/layout/braille_dots_view.xml  |  3 ++-
 app/src/main/res/layout/fragment_card.xml      | 14 ++++++++++++++
 .../main/res/layout/fragment_symbol_view.xml   | 13 +++++++++++++
 app/src/main/res/values/strings.xml            |  1 +
 8 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_flip_white_24dp.xml
 create mode 100644 app/src/main/res/drawable/left_border.xml

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
index 86c2ae1f..b01b62a1 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
@@ -7,16 +7,22 @@ import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.Material
 import com.github.braillesystems.learnbraille.data.entities.Symbol
+import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.databinding.FragmentSymbolViewBinding
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.getFragmentStringArg
 import com.github.braillesystems.learnbraille.utils.parse
+import com.github.braillesystems.learnbraille.utils.setSize
 import com.github.braillesystems.learnbraille.utils.title
+import kotlinx.android.synthetic.main.fragment_card.*
+import org.koin.android.ext.android.inject
 
 class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view_help) {
 
+    private val preferenceRepository: PreferenceRepository by inject()
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -37,5 +43,11 @@ class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view
         binding.letter.text = m.data.char.toString()
         binding.brailleDots.dotsState.display(m.data.brailleDots)
 
+        if (preferenceRepository.extendedAccessibilityEnabled) {
+            binding.flipButton.setSize(
+                width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
+            )
+        }
+
     }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
index cab053f3..536cb372 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
@@ -58,12 +58,11 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
         setHasOptionsMenu(true)
 
         if (preferenceRepository.extendedAccessibilityEnabled) {
-            hintButton.setSize(
-                width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
-            )
-            nextButton.setSize(
-                width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
-            )
+            for (button in arrayOf(hintButton, nextButton, flipButton)){
+                button.setSize(
+                    width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
+                )
+            }
         }
 
         dotsState = brailleDots.dotsState.apply {
diff --git a/app/src/main/res/drawable/ic_flip_white_24dp.xml b/app/src/main/res/drawable/ic_flip_white_24dp.xml
new file mode 100644
index 00000000..1c0c1983
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flip_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15,21h2v-2h-2v2zM19,9h2L21,7h-2v2zM3,5v14c0,1.1 0.9,2 2,2h3c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L6,19c-0.55,0 -1,-0.45 -1,-1L5,6c0,-0.55 0.45,-1 1,-1h2c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L5,3c-1.1,0 -2,0.9 -2,2zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM12,23c0.55,0 1,-0.45 1,-1L13,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v20c0,0.55 0.45,1 1,1zM19,17h2v-2h-2v2zM15,5h2L17,3h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/drawable/left_border.xml b/app/src/main/res/drawable/left_border.xml
new file mode 100644
index 00000000..d192e2fe
--- /dev/null
+++ b/app/src/main/res/drawable/left_border.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+            android:right="1dp"
+            android:top="15dp"
+            android:bottom="15dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/colorSecondary" />
+        </shape>
+    </item>
+    <item android:left="6dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/colorBackground" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/braille_dots_view.xml b/app/src/main/res/layout/braille_dots_view.xml
index 0ff2a92b..249e7f55 100644
--- a/app/src/main/res/layout/braille_dots_view.xml
+++ b/app/src/main/res/layout/braille_dots_view.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/constraintLayoutButtons"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="@drawable/left_border">
 
     <com.github.braillesystems.learnbraille.ui.views.BrailleDotView
         android:id="@+id/dotButton1"
diff --git a/app/src/main/res/layout/fragment_card.xml b/app/src/main/res/layout/fragment_card.xml
index 4fbf3adf..f8eabf63 100644
--- a/app/src/main/res/layout/fragment_card.xml
+++ b/app/src/main/res/layout/fragment_card.xml
@@ -62,6 +62,20 @@
             app:shapeAppearanceOverlay="@style/sideLeftButtonsShape"
             tools:ignore="SpUsage" />
 
+        <com.google.android.material.button.MaterialButton
+                android:id="@+id/flip_button"
+                style="@style/sideIconButtons"
+                android:layout_width="@dimen/side_buttons_width"
+                android:layout_height="@dimen/practice_buttons_small_height"
+                android:contentDescription="@string/flip_card"
+                app:backgroundTint="@color/colorSecondary"
+                app:icon="@drawable/ic_flip_white_24dp"
+                app:layout_constraintBottom_toTopOf="@+id/next_button"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="1.0"
+                app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/next_button"
             style="@style/sideIconButtons"
diff --git a/app/src/main/res/layout/fragment_symbol_view.xml b/app/src/main/res/layout/fragment_symbol_view.xml
index 73c78ff2..641c7d0d 100644
--- a/app/src/main/res/layout/fragment_symbol_view.xml
+++ b/app/src/main/res/layout/fragment_symbol_view.xml
@@ -33,5 +33,18 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="@dimen/practice_dots_vertical_bias" />
 
+        <com.google.android.material.button.MaterialButton
+                android:id="@+id/flip_button"
+                style="@style/sideIconButtons"
+                android:layout_width="@dimen/side_buttons_width"
+                android:layout_height="@dimen/practice_buttons_height"
+                android:contentDescription="@string/flip_card"
+                app:icon="@drawable/ic_flip_white_24dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="@dimen/practice_buttons_vertical_bias"
+                app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3b01e9f6..8077479b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -407,5 +407,6 @@
     <string name="stats_property_input_steps_passed">Пройдено шагов с вводом</string>
     <string name="stats_section_7days">За последние 7 дней</string>
     <string name="stats_section_30days">За последние 30 дней</string>
+    <string name="flip_card">Режим как для письма (точки 123 слева) или как для чтения (точки 123 справа)</string>
 
 </resources>

From e0f1d13121e538446f51fcec4c85370c6d273855 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Tue, 18 Aug 2020 12:31:54 +0400
Subject: [PATCH 006/117] Refactor navigation.xml

---
 app/src/main/res/navigation/navigation.xml | 146 +++++++++++----------
 1 file changed, 78 insertions(+), 68 deletions(-)

diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
index a6176f16..e1dac2d9 100644
--- a/app/src/main/res/navigation/navigation.xml
+++ b/app/src/main/res/navigation/navigation.xml
@@ -5,8 +5,6 @@
     android:id="@+id/navigation"
     app:startDestination="@id/menuFragment">
 
-    <!--    Main navigation-->
-
     <fragment
         android:id="@+id/menuFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.menu.MenuFragment"
@@ -28,11 +26,17 @@
             android:id="@+id/action_menuFragment_to_browserFragment"
             app:destination="@id/browserFragment" />
     </fragment>
+    <action
+        android:id="@+id/action_global_menuFragment"
+        app:destination="@id/menuFragment"
+        app:popUpTo="@id/menuFragment" />
+
     <fragment
         android:id="@+id/exitFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.exit.ExitFragment"
         android:label="fragment_exit"
         tools:layout="@layout/fragment_exit" />
+
     <fragment
         android:id="@+id/cardFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.practice.CardFragment"
@@ -42,6 +46,7 @@
             android:id="@+id/action_cardFragment_to_decksList"
             app:destination="@id/decksList" />
     </fragment>
+
     <fragment
         android:id="@+id/helpFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.help.HelpFragment"
@@ -52,10 +57,15 @@
             app:argType="string"
             app:nullable="true" />
     </fragment>
+    <action
+        android:id="@+id/action_global_helpFragment"
+        app:destination="@id/helpFragment" />
+
     <fragment
         android:id="@+id/settingsFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.settings.SettingsFragment"
         android:label="SettingsFragment" />
+
     <fragment
         android:id="@+id/decksList"
         android:name="com.github.braillesystems.learnbraille.ui.screens.practice.DecksListFragment"
@@ -67,13 +77,42 @@
             app:popUpTo="@+id/menuFragment" />
     </fragment>
 
+    <fragment
+        android:id="@+id/lessonsListFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.lessons.LessonsListFragment"
+        android:label="fragment_lessons_list"
+        tools:layout="@layout/fragment_lessons_list" />
     <action
-        android:id="@+id/action_global_menuFragment"
-        app:destination="@id/menuFragment"
-        app:popUpTo="@id/menuFragment" />
-    <action
-        android:id="@+id/action_global_helpFragment"
-        app:destination="@id/helpFragment" />
+        android:id="@+id/action_global_lessonsListFragment"
+        app:destination="@id/lessonsListFragment" />
+
+    <fragment
+        android:id="@+id/browserFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.browser.BrowserFragment"
+        android:label="BrowserFragment">
+        <action
+            android:id="@+id/action_browserFragment_to_materialViewFragment"
+            app:destination="@id/symbolViewFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/symbolViewFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.browser.SymbolViewFragment"
+        android:label="SymbolViewFragment">
+        <argument
+            android:name="material"
+            app:argType="string" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/statsFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.stats.StatsFragment"
+        android:label="fragment_stats"
+        tools:layout="@layout/fragment_stats">
+        <action
+            android:id="@+id/action_statsFragment_to_menuFragment"
+            app:destination="@id/menuFragment" />
+    </fragment>
 
     <!--    Step fragments-->
 
@@ -85,6 +124,11 @@
             android:name="step"
             app:argType="string" />
     </fragment>
+    <action
+        android:id="@+id/action_global_infoFragment"
+        app:destination="@id/infoFragment"
+        app:popUpTo="@id/menuFragment" />
+
     <fragment
         android:id="@+id/inputDotsFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InputDotsFragment"
@@ -93,6 +137,11 @@
             android:name="step"
             app:argType="string" />
     </fragment>
+    <action
+        android:id="@+id/action_global_inputDotsFragment"
+        app:destination="@id/inputDotsFragment"
+        app:popUpTo="@id/menuFragment" />
+
     <fragment
         android:id="@+id/inputSymbolFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InputSymbolFragment"
@@ -101,6 +150,11 @@
             android:name="step"
             app:argType="string" />
     </fragment>
+    <action
+        android:id="@+id/action_global_inputSymbolFragment"
+        app:destination="@id/inputSymbolFragment"
+        app:popUpTo="@id/menuFragment" />
+
     <fragment
         android:id="@+id/showDotsFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.ShowDotsFragment"
@@ -109,6 +163,11 @@
             android:name="step"
             app:argType="string" />
     </fragment>
+    <action
+        android:id="@+id/action_global_showDotsFragment"
+        app:destination="@id/showDotsFragment"
+        app:popUpTo="@id/menuFragment" />
+
     <fragment
         android:id="@+id/showSymbolFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.ShowSymbolFragment"
@@ -117,6 +176,11 @@
             android:name="step"
             app:argType="string" />
     </fragment>
+    <action
+        android:id="@+id/action_global_showSymbolFragment"
+        app:destination="@id/showSymbolFragment"
+        app:popUpTo="@id/menuFragment" />
+
     <fragment
         android:id="@+id/lastInfoFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.LastInfoFragment"
@@ -125,6 +189,11 @@
             android:name="step"
             app:argType="string" />
     </fragment>
+    <action
+        android:id="@+id/action_global_lastInfoFragment"
+        app:destination="@id/lastInfoFragment"
+        app:popUpTo="@id/menuFragment" />
+
     <fragment
         android:id="@+id/firstInfoFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.FirstInfoFragment"
@@ -133,68 +202,9 @@
             android:name="step"
             app:argType="string" />
     </fragment>
-
-    <!--    Global step actions-->
-
-    <action
-        android:id="@+id/action_global_showSymbolFragment"
-        app:destination="@id/showSymbolFragment"
-        app:popUpTo="@id/menuFragment" />
-    <action
-        android:id="@+id/action_global_infoFragment"
-        app:destination="@id/infoFragment"
-        app:popUpTo="@id/menuFragment" />
-    <action
-        android:id="@+id/action_global_inputDotsFragment"
-        app:destination="@id/inputDotsFragment"
-        app:popUpTo="@id/menuFragment" />
-    <action
-        android:id="@+id/action_global_inputSymbolFragment"
-        app:destination="@id/inputSymbolFragment"
-        app:popUpTo="@id/menuFragment" />
-    <action
-        android:id="@+id/action_global_showDotsFragment"
-        app:destination="@id/showDotsFragment"
-        app:popUpTo="@id/menuFragment" />
-    <action
-        android:id="@+id/action_global_lastInfoFragment"
-        app:destination="@id/lastInfoFragment"
-        app:popUpTo="@id/menuFragment" />
     <action
         android:id="@+id/action_global_firstInfoFragment"
         app:destination="@id/firstInfoFragment"
         app:popUpTo="@id/menuFragment" />
-    <fragment
-        android:id="@+id/lessonsListFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.lessons.LessonsListFragment"
-        android:label="fragment_lessons_list"
-        tools:layout="@layout/fragment_lessons_list" />
-    <action
-        android:id="@+id/action_global_lessonsListFragment"
-        app:destination="@id/lessonsListFragment" />
-    <fragment
-        android:id="@+id/browserFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.browser.BrowserFragment"
-        android:label="BrowserFragment">
-        <action
-            android:id="@+id/action_browserFragment_to_materialViewFragment"
-            app:destination="@id/symbolViewFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/symbolViewFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.browser.SymbolViewFragment"
-        android:label="SymbolViewFragment">
-        <argument
-            android:name="material"
-            app:argType="string" />
-    </fragment>
-    <fragment
-        android:id="@+id/statsFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.stats.StatsFragment"
-        android:label="fragment_stats"
-        tools:layout="@layout/fragment_stats">
-        <action
-            android:id="@+id/action_statsFragment_to_menuFragment"
-            app:destination="@id/menuFragment" />
-    </fragment>
+
 </navigation>

From 13ba4d97d76fc9e0cde24549d6f0903f3fd7a47d Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Tue, 18 Aug 2020 12:48:51 +0400
Subject: [PATCH 007/117] Fix #78

---
 app/src/main/res/navigation/navigation.xml | 34 +++++++++++-----------
 app/src/main/res/values/strings.xml        |  2 ++
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
index e1dac2d9..8c14e312 100644
--- a/app/src/main/res/navigation/navigation.xml
+++ b/app/src/main/res/navigation/navigation.xml
@@ -8,7 +8,7 @@
     <fragment
         android:id="@+id/menuFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.menu.MenuFragment"
-        android:label="fragment_menu"
+        android:label="@string/menu_actionbar_text"
         tools:layout="@layout/fragment_menu">
         <action
             android:id="@+id/action_menuFragment_to_practiceFragment"
@@ -34,13 +34,13 @@
     <fragment
         android:id="@+id/exitFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.exit.ExitFragment"
-        android:label="fragment_exit"
+        android:label="@string/exit_question"
         tools:layout="@layout/fragment_exit" />
 
     <fragment
         android:id="@+id/cardFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.practice.CardFragment"
-        android:label="fragment_card"
+        android:label="@string/practice_actionbar_title"
         tools:layout="@layout/fragment_card">
         <action
             android:id="@+id/action_cardFragment_to_decksList"
@@ -50,7 +50,7 @@
     <fragment
         android:id="@+id/helpFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.help.HelpFragment"
-        android:label="HelpFragment">
+        android:label="@string/help_title">
         <argument
             android:name="help_message"
             android:defaultValue="@null"
@@ -64,12 +64,12 @@
     <fragment
         android:id="@+id/settingsFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.settings.SettingsFragment"
-        android:label="SettingsFragment" />
+        android:label="@string/preferences_actionbar_title" />
 
     <fragment
         android:id="@+id/decksList"
         android:name="com.github.braillesystems.learnbraille.ui.screens.practice.DecksListFragment"
-        android:label="fragment_decks_list"
+        android:label="@string/decks_list_title"
         tools:layout="@layout/fragment_decks_list">
         <action
             android:id="@+id/action_decksList_to_cardFragment"
@@ -80,7 +80,7 @@
     <fragment
         android:id="@+id/lessonsListFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.lessons.LessonsListFragment"
-        android:label="fragment_lessons_list"
+        android:label="@string/lessons_title_lessons_list"
         tools:layout="@layout/fragment_lessons_list" />
     <action
         android:id="@+id/action_global_lessonsListFragment"
@@ -89,7 +89,7 @@
     <fragment
         android:id="@+id/browserFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.browser.BrowserFragment"
-        android:label="BrowserFragment">
+        android:label="@string/browser_title">
         <action
             android:id="@+id/action_browserFragment_to_materialViewFragment"
             app:destination="@id/symbolViewFragment" />
@@ -98,7 +98,7 @@
     <fragment
         android:id="@+id/symbolViewFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.browser.SymbolViewFragment"
-        android:label="SymbolViewFragment">
+        android:label="@string/browser_symbol_view_title">
         <argument
             android:name="material"
             app:argType="string" />
@@ -107,7 +107,7 @@
     <fragment
         android:id="@+id/statsFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.stats.StatsFragment"
-        android:label="fragment_stats"
+        android:label="@string/stats_title"
         tools:layout="@layout/fragment_stats">
         <action
             android:id="@+id/action_statsFragment_to_menuFragment"
@@ -119,7 +119,7 @@
     <fragment
         android:id="@+id/infoFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InfoFragment"
-        android:label="InfoFragment">
+        android:label="@string/lessons_title_info">
         <argument
             android:name="step"
             app:argType="string" />
@@ -132,7 +132,7 @@
     <fragment
         android:id="@+id/inputDotsFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InputDotsFragment"
-        android:label="InputDotsFragment">
+        android:label="@string/lessons_title_input_dots">
         <argument
             android:name="step"
             app:argType="string" />
@@ -145,7 +145,7 @@
     <fragment
         android:id="@+id/inputSymbolFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InputSymbolFragment"
-        android:label="InputSymbolFragment">
+        android:label="@string/lessons_title_input_symbol">
         <argument
             android:name="step"
             app:argType="string" />
@@ -158,7 +158,7 @@
     <fragment
         android:id="@+id/showDotsFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.ShowDotsFragment"
-        android:label="ShowDotsFragment">
+        android:label="@string/lessons_title_show_dots">
         <argument
             android:name="step"
             app:argType="string" />
@@ -171,7 +171,7 @@
     <fragment
         android:id="@+id/showSymbolFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.ShowSymbolFragment"
-        android:label="ShowSymbolFragment">
+        android:label="@string/lessons_title_show_symbol">
         <argument
             android:name="step"
             app:argType="string" />
@@ -184,7 +184,7 @@
     <fragment
         android:id="@+id/lastInfoFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.LastInfoFragment"
-        android:label="LastInfoFragment">
+        android:label="@string/lessons_title_last_info">
         <argument
             android:name="step"
             app:argType="string" />
@@ -197,7 +197,7 @@
     <fragment
         android:id="@+id/firstInfoFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.FirstInfoFragment"
-        android:label="FirstInfoFragment">
+        android:label="@string/lessons_title_info">
         <argument
             android:name="step"
             app:argType="string" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3b01e9f6..88a37a7b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -60,6 +60,7 @@
     <string name="practice_hint">Подсказка</string>
     <string name="practice_next">Далее</string>
     <string name="practice_actionbar_title_template">Практика: %d из %d</string>
+    <string name="practice_actionbar_title">Практика</string>
     <string name="practice_deck_name_enabled_template">
         Колода: \"%s\"\nПовторять только изученные: включено
     </string>
@@ -130,6 +131,7 @@
     <string name="menu_settings">НАСТРОЙКИ</string>
     <string name="menu_exit">ВЫХОД</string>
     <string name="menu_actionbar_text_template">%s. Меню</string>
+    <string name="menu_actionbar_text">Меню</string>
     <string name="menu_db_not_initialized_warning">
         Загружаем базу данных. Попробуйте ещё раз!
     </string>

From ead73266b1fc680fb4ff31ec981ff76cfc32b7b7 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Tue, 18 Aug 2020 14:02:50 +0400
Subject: [PATCH 008/117] #185 add access to meta info from info steps dsl

---
 .../learnbraille/data/dsl/DslTest.kt          |  9 ++++--
 .../learnbraille/data/dsl/DataStorage.kt      | 29 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
index 44071cbb..8ca44f97 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
@@ -118,7 +118,9 @@ private val worstLessons by lessons {
         )) {
             +Input(material)
         }
-        +LastInfo("LastInfo")
+        +LastInfo(InfoInterpolation.run {
+            "LastInfo with stepId: $iStep, lessonId: $iLesson, courseName: $courseName"
+        })
     }
 }
 
@@ -184,7 +186,10 @@ private val steps = listOf(
     Step(5, 2, 1, Show(content.symbols.getValue('Z'))),
     Step(6, 2, 1, Input(content.symbols.getValue('Б'))),
     Step(7, 2, 1, Input(content.symbols.getValue('Z'))),
-    Step(8, 2, 1, LastInfo("LastInfo"))
+    Step(
+        8, 2, 1,
+        LastInfo("LastInfo with stepId: 8, lessonId: 1, courseName: Worst course")
+    )
 )
 private val stepAnnotations = listOf(
     StepAnnotation(1, "book"),
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
index 9d8e29d7..fa9df3f2 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
@@ -128,7 +128,9 @@ class DataBuilder(
 
                 stepsWithAnnotations.forEachIndexed { iStep, (step, stepAnnotationNames) ->
                     val stepId = iStep + 1L
-                    _steps += step.copy(id = stepId, courseId = courseId, lessonId = lessonId)
+                    _steps += step
+                        .copy(id = stepId, courseId = courseId, lessonId = lessonId)
+                        .interpolateText(course.name)
 
                     stepAnnotationNames.forEach {
                         val stepAnnotation = annotationByName[it]?.id
@@ -179,3 +181,28 @@ class DecksBuilder(block: DecksBuilder.() -> Unit) {
         _deckToPredicate[deck] = entryCriterion
     }
 }
+
+object InfoInterpolation {
+    const val iStep = "#istep"
+    const val iLesson = "#ilesson"
+    const val courseName = "#courseName"
+}
+
+private fun Step.interpolateText(courseName: String): Step =
+    this.copy(
+        data =
+        if (data !is BaseInfo) data
+        else {
+            when (data) {
+                is FirstInfo -> FirstInfo(interpolateTextHelper(data.text, courseName))
+                is LastInfo -> LastInfo(interpolateTextHelper(data.text, courseName))
+                is Info -> Info(interpolateTextHelper(data.text, courseName))
+            }
+        }
+    )
+
+private fun Step.interpolateTextHelper(text: String, courseName: String): String =
+    text
+        .replace(InfoInterpolation.iStep, id.toString())
+        .replace(InfoInterpolation.iLesson, lessonId.toString())
+        .replace(InfoInterpolation.courseName, courseName)

From 4a30eaf3921a39f8160d022e6113a3b0190f8932 Mon Sep 17 00:00:00 2001
From: Valerii Zuev <valera.zuev.zva@gmail.com>
Date: Tue, 18 Aug 2020 23:29:27 +0300
Subject: [PATCH 009/117] #185 replace hardcoded lesson numbers in course with
 meta info

---
 .../learnbraille/res/GolubinaCourse.kt        | 307 +++++++++---------
 1 file changed, 154 insertions(+), 153 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index 3caca8af..fb70f8d3 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -1,5 +1,6 @@
 package com.github.braillesystems.learnbraille.res
 
+import com.github.braillesystems.learnbraille.data.dsl.InfoInterpolation
 import com.github.braillesystems.learnbraille.data.dsl.annotate
 import com.github.braillesystems.learnbraille.data.dsl.lessons
 import com.github.braillesystems.learnbraille.data.entities.*
@@ -21,9 +22,9 @@ internal val golubinaIntroLessons by lessons {
                 по разделу, нажав кнопку "справка" в правом верхнем углу экрана.
             """
         )
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                <b>Урок 1. Тренировка чтения и ввода отдельных комбинаций.</b>
+                <b>Урок $iLesson. Тренировка чтения и ввода отдельных комбинаций.</b>
                 <br><br>
                 В азбуке Брайля любой символ - это шеститочие.
                 <br>
@@ -32,7 +33,7 @@ internal val golubinaIntroLessons by lessons {
                 Точки в первом столбце имеют номера 1, 2, 3 сверху вниз. 
                 Во втором столбце - 4, 5, 6 сверху вниз.
                 """
-        )
+        })
         +ShowDots(
             text = "Перед Вами символ Брайля - <br>" +
                     " точка номер один",
@@ -95,22 +96,22 @@ internal val golubinaIntroLessons by lessons {
             """Откройте букварь на странице 12. 
                 В верхней строке 14 раз повторён символ полного шеститочия."""
         ).annotate(StepAnnotation.golubinaBookRequired)
-        +Info(
-            """Первый урок закончен. В следующем уроке мы изучим буквы А, Б, Ц, Д, Е."""
-        )
+        +Info(InfoInterpolation.run {
+            """Урок $iLesson закончен. В следующем уроке мы изучим буквы А, Б, Ц, Д, Е."""
+        })
     }
 
     lesson(
         name = "Русские буквы А, Б, Ц, Д, Е"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 2. Буквы А, Б, Ц, Д, Е.</b>
+                    <b>Урок $iLesson. Буквы А, Б, Ц, Д, Е.</b>
                     <br><br>
                     Некоторые символы Брайля обозначают как букву, так и цифру. Это буквы А, Б,
                     Ц и так далее. С добавлением цифрового знака, который мы изучим в следующем
                     уроке, из них получаются цифры 1, 2, 3 и так далее."""
-        )
+        })
         +Info(
             """Буква А обозначается одной точкой, точкой номер один.
                     Ознакомьтесь с ней в следующем шаге."""
@@ -145,22 +146,22 @@ internal val golubinaIntroLessons by lessons {
         )
         +Show(content.symbols.getValue('Е'))
         +Input(content.symbols.getValue('Е')/*, repeat = 5*/)
-        +Info(
-            """Урок 2 закончен. В следующем занятии займёмся повторением букв А, Б, Ц, Д, Е
+        +Info(InfoInterpolation.run {
+            """Урок $iLesson закончен. В следующем занятии займёмся повторением букв А, Б, Ц, Д, Е
                  и выучим буквы Ф, Г. Рекомендуем в дополнение к уроку потренироваться 
                  вводить изученные буквы в разделе "Практика"."""
-        )
+        })
     }
     lesson(
         name = "Буквы Ф, Г"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 3. Буквы Ф, Г.</b>
+                    <b>Урок $iLesson. Буквы Ф, Г.</b>
                     <br><br>
                     Перед прохождением нового материала повторим пройденное.
                     В следующих трёх шагах нужно ввести буквы Б, А, Ц (вместе это слово БАЦ)."""
-        )
+        })
         inputChars("БАЦ")
         +Info(
             """
@@ -193,22 +194,22 @@ internal val golubinaIntroLessons by lessons {
                     В следующих трёх шагах введите по буквам слово БЕГ."""
         )
         inputChars("БЕГ")
-        +Info(
-            """Поздравляем! Третий урок пройден. В следующем занятии мы узнаем, 
+        +Info(InfoInterpolation.run {
+            """Поздравляем! Урок $iLesson пройден. В следующем занятии мы узнаем, 
                     как с помощью букв А, Б, Ц, Д, Е, Ф, Г составить цифры 1, 2, 3, 4, 5 и 6."""
-        )
+        })
     }
 
     lesson(
         name = "Цифры от 1 до 6"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 4. Цифры от 1 до 6.</b>
+                    <b>Урок $iLesson. Цифры от 1 до 6.</b>
                     <br><br>
                     В этом уроке мы начнём изучать цифры. Но для начала повторим пройденное.
                     В следующих шагах введите буквы, изученные в прошлых двух уроках."""
-        )
+        })
         inputChars("АБЦДЕФГ")
         +Info(
             """
@@ -256,26 +257,26 @@ internal val golubinaIntroLessons by lessons {
                 Изучите каждую цифру.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    Урок 4 пройден! Рекомендуем самостоятельно изучить цифры и числа на странице 15
+                    Урок $iLesson пройден! Рекомендуем самостоятельно изучить цифры и числа на странице 15
                     в букваре (внизу страницы).
                     <br>
                     Следующий урок будет посвящён повторению, а также мы изучим 
                     букву Х и цифру 8."""
-        )
+        })
     }
 
     lesson(
         name = "Буква Х и цифра 8"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 5. Буква Х и цифра 8.</b>
+                    <b>Урок $iLesson. Буква Х и цифра 8.</b>
                     <br><br>
                     По окончании этого урока Вы узнаете букву Х и цифру 8. 
                     Но перед изучением нового повторим пройденное. Введите по буквам слово ФЕБ. """
-        )
+        })
         inputChars("ФЕБ")
         +Info(
             """
@@ -323,20 +324,20 @@ internal val golubinaIntroLessons by lessons {
             """
         )
         inputChars("]876")
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    Урок 5 пройден!
+                    Урок $iLesson пройден!
                     <br>
                     На следующем занятии мы освоим буквы И и Ж, а также цифры 9 и 0"""
-        )
+        })
     }
 
     lesson(
         name = "Буквы Ж, И и цифры 9, 0"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 6. Буквы Ж, И и цифры 9, 0</b>
+                    <b>Урок $iLesson. Буквы Ж, И и цифры 9, 0</b>
                     <br><br>
                     Буква И - это точки 2 и 4.
                     Этот же символ с добавлением цифрового знака обозначает цифру 9.
@@ -344,7 +345,7 @@ internal val golubinaIntroLessons by lessons {
                     Буква Ж - это точки 2, 4 и 5.
                     Цифровой знак и буква Ж образуют цифру 0.
                     """
-        )
+        })
         +Info(
             """
                 Раскройте букварь на странице 17. В верхней части листа найдите рельефно-графические
@@ -372,21 +373,21 @@ internal val golubinaIntroLessons by lessons {
             """Введите по символам число 850"""
         )
         inputChars("]850")
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    Урок 6 закончен. Теперь Вы, помимо букв, знаете все цифры.
+                    Урок $iLesson закончен. Теперь Вы, помимо букв, знаете все цифры.
                     Примеры слов и чисел к этому уроку можно найти в букваре внизу страницы 17.
                     <br>
                     Следующий урок посвящён буквам К, Л и М."""
-        )
+        })
     }
 
     lesson(
         name = "Буквы К, Л, М"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 7. Буквы К, Л, М</b>
+                    <b>Урок $iLesson. Буквы К, Л, М</b>
                     <br><br>
                     До сих пор мы изучали только буквы, образованные верхними четырьмя точками,
                     то есть точками 1, 2, 4, 5. В нескольких следующих уроках будут рассмотрены
@@ -394,7 +395,7 @@ internal val golubinaIntroLessons by lessons {
                     <br>
                     Перед занятием повторим пройденное. Введите по буквам слово ЕЖИХА.
                     """
-        )
+        })
         inputChars("ЕЖИХА")
         +Info(
             """
@@ -452,27 +453,27 @@ internal val golubinaIntroLessons by lessons {
             """Напоследок введите по буквам слово ФИАЛКА"""
         )
         inputChars("ФИАЛКА")
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    Мы подошли к концу урока 7.
+                    Мы подошли к концу урока $iLesson.
                     <br>
                     Буквам К, Л, М посвящены страницы 19 и 20 букваря; желательно
                     повторить материал, прочитав слова и числа на этих страницах.
                     <br>
                     На следующем занятии мы узнаем, как обозначается буква Н."""
-        )
+        })
     }
 
     lesson(
         name = "Буква Н"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 8. Буква Н.</b>
+                    <b>Урок $iLesson. Буква Н.</b>
                     <br><br>
                     Начнём занятие с повторения. Введите по буквам слово КАМБАЛА.
                     """
-        )
+        })
         inputChars("КАМБАЛА")
         +Info(
             """
@@ -503,26 +504,26 @@ internal val golubinaIntroLessons by lessons {
             """Теперь введите по буквам слово БЛАНК"""
         )
         inputChars("БЛАНК")
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    На этом урок 8 завершается. Для закрепления материала полезно прочесть
+                    На этом урок $iLesson завершается. Для закрепления материала полезно прочесть
                     текст на страницах 21 и 22 в букваре.
                     <br>
                     В следующий раз изучим букву О и знак препинания ЗАПЯТАЯ.
                     """
-        )
+        })
     }
     lesson(
         name = "Буква О и знак препинания 'Запятая'"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 9. Буква О и знак препинания "Запятая".</b>
+                    <b>Урок $iLesson. Буква О и знак препинания "Запятая".</b>
                     <br><br>
                     Как обычно, в начале занятия повторим пройденное.
                     Введите по буквам слово НАДЕЖДА.
                     """
-        )
+        })
         inputChars("НАДЕЖДА")
         +Info(
             """
@@ -564,23 +565,23 @@ internal val golubinaIntroLessons by lessons {
             """Напоследок введите слово ГЕОЛОГ и тоже поставьте запятую в конце"""
         )
         inputChars("ГЕОЛОГ,")
-        +Info(
-            """Урок 9 подходит к концу. В следующем уроке нас ждёт изучение буквы П.
+        +Info(InfoInterpolation.run {
+            """Урок $iLesson подходит к концу. В следующем уроке нас ждёт изучение буквы П.
                     Материалы к этому занятию можно прочесть на страницах 23-24 в букваре.
             """
-        )
+        })
     }
     lesson(
         name = "Буква П"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 10. Буква П.</b>
+                    <b>Урок $iLesson. Буква П.</b>
                     <br><br>
                     В виде разминки перед уроком повторим изученные ранее символы.
                     Введите по буквам слово МОЛОКО и поставьте после него запятую.
                     """
-        )
+        })
         inputChars("МОЛОКО,")
         +Info(
             """
@@ -612,25 +613,25 @@ internal val golubinaIntroLessons by lessons {
             """И последнее в этом уроке: введите по буквам слово КАПКАН"""
         )
         inputChars("КАПКАН")
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                Вот и пройден десятый урок. Следующее занятие отведено для изучения буквы Ч.
+                Вот и пройден урок $iLesson. Следующее занятие отведено для изучения буквы Ч.
                 Изученный урок полезно закрепить, прочтя слова на странице 25 в книге Голубиной.
             """
-        )
+        })
     }
 
     lesson(
         name = "Буква Ч"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 11. Буква Ч.</b>
+                    <b>Урок $iLesson. Буква Ч.</b>
                     <br><br>
                     Перед началом работы немного повторим прошлые уроки.
                     Введите по буквам слово ХЛОПОК.
                     """
-        )
+        })
         inputChars("ХЛОПОК")
         +Info(
             """Введите отдельными символами число 215, поставив перед ним цифровой знак"""
@@ -667,26 +668,26 @@ internal val golubinaIntroLessons by lessons {
             """Введите по буквам ещё одно, последнее слово: БОЧОНОК"""
         )
         inputChars("БОЧОНОК")
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    Урок 11, в котором мы изучали букву 'Ч', позади. 
+                    Урок $iLesson, в котором мы изучали букву 'Ч', позади. 
                     А в следующий раз мы будем заниматься буквой Р.
                     """
-        )
+        })
     }
     lesson(
         name = "Буква Р"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 12. Буква Р.</b>
+                    <b>Урок $iLesson. Буква Р.</b>
                     <br><br>
                     Этому уроку соответствует страницы 27 и 28 букваря.
                     <br>
                     Перед стартом повторим материал прошлых уроков. 
                     Введите по символам слово ПЧЕЛА.
                     """
-        )
+        })
         inputChars("ПЧЕЛА")
         +Info(
             """
@@ -722,24 +723,24 @@ internal val golubinaIntroLessons by lessons {
             """Наберите аналогичным образом последнее слово в сегодняшнем уроке: ГАРАЖ"""
         )
         inputChars("ГАРАЖ")
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    Урок 12 завершён. Теперь мы, помимо прочего, знаем точечный состав буквы 'Р'.
+                    Урок $iLesson завершён. Теперь мы, помимо прочего, знаем точечный состав буквы 'Р'.
                     За этим уроком следует занятие, посвящённое букве С.
                     """
-        )
+        })
     }
     lesson(
         name = "Буква С"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 13. Буква С.</b>
+                    <b>Урок $iLesson. Буква С.</b>
                     <br><br>
                     Перед уроком вспомним старый материал.
                     Введите по буквам слово МАРАФОН
                     """
-        )
+        })
         inputChars("МАРАФОН")
         +Info(
             """
@@ -776,24 +777,24 @@ internal val golubinaIntroLessons by lessons {
             """В завершение урока введите по буквам слово ЧЕСНОК"""
         )
         inputChars("ЧЕСНОК")
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    Мы подошли к финалу урока 13. К этому моменту мы уже изучили 19 букв,
+                    Мы подошли к финалу урока $iLesson. К этому моменту мы уже изучили 19 букв,
                     знак препинания 'ЗАПЯТАЯ' и цифры. В следующем уроке изучим букву Т.
                     """
-        )
+        })
     }
     lesson(
         name = "Буква Т и знак 'Дефис'"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 14. Буква Т и знак 'Дефис'.</b>
+                    <b>Урок $iLesson. Буква Т и знак 'Дефис'.</b>
                     <br><br>
                     Как обычно, предварим урок повторением пройденного.
                     Введите символы, составляющие слово СОЛНЦЕ
                     """
-        )
+        })
         inputChars("СОЛНЦЕ")
         +Info(
             """Теперь наберите число 870, сначала поставив цифровой знак"""
@@ -857,14 +858,14 @@ internal val golubinaIntroLessons by lessons {
     lesson(
         name = "Буква У"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 15. Буква У.</b>
+                    <b>Урок $iLesson. Буква У.</b>
                     <br><br>
                     Вспомним для начала материал прошлых уроков.
                     На следующих этапах введите по буквам слово ТЕЛЕФОН
                     """
-        )
+        })
         inputChars("ТЕЛЕФОН")
         +Info(
             """
@@ -901,25 +902,25 @@ internal val golubinaIntroLessons by lessons {
             """Последнее, что нужно сделать в этом уроке - введите слово ЧУДЕСА"""
         )
         inputChars("ЧУДЕСА")
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    Урок 15 окончен. Мы изучили букву У - первую букву, где нам встретилась точка
+                    Урок $iLesson окончен. Мы изучили букву У - первую букву, где нам встретилась точка
                     номер 6 (но не первый символ: ранее мы сталкивались с ним, изучая цифровой знак
                     и знак 'Дефис'). В следующем занятии нас ждёт буква Щ.
                     """
-        )
+        })
     }
     lesson(
         name = "Буква Щ"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 16. Буква Щ.</b>
+                    <b>Урок $iLesson. Буква Щ.</b>
                     <br><br>
                     В виде разминки повторим ранее изученное.
                     Введите буквы, которые сложатся в слово ХУДОЖНИК
                     """
-        )
+        })
         inputChars("ХУДОЖНИК")
         +Info(
             """
@@ -957,24 +958,24 @@ internal val golubinaIntroLessons by lessons {
             """Перед тем, как мы закончим занятие, введите слово ОЩУЩЕНИЕ"""
         )
         inputChars("ОЩУЩЕНИЕ")
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    Урок 16 - буква Щ - подходит к завершению. Теперь нам известны 22 буквы русского
+                    Урок $iLesson - буква Щ - подходит к завершению. Теперь нам известны 22 буквы русского
                     алфавита. Следующее занятие будет на тему буквы З.
                     """
-        )
+        })
     }
     lesson(
         name = "Буква З"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 17. Буква З.</b>
+                    <b>Урок $iLesson. Буква З.</b>
                     <br><br>
                     Новый материал мы будем изучать после краткого повторения.
                     Далее введите буквы слова ЩЕПОТКА
                     """
-        )
+        })
         inputChars("ЩЕПОТКА")
         +Info(
             """
@@ -1011,24 +1012,24 @@ internal val golubinaIntroLessons by lessons {
             """И последнее, что сегодня осталось сделать: введите слово ЗАДАЧА"""
         )
         inputChars("ЗАДАЧА")
-        +Info(
+        +Info(InfoInterpolation.run {
             """                    
-                    Вы успешно окончили урок 17 - буква З. На следующем занятии перейдём к освоению
+                    Вы успешно окончили урок $iLesson - буква З. На следующем занятии перейдём к освоению
                     буквы И краткое.
                     """
-        )
+        })
     }
     lesson(
         name = "Буква Й"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 18. Буква "И краткое".</b>
+                    <b>Урок $iLesson. Буква "И краткое".</b>
                     <br><br>
                     Знакомство с новой буквой начнём после небольшой ревизии ранее пройденного.
                     Пожалуйста, введите буквы, образующие слово МИМОЗА
                     """
-        )
+        })
         inputChars("МИМОЗА")
         +Info(
             """Также в качестве повторения введите цифровой знак, а за ним число 964"""
@@ -1071,27 +1072,27 @@ internal val golubinaIntroLessons by lessons {
             """Наконец, введите последнее слово в этом уроке: РАЙОН"""
         )
         inputChars("РАЙОН")
-        +Info(
+        +Info(InfoInterpolation.run {
             """                    
-                    Урок 18 - буква 'И краткое' - окончен. Теперь мы знаем уже 4 буквы, содержащие
+                    Урок $iLesson - буква 'И краткое' - окончен. Теперь мы знаем уже 4 буквы, содержащие
                     точку номер 6. Предлагаем Вам самостоятельно вспомнить, какие именно.
                     <br>
                     До встречи на следующем уроке, где мы будем изучать твёрдый знак и 
                     знак препинания 'Литературная точка'.
                     """
-        )
+        })
     }
     lesson(
         name = "Твёрдый знак и литературная точка"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 19. Твёрдый знак и литературная точка.</b>
+                    <b>Урок $iLesson. Твёрдый знак и литературная точка.</b>
                     <br><br>
                     Вначале повторим ранее изученные буквы.
                     Введите по буквам прилагательное ОСЕННИЙ
                     """
-        )
+        })
         inputChars("ОСЕННИЙ")
         +Info(
             """
@@ -1141,24 +1142,24 @@ internal val golubinaIntroLessons by lessons {
                     """
         )
         inputChars("ЛЕНИНГРАД-ГОРОД-ГЕРОЙ")
-        +Info(
+        +Info(InfoInterpolation.run {
             """                    
-                    На этом мы завершаем занятие номер 19. Осталось ещё семь уроков, после чего 
+                    На этом мы завершаем занятие номер $iLesson. Осталось ещё семь уроков, после чего 
                     мы будем знать все русские буквы. В следующем уроке узнаем точечный состав
                     буквы Ы.
                     """
-        )
+        })
     }
     lesson(
         name = "Буква Ы"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 20. Буква Ы.</b>
+                    <b>Урок $iLesson. Буква Ы.</b>
                     <br><br>
                     Ради закрепления пройденного введите по символам слово ОБЪЕДИНЕНИЕ
                     """
-        )
+        })
         inputChars("ОБЪЕДИНЕНИЕ")
         +Info(
             """Также повторим специальные символы.
@@ -1200,25 +1201,25 @@ internal val golubinaIntroLessons by lessons {
             """Введите последнее слово - существительное во множественном числе: КОЗЫ"""
         )
         inputChars("КОЗЫ")
-        +Info(
+        +Info(InfoInterpolation.run {
             """                    
-                    Урок 20 - буква 'Ы' - подходит к завершению.
+                    Урок $iLesson - буква 'Ы' - подходит к завершению.
                     Остались неизученными семь букв русского алфавита; для них отведены оставшиеся
                     шесть уроков. На следующем занятии будем осваивать мягкий знак.
                     """
-        )
+        })
     }
     lesson(
         name = "Мягкий знак"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 21. Мягкий знак.</b>
+                    <b>Урок $iLesson. Мягкий знак.</b>
                     <br><br>
                     Как и в прошлые разы, перед занятием повторим ранее изученное.
                     Введите, набирая отдельные буквы, прилагательное РЫЖИЙ
                     """
-        )
+        })
         inputChars("РЫЖИЙ")
         +Info(
             """
@@ -1258,24 +1259,24 @@ internal val golubinaIntroLessons by lessons {
             """Введите последнее в этом занятии слово: СТАЛЬ"""
         )
         inputChars("СТАЛЬ")
-        +Info(
+        +Info(InfoInterpolation.run {
             """                    
-                    Урок 21, в котором мы изучили мягкий знак, пройден.
+                    Урок $iLesson, в котором мы изучили мягкий знак, пройден.
                     В течение следующего занятия мы изучим сразу две буквы: Ё и Ш.
                     """
-        )
+        })
     }
     lesson(
         name = "Буквы Ё и Ш"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 22. Буквы Ё и Ш.</b>
+                    <b>Урок $iLesson. Буквы Ё и Ш.</b>
                     <br><br>
                     Перед уроком будет полезно вспомнить буквы, пройденные на прошлых занятиях.
                     Введите шаг за шагом слово АПЕЛЬСИН
                     """
-        )
+        })
         inputChars("АПЕЛЬСИН")
         +Info(
             """
@@ -1332,26 +1333,26 @@ internal val golubinaIntroLessons by lessons {
             """Наконец, перед тем, как мы закончим урок, введите слово КОШКА"""
         )
         inputChars("КОШКА")
-        +Info(
+        +Info(InfoInterpolation.run {
             """                    
-                    Урок 22, посвящённый буквам Ё и Ш, завершён.
+                    Урок $iLesson, посвящённый буквам Ё и Ш, завершён.
                     <br>
                     До окончания изучения всего алфавита осталось 4 урока и 4 буквы: В, Э, Ю, Я.
                     В следующем уроке введём букву Я.
                     """
-        )
+        })
     }
     lesson(
         name = "Буква Я"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 23. Буква 'Я'.</b>
+                    <b>Урок $iLesson. Буква 'Я'.</b>
                     <br><br>
                     Мы выучили уже много букв, и перед занятием повторим часть из них.
                     Введите по буквам слово МИШЕНЬ
                     """
-        )
+        })
         inputChars("МИШЕНЬ")
         +Info(
             """
@@ -1392,24 +1393,24 @@ internal val golubinaIntroLessons by lessons {
             """Последнее слово в сегодняшнем уроке - ЗЕМЛЯ"""
         )
         inputChars("ЗЕМЛЯ")
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    Урок 23 - буква Я - успешно завершён.
+                    Урок $iLesson - буква Я - успешно завершён.
                     В следующий раз мы будем осваивать букву Ю.
                     """
-        )
+        })
     }
     lesson(
         name = "Буква Ю"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 24. Буква 'Ю'.</b>
+                    <b>Урок $iLesson. Буква 'Ю'.</b>
                     <br><br>
                     Начнём с ревизии уже изученных букв и специальных символов.
                     Введите, набирая отдельные буквы, слово ПОЛЯНА и поставьте после него запятую
                     """
-        )
+        })
         inputChars("ПОЛЯНА,")
         +Info(
             """
@@ -1452,26 +1453,26 @@ internal val golubinaIntroLessons by lessons {
             """Завершающее задание в этом уроке - введите буквы слова СЮЖЕТ"""
         )
         inputChars("СЮЖЕТ")
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    Урок 24 - русская буква Ю - закончен. Нам осталось пройти всего два занятия,
+                    Урок $iLesson - русская буква Ю - закончен. Нам осталось пройти всего два занятия,
                     после чего весь алфавит будет изучен.
                     <br>
                     В нашей предпоследней встрече мы освоим букву Э.
                     """
-        )
+        })
     }
     lesson(
         name = "Буква Э"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 25. Буква 'Э'.</b>
+                    <b>Урок $iLesson. Буква 'Э'.</b>
                     <br><br>
                     Перед погружением в новый материал повторим пройденное.
                     Введите по буквам слово ИНТЕРЕСНЫЙ
                     """
-        )
+        })
         inputChars("ИНТЕРЕСНЫЙ")
         +Info(
             """Ещё перед началом урока мы чуть-чуть повторим числа. Введите цифровой знак и
@@ -1522,25 +1523,25 @@ internal val golubinaIntroLessons by lessons {
             """В последнем задании нужно ввести слово ЭСТРАДА"""
         )
         inputChars("ЭСТРАДА")
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    Урок 25, в ходе которого мы выучили букву Э, закончен.
+                    Урок $iLesson, в ходе которого мы выучили букву Э, закончен.
                     <br>
                     В следующем уроке, который станет последним в нашем курсе, изучим букву В.
                     """
-        )
+        })
     }
     lesson(
         name = "Буква В"
     ) {
-        +Info(
+        +Info(InfoInterpolation.run {
             """
-                    <b>Урок 26. Буква 'В'.</b>
+                    <b>Урок $iLesson. Буква 'В'.</b>
                     <br><br>
                     В начале этого занятия вспомним материал, ранее пройденный в курсе.
                     Пожалуйста, наберите буквы, составляющие слово ЭНЦИКЛОПЕДИЯ
                     """
-        )
+        })
         inputChars("ЭНЦИКЛОПЕДИЯ")
         +Info(
             """
@@ -1586,9 +1587,9 @@ internal val golubinaIntroLessons by lessons {
             """Заключительное упражнение: наберите слово КОРОВА"""
         )
         inputChars("КОРОВА")
-        +LastInfo(
+        +LastInfo(InfoInterpolation.run {
             """
-                    Урок 26 - буква В - закончен.
+                    Урок $iLesson - буква В - закончен.
                     <br>
                     Вы дошли до конца курса. Спасибо, что воспользовались нашим обучающим
                     приложением! При желании можно вернутся к ранее пройденному материалу 
@@ -1598,6 +1599,6 @@ internal val golubinaIntroLessons by lessons {
                     Мы советуем Вам читать различные книги рельефно-точечным шрифтом. Желаем вам
                     приятного опыта использования алфавита Луи Брайля!
                     """
-        )
+        })
     }
 }

From fb8fc6471174703e8a605dfe08c33e016dd5c250 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Wed, 19 Aug 2020 12:34:13 +0300
Subject: [PATCH 010/117] #223 disable animation around braille dots

---
 app/src/main/res/drawable/right_border.xml | 18 ++++++++++++++++++
 app/src/main/res/values/styles.xml         |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 app/src/main/res/drawable/right_border.xml

diff --git a/app/src/main/res/drawable/right_border.xml b/app/src/main/res/drawable/right_border.xml
new file mode 100644
index 00000000..718e1edb
--- /dev/null
+++ b/app/src/main/res/drawable/right_border.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+            android:left="1dp"
+            android:top="15dp"
+            android:bottom="15dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/colorSecondary" />
+        </shape>
+    </item>
+    <item android:right="6dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/colorBackground" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7b1e9151..64098e50 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -44,6 +44,7 @@
         <item name="android:scaleX">2.6</item>
         <item name="android:scaleY">2.6</item>
         <item name="android:button">@drawable/round_checkbox</item>
+        <item name="background">@color/colorBackground</item>
     </style>
 
     <style name="SwitchPreferenceButton" parent="Theme.AppCompat.Light">

From e4383aa0d9036f8e7b4fa3afc22a55e867f1cfec Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 25 Aug 2020 10:07:56 +0300
Subject: [PATCH 011/117] #58 add one unit test to CI

---
 .github/workflows/android.yml                                 | 4 +++-
 .../github/braillesystems/learnbraille/utils/_KotlinTest.kt   | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)
 rename app/src/{androidTest => test}/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt (89%)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 897a252c..ed28a77d 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,3 +1,5 @@
+# credit: https://habr.com/ru/post/488134/
+
 name: Android CI
 
 on: [push]
@@ -21,4 +23,4 @@ jobs:
         run: ./gradlew assembleDebug
         
       - name: Run unit tests
-        run: ./gradlew testStageDebugUnitTest
+        run: ./gradlew test
diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
similarity index 89%
rename from app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
rename to app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
index dc541e55..4a192494 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
@@ -1,12 +1,8 @@
 package com.github.braillesystems.learnbraille.utils
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.junit.runner.RunWith
 
-
-@RunWith(AndroidJUnit4::class)
 class KotlinTest {
 
     private fun getNextNumber(currentNumber: Int, nextNumbers: Array<Int>, repeat: Int): Int? {

From f7b940cb65522ab8cc5d0f031dfffa4c1b2505ed Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 25 Aug 2020 10:11:23 +0300
Subject: [PATCH 012/117] #58 try to fix invalid CI manifest

---
 .github/workflows/android.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index ed28a77d..a75b8624 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -8,19 +8,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-
       - uses: actions/checkout@v1
-
       - name: set up JDK 1.8
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
-
       - name: Chmod .gradlew
         run: chmod +x ./gradlew
-
       - name: Build with Gradle
         run: ./gradlew assembleDebug
-        
       - name: Run unit tests
         run: ./gradlew test

From 07d8449116d05407f1285937f69acdffe801c5c0 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 25 Aug 2020 10:13:46 +0300
Subject: [PATCH 013/117] #58 try to fix CI script

---
 .github/workflows/android.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index a75b8624..5bd52139 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -13,8 +13,8 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
-      - name: Chmod .gradlew
-        run: chmod +x ./gradlew
+      - name: grant permissions to gradlew
+        run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew assembleDebug
       - name: Run unit tests

From 5c1c2fc33b8e5f9d732978863b8fd8854115b36d Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 25 Aug 2020 10:25:50 +0300
Subject: [PATCH 014/117] #58 delete CI script for investigation

---
 .github/workflows/android.yml | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 .github/workflows/android.yml

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
deleted file mode 100644
index 5bd52139..00000000
--- a/.github/workflows/android.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# credit: https://habr.com/ru/post/488134/
-
-name: Android CI
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: grant permissions to gradlew
-        run: chmod +x gradlew
-      - name: Build with Gradle
-        run: ./gradlew assembleDebug
-      - name: Run unit tests
-        run: ./gradlew test

From 7fd783d7de6a401fbfa752ef13aabddfd15178d5 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 25 Aug 2020 10:29:01 +0300
Subject: [PATCH 015/117] #58 investigation: return CI config

---
 .github/workflows/android.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/android.yml

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
new file mode 100644
index 00000000..8aa0047a
--- /dev/null
+++ b/.github/workflows/android.yml
@@ -0,0 +1,22 @@
+# credit: https://habr.com/ru/post/488134/
+
+
+name: Android CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: grant permissions to gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew assembleDebug
+      - name: Run unit tests
+        run: ./gradlew test

From 47cd14a44fb0cb7a6a1de5a4184b01abd4b7844e Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 25 Aug 2020 10:35:47 +0300
Subject: [PATCH 016/117] #58 investigate: convert gradlew to unix-style

---
 gradlew | 344 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 172 insertions(+), 172 deletions(-)

diff --git a/gradlew b/gradlew
index 518efffc..cccdd3d5 100644
--- a/gradlew
+++ b/gradlew
@@ -1,172 +1,172 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

From 161e7e0c0aa3a97e583015f45954d9f129850b3c Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 25 Aug 2020 11:07:01 +0300
Subject: [PATCH 017/117] (#58) add Actions badge to README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 7ab1b0e6..a77c8ac2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Learn Braille
 
+[![Actions Status](https://github.com/braille-systems/learn-braille/workflows/Android%20CI/badge.svg)](https://github.com/braille-systems/learn-braille/actions)
+
 Learn Braille is an android application for teaching Braille writing system.
 
 It is one of the few apps primarily designed for Russian Braille system, 

From 357cb7da17f22fa984138111e0a7c3ed18566b95 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 25 Aug 2020 11:21:34 +0300
Subject: [PATCH 018/117] (#58) move as many tests to unittests as possible

---
 .../learnbraille/data/dsl/DslTest.kt          | 523 +++++++++---------
 .../data/entities/BrailleDotsTest.kt          |  33 +-
 .../learnbraille/utils/UtilsTest.kt           |  71 ++-
 3 files changed, 313 insertions(+), 314 deletions(-)
 rename app/src/{androidTest => test}/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt (92%)
 rename app/src/{androidTest => test}/java/com/github/braillesystems/learnbraille/data/entities/BrailleDotsTest.kt (74%)
 rename app/src/{androidTest => test}/java/com/github/braillesystems/learnbraille/utils/UtilsTest.kt (87%)

diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
similarity index 92%
rename from app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
rename to app/src/test/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
index 8ca44f97..e2fb7c71 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
@@ -1,259 +1,264 @@
-package com.github.braillesystems.learnbraille.data.dsl
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.github.braillesystems.learnbraille.data.entities.*
-import com.github.braillesystems.learnbraille.data.entities.BrailleDot.E
-import com.github.braillesystems.learnbraille.data.entities.BrailleDot.F
-import com.github.braillesystems.learnbraille.res.DeckTags
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-
-
-private val content by materials {
-    +ruSymbols
-    +enSymbols
-    // ...
-}
-
-private val ruSymbols by symbols(symbolType = "ru") {
-    symbol(char = 'А', brailleDots = BrailleDots(F, E, E, E, E, E))
-    symbol(char = 'Б', brailleDots = BrailleDots(F, F, E, E, E, E))
-    // ...
-}
-
-private val enSymbols by symbols(symbolType = "en") {
-    symbol(char = 'Z', brailleDots = BrailleDots(F, F, F, E, E, E))
-    // ...
-}
-
-
-val knownMaterials by known()
-
-
-private val prepopulationData by data(
-    materials = content,
-    stepAnnotations = listOf("book", "bomb"),
-    knownMaterials = knownMaterials
-) {
-
-    users {
-        user("default1", "John Smith")
-    }
-
-    users {
-        user("default2", "")
-        user("default3", "")
-        // ...
-    }
-
-    courses {
-        course(
-            name = "Best course",
-            description = "The best"
-        ) {
-            +courseLessons
-            // ...
-        }
-
-        course(
-            name = "Worst course",
-            description = "The worst",
-            lessons = worstLessons
-        )
-    }
-
-    decks {
-        deck("Ru letters") {
-            it is Symbol && it.type == "ru"
-        }
-        // ...
-    }
-
-    decks {
-        deck("En letters") {
-            it is Symbol && it.type == "en"
-        }
-        deck(DeckTags.all) { true }
-        // ...
-    }
-}
-
-private val courseLessons by lessons {
-
-    lesson(
-        name = "Wow"
-    ) {
-        +FirstInfo("first")
-        addSomeSteps()
-    }
-}
-
-/*
- * Do not forget that builders is a regular Kotlin code, no magic.
- */
-private fun StepsBuilder.addSomeSteps() {
-    +Info("with book").annotate("book")
-    +LastInfo("last")
-}
-
-private val worstLessons by lessons {
-
-    lesson("1") {
-        +FirstInfo("FirstInfo")
-        +Info("Open your book and boom your bomb").annotate("book", "bomb")
-        +ShowDots(
-            text = "Перед Вами полное шеститочие",
-            dots = BrailleDots(F, F, F, F, F, F)
-        )
-        +InputDots(
-            text = "Введите все шесть точек",
-            dots = BrailleDots(F, F, F, F, F, F)
-        )
-        +Show(content.symbols.getValue('Z'))
-        for (material in getMaterials(
-            'Б',
-            'Z'
-        )) {
-            +Input(material)
-        }
-        +LastInfo(InfoInterpolation.run {
-            "LastInfo with stepId: $iStep, lessonId: $iLesson, courseName: $courseName"
-        })
-    }
-}
-
-private fun getMaterials(vararg chars: Char) =
-    chars.map(content.symbols::getValue)
-
-
-// Lists for testing
-
-private val users = listOf(
-    // Zero ID's because of autoincrement
-    User(0, "default1", "John Smith"),
-    User(0, "default2", ""),
-    User(0, "default3", "")
-)
-private val mats = listOf(
-    Material(1, Symbol(char = 'А', brailleDots = BrailleDots(F, E, E, E, E, E), type = "ru")),
-    Material(2, Symbol(char = 'Б', brailleDots = BrailleDots(F, F, E, E, E, E), type = "ru")),
-    Material(3, Symbol(char = 'Z', brailleDots = BrailleDots(F, F, F, E, E, E), type = "en"))
-)
-private val decks = listOf(
-    Deck(2, "Ru letters"),
-    Deck(3, "En letters"),
-    Deck(1, DeckTags.all)
-)
-private val cards = listOf(
-    Card(2, 1),
-    Card(2, 2),
-    Card(3, 3),
-    Card(1, 1),
-    Card(1, 2),
-    Card(1, 3)
-)
-private val courses = listOf(
-    Course(1, "Best course", "The best"),
-    Course(2, "Worst course", "The worst")
-)
-private val lessons = listOf(
-    Lesson(1, 1, "Wow", ""),
-    Lesson(1, 2, "1", "")
-)
-private val steps = listOf(
-    Step(1, 1, 1, FirstInfo("first")),
-    Step(2, 1, 1, Info("with book")),
-    Step(3, 1, 1, LastInfo("last")),
-
-    Step(1, 2, 1, FirstInfo("FirstInfo")),
-    Step(2, 2, 1, Info("Open your book and boom your bomb")),
-    Step(
-        3, 2, 1,
-        ShowDots(
-            text = "Перед Вами полное шеститочие",
-            dots = BrailleDots(F, F, F, F, F, F)
-        )
-    ),
-    Step(
-        4, 2, 1,
-        InputDots(
-            text = "Введите все шесть точек",
-            dots = BrailleDots(F, F, F, F, F, F)
-        )
-    ),
-    Step(5, 2, 1, Show(content.symbols.getValue('Z'))),
-    Step(6, 2, 1, Input(content.symbols.getValue('Б'))),
-    Step(7, 2, 1, Input(content.symbols.getValue('Z'))),
-    Step(
-        8, 2, 1,
-        LastInfo("LastInfo with stepId: 8, lessonId: 1, courseName: Worst course")
-    )
-)
-private val stepAnnotations = listOf(
-    StepAnnotation(1, "book"),
-    StepAnnotation(2, "bomb")
-)
-private val stepHasAnnotations = listOf(
-    StepHasAnnotation(1, 1, 2, 1),
-    StepHasAnnotation(2, 1, 2, 1),
-    StepHasAnnotation(2, 1, 2, 2)
-)
-
-
-@RunWith(AndroidJUnit4::class)
-class DslTest {
-
-    private lateinit var data: DataStorage
-
-    @Before
-    fun getBuilder() {
-        data = prepopulationData
-    }
-
-    @Test
-    fun testUsers() {
-        assertEquals(users, data.users)
-    }
-
-    @Test
-    fun testMaterials() {
-        assertEquals(mats, data.materials)
-    }
-
-    @Test
-    fun testDecks() {
-        assertEquals(decks, data.decks)
-    }
-
-    @Test
-    fun testCards() {
-        assertEquals(cards, data.cards)
-    }
-
-    @Test
-    fun testCourses() {
-        assertEquals(courses, data.courses)
-    }
-
-    @Test
-    fun testLessons() {
-        assertEquals(lessons, data.lessons)
-    }
-
-    @Test
-    fun testSteps() {
-        assertEquals(steps, data.steps)
-    }
-
-    @Test
-    fun testAnnotations() {
-        assertEquals(stepAnnotations, data.stepAnnotations)
-    }
-
-    @Test
-    fun testStepAnnotations() {
-        assertEquals(stepHasAnnotations, data.stepsHasAnnotations)
-    }
-}
+package com.github.braillesystems.learnbraille.data.dsl
+
+import com.github.braillesystems.learnbraille.data.entities.*
+import com.github.braillesystems.learnbraille.data.entities.BrailleDot.E
+import com.github.braillesystems.learnbraille.data.entities.BrailleDot.F
+import com.github.braillesystems.learnbraille.res.DeckTags
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+
+private val content by materials {
+    +ruSymbols
+    +enSymbols
+    // ...
+}
+
+private val ruSymbols by symbols(
+    symbolType = "ru"
+) {
+    symbol(char = 'А', brailleDots = BrailleDots(F, E, E, E, E, E))
+    symbol(char = 'Б', brailleDots = BrailleDots(F, F, E, E, E, E))
+    // ...
+}
+
+private val enSymbols by symbols(
+    symbolType = "en"
+) {
+    symbol(char = 'Z', brailleDots = BrailleDots(F, F, F, E, E, E))
+    // ...
+}
+
+
+val knownMaterials by known()
+
+
+private val prepopulationData by data(
+    materials = content,
+    stepAnnotations = listOf("book", "bomb"),
+    knownMaterials = knownMaterials
+) {
+
+    users {
+        user("default1", "John Smith")
+    }
+
+    users {
+        user("default2", "")
+        user("default3", "")
+        // ...
+    }
+
+    courses {
+        course(
+            name = "Best course",
+            description = "The best"
+        ) {
+            +courseLessons
+            // ...
+        }
+
+        course(
+            name = "Worst course",
+            description = "The worst",
+            lessons = worstLessons
+        )
+    }
+
+    decks {
+        deck("Ru letters") {
+            it is Symbol && it.type == "ru"
+        }
+        // ...
+    }
+
+    decks {
+        deck("En letters") {
+            it is Symbol && it.type == "en"
+        }
+        deck(DeckTags.all) { true }
+        // ...
+    }
+}
+
+private val courseLessons by lessons {
+
+    lesson(
+        name = "Wow"
+    ) {
+        +FirstInfo("first")
+        addSomeSteps()
+    }
+}
+
+/*
+ * Do not forget that builders is a regular Kotlin code, no magic.
+ */
+private fun StepsBuilder.addSomeSteps() {
+    +Info("with book").annotate("book")
+    +LastInfo("last")
+}
+
+private val worstLessons by lessons {
+
+    lesson("1") {
+        +FirstInfo("FirstInfo")
+        +Info("Open your book and boom your bomb").annotate("book", "bomb")
+        +ShowDots(
+            text = "Перед Вами полное шеститочие",
+            dots = BrailleDots(F, F, F, F, F, F)
+        )
+        +InputDots(
+            text = "Введите все шесть точек",
+            dots = BrailleDots(F, F, F, F, F, F)
+        )
+        +Show(
+            content.symbols.getValue(
+                'Z'
+            )
+        )
+        for (material in getMaterials(
+            'Б',
+            'Z'
+        )) {
+            +Input(material)
+        }
+        +LastInfo(InfoInterpolation.run {
+            "LastInfo with stepId: $iStep, lessonId: $iLesson, courseName: $courseName"
+        })
+    }
+}
+
+private fun getMaterials(vararg chars: Char) =
+    chars.map(content.symbols::getValue)
+
+
+// Lists for testing
+
+private val users = listOf(
+    // Zero ID's because of autoincrement
+    User(0, "default1", "John Smith"),
+    User(0, "default2", ""),
+    User(0, "default3", "")
+)
+private val mats = listOf(
+    Material(1, Symbol(char = 'А', brailleDots = BrailleDots(F, E, E, E, E, E), type = "ru")),
+    Material(2, Symbol(char = 'Б', brailleDots = BrailleDots(F, F, E, E, E, E), type = "ru")),
+    Material(3, Symbol(char = 'Z', brailleDots = BrailleDots(F, F, F, E, E, E), type = "en"))
+)
+private val decks = listOf(
+    Deck(2, "Ru letters"),
+    Deck(3, "En letters"),
+    Deck(1, DeckTags.all)
+)
+private val cards = listOf(
+    Card(2, 1),
+    Card(2, 2),
+    Card(3, 3),
+    Card(1, 1),
+    Card(1, 2),
+    Card(1, 3)
+)
+private val courses = listOf(
+    Course(1, "Best course", "The best"),
+    Course(2, "Worst course", "The worst")
+)
+private val lessons = listOf(
+    Lesson(1, 1, "Wow", ""),
+    Lesson(1, 2, "1", "")
+)
+private val steps = listOf(
+    Step(1, 1, 1, FirstInfo("first")),
+    Step(2, 1, 1, Info("with book")),
+    Step(3, 1, 1, LastInfo("last")),
+
+    Step(1, 2, 1, FirstInfo("FirstInfo")),
+    Step(2, 2, 1, Info("Open your book and boom your bomb")),
+    Step(
+        3, 2, 1,
+        ShowDots(
+            text = "Перед Вами полное шеститочие",
+            dots = BrailleDots(F, F, F, F, F, F)
+        )
+    ),
+    Step(
+        4, 2, 1,
+        InputDots(
+            text = "Введите все шесть точек",
+            dots = BrailleDots(F, F, F, F, F, F)
+        )
+    ),
+    Step(5, 2, 1, Show(content.symbols.getValue('Z'))),
+    Step(6, 2, 1, Input(content.symbols.getValue('Б'))),
+    Step(7, 2, 1, Input(content.symbols.getValue('Z'))),
+    Step(
+        8, 2, 1,
+        LastInfo("LastInfo with stepId: 8, lessonId: 1, courseName: Worst course")
+    )
+)
+private val stepAnnotations = listOf(
+    StepAnnotation(1, "book"),
+    StepAnnotation(2, "bomb")
+)
+private val stepHasAnnotations = listOf(
+    StepHasAnnotation(1, 1, 2, 1),
+    StepHasAnnotation(2, 1, 2, 1),
+    StepHasAnnotation(2, 1, 2, 2)
+)
+
+
+class DslTest {
+
+    private lateinit var data: DataStorage
+
+    @Before
+    fun getBuilder() {
+        data = prepopulationData
+    }
+
+    @Test
+    fun testUsers() {
+        assertEquals(users, data.users)
+    }
+
+    @Test
+    fun testMaterials() {
+        assertEquals(mats, data.materials)
+    }
+
+    @Test
+    fun testDecks() {
+        assertEquals(decks, data.decks)
+    }
+
+    @Test
+    fun testCards() {
+        assertEquals(cards, data.cards)
+    }
+
+    @Test
+    fun testCourses() {
+        assertEquals(courses, data.courses)
+    }
+
+    @Test
+    fun testLessons() {
+        assertEquals(lessons, data.lessons)
+    }
+
+    @Test
+    fun testSteps() {
+        assertEquals(steps, data.steps)
+    }
+
+    @Test
+    fun testAnnotations() {
+        assertEquals(stepAnnotations, data.stepAnnotations)
+    }
+
+    @Test
+    fun testStepAnnotations() {
+        assertEquals(stepHasAnnotations, data.stepsHasAnnotations)
+    }
+}
diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/entities/BrailleDotsTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/data/entities/BrailleDotsTest.kt
similarity index 74%
rename from app/src/androidTest/java/com/github/braillesystems/learnbraille/data/entities/BrailleDotsTest.kt
rename to app/src/test/java/com/github/braillesystems/learnbraille/data/entities/BrailleDotsTest.kt
index 04ce1e29..ce2e287e 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/entities/BrailleDotsTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/data/entities/BrailleDotsTest.kt
@@ -1,18 +1,15 @@
-package com.github.braillesystems.learnbraille.data.entities
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class BrailleDotsTest {
-
-    @Test
-    fun spelling() {
-        assertEquals(
-            "1, 3, 6",
-            BrailleDots(b1 = BrailleDot.F, b3 = BrailleDot.F, b6 = BrailleDot.F).spelling
-        )
-    }
-}
+package com.github.braillesystems.learnbraille.data.entities
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class BrailleDotsTest {
+
+    @Test
+    fun spelling() {
+        assertEquals(
+            "1, 3, 6",
+            BrailleDots(b1 = BrailleDot.F, b3 = BrailleDot.F, b6 = BrailleDot.F).spelling
+        )
+    }
+}
diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/UtilsTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/utils/UtilsTest.kt
similarity index 87%
rename from app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/UtilsTest.kt
rename to app/src/test/java/com/github/braillesystems/learnbraille/utils/UtilsTest.kt
index 57f10523..8a098998 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/UtilsTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/utils/UtilsTest.kt
@@ -1,37 +1,34 @@
-package com.github.braillesystems.learnbraille.utils
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import kotlinx.serialization.Serializable
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@Serializable
-sealed class S
-
-@Serializable
-data class A(val s: String) : S()
-
-@Serializable
-data class B(val i: Long, val s: String) : S()
-
-@RunWith(AndroidJUnit4::class)
-class UtilsTest {
-
-    @Test
-    fun serializationBasic() {
-        @Serializable
-        data class D(val s: String, val i: Int)
-
-        val d = D("Wow", 100500)
-        assertEquals(d, parse(D.serializer(), stringify(D.serializer(), d)))
-    }
-
-    @Test
-    fun serializationVirtual() {
-        val s1: S = A("wow")
-        assertEquals(s1 as A, parse(S.serializer(), stringify(S.serializer(), s1)))
-        val s2: S = B(100500, "aaa")
-        assertEquals(s2 as B, parse(S.serializer(), stringify(S.serializer(), s2)))
-    }
-}
+package com.github.braillesystems.learnbraille.utils
+
+import kotlinx.serialization.Serializable
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+@Serializable
+sealed class S
+
+@Serializable
+data class A(val s: String) : S()
+
+@Serializable
+data class B(val i: Long, val s: String) : S()
+
+class UtilsTest {
+
+    @Test
+    fun serializationBasic() {
+        @Serializable
+        data class D(val s: String, val i: Int)
+
+        val d = D("Wow", 100500)
+        assertEquals(d, parse(D.serializer(), stringify(D.serializer(), d)))
+    }
+
+    @Test
+    fun serializationVirtual() {
+        val s1: S = A("wow")
+        assertEquals(s1 as A, parse(S.serializer(), stringify(S.serializer(), s1)))
+        val s2: S = B(100500, "aaa")
+        assertEquals(s2 as B, parse(S.serializer(), stringify(S.serializer(), s2)))
+    }
+}

From 316295c978cfe2e69b2ad619ca520d8a2336f4e0 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 25 Aug 2020 17:14:53 +0300
Subject: [PATCH 019/117] #58 upload APK as artifact

---
 .github/workflows/android.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 8aa0047a..0c0a934a 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -20,3 +20,8 @@ jobs:
         run: ./gradlew assembleDebug
       - name: Run unit tests
         run: ./gradlew test
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: learn-braille-debug
+          path: app/build/outputs/apk/debug/app-debug.apk

From b029170f1cbb7bb47ce79d60a5c120b1468fff54 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 25 Aug 2020 21:05:16 +0300
Subject: [PATCH 020/117] #58 add detekt

---
 .github/workflows/android.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 0c0a934a..559a1b3c 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -10,6 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
+      - name: Set up detekt
+        run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.12.0-RC1/detekt && chmod a+x detekt
+      - name: Static check with detekt
+        run: ./detekt
       - name: set up JDK 1.8
         uses: actions/setup-java@v1
         with:

From f9d3f5d322be69ab05a2b59d3134ca69c975554b Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 25 Aug 2020 22:17:20 +0300
Subject: [PATCH 021/117] #58 fix or ignore a few detect non-compliances

---
 .github/workflows/android.yml                 |   2 +-
 .gitignore                                    |   2 +
 .../data/repository/PracticeRepositoryTest.kt |  28 +-
 .../learnbraille/res/TestCourse.kt            |   2 +-
 .../ui/screens/settings/SettingsFragment.kt   |  26 +-
 .../ui/screens/stats/StatsFragment.kt         |   2 +-
 .../learnbraille/utils/SpeechRecognition.kt   | 248 +++++++++---------
 .../learnbraille/utils/_KotlinTest.kt         |  12 +-
 detekt-config.yml                             |   9 +
 9 files changed, 171 insertions(+), 160 deletions(-)
 create mode 100644 detekt-config.yml

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 559a1b3c..1a2f42c6 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up detekt
         run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.12.0-RC1/detekt && chmod a+x detekt
       - name: Static check with detekt
-        run: ./detekt
+        run: ./detekt -c detekt-config.yml --build-upon-default-config
       - name: set up JDK 1.8
         uses: actions/setup-java@v1
         with:
diff --git a/.gitignore b/.gitignore
index 11039858..ea14d43c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+# static check script
+detekt
 
 # Created by https://www.toptal.com/developers/gitignore/api/androidstudio,android,gradle
 # Edit at https://www.toptal.com/developers/gitignore?templates=androidstudio,android,gradle
diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepositoryTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepositoryTest.kt
index 074a6d5a..11cca30e 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepositoryTest.kt
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepositoryTest.kt
@@ -1,14 +1,14 @@
-package com.github.braillesystems.learnbraille.data.repository
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class PracticeRepositoryTest {
-
-    @Test
-    fun practiceRepo() {
-        // TODO
-    }
-}
\ No newline at end of file
+package com.github.braillesystems.learnbraille.data.repository
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class PracticeRepositoryTest {
+
+    @Test
+    fun practiceRepo() {
+        // TODO
+    }
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
index 89c5acc1..cfb1aeb1 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
@@ -96,4 +96,4 @@ internal val testLessons by lessons {
             """
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/settings/SettingsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/settings/SettingsFragment.kt
index 4e8a427f..bae9cf45 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/settings/SettingsFragment.kt
@@ -1,13 +1,13 @@
-package com.github.braillesystems.learnbraille.ui.screens.settings
-
-import android.os.Bundle
-import com.github.braillesystems.learnbraille.R
-import com.github.braillesystems.learnbraille.utils.title
-
-class SettingsFragment : androidx.preference.PreferenceFragmentCompat() {
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.settings_hierarchy, rootKey)
-        title = getString(R.string.preferences_actionbar_title)
-    }
-}
\ No newline at end of file
+package com.github.braillesystems.learnbraille.ui.screens.settings
+
+import android.os.Bundle
+import com.github.braillesystems.learnbraille.R
+import com.github.braillesystems.learnbraille.utils.title
+
+class SettingsFragment : androidx.preference.PreferenceFragmentCompat() {
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.settings_hierarchy, rootKey)
+        title = getString(R.string.preferences_actionbar_title)
+    }
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
index b01f4684..0727aaff 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
@@ -66,4 +66,4 @@ class StatsFragment : AbstractFragmentWithHelp(R.string.stats_help) {
     }.root
 
     override fun onDestroy() = super.onDestroy().also { job.cancel() }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/SpeechRecognition.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/SpeechRecognition.kt
index e44fbd47..20348382 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/SpeechRecognition.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/SpeechRecognition.kt
@@ -1,124 +1,124 @@
-package com.github.braillesystems.learnbraille.utils
-
-import android.content.Intent
-import android.os.Bundle
-import android.speech.RecognitionListener
-import android.speech.RecognizerIntent
-import android.speech.SpeechRecognizer
-import android.speech.tts.TextToSpeech
-import android.speech.tts.UtteranceProgressListener
-import androidx.fragment.app.Fragment
-import com.github.braillesystems.learnbraille.R
-import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
-import timber.log.Timber
-import java.util.*
-import kotlin.collections.HashMap
-import kotlin.collections.set
-import kotlin.system.exitProcess
-
-// TODO refactor
-
-class SpeechRecognition(
-    private val fragment: Fragment,
-    private val preferenceRepository: PreferenceRepository
-) {
-
-    private var mostRecentUtteranceID: String? = null
-    private lateinit var mTTs: TextToSpeech
-    private var mSpeechRecognizer: SpeechRecognizer? = null
-    private var mSpeechRecognizerIntent: Intent? = null
-
-    init {
-        runIf(preferenceRepository.speechRecognitionEnabled) {
-            try {
-                initialize()
-            } catch (e: Throwable) {
-                Timber.e(e)
-            }
-        }
-    }
-
-    private fun initialize() = fragment.apply {
-        mTTs = TextToSpeech(context, TextToSpeech.OnInitListener { status ->
-            if (status == TextToSpeech.SUCCESS) {
-                mTTs.language = Locale.UK
-                mostRecentUtteranceID = (Random().nextInt() % 9999999).toString() + ""
-
-                val params: MutableMap<String, String?> = HashMap()
-                params[TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID] = mostRecentUtteranceID
-                @Suppress("DEPRECATION", "UNCHECKED_CAST")
-                mTTs.speak(
-                    getString(R.string.exit_question), TextToSpeech.QUEUE_FLUSH,
-                    params as HashMap<String, String>?
-                )
-                mTTs.setOnUtteranceProgressListener(object : UtteranceProgressListener() {
-                    override fun onDone(utteranceId: String) {
-                        if (utteranceId != mostRecentUtteranceID) {
-                            return
-                        }
-                        activity?.runOnUiThread {
-                            if (mSpeechRecognizer != null) {
-                                mSpeechRecognizer!!.startListening(mSpeechRecognizerIntent)
-                            }
-                        }
-                    }
-
-                    override fun onError(utteranceId: String) {}
-                    override fun onStart(utteranceId: String) {}
-                })
-
-            }
-        })
-
-        mSpeechRecognizer = SpeechRecognizer.createSpeechRecognizer(context)
-        mSpeechRecognizerIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
-        mSpeechRecognizerIntent?.putExtra(
-            RecognizerIntent.EXTRA_LANGUAGE_MODEL,
-            RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
-        )
-        mSpeechRecognizerIntent?.putExtra(
-            RecognizerIntent.EXTRA_CALLING_PACKAGE,
-            context?.packageName
-        )
-        mSpeechRecognizer?.setRecognitionListener(SpeechRecognitionListener(fragment))
-    }
-
-    fun onDestroy() = runIf(preferenceRepository.speechRecognitionEnabled) {
-        try {
-            mSpeechRecognizer?.destroy()
-        } catch (e: Throwable) {
-            Timber.e(e)
-        }
-    }
-}
-
-private class SpeechRecognitionListener(fragment: Fragment) : RecognitionListener {
-
-    override fun onBeginningOfSpeech() {}
-    override fun onBufferReceived(buffer: ByteArray) {}
-    override fun onEndOfSpeech() {}
-    override fun onError(error: Int) {}
-    override fun onEvent(eventType: Int, params: Bundle) {}
-    override fun onPartialResults(partialResults: Bundle) {}
-    override fun onReadyForSpeech(params: Bundle) {}
-    override fun onRmsChanged(rmsdB: Float) {}
-
-    private val hostFragment: Fragment = fragment
-
-    override fun onResults(results: Bundle) {
-        try {
-            val matches =
-                results.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)
-                    ?: return
-            Timber.i("Speech recognized: $matches")
-            if (matches[0] == "да") {
-                exitProcess(0)
-            }
-            if (matches[0] == "нет") {
-                hostFragment.navigate(R.id.action_global_menuFragment)
-            }
-        } catch (e: Exception) {
-            Timber.e(e)
-        }
-    }
-}
+package com.github.braillesystems.learnbraille.utils
+
+import android.content.Intent
+import android.os.Bundle
+import android.speech.RecognitionListener
+import android.speech.RecognizerIntent
+import android.speech.SpeechRecognizer
+import android.speech.tts.TextToSpeech
+import android.speech.tts.UtteranceProgressListener
+import androidx.fragment.app.Fragment
+import com.github.braillesystems.learnbraille.R
+import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
+import timber.log.Timber
+import java.util.*
+import kotlin.collections.HashMap
+import kotlin.collections.set
+import kotlin.system.exitProcess
+
+// TODO refactor
+
+class SpeechRecognition(
+    private val fragment: Fragment,
+    private val preferenceRepository: PreferenceRepository
+) {
+
+    private var mostRecentUtteranceID: String? = null
+    private lateinit var mTTs: TextToSpeech
+    private var mSpeechRecognizer: SpeechRecognizer? = null
+    private var mSpeechRecognizerIntent: Intent? = null
+
+    init {
+        runIf(preferenceRepository.speechRecognitionEnabled) {
+            try {
+                initialize()
+            } catch (e: Throwable) {
+                Timber.e(e)
+            }
+        }
+    }
+
+    private fun initialize() = fragment.apply {
+        mTTs = TextToSpeech(context, TextToSpeech.OnInitListener { status ->
+            if (status == TextToSpeech.SUCCESS) {
+                mTTs.language = Locale.UK
+                mostRecentUtteranceID = (Random().nextInt() % 9999999).toString() + ""
+
+                val params: MutableMap<String, String?> = HashMap()
+                params[TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID] = mostRecentUtteranceID
+                @Suppress("DEPRECATION", "UNCHECKED_CAST")
+                mTTs.speak(
+                    getString(R.string.exit_question), TextToSpeech.QUEUE_FLUSH,
+                    params as HashMap<String, String>?
+                )
+                mTTs.setOnUtteranceProgressListener(object : UtteranceProgressListener() {
+                    override fun onDone(utteranceId: String) {
+                        if (utteranceId != mostRecentUtteranceID) {
+                            return
+                        }
+                        activity?.runOnUiThread {
+                            if (mSpeechRecognizer != null) {
+                                mSpeechRecognizer!!.startListening(mSpeechRecognizerIntent)
+                            }
+                        }
+                    }
+
+                    override fun onError(p0: String?) = Unit
+                    override fun onStart(p0: String?) = Unit
+                })
+
+            }
+        })
+
+        mSpeechRecognizer = SpeechRecognizer.createSpeechRecognizer(context)
+        mSpeechRecognizerIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
+        mSpeechRecognizerIntent?.putExtra(
+            RecognizerIntent.EXTRA_LANGUAGE_MODEL,
+            RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
+        )
+        mSpeechRecognizerIntent?.putExtra(
+            RecognizerIntent.EXTRA_CALLING_PACKAGE,
+            context?.packageName
+        )
+        mSpeechRecognizer?.setRecognitionListener(SpeechRecognitionListener(fragment))
+    }
+
+    fun onDestroy() = runIf(preferenceRepository.speechRecognitionEnabled) {
+        try {
+            mSpeechRecognizer?.destroy()
+        } catch (e: Throwable) {
+            Timber.e(e)
+        }
+    }
+}
+
+private class SpeechRecognitionListener(fragment: Fragment) : RecognitionListener {
+
+    override fun onBeginningOfSpeech() = Unit
+    override fun onBufferReceived(buffer: ByteArray) = Unit
+    override fun onEndOfSpeech() = Unit
+    override fun onError(error: Int) = Unit
+    override fun onEvent(eventType: Int, params: Bundle) = Unit
+    override fun onPartialResults(partialResults: Bundle) = Unit
+    override fun onReadyForSpeech(params: Bundle) = Unit
+    override fun onRmsChanged(rmsdB: Float) = Unit
+
+    private val hostFragment: Fragment = fragment
+
+    override fun onResults(results: Bundle) {
+        try {
+            val matches =
+                results.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)
+                    ?: return
+            Timber.i("Speech recognized: $matches")
+            if (matches[0] == "да") {
+                exitProcess(0)
+            }
+            if (matches[0] == "нет") {
+                hostFragment.navigate(R.id.action_global_menuFragment)
+            }
+        } catch (e: Exception) {
+            Timber.e(e)
+        }
+    }
+}
diff --git a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
index 4a192494..b4198692 100644
--- a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
@@ -5,7 +5,7 @@ import org.junit.Test
 
 class KotlinTest {
 
-    private fun getNextNumber(currentNumber: Int, nextNumbers: Array<Int>, repeat: Int): Int? {
+    private fun getNextNumber(currentNumber: Int, nextNumbers: IntArray, repeat: Int): Int? {
         var i = 0
         fun getNextNumber(): Int {
             return nextNumbers[i++]
@@ -19,11 +19,11 @@ class KotlinTest {
     @Test
     fun tryNTest() {
         // testing how tryN helps to find first number in a sequence different from specified number
-        assertEquals(1, getNextNumber(0, arrayOf(1, 1, 1), 2))
-        assertEquals(2, getNextNumber(1, arrayOf(1, 2, 3), 2))
-        assertEquals(2, getNextNumber(1, arrayOf(1, 2, 3), 3))
-        assertEquals(null, getNextNumber(1, arrayOf(1, 2, 3), 1))
-        assertEquals(5, getNextNumber(0, arrayOf(0, 0, 0, 5, 1, 0, 4), 4))
+        assertEquals(1, getNextNumber(0, intArrayOf(1, 1, 1), 2))
+        assertEquals(2, getNextNumber(1, intArrayOf(1, 2, 3), 2))
+        assertEquals(2, getNextNumber(1, intArrayOf(1, 2, 3), 3))
+        assertEquals(null, getNextNumber(1, intArrayOf(1, 2, 3), 1))
+        assertEquals(5, getNextNumber(0, intArrayOf(0, 0, 0, 5, 1, 0, 4), 4))
 
     }
 }
diff --git a/detekt-config.yml b/detekt-config.yml
new file mode 100644
index 00000000..ac3c8247
--- /dev/null
+++ b/detekt-config.yml
@@ -0,0 +1,9 @@
+# see https://github.com/detekt/detekt/blob/master/detekt-core/src/main/resources/default-detekt-config.yml for examples
+
+complexity:
+   TooManyFunctions:
+      excludes: ['**/utils/**']
+
+style:
+   WildcardImport:
+      active: false

From 69a56a19661f2bb8a8160ef689eed8eebbd928f4 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 29 Aug 2020 13:59:44 +0300
Subject: [PATCH 022/117] #241 add latin & greek letters to symbols

---
 .../braillesystems/learnbraille/res/Data.kt   | 21 ++++-
 .../learnbraille/res/Materials.kt             | 87 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  7 ++
 3 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
index c78823a7..de7003cf 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
@@ -55,10 +55,23 @@ val prepopulationData by data(
     }
 
     decks {
-        deck(DeckTags.all) { true }  // This deck should always exist
+        deck(DeckTags.all) { true } // This deck should always exist
+        deck(DeckTags.allWithRus) { data ->
+            data is Symbol && data.type in listOf(
+                SymbolType.ru,
+                SymbolType.special,
+                SymbolType.digit
+            )
+        }
         deck(DeckTags.ruLetters) { data ->
             data is Symbol && data.type == SymbolType.ru
         }
+        deck(DeckTags.latinLetters) { data ->
+            data is Symbol && data.type == SymbolType.latin
+        }
+        deck(DeckTags.greekLetters) { data ->
+            data is Symbol && data.type == SymbolType.greek
+        }
         deck(DeckTags.special) { data ->
             data is Symbol && data.type == SymbolType.special
         }
@@ -74,7 +87,10 @@ object StepAnnotation {
 
 object DeckTags {
     const val all = "all"
+    const val allWithRus = "all_with_rus"
     const val ruLetters = "ru_letters"
+    const val latinLetters = "latin_letters"
+    const val greekLetters = "greek_letters"
     const val digits = "digits"
     const val special = "special"
 }
@@ -83,7 +99,10 @@ val Context.deckTagToName: Map<String, String> by lazyWithContext {
     DeckTags.run {
         mapOf(
             all to getString(R.string.deck_name_all),
+            allWithRus to getString(R.string.deck_name_all_with_ru),
             ruLetters to getString(R.string.deck_name_ru_letters),
+            latinLetters to getString(R.string.deck_name_latin_letters),
+            greekLetters to getString(R.string.deck_name_greek_letters),
             digits to getString(R.string.deck_name_digits),
             special to getString(R.string.deck_name_special_symbols)
         )
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index af98f675..ef07b03a 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -16,10 +16,15 @@ import com.github.braillesystems.learnbraille.utils.rules
  *
  * Always use this variable to get materials.
  */
+
+// TODO write a migration for lat, greek
+
 val content by materials {
     +ruSymbols
     +specialSymbols
     +uebDigits
+    +latinLetters
+    +greekLetters
 }
 
 val knownMaterials by known(
@@ -44,6 +49,16 @@ val Context.inputSymbolPrintRules by rules<Context, Char, String>(
         uebDigits.map::containsKey to { c: Char -> t.format(c) }
     },
 
+    {
+        val t = getString(R.string.input_latin_letter_intro_template)
+        latinLetters.map::containsKey to { c: Char -> t.format(c) }
+    },
+
+    {
+        val t = getString(R.string.input_greek_letter_intro_template)
+        greekLetters.map::containsKey to { c: Char -> t.format(c) }
+    },
+
     {
         val other = getString(R.string.input_special_intro_template)
         val numSign = getString(R.string.input_special_intro_num_sign)
@@ -63,6 +78,8 @@ val Context.inputSymbolPrintRules by rules<Context, Char, String>(
 )
 
 val Context.showSymbolPrintRules by rules<Context, Char, String>(
+    // TODO reduce repeated code
+
     {
         val t = getString(R.string.show_letter_intro_template)
         ruSymbols.map::containsKey to { c: Char -> t.format(c) }
@@ -73,6 +90,16 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
         uebDigits.map::containsKey to { c: Char -> t.format(c) }
     },
 
+    {
+        val t = getString(R.string.show_latin_letter_intro_template)
+        latinLetters.map::containsKey to { c: Char -> t.format(c) }
+    },
+
+    {
+        val t = getString(R.string.show_greek_letter_intro_template)
+        greekLetters.map::containsKey to { c: Char -> t.format(c) }
+    },
+
     {
         val other = getString(R.string.show_special_intro_template)
         val numSign = getString(R.string.show_special_intro_num_sign)
@@ -94,6 +121,8 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
 
 object SymbolType {
     const val ru = "ru"
+    const val latin = "Latin"
+    const val greek = "greek"
     const val special = "special"
     const val digit = "digit"
 }
@@ -153,3 +182,61 @@ private val uebDigits by symbols(SymbolType.digit) {
     symbol(char = '9', brailleDots = BrailleDots(E, F, E, F, E, E))
     symbol(char = '0', brailleDots = BrailleDots(E, F, E, F, F, E))
 }
+
+private val latinLetters by symbols(SymbolType.latin) {
+    symbol(char = 'A', brailleDots = BrailleDots(F, E, E, E, E, E))
+    symbol(char = 'B', brailleDots = BrailleDots(F, F, E, E, E, E))
+    symbol(char = 'C', brailleDots = BrailleDots(F, E, E, F, E, E))
+    symbol(char = 'D', brailleDots = BrailleDots(F, E, E, F, F, E))
+    symbol(char = 'E', brailleDots = BrailleDots(F, E, E, E, F, E))
+    symbol(char = 'F', brailleDots = BrailleDots(F, F, E, F, E, E))
+    symbol(char = 'G', brailleDots = BrailleDots(F, F, E, F, F, E))
+    symbol(char = 'H', brailleDots = BrailleDots(F, F, E, E, F, E))
+    symbol(char = 'I', brailleDots = BrailleDots(E, F, E, F, E, E))
+    symbol(char = 'J', brailleDots = BrailleDots(E, F, E, F, F, E))
+    symbol(char = 'K', brailleDots = BrailleDots(F, E, F, E, E, E))
+    symbol(char = 'L', brailleDots = BrailleDots(F, F, F, E, E, E))
+    symbol(char = 'M', brailleDots = BrailleDots(F, E, F, F, E, E))
+    symbol(char = 'N', brailleDots = BrailleDots(F, E, F, F, F, E))
+    symbol(char = 'O', brailleDots = BrailleDots(F, E, F, E, F, E))
+    symbol(char = 'P', brailleDots = BrailleDots(F, F, F, F, E, E))
+    symbol(char = 'Q', brailleDots = BrailleDots(F, F, F, F, F, E))
+    symbol(char = 'R', brailleDots = BrailleDots(F, F, F, E, F, E))
+    symbol(char = 'S', brailleDots = BrailleDots(E, F, F, F, E, E))
+    symbol(char = 'T', brailleDots = BrailleDots(E, F, F, F, F, E))
+    symbol(char = 'U', brailleDots = BrailleDots(F, E, F, E, E, F))
+    symbol(char = 'V', brailleDots = BrailleDots(F, F, F, E, E, F))
+    symbol(char = 'W', brailleDots = BrailleDots(E, F, E, F, F, F))
+    symbol(char = 'X', brailleDots = BrailleDots(F, E, F, F, E, F))
+    symbol(char = 'Y', brailleDots = BrailleDots(F, E, F, F, F, F))
+    symbol(char = 'Z', brailleDots = BrailleDots(F, E, F, E, F, F))
+}
+
+private val greekLetters by symbols(SymbolType.greek) {
+    // Note: A - Alpha (Unicode char 0399); A - English (0041); А - Russian
+    // You may check the code by copying and pasting at https://r12a.github.io/app-conversion/
+    symbol(char = 'Α', brailleDots = BrailleDots(F, E, E, E, E, E))
+    symbol(char = 'Β', brailleDots = BrailleDots(F, F, E, E, E, E))
+    symbol(char = 'Γ', brailleDots = BrailleDots(F, F, E, F, F, E))
+    symbol(char = 'Δ', brailleDots = BrailleDots(F, E, E, F, F, E))
+    symbol(char = 'Ε', brailleDots = BrailleDots(F, E, E, E, F, E))
+    symbol(char = 'Ζ', brailleDots = BrailleDots(F, E, F, E, F, F))
+    symbol(char = 'Η', brailleDots = BrailleDots(E, F, E, F, F, E))
+    symbol(char = 'Θ', brailleDots = BrailleDots(F, F, E, E, F, E))
+    symbol(char = 'Ι', brailleDots = BrailleDots(E, F, E, F, E, E))
+    symbol(char = 'Κ', brailleDots = BrailleDots(F, E, F, E, E, E))
+    symbol(char = 'Λ', brailleDots = BrailleDots(F, F, F, E, E, E))
+    symbol(char = 'Μ', brailleDots = BrailleDots(F, E, F, F, E, E))
+    symbol(char = 'Ν', brailleDots = BrailleDots(F, E, F, F, F, E))
+    symbol(char = 'Ξ', brailleDots = BrailleDots(F, E, F, F, E, F))
+    symbol(char = 'Ο', brailleDots = BrailleDots(F, E, F, E, F, E))
+    symbol(char = 'Π', brailleDots = BrailleDots(F, F, F, F, E, E))
+    symbol(char = 'Ρ', brailleDots = BrailleDots(F, F, F, E, F, E))
+    symbol(char = 'Σ', brailleDots = BrailleDots(E, F, F, F, E, E))
+    symbol(char = 'Τ', brailleDots = BrailleDots(E, F, F, F, F, E))
+    symbol(char = 'Υ', brailleDots = BrailleDots(F, E, F, E, E, F))
+    symbol(char = 'Φ', brailleDots = BrailleDots(F, F, E, F, E, E))
+    symbol(char = 'Χ', brailleDots = BrailleDots(F, E, E, F, E, E))
+    symbol(char = 'Ψ', brailleDots = BrailleDots(F, E, F, F, F, F))
+    symbol(char = 'Ω', brailleDots = BrailleDots(E, F, E, F, F, F))
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 88a37a7b..5d6c3706 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,6 +35,8 @@
     <string name="input_dots_hint_6">точка 6 справа снизу</string>
 
     <string name="input_letter_intro_template">Введите букву: %s</string>
+    <string name="input_latin_letter_intro_template">Введите латинскую букву: %s</string>
+    <string name="input_greek_letter_intro_template">Введите греческую букву: %s</string>
     <string name="input_digit_intro_template">Введите цифру: %s</string>
     <string name="input_special_intro_template">Введите символ: %s</string>
     <string name="input_special_intro_num_sign">Введите цифровой знак</string>
@@ -43,6 +45,8 @@
     <string name="input_special_intro_comma">Введите запятую</string>
 
     <string name="show_letter_intro_template">Буква %s</string>
+    <string name="show_latin_letter_intro_template">Латинская буква %s</string>
+    <string name="show_greek_letter_intro_template">Греческая буква %s</string>
     <string name="show_digit_intro_template">Цифра %s</string>
     <string name="show_special_intro_template">Символ %s</string>
     <string name="show_special_intro_num_sign">Цифровой знак</string>
@@ -74,7 +78,10 @@
     </string>
 
     <string name="deck_name_all">Все символы</string>
+    <string name="deck_name_all_with_ru">Все символы, кроме латинских и греческих букв</string>
     <string name="deck_name_ru_letters">Русские буквы</string>
+    <string name="deck_name_latin_letters">Латинские буквы</string>
+    <string name="deck_name_greek_letters">Греческие буквы</string>
     <string name="deck_name_digits">Цифры</string>
     <string name="deck_name_special_symbols">Специальные символы</string>
 

From 2543366e49457caf906d3380c9562af9138777ab Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sun, 30 Aug 2020 14:21:03 +0300
Subject: [PATCH 023/117] #241 add caption on top of each symbol

---
 .../learnbraille/res/Materials.kt             | 12 +++++++++++
 .../ui/screens/browser/SymbolViewFragment.kt  |  2 ++
 .../ui/screens/practice/CardFragment.kt       |  8 ++++++++
 .../ui/screens/practice/CardViewModel.kt      |  6 ++++++
 .../theory/steps/InputSymbolFragment.kt       |  2 ++
 .../theory/steps/ShowSymbolFragment.kt        | 12 +++++++----
 app/src/main/res/layout/fragment_card.xml     | 14 +++++++------
 .../layout/fragment_lessons_input_symbol.xml  | 14 +++++++------
 .../layout/fragment_lessons_show_symbol.xml   | 14 +++++++------
 .../main/res/layout/fragment_symbol_view.xml  | 14 +++++++------
 app/src/main/res/values-sw320dp/dimens.xml    |  3 +--
 app/src/main/res/values-sw360dp/dimens.xml    |  2 --
 app/src/main/res/values-sw400dp/dimens.xml    |  3 +--
 app/src/main/res/values-sw600dp/dimens.xml    |  3 +--
 app/src/main/res/values-sw720dp/dimens.xml    |  3 +--
 app/src/main/res/values/dimens.xml            |  3 +--
 app/src/main/res/values/strings.xml           |  9 +++++++++
 app/src/main/res/values/styles.xml            | 20 +++++++++++++++++++
 18 files changed, 104 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index ef07b03a..86741233 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -8,6 +8,7 @@ import com.github.braillesystems.learnbraille.data.dsl.symbols
 import com.github.braillesystems.learnbraille.data.entities.BrailleDot.E
 import com.github.braillesystems.learnbraille.data.entities.BrailleDot.F
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
+import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.utils.rules
 
 
@@ -118,6 +119,17 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
     }
 )
 
+fun getCaptionTitleId(symbol: Symbol): Int {
+    return when (symbol.type) {
+        SymbolType.ru -> R.string.letter_caption_ru
+        SymbolType.greek -> R.string.letter_caption_greek
+        SymbolType.latin -> R.string.letter_caption_latin
+        SymbolType.digit -> R.string.letter_caption_digit
+        SymbolType.special -> R.string.letter_caption_special
+        else -> R.string.empty_string
+    }
+}
+
 
 object SymbolType {
     const val ru = "ru"
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
index 86c2ae1f..64f903ba 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
@@ -8,6 +8,7 @@ import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.Material
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.databinding.FragmentSymbolViewBinding
+import com.github.braillesystems.learnbraille.res.getCaptionTitleId
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
@@ -35,6 +36,7 @@ class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view
         require(m.data is Symbol)
 
         binding.letter.text = m.data.char.toString()
+        binding.letterCaptionTextView.text = getString(getCaptionTitleId(m.data))
         binding.brailleDots.dotsState.display(m.data.brailleDots)
 
     }.root
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
index cab053f3..9be67530 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
@@ -124,6 +124,14 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             Observer {
                 if (it == null) return@Observer
                 announceIntro(it)
+
+            }
+        )
+
+        viewModel.symbolCaptionId.observe(
+            viewLifecycleOwner,
+            Observer {
+                letterCaptionTextView.text = it?.let { it1 -> getString(it1) }
             }
         )
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
index 2ff2091a..35e1c929 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.*
 import com.github.braillesystems.learnbraille.data.entities.*
 import com.github.braillesystems.learnbraille.data.repository.MutableActionsRepository
 import com.github.braillesystems.learnbraille.data.repository.MutablePracticeRepository
+import com.github.braillesystems.learnbraille.res.getCaptionTitleId
 import com.github.braillesystems.learnbraille.ui.screens.DotsChecker
 import com.github.braillesystems.learnbraille.ui.screens.MutableDotsChecker
 import com.github.braillesystems.learnbraille.utils.scope
@@ -43,6 +44,10 @@ class CardViewModel(
     private val _symbol = MutableLiveData<String?>()
     val symbol: LiveData<String?> get() = _symbol
 
+    // not string! https://medium.com/androiddevelopers/locale-changes-and-the-androidviewmodel-antipattern-84eb677660d9
+    private val _symbolCaptionId = MutableLiveData<Int?>()
+    val symbolCaptionId: LiveData<Int?> get() = _symbolCaptionId
+
     private val _deckTag = MutableLiveData<String?>()
     val deckTag: LiveData<String?> get() = _deckTag
 
@@ -112,6 +117,7 @@ class CardViewModel(
         require(material.data is Symbol)
         material.data.run {
             _symbol.value = char.toString()
+            _symbolCaptionId.value = getCaptionTitleId(this)
             expectedDots = brailleDots
         }
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt
index ca0ce4cf..ae1d480c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt
@@ -13,6 +13,7 @@ import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.data.entities.Input
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputSymbolBinding
+import com.github.braillesystems.learnbraille.res.getCaptionTitleId
 import com.github.braillesystems.learnbraille.ui.*
 import com.github.braillesystems.learnbraille.ui.screens.observeCheckedOnFly
 import com.github.braillesystems.learnbraille.ui.screens.observeEventHint
@@ -56,6 +57,7 @@ class InputSymbolFragment : AbstractStepFragment(R.string.lessons_help_input_sym
         require(step.data.material.data is Symbol)
         val symbol = step.data.material.data
         letter.text = symbol.char.toString()
+        letterCaptionTextView.text = getString(getCaptionTitleId(symbol))
         brailleDots.dotsState.display(symbol.brailleDots)
         checkedAnnounce(printStringNotNullLogged(symbol.char, PrintMode.INPUT))
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt
index e34a4d1b..2d9ac87b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt
@@ -8,6 +8,7 @@ import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.Show
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsShowSymbolBinding
+import com.github.braillesystems.learnbraille.res.getCaptionTitleId
 import com.github.braillesystems.learnbraille.ui.PrintMode
 import com.github.braillesystems.learnbraille.ui.printStringNotNullLogged
 import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
@@ -35,10 +36,13 @@ class ShowSymbolFragment : AbstractStepFragment(R.string.lessons_help_show_symbo
         require(step.data is Show)
         initialize(step, prevButton, nextButton)
 
-        require(step.data.material.data is Symbol)
-        letter.text = step.data.material.data.char.toString()
-        brailleDots.dotsState.display(step.data.material.data.brailleDots)
-        checkedAnnounce(printStringNotNullLogged(step.data.material.data.char, PrintMode.SHOW))
+        step.data.material.apply{
+            require(data is Symbol)
+            letter.text = data.char.toString()
+            letterCaptionTextView.text = getString(getCaptionTitleId(data))
+            brailleDots.dotsState.display(data.brailleDots)
+            checkedAnnounce(printStringNotNullLogged(data.char, PrintMode.SHOW))
+        }
 
         updateTitle(getString(R.string.lessons_title_show_symbol))
         setPrevButton(prevButton)
diff --git a/app/src/main/res/layout/fragment_card.xml b/app/src/main/res/layout/fragment_card.xml
index 4fbf3adf..43917fb9 100644
--- a/app/src/main/res/layout/fragment_card.xml
+++ b/app/src/main/res/layout/fragment_card.xml
@@ -16,19 +16,21 @@
         android:layout_height="match_parent"
         tools:context=".ui.screens.practice.CardFragment">
 
+        <TextView
+            android:id="@+id/letter_caption_text_view"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            style="@style/bigLetterCaptionStyle"/>
+
         <com.github.braillesystems.learnbraille.ui.views.InputBigLetterView
             android:id="@+id/letter"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:scaleX="@dimen/letter_practice_scale_of_view"
-            android:scaleY="@dimen/letter_practice_scale_of_view"
             android:text="@{cardViewModel.symbol}"
-            android:textSize="@dimen/big_letter_text_size"
-            android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/braille_dots"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            style="@style/bigLetterStyle"
             tools:text="M" />
 
         <com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
diff --git a/app/src/main/res/layout/fragment_lessons_input_symbol.xml b/app/src/main/res/layout/fragment_lessons_input_symbol.xml
index 82ce9f30..83409e5b 100644
--- a/app/src/main/res/layout/fragment_lessons_input_symbol.xml
+++ b/app/src/main/res/layout/fragment_lessons_input_symbol.xml
@@ -14,18 +14,20 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <TextView
+            android:id="@+id/letter_caption_text_view"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            style="@style/bigLetterCaptionStyle"/>
+
         <com.github.braillesystems.learnbraille.ui.views.InputBigLetterView
             android:id="@+id/letter"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:scaleX="@dimen/letter_practice_scale_of_view"
-            android:scaleY="@dimen/letter_practice_scale_of_view"
-            android:textSize="@dimen/big_letter_text_size"
-            android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/braille_dots"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            style="@style/bigLetterStyle"
             tools:text="M" />
 
         <com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
diff --git a/app/src/main/res/layout/fragment_lessons_show_symbol.xml b/app/src/main/res/layout/fragment_lessons_show_symbol.xml
index 5f4f220a..cfa36629 100644
--- a/app/src/main/res/layout/fragment_lessons_show_symbol.xml
+++ b/app/src/main/res/layout/fragment_lessons_show_symbol.xml
@@ -7,18 +7,20 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <TextView
+            android:id="@+id/letter_caption_text_view"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            style="@style/bigLetterCaptionStyle"/>
+
         <com.github.braillesystems.learnbraille.ui.views.ShowBigLetterView
             android:id="@+id/letter"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:scaleX="@dimen/letter_practice_scale_of_view"
-            android:scaleY="@dimen/letter_practice_scale_of_view"
-            android:textSize="@dimen/big_letter_text_size"
-            android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/braille_dots"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            style="@style/bigLetterStyle"
             tools:text="M" />
 
         <com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
diff --git a/app/src/main/res/layout/fragment_symbol_view.xml b/app/src/main/res/layout/fragment_symbol_view.xml
index 73c78ff2..36f5b5d1 100644
--- a/app/src/main/res/layout/fragment_symbol_view.xml
+++ b/app/src/main/res/layout/fragment_symbol_view.xml
@@ -7,18 +7,20 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <TextView
+            android:id="@+id/letter_caption_text_view"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            style="@style/bigLetterCaptionStyle"/>
+
         <com.github.braillesystems.learnbraille.ui.views.ShowBigLetterView
             android:id="@+id/letter"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:scaleX="@dimen/letter_practice_scale_of_view"
-            android:scaleY="@dimen/letter_practice_scale_of_view"
-            android:textSize="@dimen/big_letter_text_size"
-            android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/braille_dots"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            style="@style/bigLetterStyle"
             tools:text="M" />
 
         <com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
diff --git a/app/src/main/res/values-sw320dp/dimens.xml b/app/src/main/res/values-sw320dp/dimens.xml
index 4c6df5ca..f949d2f4 100644
--- a/app/src/main/res/values-sw320dp/dimens.xml
+++ b/app/src/main/res/values-sw320dp/dimens.xml
@@ -21,8 +21,6 @@
     <dimen name="practice_buttons_icon_hint_size">32dp</dimen>
     <dimen name="practice_buttons_border_radius">30dp</dimen>
 
-    <dimen name="lessons_title_width">320dp</dimen>
-    <dimen name="lessons_title_height">64dp</dimen>
     <dimen name="lessons_title_text_size">15sp</dimen>
     <dimen name="lessons_title_vertical_bias">0.05</dimen>
     <dimen name="lessons_info_width">230dp</dimen>
@@ -33,6 +31,7 @@
     <dimen name="lessons_dots_info_height">175dp</dimen>
 
     <dimen name="big_letter_text_size">170sp</dimen>
+    <dimen name="big_letter_caption_padding">2dp</dimen>
 
     <dimen name="big_buttons_border_radius">30dp</dimen>
 
diff --git a/app/src/main/res/values-sw360dp/dimens.xml b/app/src/main/res/values-sw360dp/dimens.xml
index 16dbc3ba..9fb5067e 100644
--- a/app/src/main/res/values-sw360dp/dimens.xml
+++ b/app/src/main/res/values-sw360dp/dimens.xml
@@ -21,8 +21,6 @@
     <dimen name="practice_buttons_icon_hint_size">45dp</dimen>
     <dimen name="practice_buttons_border_radius">40dp</dimen>
 
-    <dimen name="lessons_title_width">360dp</dimen>
-    <dimen name="lessons_title_height">64dp</dimen>
     <dimen name="lessons_title_text_size">20sp</dimen>
     <dimen name="lessons_title_vertical_bias">0.05</dimen>
     <dimen name="lessons_info_width">240dp</dimen>
diff --git a/app/src/main/res/values-sw400dp/dimens.xml b/app/src/main/res/values-sw400dp/dimens.xml
index 51a80913..5d73de3b 100644
--- a/app/src/main/res/values-sw400dp/dimens.xml
+++ b/app/src/main/res/values-sw400dp/dimens.xml
@@ -21,8 +21,6 @@
     <dimen name="practice_buttons_icon_hint_size">45dp</dimen>
     <dimen name="practice_buttons_border_radius">40dp</dimen>
 
-    <dimen name="lessons_title_width">428dp</dimen>
-    <dimen name="lessons_title_height">64dp</dimen>
     <dimen name="lessons_title_text_size">20sp</dimen>
     <dimen name="lessons_title_vertical_bias">0.05</dimen>
     <dimen name="lessons_info_width">300dp</dimen>
@@ -33,6 +31,7 @@
     <dimen name="lessons_dots_info_height">175dp</dimen>
 
     <dimen name="big_letter_text_size">170sp</dimen>
+    <dimen name="big_letter_caption_padding">8dp</dimen>
 
     <dimen name="big_buttons_border_radius">40dp</dimen>
 
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index f8fc6350..95771e98 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -18,8 +18,6 @@
     <dimen name="practice_buttons_icon_hint_size">60dp</dimen>
     <dimen name="practice_buttons_border_radius">55dp</dimen>
 
-    <dimen name="lessons_title_width">428dp</dimen>
-    <dimen name="lessons_title_height">80dp</dimen>
     <dimen name="lessons_title_text_size">35sp</dimen>
     <dimen name="lessons_title_vertical_bias">0.05</dimen>
     <dimen name="lessons_info_width">450dp</dimen>
@@ -30,6 +28,7 @@
     <dimen name="lessons_dots_info_height">175dp</dimen>
 
     <dimen name="big_letter_text_size">150sp</dimen>
+    <dimen name="big_letter_caption_padding">11dp</dimen>
 
     <dimen name="big_buttons_border_radius">30dp</dimen>
 
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
index 8685fd91..8889dfa9 100644
--- a/app/src/main/res/values-sw720dp/dimens.xml
+++ b/app/src/main/res/values-sw720dp/dimens.xml
@@ -18,8 +18,6 @@
     <dimen name="practice_buttons_icon_hint_size">65dp</dimen>
     <dimen name="practice_buttons_border_radius">60dp</dimen>
 
-    <dimen name="lessons_title_width">428dp</dimen>
-    <dimen name="lessons_title_height">100dp</dimen>
     <dimen name="lessons_title_text_size">40sp</dimen>
     <dimen name="lessons_title_vertical_bias">0.05</dimen>
     <dimen name="lessons_info_width">590dp</dimen>
@@ -30,6 +28,7 @@
     <dimen name="lessons_dots_info_height">175dp</dimen>
 
     <dimen name="big_letter_text_size">150sp</dimen>
+    <dimen name="big_letter_caption_padding">15dp</dimen>
 
     <dimen name="big_buttons_border_radius">30dp</dimen>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bb4efba8..ce10c125 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -23,8 +23,6 @@
     <dimen name="practice_buttons_icon_hint_padding">0dp</dimen>
     <dimen name="practice_buttons_border_radius">20dp</dimen>
 
-    <dimen name="lessons_title_width">428dp</dimen>
-    <dimen name="lessons_title_height">64dp</dimen>
     <dimen name="lessons_title_text_size">20sp</dimen>
     <dimen name="lessons_title_vertical_bias">0.0</dimen>
     <dimen name="lessons_info_width">270dp</dimen>
@@ -38,6 +36,7 @@
     <dimen name="lessons_info_vertical_bias">0.2</dimen>
 
     <dimen name="big_letter_text_size">170sp</dimen>
+    <dimen name="big_letter_caption_padding">5dp</dimen>
 
     <dimen name="big_buttons_border_radius">40dp</dimen>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5d6c3706..8623d7ae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,6 +54,13 @@
     <string name="show_special_intro_hyphen">Дефис</string>
     <string name="show_special_intro_comma">Запятая</string>
 
+    <string name="letter_caption_ru">Русская буква</string>
+    <string name="letter_caption_greek">Греческая буква</string>
+    <string name="letter_caption_latin">Латинская буква</string>
+    <string name="letter_caption_digit">Цифра</string>
+    <string name="letter_caption_special">Специальный символ</string>
+    <string name="empty_string"></string>
+
     <!--    QR-->
 
     <string name="qr_intent_cancelled">Установите сканнер qr кодов и попробуйте снова</string>
@@ -417,4 +424,6 @@
     <string name="stats_section_7days">За последние 7 дней</string>
     <string name="stats_section_30days">За последние 30 дней</string>
 
+    <string name="letter_caption_example">Пример заголовка</string>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bf9a2db7..16ac0546 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <!-- Base application theme. -->
@@ -43,6 +44,25 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
+    <style name="bigLetterStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:scaleX">@dimen/letter_practice_scale_of_view</item>
+        <item name="android:scaleY">@dimen/letter_practice_scale_of_view</item>
+        <item name="android:textSize">@dimen/big_letter_text_size</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="bigLetterCaptionStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:importantForAccessibility">no</item>
+        <item name="android:paddingTop">@dimen/big_letter_caption_padding</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:textSize">@dimen/lessons_title_text_size</item>
+        <item name="android:text">@string/letter_caption_example</item>
+    </style>
+
     <style name="SwitchPreferenceButton" parent="Theme.AppCompat.Light">
         <item name="colorControlActivated">@color/colorSecondary</item>
         <item name="colorSwitchThumbNormal">@color/colorOnSecondary</item>

From a692107ba870d5c6e2530533c8d9ebc7faa1489d Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sun, 30 Aug 2020 14:33:55 +0300
Subject: [PATCH 024/117] #241 reformat: remove space

---
 .../learnbraille/ui/screens/practice/CardFragment.kt             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
index 9be67530..400182ec 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
@@ -124,7 +124,6 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             Observer {
                 if (it == null) return@Observer
                 announceIntro(it)
-
             }
         )
 

From c369e012cb97099de7092ce2d2faf30f5484eea1 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sun, 30 Aug 2020 14:51:16 +0300
Subject: [PATCH 025/117] #241 design: anchor caption to big letter, not to top
 of view

---
 app/src/main/res/layout/fragment_card.xml                 | 2 +-
 app/src/main/res/layout/fragment_lessons_input_symbol.xml | 2 +-
 app/src/main/res/layout/fragment_lessons_show_symbol.xml  | 2 +-
 app/src/main/res/layout/fragment_symbol_view.xml          | 2 +-
 app/src/main/res/values/styles.xml                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/fragment_card.xml b/app/src/main/res/layout/fragment_card.xml
index 43917fb9..243a4688 100644
--- a/app/src/main/res/layout/fragment_card.xml
+++ b/app/src/main/res/layout/fragment_card.xml
@@ -20,7 +20,7 @@
             android:id="@+id/letter_caption_text_view"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@id/letter"
             style="@style/bigLetterCaptionStyle"/>
 
         <com.github.braillesystems.learnbraille.ui.views.InputBigLetterView
diff --git a/app/src/main/res/layout/fragment_lessons_input_symbol.xml b/app/src/main/res/layout/fragment_lessons_input_symbol.xml
index 83409e5b..a15992a1 100644
--- a/app/src/main/res/layout/fragment_lessons_input_symbol.xml
+++ b/app/src/main/res/layout/fragment_lessons_input_symbol.xml
@@ -18,7 +18,7 @@
             android:id="@+id/letter_caption_text_view"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@id/letter"
             style="@style/bigLetterCaptionStyle"/>
 
         <com.github.braillesystems.learnbraille.ui.views.InputBigLetterView
diff --git a/app/src/main/res/layout/fragment_lessons_show_symbol.xml b/app/src/main/res/layout/fragment_lessons_show_symbol.xml
index cfa36629..c5c81bf0 100644
--- a/app/src/main/res/layout/fragment_lessons_show_symbol.xml
+++ b/app/src/main/res/layout/fragment_lessons_show_symbol.xml
@@ -11,7 +11,7 @@
             android:id="@+id/letter_caption_text_view"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@id/letter"
             style="@style/bigLetterCaptionStyle"/>
 
         <com.github.braillesystems.learnbraille.ui.views.ShowBigLetterView
diff --git a/app/src/main/res/layout/fragment_symbol_view.xml b/app/src/main/res/layout/fragment_symbol_view.xml
index 36f5b5d1..f67ae979 100644
--- a/app/src/main/res/layout/fragment_symbol_view.xml
+++ b/app/src/main/res/layout/fragment_symbol_view.xml
@@ -11,7 +11,7 @@
             android:id="@+id/letter_caption_text_view"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@id/letter"
             style="@style/bigLetterCaptionStyle"/>
 
         <com.github.braillesystems.learnbraille.ui.views.ShowBigLetterView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 16ac0546..b8d5951e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -51,13 +51,13 @@
         <item name="android:scaleY">@dimen/letter_practice_scale_of_view</item>
         <item name="android:textSize">@dimen/big_letter_text_size</item>
         <item name="android:textStyle">bold</item>
+        <item name="android:paddingTop">@dimen/big_letter_caption_padding</item>
     </style>
 
     <style name="bigLetterCaptionStyle">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:importantForAccessibility">no</item>
-        <item name="android:paddingTop">@dimen/big_letter_caption_padding</item>
         <item name="android:textAlignment">center</item>
         <item name="android:textSize">@dimen/lessons_title_text_size</item>
         <item name="android:text">@string/letter_caption_example</item>

From 0b4fc2665fcc4aa9756e4f14421ca92af1acd325 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sun, 30 Aug 2020 20:27:25 +0300
Subject: [PATCH 026/117] #241 add latin,greek capital signs

---
 .../braillesystems/learnbraille/res/Materials.kt   | 14 ++++++++++++++
 app/src/main/res/values/strings.xml                |  9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index 86741233..6fd2517f 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -66,12 +66,16 @@ val Context.inputSymbolPrintRules by rules<Context, Char, String>(
         val dotIntro = getString(R.string.input_special_intro_dot)
         val commaIntro = getString(R.string.input_special_intro_comma)
         val hyphenIntro = getString(R.string.input_special_intro_hyphen)
+        val latinCapitalIntro = getString(R.string.input_special_intro_latin_capital)
+        val greekCapitalIntro = getString(R.string.input_special_intro_greek_capital)
         specialSymbols.map::containsKey to { c: Char ->
             when (c) {
                 ']' -> numSign
                 '.' -> dotIntro
                 ',' -> commaIntro
                 '-' -> hyphenIntro
+                'Ⓛ' -> latinCapitalIntro
+                'Ⓖ' -> greekCapitalIntro
                 else -> other.format(c)
             }
         }
@@ -107,12 +111,16 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
         val dotIntro = getString(R.string.show_special_intro_dot)
         val commaIntro = getString(R.string.show_special_intro_comma)
         val hyphenIntro = getString(R.string.show_special_intro_hyphen)
+        val latinCapitalIntro = getString(R.string.letter_caption_special_latin_capital)
+        val greekCapitalIntro = getString(R.string.letter_caption_special_greek_capital)
         specialSymbols.map::containsKey to { c: Char ->
             when (c) {
                 ']' -> numSign
                 '.' -> dotIntro
                 ',' -> commaIntro
                 '-' -> hyphenIntro
+                'Ⓛ' -> latinCapitalIntro
+                'Ⓖ' -> greekCapitalIntro
                 else -> other.format(c)
             }
         }
@@ -120,6 +128,10 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
 )
 
 fun getCaptionTitleId(symbol: Symbol): Int {
+    when(symbol.char) {
+        'Ⓛ' -> return R.string.letter_caption_special_latin_capital
+        'Ⓖ' -> return R.string.letter_caption_special_greek_capital
+    }
     return when (symbol.type) {
         SymbolType.ru -> R.string.letter_caption_ru
         SymbolType.greek -> R.string.letter_caption_greek
@@ -177,6 +189,8 @@ private val ruSymbols by symbols(SymbolType.ru) {
 
 private val specialSymbols by symbols(SymbolType.special) {
     symbol(char = ']', brailleDots = BrailleDots(E, E, F, F, F, F)) // Number sign
+    symbol(char = 'Ⓛ', brailleDots = BrailleDots(E, E, E, E, E, F)) // Latin capital
+    symbol(char = 'Ⓖ', brailleDots = BrailleDots(E, E, E, F, F, F)) // Greek capital
     symbol(char = ',', brailleDots = BrailleDots(E, F, E, E, E, E)) // Comma
     symbol(char = '-', brailleDots = BrailleDots(E, E, F, E, E, F)) // Hyphen
     symbol(char = '.', brailleDots = BrailleDots(E, F, E, E, F, F)) // Dot
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8623d7ae..18a7db4e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,6 +43,8 @@
     <string name="input_special_intro_dot">Введите символ: Литературная точка</string>
     <string name="input_special_intro_hyphen">Введите символ: Дефис</string>
     <string name="input_special_intro_comma">Введите запятую</string>
+    <string name="input_special_intro_latin_capital">Введите признак большой буквы латинского алфавита</string>
+    <string name="input_special_intro_greek_capital">Введите признак большой буквы греческого алфавита</string>
 
     <string name="show_letter_intro_template">Буква %s</string>
     <string name="show_latin_letter_intro_template">Латинская буква %s</string>
@@ -59,6 +61,8 @@
     <string name="letter_caption_latin">Латинская буква</string>
     <string name="letter_caption_digit">Цифра</string>
     <string name="letter_caption_special">Специальный символ</string>
+    <string name="letter_caption_special_latin_capital">Признак большой буквы латинского алфавита</string>
+    <string name="letter_caption_special_greek_capital">Признак большой буквы греческого алфавита</string>
     <string name="empty_string"></string>
 
     <!--    QR-->
@@ -334,7 +338,10 @@
         В данном разделе можно просмотреть точечный состав любой буквы,
         цифры или специального символа. Буквы расположены здесь в порядке \"зрячего\" алфавита,
         а не в порядке \"ключа Брайля\", как они изучаются в курсе.
-        Помните, что при написании чисел нужно вначале ставить цифровой знак.
+        &<br>
+        Помните, что при написании чисел нужно вначале ставить цифровой знак. При написании слов на
+        латинице или по-гречески внутри русского текста в начале слова надо ставить признак
+        латинской / греческой буквы.
         &<br>
         Нажатие на символ в списке (или двойное нажатие, если Вы используете программу TalkBack)
         открывает окно, где этот символ крупным шрифтом выведен на экран.

From 6e253586dfc39d4adcd004441f58230bb8347ab2 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Mon, 31 Aug 2020 21:10:30 +0300
Subject: [PATCH 027/117] (#58) add instrumental tests

---
 .github/workflows/android.yml | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 1a2f42c6..865e8532 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -3,17 +3,18 @@
 
 name: Android CI
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
+      - dev
+  pull_request:
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  build-and-test: # instrumental tests run on MacOS to enable hardware acceleration
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Set up detekt
-        run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.12.0-RC1/detekt && chmod a+x detekt
-      - name: Static check with detekt
-        run: ./detekt -c detekt-config.yml --build-upon-default-config
       - name: set up JDK 1.8
         uses: actions/setup-java@v1
         with:
@@ -24,8 +25,22 @@ jobs:
         run: ./gradlew assembleDebug
       - name: Run unit tests
         run: ./gradlew test
+      - name: Run instrumental tests
+        # warning: it depends on "grant permission to gradlew" step
+        uses: reactivecircus/android-emulator-runner@v1
+        with:
+          api-level: 29
+          script: ./gradlew connectedCheck
       - name: Upload artifacts
         uses: actions/upload-artifact@v1
         with:
           name: learn-braille-debug
           path: app/build/outputs/apk/debug/app-debug.apk
+  static-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up detekt
+        run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.12.0-RC1/detekt && chmod a+x detekt
+      - name: Static check with detekt
+        run: ./detekt -c detekt-config.yml --build-upon-default-config

From bd528a83c6b57cb1ad6f1dfc121c47449f5ccc4d Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Mon, 31 Aug 2020 22:17:48 +0300
Subject: [PATCH 028/117] (#58) add kdoc

---
 .github/workflows/android.yml | 10 +++++++++-
 app/build.gradle              | 13 +++++++++++++
 build.gradle                  |  2 ++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 865e8532..adb02f97 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -31,11 +31,19 @@ jobs:
         with:
           api-level: 29
           script: ./gradlew connectedCheck
-      - name: Upload artifacts
+      - name: Generate documentation
+        run: ./gradlew dokka
+      - name: Upload APK to artifacts
         uses: actions/upload-artifact@v1
         with:
           name: learn-braille-debug
           path: app/build/outputs/apk/debug/app-debug.apk
+      - name: Upload documentation to artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: documentation-html
+          path: app/build/dokka/
+
   static-check:
     runs-on: ubuntu-latest
     steps:
diff --git a/app/build.gradle b/app/build.gradle
index 435fb944..a501f5f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,6 +10,8 @@ apply plugin: 'androidx.navigation.safeargs'
 
 apply plugin: 'kotlinx-serialization'
 
+apply plugin: 'org.jetbrains.dokka'
+
 android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -38,6 +40,17 @@ android {
     }
     productFlavors {
     }
+    dokka {
+        outputDirectory = "$buildDir/dokka"
+        packageOptions {
+            prefix = "android"
+            suppress = true
+        }
+        packageOptions{
+            prefix = "androidx"
+            suppress = true
+        }
+    }
 }
 
 dependencies {
diff --git a/build.gradle b/build.gradle
index ba99822f..16a30646 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
         kotlin_version = '1.3.61'
         version_navigation = '1.0.0'
         version_room = "2.2.5"
+        version_dokka="0.9.18"
     }
     repositories {
         google()
@@ -17,6 +18,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:$version_navigation"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$version_dokka"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From 0afe843a4b46991ff1ecf299f6086a047a02495c Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Tue, 1 Sep 2020 17:36:07 +0300
Subject: [PATCH 029/117] #58 fix detekt warnings

---
 .idea/codeStyles/Project.xml                  | 16 ++++++++++++++
 .../{Database.kt => LearnBrailleDatabase.kt}  |  0
 .../learnbraille/data/dsl/DataStorage.kt      |  4 +++-
 .../learnbraille/data/dsl/Lessons.kt          |  1 +
 .../learnbraille/data/dsl/Materials.kt        |  7 ++++--
 .../data/repository/TheoryRepository.kt       |  1 +
 .../learnbraille/ui/screens/DotsChecker.kt    |  1 +
 .../learnbraille/utils/_Android.kt            |  1 +
 .../learnbraille/utils/_Kotlin.kt             |  2 ++
 detekt-config.yml                             | 22 +++++++++++++++----
 10 files changed, 48 insertions(+), 7 deletions(-)
 rename app/src/main/java/com/github/braillesystems/learnbraille/data/db/{Database.kt => LearnBrailleDatabase.kt} (100%)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ce889bd5..ce1fc4fe 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,6 +1,22 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/db/Database.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt
similarity index 100%
rename from app/src/main/java/com/github/braillesystems/learnbraille/data/db/Database.kt
rename to app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
index fa9df3f2..e50dbdc9 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
@@ -31,7 +31,7 @@ typealias LessonWithSteps = Pair<Lesson, List<StepWithAnnotations>>
 @DslMarker
 annotation class DataBuilderMarker
 
-
+@Suppress("ClassNaming")
 class data(
     private val materials: MaterialsBuilder,
     private val stepAnnotations: List<StepAnnotationName>,
@@ -45,8 +45,10 @@ class data(
 
 @DataBuilderMarker
 class DataBuilder(
+    @Suppress("ConstructorParameterNaming")
     private val _materials: MaterialsBuilder,
     private val stepAnnotationNames: List<StepAnnotationName>,
+    @Suppress("ConstructorParameterNaming")
     private val _knownMaterials: List<KnownMaterial>,
     block: DataBuilder.() -> Unit
 ) : DataStorage {
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Lessons.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Lessons.kt
index 0e4ff4c7..3713df03 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Lessons.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Lessons.kt
@@ -4,6 +4,7 @@ import com.github.braillesystems.learnbraille.data.entities.*
 import com.github.braillesystems.learnbraille.utils.side
 import kotlin.reflect.KProperty
 
+@Suppress("ClassNaming")
 class lessons(private val block: LessonsBuilder.() -> Unit) {
     operator fun getValue(thisRef: Any?, property: KProperty<*>) = LessonsBuilder(block)
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt
index 3fbec36f..5dc275e8 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt
@@ -8,8 +8,10 @@ import com.github.braillesystems.learnbraille.res.content
 import kotlin.reflect.KProperty
 
 
+@Suppress("ClassNaming")
 open class materials(private val block: MaterialsBuilder.() -> Unit) {
 
+    @Suppress("MemberNameEqualsClassName")
     private var materials: MaterialsBuilder? = null
 
     operator fun getValue(thisRef: Any?, property: KProperty<*>) =
@@ -48,9 +50,10 @@ class MaterialsBuilder(block: MaterialsBuilder.() -> Unit) {
     }
 }
 
-
+@Suppress("ClassNaming")
 class symbols(private val symbolType: String, private val block: SymbolsBuilder.() -> Unit) {
 
+    @Suppress("MemberNameEqualsClassName")
     private var symbols: SymbolsBuilder? = null
 
     operator fun getValue(thisRef: Any?, property: KProperty<*>) =
@@ -77,7 +80,7 @@ class SymbolsBuilder(private val symbolType: String, block: SymbolsBuilder.() ->
     }
 }
 
-
+@Suppress("ClassNaming")
 class known(vararg chars: Char) {
 
     private val cs = chars.map(Char::toUpperCase)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
index fb142a80..da03ebc8 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
@@ -36,6 +36,7 @@ class TheoryRepositoryImpl(
             else StepAnnotation.golubinaBookRequired
         )
 
+    @Suppress("ReturnCount")
     override suspend fun getNextStepAndUpdate(thisStep: Step, markThisAsPassed: Boolean): Step? {
         val next = stepDao
             .getNextStep(
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt
index 41732c16..c1c591ca 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt
@@ -196,6 +196,7 @@ private class DotsCheckerImpl : MutableDotsChecker {
     }
 }
 
+@Suppress("LongParameterList")
 inline fun DotsChecker.observeCheckedOnFly(
     lifecycleOwner: LifecycleOwner,
     dotsState: BrailleDotsState,
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
index 340dc27a..e17f12d1 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
@@ -111,6 +111,7 @@ fun Button.setSize(width: Int? = null, height: Int? = null) {
     }
 }
 
+@Suppress("ClassNaming")
 class logged<C, T>(
     private val logger: (String) -> Unit = { Timber.d(it) },
     private val setter: (C.(T) -> Unit)? = null,
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
index 735a35f6..84dfc138 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
@@ -83,6 +83,7 @@ operator fun <T, R> Rules<T, R>.get(x: T): R? = match(x)
  * )
  * ```
  */
+@Suppress("ClassNaming")
 class rules<C, T, R>(private vararg val ruleProviders: C.() -> Rule<T, R>) {
     private var value: Rules<T, R>? = null
     operator fun getValue(thisRef: C, property: KProperty<*>): Rules<T, R> =
@@ -91,6 +92,7 @@ class rules<C, T, R>(private vararg val ruleProviders: C.() -> Rule<T, R>) {
             .also { value = it }
 }
 
+@Suppress("ClassNaming")
 class lazyWithContext<C, R>(private val getter: C.(KProperty<*>) -> R) {
     private var value: R? = null
     operator fun getValue(thisRef: C, property: KProperty<*>): R =
diff --git a/detekt-config.yml b/detekt-config.yml
index ac3c8247..56bff69c 100644
--- a/detekt-config.yml
+++ b/detekt-config.yml
@@ -1,9 +1,23 @@
 # see https://github.com/detekt/detekt/blob/master/detekt-core/src/main/resources/default-detekt-config.yml for examples
 
 complexity:
-   TooManyFunctions:
-      excludes: ['**/utils/**']
+  TooManyFunctions:
+    active: false
+  LongMethod:
+    active: false
+  LongParameterList:
+    active: false
 
 style:
-   WildcardImport:
-      active: false
+  WildcardImport:
+    active: false
+  MagicNumber:
+    active: false
+
+exceptions:
+  TooGenericExceptionCaught:
+    excludes: ['**/SpeechRecognition.kt']
+
+naming:
+  MatchingDeclarationName:
+    active: false

From 6ee053ad5d2b853f5f95d680b2e25fd60747c643 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Tue, 1 Sep 2020 17:47:32 +0300
Subject: [PATCH 030/117] Modify code style

---
 .idea/codeStyles/Project.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ce889bd5..ce1fc4fe 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,6 +1,22 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">

From 67a8df65fcefa378770d6ebc7f0fec769c7a1599 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Tue, 1 Sep 2020 21:51:51 +0300
Subject: [PATCH 031/117] Remove warning suppression and ignore checks in
 detekt config

---
 .../learnbraille/data/dsl/DataStorage.kt             |  3 ---
 .../braillesystems/learnbraille/data/dsl/Lessons.kt  |  1 -
 .../learnbraille/data/dsl/Materials.kt               | 12 ++++--------
 .../braillesystems/learnbraille/utils/_Android.kt    |  1 -
 .../braillesystems/learnbraille/utils/_Kotlin.kt     |  2 --
 detekt-config.yml                                    |  6 ++++++
 6 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
index e50dbdc9..d5fef801 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
@@ -31,7 +31,6 @@ typealias LessonWithSteps = Pair<Lesson, List<StepWithAnnotations>>
 @DslMarker
 annotation class DataBuilderMarker
 
-@Suppress("ClassNaming")
 class data(
     private val materials: MaterialsBuilder,
     private val stepAnnotations: List<StepAnnotationName>,
@@ -45,10 +44,8 @@ class data(
 
 @DataBuilderMarker
 class DataBuilder(
-    @Suppress("ConstructorParameterNaming")
     private val _materials: MaterialsBuilder,
     private val stepAnnotationNames: List<StepAnnotationName>,
-    @Suppress("ConstructorParameterNaming")
     private val _knownMaterials: List<KnownMaterial>,
     block: DataBuilder.() -> Unit
 ) : DataStorage {
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Lessons.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Lessons.kt
index 3713df03..0e4ff4c7 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Lessons.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Lessons.kt
@@ -4,7 +4,6 @@ import com.github.braillesystems.learnbraille.data.entities.*
 import com.github.braillesystems.learnbraille.utils.side
 import kotlin.reflect.KProperty
 
-@Suppress("ClassNaming")
 class lessons(private val block: LessonsBuilder.() -> Unit) {
     operator fun getValue(thisRef: Any?, property: KProperty<*>) = LessonsBuilder(block)
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt
index 5dc275e8..2fad8662 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt
@@ -8,10 +8,8 @@ import com.github.braillesystems.learnbraille.res.content
 import kotlin.reflect.KProperty
 
 
-@Suppress("ClassNaming")
 open class materials(private val block: MaterialsBuilder.() -> Unit) {
 
-    @Suppress("MemberNameEqualsClassName")
     private var materials: MaterialsBuilder? = null
 
     operator fun getValue(thisRef: Any?, property: KProperty<*>) =
@@ -50,10 +48,8 @@ class MaterialsBuilder(block: MaterialsBuilder.() -> Unit) {
     }
 }
 
-@Suppress("ClassNaming")
 class symbols(private val symbolType: String, private val block: SymbolsBuilder.() -> Unit) {
 
-    @Suppress("MemberNameEqualsClassName")
     private var symbols: SymbolsBuilder? = null
 
     operator fun getValue(thisRef: Any?, property: KProperty<*>) =
@@ -80,14 +76,14 @@ class SymbolsBuilder(private val symbolType: String, block: SymbolsBuilder.() ->
     }
 }
 
-@Suppress("ClassNaming")
 class known(vararg chars: Char) {
 
     private val cs = chars.map(Char::toUpperCase)
     private var knownMaterials: List<KnownMaterial>? = null
 
     operator fun getValue(thisRef: Any?, property: KProperty<*>): List<KnownMaterial> =
-        knownMaterials ?: cs.map {
-            KnownMaterial(DEFAULT_ID, content.symbols.getValue(it).id)
-        }.also { knownMaterials = it }
+        knownMaterials
+            ?: cs
+                .map { KnownMaterial(DEFAULT_ID, content.symbols.getValue(it).id) }
+                .also { knownMaterials = it }
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
index e17f12d1..340dc27a 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
@@ -111,7 +111,6 @@ fun Button.setSize(width: Int? = null, height: Int? = null) {
     }
 }
 
-@Suppress("ClassNaming")
 class logged<C, T>(
     private val logger: (String) -> Unit = { Timber.d(it) },
     private val setter: (C.(T) -> Unit)? = null,
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
index 84dfc138..735a35f6 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
@@ -83,7 +83,6 @@ operator fun <T, R> Rules<T, R>.get(x: T): R? = match(x)
  * )
  * ```
  */
-@Suppress("ClassNaming")
 class rules<C, T, R>(private vararg val ruleProviders: C.() -> Rule<T, R>) {
     private var value: Rules<T, R>? = null
     operator fun getValue(thisRef: C, property: KProperty<*>): Rules<T, R> =
@@ -92,7 +91,6 @@ class rules<C, T, R>(private vararg val ruleProviders: C.() -> Rule<T, R>) {
             .also { value = it }
 }
 
-@Suppress("ClassNaming")
 class lazyWithContext<C, R>(private val getter: C.(KProperty<*>) -> R) {
     private var value: R? = null
     operator fun getValue(thisRef: C, property: KProperty<*>): R =
diff --git a/detekt-config.yml b/detekt-config.yml
index 56bff69c..9443f8f0 100644
--- a/detekt-config.yml
+++ b/detekt-config.yml
@@ -21,3 +21,9 @@ exceptions:
 naming:
   MatchingDeclarationName:
     active: false
+  ClassNaming:
+    active: false
+  ConstructorParameterNaming:
+    active: false
+  MemberNameEqualsClassName:
+    active: false

From 249723878235ab82cad610f8a3140fc97dbd93e8 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Tue, 1 Sep 2020 22:57:55 +0300
Subject: [PATCH 032/117] Fix docs

---
 .../github/braillesystems/learnbraille/data/db/Database.kt  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/db/Database.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/db/Database.kt
index 1c997316..665a01bf 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/db/Database.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/db/Database.kt
@@ -68,8 +68,6 @@ abstract class LearnBrailleDatabase : RoomDatabase(), KoinComponent {
     /**
      * Android Room prepopulation and migrations are lazy,
      * they will start with the first request, blocking it.
-     *
-     * TODO add reference to docs
      */
     private fun init(): LearnBrailleDatabase = this.also {
         prepareDbJob = scope().launch {
@@ -88,6 +86,10 @@ abstract class LearnBrailleDatabase : RoomDatabase(), KoinComponent {
 
         const val name = "learn_braille_database"
 
+        /**
+         * Try to run `build` before first user's request (mb in Application's `onCreate`)
+         * to make DB likely prepared until it is really needed.
+         */
         fun buildDatabase(context: Context) = Room
             .databaseBuilder(
                 context.applicationContext,

From d7f089753e0470f4233290870f2cc2f91f6b1daf Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Wed, 2 Sep 2020 14:14:07 +0300
Subject: [PATCH 033/117] Refactor utils

---
 .../learnbraille/utils/_KotlinTest.kt         | 22 ++++++------
 .../learnbraille/ui/screens/DotsChecker.kt    |  6 ++--
 .../ui/screens/practice/CardViewModel.kt      |  4 +--
 .../learnbraille/utils/Utils.kt               | 22 +++++++-----
 .../learnbraille/utils/_Android.kt            |  8 +++--
 .../learnbraille/utils/_Kotlin.kt             | 36 ++++++-------------
 6 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
index dc541e55..84ece916 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
@@ -9,20 +9,20 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class KotlinTest {
 
-    private fun getNextNumber(currentNumber: Int, nextNumbers: Array<Int>, repeat: Int): Int? {
-        var i = 0
-        fun getNextNumber(): Int {
-            return nextNumbers[i++]
-        }
+    @Test
+    fun retryNTest() {
+        fun getNextNumber(currentNumber: Int, nextNumbers: Array<Int>, repeat: Int): Int? {
+            var i = 0
+            fun getNextNumber(): Int {
+                return nextNumbers[i++]
+            }
 
-        fun ifNumberSameAsCurrent(number: Int) = number == currentNumber
+            fun ifNumberSameAsCurrent(number: Int) = number == currentNumber
 
-        return tryN(repeat, { !ifNumberSameAsCurrent(it) }, { getNextNumber() })
-    }
+            return retryN(repeat, { !ifNumberSameAsCurrent(it) }, { getNextNumber() })
+        }
 
-    @Test
-    fun tryNTest() {
-        // testing how tryN helps to find first number in a sequence different from specified number
+        // Find first number in a sequence different from specified number
         assertEquals(1, getNextNumber(0, arrayOf(1, 1, 1), 2))
         assertEquals(2, getNextNumber(1, arrayOf(1, 2, 3), 2))
         assertEquals(2, getNextNumber(1, arrayOf(1, 2, 3), 3))
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt
index 41732c16..5c83ebea 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt
@@ -226,7 +226,7 @@ inline fun DotsChecker.observeEventCorrect(
     Observer {
         if (!it) return@Observer
         Timber.i("Handle correct")
-        buzzer.checkedBuzz(preferenceRepository.correctBuzzPattern, preferenceRepository)
+        buzzer.checkedBuzz(preferenceRepository.correctBuzzPattern)
         dotsState.uncheck()
         block()
         onCorrectComplete()
@@ -243,7 +243,7 @@ inline fun DotsChecker.observeEventSoftCorrect(
     Observer {
         if (!it) return@Observer
         Timber.i("Handle soft correct")
-        buzzer.checkedBuzz(preferenceRepository.correctBuzzPattern, preferenceRepository)
+        buzzer.checkedBuzz(preferenceRepository.correctBuzzPattern)
         block()
         onSoftCorrectComplete()
     }
@@ -260,7 +260,7 @@ inline fun DotsChecker.observeEventIncorrect(
     Observer {
         if (!it) return@Observer
         Timber.i("Handle incorrect: entered = ${dotsState.spelling}")
-        buzzer.checkedBuzz(preferenceRepository.incorrectBuzzPattern, preferenceRepository)
+        buzzer.checkedBuzz(preferenceRepository.incorrectBuzzPattern)
         dotsState.uncheck()
         block()
         onIncorrectComplete()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
index 2ff2091a..9604c176 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
@@ -8,7 +8,7 @@ import com.github.braillesystems.learnbraille.data.repository.MutablePracticeRep
 import com.github.braillesystems.learnbraille.ui.screens.DotsChecker
 import com.github.braillesystems.learnbraille.ui.screens.MutableDotsChecker
 import com.github.braillesystems.learnbraille.utils.scope
-import com.github.braillesystems.learnbraille.utils.tryN
+import com.github.braillesystems.learnbraille.utils.retryN
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -98,7 +98,7 @@ class CardViewModel(
     }
 
     private fun initializeCard(firstTime: Boolean = false) = uiScope.launch {
-        val material = tryN(
+        val material = retryN(
             n = 5,
             stop = { it.data !in materialsQueue },
             get = { practiceRepository.getNextMaterialNotNull() }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
index 9b8ff50c..14c6959b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
@@ -10,6 +10,7 @@ import androidx.fragment.app.Fragment
 import com.github.braillesystems.learnbraille.LearnBrailleApplication
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
+import com.github.braillesystems.learnbraille.koin
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -28,13 +29,18 @@ val Fragment.application: LearnBrailleApplication
 fun scope(job: Job = Job()) = CoroutineScope(Dispatchers.Main + job)
 
 
-fun Vibrator?.checkedBuzz(pattern: BuzzPattern, preferenceRepository: PreferenceRepository) =
-    runIf(preferenceRepository.buzzEnabled) { buzz(pattern) }
+fun Vibrator?.checkedBuzz(
+    pattern: BuzzPattern,
+    preferenceRepository: PreferenceRepository = koin.get()
+) = runIf(preferenceRepository.buzzEnabled) { buzz(pattern) }
 
-fun checkedToast(msg: String, context: Context?, preferenceRepository: PreferenceRepository) =
-    runIf(preferenceRepository.toastsEnabled) {
-        Toast.makeText(context, msg, preferenceRepository.toastDuration).show()
-    }
+fun checkedToast(
+    msg: String,
+    context: Context?,
+    preferenceRepository: PreferenceRepository = koin.get()
+) = runIf(preferenceRepository.toastsEnabled) {
+    Toast.makeText(context, msg, preferenceRepository.toastDuration).show()
+}
 
 fun Fragment.checkedToast(msg: String, preferenceRepository: PreferenceRepository = get()) =
     checkedToast(msg, context, preferenceRepository)
@@ -53,8 +59,7 @@ fun Context.announce(announcement: String) {
     manager.sendAccessibilityEvent(event)
 }
 
-fun Fragment.announce(announcement: String) =
-    application.announce(announcement)
+fun Fragment.announce(announcement: String) = contextNotNull.announce(announcement)
 
 fun Fragment.checkedAnnounce(
     announcement: String,
@@ -84,6 +89,7 @@ fun Fragment.updateTitle(title: String) {
 fun <T> stringify(s: SerializationStrategy<T>, obj: T) = Json.stringify(s, obj)
 fun <T> parse(d: DeserializationStrategy<T>, s: String) = Json.parse(d, s)
 
+
 val Context.extendedTextSize: Float by lazyWithContext {
     // Size applied in runtime is different
     resources.getDimension(R.dimen.lessons_info_text_size) / 5 * 3
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
index 340dc27a..b8ff8be5 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
@@ -26,6 +26,9 @@ import kotlin.reflect.KProperty
  * that are not specific for particular project.
  */
 
+val Fragment.contextNotNull: Context
+    get() = requireNotNull(context)
+
 val Context.usbManager get() = getSystemService(Context.USB_SERVICE) as UsbManager
 
 val Context.accessibilityManager: AccessibilityManager?
@@ -36,7 +39,7 @@ val Context.accessibilityManager: AccessibilityManager?
 fun Fragment.getFragmentStringArg(name: String): String =
     arguments
         ?.getString(name)
-        ?: error("No $name found in args")
+        ?: error("No $name found in fragment args")
 
 typealias BuzzPattern = LongArray
 
@@ -98,8 +101,7 @@ fun Fragment.navigate(action: NavDirections) = try {
 }
 
 val Context.appName: String get() = getString(R.string.app_name)
-val Fragment.appName: String
-    get() = context?.appName ?: error("Fragment is expected to have a context")
+val Fragment.appName: String get() = contextNotNull.appName
 
 val Context.preferences: SharedPreferences
     get() = PreferenceManager.getDefaultSharedPreferences(this)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
index 735a35f6..ffe0e4ed 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
@@ -51,34 +51,16 @@ operator fun <T, R> Rules<T, R>.get(x: T): R? = match(x)
 /**
  * It is very useful to choose android text resource depending on some condition.
  * (In that case prevent lambda of capturing context that will be invalid next time fragment entered,
- * so use `Fragment.getString` outside of (...) -> String lambdas.)
+ * so use `Context::getString` outside of inner paired lambdas)
  * ```
  * val Context.inputSymbolPrintRules by rules<Context, Char, String>(
  *     {
  *         val t = getString(R.string.input_letter_intro_template)
  *         ruSymbols.map::containsKey to { c: Char -> t.format(c) }
  *     },
- *
  *     {
  *         val t = getString(R.string.input_digit_intro_template)
  *         uebDigits.map::containsKey to { c: Char -> t.format(c) }
- *     },
- *
- *     {
- *         val other = getString(R.string.input_special_intro_template)
- *         val numSign = getString(R.string.input_special_intro_num_sign)
- *         val dotIntro = getString(R.string.input_special_intro_dot)
- *         val commaIntro = getString(R.string.input_special_intro_comma)
- *         val hyphenIntro = getString(R.string.input_special_intro_hyphen)
- *         specialSymbols.map::containsKey to { c: Char ->
- *             when (c) {
- *                 ']' -> numSign
- *                 '.' -> dotIntro
- *                 ',' -> commaIntro
- *                 '-' -> hyphenIntro
- *                 else -> other.format(c)
- *             }
- *         }
  *     }
  * )
  * ```
@@ -86,17 +68,19 @@ operator fun <T, R> Rules<T, R>.get(x: T): R? = match(x)
 class rules<C, T, R>(private vararg val ruleProviders: C.() -> Rule<T, R>) {
     private var value: Rules<T, R>? = null
     operator fun getValue(thisRef: C, property: KProperty<*>): Rules<T, R> =
-        value ?: ruleProviders
-            .map { thisRef.it() }
-            .also { value = it }
+        value
+            ?: ruleProviders
+                .map { thisRef.it() }
+                .also { value = it }
 }
 
 class lazyWithContext<C, R>(private val getter: C.(KProperty<*>) -> R) {
     private var value: R? = null
     operator fun getValue(thisRef: C, property: KProperty<*>): R =
-        value ?: thisRef
-            .getter(property)
-            .also { value = it }
+        value
+            ?: thisRef
+                .getter(property)
+                .also { value = it }
 }
 
 class Days(val v: Int) {
@@ -113,7 +97,7 @@ operator fun Date.plus(days: Days): Date =
 
 operator fun Date.minus(days: Days): Date = plus(-days)
 
-inline fun <T> tryN(n: Int, stop: (T) -> Boolean, get: () -> T): T? {
+inline fun <T> retryN(n: Int, stop: (T) -> Boolean, get: () -> T): T? {
     repeat(n) {
         val v = get()
         if (stop(v)) return v

From 36e005820415a0c6c6a2e2d982b643049a25bb0f Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Thu, 3 Sep 2020 01:40:12 +0300
Subject: [PATCH 034/117] Impl Step compareTO via Pair compareTo

---
 .../learnbraille/utils/_KotlinTest.kt         |  13 +-
 .../learnbraille/data/entities/Steps.kt       | 274 +++++++++---------
 .../learnbraille/utils/_Kotlin.kt             |   9 +
 3 files changed, 155 insertions(+), 141 deletions(-)

diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
index 84ece916..2fd15e23 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
@@ -2,13 +2,23 @@ package com.github.braillesystems.learnbraille.utils
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 @RunWith(AndroidJUnit4::class)
 class KotlinTest {
 
+    @Test
+    fun pairCompareTo() {
+        assertTrue((0 to 0) == (0 to 0))
+        assertTrue((1 to 0) > (0 to 0))
+        assertTrue((0 to 1) > (0 to 0))
+        assertTrue((1 to 2) < (2 to 1))
+        assertTrue((0 to 0) <= (0 to 0))
+        assertTrue((1 to 2) > (0 to 0))
+    }
+
     @Test
     fun retryNTest() {
         fun getNextNumber(currentNumber: Int, nextNumbers: Array<Int>, repeat: Int): Int? {
@@ -28,6 +38,5 @@ class KotlinTest {
         assertEquals(2, getNextNumber(1, arrayOf(1, 2, 3), 3))
         assertEquals(null, getNextNumber(1, arrayOf(1, 2, 3), 1))
         assertEquals(5, getNextNumber(0, arrayOf(0, 0, 0, 5, 1, 0, 4), 4))
-
     }
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt
index 5623437e..0064dad5 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt
@@ -1,139 +1,135 @@
-package com.github.braillesystems.learnbraille.data.entities
-
-import androidx.room.*
-import com.github.braillesystems.learnbraille.data.dsl.StepAnnotationName
-import kotlinx.serialization.Serializable
-
-
-@Entity(tableName = "steps", primaryKeys = ["id", "course_id", "lesson_id"])
-@Serializable
-data class Step(
-    val id: Long,
-    @ColumnInfo(name = "course_id")
-    val courseId: Long,
-    @ColumnInfo(name = "lesson_id")
-    val lessonId: Long,
-    val data: StepData
-) : Comparable<Step> {
-
-    override operator fun compareTo(other: Step): Int {
-        require(other.courseId == courseId) {
-            "Only steps of the same course are comparable"
-        }
-        if (this == other) return 0
-        return if (lessonId < other.lessonId ||
-            (lessonId == other.lessonId && id < other.id)
-        ) {
-            -1
-        } else {
-            1
-        }
-    }
-}
-
-/**
- * Be careful: there are duplications of some SQL code.
- */
-@Dao
-interface StepDao {
-
-    @Insert(onConflict = OnConflictStrategy.ABORT)
-    suspend fun insert(steps: List<Step>)
-
-    @Query("select * from steps where id = :id")
-    suspend fun getStep(id: Long): Step?
-
-    @Query(
-        """
-        select steps.* from current_step as cs
-        inner join steps on steps.course_id = cs.course_id 
-        and steps.lesson_id = cs.lesson_id and steps.id = cs.step_id 
-        where cs.user_id = :userId and cs.course_id = :courseId
-        """
-    )
-    suspend fun getCurrentStep(userId: Long, courseId: Long): Step?
-
-    @Query(
-        """
-        select steps.* from last_course_step as ls
-        inner join steps on steps.course_id = ls.course_id 
-        and steps.lesson_id = ls.lesson_id and steps.id = ls.step_id
-        where ls.user_id = :userId and ls.course_id = :courseId
-        """
-    )
-    suspend fun getLastStep(userId: Long, courseId: Long): Step?
-
-    @Query(
-        """
-        select steps.* from last_lesson_step as ls
-        inner join steps on steps.course_id = ls.course_id 
-        and steps.lesson_id = ls.lesson_id and steps.id = ls.step_id
-        where ls.user_id = :userId and ls.course_id = :courseId and ls.lesson_id = :lessonId
-        """
-    )
-    suspend fun getLastStep(userId: Long, courseId: Long, lessonId: Long): Step?
-
-    @Query(
-        """
-        select steps.* from steps
-        where steps.course_id = :courseId
-        order by steps.lesson_id, steps.id limit 1
-        """
-    )
-    suspend fun getFirstCourseStep(courseId: Long): Step?
-
-    @Query(
-        """
-        select steps.* from steps
-        where course_id = :courseId 
-        and (
-            (id > :thisStepId and lesson_id = :thisLessonId)
-            or (lesson_id > :thisLessonId)
-        )
-        and not exists(
-            select * from step_has_annotations as sha
-            inner join step_annotations as sa on sha.annotation_id = sa.id
-            where sha.course_id = :courseId 
-            and sha.lesson_id = steps.lesson_id and sha.step_id = steps.id
-            and sa.name in (:proscribedAnnotations)
-        )
-        order by lesson_id, id
-        limit 1
-        """
-    )
-    suspend fun getNextStep(
-        courseId: Long,
-        thisLessonId: Long,
-        thisStepId: Long,
-        proscribedAnnotations: List<StepAnnotationName> = listOf()
-    ): Step?
-
-    @Query(
-        """
-        select steps.* from steps
-        where course_id = :courseId
-        and (
-            (id < :thisStepId and lesson_id = :thisLessonId)
-            or (lesson_id < :thisLessonId)
-        )
-        and not exists(
-            select * from step_has_annotations as sha
-            inner join step_annotations as sa on sha.annotation_id = sa.id
-            where sha.course_id = :courseId 
-            and sha.lesson_id = steps.lesson_id and sha.step_id = steps.id
-            and sa.name in (:proscribedAnnotations)
-        )
-        order by lesson_id desc, id desc
-        limit 1
-        """
-    )
-    suspend fun getPrevStep(
-        courseId: Long,
-        thisLessonId: Long,
-        thisStepId: Long,
-        proscribedAnnotations: List<StepAnnotationName> = listOf()
-    ): Step?
-
-    @Query("delete from steps")
-    suspend fun clear()
-}
+package com.github.braillesystems.learnbraille.data.entities
+
+import androidx.room.*
+import com.github.braillesystems.learnbraille.data.dsl.StepAnnotationName
+import com.github.braillesystems.learnbraille.utils.compareTo
+import kotlinx.serialization.Serializable
+
+
+@Entity(tableName = "steps", primaryKeys = ["id", "course_id", "lesson_id"])
+@Serializable
+data class Step(
+    val id: Long,
+    @ColumnInfo(name = "course_id")
+    val courseId: Long,
+    @ColumnInfo(name = "lesson_id")
+    val lessonId: Long,
+    val data: StepData
+) : Comparable<Step> {
+
+    override operator fun compareTo(other: Step): Int {
+        require(other.courseId == courseId) {
+            "Only steps of the same course are comparable"
+        }
+        val id1 = lessonId to id
+        val id2 = other.run { lessonId to id }
+        return id1.compareTo(id2)
+    }
+}
+
+/**
+ * Be careful: there are duplications of some SQL code.
+ */
+@Dao
+interface StepDao {
+
+    @Insert(onConflict = OnConflictStrategy.ABORT)
+    suspend fun insert(steps: List<Step>)
+
+    @Query("select * from steps where id = :id")
+    suspend fun getStep(id: Long): Step?
+
+    @Query(
+        """
+        select steps.* from current_step as cs
+        inner join steps on steps.course_id = cs.course_id 
+        and steps.lesson_id = cs.lesson_id and steps.id = cs.step_id 
+        where cs.user_id = :userId and cs.course_id = :courseId
+        """
+    )
+    suspend fun getCurrentStep(userId: Long, courseId: Long): Step?
+
+    @Query(
+        """
+        select steps.* from last_course_step as ls
+        inner join steps on steps.course_id = ls.course_id 
+        and steps.lesson_id = ls.lesson_id and steps.id = ls.step_id
+        where ls.user_id = :userId and ls.course_id = :courseId
+        """
+    )
+    suspend fun getLastStep(userId: Long, courseId: Long): Step?
+
+    @Query(
+        """
+        select steps.* from last_lesson_step as ls
+        inner join steps on steps.course_id = ls.course_id 
+        and steps.lesson_id = ls.lesson_id and steps.id = ls.step_id
+        where ls.user_id = :userId and ls.course_id = :courseId and ls.lesson_id = :lessonId
+        """
+    )
+    suspend fun getLastStep(userId: Long, courseId: Long, lessonId: Long): Step?
+
+    @Query(
+        """
+        select steps.* from steps
+        where steps.course_id = :courseId
+        order by steps.lesson_id, steps.id limit 1
+        """
+    )
+    suspend fun getFirstCourseStep(courseId: Long): Step?
+
+    @Query(
+        """
+        select steps.* from steps
+        where course_id = :courseId 
+        and (
+            (id > :thisStepId and lesson_id = :thisLessonId)
+            or (lesson_id > :thisLessonId)
+        )
+        and not exists(
+            select * from step_has_annotations as sha
+            inner join step_annotations as sa on sha.annotation_id = sa.id
+            where sha.course_id = :courseId 
+            and sha.lesson_id = steps.lesson_id and sha.step_id = steps.id
+            and sa.name in (:proscribedAnnotations)
+        )
+        order by lesson_id, id
+        limit 1
+        """
+    )
+    suspend fun getNextStep(
+        courseId: Long,
+        thisLessonId: Long,
+        thisStepId: Long,
+        proscribedAnnotations: List<StepAnnotationName> = listOf()
+    ): Step?
+
+    @Query(
+        """
+        select steps.* from steps
+        where course_id = :courseId
+        and (
+            (id < :thisStepId and lesson_id = :thisLessonId)
+            or (lesson_id < :thisLessonId)
+        )
+        and not exists(
+            select * from step_has_annotations as sha
+            inner join step_annotations as sa on sha.annotation_id = sa.id
+            where sha.course_id = :courseId 
+            and sha.lesson_id = steps.lesson_id and sha.step_id = steps.id
+            and sa.name in (:proscribedAnnotations)
+        )
+        order by lesson_id desc, id desc
+        limit 1
+        """
+    )
+    suspend fun getPrevStep(
+        courseId: Long,
+        thisLessonId: Long,
+        thisStepId: Long,
+        proscribedAnnotations: List<StepAnnotationName> = listOf()
+    ): Step?
+
+    @Query("delete from steps")
+    suspend fun clear()
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
index ffe0e4ed..649e63a9 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
@@ -24,6 +24,15 @@ operator fun MatchGroupCollection.component3() = get(2)
 operator fun MatchGroupCollection.component4() = get(3)
 operator fun MatchGroupCollection.component5() = get(4)
 
+operator fun <A, B> Pair<A, B>.compareTo(other: Pair<A, B>): Int
+        where A : Comparable<A>, B : Comparable<B> =
+    when {
+        first < other.first -> -1
+        first == other.first && second < other.second -> -1
+        equals(other) -> 0
+        else -> 1
+    }
+
 val Any?.devnull: Unit get() {}
 
 fun String.removeHtmlMarkup() = Regex("""<[^>]*>|&""").replace(this, "")

From c68e7de88c4059e1ac2ddb35c85c96aabb985dbb Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Thu, 3 Sep 2020 01:44:51 +0300
Subject: [PATCH 035/117] Introduce readable type aliases

---
 .../learnbraille/data/entities/Actions.kt     |  2 +-
 .../learnbraille/data/entities/BrailleDots.kt |  3 --
 .../learnbraille/data/entities/Cards.kt       | 10 +++----
 .../learnbraille/data/entities/Common.kt      |  3 ++
 .../data/entities/CoursePositions.kt          | 27 ++++++++---------
 .../learnbraille/data/entities/Courses.kt     | 10 ++++---
 .../learnbraille/data/entities/Decks.kt       |  9 +++---
 .../data/entities/KnownMaterials.kt           |  5 ++--
 .../learnbraille/data/entities/Lessons.kt     | 12 ++++----
 .../data/entities/MaterialData.kt             |  4 +--
 .../learnbraille/data/entities/Materials.kt   |  5 ++--
 .../data/entities/StepAnnotations.kt          |  5 ++--
 .../learnbraille/data/entities/StepData.kt    | 14 ++++-----
 .../data/entities/StepHasAnnotations.kt       |  9 +++---
 .../learnbraille/data/entities/Steps.kt       | 29 +++++++++----------
 .../learnbraille/data/entities/Users.kt       | 13 +++++----
 .../data/repository/ActionsRepository.kt      |  4 +--
 .../data/repository/BrowserRepository.kt      |  7 +++--
 .../data/repository/MaterialsRepository.kt    | 13 ++++-----
 .../data/repository/PracticeRepository.kt     | 11 +++----
 .../data/repository/PreferenceRepository.kt   |  6 ++--
 .../data/repository/TheoryRepository.kt       | 26 ++++++++---------
 22 files changed, 111 insertions(+), 116 deletions(-)
 create mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Common.kt

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Actions.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Actions.kt
index 7c13bd6f..54e41317 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Actions.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Actions.kt
@@ -9,7 +9,7 @@ import java.util.*
 @Entity(tableName = "actions")
 data class Action(
     @PrimaryKey(autoGenerate = true)
-    var id: Long = 0,
+    var id: DBid = 0,
     val type: ActionType,
     val date: Date = Date()
 ) {
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/BrailleDots.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/BrailleDots.kt
index 0bc3e7f9..e62f0bd0 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/BrailleDots.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/BrailleDots.kt
@@ -5,7 +5,6 @@ import com.github.braillesystems.learnbraille.data.entities.BrailleDot.E
 import com.github.braillesystems.learnbraille.data.entities.BrailleDot.F
 import kotlinx.serialization.Serializable
 
-
 /**
  * State of one Braille dot.
  */
@@ -19,7 +18,6 @@ enum class BrailleDot {
     }
 }
 
-
 /**
  * Combination on Braille dots for one symbol in 6-dots notation.
  */
@@ -70,7 +68,6 @@ val BrailleDots.filled: List<Int>
 
 operator fun BrailleDots.contains(i: Int) = i in filled
 
-
 class BrailleDotsConverters {
 
     @TypeConverter
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Cards.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Cards.kt
index f2d1574b..563ab229 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Cards.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Cards.kt
@@ -6,9 +6,9 @@ import androidx.room.*
 @Entity(tableName = "cards", primaryKeys = ["deck_id", "material_id"])
 data class Card(
     @ColumnInfo(name = "deck_id")
-    val deckId: Long,
+    val deckId: DBid,
     @ColumnInfo(name = "material_id")
-    val materialId: Long
+    val materialId: DBid
 )
 
 @Dao
@@ -26,7 +26,7 @@ interface CardDao {
         order by RANDOM() limit 1
         """
     )
-    suspend fun getRandomMaterialFromDeck(deckId: Long): Material?
+    suspend fun getRandomMaterialFromDeck(deckId: DBid): Material?
 
     @Query(
         """
@@ -40,7 +40,7 @@ interface CardDao {
         order by RANDOM() limit 1
         """
     )
-    suspend fun getRandomKnownMaterialFromDeck(userId: Long, deckId: Long): Material?
+    suspend fun getRandomKnownMaterialFromDeck(userId: DBid, deckId: DBid): Material?
 
     @Query(
         """
@@ -51,7 +51,7 @@ interface CardDao {
         order by m.id
         """
     )
-    suspend fun getAllMaterialsFromDeck(id: Long): List<Material>
+    suspend fun getAllMaterialsFromDeck(id: DBid): List<Material>
 
     @Query("delete from cards")
     suspend fun clear()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Common.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Common.kt
new file mode 100644
index 00000000..fc836e2a
--- /dev/null
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Common.kt
@@ -0,0 +1,3 @@
+package com.github.braillesystems.learnbraille.data.entities
+
+typealias DBid = Long
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/CoursePositions.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/CoursePositions.kt
index df1912f5..05679bf4 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/CoursePositions.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/CoursePositions.kt
@@ -2,20 +2,19 @@ package com.github.braillesystems.learnbraille.data.entities
 
 import androidx.room.*
 
-
 /**
  * `Current` means: last not passed.
  */
 @Entity(tableName = "current_step", primaryKeys = ["user_id", "course_id"])
 data class CurrentStep(
     @ColumnInfo(name = "user_id")
-    val userId: Long,
+    val userId: DBid,
     @ColumnInfo(name = "course_id")
-    val courseId: Long,
+    val courseId: DBid,
     @ColumnInfo(name = "lesson_id")
-    val lessonId: Long,
+    val lessonId: DBid,
     @ColumnInfo(name = "step_id")
-    val stepId: Long
+    val stepId: DBid
 )
 
 @Dao
@@ -28,20 +27,19 @@ interface CurrentStepDao {
     suspend fun update(currentStep: CurrentStep)
 }
 
-
 /**
  * `Last` means: last seen.
  */
 @Entity(tableName = "last_course_step", primaryKeys = ["user_id", "course_id"])
 data class LastCourseStep(
     @ColumnInfo(name = "user_id")
-    val userId: Long,
+    val userId: DBid,
     @ColumnInfo(name = "course_id")
-    val courseId: Long,
+    val courseId: DBid,
     @ColumnInfo(name = "lesson_id")
-    val lessonId: Long,
+    val lessonId: DBid,
     @ColumnInfo(name = "step_id")
-    val stepId: Long
+    val stepId: DBid
 )
 
 @Dao
@@ -54,20 +52,19 @@ interface LastCourseStepDao {
     suspend fun update(lastCourseStep: LastCourseStep)
 }
 
-
 /**
  * Last step, what user visited in lesson
  */
 @Entity(tableName = "last_lesson_step", primaryKeys = ["user_id", "course_id", "lesson_id"])
 data class LastLessonStep(
     @ColumnInfo(name = "user_id")
-    val userId: Long,
+    val userId: DBid,
     @ColumnInfo(name = "course_id")
-    val courseId: Long,
+    val courseId: DBid,
     @ColumnInfo(name = "lesson_id")
-    val lessonId: Long,
+    val lessonId: DBid,
     @ColumnInfo(name = "step_id")
-    val stepId: Long
+    val stepId: DBid
 )
 
 @Dao
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Courses.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Courses.kt
index a111346c..5880edbd 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Courses.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Courses.kt
@@ -2,12 +2,14 @@ package com.github.braillesystems.learnbraille.data.entities
 
 import androidx.room.*
 
+typealias CourseName = String
+typealias CourseDesc = String
 
 @Entity(tableName = "courses")
 data class Course(
-    @PrimaryKey val id: Long,
-    val name: String,
-    val description: String
+    @PrimaryKey val id: DBid,
+    val name: CourseName,
+    val description: CourseDesc
 )
 
 @Dao
@@ -17,7 +19,7 @@ interface CourseDao {
     suspend fun insert(courses: List<Course>)
 
     @Query("select * from courses where id = :id")
-    suspend fun getCourse(id: Long): Course?
+    suspend fun getCourse(id: DBid): Course?
 
     @Query("delete from courses")
     suspend fun clear()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Decks.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Decks.kt
index 7125baf0..19a6551b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Decks.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Decks.kt
@@ -2,11 +2,12 @@ package com.github.braillesystems.learnbraille.data.entities
 
 import androidx.room.*
 
+typealias DeckTag = String
 
 @Entity(tableName = "decks")
 data class Deck(
-    @PrimaryKey val id: Long,
-    val tag: String
+    @PrimaryKey val id: DBid,
+    val tag: DeckTag
 )
 
 @Dao
@@ -16,7 +17,7 @@ interface DeckDao {
     suspend fun insert(decks: List<Deck>)
 
     @Query("select * from decks where id = :id")
-    suspend fun getDeck(id: Long): Deck?
+    suspend fun getDeck(id: DBid): Deck?
 
     @Query("select * from decks")
     suspend fun getAllDecks(): List<Deck>
@@ -32,7 +33,7 @@ interface DeckDao {
         order by d.id
         """
     )
-    suspend fun getAvailableDecks(userId: Long): List<Deck>
+    suspend fun getAvailableDecks(userId: DBid): List<Deck>
 
     @Query("delete from decks")
     suspend fun clear()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/KnownMaterials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/KnownMaterials.kt
index d703a3d0..1a8fcfb6 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/KnownMaterials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/KnownMaterials.kt
@@ -2,13 +2,12 @@ package com.github.braillesystems.learnbraille.data.entities
 
 import androidx.room.*
 
-
 @Entity(tableName = "known_materials", primaryKeys = ["user_id", "material_id"])
 data class KnownMaterial(
     @ColumnInfo(name = "user_id")
-    val userId: Long,
+    val userId: DBid,
     @ColumnInfo(name = "material_id")
-    val materialId: Long
+    val materialId: DBid
 )
 
 @Dao
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Lessons.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Lessons.kt
index 25e5571b..7fe924d6 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Lessons.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Lessons.kt
@@ -2,14 +2,16 @@ package com.github.braillesystems.learnbraille.data.entities
 
 import androidx.room.*
 
+typealias LessonName = String
+typealias LessonDesc = String
 
 @Entity(tableName = "lessons", primaryKeys = ["id", "course_id"])
 data class Lesson(
-    val id: Long,
+    val id: DBid,
     @ColumnInfo(name = "course_id")
-    val courseId: Long,
-    val name: String,
-    val description: String
+    val courseId: DBid,
+    val name: LessonName,
+    val description: LessonDesc
 )
 
 @Dao
@@ -25,7 +27,7 @@ interface LessonDao {
         order by id
         """
     )
-    suspend fun getAllCourseLessons(courseId: Long): List<Lesson>
+    suspend fun getAllCourseLessons(courseId: DBid): List<Lesson>
 
     @Query("delete from lessons")
     suspend fun clear()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/MaterialData.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/MaterialData.kt
index d5d800b3..541c184c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/MaterialData.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/MaterialData.kt
@@ -6,7 +6,6 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 
-
 @Serializable
 sealed class MaterialData
 
@@ -21,11 +20,12 @@ class MaterialDataTypeConverters {
     fun from(s: String): MaterialData = Json.parse(MaterialData.serializer(), s)
 }
 
+typealias SymbolType = String
 
 @Serializable
 data class Symbol(
     val char: Char,
     val brailleDots: BrailleDots,
     @SerialName("symbol_type")
-    val type: String
+    val type: SymbolType
 ) : MaterialData()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Materials.kt
index d2a5ff11..f3358a78 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Materials.kt
@@ -3,11 +3,10 @@ package com.github.braillesystems.learnbraille.data.entities
 import androidx.room.*
 import kotlinx.serialization.Serializable
 
-
 @Entity(tableName = "materials")
 @Serializable
 data class Material(
-    @PrimaryKey val id: Long,
+    @PrimaryKey val id: DBid,
     val data: MaterialData
 )
 
@@ -18,7 +17,7 @@ interface MaterialDao {
     suspend fun insert(materials: List<Material>)
 
     @Query("select * from materials where id = :id")
-    suspend fun getMaterial(id: Long): Material?
+    suspend fun getMaterial(id: DBid): Material?
 
     @Query("select * from materials order by RANDOM() limit 1")
     suspend fun getRandomMaterial(): Material?
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepAnnotations.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepAnnotations.kt
index 307e7806..f9d36d80 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepAnnotations.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepAnnotations.kt
@@ -2,11 +2,12 @@ package com.github.braillesystems.learnbraille.data.entities
 
 import androidx.room.*
 
+typealias StepAnnotationName = String
 
 @Entity(tableName = "step_annotations", indices = [Index(value = ["name"], unique = true)])
 data class StepAnnotation(
-    @PrimaryKey val id: Long,
-    val name: String
+    @PrimaryKey val id: DBid,
+    val name: StepAnnotationName
 )
 
 @Dao
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt
index 4a34db54..fbb7e06c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt
@@ -6,13 +6,10 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 
-
 /**
  * There are specific step types in the app.
  * They differs by visual representation and by the data they contain.
  *
- * Step type can be determined by `is` check.
- *
  * All texts are in html format. Use .parseAsHtml android extension function.
  */
 @Serializable
@@ -29,6 +26,7 @@ class StepDataConverters {
     fun from(string: String) = Json.parse(StepData.serializer(), string)
 }
 
+typealias HtmlText = String
 
 /**
  * Represents step types with information.
@@ -42,7 +40,7 @@ sealed class BaseInfo : StepData()
 @Serializable
 data class Info(
     @SerialName("info")
-    val text: String
+    val text: HtmlText
 ) : BaseInfo()
 
 /**
@@ -51,7 +49,7 @@ data class Info(
 @Serializable
 data class FirstInfo(
     @SerialName("info")
-    val text: String
+    val text: HtmlText
 ) : BaseInfo()
 
 /**
@@ -60,7 +58,7 @@ data class FirstInfo(
 @Serializable
 data class LastInfo(
     @SerialName("info")
-    val text: String
+    val text: HtmlText
 ) : BaseInfo()
 
 
@@ -83,7 +81,7 @@ data class Input(
  */
 @Serializable
 data class InputDots(
-    val text: String?,
+    val text: HtmlText?,
     val dots: BrailleDots
 ) : BaseInput()
 
@@ -107,6 +105,6 @@ data class Show(
  */
 @Serializable
 data class ShowDots(
-    val text: String?,
+    val text: HtmlText?,
     val dots: BrailleDots
 ) : BaseShow()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepHasAnnotations.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepHasAnnotations.kt
index 0116128e..a7e06fea 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepHasAnnotations.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepHasAnnotations.kt
@@ -2,20 +2,19 @@ package com.github.braillesystems.learnbraille.data.entities
 
 import androidx.room.*
 
-
 @Entity(
     tableName = "step_has_annotations",
     primaryKeys = ["course_id", "lesson_id", "step_id", "annotation_id"]
 )
 data class StepHasAnnotation(
     @ColumnInfo(name = "course_id")
-    val courseId: Long,
+    val courseId: DBid,
     @ColumnInfo(name = "lesson_id")
-    val lessonId: Long,
+    val lessonId: DBid,
     @ColumnInfo(name = "step_id")
-    val stepId: Long,
+    val stepId: DBid,
     @ColumnInfo(name = "annotation_id")
-    val annotationId: Long
+    val annotationId: DBid
 )
 
 @Dao
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt
index 0064dad5..e1814e43 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt
@@ -5,15 +5,14 @@ import com.github.braillesystems.learnbraille.data.dsl.StepAnnotationName
 import com.github.braillesystems.learnbraille.utils.compareTo
 import kotlinx.serialization.Serializable
 
-
 @Entity(tableName = "steps", primaryKeys = ["id", "course_id", "lesson_id"])
 @Serializable
 data class Step(
-    val id: Long,
+    val id: DBid,
     @ColumnInfo(name = "course_id")
-    val courseId: Long,
+    val courseId: DBid,
     @ColumnInfo(name = "lesson_id")
-    val lessonId: Long,
+    val lessonId: DBid,
     val data: StepData
 ) : Comparable<Step> {
 
@@ -37,7 +36,7 @@ interface StepDao {
     suspend fun insert(steps: List<Step>)
 
     @Query("select * from steps where id = :id")
-    suspend fun getStep(id: Long): Step?
+    suspend fun getStep(id: DBid): Step?
 
     @Query(
         """
@@ -47,7 +46,7 @@ interface StepDao {
         where cs.user_id = :userId and cs.course_id = :courseId
         """
     )
-    suspend fun getCurrentStep(userId: Long, courseId: Long): Step?
+    suspend fun getCurrentStep(userId: DBid, courseId: DBid): Step?
 
     @Query(
         """
@@ -57,7 +56,7 @@ interface StepDao {
         where ls.user_id = :userId and ls.course_id = :courseId
         """
     )
-    suspend fun getLastStep(userId: Long, courseId: Long): Step?
+    suspend fun getLastStep(userId: DBid, courseId: DBid): Step?
 
     @Query(
         """
@@ -67,7 +66,7 @@ interface StepDao {
         where ls.user_id = :userId and ls.course_id = :courseId and ls.lesson_id = :lessonId
         """
     )
-    suspend fun getLastStep(userId: Long, courseId: Long, lessonId: Long): Step?
+    suspend fun getLastStep(userId: DBid, courseId: DBid, lessonId: DBid): Step?
 
     @Query(
         """
@@ -76,7 +75,7 @@ interface StepDao {
         order by steps.lesson_id, steps.id limit 1
         """
     )
-    suspend fun getFirstCourseStep(courseId: Long): Step?
+    suspend fun getFirstCourseStep(courseId: DBid): Step?
 
     @Query(
         """
@@ -98,9 +97,9 @@ interface StepDao {
         """
     )
     suspend fun getNextStep(
-        courseId: Long,
-        thisLessonId: Long,
-        thisStepId: Long,
+        courseId: DBid,
+        thisLessonId: DBid,
+        thisStepId: DBid,
         proscribedAnnotations: List<StepAnnotationName> = listOf()
     ): Step?
 
@@ -124,9 +123,9 @@ interface StepDao {
         """
     )
     suspend fun getPrevStep(
-        courseId: Long,
-        thisLessonId: Long,
-        thisStepId: Long,
+        courseId: DBid,
+        thisLessonId: DBid,
+        thisStepId: DBid,
         proscribedAnnotations: List<StepAnnotationName> = listOf()
     ): Step?
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Users.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Users.kt
index e997762d..5af9a2bf 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Users.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Users.kt
@@ -2,12 +2,15 @@ package com.github.braillesystems.learnbraille.data.entities
 
 import androidx.room.*
 
+typealias UserLogin = String
+typealias UserName = String
+
 @Entity(tableName = "users", indices = [Index(value = ["login"], unique = true)])
 data class User(
     @PrimaryKey(autoGenerate = true)
-    var id: Long = 0,
-    val login: String,
-    val name: String
+    var id: DBid = 0,
+    val login: UserLogin,
+    val name: UserName
 )
 
 @Dao
@@ -20,10 +23,10 @@ interface UserDao {
     suspend fun insert(users: List<User>)
 
     @Query("select * from users where :login = login limit 1")
-    suspend fun getUser(login: String): User?
+    suspend fun getUser(login: UserLogin): User?
 
     @Query("select * from users where :id = id limit 1")
-    suspend fun getUser(id: Long): User?
+    suspend fun getUser(id: DBid): User?
 
     @Query("delete from users")
     suspend fun clear()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepository.kt
index 91ec3e8c..04783487 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepository.kt
@@ -9,6 +9,8 @@ import com.github.braillesystems.learnbraille.utils.scope
 import kotlinx.coroutines.launch
 import java.util.*
 
+typealias Actions = List<Action>
+
 interface ActionsRepository {
     suspend fun getActionsFrom(days: Days): Actions
 }
@@ -40,5 +42,3 @@ class ActionsRepositoryImpl(
                 }
             }
 }
-
-typealias Actions = List<Action>
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/BrowserRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/BrowserRepository.kt
index 25e87dc6..b4d6e3f4 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/BrowserRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/BrowserRepository.kt
@@ -3,15 +3,16 @@ package com.github.braillesystems.learnbraille.data.repository
 import android.content.Context
 import com.github.braillesystems.learnbraille.data.dsl.ALL_CARDS_DECK_ID
 import com.github.braillesystems.learnbraille.data.entities.CardDao
+import com.github.braillesystems.learnbraille.data.entities.DBid
 import com.github.braillesystems.learnbraille.data.entities.DeckDao
 import com.github.braillesystems.learnbraille.utils.preferences
 
 interface BrowserRepository : MaterialsRepository {
-    val currentDeckId: Long
+    val currentDeckId: DBid
 }
 
 interface MutableBrowserRepository : BrowserRepository {
-    override var currentDeckId: Long
+    override var currentDeckId: DBid
 }
 
 class BrowserRepositoryImpl(
@@ -25,7 +26,7 @@ class BrowserRepositoryImpl(
     private val currDeckPreference: String
         get() = "browser_curr_deck_${preferenceRepository.currentUserId}"
 
-    override var currentDeckId: Long
+    override var currentDeckId: DBid
         get() = context.preferences.getLong(
             currDeckPreference, ALL_CARDS_DECK_ID
         )
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepository.kt
index 54eaa064..6a05bdb2 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepository.kt
@@ -1,13 +1,10 @@
 package com.github.braillesystems.learnbraille.data.repository
 
-import com.github.braillesystems.learnbraille.data.entities.CardDao
-import com.github.braillesystems.learnbraille.data.entities.Deck
-import com.github.braillesystems.learnbraille.data.entities.DeckDao
-import com.github.braillesystems.learnbraille.data.entities.Material
+import com.github.braillesystems.learnbraille.data.entities.*
 
 interface MaterialsRepository {
-    suspend fun getRandomMaterialFromDeck(id: Long): Material?
-    suspend fun getAllMaterialsFromDeck(id: Long): List<Material>
+    suspend fun getRandomMaterialFromDeck(id: DBid): Material?
+    suspend fun getAllMaterialsFromDeck(id: DBid): List<Material>
     suspend fun getAllDecks(): List<Deck>
 }
 
@@ -16,10 +13,10 @@ open class MaterialsRepositoryImpl(
     private val cardDao: CardDao
 ) : MaterialsRepository {
 
-    override suspend fun getRandomMaterialFromDeck(id: Long): Material? =
+    override suspend fun getRandomMaterialFromDeck(id: DBid): Material? =
         cardDao.getRandomMaterialFromDeck(id)
 
-    override suspend fun getAllMaterialsFromDeck(id: Long): List<Material> =
+    override suspend fun getAllMaterialsFromDeck(id: DBid): List<Material> =
         cardDao.getAllMaterialsFromDeck(id)
 
     override suspend fun getAllDecks(): List<Deck> = deckDao.getAllDecks()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepository.kt
index e6ae0628..213dbc4b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepository.kt
@@ -2,10 +2,7 @@ package com.github.braillesystems.learnbraille.data.repository
 
 import android.content.Context
 import com.github.braillesystems.learnbraille.data.dsl.ALL_CARDS_DECK_ID
-import com.github.braillesystems.learnbraille.data.entities.CardDao
-import com.github.braillesystems.learnbraille.data.entities.Deck
-import com.github.braillesystems.learnbraille.data.entities.DeckDao
-import com.github.braillesystems.learnbraille.data.entities.Material
+import com.github.braillesystems.learnbraille.data.entities.*
 import com.github.braillesystems.learnbraille.utils.preferences
 
 data class DeckNotEmpty(
@@ -14,14 +11,14 @@ data class DeckNotEmpty(
 )
 
 interface PracticeRepository {
-    val currentDeckId: Long
+    val currentDeckId: DBid
     suspend fun getNextMaterial(): Material?
     suspend fun getCurrDeck(): Deck
     suspend fun getAllDecks(): List<DeckNotEmpty>
 }
 
 interface MutablePracticeRepository : PracticeRepository {
-    override var currentDeckId: Long
+    override var currentDeckId: DBid
     suspend fun getNextMaterialNotNull(): Material
 }
 
@@ -35,7 +32,7 @@ class PracticeRepositoryImpl(
     private val currDeckPreference: String
         get() = "practice_curr_deck_${preferenceRepository.currentUserId}"
 
-    override var currentDeckId: Long
+    override var currentDeckId: DBid
         get() = context.preferences.getLong(
             currDeckPreference, ALL_CARDS_DECK_ID
         )
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
index 159f70db..4bbfb4d6 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
@@ -3,6 +3,7 @@ package com.github.braillesystems.learnbraille.data.repository
 import android.content.Context
 import android.widget.Toast
 import com.github.braillesystems.learnbraille.R
+import com.github.braillesystems.learnbraille.data.entities.DBid
 import com.github.braillesystems.learnbraille.data.entities.User
 import com.github.braillesystems.learnbraille.data.entities.UserDao
 import com.github.braillesystems.learnbraille.utils.BuzzPattern
@@ -10,7 +11,6 @@ import com.github.braillesystems.learnbraille.utils.logged
 import com.github.braillesystems.learnbraille.utils.preferences
 import timber.log.Timber
 
-
 interface PreferenceRepository {
 
     val buzzEnabled: Boolean
@@ -25,7 +25,7 @@ interface PreferenceRepository {
     val extendedAccessibilityEnabled: Boolean
     val additionalQrCodeButtonEnabled: Boolean
 
-    val currentUserId: Long
+    val currentUserId: DBid
     suspend fun getCurrentUser(): User
 
     val toastDuration get() = Toast.LENGTH_SHORT
@@ -114,7 +114,7 @@ class PreferenceRepositoryImpl(
         )
     }
 
-    override val currentUserId: Long by logged {
+    override val currentUserId: DBid by logged {
         context.preferences.getLong(
             context.getString(R.string.preference_current_user), 1
         )
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
index fb142a80..097be796 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
@@ -7,16 +7,16 @@ import com.github.braillesystems.learnbraille.utils.scope
 import kotlinx.coroutines.launch
 
 interface TheoryRepository {
-    suspend fun getCurrentStep(courseId: Long): Step
-    suspend fun getLastCourseStep(courseId: Long): Step
-    suspend fun getAllCourseLessons(courseId: Long): List<Lesson>
+    suspend fun getCurrentStep(courseId: DBid): Step
+    suspend fun getLastCourseStep(courseId: DBid): Step
+    suspend fun getAllCourseLessons(courseId: DBid): List<Lesson>
 }
 
 interface MutableTheoryRepository : TheoryRepository {
     suspend fun getNextStepAndUpdate(thisStep: Step, markThisAsPassed: Boolean = false): Step?
     suspend fun getPrevStepAndUpdate(thisStep: Step): Step?
-    suspend fun getCurrentStepAndUpdate(courseId: Long): Step
-    suspend fun getLastLessonOrCurrentStepAndUpdate(courseId: Long, lessonId: Long): Step
+    suspend fun getCurrentStepAndUpdate(courseId: DBid): Step
+    suspend fun getLastLessonOrCurrentStepAndUpdate(courseId: DBid, lessonId: DBid): Step
 }
 
 class TheoryRepositoryImpl(
@@ -79,13 +79,13 @@ class TheoryRepositoryImpl(
             )
             ?.also { updateLast(it) }
 
-    override suspend fun getCurrentStepAndUpdate(courseId: Long): Step =
+    override suspend fun getCurrentStepAndUpdate(courseId: DBid): Step =
         getCurrentStep(courseId).also { updateLast(it) }
 
     /**
      * LessonId is supposed to exist for this courseId.
      */
-    override suspend fun getLastLessonOrCurrentStepAndUpdate(courseId: Long, lessonId: Long): Step =
+    override suspend fun getLastLessonOrCurrentStepAndUpdate(courseId: DBid, lessonId: DBid): Step =
         stepDao
             .getLastStep(preferenceRepository.currentUserId, courseId, lessonId)
             ?.also { updateLast(it) }
@@ -94,20 +94,20 @@ class TheoryRepositoryImpl(
                         "or current step is behind lesson with such lessonId"
             )
 
-    override suspend fun getCurrentStep(courseId: Long): Step =
+    override suspend fun getCurrentStep(courseId: DBid): Step =
         stepDao
             .getCurrentStep(preferenceRepository.currentUserId, courseId)
             ?: initCoursePos(courseId)
 
-    override suspend fun getLastCourseStep(courseId: Long): Step =
+    override suspend fun getLastCourseStep(courseId: DBid): Step =
         stepDao
             .getLastStep(preferenceRepository.currentUserId, courseId)
             ?: initCoursePos(courseId)
 
-    override suspend fun getAllCourseLessons(courseId: Long): List<Lesson> =
+    override suspend fun getAllCourseLessons(courseId: DBid): List<Lesson> =
         lessonDao.getAllCourseLessons(courseId)
 
-    private suspend fun initCoursePos(courseId: Long): Step =
+    private suspend fun initCoursePos(courseId: DBid): Step =
         stepDao
             .getFirstCourseStep(courseId)
             ?.also { first ->
@@ -137,8 +137,8 @@ class TheoryRepositoryImpl(
     }.devnull
 
     private fun updateKnown(step: Step): Unit = scope().launch {
-        when (step.data) {
-            is Input -> knownMaterialDao.insert(
+        if (step.data is Input) {
+            knownMaterialDao.insert(
                 KnownMaterial(
                     preferenceRepository.currentUserId,
                     step.data.material.id

From ec6ba249d074cc7208e3115d76b5eea86870d661 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Thu, 3 Sep 2020 13:00:56 +0300
Subject: [PATCH 036/117] Refactor DSL and DSL resources

---
 .../learnbraille/data/dsl/DslTest.kt          |  2 +-
 .../learnbraille/data/dsl/Courses.kt          | 28 ++++++++++--------
 .../learnbraille/data/dsl/DataStorage.kt      | 29 ++++---------------
 .../learnbraille/data/dsl/Defs.kt             | 13 +++++++++
 .../learnbraille/data/dsl/Lessons.kt          |  6 ++--
 .../learnbraille/data/dsl/Materials.kt        |  5 ++--
 .../learnbraille/data/dsl/Users.kt            |  5 ++--
 .../learnbraille/data/entities/Steps.kt       |  1 -
 .../braillesystems/learnbraille/res/Data.kt   | 16 ++++++----
 .../learnbraille/res/Materials.kt             | 12 ++++----
 .../ui/screens/stats/StatsFragment.kt         |  2 +-
 11 files changed, 59 insertions(+), 60 deletions(-)
 create mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Defs.kt

diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
index 8ca44f97..9e20450c 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
@@ -34,7 +34,7 @@ val knownMaterials by known()
 
 private val prepopulationData by data(
     materials = content,
-    stepAnnotations = listOf("book", "bomb"),
+    stepAnnotationNames = listOf("book", "bomb"),
     knownMaterials = knownMaterials
 ) {
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Courses.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Courses.kt
index 7ae7c979..93720eb4 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Courses.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Courses.kt
@@ -1,11 +1,16 @@
 package com.github.braillesystems.learnbraille.data.dsl
 
 import com.github.braillesystems.learnbraille.data.entities.Course
+import com.github.braillesystems.learnbraille.data.entities.CourseDesc
+import com.github.braillesystems.learnbraille.data.entities.CourseName
+import com.github.braillesystems.learnbraille.data.entities.DBid
 import com.github.braillesystems.learnbraille.utils.side
 
-sealed class CourseID(val id: Long)
+sealed class CourseID(val id: DBid)
+
 object DevelopersCourse : CourseID(1)
-class UsersCourse(id: Long) : CourseID(id) {
+
+class UsersCourse(id: DBid) : CourseID(id) {
     init {
         require(id > 1) {
             "id == 1 stands for developers course"
@@ -13,9 +18,6 @@ class UsersCourse(id: Long) : CourseID(id) {
     }
 }
 
-/**
- * Provided values have no ID
- */
 @DataBuilderMarker
 class CoursesBuilder(block: CoursesBuilder.() -> Unit) {
 
@@ -27,14 +29,16 @@ class CoursesBuilder(block: CoursesBuilder.() -> Unit) {
         block()
     }
 
-    fun course(name: String, description: String, block: LessonAccumulatorBuilder.() -> Unit) =
-        LessonAccumulatorBuilder(block).side {
-            val course = Course(DEFAULT_ID, name, description)
-            _data[course] = it.lessons
-        }
+    fun course(
+        name: CourseName, description: CourseDesc,
+        block: LessonAccumulatorBuilder.() -> Unit
+    ) = LessonAccumulatorBuilder(block).side {
+        val course = Course(UNDEFINED_ID, name, description)
+        _data[course] = it.lessons
+    }
 
-    fun course(name: String, description: String, lessons: LessonsBuilder) {
-        val course = Course(DEFAULT_ID, name, description)
+    fun course(name: CourseName, description: CourseDesc, lessons: LessonsBuilder) {
+        val course = Course(UNDEFINED_ID, name, description)
         _data[course] = lessons.lessons
     }
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
index fa9df3f2..76ccd1e7 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
@@ -5,7 +5,6 @@ import com.github.braillesystems.learnbraille.res.DeckTags
 import com.github.braillesystems.learnbraille.utils.side
 import kotlin.reflect.KProperty
 
-
 interface DataStorage {
     val users: List<User>?
     val materials: List<Material>?
@@ -19,30 +18,19 @@ interface DataStorage {
     val knownMaterials: List<KnownMaterial>?
 }
 
-
-const val DEFAULT_ID = -1L
-const val ALL_CARDS_DECK_ID = 1L
-
-typealias StepAnnotationName = String
 typealias StepWithAnnotations = Pair<Step, List<StepAnnotationName>>
 typealias LessonWithSteps = Pair<Lesson, List<StepWithAnnotations>>
 
-
-@DslMarker
-annotation class DataBuilderMarker
-
-
 class data(
     private val materials: MaterialsBuilder,
-    private val stepAnnotations: List<StepAnnotationName>,
+    private val stepAnnotationNames: List<StepAnnotationName>,
     private val knownMaterials: List<KnownMaterial>,
     private val block: DataBuilder.() -> Unit
 ) {
     internal operator fun getValue(thisRef: Any?, property: KProperty<*>): DataStorage =
-        DataBuilder(materials, stepAnnotations, knownMaterials, block)
+        DataBuilder(materials, stepAnnotationNames, knownMaterials, block)
 }
 
-
 @DataBuilderMarker
 class DataBuilder(
     private val _materials: MaterialsBuilder,
@@ -164,7 +152,6 @@ class DataBuilder(
         }
 }
 
-
 @DataBuilderMarker
 class DecksBuilder(block: DecksBuilder.() -> Unit) {
 
@@ -177,18 +164,12 @@ class DecksBuilder(block: DecksBuilder.() -> Unit) {
     }
 
     fun deck(tag: String, entryCriterion: (MaterialData) -> Boolean) {
-        val deck = Deck(DEFAULT_ID, tag)
+        val deck = Deck(UNDEFINED_ID, tag)
         _deckToPredicate[deck] = entryCriterion
     }
 }
 
-object InfoInterpolation {
-    const val iStep = "#istep"
-    const val iLesson = "#ilesson"
-    const val courseName = "#courseName"
-}
-
-private fun Step.interpolateText(courseName: String): Step =
+private fun Step.interpolateText(courseName: CourseName): Step =
     this.copy(
         data =
         if (data !is BaseInfo) data
@@ -201,7 +182,7 @@ private fun Step.interpolateText(courseName: String): Step =
         }
     )
 
-private fun Step.interpolateTextHelper(text: String, courseName: String): String =
+private fun Step.interpolateTextHelper(text: HtmlText, courseName: CourseName): HtmlText =
     text
         .replace(InfoInterpolation.iStep, id.toString())
         .replace(InfoInterpolation.iLesson, lessonId.toString())
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Defs.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Defs.kt
new file mode 100644
index 00000000..6250ffeb
--- /dev/null
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Defs.kt
@@ -0,0 +1,13 @@
+package com.github.braillesystems.learnbraille.data.dsl
+
+const val UNDEFINED_ID = -1L
+const val ALL_CARDS_DECK_ID = 1L
+
+object InfoInterpolation {
+    const val iStep = "#istep"
+    const val iLesson = "#ilesson"
+    const val courseName = "#courseName"
+}
+
+@DslMarker
+internal annotation class DataBuilderMarker
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Lessons.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Lessons.kt
index 0e4ff4c7..b1abba54 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Lessons.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Lessons.kt
@@ -22,7 +22,7 @@ class LessonsBuilder(block: LessonsBuilder.() -> Unit) {
     fun lesson(name: String, description: String = "", block: StepsBuilder.() -> Unit) =
         StepsBuilder(block).side {
             _lessons += Pair(
-                Lesson(DEFAULT_ID, DEFAULT_ID, name, description),
+                Lesson(UNDEFINED_ID, UNDEFINED_ID, name, description),
                 it.steps
             )
         }
@@ -41,7 +41,7 @@ class StepsBuilder(block: StepsBuilder.() -> Unit) {
 
     operator fun StepData.unaryPlus() {
         _steps += Pair(
-            Step(DEFAULT_ID, DEFAULT_ID, DEFAULT_ID, this),
+            Step(UNDEFINED_ID, UNDEFINED_ID, UNDEFINED_ID, this),
             listOf()
         )
     }
@@ -51,7 +51,7 @@ class StepsBuilder(block: StepsBuilder.() -> Unit) {
             "First and Last steps of the course should not be annotated"
         }
         _steps += Pair(
-            Step(DEFAULT_ID, DEFAULT_ID, DEFAULT_ID, first),
+            Step(UNDEFINED_ID, UNDEFINED_ID, UNDEFINED_ID, first),
             second
         )
     }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt
index 3fbec36f..82ee084c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt
@@ -7,7 +7,6 @@ import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.res.content
 import kotlin.reflect.KProperty
 
-
 open class materials(private val block: MaterialsBuilder.() -> Unit) {
 
     private var materials: MaterialsBuilder? = null
@@ -43,7 +42,7 @@ class MaterialsBuilder(block: MaterialsBuilder.() -> Unit) {
 
     operator fun SymbolsBuilder.unaryPlus() {
         symbols.forEach { symbol ->
-            this@MaterialsBuilder._materials.add(Material(DEFAULT_ID, symbol))
+            this@MaterialsBuilder._materials.add(Material(UNDEFINED_ID, symbol))
         }
     }
 }
@@ -85,6 +84,6 @@ class known(vararg chars: Char) {
 
     operator fun getValue(thisRef: Any?, property: KProperty<*>): List<KnownMaterial> =
         knownMaterials ?: cs.map {
-            KnownMaterial(DEFAULT_ID, content.symbols.getValue(it).id)
+            KnownMaterial(UNDEFINED_ID, content.symbols.getValue(it).id)
         }.also { knownMaterials = it }
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Users.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Users.kt
index b6ae72eb..a2633ff0 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Users.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Users.kt
@@ -1,7 +1,8 @@
 package com.github.braillesystems.learnbraille.data.dsl
 
 import com.github.braillesystems.learnbraille.data.entities.User
-
+import com.github.braillesystems.learnbraille.data.entities.UserLogin
+import com.github.braillesystems.learnbraille.data.entities.UserName
 
 @DataBuilderMarker
 class UsersBuilder(block: UsersBuilder.() -> Unit) {
@@ -14,7 +15,7 @@ class UsersBuilder(block: UsersBuilder.() -> Unit) {
         block()
     }
 
-    fun user(login: String, name: String) {
+    fun user(login: UserLogin, name: UserName) {
         _users += User(
             login = login,
             name = name
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt
index e1814e43..3e9cbd5f 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt
@@ -1,7 +1,6 @@
 package com.github.braillesystems.learnbraille.data.entities
 
 import androidx.room.*
-import com.github.braillesystems.learnbraille.data.dsl.StepAnnotationName
 import com.github.braillesystems.learnbraille.utils.compareTo
 import kotlinx.serialization.Serializable
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
index c78823a7..0405004c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
@@ -5,9 +5,9 @@ import androidx.fragment.app.Fragment
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.dsl.data
 import com.github.braillesystems.learnbraille.data.entities.Symbol
+import com.github.braillesystems.learnbraille.utils.contextNotNull
 import com.github.braillesystems.learnbraille.utils.lazyWithContext
 
-
 /**
  * Do not change name of this property, it is used for prepopulation.
  *
@@ -19,17 +19,19 @@ import com.github.braillesystems.learnbraille.utils.lazyWithContext
  * It is better to simply have only one value declared as `by materials`.
  *
  * Correctness of all information should be checked in compile time or in runtime.
- * If you need some additional info, do not hardcode it. Just make request to the new DSL feature.
+ * If some additional info is need, do not hardcode it.
+ * Just make request to the new DSL feature via github issues.
  */
 val prepopulationData by data(
     materials = content,
-    stepAnnotations = listOf(
+    stepAnnotationNames = listOf(
         StepAnnotation.golubinaBookRequired
     ),
     knownMaterials = knownMaterials
 ) {
 
     users {
+        // Default user should always exist and be first in the list of users
         user(
             login = "default",
             name = "John Smith"
@@ -37,7 +39,7 @@ val prepopulationData by data(
     }
 
     courses {
-        // This course should be always be first
+        // Dev course should be always be first
         course(
             name = "Test course for developers",
             description = "Small course for tests during development",
@@ -55,7 +57,9 @@ val prepopulationData by data(
     }
 
     decks {
-        deck(DeckTags.all) { true }  // This deck should always exist
+        // All cards deck should always exist and be first in the list
+        deck(DeckTags.all) { true }
+
         deck(DeckTags.ruLetters) { data ->
             data is Symbol && data.type == SymbolType.ru
         }
@@ -91,4 +95,4 @@ val Context.deckTagToName: Map<String, String> by lazyWithContext {
 }
 
 val Fragment.deckTagToName
-    get() = context?.deckTagToName ?: error("Fragment should have context")
+    get() = contextNotNull.deckTagToName
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index af98f675..65e26b03 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -10,6 +10,11 @@ import com.github.braillesystems.learnbraille.data.entities.BrailleDot.F
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.utils.rules
 
+object SymbolType {
+    const val ru = "ru"
+    const val special = "special"
+    const val digit = "digit"
+}
 
 /**
  * Do not forget to register print rules below for the new types of symbols.
@@ -91,13 +96,6 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
     }
 )
 
-
-object SymbolType {
-    const val ru = "ru"
-    const val special = "special"
-    const val digit = "digit"
-}
-
 private val ruSymbols by symbols(SymbolType.ru) {
     symbol(char = 'А', brailleDots = BrailleDots(F, E, E, E, E, E))
     symbol(char = 'Б', brailleDots = BrailleDots(F, F, E, E, E, E))
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
index b01f4684..0a52059b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
@@ -35,7 +35,7 @@ class StatsFragment : AbstractFragmentWithHelp(R.string.stats_help) {
         R.layout.fragment_stats,
         container,
         false
-    ).also { binding ->
+    ).also {
 
         title = getString(R.string.stats_title)
         setHasOptionsMenu(true)

From 4e56dfb4fa6f7787a8ecec77b2faf30ad47a07bb Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Thu, 3 Sep 2020 22:15:00 +0300
Subject: [PATCH 037/117] (#58) add test report to artifacts

---
 .github/workflows/android.yml | 6 ++++++
 .gitignore                    | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index adb02f97..e3b1873b 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -43,6 +43,12 @@ jobs:
         with:
           name: documentation-html
           path: app/build/dokka/
+      - name: Upload artifact (test reports)
+        uses: actions/upload-artifact@v1
+        with:
+          name: test-reports
+          path: app/build/reports/
+        if: always()
 
   static-check:
     runs-on: ubuntu-latest
diff --git a/.gitignore b/.gitignore
index ea14d43c..9544a0dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-# static check script
+# auto-generated scripts
 detekt
+android-wait-for-emulator
 
 # Created by https://www.toptal.com/developers/gitignore/api/androidstudio,android,gradle
 # Edit at https://www.toptal.com/developers/gitignore?templates=androidstudio,android,gradle

From 0e59fd4e8512990e40278e46d510d679b1c4c0dd Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Thu, 3 Sep 2020 22:31:56 +0300
Subject: [PATCH 038/117] #250 add MarkerSymbol type

---
 .../learnbraille/data/dsl/DslTest.kt          | 32 +++++++--
 .../learnbraille/data/dsl/Materials.kt        | 65 +++++++++++++++----
 .../data/entities/MaterialData.kt             |  8 +++
 .../learnbraille/res/Materials.kt             |  8 +++
 .../ui/screens/browser/BrowserFragment.kt     |  1 +
 .../ui/screens/theory/TheoryFreeNavigation.kt |  2 +
 6 files changed, 99 insertions(+), 17 deletions(-)

diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
index 9e20450c..6c12d212 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
@@ -5,15 +5,17 @@ import com.github.braillesystems.learnbraille.data.entities.*
 import com.github.braillesystems.learnbraille.data.entities.BrailleDot.E
 import com.github.braillesystems.learnbraille.data.entities.BrailleDot.F
 import com.github.braillesystems.learnbraille.res.DeckTags
+import com.github.braillesystems.learnbraille.res.MarkerType
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 private val content by materials {
     +ruSymbols
     +enSymbols
+    +markers1
+    +markers2
     // ...
 }
 
@@ -28,9 +30,16 @@ private val enSymbols by symbols(symbolType = "en") {
     // ...
 }
 
+private val markers1 by markers {
+    marker(MarkerType.Greek, BrailleDots(F, F, F, E, E, F))
+}
 
-val knownMaterials by known()
+private val markers2 by markers {
+    marker(MarkerType.Latin, BrailleDots(F, F, F, E, F, F))
+    marker(MarkerType.Capital, BrailleDots(F, E, F, F, E, F))
+}
 
+val knownMaterials by known()
 
 private val prepopulationData by data(
     materials = content,
@@ -136,32 +145,44 @@ private val users = listOf(
     User(0, "default2", ""),
     User(0, "default3", "")
 )
+
 private val mats = listOf(
     Material(1, Symbol(char = 'А', brailleDots = BrailleDots(F, E, E, E, E, E), type = "ru")),
     Material(2, Symbol(char = 'Б', brailleDots = BrailleDots(F, F, E, E, E, E), type = "ru")),
-    Material(3, Symbol(char = 'Z', brailleDots = BrailleDots(F, F, F, E, E, E), type = "en"))
+    Material(3, Symbol(char = 'Z', brailleDots = BrailleDots(F, F, F, E, E, E), type = "en")),
+    Material(4, MarkerSymbol(MarkerType.Greek, BrailleDots(F, F, F, E, E, F))),
+    Material(5, MarkerSymbol(MarkerType.Latin, BrailleDots(F, F, F, E, F, F))),
+    Material(6, MarkerSymbol(MarkerType.Capital, BrailleDots(F, E, F, F, E, F)))
 )
+
 private val decks = listOf(
     Deck(2, "Ru letters"),
     Deck(3, "En letters"),
     Deck(1, DeckTags.all)
 )
+
 private val cards = listOf(
     Card(2, 1),
     Card(2, 2),
     Card(3, 3),
     Card(1, 1),
     Card(1, 2),
-    Card(1, 3)
+    Card(1, 3),
+    Card(1, 4),
+    Card(1, 5),
+    Card(1, 6)
 )
+
 private val courses = listOf(
     Course(1, "Best course", "The best"),
     Course(2, "Worst course", "The worst")
 )
+
 private val lessons = listOf(
     Lesson(1, 1, "Wow", ""),
     Lesson(1, 2, "1", "")
 )
+
 private val steps = listOf(
     Step(1, 1, 1, FirstInfo("first")),
     Step(2, 1, 1, Info("with book")),
@@ -191,17 +212,18 @@ private val steps = listOf(
         LastInfo("LastInfo with stepId: 8, lessonId: 1, courseName: Worst course")
     )
 )
+
 private val stepAnnotations = listOf(
     StepAnnotation(1, "book"),
     StepAnnotation(2, "bomb")
 )
+
 private val stepHasAnnotations = listOf(
     StepHasAnnotation(1, 1, 2, 1),
     StepHasAnnotation(2, 1, 2, 1),
     StepHasAnnotation(2, 1, 2, 2)
 )
 
-
 @RunWith(AndroidJUnit4::class)
 class DslTest {
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt
index 82ee084c..031dd796 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Materials.kt
@@ -1,9 +1,7 @@
 package com.github.braillesystems.learnbraille.data.dsl
 
-import com.github.braillesystems.learnbraille.data.entities.BrailleDots
-import com.github.braillesystems.learnbraille.data.entities.KnownMaterial
-import com.github.braillesystems.learnbraille.data.entities.Material
-import com.github.braillesystems.learnbraille.data.entities.Symbol
+import com.github.braillesystems.learnbraille.data.entities.*
+import com.github.braillesystems.learnbraille.res.MarkerType
 import com.github.braillesystems.learnbraille.res.content
 import kotlin.reflect.KProperty
 
@@ -26,15 +24,27 @@ class MaterialsBuilder(block: MaterialsBuilder.() -> Unit) {
     val symbols: Map<Char, Material>
         get() = _symbols
 
+    private val _markers = mutableMapOf<MarkerType, Material>()
+    val markers: Map<MarkerType, Material>
+        get() = _markers
+
     init {
         block()
         _materials = materials.mapIndexed { index, material ->
             material.copy(id = index + 1L).apply {
-                if (data is Symbol) {
-                    require(!_symbols.contains(data.char)) {
-                        "Symbol (symbol = ${data.char}, type = ${data.type}) already exists"
+                when (data) {
+                    is Symbol -> {
+                        require(!_symbols.contains(data.char)) {
+                            "Symbol (symbol = ${data.char}, type = ${data.type}) already exists"
+                        }
+                        _symbols[data.char] = this
+                    }
+                    is MarkerSymbol -> {
+                        require(!_markers.contains(data.type)) {
+                            "Symbol (type = ${data.type}"
+                        }
+                        _markers[data.type] = this
                     }
-                    _symbols[data.char] = this
                 }
             }
         }.toMutableList()
@@ -45,8 +55,13 @@ class MaterialsBuilder(block: MaterialsBuilder.() -> Unit) {
             this@MaterialsBuilder._materials.add(Material(UNDEFINED_ID, symbol))
         }
     }
-}
 
+    operator fun MarkersBuilder.unaryPlus() {
+        markers.forEach { marker ->
+            this@MaterialsBuilder._materials.add(Material(UNDEFINED_ID, marker))
+        }
+    }
+}
 
 class symbols(private val symbolType: String, private val block: SymbolsBuilder.() -> Unit) {
 
@@ -76,6 +91,31 @@ class SymbolsBuilder(private val symbolType: String, block: SymbolsBuilder.() ->
     }
 }
 
+class markers(private val block: MarkersBuilder.() -> Unit) {
+
+    private var markers: MarkersBuilder? = null
+
+    operator fun getValue(thisRef: Any?, property: KProperty<*>) =
+        markers ?: MarkersBuilder(block).also { markers = it }
+}
+
+class MarkersBuilder(private val block: MarkersBuilder.() -> Unit) {
+
+    private val _map = mutableMapOf<MarkerType, MarkerSymbol>()
+    val map: Map<MarkerType, MarkerSymbol> get() = _map
+    internal val markers: List<MarkerSymbol>
+        get() = _map.values.toList()
+
+    init {
+        block()
+    }
+
+    operator fun get(type: MarkerType): MarkerSymbol? = _map[type]
+
+    fun marker(type: MarkerType, brailleDots: BrailleDots) {
+        _map[type] = MarkerSymbol(type, brailleDots)
+    }
+}
 
 class known(vararg chars: Char) {
 
@@ -83,7 +123,8 @@ class known(vararg chars: Char) {
     private var knownMaterials: List<KnownMaterial>? = null
 
     operator fun getValue(thisRef: Any?, property: KProperty<*>): List<KnownMaterial> =
-        knownMaterials ?: cs.map {
-            KnownMaterial(UNDEFINED_ID, content.symbols.getValue(it).id)
-        }.also { knownMaterials = it }
+        knownMaterials
+            ?: cs
+                .map { KnownMaterial(UNDEFINED_ID, content.symbols.getValue(it).id) }
+                .also { knownMaterials = it }
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/MaterialData.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/MaterialData.kt
index 541c184c..788b11ec 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/MaterialData.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/MaterialData.kt
@@ -1,6 +1,7 @@
 package com.github.braillesystems.learnbraille.data.entities
 
 import androidx.room.TypeConverter
+import com.github.braillesystems.learnbraille.res.MarkerType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UnstableDefault
@@ -29,3 +30,10 @@ data class Symbol(
     @SerialName("symbol_type")
     val type: SymbolType
 ) : MaterialData()
+
+@Serializable
+data class MarkerSymbol(
+    @SerialName("marker_type")
+    val type: MarkerType,
+    val brailleDots: BrailleDots
+) : MaterialData()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index 65e26b03..1fce11e1 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -9,6 +9,7 @@ import com.github.braillesystems.learnbraille.data.entities.BrailleDot.E
 import com.github.braillesystems.learnbraille.data.entities.BrailleDot.F
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.utils.rules
+import kotlinx.serialization.Serializable
 
 object SymbolType {
     const val ru = "ru"
@@ -16,6 +17,13 @@ object SymbolType {
     const val digit = "digit"
 }
 
+@Serializable
+enum class MarkerType {
+    Capital,
+    Greek,
+    Latin
+}
+
 /**
  * Do not forget to register print rules below for the new types of symbols.
  *
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
index 922bbb34..93d05cff 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
@@ -58,6 +58,7 @@ class BrowserFragment : AbstractFragmentWithHelp(R.string.browser_help) {
                         application.showSymbolPrintRules[item.data.char].toString(),
                         item.data.brailleDots.spelling
                     )
+                    else -> TODO()
                 }
                 clickListener = listener
             }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/TheoryFreeNavigation.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/TheoryFreeNavigation.kt
index 36cfb111..2d56ac0d 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/TheoryFreeNavigation.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/TheoryFreeNavigation.kt
@@ -27,9 +27,11 @@ fun getAction(step: Step): NavDirections =
             is ShowDots -> MenuFragmentDirections.actionGlobalShowDotsFragment(arg)
             is Input -> when (step.data.material.data) {
                 is Symbol -> MenuFragmentDirections.actionGlobalInputSymbolFragment(arg)
+                else -> TODO()
             }
             is Show -> when (step.data.material.data) {
                 is Symbol -> MenuFragmentDirections.actionGlobalShowSymbolFragment(arg)
+                else -> TODO()
             }
         }
     }

From dfd23df97f0c1ce97a9d3790dabb7d2f549cbf4b Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Thu, 3 Sep 2020 22:47:43 +0300
Subject: [PATCH 039/117] Fix detekt

---
 .github/workflows/android.yml                        |  2 +-
 .../braillesystems/learnbraille/utils/_KotlinTest.kt | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index e3b1873b..d0f8c236 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -54,7 +54,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Set up detekt
+      - name: Set up detekt # detekt gradle plugin uses newer gradle version then is used
         run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.12.0-RC1/detekt && chmod a+x detekt
       - name: Static check with detekt
         run: ./detekt -c detekt-config.yml --build-upon-default-config
diff --git a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
index 2fd15e23..712fb8ee 100644
--- a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
@@ -21,7 +21,7 @@ class KotlinTest {
 
     @Test
     fun retryNTest() {
-        fun getNextNumber(currentNumber: Int, nextNumbers: Array<Int>, repeat: Int): Int? {
+        fun getNextNumber(currentNumber: Int, nextNumbers: IntArray, repeat: Int): Int? {
             var i = 0
             fun getNextNumber(): Int {
                 return nextNumbers[i++]
@@ -33,10 +33,10 @@ class KotlinTest {
         }
 
         // Find first number in a sequence different from specified number
-        assertEquals(1, getNextNumber(0, arrayOf(1, 1, 1), 2))
-        assertEquals(2, getNextNumber(1, arrayOf(1, 2, 3), 2))
-        assertEquals(2, getNextNumber(1, arrayOf(1, 2, 3), 3))
-        assertEquals(null, getNextNumber(1, arrayOf(1, 2, 3), 1))
-        assertEquals(5, getNextNumber(0, arrayOf(0, 0, 0, 5, 1, 0, 4), 4))
+        assertEquals(1, getNextNumber(0, intArrayOf(1, 1, 1), 2))
+        assertEquals(2, getNextNumber(1, intArrayOf(1, 2, 3), 2))
+        assertEquals(2, getNextNumber(1, intArrayOf(1, 2, 3), 3))
+        assertEquals(null, getNextNumber(1, intArrayOf(1, 2, 3), 1))
+        assertEquals(5, getNextNumber(0, intArrayOf(0, 0, 0, 5, 1, 0, 4), 4))
     }
 }

From 7bb3601d2adadcfdd2a0778a3a5d1b59983886d3 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Thu, 3 Sep 2020 23:00:40 +0300
Subject: [PATCH 040/117] Remove wrong asinc test

---
 .../learnbraille/data/repository/ActionsRepositoryTest.kt    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepositoryTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepositoryTest.kt
index 5f9553f7..df040714 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepositoryTest.kt
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepositoryTest.kt
@@ -57,9 +57,4 @@ class ActionsRepositoryTest {
     fun getAll() = runBlocking {
         assertEquals(actions.toList(), repo.getActionsFrom(Days(100)))
     }
-
-    @Test
-    fun rejectLast() = runBlocking {
-        assertEquals(listOf(actions.first()), repo.getActionsFrom(Days(10)))
-    }
 }

From 46eb40e93fc6aea716161f5bc9434c946ad755e0 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Thu, 3 Sep 2020 23:16:20 +0300
Subject: [PATCH 041/117] Fix unit tests

---
 .../com/github/braillesystems/learnbraille/utils/_KotlinTest.kt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
index 712fb8ee..49cb95bf 100644
--- a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
@@ -1,12 +1,10 @@
 package com.github.braillesystems.learnbraille.utils
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
 class KotlinTest {
 
     @Test

From f3634e3e630d283d777645f9461057b3037ef6e1 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Thu, 3 Sep 2020 23:27:36 +0300
Subject: [PATCH 042/117] Autoformat

---
 .../com/github/braillesystems/learnbraille/utils/_KotlinTest.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
index 49cb95bf..b784b4f6 100644
--- a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
@@ -3,7 +3,6 @@ package com.github.braillesystems.learnbraille.utils
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class KotlinTest {
 

From bbc44889f826c2ae18d348baf098ac72aebd1ccb Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Fri, 4 Sep 2020 00:42:49 +0300
Subject: [PATCH 043/117] #250 add fragments to display markers

---
 .../learnbraille/LearnBrailleApplication.kt   |   5 +-
 .../learnbraille/res/Materials.kt             |  43 ++++++
 .../learnbraille/res/TestCourse.kt            |   6 +
 .../ui/screens/theory/TheoryFreeNavigation.kt |   4 +-
 .../theory/steps/InputMarkerFragment.kt       | 132 ++++++++++++++++++
 .../theory/steps/ShowMarkerFragment.kt        |  55 ++++++++
 .../layout/fragment_lessons_input_marker.xml  |  90 ++++++++++++
 .../layout/fragment_lessons_show_marker.xml   |  64 +++++++++
 app/src/main/res/navigation/navigation.xml    |  26 ++++
 app/src/main/res/values/strings.xml           |  35 +++++
 10 files changed, 456 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputMarkerFragment.kt
 create mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowMarkerFragment.kt
 create mode 100644 app/src/main/res/layout/fragment_lessons_input_marker.xml
 create mode 100644 app/src/main/res/layout/fragment_lessons_show_marker.xml

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
index 92c26699..bd8b863c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
@@ -2,7 +2,7 @@ package com.github.braillesystems.learnbraille
 
 import android.app.Application
 import com.github.braillesystems.learnbraille.data.db.LearnBrailleDatabase
-import com.github.braillesystems.learnbraille.data.dsl.UsersCourse
+import com.github.braillesystems.learnbraille.data.dsl.DevelopersCourse
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.data.repository.*
 import com.github.braillesystems.learnbraille.ui.screens.practice.CardViewModelFactory
@@ -116,4 +116,5 @@ class LearnBrailleApplication : Application() {
 lateinit var koin: Koin
     private set
 
-val COURSE = UsersCourse(2L)
+// TODO
+val COURSE = DevelopersCourse
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index 1fce11e1..36e44900 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -3,6 +3,7 @@ package com.github.braillesystems.learnbraille.res
 import android.content.Context
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.dsl.known
+import com.github.braillesystems.learnbraille.data.dsl.markers
 import com.github.braillesystems.learnbraille.data.dsl.materials
 import com.github.braillesystems.learnbraille.data.dsl.symbols
 import com.github.braillesystems.learnbraille.data.entities.BrailleDot.E
@@ -33,6 +34,7 @@ val content by materials {
     +ruSymbols
     +specialSymbols
     +uebDigits
+    +ms
 }
 
 val knownMaterials by known(
@@ -104,6 +106,40 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
     }
 )
 
+val Context.inputMarkerPrintRules by rules<Context, MarkerType, String>(
+    {
+        val s = getString(R.string.input_mod_capital)
+        MarkerType.Capital::equals to { _: MarkerType -> s }
+    },
+
+    {
+        val s = getString(R.string.input_mod_greek)
+        MarkerType.Greek::equals to { _: MarkerType -> s }
+    },
+
+    {
+        val s = getString(R.string.input_mod_latin)
+        MarkerType.Latin::equals to { _: MarkerType -> s }
+    }
+)
+
+val Context.showMarkerPrintRules by rules<Context, MarkerType, String>(
+    {
+        val s = getString(R.string.show_mod_capital)
+        MarkerType.Capital::equals to { _: MarkerType -> s }
+    },
+
+    {
+        val s = getString(R.string.show_mod_greek)
+        MarkerType.Greek::equals to { _: MarkerType -> s }
+    },
+
+    {
+        val s = getString(R.string.show_mod_latin)
+        MarkerType.Latin::equals to { _: MarkerType -> s }
+    }
+)
+
 private val ruSymbols by symbols(SymbolType.ru) {
     symbol(char = 'А', brailleDots = BrailleDots(F, E, E, E, E, E))
     symbol(char = 'Б', brailleDots = BrailleDots(F, F, E, E, E, E))
@@ -159,3 +195,10 @@ private val uebDigits by symbols(SymbolType.digit) {
     symbol(char = '9', brailleDots = BrailleDots(E, F, E, F, E, E))
     symbol(char = '0', brailleDots = BrailleDots(E, F, E, F, F, E))
 }
+
+// TODO fix braille dots
+private val ms by markers {
+    marker(MarkerType.Greek, BrailleDots(F, F, F, E, E, F))
+    marker(MarkerType.Latin, BrailleDots(F, F, F, E, F, F))
+    marker(MarkerType.Capital, BrailleDots(F, E, F, F, E, F))
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
index cfb1aeb1..a207f60c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
@@ -66,6 +66,12 @@ internal val testLessons by lessons {
                     буква А точечным шрифтом."""
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Input(content.symbols.getValue('А'))
+
+        // Testing marker symbols representation
+        val greek = content.markers.getValue(MarkerType.Greek)
+        +Show(greek)
+        +Input(greek)
+
         +Show(content.symbols.getValue('Б'))
         +Info(
             """Снова изучим страницу 13 в букваре. Под строкой с буквой А - 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/TheoryFreeNavigation.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/TheoryFreeNavigation.kt
index 2d56ac0d..d293e9f7 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/TheoryFreeNavigation.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/TheoryFreeNavigation.kt
@@ -27,11 +27,11 @@ fun getAction(step: Step): NavDirections =
             is ShowDots -> MenuFragmentDirections.actionGlobalShowDotsFragment(arg)
             is Input -> when (step.data.material.data) {
                 is Symbol -> MenuFragmentDirections.actionGlobalInputSymbolFragment(arg)
-                else -> TODO()
+                is MarkerSymbol -> MenuFragmentDirections.actionGlobalInputMarkerFragment(arg)
             }
             is Show -> when (step.data.material.data) {
                 is Symbol -> MenuFragmentDirections.actionGlobalShowSymbolFragment(arg)
-                else -> TODO()
+                is MarkerSymbol -> MenuFragmentDirections.actionGlobalShowMarkerFragment(arg)
             }
         }
     }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputMarkerFragment.kt
new file mode 100644
index 00000000..92e556d3
--- /dev/null
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputMarkerFragment.kt
@@ -0,0 +1,132 @@
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps
+
+import android.os.Bundle
+import android.os.Vibrator
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.getSystemService
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.ViewModelProvider
+import com.github.braillesystems.learnbraille.R
+import com.github.braillesystems.learnbraille.data.entities.BrailleDots
+import com.github.braillesystems.learnbraille.data.entities.Input
+import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
+import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputMarkerBinding
+import com.github.braillesystems.learnbraille.res.inputMarkerPrintRules
+import com.github.braillesystems.learnbraille.ui.screens.observeCheckedOnFly
+import com.github.braillesystems.learnbraille.ui.screens.observeEventHint
+import com.github.braillesystems.learnbraille.ui.screens.observeEventIncorrect
+import com.github.braillesystems.learnbraille.ui.screens.observeEventPassHint
+import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
+import com.github.braillesystems.learnbraille.ui.screens.theory.toNextStep
+import com.github.braillesystems.learnbraille.ui.screens.theory.toPrevStep
+import com.github.braillesystems.learnbraille.ui.showCorrectToast
+import com.github.braillesystems.learnbraille.ui.showHintToast
+import com.github.braillesystems.learnbraille.ui.showIncorrectToast
+import com.github.braillesystems.learnbraille.ui.views.*
+import com.github.braillesystems.learnbraille.utils.*
+import timber.log.Timber
+
+class InputMarkerFragment : AbstractStepFragment(R.string.lessons_help_input_marker) {
+
+    private lateinit var expectedDots: BrailleDots
+    private lateinit var dotsState: BrailleDotsState
+    private var userTouchedDots: Boolean = false
+    private var buzzer: Vibrator? = null
+    private lateinit var viewModel: InputViewModel
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ) = DataBindingUtil.inflate<FragmentLessonsInputMarkerBinding>(
+        inflater,
+        R.layout.fragment_lessons_input_marker,
+        container,
+        false
+    ).also { binding ->
+
+        Timber.i("Start initialize input dots fragment")
+
+        val step = getStepArg()
+        require(step.data is Input)
+        initialize(
+            step,
+            binding.prevButton,
+            binding.nextButton,
+            binding.hintButton
+        )
+
+        val data = step.data.material.data
+        require(data is MarkerSymbol)
+        val infoText = contextNotNull.inputMarkerPrintRules[data.type]
+            ?: error("No input print rules for marker: ${data.type}")
+        setText(
+            text = infoText,
+            infoTextView = binding.infoTextView
+        )
+        checkedAnnounce(infoText)
+        binding.brailleDots.dotsState.display(data.brailleDots)
+
+        updateTitle(getString(R.string.lessons_title_input_marker))
+
+        expectedDots = data.brailleDots
+        userTouchedDots = false
+        dotsState = binding.brailleDots.dotsState.apply {
+            uncheck()
+            clickable(true)
+            subscribe(View.OnClickListener {
+                userTouchedDots = true
+                viewModel.onSoftCheck()
+            })
+        }
+
+
+        val viewModelFactory = InputViewModelFactory(application, expectedDots) {
+            dotsState.brailleDots
+        }
+        viewModel = ViewModelProvider(
+            this@InputMarkerFragment, viewModelFactory
+        ).get(InputViewModel::class.java)
+        buzzer = activity?.getSystemService()
+
+
+        binding.inputViewModel = viewModel
+        binding.lifecycleOwner = this@InputMarkerFragment
+
+
+        binding.prevButton.setOnClickListener {
+            toPrevStep(step)
+        }
+
+        viewModel.observeCheckedOnFly(
+            viewLifecycleOwner, dotsState, buzzer,
+            block = { toNextStep(step, markThisAsPassed = true) },
+            softBlock = ::showCorrectToast
+        )
+
+        viewModel.observeEventIncorrect(
+            viewLifecycleOwner, dotsState
+        ) {
+            val notify = {
+                showIncorrectToast()
+                buzzer.checkedBuzz(preferenceRepository.incorrectBuzzPattern, preferenceRepository)
+            }
+            if (userTouchedDots) notify()
+            else toNextStep(step, markThisAsPassed = false) { notify() }
+        }
+
+        viewModel.observeEventHint(
+            viewLifecycleOwner, dotsState
+        ) {
+            showHintToast(expectedDots)
+            userTouchedDots = true
+        }
+
+        viewModel.observeEventPassHint(
+            viewLifecycleOwner, dotsState
+        )
+
+    }.root
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowMarkerFragment.kt
new file mode 100644
index 00000000..a3b8f721
--- /dev/null
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowMarkerFragment.kt
@@ -0,0 +1,55 @@
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.DataBindingUtil
+import com.github.braillesystems.learnbraille.R
+import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
+import com.github.braillesystems.learnbraille.data.entities.Show
+import com.github.braillesystems.learnbraille.databinding.FragmentLessonsShowMarkerBinding
+import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
+import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
+import com.github.braillesystems.learnbraille.ui.views.display
+import com.github.braillesystems.learnbraille.ui.views.dotsState
+import com.github.braillesystems.learnbraille.utils.checkedAnnounce
+import com.github.braillesystems.learnbraille.utils.contextNotNull
+import com.github.braillesystems.learnbraille.utils.get
+import timber.log.Timber
+
+class ShowMarkerFragment : AbstractStepFragment(R.string.lessons_help_show_marker) {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ) = DataBindingUtil.inflate<FragmentLessonsShowMarkerBinding>(
+        inflater,
+        R.layout.fragment_lessons_show_marker,
+        container,
+        false
+    ).also { binding ->
+
+        Timber.i("Initialize show marker fragment")
+
+        val step = getStepArg()
+        require(step.data is Show)
+        initialize(step, binding.prevButton, binding.nextButton)
+
+        val data = step.data.material.data
+        require(data is MarkerSymbol)
+        val infoText = contextNotNull.showMarkerPrintRules[data.type]
+            ?: error("No show print rules for marker: ${data.type}")
+        setText(
+            text = infoText,
+            infoTextView = binding.infoTextView
+        )
+        checkedAnnounce(infoText)
+        binding.brailleDots.dotsState.display(data.brailleDots)
+
+        updateTitle(getString(R.string.lessons_title_show_marker))
+        setPrevButton(binding.prevButton)
+        setNextButton(binding.nextButton)
+
+    }.root
+}
diff --git a/app/src/main/res/layout/fragment_lessons_input_marker.xml b/app/src/main/res/layout/fragment_lessons_input_marker.xml
new file mode 100644
index 00000000..2061f61c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_lessons_input_marker.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="inputViewModel"
+            type="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InputViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/info_text_view"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/lessons_dots_info_height"
+            android:text=""
+            android:textAlignment="center"
+            android:textSize="@dimen/lessons_info_text_size"
+            app:layout_constraintBottom_toTopOf="@+id/braille_dots"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="ИНФОРМАЦИЯ!" />
+
+        <com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
+            android:id="@+id/braille_dots"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleX="@dimen/braille_dots_scale_of_view"
+            android:scaleY="@dimen/braille_dots_scale_of_view"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="@dimen/practice_dots_vertical_bias" />
+
+        <!--        Buttons-->
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/hint_button"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_small_height"
+            android:contentDescription="@string/lessons_hint"
+            android:onClick="@{() -> inputViewModel.onHint()}"
+            android:paddingStart="@dimen/practice_buttons_icon_hint_padding"
+            android:paddingEnd="@dimen/practice_buttons_icon_hint_padding"
+            android:text="@string/practice_hint_icon_symbol"
+            android:textSize="@dimen/practice_buttons_icon_hint_size"
+            app:backgroundTint="@color/colorSecondary"
+            app:layout_constraintBottom_toTopOf="@+id/prev_button"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0"
+            app:shapeAppearanceOverlay="@style/sideLeftButtonsShape"
+            tools:ignore="SpUsage" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/prev_button"
+            style="@style/sideIconButtons"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_height"
+            android:contentDescription="@string/lessons_prev"
+            app:icon="@drawable/navigate_left"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="@dimen/practice_buttons_vertical_bias"
+            app:shapeAppearanceOverlay="@style/sideLeftButtonsShape" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/next_button"
+            style="@style/sideIconButtons"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_height"
+            android:contentDescription="@string/lessons_next"
+            android:onClick="@{() -> inputViewModel.onCheck()}"
+            app:icon="@drawable/navigate_right"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="@dimen/practice_buttons_vertical_bias"
+            app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/layout/fragment_lessons_show_marker.xml b/app/src/main/res/layout/fragment_lessons_show_marker.xml
new file mode 100644
index 00000000..da0af3fe
--- /dev/null
+++ b/app/src/main/res/layout/fragment_lessons_show_marker.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/info_text_view"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/lessons_dots_info_height"
+            android:text=""
+            android:textAlignment="center"
+            android:textSize="@dimen/lessons_info_text_size"
+            app:layout_constraintBottom_toTopOf="@+id/braille_dots"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="ИНФОРМАЦИЯ!" />
+
+        <com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
+            android:id="@+id/braille_dots"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleX="@dimen/braille_dots_scale_of_view"
+            android:scaleY="@dimen/braille_dots_scale_of_view"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="@dimen/practice_dots_vertical_bias" />
+
+        <!--        Buttons-->
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/prev_button"
+            style="@style/sideIconButtons"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_height"
+            android:contentDescription="@string/lessons_prev"
+            app:icon="@drawable/navigate_left"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="@dimen/practice_buttons_vertical_bias"
+            app:shapeAppearanceOverlay="@style/sideLeftButtonsShape" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/next_button"
+            style="@style/sideIconButtons"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_height"
+            android:contentDescription="@string/lessons_next"
+            app:icon="@drawable/navigate_right"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="@dimen/practice_buttons_vertical_bias"
+            app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
index 8c14e312..1f7fe2ef 100644
--- a/app/src/main/res/navigation/navigation.xml
+++ b/app/src/main/res/navigation/navigation.xml
@@ -207,4 +207,30 @@
         app:destination="@id/firstInfoFragment"
         app:popUpTo="@id/menuFragment" />
 
+    <fragment
+        android:id="@+id/inputMarkerFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InputMarkerFragment"
+        android:label="@string/lessons_title_input_marker">
+        <argument
+            android:name="step"
+            app:argType="string" />
+    </fragment>
+    <action
+        android:id="@+id/action_global_inputMarkerFragment"
+        app:destination="@id/inputMarkerFragment"
+        app:popUpTo="@id/menuFragment" />
+
+    <fragment
+        android:id="@+id/showMarkerFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.ShowMarkerFragment"
+        android:label="@string/lessons_title_show_marker">
+        <argument
+            android:name="step"
+            app:argType="string" />
+    </fragment>
+    <action
+        android:id="@+id/action_global_showMarkerFragment"
+        app:destination="@id/showMarkerFragment"
+        app:popUpTo="@id/menuFragment" />
+
 </navigation>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 88a37a7b..d2bfce8e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,6 +42,11 @@
     <string name="input_special_intro_hyphen">Введите символ: Дефис</string>
     <string name="input_special_intro_comma">Введите запятую</string>
 
+    <!--    TODO-->
+    <string name="input_mod_greek">Введите модификатор греческого</string>
+    <string name="input_mod_latin">Введите модификатор латинского</string>
+    <string name="input_mod_capital">Введите модификатор заглавной буквы</string>
+
     <string name="show_letter_intro_template">Буква %s</string>
     <string name="show_digit_intro_template">Цифра %s</string>
     <string name="show_special_intro_template">Символ %s</string>
@@ -50,6 +55,11 @@
     <string name="show_special_intro_hyphen">Дефис</string>
     <string name="show_special_intro_comma">Запятая</string>
 
+    <!--    TODO-->
+    <string name="show_mod_greek">Модификатор греческого</string>
+    <string name="show_mod_latin">Модификатор латинского</string>
+    <string name="show_mod_capital">Модификатор заглавной буквы</string>
+
     <!--    QR-->
 
     <string name="qr_intent_cancelled">Установите сканнер qr кодов и попробуйте снова</string>
@@ -192,6 +202,9 @@
     <string name="lessons_title_show_symbol">Изучение</string>
     <string name="lessons_title_show_dots">Точки</string>
     <string name="lessons_title_lessons_list">Уроки</string>
+    <!--    TODO-->
+    <string name="lessons_title_input_marker">Введите маркер</string>
+    <string name="lessons_title_show_marker">Маркерный символ</string>
 
     <string name="lessons_help_template">
         <![CDATA[
@@ -248,6 +261,19 @@
         ]]>
     </string>
 
+    <!--    TODO-->
+    <string name="lessons_help_input_marker">
+        <![CDATA[
+        Пошаговый курс - <b>шаг с вводом маркерного символа.</b>
+        <br><br>
+        Введите в шеститочии на экране точки с указанными номерами.
+        &<br>
+        Если нажать кнопку \"подсказка\", расположенную над кнопкой \"назад\", выведется сообщение
+        с правильным ответом и точки переключатся в правильное состояние. Чтобы пройти то же
+        упражнение после подсказки, нажмите кнопку \"вперёд\".
+        ]]>
+    </string>
+
     <string name="lessons_help_show_symbol">
         <![CDATA[
         Пошаговый курс - <b>шаг с демонстрацией символа.</b>
@@ -265,6 +291,15 @@
         ]]>
     </string>
 
+    <!--    TODO-->
+    <string name="lessons_help_show_marker">
+        <![CDATA[
+        Пошаговый курс - <b>шаг с демонстрацией маркерных символов.</b>
+        <br><br>
+        На экран выведен точечный символ. Внимательно изучите его.
+        ]]>
+    </string>
+
     <string name="lessons_help_info">
         <![CDATA[
         Пошаговый курс - <b>шаг с информационным сообщением.</b>

From 540fed0fe50276c3568b57dd10381620f026acd5 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Fri, 4 Sep 2020 19:37:39 +0300
Subject: [PATCH 044/117] (#250) fix special symbols representation

---
 .github/workflows/android.yml                 |  2 +-
 .../learnbraille/res/Materials.kt             | 31 +++++++++----------
 .../learnbraille/res/TestCourse.kt            |  4 ++-
 .../theory/steps/InputMarkerFragment.kt       |  2 +-
 .../theory/steps/ShowMarkerFragment.kt        |  2 +-
 app/src/main/res/navigation/navigation.xml    |  4 +--
 app/src/main/res/values/strings.xml           | 29 +++++++----------
 .../learnbraille/data/dsl/DslTest.kt          | 12 +++----
 8 files changed, 41 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index d0f8c236..c85e68ba 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -54,7 +54,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Set up detekt # detekt gradle plugin uses newer gradle version then is used
+      - name: Set up detekt # detekt gradle plugin uses newer gradle version than is used
         run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.12.0-RC1/detekt && chmod a+x detekt
       - name: Static check with detekt
         run: ./detekt -c detekt-config.yml --build-upon-default-config
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index 36e44900..19aa3463 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -20,9 +20,9 @@ object SymbolType {
 
 @Serializable
 enum class MarkerType {
-    Capital,
-    Greek,
-    Latin
+    RussianCapital,
+    GreekCapital,
+    LatinCapital
 }
 
 /**
@@ -108,35 +108,35 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
 
 val Context.inputMarkerPrintRules by rules<Context, MarkerType, String>(
     {
-        val s = getString(R.string.input_mod_capital)
-        MarkerType.Capital::equals to { _: MarkerType -> s }
+        val s = getString(R.string.input_mod_ru_capital)
+        MarkerType.RussianCapital::equals to { _: MarkerType -> s }
     },
 
     {
-        val s = getString(R.string.input_mod_greek)
-        MarkerType.Greek::equals to { _: MarkerType -> s }
+        val s = getString(R.string.input_mod_greek_capital)
+        MarkerType.GreekCapital::equals to { _: MarkerType -> s }
     },
 
     {
-        val s = getString(R.string.input_mod_latin)
-        MarkerType.Latin::equals to { _: MarkerType -> s }
+        val s = getString(R.string.input_mod_latin_capital)
+        MarkerType.LatinCapital::equals to { _: MarkerType -> s }
     }
 )
 
 val Context.showMarkerPrintRules by rules<Context, MarkerType, String>(
     {
         val s = getString(R.string.show_mod_capital)
-        MarkerType.Capital::equals to { _: MarkerType -> s }
+        MarkerType.RussianCapital::equals to { _: MarkerType -> s }
     },
 
     {
         val s = getString(R.string.show_mod_greek)
-        MarkerType.Greek::equals to { _: MarkerType -> s }
+        MarkerType.GreekCapital::equals to { _: MarkerType -> s }
     },
 
     {
         val s = getString(R.string.show_mod_latin)
-        MarkerType.Latin::equals to { _: MarkerType -> s }
+        MarkerType.LatinCapital::equals to { _: MarkerType -> s }
     }
 )
 
@@ -196,9 +196,8 @@ private val uebDigits by symbols(SymbolType.digit) {
     symbol(char = '0', brailleDots = BrailleDots(E, F, E, F, F, E))
 }
 
-// TODO fix braille dots
 private val ms by markers {
-    marker(MarkerType.Greek, BrailleDots(F, F, F, E, E, F))
-    marker(MarkerType.Latin, BrailleDots(F, F, F, E, F, F))
-    marker(MarkerType.Capital, BrailleDots(F, E, F, F, E, F))
+    marker(MarkerType.GreekCapital, BrailleDots(E, E, E, F, F, F))
+    marker(MarkerType.LatinCapital, BrailleDots(E, E, E, F, E, F))
+    marker(MarkerType.RussianCapital, BrailleDots(E, E, E, F, F, E))
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
index a207f60c..3865dc46 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
@@ -68,9 +68,11 @@ internal val testLessons by lessons {
         +Input(content.symbols.getValue('А'))
 
         // Testing marker symbols representation
-        val greek = content.markers.getValue(MarkerType.Greek)
+        val greek = content.markers.getValue(MarkerType.GreekCapital)
         +Show(greek)
         +Input(greek)
+        +Show(content.markers.getValue(MarkerType.LatinCapital))
+        +Show(content.markers.getValue(MarkerType.RussianCapital))
 
         +Show(content.symbols.getValue('Б'))
         +Info(
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputMarkerFragment.kt
index 92e556d3..f793ae5e 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputMarkerFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputMarkerFragment.kt
@@ -69,7 +69,7 @@ class InputMarkerFragment : AbstractStepFragment(R.string.lessons_help_input_mar
         checkedAnnounce(infoText)
         binding.brailleDots.dotsState.display(data.brailleDots)
 
-        updateTitle(getString(R.string.lessons_title_input_marker))
+        updateTitle(getString(R.string.lessons_title_input_symbol))
 
         expectedDots = data.brailleDots
         userTouchedDots = false
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowMarkerFragment.kt
index a3b8f721..4e02bb61 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowMarkerFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowMarkerFragment.kt
@@ -47,7 +47,7 @@ class ShowMarkerFragment : AbstractStepFragment(R.string.lessons_help_show_marke
         checkedAnnounce(infoText)
         binding.brailleDots.dotsState.display(data.brailleDots)
 
-        updateTitle(getString(R.string.lessons_title_show_marker))
+        updateTitle(getString(R.string.lessons_title_show_symbol))
         setPrevButton(binding.prevButton)
         setNextButton(binding.nextButton)
 
diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
index 1f7fe2ef..44c858fa 100644
--- a/app/src/main/res/navigation/navigation.xml
+++ b/app/src/main/res/navigation/navigation.xml
@@ -210,7 +210,7 @@
     <fragment
         android:id="@+id/inputMarkerFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InputMarkerFragment"
-        android:label="@string/lessons_title_input_marker">
+        android:label="@string/lessons_title_input_symbol">
         <argument
             android:name="step"
             app:argType="string" />
@@ -223,7 +223,7 @@
     <fragment
         android:id="@+id/showMarkerFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.ShowMarkerFragment"
-        android:label="@string/lessons_title_show_marker">
+        android:label="@string/lessons_title_show_symbol">
         <argument
             android:name="step"
             app:argType="string" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d2bfce8e..72239a84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,10 +42,9 @@
     <string name="input_special_intro_hyphen">Введите символ: Дефис</string>
     <string name="input_special_intro_comma">Введите запятую</string>
 
-    <!--    TODO-->
-    <string name="input_mod_greek">Введите модификатор греческого</string>
-    <string name="input_mod_latin">Введите модификатор латинского</string>
-    <string name="input_mod_capital">Введите модификатор заглавной буквы</string>
+    <string name="input_mod_greek_capital">Введите признак большой греческой буквы</string>
+    <string name="input_mod_latin_capital">Введите признак большой латинской буквы</string>
+    <string name="input_mod_ru_capital">Введите признак большой буквы русского алфавита</string>
 
     <string name="show_letter_intro_template">Буква %s</string>
     <string name="show_digit_intro_template">Цифра %s</string>
@@ -55,10 +54,9 @@
     <string name="show_special_intro_hyphen">Дефис</string>
     <string name="show_special_intro_comma">Запятая</string>
 
-    <!--    TODO-->
-    <string name="show_mod_greek">Модификатор греческого</string>
-    <string name="show_mod_latin">Модификатор латинского</string>
-    <string name="show_mod_capital">Модификатор заглавной буквы</string>
+    <string name="show_mod_greek">Признак большой греческой буквы</string>
+    <string name="show_mod_latin">Признак большой латинской буквы</string>
+    <string name="show_mod_capital">Признак большой буквы русского алфавита</string>
 
     <!--    QR-->
 
@@ -202,9 +200,6 @@
     <string name="lessons_title_show_symbol">Изучение</string>
     <string name="lessons_title_show_dots">Точки</string>
     <string name="lessons_title_lessons_list">Уроки</string>
-    <!--    TODO-->
-    <string name="lessons_title_input_marker">Введите маркер</string>
-    <string name="lessons_title_show_marker">Маркерный символ</string>
 
     <string name="lessons_help_template">
         <![CDATA[
@@ -261,12 +256,12 @@
         ]]>
     </string>
 
-    <!--    TODO-->
     <string name="lessons_help_input_marker">
         <![CDATA[
-        Пошаговый курс - <b>шаг с вводом маркерного символа.</b>
+        Пошаговый курс - <b>шаг с вводом специального символа.</b>
         <br><br>
-        Введите в шеститочии на экране точки с указанными номерами.
+        В верхней половине экрана дано описание символа, который нужно ввести в шеститочии
+        в нижней половине экрана.
         &<br>
         Если нажать кнопку \"подсказка\", расположенную над кнопкой \"назад\", выведется сообщение
         с правильным ответом и точки переключатся в правильное состояние. Чтобы пройти то же
@@ -291,12 +286,12 @@
         ]]>
     </string>
 
-    <!--    TODO-->
     <string name="lessons_help_show_marker">
         <![CDATA[
-        Пошаговый курс - <b>шаг с демонстрацией маркерных символов.</b>
+        Пошаговый курс - <b>шаг с демонстрацией специального символа.</b>
         <br><br>
-        На экран выведен точечный символ. Внимательно изучите его.
+        В верхней половине экрана словами описан специальный символ, а в шеститочии в нижней части
+         - его точечный состав. Внимательно изучите этот символ.
         ]]>
     </string>
 
diff --git a/app/src/test/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
index 250b0a7d..5b8780b6 100644
--- a/app/src/test/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
@@ -33,12 +33,12 @@ private val enSymbols by symbols(
 }
 
 private val markers1 by markers {
-    marker(MarkerType.Greek, BrailleDots(F, F, F, E, E, F))
+    marker(MarkerType.GreekCapital, BrailleDots(E, E, E, F, F, F))
 }
 
 private val markers2 by markers {
-    marker(MarkerType.Latin, BrailleDots(F, F, F, E, F, F))
-    marker(MarkerType.Capital, BrailleDots(F, E, F, F, E, F))
+    marker(MarkerType.LatinCapital, BrailleDots(E, E, E, F, E, F))
+    marker(MarkerType.RussianCapital, BrailleDots(E, E, E, F, F, E))
 }
 
 val knownMaterials by known()
@@ -156,9 +156,9 @@ private val mats = listOf(
     Material(1, Symbol(char = 'А', brailleDots = BrailleDots(F, E, E, E, E, E), type = "ru")),
     Material(2, Symbol(char = 'Б', brailleDots = BrailleDots(F, F, E, E, E, E), type = "ru")),
     Material(3, Symbol(char = 'Z', brailleDots = BrailleDots(F, F, F, E, E, E), type = "en")),
-    Material(4, MarkerSymbol(MarkerType.Greek, BrailleDots(F, F, F, E, E, F))),
-    Material(5, MarkerSymbol(MarkerType.Latin, BrailleDots(F, F, F, E, F, F))),
-    Material(6, MarkerSymbol(MarkerType.Capital, BrailleDots(F, E, F, F, E, F)))
+    Material(4, MarkerSymbol(MarkerType.GreekCapital, BrailleDots(E, E, E, F, F, F))),
+    Material(5, MarkerSymbol(MarkerType.LatinCapital, BrailleDots(E, E, E, F, E, F))),
+    Material(6, MarkerSymbol(MarkerType.RussianCapital, BrailleDots(E, E, E, F, F, E)))
 )
 
 private val decks = listOf(

From fb049f5ab1d786fd161ab058ea83c95451e6c5db Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Fri, 4 Sep 2020 21:48:03 +0300
Subject: [PATCH 045/117] #250 move NumberSign to markers

---
 .../braillesystems/learnbraille/res/Data.kt   |  8 ++++-
 .../learnbraille/res/GolubinaCourse.kt        | 34 +++++++++++--------
 .../learnbraille/res/Materials.kt             | 27 +++++++++------
 .../learnbraille/res/TestCourse.kt            |  2 +-
 .../ui/screens/practice/CardViewModel.kt      |  2 +-
 app/src/main/res/values/strings.xml           |  7 ++--
 6 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
index 0405004c..0c04949a 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import androidx.fragment.app.Fragment
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.dsl.data
+import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.utils.contextNotNull
 import com.github.braillesystems.learnbraille.utils.lazyWithContext
@@ -66,6 +67,9 @@ val prepopulationData by data(
         deck(DeckTags.special) { data ->
             data is Symbol && data.type == SymbolType.special
         }
+        deck(DeckTags.markers) {data ->
+            data is MarkerSymbol
+        }
         deck(DeckTags.digits) { data ->
             data is Symbol && data.type == SymbolType.digit
         }
@@ -80,6 +84,7 @@ object DeckTags {
     const val all = "all"
     const val ruLetters = "ru_letters"
     const val digits = "digits"
+    const val markers = "markers"
     const val special = "special"
 }
 
@@ -89,7 +94,8 @@ val Context.deckTagToName: Map<String, String> by lazyWithContext {
             all to getString(R.string.deck_name_all),
             ruLetters to getString(R.string.deck_name_ru_letters),
             digits to getString(R.string.deck_name_digits),
-            special to getString(R.string.deck_name_special_symbols)
+            markers to getString(R.string.deck_name_markers),
+            special to getString(R.string.deck_name_punctuation)
         )
     }
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index fb70f8d3..c90a5f14 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -215,19 +215,17 @@ internal val golubinaIntroLessons by lessons {
             """
                     Переходим к изучению цифр.
                     <br>
-                    Чтобы отличить цифры от букв, перед числами и цифрами ставится цифровой знак.
-                    Этот символ обозначается точками 3, 4, 5, 6.
-                    Когда нужно обозначить цифровой знак в обычном, плоскопечатном письме, 
-                    как правило, пользуются символом правой квадратной скобки: ]"""
+                    Чтобы отличить цифры от букв, перед числами и цифрами ставится <b>цифровой знак.</b>
+                    Этот символ обозначается точками 3, 4, 5, 6. """
         )
-        +Show(content.symbols.getValue(']'))
+        +Show(content.markers.getValue(MarkerType.NumberSign))
         +Info(
             """
                 В букваре на странице 14, перед страницей с буквами Ф и Г - цифровой знак.
                 Найдите четвёртую сверху строчку. В ней цифровой знак повторён пять раз.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
-        +Input(content.symbols.getValue(']')/*, repeat = 3*/)
+        +Input(content.markers.getValue(MarkerType.NumberSign))
         +Info(
             """
                     В следующих шагах изучим цифры 1, 2, 3, 4, 5, 6, 7.
@@ -288,7 +286,8 @@ internal val golubinaIntroLessons by lessons {
                цифровой знак.
             """
         )
-        inputChars("]123")
+        +Input(content.markers.getValue(MarkerType.NumberSign))
+        inputChars("123")
         +Info(
             """
                     Буква Х  обозначается точками 1, 2 и 5.
@@ -323,7 +322,8 @@ internal val golubinaIntroLessons by lessons {
                 Далее введите, поставив цифровой знак, число "Восемьсот семдесят шесть"
             """
         )
-        inputChars("]876")
+        +Input(content.markers.getValue(MarkerType.NumberSign))
+        inputChars("876")
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson пройден!
@@ -372,7 +372,8 @@ internal val golubinaIntroLessons by lessons {
         +Info(
             """Введите по символам число 850"""
         )
-        inputChars("]850")
+        +Input(content.markers.getValue(MarkerType.NumberSign))
+        inputChars("850")
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson закончен. Теперь Вы, помимо букв, знаете все цифры.
@@ -636,7 +637,8 @@ internal val golubinaIntroLessons by lessons {
         +Info(
             """Введите отдельными символами число 215, поставив перед ним цифровой знак"""
         )
-        inputChars("]215")
+        +Input(content.markers.getValue(MarkerType.NumberSign))
+        inputChars("215")
 
         +Info(
             """
@@ -799,7 +801,8 @@ internal val golubinaIntroLessons by lessons {
         +Info(
             """Теперь наберите число 870, сначала поставив цифровой знак"""
         )
-        inputChars("]870")
+        +Input(content.markers.getValue(MarkerType.NumberSign))
+        inputChars("870")
         +Info(
             """
                     Теперь рассмотрим букву 'Т'.
@@ -1034,7 +1037,8 @@ internal val golubinaIntroLessons by lessons {
         +Info(
             """Также в качестве повторения введите цифровой знак, а за ним число 964"""
         )
-        inputChars("]964")
+        +Input(content.markers.getValue(MarkerType.NumberSign))
+        inputChars("964")
         +Info(
             """
                     Переходим к главному в сегодняшнем уроке: ознакомимся с буквой 'И краткое'.
@@ -1165,7 +1169,8 @@ internal val golubinaIntroLessons by lessons {
             """Также повторим специальные символы.
                     Введите цифровой знак, запятую, дефис и точку"""
         )
-        inputChars("],-.")
+        +Input(content.markers.getValue(MarkerType.NumberSign))
+        inputChars(",-.")
         +Info(
             """
                     Переходим к изучению точечного состава буквы Ы.
@@ -1479,7 +1484,8 @@ internal val golubinaIntroLessons by lessons {
                     за ним число 1984
                     """
         )
-        inputChars("]1984")
+        +Input(content.markers.getValue(MarkerType.NumberSign))
+        inputChars("1984")
         +Info(
             """
                     Давайте изучим букву 'Э'.
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index 19aa3463..322fa0f6 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -22,7 +22,8 @@ object SymbolType {
 enum class MarkerType {
     RussianCapital,
     GreekCapital,
-    LatinCapital
+    LatinCapital,
+    NumberSign
 }
 
 /**
@@ -32,7 +33,7 @@ enum class MarkerType {
  */
 val content by materials {
     +ruSymbols
-    +specialSymbols
+    +punctuationSigns
     +uebDigits
     +ms
 }
@@ -61,13 +62,11 @@ val Context.inputSymbolPrintRules by rules<Context, Char, String>(
 
     {
         val other = getString(R.string.input_special_intro_template)
-        val numSign = getString(R.string.input_special_intro_num_sign)
         val dotIntro = getString(R.string.input_special_intro_dot)
         val commaIntro = getString(R.string.input_special_intro_comma)
         val hyphenIntro = getString(R.string.input_special_intro_hyphen)
-        specialSymbols.map::containsKey to { c: Char ->
+        punctuationSigns.map::containsKey to { c: Char ->
             when (c) {
-                ']' -> numSign
                 '.' -> dotIntro
                 ',' -> commaIntro
                 '-' -> hyphenIntro
@@ -90,13 +89,11 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
 
     {
         val other = getString(R.string.show_special_intro_template)
-        val numSign = getString(R.string.show_special_intro_num_sign)
         val dotIntro = getString(R.string.show_special_intro_dot)
         val commaIntro = getString(R.string.show_special_intro_comma)
         val hyphenIntro = getString(R.string.show_special_intro_hyphen)
-        specialSymbols.map::containsKey to { c: Char ->
+        punctuationSigns.map::containsKey to { c: Char ->
             when (c) {
-                ']' -> numSign
                 '.' -> dotIntro
                 ',' -> commaIntro
                 '-' -> hyphenIntro
@@ -120,6 +117,11 @@ val Context.inputMarkerPrintRules by rules<Context, MarkerType, String>(
     {
         val s = getString(R.string.input_mod_latin_capital)
         MarkerType.LatinCapital::equals to { _: MarkerType -> s }
+    },
+
+    {
+        val s = getString(R.string.input_mod_num_sign)
+        MarkerType.NumberSign::equals to { _: MarkerType -> s }
     }
 )
 
@@ -137,6 +139,11 @@ val Context.showMarkerPrintRules by rules<Context, MarkerType, String>(
     {
         val s = getString(R.string.show_mod_latin)
         MarkerType.LatinCapital::equals to { _: MarkerType -> s }
+    },
+
+    {
+        val s = getString(R.string.show_mod_num_sign)
+        MarkerType.NumberSign::equals to { _: MarkerType -> s }
     }
 )
 
@@ -176,8 +183,7 @@ private val ruSymbols by symbols(SymbolType.ru) {
     symbol(char = 'Я', brailleDots = BrailleDots(F, F, E, F, E, F))
 }
 
-private val specialSymbols by symbols(SymbolType.special) {
-    symbol(char = ']', brailleDots = BrailleDots(E, E, F, F, F, F)) // Number sign
+private val punctuationSigns by symbols(SymbolType.special) {
     symbol(char = ',', brailleDots = BrailleDots(E, F, E, E, E, E)) // Comma
     symbol(char = '-', brailleDots = BrailleDots(E, E, F, E, E, F)) // Hyphen
     symbol(char = '.', brailleDots = BrailleDots(E, F, E, E, F, F)) // Dot
@@ -200,4 +206,5 @@ private val ms by markers {
     marker(MarkerType.GreekCapital, BrailleDots(E, E, E, F, F, F))
     marker(MarkerType.LatinCapital, BrailleDots(E, E, E, F, E, F))
     marker(MarkerType.RussianCapital, BrailleDots(E, E, E, F, F, E))
+    marker(MarkerType.NumberSign, BrailleDots(E, E, F, F, F, F))
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
index 3865dc46..3ee3d5a1 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
@@ -88,7 +88,7 @@ internal val testLessons by lessons {
         +Input(content.symbols.getValue('Ц'))
 
         +Info("""Symbols of other types for testing""")
-        +Input(content.symbols.getValue(']'))
+        +Input(content.symbols.getValue(','))
         +Input(content.symbols.getValue('1'))
         +Input(content.symbols.getValue('2'))
         +Input(content.symbols.getValue('3'))
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
index 88155391..9b4b763f 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
@@ -109,7 +109,7 @@ class CardViewModel(
             materialsQueue.add(material.data)
         }
 
-        require(material.data is Symbol)
+        require(material.data is Symbol) // TODO #250 change for symbols desk
         material.data.run {
             _symbol.value = char.toString()
             expectedDots = brailleDots
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 72239a84..2e51f5c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,7 +37,6 @@
     <string name="input_letter_intro_template">Введите букву: %s</string>
     <string name="input_digit_intro_template">Введите цифру: %s</string>
     <string name="input_special_intro_template">Введите символ: %s</string>
-    <string name="input_special_intro_num_sign">Введите цифровой знак</string>
     <string name="input_special_intro_dot">Введите символ: Литературная точка</string>
     <string name="input_special_intro_hyphen">Введите символ: Дефис</string>
     <string name="input_special_intro_comma">Введите запятую</string>
@@ -45,11 +44,11 @@
     <string name="input_mod_greek_capital">Введите признак большой греческой буквы</string>
     <string name="input_mod_latin_capital">Введите признак большой латинской буквы</string>
     <string name="input_mod_ru_capital">Введите признак большой буквы русского алфавита</string>
+    <string name="input_mod_num_sign">Введите цифровой знак</string>
 
     <string name="show_letter_intro_template">Буква %s</string>
     <string name="show_digit_intro_template">Цифра %s</string>
     <string name="show_special_intro_template">Символ %s</string>
-    <string name="show_special_intro_num_sign">Цифровой знак</string>
     <string name="show_special_intro_dot">Литературная точка</string>
     <string name="show_special_intro_hyphen">Дефис</string>
     <string name="show_special_intro_comma">Запятая</string>
@@ -57,6 +56,7 @@
     <string name="show_mod_greek">Признак большой греческой буквы</string>
     <string name="show_mod_latin">Признак большой латинской буквы</string>
     <string name="show_mod_capital">Признак большой буквы русского алфавита</string>
+    <string name="show_mod_num_sign">Цифровой знак</string>
 
     <!--    QR-->
 
@@ -84,7 +84,8 @@
     <string name="deck_name_all">Все символы</string>
     <string name="deck_name_ru_letters">Русские буквы</string>
     <string name="deck_name_digits">Цифры</string>
-    <string name="deck_name_special_symbols">Специальные символы</string>
+    <string name="deck_name_punctuation">Знаки препинания</string>
+    <string name="deck_name_markers">Специальные символы</string>
 
 
     <string name="practice_help">

From 67588d771abfd9573032daa0db71754e42f4a637 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Fri, 4 Sep 2020 22:12:00 +0300
Subject: [PATCH 046/117] #250 add fragment for browser to display markers

---
 .../ui/screens/browser/BrowserFragment.kt     | 15 +++++--
 .../ui/screens/browser/MarkerViewFragment.kt  | 42 +++++++++++++++++++
 .../ui/screens/browser/SymbolViewFragment.kt  |  2 -
 .../main/res/layout/fragment_marker_view.xml  | 36 ++++++++++++++++
 app/src/main/res/navigation/navigation.xml    | 15 ++++++-
 app/src/main/res/values/strings.xml           | 11 +++++
 6 files changed, 115 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
 create mode 100644 app/src/main/res/layout/fragment_marker_view.xml

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
index 93d05cff..556657ed 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
@@ -7,12 +7,14 @@ import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.github.braillesystems.learnbraille.R
+import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
 import com.github.braillesystems.learnbraille.data.entities.Material
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.data.entities.spelling
 import com.github.braillesystems.learnbraille.data.repository.BrowserRepository
 import com.github.braillesystems.learnbraille.databinding.BrowserListItemBinding
 import com.github.braillesystems.learnbraille.databinding.FragmentBrowserBinding
+import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
 import com.github.braillesystems.learnbraille.res.showSymbolPrintRules
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
 import com.github.braillesystems.learnbraille.utils.*
@@ -46,7 +48,11 @@ class BrowserFragment : AbstractFragmentWithHelp(R.string.browser_help) {
                     when (item.data) {
                         is Symbol -> navigate(
                             BrowserFragmentDirections
-                                .actionBrowserFragmentToMaterialViewFragment(arg)
+                                .actionBrowserFragmentToSymbolViewFragment(arg)
+                        )
+                        is MarkerSymbol -> navigate(
+                            BrowserFragmentDirections
+                                .actionBrowserFragmentToMarkerViewFragment(arg)
                         )
                     }
                 }
@@ -55,10 +61,13 @@ class BrowserFragment : AbstractFragmentWithHelp(R.string.browser_help) {
                 this.item = item
                 materialText.text = when (item.data) {
                     is Symbol -> getString(R.string.browser_represent_template).format(
-                        application.showSymbolPrintRules[item.data.char].toString(),
+                        contextNotNull.showSymbolPrintRules[item.data.char].toString(),
+                        item.data.brailleDots.spelling
+                    )
+                    is MarkerSymbol -> getString(R.string.browser_represent_template).format(
+                        contextNotNull.showMarkerPrintRules[item.data.type].toString(),
                         item.data.brailleDots.spelling
                     )
-                    else -> TODO()
                 }
                 clickListener = listener
             }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
new file mode 100644
index 00000000..eca41d12
--- /dev/null
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
@@ -0,0 +1,42 @@
+package com.github.braillesystems.learnbraille.ui.screens.browser
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.DataBindingUtil
+import com.github.braillesystems.learnbraille.R
+import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
+import com.github.braillesystems.learnbraille.data.entities.Material
+import com.github.braillesystems.learnbraille.databinding.FragmentMarkerViewBinding
+import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
+import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
+import com.github.braillesystems.learnbraille.ui.views.display
+import com.github.braillesystems.learnbraille.ui.views.dotsState
+import com.github.braillesystems.learnbraille.utils.contextNotNull
+import com.github.braillesystems.learnbraille.utils.get
+import com.github.braillesystems.learnbraille.utils.getFragmentStringArg
+import com.github.braillesystems.learnbraille.utils.parse
+
+class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view_help) {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ) = DataBindingUtil.inflate<FragmentMarkerViewBinding>(
+        inflater,
+        R.layout.fragment_marker_view,
+        container,
+        false
+    ).also { binding ->
+
+        setHasOptionsMenu(true)
+
+        val m: Material = parse(Material.serializer(), getFragmentStringArg("material"))
+        require(m.data is MarkerSymbol)
+
+        binding.infoTextView.text = contextNotNull.showMarkerPrintRules[m.data.type]
+        binding.brailleDots.dotsState.display(m.data.brailleDots)
+
+    }.root
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
index 86c2ae1f..9e3213ea 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
@@ -13,7 +13,6 @@ import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.getFragmentStringArg
 import com.github.braillesystems.learnbraille.utils.parse
-import com.github.braillesystems.learnbraille.utils.title
 
 class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view_help) {
 
@@ -28,7 +27,6 @@ class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view
         false
     ).also { binding ->
 
-        title = getString(R.string.browser_symbol_view_title)
         setHasOptionsMenu(true)
 
         val m: Material = parse(Material.serializer(), getFragmentStringArg("material"))
diff --git a/app/src/main/res/layout/fragment_marker_view.xml b/app/src/main/res/layout/fragment_marker_view.xml
new file mode 100644
index 00000000..2697dfea
--- /dev/null
+++ b/app/src/main/res/layout/fragment_marker_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/info_text_view"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/lessons_dots_info_height"
+            android:text=""
+            android:textAlignment="center"
+            android:textSize="@dimen/lessons_info_text_size"
+            app:layout_constraintBottom_toTopOf="@+id/braille_dots"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="ИНФОРМАЦИЯ!" />
+
+        <com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
+            android:id="@+id/braille_dots"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleX="@dimen/braille_dots_scale_of_view"
+            android:scaleY="@dimen/braille_dots_scale_of_view"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="@dimen/practice_dots_vertical_bias" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
index 1f7fe2ef..e860cf59 100644
--- a/app/src/main/res/navigation/navigation.xml
+++ b/app/src/main/res/navigation/navigation.xml
@@ -91,8 +91,11 @@
         android:name="com.github.braillesystems.learnbraille.ui.screens.browser.BrowserFragment"
         android:label="@string/browser_title">
         <action
-            android:id="@+id/action_browserFragment_to_materialViewFragment"
+            android:id="@+id/action_browserFragment_to_symbolViewFragment"
             app:destination="@id/symbolViewFragment" />
+        <action
+            android:id="@+id/action_browserFragment_to_markerViewFragment"
+            app:destination="@id/markerViewFragment" />
     </fragment>
 
     <fragment
@@ -104,6 +107,16 @@
             app:argType="string" />
     </fragment>
 
+    <!--    TODO marker title -->
+    <fragment
+        android:id="@+id/markerViewFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.browser.MarkerViewFragment"
+        android:label="@string/browser_symbol_view_title">
+        <argument
+            android:name="material"
+            app:argType="string" />
+    </fragment>
+
     <fragment
         android:id="@+id/statsFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.stats.StatsFragment"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d2bfce8e..b614eeca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -375,6 +375,17 @@
         ]]>
     </string>
 
+    <!--    TODO-->
+    <string name="browser_marker_view_help">
+        <![CDATA[
+        В верхней половине экр(ана выведен \"зрячий\" (плоскопечатный) символ, в нижней половине -
+        его точечный состав.
+        &<br>
+        Из этого раздела можно выйти обратно к списку символов, нажав кнопку <b>\"Перейти вверх\"</b>
+        в левом верхнем углу экрана.
+        ]]>
+    </string>
+
     <!--    Settings-->
 
     <string name="preferences_actionbar_title">Настройки</string>

From 75be1c68fba6a76935a97ca7810187cc788a3f34 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 5 Sep 2020 13:15:49 +0300
Subject: [PATCH 047/117] #250 change browser marker view help

---
 app/src/main/res/values/strings.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aafc8f68..2408e703 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -363,7 +363,7 @@
 
     <string name="browser_symbol_view_help">
         <![CDATA[
-        В верхней половине экр(ана выведен \"зрячий\" (плоскопечатный) символ, в нижней половине -
+        В верхней половине экрана выведен \"зрячий\" (плоскопечатный) символ, в нижней половине -
         его точечный состав.
         &<br>
         Из этого раздела можно выйти обратно к списку символов, нажав кнопку <b>\"Перейти вверх\"</b>
@@ -371,10 +371,9 @@
         ]]>
     </string>
 
-    <!--    TODO-->
     <string name="browser_marker_view_help">
         <![CDATA[
-        В верхней половине экр(ана выведен \"зрячий\" (плоскопечатный) символ, в нижней половине -
+        В верхней половине экрана текст - описание символа, в нижней половине -
         его точечный состав.
         &<br>
         Из этого раздела можно выйти обратно к списку символов, нажав кнопку <b>\"Перейти вверх\"</b>

From b1cccd58719aea729fd3240f7e1993c05d58031f Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 5 Sep 2020 13:29:28 +0300
Subject: [PATCH 048/117] #250 resolve UI-related TODOs

---
 .../braillesystems/learnbraille/LearnBrailleApplication.kt   | 5 ++---
 app/src/main/res/navigation/navigation.xml                   | 1 -
 app/src/main/res/values/strings.xml                          | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
index bd8b863c..92c26699 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
@@ -2,7 +2,7 @@ package com.github.braillesystems.learnbraille
 
 import android.app.Application
 import com.github.braillesystems.learnbraille.data.db.LearnBrailleDatabase
-import com.github.braillesystems.learnbraille.data.dsl.DevelopersCourse
+import com.github.braillesystems.learnbraille.data.dsl.UsersCourse
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.data.repository.*
 import com.github.braillesystems.learnbraille.ui.screens.practice.CardViewModelFactory
@@ -116,5 +116,4 @@ class LearnBrailleApplication : Application() {
 lateinit var koin: Koin
     private set
 
-// TODO
-val COURSE = DevelopersCourse
+val COURSE = UsersCourse(2L)
diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
index fe7e116a..1468cd1d 100644
--- a/app/src/main/res/navigation/navigation.xml
+++ b/app/src/main/res/navigation/navigation.xml
@@ -107,7 +107,6 @@
             app:argType="string" />
     </fragment>
 
-    <!--    TODO marker title -->
     <fragment
         android:id="@+id/markerViewFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.browser.MarkerViewFragment"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2408e703..1447e195 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -373,7 +373,7 @@
 
     <string name="browser_marker_view_help">
         <![CDATA[
-        В верхней половине экрана текст - описание символа, в нижней половине -
+        В верхней половине экрана выведен текст - описание символа, в нижней половине -
         его точечный состав.
         &<br>
         Из этого раздела можно выйти обратно к списку символов, нажав кнопку <b>\"Перейти вверх\"</b>

From a619d62796204a46b215cfd12781add0a1580903 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 5 Sep 2020 13:32:44 +0300
Subject: [PATCH 049/117] (#255) disable artifacts generation when workflow
 cancelled

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index d0f8c236..4fa9c1e3 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -48,7 +48,7 @@ jobs:
         with:
           name: test-reports
           path: app/build/reports/
-        if: always()
+        if: success() || failure()
 
   static-check:
     runs-on: ubuntu-latest

From 81c247dc41a6cf6a41523de26e2588f19598af1e Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 5 Sep 2020 15:01:37 +0300
Subject: [PATCH 050/117] #239 introduce SlateAndStylus steps

---
 .../data/repository/PreferenceRepository.kt     |  8 ++++++++
 .../data/repository/TheoryRepository.kt         | 17 +++++++++++++----
 .../braillesystems/learnbraille/res/Data.kt     |  1 +
 app/src/main/res/values/strings.xml             |  7 ++++++-
 app/src/main/res/xml/settings_hierarchy.xml     |  8 ++++++++
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
index 4bbfb4d6..3992969e 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
@@ -18,6 +18,7 @@ interface PreferenceRepository {
     val brailleTrainerEnabled: Boolean get() = false // Uncomment in android manifest when set true
     val speechRecognitionEnabled: Boolean
     val golubinaBookStepsEnabled: Boolean
+    val slateStylusStepsEnabled: Boolean
     val traverseDotsInEnumerationOrder: Boolean
     val inputOnFlyCheck: Boolean
     val additionalAnnouncementsEnabled: Boolean
@@ -72,6 +73,13 @@ class PreferenceRepositoryImpl(
         )
     }
 
+    override val slateStylusStepsEnabled: Boolean by logged {
+        context.preferences.getBoolean(
+            context.getString(R.string.preference_slate_stylus_steps_enabled),
+            true
+        )
+    }
+
     override val traverseDotsInEnumerationOrder: Boolean by logged {
         context.preferences.getBoolean(
             context.getString(R.string.preference_traverse_dots_in_enumeration_order),
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
index e889e353..fe192a5c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
@@ -3,6 +3,7 @@ package com.github.braillesystems.learnbraille.data.repository
 import com.github.braillesystems.learnbraille.data.entities.*
 import com.github.braillesystems.learnbraille.res.StepAnnotation
 import com.github.braillesystems.learnbraille.utils.devnull
+import com.github.braillesystems.learnbraille.utils.runIf
 import com.github.braillesystems.learnbraille.utils.scope
 import kotlinx.coroutines.launch
 
@@ -30,11 +31,19 @@ class TheoryRepositoryImpl(
     private val actionsRepository: MutableActionsRepository
 ) : MutableTheoryRepository {
 
+    private fun getProscribedAnnotation(): List<String> {
+        val result = arrayListOf<String>()
+        listOf(
+            !preferenceRepository.golubinaBookStepsEnabled to StepAnnotation.golubinaBookRequired,
+            !preferenceRepository.slateStylusStepsEnabled to StepAnnotation.slateStylusRequired
+        ).forEach {
+            runIf (it.first) { result.add(it.second) }
+        }
+        return result
+    }
+
     private val proscribedAnnotations
-        get() = listOfNotNull(
-            if (preferenceRepository.golubinaBookStepsEnabled) null
-            else StepAnnotation.golubinaBookRequired
-        )
+        get() = getProscribedAnnotation()
 
     @Suppress("ReturnCount")
     override suspend fun getNextStepAndUpdate(thisStep: Step, markThisAsPassed: Boolean): Step? {
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
index eec208e9..a4f175fe 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
@@ -90,6 +90,7 @@ val prepopulationData by data(
 
 object StepAnnotation {
     const val golubinaBookRequired = "golubina_book_required"
+    const val slateStylusRequired = "brl_slate_stylus_required"
 }
 
 object DeckTags {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fe21c2c7..7a7d10ee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,6 +16,7 @@
     <string name="preference_current_user">current_user</string>
     <string name="preference_speech_recognition_enabled">speech_recognition_enabled</string>
     <string name="preference_golubina_book_steps_enabled">golubina_book_steps_enabled</string>
+    <string name="preference_slate_stylus_steps_enabled">slate_stylus_steps_enabled</string>
     <string name="preference_traverse_dots_in_enumeration_order">traverse_dots_in_enumeration_order</string>
     <string name="preference_enable_additional_announcements">enable_additional_announcements</string>
     <string name="preference_practice_use_only_known_materials">practice_use_only_known_materials</string>
@@ -404,10 +405,14 @@
     <string name="preference_title_notifications">Всплывающие уведомления</string>
     <string name="preference_title_buzz">Вибрация</string>
     <string name="preference_summary_buzz">Вибрация в ответ на результат выполнения задания.</string>
-    <string name="preference_title_use_golubina_textbook">Шаги с букварём</string>
+    <string name="preference_title_use_golubina_textbook">Шаги с бумажным пособием</string>
+    <string name="preference_title_use_slate_stylus">Шаги с брайлевским прибором</string>
     <string name="preference_summary_use_golubina_textbook">
         Показывать шаги с обращением к бумажному букварю Голубиной в теоретическом курсе.
     </string>
+    <string name="preference_summary_use_slate_stylus">
+        Показывать шаги для выполнения с брайлевским прибором в теоретическом курсе.
+    </string>
     <string name="preference_summary_notifications">Включить/отключить краткие всплывающие
         подсказки (кроме самых важных).</string>
     <string name="preference_title_traversal_order">Обход точек в порядке нумерации</string>
diff --git a/app/src/main/res/xml/settings_hierarchy.xml b/app/src/main/res/xml/settings_hierarchy.xml
index 351636e8..cd03ee29 100644
--- a/app/src/main/res/xml/settings_hierarchy.xml
+++ b/app/src/main/res/xml/settings_hierarchy.xml
@@ -25,6 +25,14 @@
         android:title="@string/preference_title_use_golubina_textbook"
         app:iconSpaceReserved="false" />
 
+    <androidx.preference.SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:key="@string/preference_slate_stylus_steps_enabled"
+        android:summary="@string/preference_summary_use_slate_stylus"
+        android:theme="@style/SwitchPreferenceButton"
+        android:title="@string/preference_title_use_slate_stylus"
+        app:iconSpaceReserved="false" />
+
     <androidx.preference.SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="@string/preference_additional_qrcode_button_enabled"

From fbf832b7e94eb563e613f24e5d5ee6bd020abca7 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 5 Sep 2020 15:06:11 +0300
Subject: [PATCH 051/117] #241 add special captions for punctuation signs

---
 .../com/github/braillesystems/learnbraille/res/Materials.kt  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index a3a25575..6f13a73e 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -134,6 +134,11 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
 )
 
 fun getCaptionTitleId(symbol: Symbol): Int {
+    when(symbol.char) {
+        '.' -> return R.string.show_special_intro_dot
+        ',' -> return R.string.show_special_intro_comma
+        '-' -> return R.string.show_special_intro_hyphen
+    }
     return when (symbol.type) {
         SymbolType.ru -> R.string.letter_caption_ru
         SymbolType.greek -> R.string.letter_caption_greek

From cbfe5337f3b15cf07588b716f0fb91b347fc1e41 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 5 Sep 2020 17:17:35 +0300
Subject: [PATCH 052/117] #241 change texts slightly

---
 .../braillesystems/learnbraille/res/Materials.kt     | 12 ++++++++----
 app/src/main/res/values/strings.xml                  |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index 6f13a73e..aee6f400 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -134,10 +134,14 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
 )
 
 fun getCaptionTitleId(symbol: Symbol): Int {
-    when(symbol.char) {
-        '.' -> return R.string.show_special_intro_dot
-        ',' -> return R.string.show_special_intro_comma
-        '-' -> return R.string.show_special_intro_hyphen
+    val specialCaptionId = when(symbol.char) {
+        '.' -> R.string.show_special_intro_dot
+        ',' -> R.string.show_special_intro_comma
+        '-' -> R.string.show_special_intro_hyphen
+        else -> null
+    }
+    if (specialCaptionId != null) {
+        return specialCaptionId
     }
     return when (symbol.type) {
         SymbolType.ru -> R.string.letter_caption_ru
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a7d10ee..e3c4550b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -118,7 +118,7 @@
         <b>Выход в меню</b> приложения - кнопка вверху слева.
         &<br>
         <b>Список колод</b> - кнопка вверху справа.
-        &<br>
+        <br>
         Карточки объединены в колоды по типам символов, например, колода русских букв, колода цифр.
         Эта кнопка ведёт в меню выбора колоды.
         &<br>
@@ -220,7 +220,7 @@
     <string name="lessons_help_template">
         <![CDATA[
         %s
-        &<br><br><br>
+        &<br>
         %s
         ]]>
     </string>
@@ -408,7 +408,7 @@
     <string name="preference_title_use_golubina_textbook">Шаги с бумажным пособием</string>
     <string name="preference_title_use_slate_stylus">Шаги с брайлевским прибором</string>
     <string name="preference_summary_use_golubina_textbook">
-        Показывать шаги с обращением к бумажному букварю Голубиной в теоретическом курсе.
+        Показывать шаги с обращением к бумажному пособию Голубиной в теоретическом курсе.
     </string>
     <string name="preference_summary_use_slate_stylus">
         Показывать шаги для выполнения с брайлевским прибором в теоретическом курсе.

From 2c6e36664832bad3180dc77f3619bc7c05239190 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 5 Sep 2020 19:33:28 +0300
Subject: [PATCH 053/117] (#224) add all symbols that will be in the course

---
 .../braillesystems/learnbraille/res/Data.kt   |  18 +-
 .../learnbraille/res/Materials.kt             | 192 ++++++++++++++++--
 app/src/main/res/values/strings.xml           |  45 ++++
 3 files changed, 237 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
index a4f175fe..457b4b18 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
@@ -61,11 +61,11 @@ val prepopulationData by data(
         // All cards deck should always exist and be first in the list
         deck(DeckTags.all) { true }
         deck(DeckTags.allWithRus) { data ->
-            data is Symbol && data.type in listOf(
-                SymbolType.ru,
-                SymbolType.special,
-                SymbolType.digit
+            data is Symbol && data.type !in listOf(
+                SymbolType.greek,
+                SymbolType.latin
             )
+                    || data !is Symbol
         }
         deck(DeckTags.ruLetters) { data ->
             data is Symbol && data.type == SymbolType.ru
@@ -79,12 +79,16 @@ val prepopulationData by data(
         deck(DeckTags.special) { data ->
             data is Symbol && data.type == SymbolType.special
         }
-        deck(DeckTags.markers) {data ->
+        deck(DeckTags.markers) { data ->
             data is MarkerSymbol
         }
         deck(DeckTags.digits) { data ->
             data is Symbol && data.type == SymbolType.digit
         }
+        deck(DeckTags.math) {data ->
+            data is Symbol && data.type == SymbolType.math
+        }
+
     }
 }
 
@@ -102,6 +106,7 @@ object DeckTags {
     const val digits = "digits"
     const val markers = "markers"
     const val special = "special"
+    const val math = "math"
 }
 
 val Context.deckTagToName: Map<String, String> by lazyWithContext {
@@ -114,7 +119,8 @@ val Context.deckTagToName: Map<String, String> by lazyWithContext {
             greekLetters to getString(R.string.deck_name_greek_letters),
             digits to getString(R.string.deck_name_digits),
             markers to getString(R.string.deck_name_markers),
-            special to getString(R.string.deck_name_punctuation)
+            special to getString(R.string.deck_name_punctuation),
+            math to getString(R.string.deck_name_math)
         )
     }
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index aee6f400..7ab43e6d 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -15,10 +15,11 @@ import kotlinx.serialization.Serializable
 
 object SymbolType {
     const val ru = "ru"
+    const val digit = "digit"
     const val latin = "Latin"
     const val greek = "greek"
     const val special = "special"
-    const val digit = "digit"
+    const val math = "math"
 }
 
 @Serializable
@@ -26,6 +27,9 @@ enum class MarkerType {
     RussianCapital,
     GreekCapital,
     LatinCapital,
+    LatinSmall,
+    BoldFont,
+    ItalicFont,
     NumberSign
 }
 
@@ -35,7 +39,7 @@ enum class MarkerType {
  * Always use this variable to get materials.
  */
 
-// TODO write a migration for lat, greek
+// TODO write a migration for lat, greek, etc
 
 val content by materials {
     +ruSymbols
@@ -43,6 +47,7 @@ val content by materials {
     +uebDigits
     +latinLetters
     +greekLetters
+    +mathSigns
     +ms
 }
 
@@ -83,11 +88,54 @@ val Context.inputSymbolPrintRules by rules<Context, Char, String>(
         val dotIntro = getString(R.string.input_special_intro_dot)
         val commaIntro = getString(R.string.input_special_intro_comma)
         val hyphenIntro = getString(R.string.input_special_intro_hyphen)
+        val exclamationIntro = getString(R.string.input_special_intro_exclamation)
+        val questionIntro = getString(R.string.input_special_intro_question)
+        val quotationLeftIntro = getString(R.string.input_special_intro_quotation_left)
+        val quotationRightIntro = getString(R.string.input_special_intro_quotation_right)
+        val parenthesisLeftIntro = getString(R.string.input_special_intro_parenthesis_left)
+        val parenthesisRightIntro = getString(R.string.input_special_intro_parenthesis_right)
+        val asteriskIntro = getString(R.string.input_special_intro_asterisk)
+        val colonIntro = getString(R.string.input_special_intro_colon)
+        val semicolonIntro = getString(R.string.input_special_intro_semicolon)
+        val stressIntro = getString(R.string.input_special_intro_stress)
         punctuationSigns.map::containsKey to { c: Char ->
             when (c) {
                 '.' -> dotIntro
                 ',' -> commaIntro
-                '-' -> hyphenIntro
+                '—' -> hyphenIntro
+                '!' -> exclamationIntro
+                '?' -> questionIntro
+                '«' -> quotationLeftIntro
+                '»' -> quotationRightIntro
+                '(' -> parenthesisLeftIntro
+                ')' -> parenthesisRightIntro
+                '*' -> asteriskIntro
+                ':' -> colonIntro
+                ';' -> semicolonIntro
+                '\'' -> stressIntro
+                else -> other.format(c)
+            }
+        }
+    },
+
+    {
+        val other = getString(R.string.input_math_intro_template)
+        val plusIntro = getString(R.string.input_math_plus)
+        val minusIntro = getString(R.string.input_math_minus)
+        val dotMultIntro = getString(R.string.input_math_dot_mult)
+        val crossMultIntro = getString(R.string.input_math_cross_mult)
+        val fracDivisionIntro = getString(R.string.input_math_division_fraction)
+        val divisionIntro = getString(R.string.input_math_division)
+        val equalityIntro = getString(R.string.input_math_equality)
+        mathSigns.map::containsKey to { c: Char ->
+            when (c) {
+                '+' -> plusIntro
+                '-' -> minusIntro
+                '·' -> dotMultIntro
+                '✕' -> crossMultIntro
+                '/' -> fracDivisionIntro
+                '÷' -> divisionIntro
+                '=' -> equalityIntro
                 else -> other.format(c)
             }
         }
@@ -95,7 +143,6 @@ val Context.inputSymbolPrintRules by rules<Context, Char, String>(
 )
 
 val Context.showSymbolPrintRules by rules<Context, Char, String>(
-    // TODO reduce repeated code
 
     {
         val t = getString(R.string.show_letter_intro_template)
@@ -122,24 +169,87 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
         val dotIntro = getString(R.string.show_special_intro_dot)
         val commaIntro = getString(R.string.show_special_intro_comma)
         val hyphenIntro = getString(R.string.show_special_intro_hyphen)
+        val exclamationIntro = getString(R.string.show_special_intro_exclamation)
+        val questionIntro = getString(R.string.show_special_intro_question)
+        val quotationLeftIntro = getString(R.string.show_special_intro_quotation_left)
+        val quotationRightIntro = getString(R.string.show_special_intro_quotation_right)
+        val parenthesisLeftIntro = getString(R.string.show_special_intro_parenthesis_left)
+        val parenthesisRightIntro = getString(R.string.show_special_intro_parenthesis_right)
+        val asteriskIntro = getString(R.string.show_special_intro_asterisk)
+        val colonIntro = getString(R.string.show_special_intro_colon)
+        val semicolonIntro = getString(R.string.show_special_intro_semicolon)
+        val stressIntro = getString(R.string.show_special_intro_stress)
         punctuationSigns.map::containsKey to { c: Char ->
             when (c) {
                 '.' -> dotIntro
                 ',' -> commaIntro
-                '-' -> hyphenIntro
+                '—' -> hyphenIntro
+                '!' -> exclamationIntro
+                '?' -> questionIntro
+                '«' -> quotationLeftIntro
+                '»' -> quotationRightIntro
+                '(' -> parenthesisLeftIntro
+                ')' -> parenthesisRightIntro
+                '*' -> asteriskIntro
+                ':' -> colonIntro
+                ';' -> semicolonIntro
+                '\'' -> stressIntro
+                else -> other.format(c)
+            }
+        }
+    },
+
+    {
+        val other = getString(R.string.show_math_intro_template)
+        val plusIntro = getString(R.string.show_math_plus)
+        val minusIntro = getString(R.string.show_math_minus)
+        val dotMultIntro = getString(R.string.show_math_dot_mult)
+        val crossMultIntro = getString(R.string.show_math_cross_mult)
+        val fracDivisionIntro = getString(R.string.show_math_division_fraction)
+        val divisionIntro = getString(R.string.show_math_division)
+        val equalityIntro = getString(R.string.show_math_equality)
+        mathSigns.map::containsKey to { c: Char ->
+            when (c) {
+                '+' -> plusIntro
+                '-' -> minusIntro
+                '·' -> dotMultIntro
+                '✕' -> crossMultIntro
+                '/' -> fracDivisionIntro
+                '÷' -> divisionIntro
+                '=' -> equalityIntro
                 else -> other.format(c)
             }
         }
     }
 )
 
+fun getSpecialCaptionId(symbol: Symbol): Int? {
+    val specialCaptions = mapOf(
+        '.' to R.string.show_special_intro_dot, ',' to R.string.show_special_intro_comma,
+        '—' to R.string.show_special_intro_hyphen,
+        '!' to R.string.show_special_intro_exclamation,
+        '?' to R.string.show_special_intro_question,
+        '«' to R.string.show_special_intro_quotation_left,
+        '»' to R.string.show_special_intro_quotation_right,
+        '(' to R.string.show_special_intro_parenthesis_left,
+        ')' to R.string.show_special_intro_parenthesis_right,
+        '*' to R.string.show_special_intro_asterisk,
+        ':' to R.string.show_special_intro_colon,
+        ';' to R.string.show_special_intro_semicolon,
+        '\'' to R.string.show_special_intro_stress,
+        '+' to R.string.show_math_plus,
+        '-' to R.string.show_math_minus,
+        '·' to R.string.show_math_dot_mult,
+        '✕' to R.string.show_math_cross_mult,
+        '/' to R.string.show_math_division_fraction,
+        '÷' to R.string.show_math_division,
+        '=' to R.string.show_math_equality
+    )
+    return if (specialCaptions.containsKey(symbol.char)) specialCaptions[symbol.char] else null
+}
+
 fun getCaptionTitleId(symbol: Symbol): Int {
-    val specialCaptionId = when(symbol.char) {
-        '.' -> R.string.show_special_intro_dot
-        ',' -> R.string.show_special_intro_comma
-        '-' -> R.string.show_special_intro_hyphen
-        else -> null
-    }
+    val specialCaptionId = getSpecialCaptionId(symbol)
     if (specialCaptionId != null) {
         return specialCaptionId
     }
@@ -169,6 +279,21 @@ val Context.inputMarkerPrintRules by rules<Context, MarkerType, String>(
         MarkerType.LatinCapital::equals to { _: MarkerType -> s }
     },
 
+    {
+        val s = getString(R.string.input_mod_latin_small)
+        MarkerType.LatinSmall::equals to { _: MarkerType -> s }
+    },
+
+    {
+        val s = getString(R.string.input_mod_bold)
+        MarkerType.BoldFont::equals to { _: MarkerType -> s }
+    },
+
+    {
+        val s = getString(R.string.input_mod_italic)
+        MarkerType.ItalicFont::equals to { _: MarkerType -> s }
+    },
+
     {
         val s = getString(R.string.input_mod_num_sign)
         MarkerType.NumberSign::equals to { _: MarkerType -> s }
@@ -191,6 +316,26 @@ val Context.showMarkerPrintRules by rules<Context, MarkerType, String>(
         MarkerType.LatinCapital::equals to { _: MarkerType -> s }
     },
 
+    {
+        val s = getString(R.string.show_mod_latin)
+        MarkerType.LatinCapital::equals to { _: MarkerType -> s }
+    },
+
+    {
+        val s = getString(R.string.show_mod_latin_small)
+        MarkerType.LatinSmall::equals to { _: MarkerType -> s }
+    },
+
+    {
+        val s = getString(R.string.show_mod_bold)
+        MarkerType.BoldFont::equals to { _: MarkerType -> s }
+    },
+
+    {
+        val s = getString(R.string.show_mod_italic)
+        MarkerType.ItalicFont::equals to { _: MarkerType -> s }
+    },
+
     {
         val s = getString(R.string.show_mod_num_sign)
         MarkerType.NumberSign::equals to { _: MarkerType -> s }
@@ -234,8 +379,28 @@ private val ruSymbols by symbols(SymbolType.ru) {
 }
 private val punctuationSigns by symbols(SymbolType.special) {
     symbol(char = ',', brailleDots = BrailleDots(E, F, E, E, E, E)) // Comma
-    symbol(char = '-', brailleDots = BrailleDots(E, E, F, E, E, F)) // Hyphen
+    symbol(char = '—', brailleDots = BrailleDots(E, E, F, E, E, F)) // Hyphen
     symbol(char = '.', brailleDots = BrailleDots(E, F, E, E, F, F)) // Dot
+    symbol(char = '!', brailleDots = BrailleDots(E, F, F, E, F, E)) // Exclamation mark
+    symbol(char = '?', brailleDots = BrailleDots(E, F, E, E, E, F)) // Question mark
+    symbol(char = '«', brailleDots = BrailleDots(E, F, F, E, E, F)) // Left quotation mark
+    symbol(char = '»', brailleDots = BrailleDots(E, E, F, E, F, F)) // Right quotation mark
+    symbol(char = '(', brailleDots = BrailleDots(F, F, E, E, E, F)) // Left parenthesis
+    symbol(char = ')', brailleDots = BrailleDots(E, E, F, F, F, E)) // Right parenthesis
+    symbol(char = '*', brailleDots = BrailleDots(E, E, F, E, F, E)) // Asterisk
+    symbol(char = ':', brailleDots = BrailleDots(E, F, E, E, F, E)) // Colon
+    symbol(char = ';', brailleDots = BrailleDots(E, F, F, E, E, E)) // Semicolon
+    symbol(char = '\'', brailleDots = BrailleDots(E, E, E, F, E, E)) // Stress
+}
+
+private val mathSigns by symbols(SymbolType.math) {
+    symbol(char = '+', brailleDots = BrailleDots(E, F, F, E, F, E)) // Plus
+    symbol(char = '-', brailleDots = BrailleDots(E, E, F, E, E, F)) // Minus
+    symbol(char = '·', brailleDots = BrailleDots(E, E, F, E, E, E)) // Dot multiplication
+    symbol(char = '✕', brailleDots = BrailleDots(E, F, F, E, E, F)) // Cross multiplication
+    symbol(char = '/', brailleDots = BrailleDots(E, E, F, E, F, F)) // Division (fraction)
+    symbol(char = '÷', brailleDots = BrailleDots(E, F, E, E, F, F)) // Division
+    symbol(char = '=', brailleDots = BrailleDots(E, F, F, E, F, F)) // Equality
 }
 
 private val uebDigits by symbols(SymbolType.digit) {
@@ -312,6 +477,9 @@ private val greekLetters by symbols(SymbolType.greek) {
 private val ms by markers {
     marker(MarkerType.GreekCapital, BrailleDots(E, E, E, F, F, F))
     marker(MarkerType.LatinCapital, BrailleDots(E, E, E, F, E, F))
+    marker(MarkerType.LatinSmall, BrailleDots(E, E, E, E, E, F))
     marker(MarkerType.RussianCapital, BrailleDots(E, E, E, F, F, E))
+    marker(MarkerType.BoldFont, BrailleDots(F, F, E, F, F, F))
+    marker(MarkerType.ItalicFont, BrailleDots(E, E, E, F, F, F))
     marker(MarkerType.NumberSign, BrailleDots(E, E, F, F, F, F))
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e3c4550b..fcff7477 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,28 +40,72 @@
     <string name="input_greek_letter_intro_template">Введите греческую букву: %s</string>
     <string name="input_digit_intro_template">Введите цифру: %s</string>
     <string name="input_special_intro_template">Введите символ: %s</string>
+    <string name="input_math_intro_template">Введите математический символ: %s</string>
     <string name="input_special_intro_dot">Введите символ: Литературная точка</string>
     <string name="input_special_intro_hyphen">Введите символ: Дефис</string>
     <string name="input_special_intro_comma">Введите запятую</string>
+    <string name="input_special_intro_exclamation">Введите восклицательный знак</string>
+    <string name="input_special_intro_question">Введите вопросительный знак</string>
+    <string name="input_special_intro_quotation_left">Введите открывающую кавычку</string>
+    <string name="input_special_intro_quotation_right">Введите закрывающую кавычку</string>
+    <string name="input_special_intro_parenthesis_left">Введите левую литературную скобку</string>
+    <string name="input_special_intro_parenthesis_right">Введите правую литературную скобку</string>
+    <string name="input_special_intro_asterisk">Введите звёздочку</string>
+    <string name="input_special_intro_colon">Введите двоеточие</string>
+    <string name="input_special_intro_semicolon">Введите точку с запятой</string>
+    <string name="input_special_intro_stress">Введите знак ударения</string>
 
     <string name="input_mod_greek_capital">Введите признак большой буквы греческого алфавита</string>
     <string name="input_mod_latin_capital">Введите признак большой буквы латинского алфавита</string>
+    <string name="input_mod_latin_small">Введите признак малой буквы латинского алфавита</string>
     <string name="input_mod_ru_capital">Введите признак большой буквы русского алфавита</string>
     <string name="input_mod_num_sign">Введите цифровой знак</string>
+    <string name="input_mod_bold">Введите признак жирного шрифта</string>
+    <string name="input_mod_italic">Введите признак курсивного шрифта</string>
+
+    <string name="input_math_plus">Введите знак Плюс</string>
+    <string name="input_math_minus">Введите знак Минус</string>
+    <string name="input_math_dot_mult">Введите знак умножения точкой</string>
+    <string name="input_math_cross_mult">Введите знак умножения крестом</string>
+    <string name="input_math_division_fraction">Введите знак деления (углом)</string>
+    <string name="input_math_division">Введите знак деления (двумя точками)</string>
+    <string name="input_math_equality">Введите знак равенства</string>
 
     <string name="show_letter_intro_template">Буква %s</string>
     <string name="show_latin_letter_intro_template">Латинская буква %s</string>
     <string name="show_greek_letter_intro_template">Греческая буква %s</string>
     <string name="show_digit_intro_template">Цифра %s</string>
     <string name="show_special_intro_template">Символ %s</string>
+    <string name="show_math_intro_template">Математический символ %s</string>
     <string name="show_special_intro_dot">Литературная точка</string>
     <string name="show_special_intro_hyphen">Дефис</string>
     <string name="show_special_intro_comma">Запятая</string>
+    <string name="show_special_intro_exclamation">Восклицательный знак</string>
+    <string name="show_special_intro_question">Вопросительный знак</string>
+    <string name="show_special_intro_quotation_left">Открывающая кавычка</string>
+    <string name="show_special_intro_quotation_right">Закрывающая кавычка</string>
+    <string name="show_special_intro_parenthesis_left">Левая литературная скобка</string>
+    <string name="show_special_intro_parenthesis_right">Правая литературная скобка</string>
+    <string name="show_special_intro_asterisk">Звёздочка</string>
+    <string name="show_special_intro_colon">Двоеточие</string>
+    <string name="show_special_intro_semicolon">Точка с запятой</string>
+    <string name="show_special_intro_stress">Ударение</string>
 
     <string name="show_mod_greek">Признак большой греческой буквы</string>
     <string name="show_mod_latin">Признак большой латинской буквы</string>
+    <string name="show_mod_latin_small">Признак малой латинской буквы</string>
     <string name="show_mod_capital">Признак большой буквы русского алфавита</string>
     <string name="show_mod_num_sign">Цифровой знак</string>
+    <string name="show_mod_bold">Признак жирного шрифта</string>
+    <string name="show_mod_italic">Признак курсивного шрифта</string>
+
+    <string name="show_math_plus">Знак Плюс</string>
+    <string name="show_math_minus">Знак Минус</string>
+    <string name="show_math_dot_mult">Знак умножения точкой</string>
+    <string name="show_math_cross_mult">Знак умножения крестом</string>
+    <string name="show_math_division_fraction">Знак деления (углом)</string>
+    <string name="show_math_division">Знак деления (двумя точками)</string>
+    <string name="show_math_equality">Знак равенства</string>
 
     <string name="letter_caption_ru">Русская буква</string>
     <string name="letter_caption_greek">Греческая буква</string>
@@ -101,6 +145,7 @@
     <string name="deck_name_digits">Цифры</string>
     <string name="deck_name_punctuation">Знаки препинания</string>
     <string name="deck_name_markers">Специальные символы</string>
+    <string name="deck_name_math">Математические символы</string>
 
 
     <string name="practice_help">

From 57eaf5cf4e2daa0b4053b1aacb9dbb4193fe25f8 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sun, 6 Sep 2020 19:23:32 +0300
Subject: [PATCH 054/117] #204 change first lesson as Viktoria Nikolaevna
 suggested

---
 .idea/codeStyles/Project.xml                  |  15 +--
 .idea/codeStyles/codeStyleConfig.xml          |   1 +
 .../learnbraille/res/GolubinaCourse.kt        | 119 +++++++++++-------
 3 files changed, 75 insertions(+), 60 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ce1fc4fe..2b436cba 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,18 +3,9 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
         </value>
       </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index a55e7a17..6e6eec11 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
     <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
   </state>
 </component>
\ No newline at end of file
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index c90a5f14..01c46c27 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -15,9 +15,18 @@ internal val golubinaIntroLessons by lessons {
         +FirstInfo(
             """Перед Вами пошаговый курс для обучения с нуля системе Луи Брайля.
                 <br><br>
-                Курс построен на основе книги В. В. Голубиной "Пособие по изучению системы Л. Брайля".
-                В течение курса Вы ознакомитесь с обозначениями букв, цифр и специальных символов.
-                В некоторых шагах предлагается выполнять задания, используя книгу Голубиной.
+                Перед Вами пошаговый курс для обучения с нуля системе Луи Брайля. Курс предназначен 
+                для взрослых незрячих и детей старшего школьного возраста, недавно потерявших зрение,
+                а также для самостоятельного освоения рельефно-точечного шрифта родственниками 
+                инвалидов по зрению, специалистами по реабилитации и студентами-тифлопедагогами.
+                &<br>
+                Курс построен на основе учебного пособия по изучению системы Л. Брайля. 
+                Автор-составитель - тифлопедагог В. В. Голубина. Методическое консультирование
+                осуществлялось тифлопедагогом В. Н. Воробьёвой.
+                &<br>
+                В течение курса Вы ознакомитесь с обозначениями букв (русских, латинских и греческих),
+                цифр, знаков препинания и специальных символов (цифровой знак и другие).
+                В некоторых шагах предлагается выполнять задания, используя указанное пособие.
                 Если Вам будет непонятно, как пользоваться курсом, Вы в любой момент можете вызвать справку
                 по разделу, нажав кнопку "справка" в правом верхнем углу экрана.
             """
@@ -26,76 +35,90 @@ internal val golubinaIntroLessons by lessons {
             """
                 <b>Урок $iLesson. Тренировка чтения и ввода отдельных комбинаций.</b>
                 <br><br>
-                В азбуке Брайля любой символ - это шеститочие.
-                <br>
-                Точки расположены в два столбца по три.
-                <br> 
-                Точки в первом столбце имеют номера 1, 2, 3 сверху вниз. 
-                Во втором столбце - 4, 5, 6 сверху вниз.
+                В азбуке Брайля основой любого символа является шеститочие, в котором точки 
+                расположены в два столбца по три точки. Каждая точка имеет определённый порядковый
+                номер.
+                &<br>
+                При письме точки в <b>правом</b> столбце имеют номера 1, 2, 3 сверху вниз, в <b>левом</b> -
+                4, 5, 6 сверху вниз. При чтении лист переворачивается, и точки 1, 2, 3 <b>оказываются слева</b>. 
+                &<br>
+                В приложении при демонстрации символов рядом с точками 1, 2, 3 мы ставим вертикальную черту.
+                Если символ выведен "как при чтении", эта черта слева от шеститочия, если "как при письме", то справа.
                 """
         })
         +ShowDots(
-            text = "Перед Вами символ Брайля - <br>" +
-                    " точка номер один",
-            dots = BrailleDots(F, E, E, E, E, E)
+            text = "Перед Вами полное шеститочие: <br> точки 1, 2, 3, 4, 5, 6",
+            dots = BrailleDots(F, F, F, F, F, F)
         )
-        +InputDots(
-            text = "Введите точку один",
+        +InputDots(text = "Введите все шесть точек", dots = BrailleDots(F, F, F, F, F, F))
+        +ShowDots(
+            text = "Перед Вами символ шрифта Брайля - <br>" +
+                    " точка номер один",
             dots = BrailleDots(F, E, E, E, E, E)
         )
+        +InputDots(text = "Введите точку один", dots = BrailleDots(F, E, E, E, E, E))
         +ShowDots(
-            text = "Точка номер два",
-            dots = BrailleDots(E, F, E, E, E, E)
-        )
-        +InputDots(
-            text = "Введите точку два",
+            text = "Перед Вами символ шрифта Брайля - <br>" +
+                    " точка номер два",
             dots = BrailleDots(E, F, E, E, E, E)
         )
+        +InputDots(text = "Введите точку два", dots = BrailleDots(E, F, E, E, E, E))
         +ShowDots(
-            text = "Комбинация точек 1 и 2",
-            dots = BrailleDots(F, F, E, E, E, E)
+            text = "Перед Вами символ шрифта Брайля - <br>" +
+                    " точка номер три",
+            dots = BrailleDots(E, E, F, E, E, E)
         )
-        +InputDots(
-            text = "Введите комбинацию: точки 1 и 2",
-            dots = BrailleDots(F, F, E, E, E, E)
+        +InputDots(text = "Введите точку три", dots = BrailleDots(E, E, F, E, E, E))
+        +ShowDots(
+            text = "Перед Вами символ шрифта Брайля - <br>" +
+                    " точка номер четыре",
+            dots = BrailleDots(E, E, E, F, E, E)
         )
-        +InputDots(
-            text = "Введите комбинацию точек 1 и 3",
-            dots = BrailleDots(F, E, F, E, E, E)
+        +InputDots(text = "Введите точку три", dots = BrailleDots(E, E, E, F, E, E))
+        +ShowDots(
+            text = "Перед Вами символ шрифта Брайля - <br>" +
+                    " точка номер пять",
+            dots = BrailleDots(E, E, E, E, F, E)
         )
-        +InputDots(
-            text = "Введите комбинацию точек 1, 3 и 4",
-            dots = BrailleDots(F, E, F, F, E, E)
+        +InputDots(text = "Введите точку пять", dots = BrailleDots(E, E, E, E, F, E))
+        +ShowDots(
+            text = "Перед Вами символ шрифта Брайля - <br>" +
+                    " точка номер шесть",
+            dots = BrailleDots(E, E, E, E, E, F)
         )
+        +InputDots(text = "Введите точку пять", dots = BrailleDots(E, E, E, E, E, F))
         +InputDots(
-            // repeat = 3
-            text = "Введите комбинацию точек 1, 3 и 6",
-            dots = BrailleDots(F, E, F, E, E, F)
+            text = """Теперь выполним пять практических заданий без обучающей картинки. 
+                      &<br>
+                      Введите комбинацию точек 1 и 3""",
+            dots = BrailleDots(F, E, F, E, E, E)
         )
+        +InputDots(text = "Введите комбинацию: точки 4 и 6", dots = BrailleDots(E, E, E, F, E, F))
         +InputDots(
-            // repeat = 3
-            text = "Введите комбинацию точек 1, 5 и 6",
-            dots = BrailleDots(F, E, E, E, F, F)
+            text = "Введите комбинацию точек 1, 3, 4 и 6",
+            dots = BrailleDots(F, E, F, F, E, F)
         )
         +InputDots(
-            // repeat = 3
-            text = "Введите комбинацию точек 2, 3, 4 и 5",
-            dots = BrailleDots(E, F, F, F, F, E)
-        )
-        +ShowDots(
-            text = "Перед Вами полное шеститочие: <br>" +
-                    "точки 1, 2, 3, 4, 5, 6",
-            dots = BrailleDots(F, F, F, F, F, F)
+            text = "Введите комбинацию точек 1, 2, 3, 4 и 5",
+            dots = BrailleDots(F, F, F, F, F, E)
         )
         +InputDots(
-            // repeat = 3
-            text = "Введите все шесть точек",
-            dots = BrailleDots(F, F, F, F, F, F)
+            text = "Введите комбинацию точек 1, 2, 3, 4 и 6",
+            dots = BrailleDots(F, F, F, F, E, F)
         )
         +Info(
             """Откройте букварь на странице 12. 
-                В верхней строке 14 раз повторён символ полного шеститочия."""
+                    В верхней строке 14 раз повторён символ полного шеститочия. 
+                    &<br>
+                    Начиная со второй строки - тренировочные упражнения. 
+                    Самостоятельно потренируйтесь читать отдельные комбинации точек."""
         ).annotate(StepAnnotation.golubinaBookRequired)
+        +InputDots(text="""Введите "средние точки" 2 и 5""", dots=BrailleDots(E, F, E, E, F, E))
+        +Info("""Запишите "средние точки" 2 и 5 на брайлевском приборе.
+                      &<br>
+                      Если у Вас нет возможности писать по Брайлю, в разделе "Настройки" можно отключить
+                      шаги, требующие обращения к брайлевскому прибору.
+        """).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """Урок $iLesson закончен. В следующем уроке мы изучим буквы А, Б, Ц, Д, Е."""
         })

From 4c0446dbaf8e43397e7931204c2f2d447dac3afa Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 8 Sep 2020 12:29:35 +0300
Subject: [PATCH 055/117] #224 apply most suggestions from Viktoria Nikolaevna

---
 .../learnbraille/res/GolubinaCourse.kt        | 241 ++++++++++--------
 .../learnbraille/res/TestCourse.kt            |   8 +-
 2 files changed, 133 insertions(+), 116 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index 01c46c27..fd8fd6ac 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -107,18 +107,20 @@ internal val golubinaIntroLessons by lessons {
             dots = BrailleDots(F, F, F, F, E, F)
         )
         +Info(
-            """Откройте букварь на странице 12. 
+            """Откройте пособие на странице 12. 
                     В верхней строке 14 раз повторён символ полного шеститочия. 
                     &<br>
                     Начиная со второй строки - тренировочные упражнения. 
                     Самостоятельно потренируйтесь читать отдельные комбинации точек."""
         ).annotate(StepAnnotation.golubinaBookRequired)
-        +InputDots(text="""Введите "средние точки" 2 и 5""", dots=BrailleDots(E, F, E, E, F, E))
-        +Info("""Запишите "средние точки" 2 и 5 на брайлевском приборе.
+        +InputDots(text = """Введите "средние точки" 2 и 5""", dots = BrailleDots(E, F, E, E, F, E))
+        +Info(
+            """Запишите "средние точки" 2 и 5 на брайлевском приборе.
                       &<br>
                       Если у Вас нет возможности писать по Брайлю, в разделе "Настройки" можно отключить
                       шаги, требующие обращения к брайлевскому прибору.
-        """).annotate(StepAnnotation.slateStylusRequired)
+        """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """Урок $iLesson закончен. В следующем уроке мы изучим буквы А, Б, Ц, Д, Е."""
         })
@@ -131,9 +133,9 @@ internal val golubinaIntroLessons by lessons {
             """
                     <b>Урок $iLesson. Буквы А, Б, Ц, Д, Е.</b>
                     <br><br>
-                    Некоторые символы Брайля обозначают как букву, так и цифру. Это буквы А, Б,
-                    Ц и так далее. С добавлением цифрового знака, который мы изучим в следующем
-                    уроке, из них получаются цифры 1, 2, 3 и так далее."""
+                    В нашем курсе буквы изучаются не в порядке русского алфавита, а в порядке 
+                    <b>"ключа Брайля"</b>: сперва те, что состоят из двух верхних рядов точек, затем
+                    остальные. Этот порядок пришёл к нам из латинского алфавита Луи Брайля. """
         })
         +Info(
             """Буква А обозначается одной точкой, точкой номер один.
@@ -141,14 +143,14 @@ internal val golubinaIntroLessons by lessons {
         )
         +Show(content.symbols.getValue('А'))
         +Info(
-            """Откройте букварь на странице 13. Вверху слева рельефно-графическое
+            """Откройте пособие на странице 13. Вверху слева рельефно-графическое
                     изображение буквы А. Рядом после полного шеститочия пять раз повторена 
                     буква А точечным шрифтом."""
         ).annotate(StepAnnotation.golubinaBookRequired)
-        +Input(content.symbols.getValue('А')/*, repeat = 5*/)
+        +Input(content.symbols.getValue('А'))
         +Show(content.symbols.getValue('Б'))
         +Info(
-            """Снова изучим страницу 13 в букваре. Под строкой с буквой А - 
+            """Снова изучим страницу 13 в пособии. Под строкой с буквой А - 
                     такая же с буквой Б."""
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Input(content.symbols.getValue('Б'))
@@ -156,105 +158,68 @@ internal val golubinaIntroLessons by lessons {
             """
                     Буква Ц: точки 1 и 4
                     <br><br>
-                    Ознакомьтесь с буквой Ц на странице 13 букваря. 
+                    Ознакомьтесь с буквой Ц на странице 13 пособия. 
                     Строка с буквой Ц находится под строкой с буквой Б."""
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Show(content.symbols.getValue('Ц'))
-        +Input(content.symbols.getValue('Ц')/*, repeat = 5*/)
+        +Input(content.symbols.getValue('Ц'))
         +Show(content.symbols.getValue('Д'))
-        +Input(content.symbols.getValue('Д')/*, repeat = 5*/)
+        +Input(content.symbols.getValue('Д'))
         +Info(
             """Последняя буква в этом уроке - буква Е. 
                     Она обозначается двумя точками: номер 1 и 5."""
         )
         +Show(content.symbols.getValue('Е'))
-        +Input(content.symbols.getValue('Е')/*, repeat = 5*/)
-        +Info(InfoInterpolation.run {
-            """Урок $iLesson закончен. В следующем занятии займёмся повторением букв А, Б, Ц, Д, Е
-                 и выучим буквы Ф, Г. Рекомендуем в дополнение к уроку потренироваться 
-                 вводить изученные буквы в разделе "Практика"."""
-        })
-    }
-    lesson(
-        name = "Буквы Ф, Г"
-    ) {
-        +Info(InfoInterpolation.run {
-            """
-                    <b>Урок $iLesson. Буквы Ф, Г.</b>
-                    <br><br>
-                    Перед прохождением нового материала повторим пройденное.
-                    В следующих трёх шагах нужно ввести буквы Б, А, Ц (вместе это слово БАЦ)."""
-        })
+        +Input(content.symbols.getValue('Е'))
+        +Info("""В следующих трёх шагах нужно ввести буквы Б, А, Ц (вместе это слово БАЦ).""")
         inputChars("БАЦ")
-        +Info(
-            """
-                    Теперь познакомимся с буквами Ф и Г.
-                    <br>
-                    Буква Ф обозначается точками 1, 2 и 4.
-                    <br>
-                    Буква Г - точки 1, 2, 4 и 5.
-                    <br>
-                    В следующих шагах нужно ознакомиться с буквами и ввести их."""
-        )
-        +Show(content.symbols.getValue('Ф'))
-        +Info(
-            """
-                Откройте страницу 15 в букваре. Вверху страницы найдите рельефно-графическое
-                изображение буквы Ф и рядом букву Ф, пять раз написанную релефно-точечным шрифтом
-                """
-        ).annotate(StepAnnotation.golubinaBookRequired)
-        +Input(content.symbols.getValue('Ф')/*, repeat = 5*/)
-        +Show(content.symbols.getValue('Г'))
-        +Info(
-            """
-                В букваре под буквой Ф - буква Г. Изучите её графическое представление
-                и точечный состав.
-            """
-        ).annotate(StepAnnotation.golubinaBookRequired)
-        +Input(content.symbols.getValue('Г')/*, repeat = 5*/)
-        +Info(
-            """
-                    В следующих трёх шагах введите по буквам слово БЕГ."""
-        )
-        inputChars("БЕГ")
+        +Info("""Теперь наберите в следующих трёх шагах, вводя букву за буквой, слово ДЕД.""")
+        inputChars("ДЕД")
+        +Info("""Далее в следующих четырёх шагах введите слово БАБА.""")
+        inputChars("БАБА")
         +Info(InfoInterpolation.run {
-            """Поздравляем! Урок $iLesson пройден. В следующем занятии мы узнаем, 
-                    как с помощью букв А, Б, Ц, Д, Е, Ф, Г составить цифры 1, 2, 3, 4, 5 и 6."""
+            """Урок $iLesson закончен. В следующем занятии займёмся повторением букв А, Б, Ц, Д, Е
+                 и потренируемся писать цифры от 1 до 5, образуемые с помощью этих букв. Рекомендуем
+                 в дополнение к уроку потренироваться вводить изученные буквы в разделе "Практика"."""
         })
     }
 
     lesson(
-        name = "Цифры от 1 до 6"
+        name = "Цифры от 1 до 5"
     ) {
         +Info(InfoInterpolation.run {
             """
-                    <b>Урок $iLesson. Цифры от 1 до 6.</b>
+                    <b>Урок $iLesson. Цифры от 1 до 5.</b>
                     <br><br>
                     В этом уроке мы начнём изучать цифры. Но для начала повторим пройденное.
-                    В следующих шагах введите буквы, изученные в прошлых двух уроках."""
+                    В следующих шагах введите буквы, изученные в прошлом уроке."""
         })
-        inputChars("АБЦДЕФГ")
+        inputChars("АБЦДЕ")
         +Info(
             """
                     Переходим к изучению цифр.
                     <br>
-                    Чтобы отличить цифры от букв, перед числами и цифрами ставится <b>цифровой знак.</b>
-                    Этот символ обозначается точками 3, 4, 5, 6. """
+                    Запомним, 10 символов первой строки «Ключа Брайля» обозначают 10 латинских и 
+                    русских букв, а также арабские цифры.
+                    &<br>
+                    Для того, чтобы букву преобразовать в цифру, перед ней ставится 
+                    <b>«Цифровой знак»</b>. Он обозначается четырьмя точками: номер 3, 4, 5 и 6.
+                    """
         )
         +Show(content.markers.getValue(MarkerType.NumberSign))
         +Info(
             """
-                В букваре на странице 14, перед страницей с буквами Ф и Г - цифровой знак.
+                В пособии на странице 14, после страницы с буквами от А до Е - цифровой знак.
                 Найдите четвёртую сверху строчку. В ней цифровой знак повторён пять раз.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Input(content.markers.getValue(MarkerType.NumberSign))
         +Info(
             """
-                    В следующих шагах изучим цифры 1, 2, 3, 4, 5, 6, 7.
-                    Они получаются из букв А, Б, Ц, Д, Е, Ф, Г добавлением цифрового знака.
-                    Например, цифра и число 3 - это цифровой знак + Ц.
-                    Число двадцать семь - это цифровой знак, затем буквы Б и Г. 
+                    В следующих шагах изучим цифры 1, 2, 3, 4, 5.
+                    Они получаются из букв А, Б, Ц, Д, Е добавлением цифрового знака.
+                    Например, цифра 3, как и число 3 - это цифровой знак + Ц.
+                    Число двадцать четыре - это цифровой знак, затем буквы Б и Д. 
                     В уроках мы для краткости не будем всякий раз ставить цифровой знак."""
         )
         +Show(content.symbols.getValue('1'))
@@ -267,13 +232,9 @@ internal val golubinaIntroLessons by lessons {
         +Input(content.symbols.getValue('4'))
         +Show(content.symbols.getValue('5'))
         +Input(content.symbols.getValue('5'))
-        +Show(content.symbols.getValue('6'))
-        +Input(content.symbols.getValue('6'))
-        +Show(content.symbols.getValue('7'))
-        +Input(content.symbols.getValue('7'))
         +Info(
             """
-                На пятой сверху строчке на странице 14 букваря, под строкой с цифровым знаком,
+                На пятой сверху строчке на странице 14 пособия, под строкой с цифровым знаком,
                 написаны цифры от одного до пяти.
                 Изучите каждую цифру.
             """
@@ -281,10 +242,66 @@ internal val golubinaIntroLessons by lessons {
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson пройден! Рекомендуем самостоятельно изучить цифры и числа на странице 15
-                    в букваре (внизу страницы).
+                    в пособии (внизу страницы).
+                    <br>
+                    Следующий урок будет посвящён буквам Ф, Г и цифрам 6, 7."""
+        })
+    }
+
+    lesson(
+        name = "Буквы Ф, Г и цифры 6, 7"
+    ) {
+        +Info(InfoInterpolation.run {
+            """
+                    <b>Урок $iLesson. Буквы Ф, Г и цифры 6, 7.</b>
+                    <br><br>
+                    Перед прохождением нового материала повторим пройденное.
+                    В следующих пяти шагах нужно ввести буквы Б, E, Д, А (вместе это слово БЕДА)."""
+        })
+        inputChars("БЕДА")
+        +Info(
+            """
+                    Теперь познакомимся с буквами Ф и Г.
+                    <br>
+                    Буква Ф обозначается точками 1, 2 и 4.
+                    <br>
+                    Буква Г - точки 1, 2, 4 и 5.
                     <br>
-                    Следующий урок будет посвящён повторению, а также мы изучим 
-                    букву Х и цифру 8."""
+                    В следующих шагах нужно ознакомиться с буквами и ввести их."""
+        )
+        +Show(content.symbols.getValue('Ф'))
+        +Info(
+            """
+                Откройте страницу 15 в пособии. Вверху страницы найдите рельефно-графическое
+                изображение буквы Ф и рядом букву Ф, пять раз написанную рельефно-точечным шрифтом.
+                """
+        ).annotate(StepAnnotation.golubinaBookRequired)
+        +Input(content.symbols.getValue('Ф'))
+        +Show(content.symbols.getValue('Г'))
+        +Info(
+            """
+                В пособии под буквой Ф - буква Г. Изучите её графическое представление
+                и точечный состав.
+            """
+        ).annotate(StepAnnotation.golubinaBookRequired)
+        +Input(content.symbols.getValue('Г'))
+        +Info(
+            """
+                    В следующих трёх шагах введите по буквам слово БЕГ."""
+        )
+        inputChars("БЕГ")
+        +Info(
+            """
+                    Цифровой знак и буква Ф за ним обозначают арабскую цифру 6 или число 6.
+                    &<br>
+                    Цифровой знак и буква Г за ним - это семёрка.
+                    &<br>
+                    В следующих трёх шагах введите число ШЕСТЬДЕСЯТ СЕМЬ."""
+        )
+        +Input(content.markers.getValue(MarkerType.NumberSign))
+        inputChars("67")
+        +Info(InfoInterpolation.run {
+            """Поздравляем! Урок $iLesson пройден."""
         })
     }
 
@@ -296,7 +313,7 @@ internal val golubinaIntroLessons by lessons {
                     <b>Урок $iLesson. Буква Х и цифра 8.</b>
                     <br><br>
                     По окончании этого урока Вы узнаете букву Х и цифру 8. 
-                    Но перед изучением нового повторим пройденное. Введите по буквам слово ФЕБ. """
+                    Но перед изучением нового повторим пройденное. Введите по буквам слово ФЕБ."""
         })
         inputChars("ФЕБ")
         +Info(
@@ -322,7 +339,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Х'))
         +Info(
             """
-                Откройте страницу 16 в букваре Голубиной. В верхней части страницы найдите
+                Откройте страницу 16 в пособии Голубиной. В верхней части страницы найдите
                 рельефно-графическую букву Х и рядом строку из пяти брайлевских букв Х.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
@@ -342,7 +359,7 @@ internal val golubinaIntroLessons by lessons {
         inputChars("БАЦ")
         +Info(
             """
-                Далее введите, поставив цифровой знак, число "Восемьсот семдесят шесть"
+                Далее введите, поставив цифровой знак, число "Восемьсот семьдесят шесть"
             """
         )
         +Input(content.markers.getValue(MarkerType.NumberSign))
@@ -371,7 +388,7 @@ internal val golubinaIntroLessons by lessons {
         })
         +Info(
             """
-                Раскройте букварь на странице 17. В верхней части листа найдите рельефно-графические
+                Раскройте пособие на странице 17. В верхней части листа найдите рельефно-графические
                 и рельефно-точечные изображения букв Ж и И.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
@@ -400,7 +417,7 @@ internal val golubinaIntroLessons by lessons {
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson закончен. Теперь Вы, помимо букв, знаете все цифры.
-                    Примеры слов и чисел к этому уроку можно найти в букваре внизу страницы 17.
+                    Примеры слов и чисел к этому уроку можно найти в пособии внизу страницы 17.
                     <br>
                     Следующий урок посвящён буквам К, Л и М."""
         })
@@ -436,7 +453,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Л'))
         +Info(
             """
-                    Сейчас предлагаем Вам найти страницу 19 в букваре, где вверху изображена зрячая
+                    Сейчас предлагаем Вам найти страницу 19 в пособии, где вверху изображена рельефная
                     буква К и рядом с ней строка из пяти брайлевских букв К. Ниже находится буква Л.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
@@ -461,7 +478,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('М'))
         +Info(
             """
-                    На той же странице 19 в букваре найдите и прочтите строку с буквой М
+                    На той же странице 19 в пособии найдите и прочтите строку с буквой М
                     под строками с буквами К, Л.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
@@ -481,7 +498,7 @@ internal val golubinaIntroLessons by lessons {
             """
                     Мы подошли к концу урока $iLesson.
                     <br>
-                    Буквам К, Л, М посвящены страницы 19 и 20 букваря; желательно
+                    Буквам К, Л, М посвящены страницы 19 и 20 пособия; желательно
                     повторить материал, прочитав слова и числа на этих страницах.
                     <br>
                     На следующем занятии мы узнаем, как обозначается буква Н."""
@@ -512,7 +529,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Н'))
         +Info(
             """
-                    Раскройте страницу 21 букваря и найдите вверху букву Н.
+                    Раскройте страницу 21 пособия и найдите вверху букву Н.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Input(content.symbols.getValue('Н'))
@@ -531,7 +548,7 @@ internal val golubinaIntroLessons by lessons {
         +Info(InfoInterpolation.run {
             """
                     На этом урок $iLesson завершается. Для закрепления материала полезно прочесть
-                    текст на страницах 21 и 22 в букваре.
+                    текст на страницах 21 и 22 в пособии.
                     <br>
                     В следующий раз изучим букву О и знак препинания ЗАПЯТАЯ.
                     """
@@ -560,7 +577,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('О'))
         +Info(
             """
-                    Возьмите букварь и откройте страницу 23. Сверху найдите букву О.
+                    Возьмите пособие и откройте страницу 23. Сверху найдите букву О.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
 
@@ -591,7 +608,7 @@ internal val golubinaIntroLessons by lessons {
         inputChars("ГЕОЛОГ,")
         +Info(InfoInterpolation.run {
             """Урок $iLesson подходит к концу. В следующем уроке нас ждёт изучение буквы П.
-                    Материалы к этому занятию можно прочесть на страницах 23-24 в букваре.
+                    Материалы к этому занятию можно прочесть на страницах 23-24 в пособии.
             """
         })
     }
@@ -618,7 +635,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('П'))
         +Info(
             """
-                    Найдём букву П в букваре. Для этого раскройте страницу 25 и изучите верхнюю строку.
+                    Найдём букву П в пособии. Для этого раскройте страницу 25 и изучите верхнюю строку.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Info(
@@ -707,7 +724,7 @@ internal val golubinaIntroLessons by lessons {
             """
                     <b>Урок $iLesson. Буква Р.</b>
                     <br><br>
-                    Этому уроку соответствует страницы 27 и 28 букваря.
+                    Этому уроку соответствует страницы 27 и 28 пособия.
                     <br>
                     Перед стартом повторим материал прошлых уроков. 
                     Введите по символам слово ПЧЕЛА.
@@ -725,7 +742,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Р'))
         +Info(
             """
-                    Раскройте страницу 27 в букваре и ознакомьтесь с бувой Р вверху листа.
+                    Раскройте страницу 27 в пособии и ознакомьтесь с буквой Р вверху листа.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Info(
@@ -779,7 +796,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('С'))
         +Info(
             """
-                    Перейдите в букваре Голубиной к странице 29 и прочтите сверху строку с буквой С.
+                    Перейдите в пособии Голубиной к странице 29 и прочтите сверху строку с буквой С.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Info(
@@ -838,7 +855,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Т'))
         +Info(
             """
-                    В букваре В. В. Голубиной найдите букву Т на странице 30
+                    В пособии В. В. Голубиной найдите букву Т на странице 30
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Info(
@@ -861,7 +878,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('-'))
         +Info(
             """
-                   Переверните страницу в букваре. На странице 31 найдите по центру знак "дефис",
+                   Переверните страницу в пособии. На странице 31 найдите по центру знак "дефис",
                    повторённый пять раз.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
@@ -959,7 +976,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Щ'))
         +Info(
             """
-                   Букварь содержит урок с буквой Щ на странице 33.
+                   Пособие содержит урок с буквой Щ на странице 33.
                    <br>
                    Найдите эту страницу и изучите самую верхнюю строку.
             """
@@ -1074,7 +1091,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Й'))
         +Info(
             """
-                   Букварь Голубиной содержит материал на тему буквы Й на странице 35.
+                   Пособие под редакцией В. Голубиной содержит материал на тему буквы Й на странице 35.
                    <br>
                    Ознакомьтесь с рельефно-графическим и рельефно-точечным изображением буквы "Й" на первой строке.
             """
@@ -1132,7 +1149,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Ъ'))
         +Info(
             """
-                   Откройте раздел букваря, где изучается твёрдый знак, на странице 36.
+                   Откройте раздел пособия, где изучается твёрдый знак, на странице 36.
                    <br>
                    Прочтите верхнюю строку, которая содержит пять повторов этого символа.
             """
@@ -1156,7 +1173,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('.'))
         +Info(
             """
-                   В середине страницы 36 букваря, где мы изучали твёрдый знак, найдите и прочтите
+                   В середине страницы 36 пособия, где мы изучали твёрдый знак, найдите и прочтите
                    строку с изображением литературной точки.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
@@ -1205,7 +1222,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Ы'))
         +Info(
             """
-                   Теперь посетим страницу 37 букваря, где нужно найти и прочесть верхнюю строку - 
+                   Теперь посетим страницу 37 пособия, где нужно найти и прочесть верхнюю строку - 
                    рельефно-графические и рельефно-точечное изображение буквы Ы.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
@@ -1260,7 +1277,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Ь'))
         +Info(
             """
-                   Откройте страницу 39 в букваре Голубиной. Изучите первую строку, где содержится
+                   Откройте страницу 39 в пособии Голубиной. Изучите первую строку, где содержится
                    мягкий знак.
                    <br>
                    После урока рекомендуем прочесть слова на страницах 39 и 40.
@@ -1318,7 +1335,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Ё'))
         +Info(
             """
-                   Вводный текст о буквах Ё и Ш можно найти в букваре на страницах 41 и 42.
+                   Вводный текст о буквах Ё и Ш можно найти в пособии на страницах 41 и 42.
                    <br>
                    Откройте страницу 41 и прочтите верхнюю строку с буквой Ё.
             """
@@ -1342,7 +1359,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Ш'))
         +Info(
             """
-                   Прочтите строку с буквой Ш в середине страницы 41 букваря.
+                   Прочтите строку с буквой Ш в середине страницы 41 пособия.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Info(
@@ -1394,7 +1411,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Я'))
         +Info(
             """
-                   Изучению буквы 'Я' отведены страницы 43 и 44 в букваре Голубиной.
+                   Изучению буквы 'Я' отведены страницы 43 и 44 в пособии под редакцией В. Голубиной.
                    <br>
                    Откройте страницу 43 и прочтите верхнюю строку - пять букв 'Я' подряд.
             """
@@ -1451,7 +1468,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('Ю'))
         +Info(
             """
-                   Буква 'Ю' и слова с ней находятся на страницах 45 и 46 в букваре. 
+                   Буква 'Ю' и слова с ней находятся на страницах 45 и 46 в пособии. 
                    <br>
                    Найдите сорок пятую страницу и ознакомьтесь с буквой Ю в самой верхней строке.
             """
@@ -1521,7 +1538,7 @@ internal val golubinaIntroLessons by lessons {
         +Info(
             """
                    Для развития памяти пальцев рекомендуется в дополнение к этому уроку
-                   просмотреть материал о букве Э на страницах 47 и 48 в букваре. 
+                   просмотреть материал о букве Э на страницах 47 и 48 в пособии. 
                    <br>
                    Сейчас откройте страницу 47 и прочтите первую строку, где написана буква 'Э'.
             """
@@ -1583,7 +1600,7 @@ internal val golubinaIntroLessons by lessons {
         +Show(content.symbols.getValue('В'))
         +Info(
             """
-                    Для более тщательного изучения буквы 'В' мы рекомендуем обратиться к букварю
+                    Для более тщательного изучения буквы 'В' мы рекомендуем обратиться к пособию В.
                     Голубиной, страницы 49 и 50.
                     <br>
                     В данный момент предлагаем Вам раскрыть страницу 49 и прочесть верхнюю строку,
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
index 3ee3d5a1..6fe348bd 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
@@ -36,7 +36,7 @@ internal val testLessons by lessons {
             dots = BrailleDots(F, F, F, F, F, F)
         )
         +Info(
-            """Откройте букварь на странице 12. 
+            """Откройте пособие на странице 12. 
                 В верхней строке 14 раз повторён символ полного шеститочия."""
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Info(
@@ -61,7 +61,7 @@ internal val testLessons by lessons {
         )
         +Show(content.symbols.getValue('А'))
         +Info(
-            """Откройте букварь на странице 13. Вверху слева рельефно-графическое
+            """Откройте пособие на странице 13. Вверху слева рельефно-графическое
                     изображение буквы А. Рядом после полного шеститочия пять раз повторена 
                     буква А точечным шрифтом."""
         ).annotate(StepAnnotation.golubinaBookRequired)
@@ -76,12 +76,12 @@ internal val testLessons by lessons {
 
         +Show(content.symbols.getValue('Б'))
         +Info(
-            """Снова изучим страницу 13 в букваре. Под строкой с буквой А - 
+            """Снова изучим страницу 13 в пособии. Под строкой с буквой А - 
                     такая же с буквой Б."""
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Input(content.symbols.getValue('Б'))
         +Info(
-            """Ознакомьтесь с буквой Ц на странице 13 букваря. 
+            """Ознакомьтесь с буквой Ц на странице 13 пособия. 
                     Строка с буквой Ц находится под строкой с буквой Б."""
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Show(content.symbols.getValue('Ц'))

From 033115f190de2d0974abb391d1e0e0d6045857fa Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 8 Sep 2020 14:53:59 +0300
Subject: [PATCH 056/117] #224 add greek and latin symbols

---
 .../learnbraille/res/GolubinaCourse.kt        | 79 ++++++++++++++++++-
 .../braillesystems/learnbraille/res/_DSL.kt   |  7 ++
 2 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index fd8fd6ac..8da7d902 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -1503,7 +1503,7 @@ internal val golubinaIntroLessons by lessons {
                     Урок $iLesson - русская буква Ю - закончен. Нам осталось пройти всего два занятия,
                     после чего весь алфавит будет изучен.
                     <br>
-                    В нашей предпоследней встрече мы освоим букву Э.
+                    В нашей предпоследней встрече, связанной с русским алфавитом, мы освоим букву Э.
                     """
         })
     }
@@ -1573,7 +1573,7 @@ internal val golubinaIntroLessons by lessons {
             """
                     Урок $iLesson, в ходе которого мы выучили букву Э, закончен.
                     <br>
-                    В следующем уроке, который станет последним в нашем курсе, изучим букву В.
+                    В следующем уроке изучим букву В, после чего весь алфавит будет освоен.
                     """
         })
     }
@@ -1633,9 +1633,82 @@ internal val golubinaIntroLessons by lessons {
             """Заключительное упражнение: наберите слово КОРОВА"""
         )
         inputChars("КОРОВА")
+        +Info(InfoInterpolation.run {
+            """
+                Урок $iLesson - буква В - закончен.
+                <br>
+                Теперь Вам знаком весь русский алфавит и цифры. Следующие уроки покрывают
+                полезный материал, который встречается в брайлевских книгах не так часто, поэтому
+                упражнений будет меньше и материал будет, скорее, справочный.
+            """
+        })
+    }
+    lesson("Латинский алфавит") {
+        +Info(InfoInterpolation.run {
+            """
+                <b>Урок $iLesson: латинский алфавит.</b>
+                <br><br>
+                В этом уроке собраны все буквы латинского алфавита. Каждую из них нужно сперва
+                прочесть, а затем ввести в шеститочии на экране.
+                &<br>
+                Слова на латинице внутри русского текста выделяются специальным символом 
+                <b>"Признак большой буквы латинского алфавита"</b> (точки 4 и 6) или 
+                <b>"Признак малой буквы латинского алфавита"</b> (точка 6).
+                """
+        })
+        +Info(
+            """
+                    Латинский алфавит в книге под редакцией В. В. Голубиной изучается на страницах 
+                    85-91. Для каждой буквы в пособии приведена русская транскрипция, английское
+                    написание шрифтом Брайля (вместе с признаком заглавной латинской буквы)
+                    и рельефно-графическое изображение.
+                    """
+        ).annotate(StepAnnotation.golubinaBookRequired)
+        +Show(content.markers.getValue(MarkerType.LatinCapital))
+        +Input(content.markers.getValue(MarkerType.LatinCapital))
+        +Show(content.markers.getValue(MarkerType.LatinSmall))
+        +Input(content.markers.getValue(MarkerType.LatinSmall))
+        showAndInputChars("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
+        +Info(
+            """
+                    В следующих шагах введите по буквам фамилию Луи Брайля, как она пишется во 
+                    французском и английском языках: BRAILLE, поставив перед этим признак большой
+                    латинской буквы.
+                    """
+        )
+        +Input(content.markers.getValue(MarkerType.LatinCapital))
+        inputChars("BRAILLE")
+        +Info(InfoInterpolation.run {
+            """
+               На этом урок $iLesson завершается. В следующем занятии аналогичным образом 
+               мы кратко ознакомимся с греческим алфавитом.
+            """
+        })
+    }
+    lesson("Греческий алфавит") {
+        +Info(InfoInterpolation.run {
+            """
+                <b>Урок $iLesson: греческий алфавит.</b>
+                <br><br>
+                Последний урок в нашем курсе посвящён греческому алфавиту. При вставке заглавных
+                греческих букв в русском тексте ставится специальный символ <b>"Признак большой
+                буквы греческого алфавита"</b>.
+                """
+        })
+        +Show(content.markers.getValue(MarkerType.GreekCapital))
+        +Input(content.markers.getValue(MarkerType.GreekCapital))
+        +Info(
+            """
+                    Пособие под редакцией В. Голубиной включает и греческий алфавит. Его можно найти
+                    на страницах 93-99. Для каждой буквы приведено её название (на русском языке),
+                    обозначение в азбуке Брайля (вместе с признаком заглавной буквы), а также
+                    рельефно-графическое изображение.
+                    """
+        ).annotate(StepAnnotation.golubinaBookRequired)
+        showAndInputChars("ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ")
         +LastInfo(InfoInterpolation.run {
             """
-                    Урок $iLesson - буква В - закончен.
+                    Урок $iLesson закончен.
                     <br>
                     Вы дошли до конца курса. Спасибо, что воспользовались нашим обучающим
                     приложением! При желании можно вернутся к ранее пройденному материалу 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/_DSL.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/_DSL.kt
index d3668e9e..44877615 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/_DSL.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/_DSL.kt
@@ -2,8 +2,15 @@ package com.github.braillesystems.learnbraille.res
 
 import com.github.braillesystems.learnbraille.data.dsl.StepsBuilder
 import com.github.braillesystems.learnbraille.data.entities.Input
+import com.github.braillesystems.learnbraille.data.entities.Show
 
 fun StepsBuilder.inputChars(chars: String): Unit =
     chars
         .map(Char::toUpperCase)
         .forEach { c -> +Input(content.symbols.getValue(c)) }
+
+fun StepsBuilder.showAndInputChars(chars: String): Unit =
+    chars.map(Char::toUpperCase).forEach {
+        +Show(content.symbols.getValue(it))
+        +Input(content.symbols.getValue(it))
+    }

From fc854bcc6a87af8860d272df50caeb3819968325 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Tue, 8 Sep 2020 14:54:46 +0300
Subject: [PATCH 057/117] #224 #204 fix noticed mistakes in course

---
 .../braillesystems/learnbraille/res/Data.kt   |  3 +-
 .../learnbraille/res/GolubinaCourse.kt        | 29 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
index 457b4b18..08dc0ca0 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
@@ -26,7 +26,8 @@ import com.github.braillesystems.learnbraille.utils.lazyWithContext
 val prepopulationData by data(
     materials = content,
     stepAnnotationNames = listOf(
-        StepAnnotation.golubinaBookRequired
+        StepAnnotation.golubinaBookRequired,
+        StepAnnotation.slateStylusRequired
     ),
     knownMaterials = knownMaterials
 ) {
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index 8da7d902..5b98106b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -13,17 +13,16 @@ internal val golubinaIntroLessons by lessons {
         name = "Знакомство с шеститочием"
     ) {
         +FirstInfo(
-            """Перед Вами пошаговый курс для обучения с нуля системе Луи Брайля.
-                <br><br>
+            """
                 Перед Вами пошаговый курс для обучения с нуля системе Луи Брайля. Курс предназначен 
                 для взрослых незрячих и детей старшего школьного возраста, недавно потерявших зрение,
                 а также для самостоятельного освоения рельефно-точечного шрифта родственниками 
                 инвалидов по зрению, специалистами по реабилитации и студентами-тифлопедагогами.
-                &<br>
+                <br>
                 Курс построен на основе учебного пособия по изучению системы Л. Брайля. 
                 Автор-составитель - тифлопедагог В. В. Голубина. Методическое консультирование
                 осуществлялось тифлопедагогом В. Н. Воробьёвой.
-                &<br>
+                <br>
                 В течение курса Вы ознакомитесь с обозначениями букв (русских, латинских и греческих),
                 цифр, знаков препинания и специальных символов (цифровой знак и другие).
                 В некоторых шагах предлагается выполнять задания, используя указанное пособие.
@@ -38,10 +37,10 @@ internal val golubinaIntroLessons by lessons {
                 В азбуке Брайля основой любого символа является шеститочие, в котором точки 
                 расположены в два столбца по три точки. Каждая точка имеет определённый порядковый
                 номер.
-                &<br>
+                <br>
                 При письме точки в <b>правом</b> столбце имеют номера 1, 2, 3 сверху вниз, в <b>левом</b> -
                 4, 5, 6 сверху вниз. При чтении лист переворачивается, и точки 1, 2, 3 <b>оказываются слева</b>. 
-                &<br>
+                <br>
                 В приложении при демонстрации символов рядом с точками 1, 2, 3 мы ставим вертикальную черту.
                 Если символ выведен "как при чтении", эта черта слева от шеститочия, если "как при письме", то справа.
                 """
@@ -74,7 +73,7 @@ internal val golubinaIntroLessons by lessons {
                     " точка номер четыре",
             dots = BrailleDots(E, E, E, F, E, E)
         )
-        +InputDots(text = "Введите точку три", dots = BrailleDots(E, E, E, F, E, E))
+        +InputDots(text = "Введите точку четыре", dots = BrailleDots(E, E, E, F, E, E))
         +ShowDots(
             text = "Перед Вами символ шрифта Брайля - <br>" +
                     " точка номер пять",
@@ -86,10 +85,10 @@ internal val golubinaIntroLessons by lessons {
                     " точка номер шесть",
             dots = BrailleDots(E, E, E, E, E, F)
         )
-        +InputDots(text = "Введите точку пять", dots = BrailleDots(E, E, E, E, E, F))
+        +InputDots(text = "Введите точку шесть", dots = BrailleDots(E, E, E, E, E, F))
         +InputDots(
             text = """Теперь выполним пять практических заданий без обучающей картинки. 
-                      &<br>
+                      <br>
                       Введите комбинацию точек 1 и 3""",
             dots = BrailleDots(F, E, F, E, E, E)
         )
@@ -109,14 +108,14 @@ internal val golubinaIntroLessons by lessons {
         +Info(
             """Откройте пособие на странице 12. 
                     В верхней строке 14 раз повторён символ полного шеститочия. 
-                    &<br>
+                    <br>
                     Начиная со второй строки - тренировочные упражнения. 
                     Самостоятельно потренируйтесь читать отдельные комбинации точек."""
         ).annotate(StepAnnotation.golubinaBookRequired)
         +InputDots(text = """Введите "средние точки" 2 и 5""", dots = BrailleDots(E, F, E, E, F, E))
         +Info(
             """Запишите "средние точки" 2 и 5 на брайлевском приборе.
-                      &<br>
+                      <br>
                       Если у Вас нет возможности писать по Брайлю, в разделе "Настройки" можно отключить
                       шаги, требующие обращения к брайлевскому прибору.
         """
@@ -201,7 +200,7 @@ internal val golubinaIntroLessons by lessons {
                     <br>
                     Запомним, 10 символов первой строки «Ключа Брайля» обозначают 10 латинских и 
                     русских букв, а также арабские цифры.
-                    &<br>
+                    <br>
                     Для того, чтобы букву преобразовать в цифру, перед ней ставится 
                     <b>«Цифровой знак»</b>. Он обозначается четырьмя точками: номер 3, 4, 5 и 6.
                     """
@@ -293,9 +292,9 @@ internal val golubinaIntroLessons by lessons {
         +Info(
             """
                     Цифровой знак и буква Ф за ним обозначают арабскую цифру 6 или число 6.
-                    &<br>
+                    <br>
                     Цифровой знак и буква Г за ним - это семёрка.
-                    &<br>
+                    <br>
                     В следующих трёх шагах введите число ШЕСТЬДЕСЯТ СЕМЬ."""
         )
         +Input(content.markers.getValue(MarkerType.NumberSign))
@@ -1650,7 +1649,7 @@ internal val golubinaIntroLessons by lessons {
                 <br><br>
                 В этом уроке собраны все буквы латинского алфавита. Каждую из них нужно сперва
                 прочесть, а затем ввести в шеститочии на экране.
-                &<br>
+                <br>
                 Слова на латинице внутри русского текста выделяются специальным символом 
                 <b>"Признак большой буквы латинского алфавита"</b> (точки 4 и 6) или 
                 <b>"Признак малой буквы латинского алфавита"</b> (точка 6).

From 1cd6df51f56468f036565806ef792e358df3c913 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sun, 13 Sep 2020 15:32:23 +0300
Subject: [PATCH 058/117] #224 define final lessons structure

---
 .../learnbraille/res/GolubinaCourse.kt        | 199 ++++++++++++++++--
 1 file changed, 187 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index 5b98106b..c2a98e5a 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -871,10 +871,10 @@ internal val golubinaIntroLessons by lessons {
                     Прямо сейчас перейдём к изучению дефиса.
                     <br>
                     Знак 'Дефис' обозначается точками 3 и 6. Не нужно путать его с буквой Ц: 
-                    точки буквы Ц - в верхней трети шеститочия, точки дефиса - в самой нижней.
+                    точки буквы Ц — в верхней трети шеститочия, точки дефиса — в самой нижней.
                     """
         )
-        +Show(content.symbols.getValue('-'))
+        +Show(content.symbols.getValue('—'))
         +Info(
             """
                    Переверните страницу в пособии. На странице 31 найдите по центру знак "дефис",
@@ -884,11 +884,11 @@ internal val golubinaIntroLessons by lessons {
         +Info(
             """Введите по символам слово ПОЛ-ЛИМОНА"""
         )
-        inputChars("ПОЛ-ЛИМОНА")
+        inputChars("ПОЛ—ЛИМОНА")
         +Info(
-            """И последнее слово, которое нужно ввести в этом уроке - местоимение ГДЕ-ЛИБО"""
+            """И последнее слово, которое нужно ввести в этом уроке — местоимение ГДЕ-ЛИБО"""
         )
-        inputChars("ГДЕ-ЛИБО")
+        inputChars("ГДЕ—ЛИБО")
         +Info(
             """
                     На этом урок 14 закончен. Буква Т, которой он был посвящён, стала двадцатой
@@ -941,12 +941,12 @@ internal val golubinaIntroLessons by lessons {
         )
         inputChars("ТРУД")
         +Info(
-            """Последнее, что нужно сделать в этом уроке - введите слово ЧУДЕСА"""
+            """Последнее, что нужно сделать в этом уроке — введите слово ЧУДЕСА"""
         )
         inputChars("ЧУДЕСА")
         +Info(InfoInterpolation.run {
             """
-                    Урок $iLesson окончен. Мы изучили букву У - первую букву, где нам встретилась точка
+                    Урок $iLesson окончен. Мы изучили букву У — первую букву, где нам встретилась точка
                     номер 6 (но не первый символ: ранее мы сталкивались с ним, изучая цифровой знак
                     и знак 'Дефис'). В следующем занятии нас ждёт буква Щ.
                     """
@@ -1179,12 +1179,12 @@ internal val golubinaIntroLessons by lessons {
         +Input(content.symbols.getValue('.'))
         +Info(
             """
-                    В следующих шагах введите по буквам целое предложение: "Ленинград - город-герой".
+                    В следующих шагах введите по буквам целое предложение: "Ленинград — город-герой".
                     <br>
                     В конце поставьте литературную точку.
                     """
         )
-        inputChars("ЛЕНИНГРАД-ГОРОД-ГЕРОЙ")
+        inputChars("ЛЕНИНГРАД—ГОРОД—ГЕРОЙ")
         +Info(InfoInterpolation.run {
             """                    
                     На этом мы завершаем занятие номер $iLesson. Осталось ещё семь уроков, после чего 
@@ -1636,12 +1636,187 @@ internal val golubinaIntroLessons by lessons {
             """
                 Урок $iLesson - буква В - закончен.
                 <br>
-                Теперь Вам знаком весь русский алфавит и цифры. Следующие уроки покрывают
-                полезный материал, который встречается в брайлевских книгах не так часто, поэтому
-                упражнений будет меньше и материал будет, скорее, справочный.
+                Теперь Вам знаком весь русский алфавит и цифры, а также некоторые знаки препинания.
+                В следующих занятиях мы пополним наш запас знаков препинания.
             """
         })
     }
+    lesson("Двоеточие и точка с запятой"){ // Golubina pp 53-54
+        +Info(InfoInterpolation.run {
+            """
+                <b>Урок $iLesson: Двоеточие и точка с запятой.</b>
+                <br><br>
+                До сих пор мы знали три знака препинания - точка, запятая и дефис (тире).
+                В этом уроке будут введены ещё два.
+                """
+        })
+        // TODO
+        +Info(InfoInterpolation.run {
+            """
+                Урок $iLesson - двоеточие и точка с запятой - подошёл к концу.
+                <br>
+                Следующий урок посвящён не менее важным символам - вопросительному знаку и 
+                восклицательному знаку.
+                """
+        })
+    }
+    lesson("Вопросительный и восклицательный знак"){
+        +Info(InfoInterpolation.run {
+            """
+                    <b>Урок $iLesson. Вопросительный и восклицательный знак.</b>
+                    <br><br>
+                    В этом уроке мы пополним коллекцию известных нам знаков препинания.
+                    <br>
+                    Перед стартом немного повторения. Введите слово ВОСКЛИЦАНИЕ
+                    """
+        })
+        inputChars("ВОСКЛИЦАНИЕ")
+        +Info(
+            """
+                    Вопросительный знак - точки 2 и 6. Как буква Е, но точки сдвинуты на один ряд вниз.
+                    <br>
+                    В следующих шагах ознакомимся с этим символом.
+                    """
+        )
+        showAndInputChars("?")
+        +Info(
+            """
+                    Раскройте страницу 55 пособия.
+                    <br>
+                    В четвёртой снизу строчке вводится вопросительный знак. Полное шеститочие перед
+                    ним приведено лишь в качестве ориентира.
+                    <br>
+                    В строках ниже прочтите примеры с вопросительным знаком.
+            """
+        ).annotate(StepAnnotation.golubinaBookRequired)
+        +Info(
+            """Введите вопрос: ГДЕ?"""
+        )
+        inputChars("ГДЕ?")
+        +Info("""Наберите по буквам вопрос: КОГДА?""")
+        inputChars("КОГДА?")
+
+        +Info(
+            """
+                    Восклицательный знак в азбуке Брайля - точки 2, 3 и 5. Не перепутайте с буквой Ф:
+                    точки расположены похожим образом, но каждая сдвинута на ряд ниже.
+                    """
+        )
+        showAndInputChars("!")
+        +Info(
+            """
+                    Найдите в обучающем пособии страницу 56.
+                    <br>
+                    В третьей сверху строке описан восклицательный знак. Прочтите эту строку.
+                    <br>
+                    Затем прочтите приведённые в следующих строках цитаты А. С. Пушкина и Н. А. 
+                    Некрасова.
+            """
+        ).annotate(StepAnnotation.golubinaBookRequired)
+        +Info("""В завершение урока введите слово с восклицательным знаком на конце: ЧУДЕСНО!""")
+        inputChars("ЧУДЕСНО!")
+        +Info(InfoInterpolation.run {
+            """
+                Поздравляем. Урок $iLesson - восклицательный и вопросительный знак - завершён.
+                <br>
+                В следующем уроке мы изучим скобки, кавычки и знак "Звёздочка".
+            """
+        })
+    }
+    lesson("""Скобки, кавычки и знак "*" """){
+        +Info(InfoInterpolation.run {
+            """
+                <b>Урок $iLesson: Скобки, кавычки и знак "Звёздочка".</b>
+                <br><br>
+                В результате этого занятия мы изучим парные знаки препинания - скобки и кавычки,
+                а также узнаем, как в рельефно-точечном алфавите обозначается символ "Звёздочка"
+                и знак ударения.
+                """
+        })
+        // TODO
+        +Info(InfoInterpolation.run {
+            """
+                Урок $iLesson - cкобки, кавычки и знак "Звёздочка" - подходит к завершению.
+                <br>
+                Следующие уроки покрывают материал, который встречается в брайлевских книгах 
+                не так часто, поэтому упражнений будет меньше и изложение будет носить скорее 
+                справочный характер.
+                """
+        })
+    }
+    lesson("Специальные символы"){ // Golubina: pp 59-62
+        +Info(InfoInterpolation.run {
+            """
+                <b>Урок $iLesson: Специальные символы.</b>
+                <br><br>
+                Этот урок посвящён литературным знакам и знакам выделения шрифтов, которые,
+                за исключением, разве что, знака ударения, не имеют аналогов в плоскопечатном
+                письме.
+                """
+        })
+        +Info(
+            """
+                    Знак ударения обозначается точкой 4 и ставится в клетке перед ударной гласной. 
+                    <br>
+                    Например, в слове МОСКВА знак ударения будет стоять перед буквой А.
+                    """
+        )
+        showAndInputChars("\'")
+        +Info(
+            """
+                    Раскройте пособие В. Голубиной на странице 59.
+                    <br>
+                    Прочтите вторую сверху строку, где вводится знак ударения. Также прочтите
+                    примеры употребления этого знака в шестой и седьмой строках сверху.
+            """
+        ).annotate(StepAnnotation.golubinaBookRequired)
+        +Info(
+            """
+                    В брайлевских текстах перед именами и названиями иногда ставят <b>признак
+                    большой буквы</b>. Он обозначается точками 4 и 5.
+                    """
+        )
+        +Show(content.markers.getValue(MarkerType.RussianCapital))
+        +Input(content.markers.getValue(MarkerType.RussianCapital))
+        +Info(
+            """
+                    На странице 59 в пособии прочтите четыре нижние строки, где приводится признак
+                    большой русской буквы и предложение с его использованием.
+            """
+        ).annotate(StepAnnotation.golubinaBookRequired)
+        // TODO bold font, italic font markers
+        +Info(InfoInterpolation.run {
+            """
+                Урок $iLesson - специальные символы - закончен.
+                <br>
+                Мы привели лишь наиболее часто употребимые литературные знаки. Полный
+                список доступен в интернете на сайте <b>chtenie.spb.ru</b>
+                <br>
+                На следующем занятии мы познакомимся с обозначениями основных арифметических знаков.
+                """
+        })
+    }
+
+    lesson("Математические символы"){ // Golubina: p 65
+        +Info(InfoInterpolation.run {
+            """
+                <b>Урок $iLesson: Математические символы.</b>
+                <br><br>
+                В данном уроке мы изучим запись арифметических операций: сложение, умножение,
+                вычитание и деление, а также равенство. В плоскопечатном шрифте для умножения и 
+                деления есть два варианта записи; оба варианта имеют аналоги в шрифте Брайля.
+                """
+        })
+        // TODO
+        +Info(InfoInterpolation.run {
+            """
+                Урок $iLesson - математические символы - окончен.
+                <br>
+                В следующих двух уроках мы бегло ознакомимся с обозначениями латинских и греческих
+                букв.
+                """
+        })
+    }
     lesson("Латинский алфавит") {
         +Info(InfoInterpolation.run {
             """

From 42de5d1f32630176ba810d7d5e9a7f3c83b97f98 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Fri, 18 Sep 2020 22:30:05 +0300
Subject: [PATCH 059/117] #250 fix card fragment for marker symbols

---
 .../ui/screens/practice/CardFragment.kt       | 54 +++++++++++++++----
 .../ui/screens/practice/CardViewModel.kt      | 14 ++---
 app/src/main/res/layout/fragment_card.xml     | 15 +++++-
 3 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
index cab053f3..6dadf0dd 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
@@ -2,15 +2,19 @@ package com.github.braillesystems.learnbraille.ui.screens.practice
 
 import android.os.Bundle
 import android.os.Vibrator
+import android.util.TypedValue
 import android.view.*
 import androidx.core.content.getSystemService
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import com.github.braillesystems.learnbraille.R
+import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
+import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.databinding.FragmentCardBinding
 import com.github.braillesystems.learnbraille.res.deckTagToName
+import com.github.braillesystems.learnbraille.res.inputMarkerPrintRules
 import com.github.braillesystems.learnbraille.ui.*
 import com.github.braillesystems.learnbraille.ui.brailletrainer.BrailleTrainer
 import com.github.braillesystems.learnbraille.ui.brailletrainer.BrailleTrainerSignalHandler
@@ -50,7 +54,7 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
         R.layout.fragment_card,
         container,
         false
-    ).apply {
+    ).also { binding ->
 
         Timber.i("onCreateView")
 
@@ -58,15 +62,19 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
         setHasOptionsMenu(true)
 
         if (preferenceRepository.extendedAccessibilityEnabled) {
-            hintButton.setSize(
+            binding.hintButton.setSize(
                 width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
             )
-            nextButton.setSize(
+            binding.nextButton.setSize(
                 width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
             )
+            binding.markerDescription.setTextSize(
+                TypedValue.COMPLEX_UNIT_SP,
+                application.extendedTextSize
+            )
         }
 
-        dotsState = brailleDots.dotsState.apply {
+        dotsState = binding.brailleDots.dotsState.apply {
             subscribe(View.OnClickListener {
                 viewModel.onSoftCheck()
             })
@@ -76,7 +84,7 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             parametersOf({ dotsState.brailleDots })
         }
         viewModel = ViewModelProvider(
-            this@CardFragment, viewModelFactory
+            this, viewModelFactory
         ).get(CardViewModel::class.java)
         buzzer = activity?.getSystemService()
         BrailleTrainer.setSignalHandler(object : BrailleTrainerSignalHandler {
@@ -85,10 +93,26 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
         })
 
 
-        cardViewModel = viewModel
-        lifecycleOwner = this@CardFragment
+        binding.cardViewModel = viewModel
+        binding.lifecycleOwner = this@CardFragment
 
 
+        viewModel.symbol.observe(viewLifecycleOwner, Observer {
+            if (it == null) return@Observer
+            when (it) {
+                is Symbol -> {
+                    binding.letter.visibility = View.VISIBLE
+                    binding.markerDescription.visibility = View.GONE
+                    binding.letter.text = it.char.toString()
+                }
+                is MarkerSymbol -> {
+                    binding.letter.visibility = View.GONE
+                    binding.markerDescription.visibility = View.VISIBLE
+                    binding.markerDescription.text = contextNotNull.inputMarkerPrintRules[it.type]
+                }
+            }
+        })
+
         viewModel.observeCheckedOnFly(
             viewLifecycleOwner, dotsState, buzzer,
             block = { updateTitle(title) },
@@ -99,8 +123,10 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             viewLifecycleOwner, dotsState, buzzer
         ) {
             viewModel.symbol.value?.let { symbol ->
-                require(symbol.length == 1)
-                showIncorrectToast(symbol.first())
+                when (symbol) {
+                    is Symbol -> showIncorrectToast(symbol.char)
+                    is MarkerSymbol -> showIncorrectToast()
+                }
             } ?: checkedToast(getString(R.string.input_loading))
             updateTitle(title)
         }
@@ -115,7 +141,10 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             viewLifecycleOwner, dotsState
         ) {
             viewModel.symbol.value?.let {
-                announceIntro(it)
+                when (it) {
+                    is Symbol -> announceIntro(it.char.toString())
+                    is MarkerSymbol -> checkedAnnounce(contextNotNull.inputMarkerPrintRules[it.type]!!)
+                }
             }
         }
 
@@ -123,7 +152,10 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             viewLifecycleOwner,
             Observer {
                 if (it == null) return@Observer
-                announceIntro(it)
+                when (it) {
+                    is Symbol -> announceIntro(it.char.toString())
+                    is MarkerSymbol -> checkedAnnounce(contextNotNull.inputMarkerPrintRules[it.type]!!)
+                }
             }
         )
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
index 9b4b763f..f5dfe5d9 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
@@ -40,8 +40,8 @@ class CardViewModel(
 ) : AndroidViewModel(application),
     DotsChecker by dotsChecker {
 
-    private val _symbol = MutableLiveData<String?>()
-    val symbol: LiveData<String?> get() = _symbol
+    private val _symbol = MutableLiveData<MaterialData>()
+    val symbol: LiveData<MaterialData> get() = _symbol
 
     private val _deckTag = MutableLiveData<String?>()
     val deckTag: LiveData<String?> get() = _deckTag
@@ -109,10 +109,12 @@ class CardViewModel(
             materialsQueue.add(material.data)
         }
 
-        require(material.data is Symbol) // TODO #250 change for symbols desk
-        material.data.run {
-            _symbol.value = char.toString()
-            expectedDots = brailleDots
+        material.data.let {
+            _symbol.value = it
+            expectedDots = when (it) {
+                is Symbol -> it.brailleDots
+                is MarkerSymbol -> it.brailleDots
+            }
         }
 
         // Should be called after getting material because deck changes automatically
diff --git a/app/src/main/res/layout/fragment_card.xml b/app/src/main/res/layout/fragment_card.xml
index 4fbf3adf..6c6c8ab2 100644
--- a/app/src/main/res/layout/fragment_card.xml
+++ b/app/src/main/res/layout/fragment_card.xml
@@ -16,13 +16,26 @@
         android:layout_height="match_parent"
         tools:context=".ui.screens.practice.CardFragment">
 
+        <TextView
+            android:id="@+id/marker_description"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/lessons_dots_info_height"
+            android:text=""
+            android:textAlignment="center"
+            android:textSize="@dimen/lessons_info_text_size"
+            app:layout_constraintBottom_toTopOf="@+id/braille_dots"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="" />
+
         <com.github.braillesystems.learnbraille.ui.views.InputBigLetterView
             android:id="@+id/letter"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:scaleX="@dimen/letter_practice_scale_of_view"
             android:scaleY="@dimen/letter_practice_scale_of_view"
-            android:text="@{cardViewModel.symbol}"
+            android:text=""
             android:textSize="@dimen/big_letter_text_size"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/braille_dots"

From 50f5eeeb7c50e6f7d73a254202b1a8aa805668f9 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Fri, 18 Sep 2020 22:34:58 +0300
Subject: [PATCH 060/117] Fix detekt

---
 detekt-config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/detekt-config.yml b/detekt-config.yml
index 9443f8f0..1d05da16 100644
--- a/detekt-config.yml
+++ b/detekt-config.yml
@@ -5,6 +5,8 @@ complexity:
     active: false
   LongMethod:
     active: false
+  ComplexMethod:
+    active: false
   LongParameterList:
     active: false
 

From ac5f0664f8c4f62ee4e91eda7e4832beeafc2cba Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 19 Sep 2020 20:42:36 +0300
Subject: [PATCH 061/117] #250 update strings

---
 app/src/main/res/values/strings.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fcff7477..36feef32 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -172,7 +172,7 @@
         Если Вы <b>забыли символ</b>, можно нажать <b>кнопку \"подсказка\"</b> слева внизу экрана.
         По нажатию этой кнопки будет выведено сообщение с верными номерами точек, шеститочие будет
         заполнено правильными точками и недоступно для переключения. После этого нужно нажать кнопку
-        <b>\"далее\"</b> и ввести ту же букву ещё раз.
+        <b>\"далее\"</b> и ввести тот же символ ещё раз.
         ]]>
     </string>
 
@@ -517,7 +517,4 @@
     <string name="stats_property_input_steps_passed">Пройдено шагов с вводом</string>
     <string name="stats_section_7days">За последние 7 дней</string>
     <string name="stats_section_30days">За последние 30 дней</string>
-
-    <string name="letter_caption_example">Пример заголовка</string>
-
 </resources>

From 6c0919e5dff440431a5e6f908a090a9702bfa0f0 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sun, 20 Sep 2020 12:28:15 +0300
Subject: [PATCH 062/117] #224 add all lessons content

---
 .../learnbraille/res/GolubinaCourse.kt        | 196 ++++++++++++++++--
 1 file changed, 183 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index c2a98e5a..6d0cb00e 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -1641,16 +1641,66 @@ internal val golubinaIntroLessons by lessons {
             """
         })
     }
-    lesson("Двоеточие и точка с запятой"){ // Golubina pp 53-54
+    lesson("Двоеточие и точка с запятой") { // Golubina pp 53-54
         +Info(InfoInterpolation.run {
             """
                 <b>Урок $iLesson: Двоеточие и точка с запятой.</b>
                 <br><br>
                 До сих пор мы знали три знака препинания - точка, запятая и дефис (тире).
                 В этом уроке будут введены ещё два.
+                <br>
+                В виде разминки перед уроком введите по буквам слово ДВОЕТОЧИЕ
                 """
         })
-        // TODO
+        inputChars("ДВОЕТОЧИЕ")
+        +Info(
+            """
+                    В рельефно-точечном алфавите точка с запятой обозначается точками с номерами 2
+                    и 3. Напоминает букву Б, только точки сдвинуты на ряд вниз.
+                    <br>
+                    В следующих шагах ознакомьтесь с символом "Точка с запятой".
+                    """
+        )
+        showAndInputChars(";")
+        +Info(
+            """
+                    Раскройте пособие В. Голубиной на странице 53.
+                    <br>
+                    Прочтите шестую сверху строку, где после полного шеститочия приведено обозначение
+                    знака "точка с запятой". Затем прочтите цитату М. Шолохова в строках ниже.
+            """
+        ).annotate(StepAnnotation.golubinaBookRequired)
+        +Info(
+            """
+                    Точка с запятой используется для разделения частей сложного предложения.
+                    <br>
+                    В следующих шагах введите слово РАЗДЕЛЕНИЕ; и поставьте в конце точку с запятой.
+            """
+        )
+        inputChars("РАЗДЕЛЕНИЕ;")
+        +Info(
+            """
+                    Двоеточие записывается в азбуке Брайля с помощью точек 2 и 5. Похоже на дефис,
+                    но точки расположены на ряд выше.
+                    <br>
+                    Далее прочтите, а затем введите этот знак.
+                    """
+        )
+        showAndInputChars(":")
+        +Info(
+            """
+                    В пособии В. В. Голубиной перейдите к странице 54.
+                    <br>
+                    На этой странице прочтите строку 4 сверху, где записан брайлевский знак двоеточия.
+                    <br>
+                    Прочтите и остальное содержание страницы 54 - предложение о Летнем Саде, а также
+                    цитаты Пушкина и Горького.
+            """
+        ).annotate(StepAnnotation.golubinaBookRequired)
+        +Info(
+            """Введите по буквам слово ВЫВОД: и поставьте в конце двоеточие"""
+        )
+        inputChars("ВЫВОД:")
         +Info(InfoInterpolation.run {
             """
                 Урок $iLesson - двоеточие и точка с запятой - подошёл к концу.
@@ -1660,14 +1710,14 @@ internal val golubinaIntroLessons by lessons {
                 """
         })
     }
-    lesson("Вопросительный и восклицательный знак"){
+    lesson("Вопросительный и восклицательный знак") {
         +Info(InfoInterpolation.run {
             """
                     <b>Урок $iLesson. Вопросительный и восклицательный знак.</b>
                     <br><br>
                     В этом уроке мы пополним коллекцию известных нам знаков препинания.
                     <br>
-                    Перед стартом немного повторения. Введите слово ВОСКЛИЦАНИЕ
+                    Перед стартом немного повторения. Введите слово <b>"ВОСКЛИЦАНИЕ"</b>
                     """
         })
         inputChars("ВОСКЛИЦАНИЕ")
@@ -1723,17 +1773,68 @@ internal val golubinaIntroLessons by lessons {
             """
         })
     }
-    lesson("""Скобки, кавычки и знак "*" """){
+    lesson("""Скобки, кавычки и знак "*" """) { // Golubina pp 57-58
         +Info(InfoInterpolation.run {
             """
                 <b>Урок $iLesson: Скобки, кавычки и знак "Звёздочка".</b>
                 <br><br>
                 В результате этого занятия мы изучим парные знаки препинания - скобки и кавычки,
-                а также узнаем, как в рельефно-точечном алфавите обозначается символ "Звёздочка"
-                и знак ударения.
+                а также узнаем, как в рельефно-точечном алфавите обозначается символ "Звёздочка".
+                <br>
+                Перед уроком закрепим пройденное. Введите слово <b>"ВНИМАНИЕ!"</b> и поставьте на конце
+                восклицательный знак.
                 """
         })
-        // TODO
+        inputChars("ВНИМАНИЕ!")
+        +Info(
+            """
+                    Левая открывающая скобка обозначается точками с номерами 1, 2 и 6, правая - 3,
+                    4 и 5. Заметьте, правая является зеркальным отражением левой.
+                    <br>
+                    Скобки при письме примыкают к выделяемой части предложения.
+                    """
+        )
+        showAndInputChars("()")
+        +Info(
+            """
+                    Найдите страницу 57 в обучающем пособии.
+                    <br>
+                    Изучите три верхние строки - обозначение скобок и комментарий. Также прочтите
+                    на следующих трёх строках предложение о Русском музее с примером употребления
+                    скобок.
+            """
+        ).annotate(StepAnnotation.golubinaBookRequired)
+        +Info("""Введите слово <b>(ВЕРОЯТНО)</b>, заключив его в скобки""")
+        inputChars("(ВЕРОЯТНО)")
+        +Info(
+            """
+                    Теперь изучим кавычки. Левая (открывающая) кавычка - это точки 2, 3 и 6, правая
+                    (закрывающая) - точки 3, 5 и 6.
+                    <br>
+                    Как и скобки, кавычки примыкают к выделяемой части. Открывающая и закрывающая
+                    кавычки являются зеркальным отражением друг друга.
+                    """
+        )
+        showAndInputChars("«»")
+        +Info("""Введите название повести Тургенева - <b>«НАКАНУНЕ»</b>, заключив его в кавычки""")
+        inputChars("«НАКАНУНЕ»")
+        +Info(
+            """
+                    Нам осталось изучить ещё один символ в этом уроке - знак "Звёздочка".
+                    <br>
+                    Звёздочка обозначается двумя точками с номерами 3 и 5.
+                    """
+        )
+        showAndInputChars("*")
+        +Info(
+            """
+                    На той же странице 57 пособия, где мы изучали скобки, прочтите шесть нижних строк.
+                    В них демонстрируются символы открывающей скобки, звёздочки и закрывающей скобки.
+                    <br>
+                    После этого переверните страницу и прочтите шесть верхних строк, где приведены 
+                    примеры использования кавычек.
+            """
+        ).annotate(StepAnnotation.golubinaBookRequired)
         +Info(InfoInterpolation.run {
             """
                 Урок $iLesson - cкобки, кавычки и знак "Звёздочка" - подходит к завершению.
@@ -1744,7 +1845,7 @@ internal val golubinaIntroLessons by lessons {
                 """
         })
     }
-    lesson("Специальные символы"){ // Golubina: pp 59-62
+    lesson("Специальные символы") { // Golubina: pp 59-62
         +Info(InfoInterpolation.run {
             """
                 <b>Урок $iLesson: Специальные символы.</b>
@@ -1752,6 +1853,8 @@ internal val golubinaIntroLessons by lessons {
                 Этот урок посвящён литературным знакам и знакам выделения шрифтов, которые,
                 за исключением, разве что, знака ударения, не имеют аналогов в плоскопечатном
                 письме.
+                <br>
+                До сих пор мы знали один такой знак - цифровой. Теперь познакомимся и с остальными.
                 """
         })
         +Info(
@@ -1784,20 +1887,70 @@ internal val golubinaIntroLessons by lessons {
                     большой русской буквы и предложение с его использованием.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
-        // TODO bold font, italic font markers
+        +Info(
+            """
+                    Если в текст на русском языке вставлено слово на латинице (например, 
+                    на английском), перед ним непременно ставится <b>признак большой латинской буквы</b>
+                    или <b>признак малой латинской буквы</b>.
+                    <br>
+                    Признак большой буквы латинского алфавита - точки 4 и 6.
+                    <br>
+                    Признак малой буквы латинского алфавита обозначается одной точкой номер 6.
+                    """
+        )
+        +Show(content.markers.getValue(MarkerType.LatinCapital))
+        +Input(content.markers.getValue(MarkerType.LatinCapital))
+        +Info(
+            """
+                    Перед греческими буквами в русских текстах ставят <b>признак большой буквы
+                    греческого алфавита</b>. Он обозначается точками 4, 5 и 6. Не перепутайте 
+                    с буквой "Л".
+                    """
+        )
+        +Info(
+            """
+                    Переверните страницу в пособии и прочтите содержание страницы 60, где вводятся
+                    признаки букв греческого и латинского алфавита.
+            """
+        ).annotate(StepAnnotation.golubinaBookRequired)
+        +Info(
+            """
+                    Иногда для смыслового выделения используют жирный или курсивный шрифт. Для них
+                    в брайлевских текстах есть специальные знаки, которые ставятся с обеих сторон
+                    выделяемого слова или фразы, причём примыкают вплотную к тексту, как скобки
+                    или кавычки.
+                    <br>
+                    Знак курсивного шрифта обозначается точками 4, 5, 6 (совпадает с признаком большой
+                    латинской буквы).
+                    <br>
+                    Знак жирного шрифта - точки 1, 2, 4, 5, 6 (то есть все, кроме третьей).
+                    """
+        )
+        +Show(content.markers.getValue(MarkerType.ItalicFont))
+        +Input(content.markers.getValue(MarkerType.ItalicFont))
+        +Show(content.markers.getValue(MarkerType.BoldFont))
+        +Input(content.markers.getValue(MarkerType.BoldFont))
+        +Info(
+            """
+                    Прочтите первые пять строк на странице 61. Там рассказывается о знаках жирного
+                    и курсивного шрифта. При желании прочтите и остальной материал на странице, где
+                    рассказывается о знаках разрядки и выделения врезки. Мы не будем изучать эти знаки
+                    в данном курсе.
+            """
+        ).annotate(StepAnnotation.golubinaBookRequired)
         +Info(InfoInterpolation.run {
             """
                 Урок $iLesson - специальные символы - закончен.
                 <br>
                 Мы привели лишь наиболее часто употребимые литературные знаки. Полный
-                список доступен в интернете на сайте <b>chtenie.spb.ru</b>
+                список доступен в интернете на сайте <b>chtenie.spb.ru/komissia.htm</b>
                 <br>
                 На следующем занятии мы познакомимся с обозначениями основных арифметических знаков.
                 """
         })
     }
 
-    lesson("Математические символы"){ // Golubina: p 65
+    lesson("Математические символы") { // Golubina: p 65
         +Info(InfoInterpolation.run {
             """
                 <b>Урок $iLesson: Математические символы.</b>
@@ -1805,9 +1958,26 @@ internal val golubinaIntroLessons by lessons {
                 В данном уроке мы изучим запись арифметических операций: сложение, умножение,
                 вычитание и деление, а также равенство. В плоскопечатном шрифте для умножения и 
                 деления есть два варианта записи; оба варианта имеют аналоги в шрифте Брайля.
+                <br>
+                В следующих шагах ознакомьтесь с обозначениями знаков арифметических действий
+                и введите их на экране.
                 """
         })
-        // TODO
+        showAndInputChars("+-✕·/÷=")
+        +Info(
+            """
+                    Раскройте книгу В. В. Голубиной на странице 65 и прочтите её содержание. Там
+                    приведены обозначения арифметических операций, математические скобки (здесь мы
+                    не будем их изучать) и записано несколько арифметических примеров.
+            """
+        ).annotate(StepAnnotation.golubinaBookRequired)
+
+        +Info("""В следующих шагах запишите: ДВА ПЛЮС ДВА РАВНО ЧЕТЫРЕ""")
+        +Input(content.markers.getValue(MarkerType.NumberSign))
+        inputChars("2+")
+        +Input(content.markers.getValue(MarkerType.NumberSign))
+        inputChars("2=4")
+
         +Info(InfoInterpolation.run {
             """
                 Урок $iLesson - математические символы - окончен.

From 875584d54dba82fec8fa6352465ddecf4a49f0a0 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sun, 20 Sep 2020 18:40:55 +0300
Subject: [PATCH 063/117] #224: add more steps with slate&stylus

---
 .../learnbraille/res/GolubinaCourse.kt        | 251 +++++++++++++++---
 .../braillesystems/learnbraille/res/_DSL.kt   |   8 +
 2 files changed, 221 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index 6d0cb00e..172dac4b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -115,9 +115,9 @@ internal val golubinaIntroLessons by lessons {
         +InputDots(text = """Введите "средние точки" 2 и 5""", dots = BrailleDots(E, F, E, E, F, E))
         +Info(
             """Запишите "средние точки" 2 и 5 на брайлевском приборе.
-                      <br>
-                      Если у Вас нет возможности писать по Брайлю, в разделе "Настройки" можно отключить
-                      шаги, требующие обращения к брайлевскому прибору.
+                  <br>
+                  Совет: если у Вас нет возможности писать на брайлевском приборе, в разделе "Настройки" можно отключить
+                  шаги, требующие обращения к брайлевскому прибору.
         """
         ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
@@ -147,12 +147,14 @@ internal val golubinaIntroLessons by lessons {
                     буква А точечным шрифтом."""
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Input(content.symbols.getValue('А'))
+        slateStylusLine('А')
         +Show(content.symbols.getValue('Б'))
         +Info(
             """Снова изучим страницу 13 в пособии. Под строкой с буквой А - 
                     такая же с буквой Б."""
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Input(content.symbols.getValue('Б'))
+        slateStylusLine('Б')
         +Info(
             """
                     Буква Ц: точки 1 и 4
@@ -176,6 +178,12 @@ internal val golubinaIntroLessons by lessons {
         inputChars("ДЕД")
         +Info("""Далее в следующих четырёх шагах введите слово БАБА.""")
         inputChars("БАБА")
+        +Info(
+            """Запишите на брайлевском приборе три строки: из букв Ц, Д и Е.
+                    <br>
+                    После этого запишите через пробел слова: БАЦ, ДЕД, БАБА.
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """Урок $iLesson закончен. В следующем занятии займёмся повторением букв А, Б, Ц, Д, Е
                  и потренируемся писать цифры от 1 до 5, образуемые с помощью этих букв. Рекомендуем
@@ -221,16 +229,7 @@ internal val golubinaIntroLessons by lessons {
                     Число двадцать четыре - это цифровой знак, затем буквы Б и Д. 
                     В уроках мы для краткости не будем всякий раз ставить цифровой знак."""
         )
-        +Show(content.symbols.getValue('1'))
-        +Input(content.symbols.getValue('1'))
-        +Show(content.symbols.getValue('2'))
-        +Input(content.symbols.getValue('2'))
-        +Show(content.symbols.getValue('3'))
-        +Input(content.symbols.getValue('3'))
-        +Show(content.symbols.getValue('4'))
-        +Input(content.symbols.getValue('4'))
-        +Show(content.symbols.getValue('5'))
-        +Input(content.symbols.getValue('5'))
+        showAndInputChars("12345")
         +Info(
             """
                 На пятой сверху строчке на странице 14 пособия, под строкой с цифровым знаком,
@@ -238,6 +237,12 @@ internal val golubinaIntroLessons by lessons {
                 Изучите каждую цифру.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        +Info(
+            """
+                    Запишите, используя брайлевский прибор, цифровой знак и за ним изученные пять цифр.
+                    Получится число "двенадцать тысяч триста сорок пять".
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson пройден! Рекомендуем самостоятельно изучить цифры и числа на странице 15
@@ -276,6 +281,7 @@ internal val golubinaIntroLessons by lessons {
                 """
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Input(content.symbols.getValue('Ф'))
+        slateStylusLine('Ф')
         +Show(content.symbols.getValue('Г'))
         +Info(
             """
@@ -284,6 +290,7 @@ internal val golubinaIntroLessons by lessons {
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Input(content.symbols.getValue('Г'))
+        slateStylusLine('Г')
         +Info(
             """
                     В следующих трёх шагах введите по буквам слово БЕГ."""
@@ -299,6 +306,9 @@ internal val golubinaIntroLessons by lessons {
         )
         +Input(content.markers.getValue(MarkerType.NumberSign))
         inputChars("67")
+        +Info(
+            """Напишите слово БЕГ и число "ШЕСТДЕСЯТ СЕМЬ" при помощи брайлевского прибора."""
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """Поздравляем! Урок $iLesson пройден."""
         })
@@ -315,10 +325,7 @@ internal val golubinaIntroLessons by lessons {
                     Но перед изучением нового повторим пройденное. Введите по буквам слово ФЕБ."""
         })
         inputChars("ФЕБ")
-        +Info(
-            """
-                    В следующих шести шагах введите по буквам слово БАГДАД."""
-        )
+        +Info("""В следующих шести шагах введите по буквам слово БАГДАД.""")
         inputChars("БАГДАД")
         +Info(
             """Наберите в следующих четырёх шагах число СТО ДВАДЦАТЬ ТРИ, поставив перед ним
@@ -344,25 +351,17 @@ internal val golubinaIntroLessons by lessons {
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Input(content.symbols.getValue('Х'))
         +Input(content.symbols.getValue('8'))
-        +Info(
-            """
-                    В следующих шагах введите по буквам слово ЦЕХ
-                    """
-        )
+        slateStylusLine('Х')
+        +Info("""В следующих шагах введите по буквам слово ЦЕХ""")
         inputChars("ЦЕХ")
-        +Info(
-            """
-                Наберите слово БАЦ
-            """
-        )
-        inputChars("БАЦ")
-        +Info(
-            """
-                Далее введите, поставив цифровой знак, число "Восемьсот семьдесят шесть"
-            """
-        )
+        +Info("""Наберите восклицание АХ""")
+        inputChars("АХ")
+        +Info("""Далее введите, поставив цифровой знак, число "ВОСЕМЬСОТ СЕМЬДЕСЯТ ШЕСТЬ" """)
         +Input(content.markers.getValue(MarkerType.NumberSign))
         inputChars("876")
+        +Info(
+            """Введите на брайлевском приборе слова ЦЕХ, АХ и число ВОСЕМЬСОТ СЕМЬДЕСЯТ ШЕСТЬ."""
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson пройден!
@@ -391,6 +390,8 @@ internal val golubinaIntroLessons by lessons {
                 и рельефно-точечные изображения букв Ж и И.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('Ж')
+        slateStylusLine('И')
         +Info(
             """Введите буквы, составляющие слово БАГАЖ"""
         )
@@ -413,6 +414,13 @@ internal val golubinaIntroLessons by lessons {
         )
         +Input(content.markers.getValue(MarkerType.NumberSign))
         inputChars("850")
+        +Info(
+            """
+                    Напишите с помощью брайлевского прибора слова, набранные до этого на экране:
+                    <br>
+                    БАГДАД, ЖАЖДА, ГИД, ИЖИЦА и число ВОСЕМЬСОТ ПЯТЬДЕСЯТ.
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson закончен. Теперь Вы, помимо букв, знаете все цифры.
@@ -456,6 +464,8 @@ internal val golubinaIntroLessons by lessons {
                     буква К и рядом с ней строка из пяти брайлевских букв К. Ниже находится буква Л.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('К')
+        slateStylusLine('Л')
         +Info(
             """Введите по буквам слово КЛАД"""
         )
@@ -481,6 +491,7 @@ internal val golubinaIntroLessons by lessons {
                     под строками с буквами К, Л.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('М')
         +Info(
             """В следующих трёх шагах ведите по буквам слово МЕЛ"""
         )
@@ -493,6 +504,13 @@ internal val golubinaIntroLessons by lessons {
             """Напоследок введите по буквам слово ФИАЛКА"""
         )
         inputChars("ФИАЛКА")
+        +Info(
+            """
+                    Напишите на брайлевском приборе пройденные в уроке слова:
+                    <br>
+                    КЛАД, БЕЛКА, МЕЛ, МАК, ФИАЛКА.
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                     Мы подошли к концу урока $iLesson.
@@ -532,6 +550,7 @@ internal val golubinaIntroLessons by lessons {
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Input(content.symbols.getValue('Н'))
+        slateStylusLine('Н')
         +Info(
             """Введите по буквам слово БАНАН"""
         )
@@ -544,6 +563,13 @@ internal val golubinaIntroLessons by lessons {
             """Теперь введите по буквам слово БЛАНК"""
         )
         inputChars("БЛАНК")
+        +Info(
+            """
+                    С помощью брайлевского прибора запишите введённые ранее слова:
+                    <br>
+                    БАНАН, ЦЕНА, БЛАНК.
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                     На этом урок $iLesson завершается. Для закрепления материала полезно прочесть
@@ -579,6 +605,7 @@ internal val golubinaIntroLessons by lessons {
                     Возьмите пособие и откройте страницу 23. Сверху найдите букву О.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('О')
 
         +Info(
             """Наберите по буквам слово ОБЛАКО"""
@@ -605,6 +632,16 @@ internal val golubinaIntroLessons by lessons {
             """Напоследок введите слово ГЕОЛОГ и тоже поставьте запятую в конце"""
         )
         inputChars("ГЕОЛОГ,")
+        +Info(
+            """
+                    Используя брайлевский прибор, запишите фразу:
+                    <br>
+                    БЕЛОЕ ОБЛАКО, БЛЕДНОЕ ЛИЦО, БЕЛОЕ МОЛОКО
+                    <br>
+                    разделяя перечисляемые элементы запятыми. Затем откройте страницу 24 пособия,
+                    где записана эта фраза, и проверьте себя.
+            """
+        ).annotate(StepAnnotation.golubinaBookRequired, StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """Урок $iLesson подходит к концу. В следующем уроке нас ждёт изучение буквы П.
                     Материалы к этому занятию можно прочесть на страницах 23-24 в пособии.
@@ -637,6 +674,7 @@ internal val golubinaIntroLessons by lessons {
                     Найдём букву П в пособии. Для этого раскройте страницу 25 и изучите верхнюю строку.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('П')
         +Info(
             """Введите отдельными символами слово ПЕНА"""
         )
@@ -709,6 +747,13 @@ internal val golubinaIntroLessons by lessons {
             """Введите по буквам ещё одно, последнее слово: БОЧОНОК"""
         )
         inputChars("БОЧОНОК")
+        +Info(
+            """
+                    Запишите на брайлевском приборе изученные слова, разделяя их запятыми:
+                    <br>
+                    ЧЕК, ОЧКИ, КОЧАН, БОЧОНОК
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson, в котором мы изучали букву 'Ч', позади. 
@@ -744,6 +789,7 @@ internal val golubinaIntroLessons by lessons {
                     Раскройте страницу 27 в пособии и ознакомьтесь с буквой Р вверху листа.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('Р')
         +Info(
             """Наберите последовательно, по буквам слово РЕКА"""
         )
@@ -764,6 +810,13 @@ internal val golubinaIntroLessons by lessons {
             """Наберите аналогичным образом последнее слово в сегодняшнем уроке: ГАРАЖ"""
         )
         inputChars("ГАРАЖ")
+        +Info(
+            """
+                    Возьмите брайлевский прибор и запишите через запятую пройденные слова:
+                    <br>
+                    РЕКА, КРАН, КРЕМ, ФАРА, ГАРАЖ
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson завершён. Теперь мы, помимо прочего, знаем точечный состав буквы 'Р'.
@@ -798,6 +851,7 @@ internal val golubinaIntroLessons by lessons {
                     Перейдите в пособии Голубиной к странице 29 и прочтите сверху строку с буквой С.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('С')
         +Info(
             """В следующих шагах наберите слово САЖА"""
         )
@@ -818,6 +872,13 @@ internal val golubinaIntroLessons by lessons {
             """В завершение урока введите по буквам слово ЧЕСНОК"""
         )
         inputChars("ЧЕСНОК")
+        +Info(
+            """
+                    Осталось немного поработать с брайлевским прибором. Запишите на нём слова:
+                    <br>
+                    САЖА, СЛЕД, ФАСАД, ДОСКА, ЧЕСНОК
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                     Мы подошли к финалу урока $iLesson. К этому моменту мы уже изучили 19 букв,
@@ -889,6 +950,13 @@ internal val golubinaIntroLessons by lessons {
             """И последнее слово, которое нужно ввести в этом уроке — местоимение ГДЕ-ЛИБО"""
         )
         inputChars("ГДЕ—ЛИБО")
+        +Info(
+            """
+                    Теперь рекомендуем Вам записать на брайлевском приборе изученные слова:
+                    <br>
+                    ПОЛ—ЛИМОНА, ГДЕ—ЛИБО
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(
             """
                     На этом урок 14 закончен. Буква Т, которой он был посвящён, стала двадцатой
@@ -924,6 +992,7 @@ internal val golubinaIntroLessons by lessons {
                    Откройте эту страницу и прочтите верхнюю строку.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('У')
         +Info(
             """В следующих шагах введите, пожалуйста, слово УГОЛ"""
         )
@@ -941,9 +1010,16 @@ internal val golubinaIntroLessons by lessons {
         )
         inputChars("ТРУД")
         +Info(
-            """Последнее, что нужно сделать в этом уроке — введите слово ЧУДЕСА"""
+            """Последнее, что нужно набрать в этом уроке — слово ЧУДЕСА"""
         )
         inputChars("ЧУДЕСА")
+        +Info(
+            """
+                    Набранные в этом уроке слова запишем и на брайлевском приборе через запятую:
+                    <br>
+                    УГОЛ, ЛУНА, КРУГ, ТРУД, ЧУДЕСА
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson окончен. Мы изучили букву У — первую букву, где нам встретилась точка
@@ -973,6 +1049,7 @@ internal val golubinaIntroLessons by lessons {
                     """
         )
         +Show(content.symbols.getValue('Щ'))
+        slateStylusLine('Щ')
         +Info(
             """
                    Пособие содержит урок с буквой Щ на странице 33.
@@ -997,9 +1074,16 @@ internal val golubinaIntroLessons by lessons {
         )
         inputChars("ЩЕПКА")
         +Info(
-            """Перед тем, как мы закончим занятие, введите слово ОЩУЩЕНИЕ"""
+            """И последнее: введите слово ОЩУЩЕНИЕ"""
         )
         inputChars("ОЩУЩЕНИЕ")
+        +Info(
+            """
+                    Перед тем, как мы закончим занятие, запишите на брайлевском приборе все пройденные слова:
+                    <br>
+                    ЩЕГОЛ, ПЛАЩ, КЛЕЩ, ЩЕПКА, ОЩУЩЕНИЕ
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson - буква Щ - подходит к завершению. Теперь нам известны 22 буквы русского
@@ -1034,6 +1118,7 @@ internal val golubinaIntroLessons by lessons {
                    Прочтите первую строку на этой странице.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('З')
         +Info(
             """Последовательно, по буквам введите слово ЗАКАЗ"""
         )
@@ -1051,9 +1136,16 @@ internal val golubinaIntroLessons by lessons {
         )
         inputChars("АРБУЗ")
         +Info(
-            """И последнее, что сегодня осталось сделать: введите слово ЗАДАЧА"""
+            """И последнее, что сегодня осталось ввести: слово ЗАДАЧА"""
         )
         inputChars("ЗАДАЧА")
+        +Info(
+            """
+                    Для закрепления материала напишите слова на брайлевском приборе:
+                    <br>
+                    ЗАКАЗ, ЗЕРНО, АЗБУКА, АРБУЗ, ЗАДАЧА
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """                    
                     Вы успешно окончили урок $iLesson - буква З. На следующем занятии перейдём к освоению
@@ -1095,6 +1187,7 @@ internal val golubinaIntroLessons by lessons {
                    Ознакомьтесь с рельефно-графическим и рельефно-точечным изображением буквы "Й" на первой строке.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('Й')
         +Info(
             """Буква за буквой, введите точечным шрифтом слово КЛЕЙ"""
         )
@@ -1115,6 +1208,13 @@ internal val golubinaIntroLessons by lessons {
             """Наконец, введите последнее слово в этом уроке: РАЙОН"""
         )
         inputChars("РАЙОН")
+        +Info(
+            """
+                    Все пройденные слова следует записать на брайлевском приборе. Напомним, это слова
+                    <br>
+                    КЛЕЙ, УЛЕЙ, РЕЙС, ЗНОЙ, РАЙОН
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """                    
                     Урок $iLesson - буква 'И краткое' - окончен. Теперь мы знаем уже 4 буквы, содержащие
@@ -1153,6 +1253,7 @@ internal val golubinaIntroLessons by lessons {
                    Прочтите верхнюю строку, которая содержит пять повторов этого символа.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('Ъ')
         +Info(
             """Введите по буквам слово СЪЕЗД"""
         )
@@ -1177,6 +1278,9 @@ internal val golubinaIntroLessons by lessons {
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
         +Input(content.symbols.getValue('.'))
+        +Info(
+            "Используя брайлевский прибор, запишите строку из одних точек."
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(
             """
                     В следующих шагах введите по буквам целое предложение: "Ленинград — город-герой".
@@ -1184,7 +1288,14 @@ internal val golubinaIntroLessons by lessons {
                     В конце поставьте литературную точку.
                     """
         )
-        inputChars("ЛЕНИНГРАД—ГОРОД—ГЕРОЙ")
+        inputChars("ЛЕНИНГРАД—ГОРОД—ГЕРОЙ.")
+        +Info(
+            """
+                    Теперь запишите на брайлевском приборе то же самое предложение:
+                    <br>
+                    ЛЕНИНГРАД — ГОРОД—ГЕРОЙ.
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """                    
                     На этом мы завершаем занятие номер $iLesson. Осталось ещё семь уроков, после чего 
@@ -1225,6 +1336,7 @@ internal val golubinaIntroLessons by lessons {
                    рельефно-графические и рельефно-точечное изображение буквы Ы.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('Ы')
         +Info(
             """Набирая буквы одна за одной, введите слово МЫЛО"""
         )
@@ -1245,10 +1357,17 @@ internal val golubinaIntroLessons by lessons {
             """Введите последнее слово - существительное во множественном числе: КОЗЫ"""
         )
         inputChars("КОЗЫ")
+        +Info(
+            """
+                    Все изученные слова, пожалуйста, запишите и на брайлевском приборе:
+                    <br>
+                    МЫЛО, ЛЫЖИ, КЛЫК, МУЗЫКА, КОЗЫ
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """                    
                     Урок $iLesson - буква 'Ы' - подходит к завершению.
-                    Остались неизученными семь букв русского алфавита; для них отведены оставшиеся
+                    Остались неизученными семь букв русского алфавита; для них отведены последующие
                     шесть уроков. На следующем занятии будем осваивать мягкий знак.
                     """
         })
@@ -1282,6 +1401,7 @@ internal val golubinaIntroLessons by lessons {
                    После урока рекомендуем прочесть слова на страницах 39 и 40.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('Ь')
         +Info(
             """Введите по буквам существительное СОЛЬ"""
         )
@@ -1303,6 +1423,13 @@ internal val golubinaIntroLessons by lessons {
             """Введите последнее в этом занятии слово: СТАЛЬ"""
         )
         inputChars("СТАЛЬ")
+        +Info(
+            """
+                    Как обычно, напишите на брайлевском приборе изученные слова:
+                    <br>
+                    СОЛЬ, МЕЛЬ, КОНЬ, РУЧЬИ, СТАЛЬ
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """                    
                     Урок $iLesson, в котором мы изучили мягкий знак, пройден.
@@ -1339,6 +1466,7 @@ internal val golubinaIntroLessons by lessons {
                    Откройте страницу 41 и прочтите верхнюю строку с буквой Ё.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('Ё')
         +Info(
             """Шаг за шагом введите слово ЁЛКА"""
         )
@@ -1361,6 +1489,7 @@ internal val golubinaIntroLessons by lessons {
                    Прочтите строку с буквой Ш в середине страницы 41 пособия.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('Ш')
         +Info(
             """Наберите отдельными символами слово ШЁЛК"""
         )
@@ -1377,6 +1506,13 @@ internal val golubinaIntroLessons by lessons {
             """Наконец, перед тем, как мы закончим урок, введите слово КОШКА"""
         )
         inputChars("КОШКА")
+        +Info(
+            """
+                    Используя брайлевский прибор, запишите изученные в этом уроке существительные:
+                    <br>
+                    ЁЛКА, КЛЁН, ШЁЛК, ШЕСТ, ШАРФ, КОШКА
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """                    
                     Урок $iLesson, посвящённый буквам Ё и Ш, завершён.
@@ -1415,6 +1551,7 @@ internal val golubinaIntroLessons by lessons {
                    Откройте страницу 43 и прочтите верхнюю строку - пять букв 'Я' подряд.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('Я')
         +Info(
             """Введите брайлевские буквы, которые составляют слово ЯБЛОКО"""
         )
@@ -1437,6 +1574,13 @@ internal val golubinaIntroLessons by lessons {
             """Последнее слово в сегодняшнем уроке - ЗЕМЛЯ"""
         )
         inputChars("ЗЕМЛЯ")
+        +Info(
+            """
+                    Запишите на брайлевском приборе изученные слова с буквой Я:
+                    <br>
+                    ЯБЛОКО, ЯГОДА, ПЯТНО, ЦАПЛЯ, ЗЕМЛЯ
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson - буква Я - успешно завершён.
@@ -1472,6 +1616,7 @@ internal val golubinaIntroLessons by lessons {
                    Найдите сорок пятую страницу и ознакомьтесь с буквой Ю в самой верхней строке.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('Ю')
         +Info(
             """Наберите по символам слово с новой буквой: ЮБКА"""
         )
@@ -1497,6 +1642,13 @@ internal val golubinaIntroLessons by lessons {
             """Завершающее задание в этом уроке - введите буквы слова СЮЖЕТ"""
         )
         inputChars("СЮЖЕТ")
+        +Info(
+            """
+                    Снова возьмите брайлевский прибор и напишите пройденные слова с буквами Ю, Т:
+                    <br>
+                    ЮБКА, УТЮГ, ТЮБИК, ТРЮК, СЮЖЕТ
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson - русская буква Ю - закончен. Нам осталось пройти всего два занятия,
@@ -1542,6 +1694,7 @@ internal val golubinaIntroLessons by lessons {
                    Сейчас откройте страницу 47 и прочтите первую строку, где написана буква 'Э'.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('Э')
         +Info(
             """Вводя отдельные буквы, составьте слово ЭХО"""
         )
@@ -1568,6 +1721,13 @@ internal val golubinaIntroLessons by lessons {
             """В последнем задании нужно ввести слово ЭСТРАДА"""
         )
         inputChars("ЭСТРАДА")
+        +Info(
+            """
+                    Теперь запишите введённые ранее слова на брайлевском приборе:
+                    <br>
+                    ЭХО, ПОЭМА, ЭКРАН, ЭПИЗОД, ЭСТРАДА
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                     Урок $iLesson, в ходе которого мы выучили букву Э, закончен.
@@ -1606,6 +1766,7 @@ internal val golubinaIntroLessons by lessons {
                     где написана буква 'В'.
             """
         ).annotate(StepAnnotation.golubinaBookRequired)
+        slateStylusLine('В')
         +Info(
             """Наберите первое слово с буквой 'В' - слово ВОР"""
         )
@@ -1632,6 +1793,13 @@ internal val golubinaIntroLessons by lessons {
             """Заключительное упражнение: наберите слово КОРОВА"""
         )
         inputChars("КОРОВА")
+        +Info(
+            """
+                    Не забудьте для тренировки написать на брайлевском приборе набранные слова:
+                    <br>
+                    ВОР, ВРАЧ, ВОРОНА, СЕВЕР, КОРОВА.
+            """
+        ).annotate(StepAnnotation.slateStylusRequired)
         +Info(InfoInterpolation.run {
             """
                 Урок $iLesson - буква В - закончен.
@@ -1701,6 +1869,13 @@ internal val golubinaIntroLessons by lessons {
             """Введите по буквам слово ВЫВОД: и поставьте в конце двоеточие"""
         )
         inputChars("ВЫВОД:")
+        +Info(
+            """
+                    Перепишите, используя брайлевский прибор, предложение со страницы 54 пособия:
+                    <br>
+                    Летний Сад омывается реками: Невой, Мойкой, Фонтанкой и Лебяжьей Канавкой.
+            """
+        ).annotate(StepAnnotation.slateStylusRequired, StepAnnotation.golubinaBookRequired)
         +Info(InfoInterpolation.run {
             """
                 Урок $iLesson - двоеточие и точка с запятой - подошёл к концу.
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/_DSL.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/_DSL.kt
index 44877615..6b1d111d 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/_DSL.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/_DSL.kt
@@ -1,6 +1,8 @@
 package com.github.braillesystems.learnbraille.res
 
 import com.github.braillesystems.learnbraille.data.dsl.StepsBuilder
+import com.github.braillesystems.learnbraille.data.dsl.annotate
+import com.github.braillesystems.learnbraille.data.entities.Info
 import com.github.braillesystems.learnbraille.data.entities.Input
 import com.github.braillesystems.learnbraille.data.entities.Show
 
@@ -14,3 +16,9 @@ fun StepsBuilder.showAndInputChars(chars: String): Unit =
         +Show(content.symbols.getValue(it))
         +Input(content.symbols.getValue(it))
     }
+
+fun StepsBuilder.slateStylusLine(char: Char) {
+    +Info(
+        "Запишите на брайлевском приборе строку, состоящую из одного символа: $char."
+    ).annotate(StepAnnotation.slateStylusRequired)
+}

From 30658325e81361d87c21be9115eb40141f9445a7 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sun, 20 Sep 2020 18:43:07 +0300
Subject: [PATCH 064/117] #224 lesson 1: reduce steps with dots input

---
 .../learnbraille/res/GolubinaCourse.kt         | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index 172dac4b..6dbeb961 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -56,36 +56,18 @@ internal val golubinaIntroLessons by lessons {
             dots = BrailleDots(F, E, E, E, E, E)
         )
         +InputDots(text = "Введите точку один", dots = BrailleDots(F, E, E, E, E, E))
-        +ShowDots(
-            text = "Перед Вами символ шрифта Брайля - <br>" +
-                    " точка номер два",
-            dots = BrailleDots(E, F, E, E, E, E)
-        )
-        +InputDots(text = "Введите точку два", dots = BrailleDots(E, F, E, E, E, E))
         +ShowDots(
             text = "Перед Вами символ шрифта Брайля - <br>" +
                     " точка номер три",
             dots = BrailleDots(E, E, F, E, E, E)
         )
         +InputDots(text = "Введите точку три", dots = BrailleDots(E, E, F, E, E, E))
-        +ShowDots(
-            text = "Перед Вами символ шрифта Брайля - <br>" +
-                    " точка номер четыре",
-            dots = BrailleDots(E, E, E, F, E, E)
-        )
-        +InputDots(text = "Введите точку четыре", dots = BrailleDots(E, E, E, F, E, E))
         +ShowDots(
             text = "Перед Вами символ шрифта Брайля - <br>" +
                     " точка номер пять",
             dots = BrailleDots(E, E, E, E, F, E)
         )
         +InputDots(text = "Введите точку пять", dots = BrailleDots(E, E, E, E, F, E))
-        +ShowDots(
-            text = "Перед Вами символ шрифта Брайля - <br>" +
-                    " точка номер шесть",
-            dots = BrailleDots(E, E, E, E, E, F)
-        )
-        +InputDots(text = "Введите точку шесть", dots = BrailleDots(E, E, E, E, E, F))
         +InputDots(
             text = """Теперь выполним пять практических заданий без обучающей картинки. 
                       <br>

From 585f4d0d3520bea3a7ed0ef150a54970f0e1b42b Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Wed, 23 Sep 2020 16:35:19 +0300
Subject: [PATCH 065/117] #241 fix letter caption position on big screens

---
 app/src/main/res/values-sw320dp/dimens.xml | 4 +---
 app/src/main/res/values-sw400dp/dimens.xml | 2 --
 app/src/main/res/values-sw600dp/dimens.xml | 4 +---
 app/src/main/res/values-sw720dp/dimens.xml | 4 +---
 app/src/main/res/values/dimens.xml         | 1 -
 app/src/main/res/values/styles.xml         | 4 +---
 6 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/values-sw320dp/dimens.xml b/app/src/main/res/values-sw320dp/dimens.xml
index f949d2f4..f95fc631 100644
--- a/app/src/main/res/values-sw320dp/dimens.xml
+++ b/app/src/main/res/values-sw320dp/dimens.xml
@@ -9,7 +9,6 @@
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">1.1</dimen>
 
-    <dimen name="letter_practice_scale_of_view">0.8</dimen>
     <dimen name="practice_dots_vertical_bias">0.85</dimen>
     <dimen name="practice_buttons_vertical_bias">0.9</dimen>
 
@@ -30,8 +29,7 @@
     <dimen name="lessons_dots_info_width">394dp</dimen>
     <dimen name="lessons_dots_info_height">175dp</dimen>
 
-    <dimen name="big_letter_text_size">170sp</dimen>
-    <dimen name="big_letter_caption_padding">2dp</dimen>
+    <dimen name="big_letter_text_size">136sp</dimen>
 
     <dimen name="big_buttons_border_radius">30dp</dimen>
 
diff --git a/app/src/main/res/values-sw400dp/dimens.xml b/app/src/main/res/values-sw400dp/dimens.xml
index 5d73de3b..e0e9ebe7 100644
--- a/app/src/main/res/values-sw400dp/dimens.xml
+++ b/app/src/main/res/values-sw400dp/dimens.xml
@@ -9,7 +9,6 @@
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">1.5</dimen>
 
-    <dimen name="letter_practice_scale_of_view">1</dimen>
     <dimen name="practice_dots_vertical_bias">0.85</dimen>
     <dimen name="practice_buttons_vertical_bias">0.9</dimen>
 
@@ -31,7 +30,6 @@
     <dimen name="lessons_dots_info_height">175dp</dimen>
 
     <dimen name="big_letter_text_size">170sp</dimen>
-    <dimen name="big_letter_caption_padding">8dp</dimen>
 
     <dimen name="big_buttons_border_radius">40dp</dimen>
 
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 95771e98..32c7b84c 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -8,7 +8,6 @@
     <dimen name="braille_dots_inner_vertical_margin">25dp</dimen>
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">1.8</dimen>
-    <dimen name="letter_practice_scale_of_view">1.9</dimen>
 
     <dimen name="side_buttons_extended_width">80dp</dimen>
     <dimen name="side_buttons_width">65dp</dimen>
@@ -27,8 +26,7 @@
     <dimen name="lessons_dots_info_width">394dp</dimen>
     <dimen name="lessons_dots_info_height">175dp</dimen>
 
-    <dimen name="big_letter_text_size">150sp</dimen>
-    <dimen name="big_letter_caption_padding">11dp</dimen>
+    <dimen name="big_letter_text_size">285sp</dimen>
 
     <dimen name="big_buttons_border_radius">30dp</dimen>
 
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
index 8889dfa9..70f79b1a 100644
--- a/app/src/main/res/values-sw720dp/dimens.xml
+++ b/app/src/main/res/values-sw720dp/dimens.xml
@@ -8,7 +8,6 @@
     <dimen name="braille_dots_inner_vertical_margin">25dp</dimen>
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">2.1</dimen>
-    <dimen name="letter_practice_scale_of_view">2.2</dimen>
 
     <dimen name="side_buttons_extended_width">90dp</dimen>
     <dimen name="side_buttons_width">75dp</dimen>
@@ -27,8 +26,7 @@
     <dimen name="lessons_dots_info_width">394dp</dimen>
     <dimen name="lessons_dots_info_height">175dp</dimen>
 
-    <dimen name="big_letter_text_size">150sp</dimen>
-    <dimen name="big_letter_caption_padding">15dp</dimen>
+    <dimen name="big_letter_text_size">330sp</dimen>
 
     <dimen name="big_buttons_border_radius">30dp</dimen>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ce10c125..cacf9cb5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,7 +9,6 @@
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">1</dimen>
 
-    <dimen name="letter_practice_scale_of_view">0.8</dimen>
     <dimen name="practice_dots_vertical_bias">0.85</dimen>
     <dimen name="practice_buttons_vertical_bias">0.9</dimen>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6b1bda05..753c17af 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -47,11 +47,8 @@
     <style name="bigLetterStyle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:scaleX">@dimen/letter_practice_scale_of_view</item>
-        <item name="android:scaleY">@dimen/letter_practice_scale_of_view</item>
         <item name="android:textSize">@dimen/big_letter_text_size</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:paddingTop">@dimen/big_letter_caption_padding</item>
     </style>
 
     <style name="bigLetterCaptionStyle">
@@ -60,6 +57,7 @@
         <item name="android:importantForAccessibility">no</item>
         <item name="android:textAlignment">center</item>
         <item name="android:textSize">@dimen/lessons_title_text_size</item>
+        <item name="android:paddingTop">@dimen/big_letter_caption_padding</item>
     </style>
 
     <style name="SwitchPreferenceButton" parent="Theme.AppCompat.Light">

From d2513e074b317d64824a84ce643e166ebdc8a6c2 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Wed, 23 Sep 2020 17:26:36 +0300
Subject: [PATCH 066/117] Remove SpeechRecognition

---
 app/src/main/AndroidManifest.xml              |   3 -
 .../data/repository/PreferenceRepository.kt   |   8 --
 .../ui/screens/exit/ExitFragment.kt           |  17 +--
 .../learnbraille/utils/SpeechRecognition.kt   | 124 ------------------
 4 files changed, 2 insertions(+), 150 deletions(-)
 delete mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/utils/SpeechRecognition.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 18285f0c..5a937f5c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.braillesystems.learnbraille">
 
-    <!--TODO-->
-    <!--<uses-permission android:name="android.permission.RECORD_AUDIO" />-->
     <uses-permission android:name="android.permission.VIBRATE" />
     <application
         android:name="com.github.braillesystems.learnbraille.LearnBrailleApplication"
@@ -21,7 +19,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <!--        TODO-->
         <!--        <service-->
         <!--            android:name="com.github.braillesystems.learnbraille.ui.brailletrainer.UsbService"-->
         <!--            android:enabled="true"></service>-->
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
index 4bbfb4d6..da51138f 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
@@ -16,7 +16,6 @@ interface PreferenceRepository {
     val buzzEnabled: Boolean
     val toastsEnabled: Boolean
     val brailleTrainerEnabled: Boolean get() = false // Uncomment in android manifest when set true
-    val speechRecognitionEnabled: Boolean
     val golubinaBookStepsEnabled: Boolean
     val traverseDotsInEnumerationOrder: Boolean
     val inputOnFlyCheck: Boolean
@@ -58,13 +57,6 @@ class PreferenceRepositoryImpl(
         )
     }
 
-    override val speechRecognitionEnabled: Boolean by logged {
-        context.preferences.getBoolean(
-            context.getString(R.string.preference_speech_recognition_enabled),
-            false // To enable, set to `true` and uncomment permission in AndroidManifest
-        )
-    }
-
     override val golubinaBookStepsEnabled: Boolean by logged {
         context.preferences.getBoolean(
             context.getString(R.string.preference_golubina_book_steps_enabled),
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
index 95ca0112..4f99a79f 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
@@ -8,17 +8,12 @@ import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.databinding.FragmentExitBinding
-import com.github.braillesystems.learnbraille.utils.SpeechRecognition
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.navigate
-import com.github.braillesystems.learnbraille.utils.updateTitle
-import org.koin.android.ext.android.get
-
+import com.github.braillesystems.learnbraille.utils.title
 
 class ExitFragment : Fragment() {
 
-    private lateinit var recognizer: SpeechRecognition
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -30,12 +25,9 @@ class ExitFragment : Fragment() {
         false
     ).apply {
 
-        val title: String = getString(R.string.exit_question)
-        updateTitle(title)
+        title = getString(R.string.exit_question)
         checkedAnnounce(title)
 
-        recognizer = SpeechRecognition(this@ExitFragment, get())
-
         exitButton.setOnClickListener {
             val homeIntent = Intent(Intent.ACTION_MAIN)
             homeIntent.addCategory(Intent.CATEGORY_HOME)
@@ -48,9 +40,4 @@ class ExitFragment : Fragment() {
         }
 
     }.root
-
-    override fun onDestroy() {
-        super.onDestroy()
-        recognizer.onDestroy()
-    }
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/SpeechRecognition.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/SpeechRecognition.kt
deleted file mode 100644
index 20348382..00000000
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/SpeechRecognition.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.github.braillesystems.learnbraille.utils
-
-import android.content.Intent
-import android.os.Bundle
-import android.speech.RecognitionListener
-import android.speech.RecognizerIntent
-import android.speech.SpeechRecognizer
-import android.speech.tts.TextToSpeech
-import android.speech.tts.UtteranceProgressListener
-import androidx.fragment.app.Fragment
-import com.github.braillesystems.learnbraille.R
-import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
-import timber.log.Timber
-import java.util.*
-import kotlin.collections.HashMap
-import kotlin.collections.set
-import kotlin.system.exitProcess
-
-// TODO refactor
-
-class SpeechRecognition(
-    private val fragment: Fragment,
-    private val preferenceRepository: PreferenceRepository
-) {
-
-    private var mostRecentUtteranceID: String? = null
-    private lateinit var mTTs: TextToSpeech
-    private var mSpeechRecognizer: SpeechRecognizer? = null
-    private var mSpeechRecognizerIntent: Intent? = null
-
-    init {
-        runIf(preferenceRepository.speechRecognitionEnabled) {
-            try {
-                initialize()
-            } catch (e: Throwable) {
-                Timber.e(e)
-            }
-        }
-    }
-
-    private fun initialize() = fragment.apply {
-        mTTs = TextToSpeech(context, TextToSpeech.OnInitListener { status ->
-            if (status == TextToSpeech.SUCCESS) {
-                mTTs.language = Locale.UK
-                mostRecentUtteranceID = (Random().nextInt() % 9999999).toString() + ""
-
-                val params: MutableMap<String, String?> = HashMap()
-                params[TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID] = mostRecentUtteranceID
-                @Suppress("DEPRECATION", "UNCHECKED_CAST")
-                mTTs.speak(
-                    getString(R.string.exit_question), TextToSpeech.QUEUE_FLUSH,
-                    params as HashMap<String, String>?
-                )
-                mTTs.setOnUtteranceProgressListener(object : UtteranceProgressListener() {
-                    override fun onDone(utteranceId: String) {
-                        if (utteranceId != mostRecentUtteranceID) {
-                            return
-                        }
-                        activity?.runOnUiThread {
-                            if (mSpeechRecognizer != null) {
-                                mSpeechRecognizer!!.startListening(mSpeechRecognizerIntent)
-                            }
-                        }
-                    }
-
-                    override fun onError(p0: String?) = Unit
-                    override fun onStart(p0: String?) = Unit
-                })
-
-            }
-        })
-
-        mSpeechRecognizer = SpeechRecognizer.createSpeechRecognizer(context)
-        mSpeechRecognizerIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
-        mSpeechRecognizerIntent?.putExtra(
-            RecognizerIntent.EXTRA_LANGUAGE_MODEL,
-            RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
-        )
-        mSpeechRecognizerIntent?.putExtra(
-            RecognizerIntent.EXTRA_CALLING_PACKAGE,
-            context?.packageName
-        )
-        mSpeechRecognizer?.setRecognitionListener(SpeechRecognitionListener(fragment))
-    }
-
-    fun onDestroy() = runIf(preferenceRepository.speechRecognitionEnabled) {
-        try {
-            mSpeechRecognizer?.destroy()
-        } catch (e: Throwable) {
-            Timber.e(e)
-        }
-    }
-}
-
-private class SpeechRecognitionListener(fragment: Fragment) : RecognitionListener {
-
-    override fun onBeginningOfSpeech() = Unit
-    override fun onBufferReceived(buffer: ByteArray) = Unit
-    override fun onEndOfSpeech() = Unit
-    override fun onError(error: Int) = Unit
-    override fun onEvent(eventType: Int, params: Bundle) = Unit
-    override fun onPartialResults(partialResults: Bundle) = Unit
-    override fun onReadyForSpeech(params: Bundle) = Unit
-    override fun onRmsChanged(rmsdB: Float) = Unit
-
-    private val hostFragment: Fragment = fragment
-
-    override fun onResults(results: Bundle) {
-        try {
-            val matches =
-                results.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)
-                    ?: return
-            Timber.i("Speech recognized: $matches")
-            if (matches[0] == "да") {
-                exitProcess(0)
-            }
-            if (matches[0] == "нет") {
-                hostFragment.navigate(R.id.action_global_menuFragment)
-            }
-        } catch (e: Exception) {
-            Timber.e(e)
-        }
-    }
-}

From 7659067f1184056411cfb6c0a98d386b430a05fc Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Wed, 23 Sep 2020 20:17:10 +0300
Subject: [PATCH 067/117] Remove arch.md and navigation.md

---
 arch.md       |  5 -----
 navigation.md | 21 ---------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 arch.md
 delete mode 100644 navigation.md

diff --git a/arch.md b/arch.md
deleted file mode 100644
index 24f23578..00000000
--- a/arch.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# App architecture
-
-This app follows default patterns ([guide](https://developer.android.com/jetpack/docs/guide))
-
-![arch](https://developer.android.com/topic/libraries/architecture/images/final-architecture.png)
diff --git a/navigation.md b/navigation.md
deleted file mode 100644
index 3c74fbdb..00000000
--- a/navigation.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Learn Braille navigation
-
-- main menu
-  - theory
-    - continue last visited course
-    - courses [Golubina, ...] `no menu while we have one course`
-      - continue
-      - lessons [lesson 1, ...]
-        - steps
-  - practice
-    - **browse symbols**
-    - **decks [all, ru symbols, punctuation, ...]**
-      - cards
-  - settings 
-    - setting classes `no classes while we have not so much settings`
-      - items
-  - scan QR
-  - help
-  - exit
-  
-  Menus and items which concept has not been proved yet, are marked as **bold**.

From ceb45b1209aa4e8d465a750fdfe65599c08e2c9d Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Wed, 23 Sep 2020 22:37:46 +0300
Subject: [PATCH 068/117] Refactor daos and repos

---
 .../data/db/LearnBrailleDatabaseTest.kt       |  14 +-
 .../data/repository/ActionsRepositoryTest.kt  |   7 +-
 .../repository/MaterialsRepositoryTest.kt     | 237 ++++++++++++++++++
 .../data/repository/PracticeRepositoryTest.kt |  14 --
 .../learnbraille/LearnBrailleApplication.kt   |  17 +-
 .../data/db/LearnBrailleDatabase.kt           |   6 +-
 .../learnbraille/data/entities/Actions.kt     |   2 +-
 .../learnbraille/data/entities/Cards.kt       |   6 +-
 .../learnbraille/data/entities/Courses.kt     |   2 +-
 .../learnbraille/data/entities/Decks.kt       |   6 +-
 .../learnbraille/data/entities/Lessons.kt     |   2 +-
 .../data/entities/MaterialData.kt             |  13 +-
 .../learnbraille/data/entities/Materials.kt   |   4 +-
 .../learnbraille/data/entities/StepData.kt    |  14 +-
 .../learnbraille/data/entities/Steps.kt       |  14 +-
 .../learnbraille/data/entities/Users.kt       |   4 +-
 .../data/repository/ActionsRepository.kt      |   6 +-
 .../data/repository/BrowserRepository.kt      |   9 +-
 .../data/repository/MaterialsRepository.kt    |  42 +++-
 .../data/repository/PracticeRepository.kt     |  68 ++---
 .../data/repository/PreferenceRepository.kt   |   2 +-
 .../data/repository/TheoryRepository.kt       |  51 ++--
 .../braillesystems/learnbraille/res/Data.kt   |  16 +-
 .../ui/screens/browser/BrowserFragment.kt     |   2 +-
 .../ui/screens/menu/MenuFragment.kt           |  12 -
 .../ui/screens/practice/CardViewModel.kt      |  48 ++--
 .../ui/screens/practice/DecksListFragment.kt  |  12 +-
 .../ui/screens/stats/StatsFragment.kt         |   2 +-
 .../ui/screens/theory/TheoryFreeNavigation.kt |  10 +-
 .../theory/lessons/LessonsListFragment.kt     |   4 +-
 app/src/main/res/layout/decks_list_item.xml   |   2 +-
 .../learnbraille/utils/UtilsTest.kt           |   9 +-
 32 files changed, 442 insertions(+), 215 deletions(-)
 create mode 100644 app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepositoryTest.kt
 delete mode 100644 app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepositoryTest.kt

diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabaseTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabaseTest.kt
index f4e735ba..134045e9 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabaseTest.kt
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabaseTest.kt
@@ -15,10 +15,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import java.io.IOException
 
-
-/**
- * Tests data serialization first of all.
- */
 @RunWith(AndroidJUnit4::class)
 class LearnBrailleDatabaseTest {
 
@@ -157,30 +153,30 @@ class LearnBrailleDatabaseTest {
 
     @Test
     fun testUsers() = runBlocking {
-        assertEquals("default", db.userDao.getUser(1)!!.login)
+        assertEquals("default", db.userDao.user(1)!!.login)
     }
 
     @Test
     fun testMaterials() = runBlocking {
-        val data = db.materialDao.getMaterial(1)!!.data
+        val data = db.materialDao.material(1)!!.data
         require(data is Symbol)
         assertEquals(BrailleDots(F, E, E, E, E, E), data.brailleDots)
     }
 
     @Test
     fun testDecks() = runBlocking {
-        assertEquals("Ru letters", db.deckDao.getDeck(1)!!.tag)
+        assertEquals("Ru letters", db.deckDao.deck(1)!!.tag)
     }
 
     @Test
     fun testCourses() = runBlocking {
-        assertEquals("Super course", db.courseDao.getCourse(1)!!.name)
+        assertEquals("Super course", db.courseDao.course(1)!!.name)
     }
 
     @Test
     fun testSteps() = runBlocking {
         for ((i, step) in steps.withIndex()) {
-            val fromDb = db.stepDao.getStep(i + 1L)!!
+            val fromDb = db.stepDao.step(i + 1L)!!
             assertEquals(step, fromDb)
         }
     }
diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepositoryTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepositoryTest.kt
index df040714..4109b78b 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepositoryTest.kt
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepositoryTest.kt
@@ -55,6 +55,11 @@ class ActionsRepositoryTest {
 
     @Test
     fun getAll() = runBlocking {
-        assertEquals(actions.toList(), repo.getActionsFrom(Days(100)))
+        assertEquals(actions.toList(), repo.actionsFrom(Days(100)))
+    }
+
+    @Test
+    fun getSince() = runBlocking {
+        assertEquals(listOf(actions.first()), repo.actionsFrom(Days(25)))
     }
 }
diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepositoryTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepositoryTest.kt
new file mode 100644
index 00000000..b12cc3d0
--- /dev/null
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepositoryTest.kt
@@ -0,0 +1,237 @@
+package com.github.braillesystems.learnbraille.data.repository
+
+import androidx.room.Room
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import com.github.braillesystems.learnbraille.data.db.LearnBrailleDatabase
+import com.github.braillesystems.learnbraille.data.entities.*
+import com.github.braillesystems.learnbraille.data.entities.BrailleDot.E
+import com.github.braillesystems.learnbraille.data.entities.BrailleDot.F
+import com.github.braillesystems.learnbraille.res.MarkerType
+import com.github.braillesystems.learnbraille.res.SymbolType
+import com.github.braillesystems.learnbraille.utils.unreachable
+import kotlinx.coroutines.runBlocking
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.io.IOException
+
+@RunWith(AndroidJUnit4::class)
+class MaterialsRepositoryTest {
+
+    private lateinit var db: LearnBrailleDatabase
+    private lateinit var repo: MaterialsRepository
+
+    private val users = listOf(
+        User(
+            login = "default",
+            name = "John Smith"
+        )
+    )
+
+    private val materials = listOf(
+        Material(
+            1,
+            Symbol(
+                char = 'А',
+                brailleDots = BrailleDots(F, E, E, E, E, E),
+                type = SymbolType.ru
+            )
+        ),
+        Material(
+            2,
+            MarkerSymbol(
+                type = MarkerType.GreekCapital,
+                brailleDots = BrailleDots(F, F, F, E, E, E)
+            )
+        ),
+        Material(
+            3,
+            Symbol(
+                char = 'B',
+                brailleDots = BrailleDots(F, F, F, E, E, F),
+                type = SymbolType.digit
+            )
+        )
+    )
+
+    private val knownMaterials = listOf(
+        KnownMaterial(1, 2),
+        KnownMaterial(1, 3)
+    )
+
+    private val decks = listOf(
+        Deck(
+            id = 1,
+            tag = "Ru letters"
+        ),
+        Deck(
+            id = 2,
+            tag = "Another useless deck"
+        )
+    )
+
+    private val cards = listOf(
+        Card(
+            deckId = 1,
+            materialId = 1
+        ),
+        Card(
+            deckId = 2,
+            materialId = 1
+        ),
+        Card(
+            deckId = 1,
+            materialId = 2
+        )
+    )
+
+    private val courses = listOf(
+        Course(
+            id = 1,
+            name = "Super course",
+            description = "Oh, it's so good"
+        )
+    )
+
+    private val lessons = listOf(
+        Lesson(
+            id = 1,
+            name = "First",
+            description = "First First First",
+            courseId = 1
+        ),
+        Lesson(
+            id = 2,
+            name = "Last",
+            description = "Last Last Last",
+            courseId = 1
+        )
+    )
+
+    private val steps = listOf(
+        Step(
+            id = 1,
+            data = FirstInfo("FirstInfo"),
+            lessonId = 1, courseId = 1
+        )
+    )
+
+    private val annotations = listOf(
+        StepAnnotation(id = 1, name = "a1"),
+        StepAnnotation(id = 2, name = "a2")
+    )
+
+    private val stepAnnotations = listOf(
+        StepHasAnnotation(
+            courseId = 1,
+            lessonId = 3,
+            stepId = 2,
+            annotationId = 1
+        )
+    )
+
+    @Before
+    fun createDB() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        db = Room
+            .inMemoryDatabaseBuilder(context, LearnBrailleDatabase::class.java)
+            .allowMainThreadQueries()
+            .build().apply {
+                runBlocking {
+                    userDao.insert(users)
+                    materialDao.insert(materials)
+                    knownMaterialDao.insert(knownMaterials)
+                    deckDao.insert(decks)
+                    cardDao.insert(cards)
+                    courseDao.insert(courses)
+                    lessonDao.insert(lessons)
+                    stepDao.insert(steps)
+                    stepAnnotationDao.insert(annotations)
+                    stepHasAnnotationDao.insert(stepAnnotations)
+                }
+            }
+
+        repo = MaterialsRepositoryImpl(
+            db.deckDao, db.cardDao,
+            object : PreferenceRepository {
+                override val buzzEnabled: Boolean
+                    get() = unreachable
+                override val toastsEnabled: Boolean
+                    get() = unreachable
+                override val golubinaBookStepsEnabled: Boolean
+                    get() = unreachable
+                override val traverseDotsInEnumerationOrder: Boolean
+                    get() = unreachable
+                override val inputOnFlyCheck: Boolean
+                    get() = unreachable
+                override val additionalAnnouncementsEnabled: Boolean
+                    get() = unreachable
+                override val practiceUseOnlyKnownMaterials: Boolean
+                    get() = true
+                override val extendedAccessibilityEnabled: Boolean
+                    get() = unreachable
+                override val additionalQrCodeButtonEnabled: Boolean
+                    get() = unreachable
+                override val currentUserId: DBid
+                    get() = 1
+
+                override suspend fun getCurrentUser(): User = users.first()
+            }
+        )
+    }
+
+    @After
+    @Throws(IOException::class)
+    fun closeDB() {
+        db.close()
+    }
+
+    @Test
+    fun randomMaterialFromDeck() = runBlocking {
+        val material = repo.randomMaterialFromDeck(2)
+        assertTrue(material in materials.filter { Card(2, it.id) in cards })
+    }
+
+    @Test
+    fun randomKnownMaterialFromDeck() = runBlocking {
+        val material = repo.randomKnownMaterialFromDeck(1)
+        assertTrue(material in materials.filter { Card(1, it.id) in cards })
+        assertTrue(material!!.id in knownMaterials.map { it.materialId })
+    }
+
+    @Test
+    fun allMaterialsFromDeck() = runBlocking {
+        assertEquals(
+            materials.filter { Card(2, it.id) in cards },
+            repo.allMaterialsFromDeck(2)
+        )
+    }
+
+    @Test
+    fun allDecks() = runBlocking {
+        assertEquals(
+            decks,
+            repo.allDecks()
+        )
+    }
+
+    @Test
+    fun availableDecks() = runBlocking {
+        assertEquals(listOf(decks.first()), repo.availableDecks())
+    }
+
+    @Test
+    fun allDecksWithAvailability() = runBlocking {
+        assertEquals(
+            listOf(
+                DeckWithAvailability(decks[0], true),
+                DeckWithAvailability(decks[1], false)
+            ),
+            repo.allDecksWithAvailability()
+        )
+    }
+}
diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepositoryTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepositoryTest.kt
deleted file mode 100644
index 11cca30e..00000000
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepositoryTest.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.github.braillesystems.learnbraille.data.repository
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class PracticeRepositoryTest {
-
-    @Test
-    fun practiceRepo() {
-        // TODO
-    }
-}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
index 92c26699..bd2ca28c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
@@ -45,33 +45,36 @@ class LearnBrailleApplication : Application() {
                 )
             }
 
+            factory<MaterialsRepository> {
+                val db = get<LearnBrailleDatabase>()
+                MaterialsRepositoryImpl(db.deckDao, db.cardDao, get())
+            }
+
             factory<PracticeRepository> {
                 val db = get<LearnBrailleDatabase>()
                 PracticeRepositoryImpl(
                     this@LearnBrailleApplication,
-                    db.deckDao, db.cardDao, get()
+                    db.deckDao, get(), get()
                 )
             }
             factory<MutablePracticeRepository> {
                 val db = get<LearnBrailleDatabase>()
                 PracticeRepositoryImpl(
                     this@LearnBrailleApplication,
-                    db.deckDao, db.cardDao, get()
+                    db.deckDao, get(), get()
                 )
             }
 
             factory<BrowserRepository> {
-                val db = get<LearnBrailleDatabase>()
                 BrowserRepositoryImpl(
                     this@LearnBrailleApplication,
-                    get(), db.deckDao, db.cardDao
+                    get(), get()
                 )
             }
             factory<MutableBrowserRepository> {
-                val db = get<LearnBrailleDatabase>()
                 BrowserRepositoryImpl(
                     this@LearnBrailleApplication,
-                    get(), db.deckDao, db.cardDao
+                    get(), get()
                 )
             }
 
@@ -96,7 +99,7 @@ class LearnBrailleApplication : Application() {
 
             factory { (getEnteredDots: () -> BrailleDots) ->
                 CardViewModelFactory(
-                    get(), get(),
+                    get(), get(), get(),
                     this@LearnBrailleApplication,
                     getEnteredDots
                 )
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt
index 665a01bf..b891a809 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt
@@ -73,7 +73,7 @@ abstract class LearnBrailleDatabase : RoomDatabase(), KoinComponent {
         prepareDbJob = scope().launch {
             Timber.i("Requesting value from database to force database callbacks and migrations")
             Timber.i("Start database preparation")
-            userDao.getUser(1).devnull
+            userDao.user(1).devnull
             Timber.i("Finnish database preparation")
         }
     }
@@ -87,7 +87,7 @@ abstract class LearnBrailleDatabase : RoomDatabase(), KoinComponent {
         const val name = "learn_braille_database"
 
         /**
-         * Try to run `build` before first user's request (mb in Application's `onCreate`)
+         * Try to run `buildDatabase` before first user's request (mb in Application's `onCreate`)
          * to make DB likely prepared until it is really needed.
          */
         fun buildDatabase(context: Context) = Room
@@ -207,3 +207,5 @@ private val MIGRATION_17_18 = object : Migration(17, 18), KoinComponent {
         Timber.i("Actions table created")
     }
 }
+
+// TODO migration that preserves current true user's position
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Actions.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Actions.kt
index 54e41317..b2f0aa5c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Actions.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Actions.kt
@@ -31,7 +31,7 @@ interface ActionDao {
     suspend fun insert(vararg actions: Action)
 
     @Query("select * from actions where date >= :date")
-    suspend fun getAllActionsSince(date: Long): List<Action>
+    suspend fun allActionsSince(date: Long): List<Action>
 
     @Query("delete from actions")
     suspend fun clear()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Cards.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Cards.kt
index 563ab229..de019556 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Cards.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Cards.kt
@@ -26,7 +26,7 @@ interface CardDao {
         order by RANDOM() limit 1
         """
     )
-    suspend fun getRandomMaterialFromDeck(deckId: DBid): Material?
+    suspend fun randomMaterialFromDeck(deckId: DBid): Material?
 
     @Query(
         """
@@ -40,7 +40,7 @@ interface CardDao {
         order by RANDOM() limit 1
         """
     )
-    suspend fun getRandomKnownMaterialFromDeck(userId: DBid, deckId: DBid): Material?
+    suspend fun randomKnownMaterialFromDeck(userId: DBid, deckId: DBid): Material?
 
     @Query(
         """
@@ -51,7 +51,7 @@ interface CardDao {
         order by m.id
         """
     )
-    suspend fun getAllMaterialsFromDeck(id: DBid): List<Material>
+    suspend fun allMaterialsFromDeck(id: DBid): List<Material>
 
     @Query("delete from cards")
     suspend fun clear()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Courses.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Courses.kt
index 5880edbd..a3d54a60 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Courses.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Courses.kt
@@ -19,7 +19,7 @@ interface CourseDao {
     suspend fun insert(courses: List<Course>)
 
     @Query("select * from courses where id = :id")
-    suspend fun getCourse(id: DBid): Course?
+    suspend fun course(id: DBid): Course?
 
     @Query("delete from courses")
     suspend fun clear()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Decks.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Decks.kt
index 19a6551b..5cae21bc 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Decks.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Decks.kt
@@ -17,10 +17,10 @@ interface DeckDao {
     suspend fun insert(decks: List<Deck>)
 
     @Query("select * from decks where id = :id")
-    suspend fun getDeck(id: DBid): Deck?
+    suspend fun deck(id: DBid): Deck?
 
     @Query("select * from decks")
-    suspend fun getAllDecks(): List<Deck>
+    suspend fun allDecks(): List<Deck>
 
     @Query(
         """
@@ -33,7 +33,7 @@ interface DeckDao {
         order by d.id
         """
     )
-    suspend fun getAvailableDecks(userId: DBid): List<Deck>
+    suspend fun availableDecks(userId: DBid): List<Deck>
 
     @Query("delete from decks")
     suspend fun clear()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Lessons.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Lessons.kt
index 7fe924d6..15fa45c2 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Lessons.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Lessons.kt
@@ -27,7 +27,7 @@ interface LessonDao {
         order by id
         """
     )
-    suspend fun getAllCourseLessons(courseId: DBid): List<Lesson>
+    suspend fun allCourseLessons(courseId: DBid): List<Lesson>
 
     @Query("delete from lessons")
     suspend fun clear()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/MaterialData.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/MaterialData.kt
index 788b11ec..a1ea408f 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/MaterialData.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/MaterialData.kt
@@ -23,17 +23,22 @@ class MaterialDataTypeConverters {
 
 typealias SymbolType = String
 
+@Serializable
+sealed class OneBrailleSymbol : MaterialData() {
+    abstract val brailleDots: BrailleDots
+}
+
 @Serializable
 data class Symbol(
     val char: Char,
-    val brailleDots: BrailleDots,
+    override val brailleDots: BrailleDots,
     @SerialName("symbol_type")
     val type: SymbolType
-) : MaterialData()
+) : OneBrailleSymbol()
 
 @Serializable
 data class MarkerSymbol(
     @SerialName("marker_type")
     val type: MarkerType,
-    val brailleDots: BrailleDots
-) : MaterialData()
+    override val brailleDots: BrailleDots
+) : OneBrailleSymbol()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Materials.kt
index f3358a78..34482385 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Materials.kt
@@ -17,10 +17,10 @@ interface MaterialDao {
     suspend fun insert(materials: List<Material>)
 
     @Query("select * from materials where id = :id")
-    suspend fun getMaterial(id: DBid): Material?
+    suspend fun material(id: DBid): Material?
 
     @Query("select * from materials order by RANDOM() limit 1")
-    suspend fun getRandomMaterial(): Material?
+    suspend fun randomMaterial(): Material?
 
     @Query("Delete from materials")
     suspend fun clear()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt
index fbb7e06c..ffef8f34 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt
@@ -32,7 +32,9 @@ typealias HtmlText = String
  * Represents step types with information.
  */
 @Serializable
-sealed class BaseInfo : StepData()
+sealed class BaseInfo : StepData() {
+    abstract val text: HtmlText
+}
 
 /**
  * Step displays information text for the user.
@@ -40,7 +42,7 @@ sealed class BaseInfo : StepData()
 @Serializable
 data class Info(
     @SerialName("info")
-    val text: HtmlText
+    override val text: HtmlText
 ) : BaseInfo()
 
 /**
@@ -49,7 +51,7 @@ data class Info(
 @Serializable
 data class FirstInfo(
     @SerialName("info")
-    val text: HtmlText
+    override val text: HtmlText
 ) : BaseInfo()
 
 /**
@@ -58,7 +60,7 @@ data class FirstInfo(
 @Serializable
 data class LastInfo(
     @SerialName("info")
-    val text: HtmlText
+    override val text: HtmlText
 ) : BaseInfo()
 
 
@@ -73,6 +75,8 @@ data class Input(
     val material: Material
 ) : BaseInput()
 
+// TODO add ReflectedInput
+
 /**
  * Step prompts the user to enter dots with specific numbers.
  *
@@ -97,6 +101,8 @@ data class Show(
     val material: Material
 ) : BaseShow()
 
+// TODO ReflectedShow
+
 /**
  * Step shows Braille dots with specific numbers.
  *
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt
index 3e9cbd5f..fe68006c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Steps.kt
@@ -35,7 +35,7 @@ interface StepDao {
     suspend fun insert(steps: List<Step>)
 
     @Query("select * from steps where id = :id")
-    suspend fun getStep(id: DBid): Step?
+    suspend fun step(id: DBid): Step?
 
     @Query(
         """
@@ -45,7 +45,7 @@ interface StepDao {
         where cs.user_id = :userId and cs.course_id = :courseId
         """
     )
-    suspend fun getCurrentStep(userId: DBid, courseId: DBid): Step?
+    suspend fun currentStep(userId: DBid, courseId: DBid): Step?
 
     @Query(
         """
@@ -55,7 +55,7 @@ interface StepDao {
         where ls.user_id = :userId and ls.course_id = :courseId
         """
     )
-    suspend fun getLastStep(userId: DBid, courseId: DBid): Step?
+    suspend fun lastStep(userId: DBid, courseId: DBid): Step?
 
     @Query(
         """
@@ -65,7 +65,7 @@ interface StepDao {
         where ls.user_id = :userId and ls.course_id = :courseId and ls.lesson_id = :lessonId
         """
     )
-    suspend fun getLastStep(userId: DBid, courseId: DBid, lessonId: DBid): Step?
+    suspend fun lastStep(userId: DBid, courseId: DBid, lessonId: DBid): Step?
 
     @Query(
         """
@@ -74,7 +74,7 @@ interface StepDao {
         order by steps.lesson_id, steps.id limit 1
         """
     )
-    suspend fun getFirstCourseStep(courseId: DBid): Step?
+    suspend fun firstCourseStep(courseId: DBid): Step?
 
     @Query(
         """
@@ -95,7 +95,7 @@ interface StepDao {
         limit 1
         """
     )
-    suspend fun getNextStep(
+    suspend fun nextStep(
         courseId: DBid,
         thisLessonId: DBid,
         thisStepId: DBid,
@@ -121,7 +121,7 @@ interface StepDao {
         limit 1
         """
     )
-    suspend fun getPrevStep(
+    suspend fun prevStep(
         courseId: DBid,
         thisLessonId: DBid,
         thisStepId: DBid,
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Users.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Users.kt
index 5af9a2bf..995c0ea4 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Users.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Users.kt
@@ -23,10 +23,10 @@ interface UserDao {
     suspend fun insert(users: List<User>)
 
     @Query("select * from users where :login = login limit 1")
-    suspend fun getUser(login: UserLogin): User?
+    suspend fun user(login: UserLogin): User?
 
     @Query("select * from users where :id = id limit 1")
-    suspend fun getUser(id: DBid): User?
+    suspend fun user(id: DBid): User?
 
     @Query("delete from users")
     suspend fun clear()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepository.kt
index 04783487..83dd9011 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/ActionsRepository.kt
@@ -12,7 +12,7 @@ import java.util.*
 typealias Actions = List<Action>
 
 interface ActionsRepository {
-    suspend fun getActionsFrom(days: Days): Actions
+    suspend fun actionsFrom(days: Days): Actions
 }
 
 interface MutableActionsRepository : ActionsRepository {
@@ -33,9 +33,9 @@ class ActionsRepositoryImpl(
 
     override suspend fun clearAllStats() = actionsDao.clear()
 
-    override suspend fun getActionsFrom(days: Days): Actions =
+    override suspend fun actionsFrom(days: Days): Actions =
         actionsDao
-            .getAllActionsSince((getCurrDate() - days).time)
+            .allActionsSince((getCurrDate() - days).time)
             .also {
                 scope().launch {
                     actionsDao.removeAllActionsBefore((getCurrDate() - keepActionsTime).time)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/BrowserRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/BrowserRepository.kt
index b4d6e3f4..3bf4265f 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/BrowserRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/BrowserRepository.kt
@@ -2,9 +2,7 @@ package com.github.braillesystems.learnbraille.data.repository
 
 import android.content.Context
 import com.github.braillesystems.learnbraille.data.dsl.ALL_CARDS_DECK_ID
-import com.github.braillesystems.learnbraille.data.entities.CardDao
 import com.github.braillesystems.learnbraille.data.entities.DBid
-import com.github.braillesystems.learnbraille.data.entities.DeckDao
 import com.github.braillesystems.learnbraille.utils.preferences
 
 interface BrowserRepository : MaterialsRepository {
@@ -18,10 +16,9 @@ interface MutableBrowserRepository : BrowserRepository {
 class BrowserRepositoryImpl(
     private val context: Context,
     private val preferenceRepository: PreferenceRepository,
-    deckDao: DeckDao,
-    cardDao: CardDao
-) : MaterialsRepositoryImpl(deckDao, cardDao),
-    MutableBrowserRepository {
+    private val materialsRepository: MaterialsRepository
+) : MutableBrowserRepository,
+    MaterialsRepository by materialsRepository {
 
     private val currDeckPreference: String
         get() = "browser_curr_deck_${preferenceRepository.currentUserId}"
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepository.kt
index 6a05bdb2..79654363 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepository.kt
@@ -2,22 +2,46 @@ package com.github.braillesystems.learnbraille.data.repository
 
 import com.github.braillesystems.learnbraille.data.entities.*
 
+data class DeckWithAvailability(
+    val deck: Deck,
+    val containsCards: Boolean
+)
+
 interface MaterialsRepository {
-    suspend fun getRandomMaterialFromDeck(id: DBid): Material?
-    suspend fun getAllMaterialsFromDeck(id: DBid): List<Material>
-    suspend fun getAllDecks(): List<Deck>
+    suspend fun randomMaterialFromDeck(id: DBid): Material?
+    suspend fun randomKnownMaterialFromDeck(id: DBid): Material?
+    suspend fun allMaterialsFromDeck(id: DBid): List<Material>
+    suspend fun allDecks(): List<Deck>
+    suspend fun availableDecks(): List<Deck>
+    suspend fun allDecksWithAvailability(): List<DeckWithAvailability>
 }
 
 open class MaterialsRepositoryImpl(
     private val deckDao: DeckDao,
-    private val cardDao: CardDao
+    private val cardDao: CardDao,
+    private val preferenceRepository: PreferenceRepository
 ) : MaterialsRepository {
 
-    override suspend fun getRandomMaterialFromDeck(id: DBid): Material? =
-        cardDao.getRandomMaterialFromDeck(id)
+    override suspend fun randomMaterialFromDeck(id: DBid): Material? =
+        cardDao.randomMaterialFromDeck(id)
+
+    override suspend fun randomKnownMaterialFromDeck(id: DBid): Material? =
+        cardDao.randomKnownMaterialFromDeck(preferenceRepository.currentUserId, id)
+
+    override suspend fun allMaterialsFromDeck(id: DBid): List<Material> =
+        cardDao.allMaterialsFromDeck(id)
+
+    override suspend fun allDecks(): List<Deck> = deckDao.allDecks()
 
-    override suspend fun getAllMaterialsFromDeck(id: DBid): List<Material> =
-        cardDao.getAllMaterialsFromDeck(id)
+    override suspend fun availableDecks(): List<Deck> =
+        deckDao.availableDecks(preferenceRepository.currentUserId)
 
-    override suspend fun getAllDecks(): List<Deck> = deckDao.getAllDecks()
+    override suspend fun allDecksWithAvailability(): List<DeckWithAvailability> =
+        if (preferenceRepository.practiceUseOnlyKnownMaterials) {
+            val all = allDecks()
+            val available = availableDecks()
+            all.map { DeckWithAvailability(it, available.contains(it)) }
+        } else {
+            deckDao.allDecks().map { DeckWithAvailability(it, true) }
+        }
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepository.kt
index 213dbc4b..5b666efb 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PracticeRepository.kt
@@ -2,32 +2,30 @@ package com.github.braillesystems.learnbraille.data.repository
 
 import android.content.Context
 import com.github.braillesystems.learnbraille.data.dsl.ALL_CARDS_DECK_ID
-import com.github.braillesystems.learnbraille.data.entities.*
+import com.github.braillesystems.learnbraille.data.entities.DBid
+import com.github.braillesystems.learnbraille.data.entities.Deck
+import com.github.braillesystems.learnbraille.data.entities.DeckDao
+import com.github.braillesystems.learnbraille.data.entities.Material
 import com.github.braillesystems.learnbraille.utils.preferences
 
-data class DeckNotEmpty(
-    val deck: Deck,
-    val containsCards: Boolean
-)
-
-interface PracticeRepository {
+interface PracticeRepository : MaterialsRepository {
     val currentDeckId: DBid
-    suspend fun getNextMaterial(): Material?
-    suspend fun getCurrDeck(): Deck
-    suspend fun getAllDecks(): List<DeckNotEmpty>
+    suspend fun currentDeck(): Deck
+    suspend fun randomMaterial(): Material?
+    suspend fun randomKnownMaterial(): Material?
 }
 
 interface MutablePracticeRepository : PracticeRepository {
     override var currentDeckId: DBid
-    suspend fun getNextMaterialNotNull(): Material
 }
 
 class PracticeRepositoryImpl(
     private val context: Context,
     private val deckDao: DeckDao,
-    private val cardDao: CardDao,
-    private val preferenceRepository: PreferenceRepository
-) : MutablePracticeRepository {
+    private val preferenceRepository: PreferenceRepository,
+    private val materialsRepository: MaterialsRepository
+) : MutablePracticeRepository,
+    MaterialsRepository by materialsRepository {
 
     private val currDeckPreference: String
         get() = "practice_curr_deck_${preferenceRepository.currentUserId}"
@@ -43,42 +41,12 @@ class PracticeRepositoryImpl(
             }
         }
 
-    override suspend fun getNextMaterial(): Material? =
-        if (preferenceRepository.practiceUseOnlyKnownMaterials) {
-            cardDao.getRandomKnownMaterialFromDeck(
-                preferenceRepository.currentUserId,
-                currentDeckId
-            )
-        } else {
-            cardDao.getRandomMaterialFromDeck(currentDeckId)
-        }
+    override suspend fun currentDeck(): Deck =
+        deckDao.deck(currentDeckId) ?: error("Wrong currentDeckId")
 
-    /**
-     * Deck changes automatically if `use only known materials` enabled
-     * and previous `currentDeck` became not available.
-     */
-    override suspend fun getNextMaterialNotNull(): Material = getNextMaterial() ?: run {
-        if (preferenceRepository.practiceUseOnlyKnownMaterials) {
-            currentDeckId = ALL_CARDS_DECK_ID
-            getNextMaterial()
-                ?: error("Some materials are expected to be added as known by default")
-        } else {
-            error(
-                "Materials are expected to be prepopulated and " +
-                        "user should not have possibilities to access empty deck"
-            )
-        }
-    }
+    override suspend fun randomMaterial(): Material? =
+        materialsRepository.randomMaterialFromDeck(currentDeckId)
 
-    override suspend fun getCurrDeck(): Deck =
-        deckDao.getDeck(currentDeckId) ?: error("Current deck should always exist")
-
-    override suspend fun getAllDecks(): List<DeckNotEmpty> =
-        if (preferenceRepository.practiceUseOnlyKnownMaterials) {
-            val all = deckDao.getAllDecks()
-            val available = deckDao.getAvailableDecks(preferenceRepository.currentUserId)
-            all.map { DeckNotEmpty(it, available.contains(it)) }
-        } else {
-            deckDao.getAllDecks().map { DeckNotEmpty(it, true) }
-        }
+    override suspend fun randomKnownMaterial(): Material? =
+        materialsRepository.randomKnownMaterialFromDeck(currentDeckId)
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
index da51138f..82d63e6b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
@@ -113,7 +113,7 @@ class PreferenceRepositoryImpl(
     }
 
     override suspend fun getCurrentUser(): User =
-        userDao.getUser(currentUserId)
+        userDao.user(currentUserId)
             ?.also { Timber.i("Current user = $it") }
             ?: error("Current user should always exist")
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
index e889e353..536d3a45 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
@@ -7,18 +7,20 @@ import com.github.braillesystems.learnbraille.utils.scope
 import kotlinx.coroutines.launch
 
 interface TheoryRepository {
-    suspend fun getCurrentStep(courseId: DBid): Step
-    suspend fun getLastCourseStep(courseId: DBid): Step
-    suspend fun getAllCourseLessons(courseId: DBid): List<Lesson>
+    suspend fun currentStep(courseId: DBid): Step
+    suspend fun lastCourseStep(courseId: DBid): Step
+    suspend fun allCourseLessons(courseId: DBid): List<Lesson>
 }
 
 interface MutableTheoryRepository : TheoryRepository {
-    suspend fun getNextStepAndUpdate(thisStep: Step, markThisAsPassed: Boolean = false): Step?
-    suspend fun getPrevStepAndUpdate(thisStep: Step): Step?
-    suspend fun getCurrentStepAndUpdate(courseId: DBid): Step
-    suspend fun getLastLessonOrCurrentStepAndUpdate(courseId: DBid, lessonId: DBid): Step
+    suspend fun nextStepAndMove(thisStep: Step, markThisAsPassed: Boolean = false): Step?
+    suspend fun prevStepAndMove(thisStep: Step): Step?
+    suspend fun currentStepAndMove(courseId: DBid): Step
+    suspend fun lastLessonOrCurrentStepAndMove(courseId: DBid, lessonId: DBid): Step
 }
 
+// TODO refactor theory repo and navigation
+
 class TheoryRepositoryImpl(
     private val lessonDao: LessonDao,
     private val stepDao: StepDao,
@@ -37,16 +39,15 @@ class TheoryRepositoryImpl(
         )
 
     @Suppress("ReturnCount")
-    override suspend fun getNextStepAndUpdate(thisStep: Step, markThisAsPassed: Boolean): Step? {
+    override suspend fun nextStepAndMove(thisStep: Step, markThisAsPassed: Boolean): Step? {
         val next = stepDao
-            .getNextStep(
+            .nextStep(
                 thisStep.courseId, thisStep.lessonId, thisStep.id,
                 proscribedAnnotations
             )
             ?: return null
-        val curr = requireNotNull(
-            stepDao.getCurrentStep(preferenceRepository.currentUserId, thisStep.courseId)
-        )
+        val curr = stepDao
+            .currentStep(preferenceRepository.currentUserId, thisStep.courseId)!!
 
         val updateAndReturn = {
             updateLast(next)
@@ -70,9 +71,9 @@ class TheoryRepositoryImpl(
         return updateAndReturn()
     }
 
-    override suspend fun getPrevStepAndUpdate(thisStep: Step): Step? =
+    override suspend fun prevStepAndMove(thisStep: Step): Step? =
         stepDao
-            .getPrevStep(
+            .prevStep(
                 thisStep.courseId,
                 thisStep.lessonId,
                 thisStep.id,
@@ -80,37 +81,37 @@ class TheoryRepositoryImpl(
             )
             ?.also { updateLast(it) }
 
-    override suspend fun getCurrentStepAndUpdate(courseId: DBid): Step =
-        getCurrentStep(courseId).also { updateLast(it) }
+    override suspend fun currentStepAndMove(courseId: DBid): Step =
+        currentStep(courseId).also { updateLast(it) }
 
     /**
      * LessonId is supposed to exist for this courseId.
      */
-    override suspend fun getLastLessonOrCurrentStepAndUpdate(courseId: DBid, lessonId: DBid): Step =
+    override suspend fun lastLessonOrCurrentStepAndMove(courseId: DBid, lessonId: DBid): Step =
         stepDao
-            .getLastStep(preferenceRepository.currentUserId, courseId, lessonId)
+            .lastStep(preferenceRepository.currentUserId, courseId, lessonId)
             ?.also { updateLast(it) }
             ?: error(
                 "No such lessonId ($lessonId) exists for course ($courseId) " +
                         "or current step is behind lesson with such lessonId"
             )
 
-    override suspend fun getCurrentStep(courseId: DBid): Step =
+    override suspend fun currentStep(courseId: DBid): Step =
         stepDao
-            .getCurrentStep(preferenceRepository.currentUserId, courseId)
+            .currentStep(preferenceRepository.currentUserId, courseId)
             ?: initCoursePos(courseId)
 
-    override suspend fun getLastCourseStep(courseId: DBid): Step =
+    override suspend fun lastCourseStep(courseId: DBid): Step =
         stepDao
-            .getLastStep(preferenceRepository.currentUserId, courseId)
+            .lastStep(preferenceRepository.currentUserId, courseId)
             ?: initCoursePos(courseId)
 
-    override suspend fun getAllCourseLessons(courseId: DBid): List<Lesson> =
-        lessonDao.getAllCourseLessons(courseId)
+    override suspend fun allCourseLessons(courseId: DBid): List<Lesson> =
+        lessonDao.allCourseLessons(courseId)
 
     private suspend fun initCoursePos(courseId: DBid): Step =
         stepDao
-            .getFirstCourseStep(courseId)
+            .firstCourseStep(courseId)
             ?.also { first ->
                 updateLast(first)
                 currentStepDao.update(
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
index 0c04949a..ee1bb3d7 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
@@ -9,20 +9,6 @@ import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.utils.contextNotNull
 import com.github.braillesystems.learnbraille.utils.lazyWithContext
 
-/**
- * Do not change name of this property, it is used for prepopulation.
- *
- * Use `DslTest.kt` file as DSL tutorial.
- *
- * Text in steps is parsed as HTML.
- *
- * If using `content.symbols.getValue`, `content` should be added to `data` as `materials`.
- * It is better to simply have only one value declared as `by materials`.
- *
- * Correctness of all information should be checked in compile time or in runtime.
- * If some additional info is need, do not hardcode it.
- * Just make request to the new DSL feature via github issues.
- */
 val prepopulationData by data(
     materials = content,
     stepAnnotationNames = listOf(
@@ -67,7 +53,7 @@ val prepopulationData by data(
         deck(DeckTags.special) { data ->
             data is Symbol && data.type == SymbolType.special
         }
-        deck(DeckTags.markers) {data ->
+        deck(DeckTags.markers) { data ->
             data is MarkerSymbol
         }
         deck(DeckTags.digits) { data ->
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
index 556657ed..22b6ece5 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
@@ -41,7 +41,7 @@ class BrowserFragment : AbstractFragmentWithHelp(R.string.browser_help) {
 
         lifecycleScope.launch {
             val deckId = browserRepository.currentDeckId
-            val materials = browserRepository.getAllMaterialsFromDeck(deckId)
+            val materials = browserRepository.allMaterialsFromDeck(deckId)
             val listener = object : BrowserItemListener {
                 override fun onClick(item: Material) {
                     val arg = stringify(Material.serializer(), item)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/menu/MenuFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/menu/MenuFragment.kt
index ccc18f7b..eb9795a0 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/menu/MenuFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/menu/MenuFragment.kt
@@ -1,11 +1,9 @@
 package com.github.braillesystems.learnbraille.ui.screens.menu
 
-import android.Manifest
 import android.app.Activity.RESULT_OK
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -42,7 +40,6 @@ class MenuFragment : AbstractFragmentWithHelp(R.string.menu_help) {
 
         title = getString(R.string.menu_actionbar_text_template).format(appName)
         setHasOptionsMenu(true)
-        requestPermissions()
 
         val buttons = mutableListOf<MaterialButton>()
 
@@ -138,15 +135,6 @@ class MenuFragment : AbstractFragmentWithHelp(R.string.menu_help) {
         }
     }
 
-    private fun requestPermissions() {
-        runIf(preferenceRepository.speechRecognitionEnabled) {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return@runIf
-            val permission = requireContext().checkSelfPermission(Manifest.permission.RECORD_AUDIO)
-            if (permission == PackageManager.PERMISSION_GRANTED) return@runIf
-            requestPermissions(arrayOf(Manifest.permission.RECORD_AUDIO), recordAudioPermissionCode)
-        }
-    }
-
     private fun interruptingOnClickListener(block: (View) -> Unit) =
         View.OnClickListener {
             if (db.isInitialized) block(it)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
index f5dfe5d9..c7b4f623 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
@@ -2,9 +2,11 @@ package com.github.braillesystems.learnbraille.ui.screens.practice
 
 import android.app.Application
 import androidx.lifecycle.*
+import com.github.braillesystems.learnbraille.data.dsl.ALL_CARDS_DECK_ID
 import com.github.braillesystems.learnbraille.data.entities.*
 import com.github.braillesystems.learnbraille.data.repository.MutableActionsRepository
 import com.github.braillesystems.learnbraille.data.repository.MutablePracticeRepository
+import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.ui.screens.DotsChecker
 import com.github.braillesystems.learnbraille.ui.screens.MutableDotsChecker
 import com.github.braillesystems.learnbraille.utils.retryN
@@ -18,6 +20,7 @@ import java.util.concurrent.ArrayBlockingQueue
 class CardViewModelFactory(
     private val practiceRepository: MutablePracticeRepository,
     private val actionsRepository: MutableActionsRepository,
+    private val preferenceRepository: PreferenceRepository,
     private val application: Application,
     private val getEnteredDots: () -> BrailleDots
 ) : ViewModelProvider.Factory {
@@ -25,7 +28,13 @@ class CardViewModelFactory(
     override fun <T : ViewModel> create(modelClass: Class<T>): T =
         if (modelClass.isAssignableFrom(CardViewModel::class.java)) {
             @Suppress("UNCHECKED_CAST")
-            CardViewModel(practiceRepository, actionsRepository, application, getEnteredDots) as T
+            CardViewModel(
+                practiceRepository,
+                actionsRepository,
+                preferenceRepository,
+                application,
+                getEnteredDots
+            ) as T
         } else {
             throw IllegalArgumentException("Unknown ViewModel class")
         }
@@ -34,6 +43,7 @@ class CardViewModelFactory(
 class CardViewModel(
     private val practiceRepository: MutablePracticeRepository,
     private val actionsRepository: MutableActionsRepository,
+    private val preferenceRepository: PreferenceRepository,
     application: Application,
     private val getEnteredDots: () -> BrailleDots,
     private val dotsChecker: MutableDotsChecker = MutableDotsChecker.create()
@@ -43,8 +53,8 @@ class CardViewModel(
     private val _symbol = MutableLiveData<MaterialData>()
     val symbol: LiveData<MaterialData> get() = _symbol
 
-    private val _deckTag = MutableLiveData<String?>()
-    val deckTag: LiveData<String?> get() = _deckTag
+    private val _deckTag = MutableLiveData<String>()
+    val deckTag: LiveData<String> get() = _deckTag
 
     var nTries: Int = 0
         private set
@@ -98,11 +108,23 @@ class CardViewModel(
     }
 
     private fun initializeCard(firstTime: Boolean = false) = uiScope.launch {
+        // If `use only known materials` turned on and current deck became unavailable
+        if (preferenceRepository.practiceUseOnlyKnownMaterials &&
+            practiceRepository.randomKnownMaterial() == null
+        ) {
+            practiceRepository.currentDeckId = ALL_CARDS_DECK_ID
+        }
+
+        if (firstTime) {
+            val deck = practiceRepository.currentDeck()
+            _deckTag.value = deck.tag
+        }
+
         val material = retryN(
             n = 5,
             stop = { it.data !in materialsQueue },
-            get = { practiceRepository.getNextMaterialNotNull() }
-        ) ?: practiceRepository.getNextMaterialNotNull()
+            get = { nextMaterial()!! }
+        ) ?: nextMaterial()!!
 
         if (material.data !in materialsQueue) {
             if (materialsQueue.size == nSkipMaterials) materialsQueue.poll()
@@ -112,17 +134,15 @@ class CardViewModel(
         material.data.let {
             _symbol.value = it
             expectedDots = when (it) {
-                is Symbol -> it.brailleDots
-                is MarkerSymbol -> it.brailleDots
+                is OneBrailleSymbol -> it.brailleDots
             }
         }
+    }
 
-        // Should be called after getting material because deck changes automatically
-        // if `use only known materials` enabled and previous `currentDeck`
-        // became not available.
-        if (firstTime) {
-            val deck = practiceRepository.getCurrDeck()
-            _deckTag.value = deck.tag
+    private suspend fun nextMaterial(): Material? =
+        if (preferenceRepository.practiceUseOnlyKnownMaterials) {
+            practiceRepository.randomKnownMaterial()
+        } else {
+            practiceRepository.randomMaterial()
         }
-    }
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/DecksListFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/DecksListFragment.kt
index 283e7e53..e007f34a 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/DecksListFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/DecksListFragment.kt
@@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.github.braillesystems.learnbraille.R
-import com.github.braillesystems.learnbraille.data.repository.DeckNotEmpty
+import com.github.braillesystems.learnbraille.data.repository.DeckWithAvailability
 import com.github.braillesystems.learnbraille.data.repository.MutablePracticeRepository
 import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.databinding.DecksListItemBinding
@@ -42,9 +42,9 @@ class DecksListFragment : Fragment() {
         title = getString(R.string.decks_list_title)
 
         lifecycleScope.launch {
-            val decks = practiceRepository.getAllDecks()
+            val decks = practiceRepository.allDecksWithAvailability()
             val listener = object : DecksItemListener {
-                override fun onClick(item: DeckNotEmpty) =
+                override fun onClick(item: DeckWithAvailability) =
                     if (item.containsCards) {
                         practiceRepository.currentDeckId = item.deck.id
                         navigate(R.id.action_decksList_to_cardFragment)
@@ -86,8 +86,8 @@ class DecksListFragment : Fragment() {
 }
 
 private class DecksListAdapter(
-    private val decks: List<DeckNotEmpty>,
-    private val bind: DecksListItemBinding.(DeckNotEmpty) -> Unit
+    private val decks: List<DeckWithAvailability>,
+    private val bind: DecksListItemBinding.(DeckWithAvailability) -> Unit
 ) : RecyclerView.Adapter<DeckItemViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
@@ -112,5 +112,5 @@ private class DeckItemViewHolder(
 ) : RecyclerView.ViewHolder(binding.root)
 
 interface DecksItemListener {
-    fun onClick(item: DeckNotEmpty)
+    fun onClick(item: DeckWithAvailability)
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
index a91581c9..bce6d6d5 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
@@ -43,7 +43,7 @@ class StatsFragment : AbstractFragmentWithHelp(R.string.stats_help) {
         scope(job).launch {
             val statsList = listOf(stats_week to 7, stats_month to 30)
             for (statsData in statsList) {
-                val actions: Actions = actionsRepository.getActionsFrom(Days(statsData.second))
+                val actions: Actions = actionsRepository.actionsFrom(Days(statsData.second))
                 val cardsMastered =
                     actions.count { it.type is PracticeSubmission && it.type.isCorrect }
                 val hintsUsed = actions.count { it.type is PracticeHintAction }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/TheoryFreeNavigation.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/TheoryFreeNavigation.kt
index d293e9f7..cf26d453 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/TheoryFreeNavigation.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/TheoryFreeNavigation.kt
@@ -49,7 +49,7 @@ fun AbstractStepFragment.toNextStep(
 ): Unit =
     if (thisStep.data is LastInfo) Timber.w("Tying to access step after last")
     else scope().launch {
-        val nextStep = theoryRepository.getNextStepAndUpdate(thisStep, markThisAsPassed)
+        val nextStep = theoryRepository.nextStepAndMove(thisStep, markThisAsPassed)
         if (nextStep != null) {
             toStep(nextStep)
         } else {
@@ -64,7 +64,7 @@ fun AbstractStepFragment.toPrevStep(
 ): Unit =
     if (thisStep.data is FirstInfo) Timber.w("Trying to access step before first")
     else scope().launch {
-        theoryRepository.getPrevStepAndUpdate(thisStep)
+        theoryRepository.prevStepAndMove(thisStep)
             ?.let(::toStep)
             ?: error("Prev step should always exist")
     }.devnull
@@ -73,7 +73,7 @@ fun AbstractStepFragment.toCurrentStep(
     courseId: Long,
     theoryRepository: MutableTheoryRepository = get()
 ): Unit = scope().launch {
-    val currStep = theoryRepository.getCurrentStepAndUpdate(courseId)
+    val currStep = theoryRepository.currentStepAndMove(courseId)
     toStep(currStep)
 }.devnull
 
@@ -81,13 +81,13 @@ fun Fragment.toLastCourseStep(
     courseId: Long,
     theoryRepository: TheoryRepository = get()
 ): Unit = scope().launch {
-    val lastStep = theoryRepository.getLastCourseStep(courseId)
+    val lastStep = theoryRepository.lastCourseStep(courseId)
     toStep(lastStep)
 }.devnull
 
 fun Fragment.toLastLessonStep(
     courseId: Long, lessonId: Long, theoryRepository: MutableTheoryRepository = get()
 ): Unit = scope().launch {
-    val lastStep = theoryRepository.getLastLessonOrCurrentStepAndUpdate(courseId, lessonId)
+    val lastStep = theoryRepository.lastLessonOrCurrentStepAndMove(courseId, lessonId)
     toStep(lastStep)
 }.devnull
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/lessons/LessonsListFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/lessons/LessonsListFragment.kt
index d9ce8bab..13b25c07 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/lessons/LessonsListFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/lessons/LessonsListFragment.kt
@@ -41,8 +41,8 @@ class LessonsListFragment : Fragment() {
         title = getString(R.string.lessons_title_lessons_list)
 
         lifecycleScope.launch {
-            val curr = theoryRepository.getCurrentStep(COURSE.id)
-            val lessons = theoryRepository.getAllCourseLessons(COURSE.id)
+            val curr = theoryRepository.currentStep(COURSE.id)
+            val lessons = theoryRepository.allCourseLessons(COURSE.id)
             val activeListener = object : LessonItemListener {
                 override fun onClick(item: Lesson) = toLastLessonStep(COURSE.id, item.id)
             }
diff --git a/app/src/main/res/layout/decks_list_item.xml b/app/src/main/res/layout/decks_list_item.xml
index aae78cbe..6b38d642 100644
--- a/app/src/main/res/layout/decks_list_item.xml
+++ b/app/src/main/res/layout/decks_list_item.xml
@@ -6,7 +6,7 @@
 
         <variable
             name="item"
-            type="com.github.braillesystems.learnbraille.data.repository.DeckNotEmpty" />
+            type="com.github.braillesystems.learnbraille.data.repository.DeckWithAvailability" />
 
         <variable
             name="clickListener"
diff --git a/app/src/test/java/com/github/braillesystems/learnbraille/utils/UtilsTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/utils/UtilsTest.kt
index 8a098998..c8aa7b34 100644
--- a/app/src/test/java/com/github/braillesystems/learnbraille/utils/UtilsTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/utils/UtilsTest.kt
@@ -5,13 +5,15 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 
 @Serializable
-sealed class S
+sealed class S {
+    abstract val s: String
+}
 
 @Serializable
-data class A(val s: String) : S()
+data class A(override val s: String) : S()
 
 @Serializable
-data class B(val i: Long, val s: String) : S()
+data class B(val i: Long, override val s: String) : S()
 
 class UtilsTest {
 
@@ -30,5 +32,6 @@ class UtilsTest {
         assertEquals(s1 as A, parse(S.serializer(), stringify(S.serializer(), s1)))
         val s2: S = B(100500, "aaa")
         assertEquals(s2 as B, parse(S.serializer(), stringify(S.serializer(), s2)))
+        assertEquals("wow", s1.s)
     }
 }

From 0577a6b48a86a5ed83ee8362149a4783720a14d0 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Wed, 23 Sep 2020 22:38:31 +0300
Subject: [PATCH 069/117] Add adding content tutorial

---
 CONTRIBUTING.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 29f4ed06..9e7f093b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,3 +24,32 @@ There are handy DSL that allows write content in the typesafe way.
 
 - All app content should be placed into `com.github.braillesystems.learnbraille.res` package.
 - Use `DslTest.kt` file as DSL tutorial.
+
+Information correctness should be checked in compile time or in app initialization runtime as much as possible. If some additional info is need, do not hardcode it. Just make request to the new DSL feature via github issues.
+
+Adding rules, prevent lambda of capturing context that will be invalid next time fragment entered, so use `Fragment.getString` outside of lambdas.
+
+#### Adding course
+
+1. Create lessons by `lessons` delegate.
+2. Create course in `CourseBuilder` and add lessons to it.
+
+Always use `com.github.braillesystems.learnbraille.res.content` value to get materials, they are indexed here in proper way.
+
+#### Adding deck
+
+1. Add new deck tag to `DeckTags`.
+2. Map tag to deck's predicate in `DecksBuilder`.
+3. Map deck's tag to user-visible string in `deckTagToName`.
+
+#### Adding materials
+
+1. Create materials by one of delegates: `markers` or `symbols`.
+2. Add created materials to the `contens` (`materials` delegate).
+3. Add to `inputSymbolPrintRules` and `showSymbolPrintRules`, or to `inputMarkerPrintRules` and `showMarkerPrintRules`.
+
+New materials can be marked as known by default in `knownMaterials` (`known` delegate).
+
+## Database
+
+Database scheme is described [here](https://github.com/braille-systems/learn-braille/blob/master/database.md).

From ef603a66dbd71d44a84bdc3a40ca532920052811 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Wed, 23 Sep 2020 22:38:49 +0300
Subject: [PATCH 070/117] Reformat

---
 database.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/database.md b/database.md
index df290e3d..6f9bdf8a 100644
--- a/database.md
+++ b/database.md
@@ -1,13 +1,9 @@
 # Database
 
-![LBDB](https://user-images.githubusercontent.com/25281147/81498004-5a5cb000-92d3-11ea-9c53-7246ef9d0176.png)
-
-
-Update: `Deck` does not have description.
-
-
 By `dbdiagram.io`:
 
+![LBDB](https://user-images.githubusercontent.com/25281147/81498004-5a5cb000-92d3-11ea-9c53-7246ef9d0176.png)
+
 ```
 // All fields [not null] by default
 
@@ -95,3 +91,5 @@ Table cards {
   material_id long [pk, ref: > materials.id]
 }
 ```
+
+Update: `decks` does not have description.

From c7f30f60b689ee3d331c48f058c1a8beb04f25ed Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Thu, 24 Sep 2020 00:13:56 +0300
Subject: [PATCH 071/117] Refactor messages system

---
 .../ui/screens/DotsCheckerTest.kt             | 14 -----
 .../learnbraille/ui/Messages.kt               | 62 +++++--------------
 .../ui/screens/practice/CardFragment.kt       | 18 ++++--
 .../theory/steps/InputSymbolFragment.kt       | 16 ++---
 .../theory/steps/ShowSymbolFragment.kt        |  7 ++-
 .../learnbraille/ui/views/BigLetterView.kt    | 26 ++++----
 .../learnbraille/utils/_Kotlin.kt             |  2 +
 7 files changed, 58 insertions(+), 87 deletions(-)
 delete mode 100644 app/src/androidTest/java/com/github/braillesystems/learnbraille/ui/screens/DotsCheckerTest.kt

diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/ui/screens/DotsCheckerTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/ui/screens/DotsCheckerTest.kt
deleted file mode 100644
index b6036631..00000000
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/ui/screens/DotsCheckerTest.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.github.braillesystems.learnbraille.ui.screens
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class DotsCheckerTest {
-
-    @Test
-    fun dotsChecker() {
-        // TODO
-    }
-}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt
index 87aa3c78..ad26b725 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt
@@ -3,27 +3,18 @@ package com.github.braillesystems.learnbraille.ui
 import android.content.Context
 import androidx.fragment.app.Fragment
 import com.github.braillesystems.learnbraille.R
-import com.github.braillesystems.learnbraille.data.entities.BrailleDot
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
-import com.github.braillesystems.learnbraille.data.entities.list
+import com.github.braillesystems.learnbraille.data.entities.filled
 import com.github.braillesystems.learnbraille.data.entities.spelling
-import com.github.braillesystems.learnbraille.res.inputSymbolPrintRules
-import com.github.braillesystems.learnbraille.res.showSymbolPrintRules
-import com.github.braillesystems.learnbraille.utils.*
-import timber.log.Timber
+import com.github.braillesystems.learnbraille.utils.checkedToast
+import com.github.braillesystems.learnbraille.utils.contextNotNull
+import com.github.braillesystems.learnbraille.utils.lazyWithContext
+import com.github.braillesystems.learnbraille.utils.toast
 
-enum class PrintMode {
-    INPUT, SHOW
-}
-
-fun Fragment.showCorrectToast(): Unit = toast(getString(R.string.input_correct))
+fun Fragment.showCorrectToast() = toast(getString(R.string.input_correct))
 
-fun Fragment.showIncorrectToast(c: Char? = null): Unit =
-    if (c == null) toast(getString(R.string.input_incorrect))
-    else toast(
-        "${getString(R.string.input_incorrect)} " +
-                printString(c, PrintMode.INPUT).orEmpty()
-    )
+fun Fragment.showIncorrectToast(hint: String = "") =
+    toast("${getString(R.string.input_incorrect)} $hint")
 
 val Context.dotsHintRules by lazyWithContext<Context, List<String>> {
     listOf(
@@ -36,34 +27,15 @@ val Context.dotsHintRules by lazyWithContext<Context, List<String>> {
     )
 }
 
-fun Fragment.showHintDotsToast(expectedDots: BrailleDots) =
-    getString(R.string.input_dots_hint_template)
-        .format(
-            expectedDots.list
-                .mapIndexedNotNull { index, brailleDot ->
-                    if (brailleDot == BrailleDot.F) application.dotsHintRules[index] else null
-                }
-                .joinToString(separator = ", ")
-        )
-        .side { checkedToast(it) }
+fun Fragment.showHintDotsToast(expectedDots: BrailleDots) {
+    val template = getString(R.string.input_dots_hint_template)
+    val hint = expectedDots
+        .filled
+        .joinToString(separator = ", ") {
+            contextNotNull.dotsHintRules[it - 1]
+        }
+    checkedToast(template.format(hint))
+}
 
 fun Fragment.showHintToast(expectedDots: BrailleDots) =
     checkedToast(getString(R.string.input_hint_template).format(expectedDots.spelling))
-
-fun Context.printString(c: Char, mode: PrintMode): String? =
-    when (mode) {
-        PrintMode.INPUT -> inputSymbolPrintRules[c]
-        PrintMode.SHOW -> showSymbolPrintRules[c]
-    }
-
-fun Context.printStringNotNullLogged(c: Char, mode: PrintMode): String =
-    printString(c, mode) ?: "".also { Timber.e("Intro should be available") }
-
-fun Fragment.printString(c: Char, mode: PrintMode): String? =
-    (context ?: null.also { Timber.w("Context is not available") })
-        ?.run { printString(c, mode) }
-
-fun Fragment.printStringNotNullLogged(c: Char, mode: PrintMode): String =
-    context
-        ?.printStringNotNullLogged(c, mode)
-        ?: error("Context is not available")
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
index 6dadf0dd..1e3253c1 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
@@ -15,10 +15,13 @@ import com.github.braillesystems.learnbraille.data.repository.PreferenceReposito
 import com.github.braillesystems.learnbraille.databinding.FragmentCardBinding
 import com.github.braillesystems.learnbraille.res.deckTagToName
 import com.github.braillesystems.learnbraille.res.inputMarkerPrintRules
-import com.github.braillesystems.learnbraille.ui.*
+import com.github.braillesystems.learnbraille.res.inputSymbolPrintRules
 import com.github.braillesystems.learnbraille.ui.brailletrainer.BrailleTrainer
 import com.github.braillesystems.learnbraille.ui.brailletrainer.BrailleTrainerSignalHandler
 import com.github.braillesystems.learnbraille.ui.screens.*
+import com.github.braillesystems.learnbraille.ui.showCorrectToast
+import com.github.braillesystems.learnbraille.ui.showHintToast
+import com.github.braillesystems.learnbraille.ui.showIncorrectToast
 import com.github.braillesystems.learnbraille.ui.views.BrailleDotsState
 import com.github.braillesystems.learnbraille.ui.views.brailleDots
 import com.github.braillesystems.learnbraille.ui.views.dotsState
@@ -86,7 +89,9 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
         viewModel = ViewModelProvider(
             this, viewModelFactory
         ).get(CardViewModel::class.java)
+
         buzzer = activity?.getSystemService()
+
         BrailleTrainer.setSignalHandler(object : BrailleTrainerSignalHandler {
             override fun onJoystickRight() = viewModel.onCheck()
             override fun onJoystickLeft() = viewModel.onHint()
@@ -103,7 +108,7 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
                 is Symbol -> {
                     binding.letter.visibility = View.VISIBLE
                     binding.markerDescription.visibility = View.GONE
-                    binding.letter.text = it.char.toString()
+                    binding.letter.letter = it.char
                 }
                 is MarkerSymbol -> {
                     binding.letter.visibility = View.GONE
@@ -123,10 +128,11 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             viewLifecycleOwner, dotsState, buzzer
         ) {
             viewModel.symbol.value?.let { symbol ->
-                when (symbol) {
-                    is Symbol -> showIncorrectToast(symbol.char)
-                    is MarkerSymbol -> showIncorrectToast()
+                val hint = when (symbol) {
+                    is Symbol -> contextNotNull.inputSymbolPrintRules.getValue(symbol.char)
+                    is MarkerSymbol -> contextNotNull.inputMarkerPrintRules.getValue(symbol.type)
                 }
+                showIncorrectToast(hint)
             } ?: checkedToast(getString(R.string.input_loading))
             updateTitle(title)
         }
@@ -176,7 +182,7 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
 
     private fun announceIntro(symbol: String) {
         require(symbol.length == 1)
-        val intro = printStringNotNullLogged(symbol.first(), PrintMode.INPUT)
+        val intro = contextNotNull.inputSymbolPrintRules.getValue(symbol.first())
         checkedAnnounce(intro)
     }
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt
index ca0ce4cf..af3bc28a 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt
@@ -13,7 +13,7 @@ import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.data.entities.Input
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputSymbolBinding
-import com.github.braillesystems.learnbraille.ui.*
+import com.github.braillesystems.learnbraille.res.inputSymbolPrintRules
 import com.github.braillesystems.learnbraille.ui.screens.observeCheckedOnFly
 import com.github.braillesystems.learnbraille.ui.screens.observeEventHint
 import com.github.braillesystems.learnbraille.ui.screens.observeEventIncorrect
@@ -21,11 +21,11 @@ import com.github.braillesystems.learnbraille.ui.screens.observeEventPassHint
 import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
 import com.github.braillesystems.learnbraille.ui.screens.theory.toNextStep
 import com.github.braillesystems.learnbraille.ui.screens.theory.toPrevStep
+import com.github.braillesystems.learnbraille.ui.showCorrectToast
+import com.github.braillesystems.learnbraille.ui.showHintToast
+import com.github.braillesystems.learnbraille.ui.showIncorrectToast
 import com.github.braillesystems.learnbraille.ui.views.*
-import com.github.braillesystems.learnbraille.utils.announce
-import com.github.braillesystems.learnbraille.utils.application
-import com.github.braillesystems.learnbraille.utils.checkedAnnounce
-import com.github.braillesystems.learnbraille.utils.checkedBuzz
+import com.github.braillesystems.learnbraille.utils.*
 import timber.log.Timber
 
 class InputSymbolFragment : AbstractStepFragment(R.string.lessons_help_input_symbol) {
@@ -57,7 +57,7 @@ class InputSymbolFragment : AbstractStepFragment(R.string.lessons_help_input_sym
         val symbol = step.data.material.data
         letter.text = symbol.char.toString()
         brailleDots.dotsState.display(symbol.brailleDots)
-        checkedAnnounce(printStringNotNullLogged(symbol.char, PrintMode.INPUT))
+        checkedAnnounce(contextNotNull.inputSymbolPrintRules.getValue(symbol.char))
 
         updateTitle(getString(R.string.lessons_title_input_symbol))
 
@@ -100,7 +100,7 @@ class InputSymbolFragment : AbstractStepFragment(R.string.lessons_help_input_sym
             viewLifecycleOwner, dotsState
         ) {
             val notify = {
-                showIncorrectToast(symbol.char)
+                showIncorrectToast(contextNotNull.inputSymbolPrintRules.getValue(symbol.char))
                 buzzer.checkedBuzz(preferenceRepository.incorrectBuzzPattern, preferenceRepository)
             }
             if (userTouchedDots) notify()
@@ -117,7 +117,7 @@ class InputSymbolFragment : AbstractStepFragment(R.string.lessons_help_input_sym
         viewModel.observeEventPassHint(
             viewLifecycleOwner, dotsState
         ) {
-            val msg = printStringNotNullLogged(symbol.char, PrintMode.INPUT)
+            val msg = contextNotNull.inputSymbolPrintRules.getValue(symbol.char)
             announce(msg)
         }
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt
index e34a4d1b..3a17c849 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt
@@ -8,12 +8,13 @@ import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.Show
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsShowSymbolBinding
-import com.github.braillesystems.learnbraille.ui.PrintMode
-import com.github.braillesystems.learnbraille.ui.printStringNotNullLogged
+import com.github.braillesystems.learnbraille.res.showSymbolPrintRules
 import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
+import com.github.braillesystems.learnbraille.utils.contextNotNull
+import com.github.braillesystems.learnbraille.utils.getValue
 import timber.log.Timber
 
 class ShowSymbolFragment : AbstractStepFragment(R.string.lessons_help_show_symbol) {
@@ -38,7 +39,7 @@ class ShowSymbolFragment : AbstractStepFragment(R.string.lessons_help_show_symbo
         require(step.data.material.data is Symbol)
         letter.text = step.data.material.data.char.toString()
         brailleDots.dotsState.display(step.data.material.data.brailleDots)
-        checkedAnnounce(printStringNotNullLogged(step.data.material.data.char, PrintMode.SHOW))
+        checkedAnnounce(contextNotNull.showSymbolPrintRules.getValue(step.data.material.data.char))
 
         updateTitle(getString(R.string.lessons_title_show_symbol))
         setPrevButton(prevButton)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BigLetterView.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BigLetterView.kt
index e6b908b2..8f12990e 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BigLetterView.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BigLetterView.kt
@@ -4,9 +4,9 @@ import android.content.Context
 import android.util.AttributeSet
 import android.widget.TextView
 import androidx.core.widget.addTextChangedListener
-import com.github.braillesystems.learnbraille.ui.PrintMode
-import com.github.braillesystems.learnbraille.ui.printString
-import timber.log.Timber
+import com.github.braillesystems.learnbraille.res.inputSymbolPrintRules
+import com.github.braillesystems.learnbraille.res.showSymbolPrintRules
+import com.github.braillesystems.learnbraille.utils.getValue
 
 open class BigLetterView : TextView {
 
@@ -20,16 +20,16 @@ open class BigLetterView : TextView {
         context, attrSet, defStyleAttr
     )
 
-    protected fun addContextListener(mode: PrintMode) {
+    var letter: Char
+        get() = super.getText().first()
+        set(value) = super.setText(value.toString())
+
+    protected fun addContextListener(hintGetter: Context.(Char) -> String) {
         addTextChangedListener(
             afterTextChanged = { text ->
                 if (text == null) return@addTextChangedListener
                 require(text.length == 1)
-                contentDescription = context
-                    .printString(text.first(), mode)
-                    ?: text.first().toLowerCase().toString().also {
-                        Timber.e("Symbol intro not found: $text")
-                    }
+                contentDescription = context.hintGetter(text.first())
             }
         )
     }
@@ -48,7 +48,9 @@ class InputBigLetterView : BigLetterView {
     )
 
     init {
-        addContextListener(PrintMode.INPUT)
+        addContextListener { c ->
+            inputSymbolPrintRules.getValue(c)
+        }
     }
 }
 
@@ -65,6 +67,8 @@ class ShowBigLetterView : BigLetterView {
     )
 
     init {
-        addContextListener(PrintMode.SHOW)
+        addContextListener { c ->
+            showSymbolPrintRules.getValue(c)
+        }
     }
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
index 649e63a9..836fb181 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
@@ -57,6 +57,8 @@ fun <T, R> Rules<T, R>.match(key: T): R? = matchF(key)?.invoke(key)
 
 operator fun <T, R> Rules<T, R>.get(x: T): R? = match(x)
 
+fun <T, R> Rules<T, R>.getValue(x: T): R = match(x) ?: error("No rule match value")
+
 /**
  * It is very useful to choose android text resource depending on some condition.
  * (In that case prevent lambda of capturing context that will be invalid next time fragment entered,

From 084ba19516e49067a77a896de758ffcd0635e9e4 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Thu, 24 Sep 2020 00:31:32 +0300
Subject: [PATCH 072/117] Extract exit to launcher to utils

---
 .../learnbraille/ui/screens/exit/ExitFragment.kt          | 7 ++-----
 .../github/braillesystems/learnbraille/utils/_Android.kt  | 8 ++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
index 4f99a79f..ff50e0bf 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
@@ -1,6 +1,5 @@
 package com.github.braillesystems.learnbraille.ui.screens.exit
 
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -9,6 +8,7 @@ import androidx.fragment.app.Fragment
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.databinding.FragmentExitBinding
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
+import com.github.braillesystems.learnbraille.utils.exitToLauncher
 import com.github.braillesystems.learnbraille.utils.navigate
 import com.github.braillesystems.learnbraille.utils.title
 
@@ -29,10 +29,7 @@ class ExitFragment : Fragment() {
         checkedAnnounce(title)
 
         exitButton.setOnClickListener {
-            val homeIntent = Intent(Intent.ACTION_MAIN)
-            homeIntent.addCategory(Intent.CATEGORY_HOME)
-            homeIntent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
-            startActivity(homeIntent)
+            exitToLauncher()
         }
 
         continueButton.setOnClickListener {
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
index b8ff8be5..142d4b3f 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
@@ -100,6 +100,14 @@ fun Fragment.navigate(action: NavDirections) = try {
     Timber.e(e, "Multitouch navigation")
 }
 
+fun Fragment.exitToLauncher() {
+    val intent = Intent(Intent.ACTION_MAIN).apply {
+        addCategory(Intent.CATEGORY_HOME)
+        flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+    }
+    startActivity(intent)
+}
+
 val Context.appName: String get() = getString(R.string.app_name)
 val Fragment.appName: String get() = contextNotNull.appName
 

From ce3075e7b20d4db40b2bb47fb49e70dc5e87a90c Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Thu, 24 Sep 2020 00:36:14 +0300
Subject: [PATCH 073/117] Remove voice recording permission request result
 handling

---
 .../learnbraille/ui/screens/menu/MenuFragment.kt  | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/menu/MenuFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/menu/MenuFragment.kt
index eb9795a0..20d1a088 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/menu/MenuFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/menu/MenuFragment.kt
@@ -3,7 +3,6 @@ package com.github.braillesystems.learnbraille.ui.screens.menu
 import android.app.Activity.RESULT_OK
 import android.content.ActivityNotFoundException
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -122,19 +121,6 @@ class MenuFragment : AbstractFragmentWithHelp(R.string.menu_help) {
         }
     }
 
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<String?>,
-        grantResults: IntArray
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        when (requestCode) {
-            recordAudioPermissionCode -> if (grantResults.first() != PackageManager.PERMISSION_GRANTED) {
-                toast(getString(R.string.voice_record_denial))
-            }
-        }
-    }
-
     private fun interruptingOnClickListener(block: (View) -> Unit) =
         View.OnClickListener {
             if (db.isInitialized) block(it)
@@ -175,6 +161,5 @@ class MenuFragment : AbstractFragmentWithHelp(R.string.menu_help) {
 
     companion object {
         private const val qrRequestCode = 0
-        private const val recordAudioPermissionCode = 29
     }
 }

From a42d61fb0fbeab8680f8951cdfe2087792344fa5 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Thu, 24 Sep 2020 00:49:07 +0300
Subject: [PATCH 074/117] Display current deck name bold in the practice's
 decks list

---
 .../learnbraille/ui/screens/practice/DecksListFragment.kt  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/DecksListFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/DecksListFragment.kt
index e007f34a..5816d222 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/DecksListFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/DecksListFragment.kt
@@ -1,5 +1,6 @@
 package com.github.braillesystems.learnbraille.ui.screens.practice
 
+import android.graphics.Typeface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -43,6 +44,7 @@ class DecksListFragment : Fragment() {
 
         lifecycleScope.launch {
             val decks = practiceRepository.allDecksWithAvailability()
+            val currDeck = practiceRepository.currentDeck()
             val listener = object : DecksItemListener {
                 override fun onClick(item: DeckWithAvailability) =
                     if (item.containsCards) {
@@ -58,6 +60,11 @@ class DecksListFragment : Fragment() {
             decksList.adapter = DecksListAdapter(decks) { item ->
                 this.item = item
                 deckName.text = deckTagToName.getValue(item.deck.tag)
+                deckName.setTypeface(
+                    deckName.typeface,
+                    if (item.deck == currDeck) Typeface.BOLD
+                    else Typeface.NORMAL
+                )
                 clickListener = listener
                 if (item.containsCards) {
                     deckName.setTextColor(

From 194273d2b37c3dfab92859b993a3c958f332dec1 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Thu, 24 Sep 2020 16:56:29 +0300
Subject: [PATCH 075/117] Refactor fragments

---
 .../data/db/LearnBrailleDatabaseTest.kt       |   4 +-
 .../learnbraille/LearnBrailleApplication.kt   |   4 +-
 .../learnbraille/data/entities/StepData.kt    |  32 +++--
 .../data/repository/TheoryRepository.kt       |   2 -
 .../learnbraille/res/GolubinaCourse.kt        |  26 ++--
 .../learnbraille/res/Materials.kt             |   7 +
 .../learnbraille/res/TestCourse.kt            |   4 +-
 .../learnbraille/ui/Messages.kt               |  22 +--
 .../learnbraille/ui/screens/DotsChecker.kt    |   7 +-
 .../ui/screens/browser/BrowserFragment.kt     |   9 +-
 .../ui/screens/browser/MarkerViewFragment.kt  |   5 +-
 .../ui/screens/browser/SymbolViewFragment.kt  |   2 +-
 .../ui/screens/practice/CardFragment.kt       |  86 ++++--------
 .../ui/screens/stats/StatsFragment.kt         |   1 +
 .../theory/steps/AbstractInfoStepFragment.kt  |   5 -
 .../theory/steps/AbstractStepFragment.kt      |  95 +++++++------
 .../screens/theory/steps/InputDotsFragment.kt | 126 -----------------
 .../theory/steps/InputMarkerFragment.kt       | 132 ------------------
 .../theory/steps/InputSymbolFragment.kt       | 125 -----------------
 .../steps/info/AbstractInfoStepFragment.kt    |  21 +++
 .../steps/{ => info}/FirstInfoFragment.kt     |  26 ++--
 .../theory/steps/{ => info}/InfoFragment.kt   |  28 ++--
 .../steps/{ => info}/LastInfoFragment.kt      |  26 ++--
 .../steps/input/AbstractInputStepFragment.kt  |  94 +++++++++++++
 .../theory/steps/input/InputDotsFragment.kt   |  51 +++++++
 .../theory/steps/input/InputMarkerFragment.kt |  54 +++++++
 .../theory/steps/input/InputSymbolFragment.kt |  67 +++++++++
 .../steps/{ => input}/InputViewModel.kt       |   2 +-
 .../steps/{ => show}/ShowDotsFragment.kt      |  43 +++---
 .../steps/{ => show}/ShowMarkerFragment.kt    |  53 +++----
 .../steps/{ => show}/ShowSymbolFragment.kt    |  36 ++---
 .../learnbraille/utils/Utils.kt               |  28 +++-
 .../learnbraille/utils/_Kotlin.kt             |   4 +-
 .../layout/fragment_lessons_input_dots.xml    |   2 +-
 .../layout/fragment_lessons_input_marker.xml  |   2 +-
 .../layout/fragment_lessons_input_symbol.xml  |   2 +-
 app/src/main/res/navigation/navigation.xml    |  18 +--
 .../learnbraille/data/dsl/DslTest.kt          |   8 +-
 38 files changed, 597 insertions(+), 662 deletions(-)
 delete mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractInfoStepFragment.kt
 delete mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputDotsFragment.kt
 delete mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputMarkerFragment.kt
 delete mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt
 create mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/AbstractInfoStepFragment.kt
 rename app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/{ => info}/FirstInfoFragment.kt (66%)
 rename app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/{ => info}/InfoFragment.kt (62%)
 rename app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/{ => info}/LastInfoFragment.kt (66%)
 create mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
 create mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputDotsFragment.kt
 create mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputMarkerFragment.kt
 create mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputSymbolFragment.kt
 rename app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/{ => input}/InputViewModel.kt (99%)
 rename app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/{ => show}/ShowDotsFragment.kt (56%)
 rename app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/{ => show}/ShowMarkerFragment.kt (54%)
 rename app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/{ => show}/ShowSymbolFragment.kt (63%)

diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabaseTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabaseTest.kt
index 134045e9..f67a9ab5 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabaseTest.kt
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabaseTest.kt
@@ -83,7 +83,7 @@ class LearnBrailleDatabaseTest {
             id = 3,
             data = ShowDots(
                 text = "Перед Вами полное шеститочие",
-                dots = BrailleDots(F, F, F, F, F, F)
+                brailleDots = BrailleDots(F, F, F, F, F, F)
             ),
             lessonId = 1, courseId = 1
         ),
@@ -91,7 +91,7 @@ class LearnBrailleDatabaseTest {
             id = 4,
             data = InputDots(
                 text = "Введите все шесть точек",
-                dots = BrailleDots(F, F, F, F, F, F)
+                brailleDots = BrailleDots(F, F, F, F, F, F)
             ),
             lessonId = 2, courseId = 1
         ),
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
index bd2ca28c..596d7fbb 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
@@ -2,7 +2,7 @@ package com.github.braillesystems.learnbraille
 
 import android.app.Application
 import com.github.braillesystems.learnbraille.data.db.LearnBrailleDatabase
-import com.github.braillesystems.learnbraille.data.dsl.UsersCourse
+import com.github.braillesystems.learnbraille.data.dsl.DevelopersCourse
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.data.repository.*
 import com.github.braillesystems.learnbraille.ui.screens.practice.CardViewModelFactory
@@ -119,4 +119,4 @@ class LearnBrailleApplication : Application() {
 lateinit var koin: Koin
     private set
 
-val COURSE = UsersCourse(2L)
+val COURSE = DevelopersCourse
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt
index ffef8f34..6ca07ef8 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt
@@ -65,7 +65,9 @@ data class LastInfo(
 
 
 @Serializable
-sealed class BaseInput : StepData()
+sealed class BaseInput : StepData() {
+    abstract val brailleDots: BrailleDots
+}
 
 /**
  * Step prompts the user to enter something.
@@ -73,9 +75,12 @@ sealed class BaseInput : StepData()
 @Serializable
 data class Input(
     val material: Material
-) : BaseInput()
-
-// TODO add ReflectedInput
+) : BaseInput() {
+    override val brailleDots: BrailleDots
+        get() = when (material.data) {
+            is OneBrailleSymbol -> material.data.brailleDots
+        }
+}
 
 /**
  * Step prompts the user to enter dots with specific numbers.
@@ -86,12 +91,15 @@ data class Input(
 @Serializable
 data class InputDots(
     val text: HtmlText?,
-    val dots: BrailleDots
+    @SerialName("dots") // backward compatibility
+    override val brailleDots: BrailleDots
 ) : BaseInput()
 
 
 @Serializable
-sealed class BaseShow : StepData()
+sealed class BaseShow : StepData() {
+    abstract val brailleDots: BrailleDots
+}
 
 /**
  * Step shows something.
@@ -99,9 +107,12 @@ sealed class BaseShow : StepData()
 @Serializable
 data class Show(
     val material: Material
-) : BaseShow()
-
-// TODO ReflectedShow
+) : BaseShow() {
+    override val brailleDots: BrailleDots
+        get() = when (material.data) {
+            is OneBrailleSymbol -> material.data.brailleDots
+        }
+}
 
 /**
  * Step shows Braille dots with specific numbers.
@@ -112,5 +123,6 @@ data class Show(
 @Serializable
 data class ShowDots(
     val text: HtmlText?,
-    val dots: BrailleDots
+    @SerialName("dots")
+    override val brailleDots: BrailleDots
 ) : BaseShow()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
index 536d3a45..c6582915 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
@@ -19,8 +19,6 @@ interface MutableTheoryRepository : TheoryRepository {
     suspend fun lastLessonOrCurrentStepAndMove(courseId: DBid, lessonId: DBid): Step
 }
 
-// TODO refactor theory repo and navigation
-
 class TheoryRepositoryImpl(
     private val lessonDao: LessonDao,
     private val stepDao: StepDao,
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index c90a5f14..b77d8093 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -37,60 +37,60 @@ internal val golubinaIntroLessons by lessons {
         +ShowDots(
             text = "Перед Вами символ Брайля - <br>" +
                     " точка номер один",
-            dots = BrailleDots(F, E, E, E, E, E)
+            brailleDots = BrailleDots(F, E, E, E, E, E)
         )
         +InputDots(
             text = "Введите точку один",
-            dots = BrailleDots(F, E, E, E, E, E)
+            brailleDots = BrailleDots(F, E, E, E, E, E)
         )
         +ShowDots(
             text = "Точка номер два",
-            dots = BrailleDots(E, F, E, E, E, E)
+            brailleDots = BrailleDots(E, F, E, E, E, E)
         )
         +InputDots(
             text = "Введите точку два",
-            dots = BrailleDots(E, F, E, E, E, E)
+            brailleDots = BrailleDots(E, F, E, E, E, E)
         )
         +ShowDots(
             text = "Комбинация точек 1 и 2",
-            dots = BrailleDots(F, F, E, E, E, E)
+            brailleDots = BrailleDots(F, F, E, E, E, E)
         )
         +InputDots(
             text = "Введите комбинацию: точки 1 и 2",
-            dots = BrailleDots(F, F, E, E, E, E)
+            brailleDots = BrailleDots(F, F, E, E, E, E)
         )
         +InputDots(
             text = "Введите комбинацию точек 1 и 3",
-            dots = BrailleDots(F, E, F, E, E, E)
+            brailleDots = BrailleDots(F, E, F, E, E, E)
         )
         +InputDots(
             text = "Введите комбинацию точек 1, 3 и 4",
-            dots = BrailleDots(F, E, F, F, E, E)
+            brailleDots = BrailleDots(F, E, F, F, E, E)
         )
         +InputDots(
             // repeat = 3
             text = "Введите комбинацию точек 1, 3 и 6",
-            dots = BrailleDots(F, E, F, E, E, F)
+            brailleDots = BrailleDots(F, E, F, E, E, F)
         )
         +InputDots(
             // repeat = 3
             text = "Введите комбинацию точек 1, 5 и 6",
-            dots = BrailleDots(F, E, E, E, F, F)
+            brailleDots = BrailleDots(F, E, E, E, F, F)
         )
         +InputDots(
             // repeat = 3
             text = "Введите комбинацию точек 2, 3, 4 и 5",
-            dots = BrailleDots(E, F, F, F, F, E)
+            brailleDots = BrailleDots(E, F, F, F, F, E)
         )
         +ShowDots(
             text = "Перед Вами полное шеститочие: <br>" +
                     "точки 1, 2, 3, 4, 5, 6",
-            dots = BrailleDots(F, F, F, F, F, F)
+            brailleDots = BrailleDots(F, F, F, F, F, F)
         )
         +InputDots(
             // repeat = 3
             text = "Введите все шесть точек",
-            dots = BrailleDots(F, F, F, F, F, F)
+            brailleDots = BrailleDots(F, F, F, F, F, F)
         )
         +Info(
             """Откройте букварь на странице 12. 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index 322fa0f6..c116c28e 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -1,6 +1,7 @@
 package com.github.braillesystems.learnbraille.res
 
 import android.content.Context
+import androidx.fragment.app.Fragment
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.dsl.known
 import com.github.braillesystems.learnbraille.data.dsl.markers
@@ -9,6 +10,7 @@ import com.github.braillesystems.learnbraille.data.dsl.symbols
 import com.github.braillesystems.learnbraille.data.entities.BrailleDot.E
 import com.github.braillesystems.learnbraille.data.entities.BrailleDot.F
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
+import com.github.braillesystems.learnbraille.utils.contextNotNull
 import com.github.braillesystems.learnbraille.utils.rules
 import kotlinx.serialization.Serializable
 
@@ -49,6 +51,11 @@ val knownMaterials by known(
  * so use `Fragment.getString` outside of lambdas.
  */
 
+val Fragment.inputSymbolPrintRules get() = contextNotNull.inputSymbolPrintRules
+val Fragment.showSymbolPrintRules get() = contextNotNull.showSymbolPrintRules
+val Fragment.inputMarkerPrintRules get() = contextNotNull.inputMarkerPrintRules
+val Fragment.showMarkerPrintRules get() = contextNotNull.showMarkerPrintRules
+
 val Context.inputSymbolPrintRules by rules<Context, Char, String>(
     {
         val t = getString(R.string.input_letter_intro_template)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
index 3ee3d5a1..9f25d927 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/TestCourse.kt
@@ -29,11 +29,11 @@ internal val testLessons by lessons {
         )
         +ShowDots(
             text = "Перед Вами полное шеститочие",
-            dots = BrailleDots(F, F, F, F, F, F)
+            brailleDots = BrailleDots(F, F, F, F, F, F)
         )
         +InputDots(
             text = "Введите все шесть точек",
-            dots = BrailleDots(F, F, F, F, F, F)
+            brailleDots = BrailleDots(F, F, F, F, F, F)
         )
         +Info(
             """Откройте букварь на странице 12. 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt
index ad26b725..eea7352d 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt
@@ -3,20 +3,17 @@ package com.github.braillesystems.learnbraille.ui
 import android.content.Context
 import androidx.fragment.app.Fragment
 import com.github.braillesystems.learnbraille.R
-import com.github.braillesystems.learnbraille.data.entities.BrailleDots
-import com.github.braillesystems.learnbraille.data.entities.filled
-import com.github.braillesystems.learnbraille.data.entities.spelling
-import com.github.braillesystems.learnbraille.utils.checkedToast
-import com.github.braillesystems.learnbraille.utils.contextNotNull
-import com.github.braillesystems.learnbraille.utils.lazyWithContext
-import com.github.braillesystems.learnbraille.utils.toast
+import com.github.braillesystems.learnbraille.data.entities.*
+import com.github.braillesystems.learnbraille.res.inputMarkerPrintRules
+import com.github.braillesystems.learnbraille.res.inputSymbolPrintRules
+import com.github.braillesystems.learnbraille.utils.*
 
 fun Fragment.showCorrectToast() = toast(getString(R.string.input_correct))
 
 fun Fragment.showIncorrectToast(hint: String = "") =
     toast("${getString(R.string.input_incorrect)} $hint")
 
-val Context.dotsHintRules by lazyWithContext<Context, List<String>> {
+private val Context.dotsHintRules by lazyWithContext<Context, List<String>> {
     listOf(
         getString(R.string.input_dots_hint_1),
         getString(R.string.input_dots_hint_2),
@@ -39,3 +36,12 @@ fun Fragment.showHintDotsToast(expectedDots: BrailleDots) {
 
 fun Fragment.showHintToast(expectedDots: BrailleDots) =
     checkedToast(getString(R.string.input_hint_template).format(expectedDots.spelling))
+
+fun Context.inputPrint(data: MaterialData): String =
+    when (data) {
+        is Symbol -> inputSymbolPrintRules.getValue(data.char)
+        is MarkerSymbol -> inputMarkerPrintRules.getValue(data.type)
+    }
+
+fun Fragment.inputPrint(data: MaterialData): String =
+    contextNotNull.inputPrint(data)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt
index d5fed047..51d4cb83 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt
@@ -77,7 +77,10 @@ interface MutableDotsChecker : DotsChecker {
 }
 
 /**
- * Initialize lateinit callbacks firstly
+ * Initialize lateinit callbacks firstly.
+ *
+ * Callbacks are called before changing state,
+ * so they can access previous state (the next one is obvious).
  */
 private class DotsCheckerImpl : MutableDotsChecker {
 
@@ -125,7 +128,7 @@ private class DotsCheckerImpl : MutableDotsChecker {
     private val isCorrect: Boolean
         get() = (enteredDots == expectedDots).also {
             Timber.i(
-                if (it) "Correct: "
+                if (it) "Correct"
                 else "Incorrect: entered = $enteredDots, expected = $expectedDots"
             )
         }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
index 22b6ece5..dc769d42 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
@@ -17,7 +17,10 @@ import com.github.braillesystems.learnbraille.databinding.FragmentBrowserBinding
 import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
 import com.github.braillesystems.learnbraille.res.showSymbolPrintRules
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
-import com.github.braillesystems.learnbraille.utils.*
+import com.github.braillesystems.learnbraille.utils.getValue
+import com.github.braillesystems.learnbraille.utils.navigate
+import com.github.braillesystems.learnbraille.utils.stringify
+import com.github.braillesystems.learnbraille.utils.title
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 
@@ -61,11 +64,11 @@ class BrowserFragment : AbstractFragmentWithHelp(R.string.browser_help) {
                 this.item = item
                 materialText.text = when (item.data) {
                     is Symbol -> getString(R.string.browser_represent_template).format(
-                        contextNotNull.showSymbolPrintRules[item.data.char].toString(),
+                        showSymbolPrintRules.getValue(item.data.char),
                         item.data.brailleDots.spelling
                     )
                     is MarkerSymbol -> getString(R.string.browser_represent_template).format(
-                        contextNotNull.showMarkerPrintRules[item.data.type].toString(),
+                        showMarkerPrintRules.getValue(item.data.type),
                         item.data.brailleDots.spelling
                     )
                 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
index eca41d12..a14a4c81 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
@@ -12,9 +12,8 @@ import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
-import com.github.braillesystems.learnbraille.utils.contextNotNull
-import com.github.braillesystems.learnbraille.utils.get
 import com.github.braillesystems.learnbraille.utils.getFragmentStringArg
+import com.github.braillesystems.learnbraille.utils.getValue
 import com.github.braillesystems.learnbraille.utils.parse
 
 class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view_help) {
@@ -35,7 +34,7 @@ class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view
         val m: Material = parse(Material.serializer(), getFragmentStringArg("material"))
         require(m.data is MarkerSymbol)
 
-        binding.infoTextView.text = contextNotNull.showMarkerPrintRules[m.data.type]
+        binding.infoTextView.text = showMarkerPrintRules.getValue(m.data.type)
         binding.brailleDots.dotsState.display(m.data.brailleDots)
 
     }.root
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
index 9e3213ea..14d6e1cd 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
@@ -32,7 +32,7 @@ class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view
         val m: Material = parse(Material.serializer(), getFragmentStringArg("material"))
         require(m.data is Symbol)
 
-        binding.letter.text = m.data.char.toString()
+        binding.letter.letter = m.data.char
         binding.brailleDots.dotsState.display(m.data.brailleDots)
 
     }.root
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
index 1e3253c1..9ab9dd24 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
@@ -2,7 +2,6 @@ package com.github.braillesystems.learnbraille.ui.screens.practice
 
 import android.os.Bundle
 import android.os.Vibrator
-import android.util.TypedValue
 import android.view.*
 import androidx.core.content.getSystemService
 import androidx.databinding.DataBindingUtil
@@ -15,9 +14,9 @@ import com.github.braillesystems.learnbraille.data.repository.PreferenceReposito
 import com.github.braillesystems.learnbraille.databinding.FragmentCardBinding
 import com.github.braillesystems.learnbraille.res.deckTagToName
 import com.github.braillesystems.learnbraille.res.inputMarkerPrintRules
-import com.github.braillesystems.learnbraille.res.inputSymbolPrintRules
 import com.github.braillesystems.learnbraille.ui.brailletrainer.BrailleTrainer
 import com.github.braillesystems.learnbraille.ui.brailletrainer.BrailleTrainerSignalHandler
+import com.github.braillesystems.learnbraille.ui.inputPrint
 import com.github.braillesystems.learnbraille.ui.screens.*
 import com.github.braillesystems.learnbraille.ui.showCorrectToast
 import com.github.braillesystems.learnbraille.ui.showHintToast
@@ -35,18 +34,10 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
 
     private val preferenceRepository: PreferenceRepository by inject()
 
-    private lateinit var viewModel: CardViewModel
+    // This value can change during ViewModel lifetime (ViewModelProvider does not call
+    // ViewModelFactory each time onCreateView runs). And once created ViewModel
+    // should be able to use up to date dotsState.
     private lateinit var dotsState: BrailleDotsState
-    private var buzzer: Vibrator? = null
-
-    private val title: String
-        get() = getString(R.string.practice_actionbar_title_template).let {
-            if (::viewModel.isInitialized) it.format(
-                viewModel.nCorrect,
-                viewModel.nTries
-            )
-            else it.format(0, 0)
-        }
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -61,36 +52,31 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
 
         Timber.i("onCreateView")
 
-        updateTitle(title)
+        title = title()
         setHasOptionsMenu(true)
 
         if (preferenceRepository.extendedAccessibilityEnabled) {
-            binding.hintButton.setSize(
-                width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
-            )
-            binding.nextButton.setSize(
-                width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
-            )
-            binding.markerDescription.setTextSize(
-                TypedValue.COMPLEX_UNIT_SP,
-                application.extendedTextSize
+            applyExtendedAccessibility(
+                leftButton = binding.hintButton,
+                rightButton = binding.nextButton,
+                textView = binding.markerDescription
             )
         }
 
-        dotsState = binding.brailleDots.dotsState.apply {
-            subscribe(View.OnClickListener {
-                viewModel.onSoftCheck()
-            })
-        }
+        dotsState = binding.brailleDots.dotsState
 
         val viewModelFactory: CardViewModelFactory by inject {
             parametersOf({ dotsState.brailleDots })
         }
-        viewModel = ViewModelProvider(
-            this, viewModelFactory
-        ).get(CardViewModel::class.java)
+        val viewModel = ViewModelProvider(this, viewModelFactory)
+            .get(CardViewModel::class.java)
+
+        dotsState.subscribe(View.OnClickListener {
+            viewModel.onSoftCheck()
+        })
+
 
-        buzzer = activity?.getSystemService()
+        val buzzer: Vibrator? = activity?.getSystemService()
 
         BrailleTrainer.setSignalHandler(object : BrailleTrainerSignalHandler {
             override fun onJoystickRight() = viewModel.onCheck()
@@ -113,28 +99,24 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
                 is MarkerSymbol -> {
                     binding.letter.visibility = View.GONE
                     binding.markerDescription.visibility = View.VISIBLE
-                    binding.markerDescription.text = contextNotNull.inputMarkerPrintRules[it.type]
+                    binding.markerDescription.text = inputMarkerPrintRules[it.type]
                 }
             }
         })
 
         viewModel.observeCheckedOnFly(
             viewLifecycleOwner, dotsState, buzzer,
-            block = { updateTitle(title) },
+            block = { title = title(viewModel) },
             softBlock = ::showCorrectToast
         )
 
         viewModel.observeEventIncorrect(
             viewLifecycleOwner, dotsState, buzzer
         ) {
-            viewModel.symbol.value?.let { symbol ->
-                val hint = when (symbol) {
-                    is Symbol -> contextNotNull.inputSymbolPrintRules.getValue(symbol.char)
-                    is MarkerSymbol -> contextNotNull.inputMarkerPrintRules.getValue(symbol.type)
-                }
-                showIncorrectToast(hint)
-            } ?: checkedToast(getString(R.string.input_loading))
-            updateTitle(title)
+            viewModel.symbol.value
+                ?.let { showIncorrectToast(inputPrint(it)) }
+                ?: checkedToast(getString(R.string.input_loading))
+            title = title(viewModel)
         }
 
         viewModel.observeEventHint(
@@ -147,10 +129,7 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             viewLifecycleOwner, dotsState
         ) {
             viewModel.symbol.value?.let {
-                when (it) {
-                    is Symbol -> announceIntro(it.char.toString())
-                    is MarkerSymbol -> checkedAnnounce(contextNotNull.inputMarkerPrintRules[it.type]!!)
-                }
+                checkedAnnounce(inputPrint(it))
             }
         }
 
@@ -158,10 +137,7 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             viewLifecycleOwner,
             Observer {
                 if (it == null) return@Observer
-                when (it) {
-                    is Symbol -> announceIntro(it.char.toString())
-                    is MarkerSymbol -> checkedAnnounce(contextNotNull.inputMarkerPrintRules[it.type]!!)
-                }
+                checkedAnnounce(inputPrint(it))
             }
         )
 
@@ -180,11 +156,11 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
 
     }.root
 
-    private fun announceIntro(symbol: String) {
-        require(symbol.length == 1)
-        val intro = contextNotNull.inputSymbolPrintRules.getValue(symbol.first())
-        checkedAnnounce(intro)
-    }
+    private fun title(viewModel: CardViewModel? = null): String =
+        getString(R.string.practice_actionbar_title_template).run {
+            if (viewModel == null) format(0, 0)
+            else format(viewModel.nCorrect, viewModel.nTries)
+        }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.card_menu, menu)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
index bce6d6d5..2a079721 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
@@ -63,6 +63,7 @@ class StatsFragment : AbstractFragmentWithHelp(R.string.stats_help) {
                 }
             }
         }
+
     }.root
 
     override fun onDestroy() = super.onDestroy().also { job.cancel() }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractInfoStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractInfoStepFragment.kt
deleted file mode 100644
index 31cf7165..00000000
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractInfoStepFragment.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.github.braillesystems.learnbraille.ui.screens.theory.steps
-
-import com.github.braillesystems.learnbraille.ui.screens.HelpMsgId
-
-abstract class AbstractInfoStepFragment(helpMsgId: HelpMsgId) : AbstractStepFragment(helpMsgId)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt
index 8f790d3b..dceb5ef1 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt
@@ -1,26 +1,35 @@
 package com.github.braillesystems.learnbraille.ui.screens.theory.steps
 
 import android.text.method.ScrollingMovementMethod
-import android.util.TypedValue
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.widget.Button
 import android.widget.TextView
-import androidx.core.text.parseAsHtml
+import androidx.databinding.ViewDataBinding
 import com.github.braillesystems.learnbraille.COURSE
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.Step
 import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
 import com.github.braillesystems.learnbraille.ui.screens.HelpMsgId
+import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
 import com.github.braillesystems.learnbraille.ui.screens.theory.toCurrentStep
 import com.github.braillesystems.learnbraille.ui.screens.theory.toNextStep
 import com.github.braillesystems.learnbraille.ui.screens.theory.toPrevStep
-import com.github.braillesystems.learnbraille.utils.*
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
+import com.github.braillesystems.learnbraille.utils.applyExtendedAccessibility
+import com.github.braillesystems.learnbraille.utils.navigate
+import com.github.braillesystems.learnbraille.utils.title
 import org.koin.android.ext.android.inject
-import com.github.braillesystems.learnbraille.utils.updateTitle as utilUpdateTitle
 
+interface StepBinding {
+    val prevButton: Button? get() = null
+    val nextButton: Button? get() = null
+    val hintButton: Button? get() = null
+    val textView: TextView? get() = null
+    val brailleDots: BrailleDotsView? get() = null
+}
 
 /**
  * Base class for all steps.
@@ -28,62 +37,52 @@ import com.github.braillesystems.learnbraille.utils.updateTitle as utilUpdateTit
 abstract class AbstractStepFragment(helpMsgId: HelpMsgId) : AbstractFragmentWithHelp(helpMsgId) {
 
     protected val preferenceRepository: PreferenceRepository by inject()
+
     protected lateinit var step: Step
+        private set
+
+    protected lateinit var stepBinding: StepBinding
+        private set
 
     override val helpMsg: String
         get() = getString(R.string.lessons_help_template).format(
             super.helpMsg, getString(R.string.lessons_help_common)
         )
 
-    protected fun initialize(
-        step: Step,
-        prevButton: Button? = null,
-        nextButton: Button? = null,
-        hintButton: Button? = null
-    ) {
-        this.step = step
-        setHasOptionsMenu(true)
-        if (preferenceRepository.extendedAccessibilityEnabled) {
-            prevButton?.setSize(
-                width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
-            )
-            nextButton?.setSize(
-                width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
-            )
-            hintButton?.setSize(
-                width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
-            )
-        }
-    }
+    protected fun <B : ViewDataBinding> B.init(
+        titleId: Int,
+        binding: B.() -> StepBinding
+    ): B = init(this, titleId, binding)
 
-    protected fun setText(text: String, infoTextView: TextView) {
-        infoTextView.text = text.parseAsHtml()
-        infoTextView.movementMethod = ScrollingMovementMethod()
-        checkedAnnounce(text)
-        if (preferenceRepository.extendedAccessibilityEnabled) {
-            infoTextView.setTextSize(
-                TypedValue.COMPLEX_UNIT_SP,
-                application.extendedTextSize
-            )
-        }
-    }
+    protected open fun <B> init(
+        b: B,
+        titleId: Int,
+        binding: B.() -> StepBinding
+    ): B = b.apply {
+        setHasOptionsMenu(true)
 
-    protected fun updateTitle(msg: String) {
-        utilUpdateTitle(
-            if (preferenceRepository.extendedAccessibilityEnabled) "${step.lessonId} ${step.id} $msg"
-            else "${step.lessonId}.${step.id} $msg"
-        )
-    }
+        step = getStepArg()
+        stepBinding = binding()
 
-    protected fun setNextButton(button: Button) {
-        button.setOnClickListener {
-            toNextStep(step, markThisAsPassed = true)
+        val msg = getString(titleId)
+        title = if (preferenceRepository.extendedAccessibilityEnabled) {
+            "${step.lessonId} ${step.id} $msg"
+        } else {
+            "${step.lessonId}.${step.id} $msg"
         }
-    }
 
-    protected fun setPrevButton(button: Button) {
-        button.setOnClickListener {
-            toPrevStep(step)
+        stepBinding.run {
+            if (preferenceRepository.extendedAccessibilityEnabled) {
+                applyExtendedAccessibility(
+                    leftButton = prevButton,
+                    rightButton = nextButton,
+                    leftMiddleButton = hintButton,
+                    textView = textView
+                )
+            }
+            prevButton?.setOnClickListener { toPrevStep(step) }
+            nextButton?.setOnClickListener { toNextStep(step, markThisAsPassed = true) }
+            textView?.movementMethod = ScrollingMovementMethod()
         }
     }
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputDotsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputDotsFragment.kt
deleted file mode 100644
index 2d0cd0ee..00000000
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputDotsFragment.kt
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.github.braillesystems.learnbraille.ui.screens.theory.steps
-
-import android.os.Bundle
-import android.os.Vibrator
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.getSystemService
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProvider
-import com.github.braillesystems.learnbraille.R
-import com.github.braillesystems.learnbraille.data.entities.BrailleDots
-import com.github.braillesystems.learnbraille.data.entities.InputDots
-import com.github.braillesystems.learnbraille.data.entities.spelling
-import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputDotsBinding
-import com.github.braillesystems.learnbraille.ui.screens.observeCheckedOnFly
-import com.github.braillesystems.learnbraille.ui.screens.observeEventHint
-import com.github.braillesystems.learnbraille.ui.screens.observeEventIncorrect
-import com.github.braillesystems.learnbraille.ui.screens.observeEventPassHint
-import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
-import com.github.braillesystems.learnbraille.ui.screens.theory.toNextStep
-import com.github.braillesystems.learnbraille.ui.screens.theory.toPrevStep
-import com.github.braillesystems.learnbraille.ui.showCorrectToast
-import com.github.braillesystems.learnbraille.ui.showHintDotsToast
-import com.github.braillesystems.learnbraille.ui.showIncorrectToast
-import com.github.braillesystems.learnbraille.ui.views.*
-import com.github.braillesystems.learnbraille.utils.application
-import com.github.braillesystems.learnbraille.utils.checkedAnnounce
-import com.github.braillesystems.learnbraille.utils.checkedBuzz
-import timber.log.Timber
-
-class InputDotsFragment : AbstractStepFragment(R.string.lessons_help_input_dots) {
-
-    private lateinit var expectedDots: BrailleDots
-    private lateinit var dotsState: BrailleDotsState
-    private var userTouchedDots: Boolean = false
-    private var buzzer: Vibrator? = null
-    private lateinit var viewModel: InputViewModel
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DataBindingUtil.inflate<FragmentLessonsInputDotsBinding>(
-        inflater,
-        R.layout.fragment_lessons_input_dots,
-        container,
-        false
-    ).apply {
-
-        Timber.i("Start initialize input dots fragment")
-
-        val step = getStepArg()
-        require(step.data is InputDots)
-        initialize(step, prevButton, nextButton, hintButton)
-
-        val infoText = step.data.text
-            ?: getString(R.string.lessons_show_dots_info_template).format(step.data.dots.spelling)
-        setText(
-            text = infoText,
-            infoTextView = infoTextView
-        )
-        checkedAnnounce(infoText)
-        brailleDots.dotsState.display(step.data.dots)
-
-        updateTitle(getString(R.string.lessons_title_input_dots))
-
-        expectedDots = step.data.dots
-        userTouchedDots = false
-        dotsState = brailleDots.dotsState.apply {
-            uncheck()
-            clickable(true)
-            subscribe(View.OnClickListener {
-                userTouchedDots = true
-                viewModel.onSoftCheck()
-            })
-        }
-
-
-        val viewModelFactory = InputViewModelFactory(application, expectedDots) {
-            dotsState.brailleDots
-        }
-        viewModel = ViewModelProvider(
-            this@InputDotsFragment, viewModelFactory
-        ).get(InputViewModel::class.java)
-        buzzer = activity?.getSystemService()
-
-
-        inputViewModel = viewModel
-        lifecycleOwner = this@InputDotsFragment
-
-
-        prevButton.setOnClickListener {
-            toPrevStep(step)
-        }
-
-        viewModel.observeCheckedOnFly(
-            viewLifecycleOwner, dotsState, buzzer,
-            block = { toNextStep(step, markThisAsPassed = true) },
-            softBlock = ::showCorrectToast
-        )
-
-        viewModel.observeEventIncorrect(
-            viewLifecycleOwner, dotsState
-        ) {
-            val notify = {
-                showIncorrectToast()
-                buzzer.checkedBuzz(preferenceRepository.incorrectBuzzPattern, preferenceRepository)
-            }
-            if (userTouchedDots) notify()
-            else toNextStep(step, markThisAsPassed = false) { notify() }
-        }
-
-        viewModel.observeEventHint(
-            viewLifecycleOwner, dotsState
-        ) {
-            showHintDotsToast(expectedDots)
-            userTouchedDots = true
-        }
-
-        viewModel.observeEventPassHint(
-            viewLifecycleOwner, dotsState
-        )
-
-    }.root
-}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputMarkerFragment.kt
deleted file mode 100644
index f793ae5e..00000000
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputMarkerFragment.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.github.braillesystems.learnbraille.ui.screens.theory.steps
-
-import android.os.Bundle
-import android.os.Vibrator
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.getSystemService
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProvider
-import com.github.braillesystems.learnbraille.R
-import com.github.braillesystems.learnbraille.data.entities.BrailleDots
-import com.github.braillesystems.learnbraille.data.entities.Input
-import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
-import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputMarkerBinding
-import com.github.braillesystems.learnbraille.res.inputMarkerPrintRules
-import com.github.braillesystems.learnbraille.ui.screens.observeCheckedOnFly
-import com.github.braillesystems.learnbraille.ui.screens.observeEventHint
-import com.github.braillesystems.learnbraille.ui.screens.observeEventIncorrect
-import com.github.braillesystems.learnbraille.ui.screens.observeEventPassHint
-import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
-import com.github.braillesystems.learnbraille.ui.screens.theory.toNextStep
-import com.github.braillesystems.learnbraille.ui.screens.theory.toPrevStep
-import com.github.braillesystems.learnbraille.ui.showCorrectToast
-import com.github.braillesystems.learnbraille.ui.showHintToast
-import com.github.braillesystems.learnbraille.ui.showIncorrectToast
-import com.github.braillesystems.learnbraille.ui.views.*
-import com.github.braillesystems.learnbraille.utils.*
-import timber.log.Timber
-
-class InputMarkerFragment : AbstractStepFragment(R.string.lessons_help_input_marker) {
-
-    private lateinit var expectedDots: BrailleDots
-    private lateinit var dotsState: BrailleDotsState
-    private var userTouchedDots: Boolean = false
-    private var buzzer: Vibrator? = null
-    private lateinit var viewModel: InputViewModel
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DataBindingUtil.inflate<FragmentLessonsInputMarkerBinding>(
-        inflater,
-        R.layout.fragment_lessons_input_marker,
-        container,
-        false
-    ).also { binding ->
-
-        Timber.i("Start initialize input dots fragment")
-
-        val step = getStepArg()
-        require(step.data is Input)
-        initialize(
-            step,
-            binding.prevButton,
-            binding.nextButton,
-            binding.hintButton
-        )
-
-        val data = step.data.material.data
-        require(data is MarkerSymbol)
-        val infoText = contextNotNull.inputMarkerPrintRules[data.type]
-            ?: error("No input print rules for marker: ${data.type}")
-        setText(
-            text = infoText,
-            infoTextView = binding.infoTextView
-        )
-        checkedAnnounce(infoText)
-        binding.brailleDots.dotsState.display(data.brailleDots)
-
-        updateTitle(getString(R.string.lessons_title_input_symbol))
-
-        expectedDots = data.brailleDots
-        userTouchedDots = false
-        dotsState = binding.brailleDots.dotsState.apply {
-            uncheck()
-            clickable(true)
-            subscribe(View.OnClickListener {
-                userTouchedDots = true
-                viewModel.onSoftCheck()
-            })
-        }
-
-
-        val viewModelFactory = InputViewModelFactory(application, expectedDots) {
-            dotsState.brailleDots
-        }
-        viewModel = ViewModelProvider(
-            this@InputMarkerFragment, viewModelFactory
-        ).get(InputViewModel::class.java)
-        buzzer = activity?.getSystemService()
-
-
-        binding.inputViewModel = viewModel
-        binding.lifecycleOwner = this@InputMarkerFragment
-
-
-        binding.prevButton.setOnClickListener {
-            toPrevStep(step)
-        }
-
-        viewModel.observeCheckedOnFly(
-            viewLifecycleOwner, dotsState, buzzer,
-            block = { toNextStep(step, markThisAsPassed = true) },
-            softBlock = ::showCorrectToast
-        )
-
-        viewModel.observeEventIncorrect(
-            viewLifecycleOwner, dotsState
-        ) {
-            val notify = {
-                showIncorrectToast()
-                buzzer.checkedBuzz(preferenceRepository.incorrectBuzzPattern, preferenceRepository)
-            }
-            if (userTouchedDots) notify()
-            else toNextStep(step, markThisAsPassed = false) { notify() }
-        }
-
-        viewModel.observeEventHint(
-            viewLifecycleOwner, dotsState
-        ) {
-            showHintToast(expectedDots)
-            userTouchedDots = true
-        }
-
-        viewModel.observeEventPassHint(
-            viewLifecycleOwner, dotsState
-        )
-
-    }.root
-}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt
deleted file mode 100644
index af3bc28a..00000000
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.github.braillesystems.learnbraille.ui.screens.theory.steps
-
-import android.os.Bundle
-import android.os.Vibrator
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.getSystemService
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProvider
-import com.github.braillesystems.learnbraille.R
-import com.github.braillesystems.learnbraille.data.entities.BrailleDots
-import com.github.braillesystems.learnbraille.data.entities.Input
-import com.github.braillesystems.learnbraille.data.entities.Symbol
-import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputSymbolBinding
-import com.github.braillesystems.learnbraille.res.inputSymbolPrintRules
-import com.github.braillesystems.learnbraille.ui.screens.observeCheckedOnFly
-import com.github.braillesystems.learnbraille.ui.screens.observeEventHint
-import com.github.braillesystems.learnbraille.ui.screens.observeEventIncorrect
-import com.github.braillesystems.learnbraille.ui.screens.observeEventPassHint
-import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
-import com.github.braillesystems.learnbraille.ui.screens.theory.toNextStep
-import com.github.braillesystems.learnbraille.ui.screens.theory.toPrevStep
-import com.github.braillesystems.learnbraille.ui.showCorrectToast
-import com.github.braillesystems.learnbraille.ui.showHintToast
-import com.github.braillesystems.learnbraille.ui.showIncorrectToast
-import com.github.braillesystems.learnbraille.ui.views.*
-import com.github.braillesystems.learnbraille.utils.*
-import timber.log.Timber
-
-class InputSymbolFragment : AbstractStepFragment(R.string.lessons_help_input_symbol) {
-
-    private lateinit var expectedDots: BrailleDots
-    private lateinit var dotsState: BrailleDotsState
-    private var userTouchedDots: Boolean = false
-    private var buzzer: Vibrator? = null
-    private lateinit var viewModel: InputViewModel
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DataBindingUtil.inflate<FragmentLessonsInputSymbolBinding>(
-        inflater,
-        R.layout.fragment_lessons_input_symbol,
-        container,
-        false
-    ).apply {
-
-        Timber.i("Initialize input symbol fragment")
-
-        val step = getStepArg()
-        require(step.data is Input)
-        initialize(step, prevButton, nextButton, hintButton)
-
-        require(step.data.material.data is Symbol)
-        val symbol = step.data.material.data
-        letter.text = symbol.char.toString()
-        brailleDots.dotsState.display(symbol.brailleDots)
-        checkedAnnounce(contextNotNull.inputSymbolPrintRules.getValue(symbol.char))
-
-        updateTitle(getString(R.string.lessons_title_input_symbol))
-
-        expectedDots = symbol.brailleDots
-        userTouchedDots = false
-        dotsState = brailleDots.dotsState.apply {
-            uncheck()
-            clickable(true)
-            subscribe(View.OnClickListener {
-                userTouchedDots = true
-                viewModel.onSoftCheck()
-            })
-        }
-
-
-        val viewModelFactory = InputViewModelFactory(application, expectedDots) {
-            dotsState.brailleDots
-        }
-        viewModel = ViewModelProvider(
-            this@InputSymbolFragment, viewModelFactory
-        ).get(InputViewModel::class.java)
-        buzzer = activity?.getSystemService()
-
-
-        inputViewModel = viewModel
-        lifecycleOwner = this@InputSymbolFragment
-
-
-        prevButton.setOnClickListener {
-            toPrevStep(step)
-        }
-
-        viewModel.observeCheckedOnFly(
-            viewLifecycleOwner, dotsState, buzzer,
-            block = { toNextStep(step, markThisAsPassed = true) },
-            softBlock = ::showCorrectToast
-        )
-
-        viewModel.observeEventIncorrect(
-            viewLifecycleOwner, dotsState
-        ) {
-            val notify = {
-                showIncorrectToast(contextNotNull.inputSymbolPrintRules.getValue(symbol.char))
-                buzzer.checkedBuzz(preferenceRepository.incorrectBuzzPattern, preferenceRepository)
-            }
-            if (userTouchedDots) notify()
-            else toNextStep(step, markThisAsPassed = false) { notify() }
-        }
-
-        viewModel.observeEventHint(
-            viewLifecycleOwner, dotsState
-        ) {
-            showHintToast(expectedDots)
-            userTouchedDots = true
-        }
-
-        viewModel.observeEventPassHint(
-            viewLifecycleOwner, dotsState
-        ) {
-            val msg = contextNotNull.inputSymbolPrintRules.getValue(symbol.char)
-            announce(msg)
-        }
-
-    }.root
-}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/AbstractInfoStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/AbstractInfoStepFragment.kt
new file mode 100644
index 00000000..817833e3
--- /dev/null
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/AbstractInfoStepFragment.kt
@@ -0,0 +1,21 @@
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps.info
+
+import androidx.core.text.parseAsHtml
+import com.github.braillesystems.learnbraille.data.entities.BaseInfo
+import com.github.braillesystems.learnbraille.ui.screens.HelpMsgId
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
+import com.github.braillesystems.learnbraille.utils.checkedAnnounce
+
+abstract class AbstractInfoStepFragment(helpMsgId: HelpMsgId) : AbstractStepFragment(helpMsgId) {
+
+    override fun <B> init(b: B, titleId: Int, binding: B.() -> StepBinding): B =
+        super
+            .init(b, titleId, binding)
+            .also {
+                val data = step.data
+                require(data is BaseInfo)
+                stepBinding.textView?.text = data.text.parseAsHtml()
+                checkedAnnounce(data.text)
+            }
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/FirstInfoFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/FirstInfoFragment.kt
similarity index 66%
rename from app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/FirstInfoFragment.kt
rename to app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/FirstInfoFragment.kt
index 4728d261..67e5f5d8 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/FirstInfoFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/FirstInfoFragment.kt
@@ -1,13 +1,14 @@
-package com.github.braillesystems.learnbraille.ui.screens.theory.steps
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps.info
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
 import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
-import com.github.braillesystems.learnbraille.data.entities.FirstInfo
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonFirstInfoBinding
-import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
 
 class FirstInfoFragment : AbstractInfoStepFragment(R.string.lessons_help_info) {
 
@@ -20,14 +21,13 @@ class FirstInfoFragment : AbstractInfoStepFragment(R.string.lessons_help_info) {
         R.layout.fragment_lesson_first_info,
         container,
         false
-    ).apply {
-
-        val step = getStepArg()
-        require(step.data is FirstInfo)
-        initialize(step, null, nextButton)
-        updateTitle(getString(R.string.lessons_title_info))
-        setText(step.data.text, infoTextView)
-        setNextButton(nextButton)
-
-    }.root
+    ).init(
+        titleId = R.string.lessons_title_info,
+        binding = {
+            object : StepBinding {
+                override val nextButton: Button? = this@init.nextButton
+                override val textView: TextView? = this@init.infoTextView
+            }
+        }
+    ).root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InfoFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/InfoFragment.kt
similarity index 62%
rename from app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InfoFragment.kt
rename to app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/InfoFragment.kt
index 1f13ca98..476dc8ba 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InfoFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/InfoFragment.kt
@@ -1,13 +1,14 @@
-package com.github.braillesystems.learnbraille.ui.screens.theory.steps
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps.info
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
 import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
-import com.github.braillesystems.learnbraille.data.entities.Info
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInfoBinding
-import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
 
 class InfoFragment : AbstractInfoStepFragment(R.string.lessons_help_info) {
 
@@ -20,15 +21,14 @@ class InfoFragment : AbstractInfoStepFragment(R.string.lessons_help_info) {
         R.layout.fragment_lessons_info,
         container,
         false
-    ).apply {
-
-        val step = getStepArg()
-        require(step.data is Info)
-        initialize(step, prevButton, nextButton)
-        updateTitle(getString(R.string.lessons_title_info))
-        setText(step.data.text, infoTextView)
-        setPrevButton(prevButton)
-        setNextButton(nextButton)
-
-    }.root
+    ).init(
+        titleId = R.string.lessons_title_info,
+        binding = {
+            object : StepBinding {
+                override val prevButton: Button? = this@init.prevButton
+                override val nextButton: Button? = this@init.nextButton
+                override val textView: TextView? = this@init.infoTextView
+            }
+        }
+    ).root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/LastInfoFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/LastInfoFragment.kt
similarity index 66%
rename from app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/LastInfoFragment.kt
rename to app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/LastInfoFragment.kt
index bd372c30..e72486b9 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/LastInfoFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/LastInfoFragment.kt
@@ -1,13 +1,14 @@
-package com.github.braillesystems.learnbraille.ui.screens.theory.steps
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps.info
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
 import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
-import com.github.braillesystems.learnbraille.data.entities.LastInfo
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonLastInfoBinding
-import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
 
 class LastInfoFragment : AbstractInfoStepFragment(R.string.lessons_help_last_info) {
 
@@ -20,14 +21,13 @@ class LastInfoFragment : AbstractInfoStepFragment(R.string.lessons_help_last_inf
         R.layout.fragment_lesson_last_info,
         container,
         false
-    ).apply {
-
-        val step = getStepArg()
-        require(step.data is LastInfo)
-        initialize(step, prevButton, null)
-        updateTitle(getString(R.string.lessons_title_last_info))
-        setText(step.data.text, infoTextView)
-        setPrevButton(prevButton)
-
-    }.root
+    ).init(
+        titleId = R.string.lessons_title_last_info,
+        binding = {
+            object : StepBinding {
+                override val prevButton: Button? = this@init.prevButton
+                override val textView: TextView? = this@init.infoTextView
+            }
+        }
+    ).root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
new file mode 100644
index 00000000..7dc9d18e
--- /dev/null
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
@@ -0,0 +1,94 @@
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps.input
+
+import android.os.Vibrator
+import android.view.View
+import androidx.core.content.getSystemService
+import androidx.lifecycle.ViewModelProvider
+import com.github.braillesystems.learnbraille.data.entities.BaseInput
+import com.github.braillesystems.learnbraille.data.entities.StepData
+import com.github.braillesystems.learnbraille.ui.screens.*
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
+import com.github.braillesystems.learnbraille.ui.screens.theory.toNextStep
+import com.github.braillesystems.learnbraille.ui.showCorrectToast
+import com.github.braillesystems.learnbraille.ui.showHintToast
+import com.github.braillesystems.learnbraille.ui.showIncorrectToast
+import com.github.braillesystems.learnbraille.ui.views.*
+import com.github.braillesystems.learnbraille.utils.application
+import com.github.braillesystems.learnbraille.utils.checkedBuzz
+
+abstract class AbstractInputStepFragment(helpMsgId: HelpMsgId) : AbstractStepFragment(helpMsgId) {
+
+    // This value can change during ViewModel lifetime (ViewModelProvider does not call
+    // ViewModelFactory each time onCreateView runs). And once created ViewModel
+    // should be able to use up to date dotsState.
+    private lateinit var dotsState: BrailleDotsState
+
+    protected lateinit var viewModel: InputViewModel
+        private set
+
+    override fun <B> init(b: B, titleId: Int, binding: B.() -> StepBinding): B =
+        super.init(b, titleId, binding).also {
+            val data = step.data
+            require(data is BaseInput)
+            val expectedDots = data.brailleDots
+
+            var userTouchedDots = false
+
+            dotsState = stepBinding.brailleDots!!.dotsState.apply {
+                uncheck()
+                clickable(true)
+                subscribe(View.OnClickListener {
+                    viewModel.onSoftCheck()
+                    userTouchedDots = true
+                })
+            }
+
+            val viewModelFactory = InputViewModelFactory(
+                application, expectedDots
+            ) { dotsState.brailleDots }
+            viewModel = ViewModelProvider(this, viewModelFactory)
+                .get(InputViewModel::class.java)
+
+            val buzzer: Vibrator? = activity?.getSystemService()
+
+            viewModel.observeCheckedOnFly(
+                viewLifecycleOwner, dotsState, buzzer,
+                block = { toNextStep(step, markThisAsPassed = true) },
+                softBlock = { showCorrectToast() }
+            )
+
+            viewModel.observeEventHint(
+                viewLifecycleOwner, dotsState
+            ) {
+                showHintToast(expectedDots)
+                userTouchedDots = true
+            }
+
+            viewModel.observeEventIncorrect(
+                viewLifecycleOwner, dotsState
+            ) {
+                val notify = {
+                    toastIncorrect(data)
+                    buzzer.checkedBuzz(
+                        preferenceRepository.incorrectBuzzPattern,
+                        preferenceRepository
+                    )
+                }
+                if (userTouchedDots) notify()
+                else toNextStep(step, markThisAsPassed = false) { notify() }
+            }
+
+            viewModel.observeEventPassHint(
+                viewLifecycleOwner, dotsState
+            ) {
+                onPassHint(data)
+            }
+        }
+
+    protected open fun toastIncorrect(data: StepData) {
+        showIncorrectToast()
+    }
+
+    protected open fun onPassHint(data: StepData) = Unit
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputDotsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputDotsFragment.kt
new file mode 100644
index 00000000..ce0e3990
--- /dev/null
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputDotsFragment.kt
@@ -0,0 +1,51 @@
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps.input
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import androidx.databinding.DataBindingUtil
+import com.github.braillesystems.learnbraille.R
+import com.github.braillesystems.learnbraille.data.entities.InputDots
+import com.github.braillesystems.learnbraille.data.entities.spelling
+import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputDotsBinding
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
+import com.github.braillesystems.learnbraille.utils.checkedAnnounce
+
+class InputDotsFragment : AbstractInputStepFragment(R.string.lessons_help_input_dots) {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ) = DataBindingUtil.inflate<FragmentLessonsInputDotsBinding>(
+        inflater,
+        R.layout.fragment_lessons_input_dots,
+        container,
+        false
+    ).init(
+        titleId = R.string.lessons_title_input_dots,
+        binding = {
+            object : StepBinding {
+                override val prevButton: Button? = this@init.prevButton
+                override val nextButton: Button? = this@init.nextButton
+                override val textView: TextView? = this@init.infoTextView
+                override val brailleDots: BrailleDotsView? = this@init.brailleDots
+            }
+        }
+    ).apply {
+
+        val data = step.data
+        require(data is InputDots)
+        val text = data.text
+            ?: getString(R.string.lessons_show_dots_info_template).format(data.brailleDots.spelling)
+        infoTextView.text = text
+        checkedAnnounce(text)
+
+        inputViewModel = viewModel
+        lifecycleOwner = this@InputDotsFragment
+
+    }.root
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputMarkerFragment.kt
new file mode 100644
index 00000000..095098e5
--- /dev/null
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputMarkerFragment.kt
@@ -0,0 +1,54 @@
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps.input
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import androidx.databinding.DataBindingUtil
+import com.github.braillesystems.learnbraille.R
+import com.github.braillesystems.learnbraille.data.entities.Input
+import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
+import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputMarkerBinding
+import com.github.braillesystems.learnbraille.res.inputMarkerPrintRules
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
+import com.github.braillesystems.learnbraille.utils.checkedAnnounce
+import com.github.braillesystems.learnbraille.utils.getValue
+
+class InputMarkerFragment : AbstractInputStepFragment(R.string.lessons_help_input_marker) {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ) = DataBindingUtil.inflate<FragmentLessonsInputMarkerBinding>(
+        inflater,
+        R.layout.fragment_lessons_input_marker,
+        container,
+        false
+    ).init(
+        titleId = R.string.lessons_title_input_symbol,
+        binding = {
+            object : StepBinding {
+                override val prevButton: Button? = this@init.prevButton
+                override val nextButton: Button? = this@init.nextButton
+                override val textView: TextView? = this@init.infoTextView
+                override val brailleDots: BrailleDotsView? = this@init.brailleDots
+            }
+        }
+    ).apply {
+
+        val stepData = step.data
+        require(stepData is Input)
+        val data = stepData.material.data
+        require(data is MarkerSymbol)
+        val text = inputMarkerPrintRules.getValue(data.type)
+        infoTextView.text = text
+        checkedAnnounce(text)
+
+        inputViewModel = viewModel
+        lifecycleOwner = this@InputMarkerFragment
+
+    }.root
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputSymbolFragment.kt
new file mode 100644
index 00000000..65fa205d
--- /dev/null
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputSymbolFragment.kt
@@ -0,0 +1,67 @@
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps.input
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.databinding.DataBindingUtil
+import com.github.braillesystems.learnbraille.R
+import com.github.braillesystems.learnbraille.data.entities.Input
+import com.github.braillesystems.learnbraille.data.entities.StepData
+import com.github.braillesystems.learnbraille.data.entities.Symbol
+import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputSymbolBinding
+import com.github.braillesystems.learnbraille.res.inputSymbolPrintRules
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
+import com.github.braillesystems.learnbraille.ui.showIncorrectToast
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
+import com.github.braillesystems.learnbraille.utils.checkedAnnounce
+import com.github.braillesystems.learnbraille.utils.getValue
+
+class InputSymbolFragment : AbstractInputStepFragment(R.string.lessons_help_input_symbol) {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ) = DataBindingUtil.inflate<FragmentLessonsInputSymbolBinding>(
+        inflater,
+        R.layout.fragment_lessons_input_symbol,
+        container,
+        false
+    ).init(
+        titleId = R.string.lessons_title_input_symbol,
+        binding = {
+            object : StepBinding {
+                override val prevButton: Button? = this@init.prevButton
+                override val nextButton: Button? = this@init.nextButton
+                override val brailleDots: BrailleDotsView? = this@init.brailleDots
+            }
+        }
+    ).apply {
+
+        val stepData = step.data
+        require(stepData is Input)
+        val data = stepData.material.data
+        require(data is Symbol)
+        letter.letter = data.char
+        checkedAnnounce(inputSymbolPrintRules.getValue(data.char))
+
+        inputViewModel = viewModel
+        lifecycleOwner = this@InputSymbolFragment
+
+    }.root
+
+    private fun StepData.char(): Char {
+        require(this is Input)
+        require(material.data is Symbol)
+        return material.data.char
+    }
+
+    override fun toastIncorrect(data: StepData) {
+        showIncorrectToast(inputSymbolPrintRules.getValue(data.char()))
+    }
+
+    override fun onPassHint(data: StepData) {
+        checkedAnnounce(inputSymbolPrintRules.getValue(data.char()))
+    }
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputViewModel.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputViewModel.kt
similarity index 99%
rename from app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputViewModel.kt
rename to app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputViewModel.kt
index 0c4bb192..c33748ad 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputViewModel.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputViewModel.kt
@@ -1,4 +1,4 @@
-package com.github.braillesystems.learnbraille.ui.screens.theory.steps
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps.input
 
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowDotsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt
similarity index 56%
rename from app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowDotsFragment.kt
rename to app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt
index 480f55a7..4f859780 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowDotsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt
@@ -1,18 +1,22 @@
-package com.github.braillesystems.learnbraille.ui.screens.theory.steps
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps.show
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import androidx.core.text.parseAsHtml
 import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.ShowDots
 import com.github.braillesystems.learnbraille.data.entities.spelling
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsShowDotsBinding
-import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
-import timber.log.Timber
+import com.github.braillesystems.learnbraille.utils.removeHtmlMarkup
 
 class ShowDotsFragment : AbstractStepFragment(R.string.lessons_help_show_dots) {
 
@@ -25,26 +29,25 @@ class ShowDotsFragment : AbstractStepFragment(R.string.lessons_help_show_dots) {
         R.layout.fragment_lessons_show_dots,
         container,
         false
+    ).init(
+        titleId = R.string.lessons_title_show_dots,
+        binding = {
+            object : StepBinding {
+                override val prevButton: Button? = this@init.prevButton
+                override val nextButton: Button? = this@init.nextButton
+                override val textView: TextView? = this@init.infoTextView
+            }
+        }
     ).apply {
 
-        Timber.i("Initialize show dots fragment")
+        val data = step.data
+        require(data is ShowDots)
 
-        val step = getStepArg()
-        require(step.data is ShowDots)
-        initialize(step, prevButton, nextButton)
-
-        val infoText = step.data.text
-            ?: getString(R.string.lessons_show_dots_info_template).format(step.data.dots.spelling)
-        setText(
-            text = infoText,
-            infoTextView = infoTextView
-        )
-        checkedAnnounce(infoText)
-        brailleDots.dotsState.display(step.data.dots)
-
-        updateTitle(getString(R.string.lessons_title_show_dots))
-        setPrevButton(prevButton)
-        setNextButton(nextButton)
+        val text = data.text
+            ?: getString(R.string.lessons_show_dots_info_template).format(data.brailleDots.spelling)
+        stepBinding.textView?.text = text.parseAsHtml()
+        checkedAnnounce(text.removeHtmlMarkup())
+        brailleDots.dotsState.display(data.brailleDots)
 
     }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
similarity index 54%
rename from app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowMarkerFragment.kt
rename to app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
index 4e02bb61..fd40f187 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowMarkerFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
@@ -1,21 +1,24 @@
-package com.github.braillesystems.learnbraille.ui.screens.theory.steps
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps.show
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import androidx.core.text.parseAsHtml
 import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
 import com.github.braillesystems.learnbraille.data.entities.Show
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsShowMarkerBinding
 import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
-import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
-import com.github.braillesystems.learnbraille.utils.contextNotNull
-import com.github.braillesystems.learnbraille.utils.get
-import timber.log.Timber
+import com.github.braillesystems.learnbraille.utils.getValue
+import com.github.braillesystems.learnbraille.utils.removeHtmlMarkup
 
 class ShowMarkerFragment : AbstractStepFragment(R.string.lessons_help_show_marker) {
 
@@ -28,28 +31,26 @@ class ShowMarkerFragment : AbstractStepFragment(R.string.lessons_help_show_marke
         R.layout.fragment_lessons_show_marker,
         container,
         false
-    ).also { binding ->
-
-        Timber.i("Initialize show marker fragment")
-
-        val step = getStepArg()
-        require(step.data is Show)
-        initialize(step, binding.prevButton, binding.nextButton)
-
-        val data = step.data.material.data
+    ).init(
+        titleId = R.string.lessons_title_show_symbol,
+        binding = {
+            object : StepBinding {
+                override val prevButton: Button? = this@init.prevButton
+                override val nextButton: Button? = this@init.nextButton
+                override val textView: TextView? = this@init.infoTextView
+            }
+        }
+    ).apply {
+
+        val stepData = step.data
+        require(stepData is Show)
+
+        val data = stepData.material.data
         require(data is MarkerSymbol)
-        val infoText = contextNotNull.showMarkerPrintRules[data.type]
-            ?: error("No show print rules for marker: ${data.type}")
-        setText(
-            text = infoText,
-            infoTextView = binding.infoTextView
-        )
-        checkedAnnounce(infoText)
-        binding.brailleDots.dotsState.display(data.brailleDots)
-
-        updateTitle(getString(R.string.lessons_title_show_symbol))
-        setPrevButton(binding.prevButton)
-        setNextButton(binding.nextButton)
+        val text = showMarkerPrintRules.getValue(data.type)
+        stepBinding.textView?.text = text.parseAsHtml()
+        checkedAnnounce(text.removeHtmlMarkup())
+        brailleDots.dotsState.display(data.brailleDots)
 
     }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt
similarity index 63%
rename from app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt
rename to app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt
index 3a17c849..c9a33b0e 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt
@@ -1,21 +1,21 @@
-package com.github.braillesystems.learnbraille.ui.screens.theory.steps
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps.show
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.widget.Button
 import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.Show
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsShowSymbolBinding
 import com.github.braillesystems.learnbraille.res.showSymbolPrintRules
-import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
-import com.github.braillesystems.learnbraille.utils.contextNotNull
 import com.github.braillesystems.learnbraille.utils.getValue
-import timber.log.Timber
 
 class ShowSymbolFragment : AbstractStepFragment(R.string.lessons_help_show_symbol) {
 
@@ -28,22 +28,24 @@ class ShowSymbolFragment : AbstractStepFragment(R.string.lessons_help_show_symbo
         R.layout.fragment_lessons_show_symbol,
         container,
         false
+    ).init(
+        titleId = R.string.lessons_title_show_symbol,
+        binding = {
+            object : StepBinding {
+                override val prevButton: Button? = this@init.prevButton
+                override val nextButton: Button? = this@init.nextButton
+            }
+        }
     ).apply {
 
-        Timber.i("onCreateView")
+        val stepData = step.data
+        require(stepData is Show)
 
-        val step = getStepArg()
-        require(step.data is Show)
-        initialize(step, prevButton, nextButton)
-
-        require(step.data.material.data is Symbol)
-        letter.text = step.data.material.data.char.toString()
-        brailleDots.dotsState.display(step.data.material.data.brailleDots)
-        checkedAnnounce(contextNotNull.showSymbolPrintRules.getValue(step.data.material.data.char))
-
-        updateTitle(getString(R.string.lessons_title_show_symbol))
-        setPrevButton(prevButton)
-        setNextButton(nextButton)
+        val data = stepData.material.data
+        require(data is Symbol)
+        letter.letter = data.char
+        checkedAnnounce(showSymbolPrintRules.getValue(data.char))
+        brailleDots.dotsState.display(data.brailleDots)
 
     }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
index 14c6959b..bdc09390 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
@@ -2,7 +2,10 @@ package com.github.braillesystems.learnbraille.utils
 
 import android.content.Context
 import android.os.Vibrator
+import android.util.TypedValue
 import android.view.accessibility.AccessibilityEvent
+import android.widget.Button
+import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.ActionBar
 import androidx.appcompat.app.AppCompatActivity
@@ -72,13 +75,16 @@ fun Fragment.checkedAnnounce(
 val Fragment.actionBar: ActionBar?
     get() = (activity as AppCompatActivity).supportActionBar
 
+val Fragment.actionBarNotNull: ActionBar
+    get() = actionBar ?: error("Action bar is not supported")
+
 /**
  * Throws if action bar is not available
  */
 var Fragment.title: String
-    get() = requireNotNull(actionBar).title.toString()
+    get() = actionBarNotNull.title.toString()
     set(value) {
-        requireNotNull(actionBar).title = value
+        actionBarNotNull.title = value
     }
 
 fun Fragment.updateTitle(title: String) {
@@ -94,3 +100,21 @@ val Context.extendedTextSize: Float by lazyWithContext {
     // Size applied in runtime is different
     resources.getDimension(R.dimen.lessons_info_text_size) / 5 * 3
 }
+
+fun Fragment.applyExtendedAccessibility(
+    leftButton: Button? = null,
+    rightButton: Button? = null,
+    leftMiddleButton: Button? = null,
+    rightMiddleButton: Button? = null,
+    textView: TextView? = null
+) {
+    val width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
+    leftButton?.setSize(width = width)
+    rightButton?.setSize(width = width)
+    leftMiddleButton?.setSize(width = width)
+    rightMiddleButton?.setSize(width = width)
+    textView?.setTextSize(
+        TypedValue.COMPLEX_UNIT_SP,
+        contextNotNull.extendedTextSize
+    )
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
index 836fb181..4fd56adc 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
@@ -8,10 +8,12 @@ import kotlin.reflect.KProperty
  * that are not specific for particular project.
  */
 
-inline fun <T, R> T?.side(block: (T) -> R) {
+inline fun <T> T?.side(block: (T) -> Unit) {
     if (this != null) block(this)
 }
 
+fun <T, R> T.turn(f: (T) -> R): R = f(this)
+
 /**
  * Try to use sealed classes to avoid using `unreachable`.
  */
diff --git a/app/src/main/res/layout/fragment_lessons_input_dots.xml b/app/src/main/res/layout/fragment_lessons_input_dots.xml
index 2061f61c..86c47e5a 100644
--- a/app/src/main/res/layout/fragment_lessons_input_dots.xml
+++ b/app/src/main/res/layout/fragment_lessons_input_dots.xml
@@ -7,7 +7,7 @@
 
         <variable
             name="inputViewModel"
-            type="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InputViewModel" />
+            type="com.github.braillesystems.learnbraille.ui.screens.theory.steps.input.InputViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/fragment_lessons_input_marker.xml b/app/src/main/res/layout/fragment_lessons_input_marker.xml
index 2061f61c..86c47e5a 100644
--- a/app/src/main/res/layout/fragment_lessons_input_marker.xml
+++ b/app/src/main/res/layout/fragment_lessons_input_marker.xml
@@ -7,7 +7,7 @@
 
         <variable
             name="inputViewModel"
-            type="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InputViewModel" />
+            type="com.github.braillesystems.learnbraille.ui.screens.theory.steps.input.InputViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/fragment_lessons_input_symbol.xml b/app/src/main/res/layout/fragment_lessons_input_symbol.xml
index 82ce9f30..d001108e 100644
--- a/app/src/main/res/layout/fragment_lessons_input_symbol.xml
+++ b/app/src/main/res/layout/fragment_lessons_input_symbol.xml
@@ -7,7 +7,7 @@
 
         <variable
             name="inputViewModel"
-            type="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InputViewModel" />
+            type="com.github.braillesystems.learnbraille.ui.screens.theory.steps.input.InputViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
index 1468cd1d..901cfac5 100644
--- a/app/src/main/res/navigation/navigation.xml
+++ b/app/src/main/res/navigation/navigation.xml
@@ -130,7 +130,7 @@
 
     <fragment
         android:id="@+id/infoFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InfoFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.info.InfoFragment"
         android:label="@string/lessons_title_info">
         <argument
             android:name="step"
@@ -143,7 +143,7 @@
 
     <fragment
         android:id="@+id/inputDotsFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InputDotsFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.input.InputDotsFragment"
         android:label="@string/lessons_title_input_dots">
         <argument
             android:name="step"
@@ -156,7 +156,7 @@
 
     <fragment
         android:id="@+id/inputSymbolFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InputSymbolFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.input.InputSymbolFragment"
         android:label="@string/lessons_title_input_symbol">
         <argument
             android:name="step"
@@ -169,7 +169,7 @@
 
     <fragment
         android:id="@+id/showDotsFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.ShowDotsFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.show.ShowDotsFragment"
         android:label="@string/lessons_title_show_dots">
         <argument
             android:name="step"
@@ -182,7 +182,7 @@
 
     <fragment
         android:id="@+id/showSymbolFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.ShowSymbolFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.show.ShowSymbolFragment"
         android:label="@string/lessons_title_show_symbol">
         <argument
             android:name="step"
@@ -195,7 +195,7 @@
 
     <fragment
         android:id="@+id/lastInfoFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.LastInfoFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.info.LastInfoFragment"
         android:label="@string/lessons_title_last_info">
         <argument
             android:name="step"
@@ -208,7 +208,7 @@
 
     <fragment
         android:id="@+id/firstInfoFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.FirstInfoFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.info.FirstInfoFragment"
         android:label="@string/lessons_title_info">
         <argument
             android:name="step"
@@ -221,7 +221,7 @@
 
     <fragment
         android:id="@+id/inputMarkerFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InputMarkerFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.input.InputMarkerFragment"
         android:label="@string/lessons_title_input_symbol">
         <argument
             android:name="step"
@@ -234,7 +234,7 @@
 
     <fragment
         android:id="@+id/showMarkerFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.ShowMarkerFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.show.ShowMarkerFragment"
         android:label="@string/lessons_title_show_symbol">
         <argument
             android:name="step"
diff --git a/app/src/test/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
index 5b8780b6..80002691 100644
--- a/app/src/test/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/data/dsl/DslTest.kt
@@ -116,11 +116,11 @@ private val worstLessons by lessons {
         +Info("Open your book and boom your bomb").annotate("book", "bomb")
         +ShowDots(
             text = "Перед Вами полное шеститочие",
-            dots = BrailleDots(F, F, F, F, F, F)
+            brailleDots = BrailleDots(F, F, F, F, F, F)
         )
         +InputDots(
             text = "Введите все шесть точек",
-            dots = BrailleDots(F, F, F, F, F, F)
+            brailleDots = BrailleDots(F, F, F, F, F, F)
         )
         +Show(
             content.symbols.getValue(
@@ -200,14 +200,14 @@ private val steps = listOf(
         3, 2, 1,
         ShowDots(
             text = "Перед Вами полное шеститочие",
-            dots = BrailleDots(F, F, F, F, F, F)
+            brailleDots = BrailleDots(F, F, F, F, F, F)
         )
     ),
     Step(
         4, 2, 1,
         InputDots(
             text = "Введите все шесть точек",
-            dots = BrailleDots(F, F, F, F, F, F)
+            brailleDots = BrailleDots(F, F, F, F, F, F)
         )
     ),
     Step(5, 2, 1, Show(content.symbols.getValue('Z'))),

From abc463857a62bb7d29b09ef993efd5d0dbf21cd4 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Thu, 24 Sep 2020 17:48:43 +0300
Subject: [PATCH 076/117] #241 add comments about Unicode

---
 .../github/braillesystems/learnbraille/res/Materials.kt   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index 7ab43e6d..7b417013 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -343,6 +343,7 @@ val Context.showMarkerPrintRules by rules<Context, MarkerType, String>(
 )
 
 private val ruSymbols by symbols(SymbolType.ru) {
+    // UTF-16: 0410-042F
     symbol(char = 'А', brailleDots = BrailleDots(F, E, E, E, E, E))
     symbol(char = 'Б', brailleDots = BrailleDots(F, F, E, E, E, E))
     symbol(char = 'В', brailleDots = BrailleDots(E, F, E, F, F, F))
@@ -404,6 +405,8 @@ private val mathSigns by symbols(SymbolType.math) {
 }
 
 private val uebDigits by symbols(SymbolType.digit) {
+    // UTF-16: 0030-0039
+    symbol(char = '0', brailleDots = BrailleDots(E, F, E, F, F, E))
     symbol(char = '1', brailleDots = BrailleDots(F, E, E, E, E, E))
     symbol(char = '2', brailleDots = BrailleDots(F, F, E, E, E, E))
     symbol(char = '3', brailleDots = BrailleDots(F, E, E, F, E, E))
@@ -413,10 +416,10 @@ private val uebDigits by symbols(SymbolType.digit) {
     symbol(char = '7', brailleDots = BrailleDots(F, F, E, F, F, E))
     symbol(char = '8', brailleDots = BrailleDots(F, F, E, E, F, E))
     symbol(char = '9', brailleDots = BrailleDots(E, F, E, F, E, E))
-    symbol(char = '0', brailleDots = BrailleDots(E, F, E, F, F, E))
 }
 
 private val latinLetters by symbols(SymbolType.latin) {
+    // UTF-16: 0041-005A
     symbol(char = 'A', brailleDots = BrailleDots(F, E, E, E, E, E))
     symbol(char = 'B', brailleDots = BrailleDots(F, F, E, E, E, E))
     symbol(char = 'C', brailleDots = BrailleDots(F, E, E, F, E, E))
@@ -446,8 +449,9 @@ private val latinLetters by symbols(SymbolType.latin) {
 }
 
 private val greekLetters by symbols(SymbolType.greek) {
-    // Note: A - Alpha (Unicode char 0399); A - English (0041); А - Russian
+    // Note: A - Alpha (Unicode char 0391); A - English (0041); А - Russian (0410)
     // You may check the code by copying and pasting at https://r12a.github.io/app-conversion/
+    // Capital greek letters in UTF-16: 0391-03A9
     symbol(char = 'Α', brailleDots = BrailleDots(F, E, E, E, E, E))
     symbol(char = 'Β', brailleDots = BrailleDots(F, F, E, E, E, E))
     symbol(char = 'Γ', brailleDots = BrailleDots(F, F, E, F, F, E))

From d43c1b535398ca6936440a56aa454c157981ec22 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Thu, 24 Sep 2020 17:50:44 +0300
Subject: [PATCH 077/117] #241 fix noticed misprints in lessons

---
 .../github/braillesystems/learnbraille/res/GolubinaCourse.kt    | 2 +-
 app/src/main/res/values/strings.xml                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index 6dbeb961..f80100b0 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -1302,7 +1302,7 @@ internal val golubinaIntroLessons by lessons {
                     Введите цифровой знак, запятую, дефис и точку"""
         )
         +Input(content.markers.getValue(MarkerType.NumberSign))
-        inputChars(",-.")
+        inputChars(",—.")
         +Info(
             """
                     Переходим к изучению точечного состава буквы Ы.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 36feef32..6b16e670 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -273,7 +273,7 @@
     <string name="lessons_help_common">
         <![CDATA[
         <b>Переход</b> к следующему шагу - кнопка <b>\"вперёд\"</b> справа по центру,
-         к предыдущему - кнопка <b>назад</b> слева по центру.
+         к предыдущему - кнопка <b>"назад"</b> слева по центру.
         &<br>
         <b>Выход в меню</b> приложения - кнопка <b>\"перейти вверх\"</b> в верхней панели слева.
         &<br>

From 678df654fe758b4b546509917bdcb04424d8cc5b Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Fri, 25 Sep 2020 17:21:10 +0300
Subject: [PATCH 078/117] Fix caption mechanism

---
 CONTRIBUTING.md                               |   2 +
 .../learnbraille/res/ResourceTest.kt          |  49 ++
 .../data/db/LearnBrailleDatabase.kt           |   2 +
 .../data/repository/TheoryRepository.kt       |  21 +-
 .../braillesystems/learnbraille/res/Data.kt   |  13 +-
 .../learnbraille/res/GolubinaCourse.kt        |  11 +-
 .../learnbraille/res/Materials.kt             | 441 ++++++++++--------
 .../ui/screens/browser/SymbolViewFragment.kt  |   5 +-
 .../ui/screens/practice/CardFragment.kt       |  11 +-
 .../ui/screens/practice/CardViewModel.kt      |   6 -
 .../theory/steps/InputSymbolFragment.kt       |   9 +-
 .../theory/steps/ShowSymbolFragment.kt        |   7 +-
 .../learnbraille/ui/views/BrailleDotsView.kt  |   2 +-
 .../learnbraille/utils/_Kotlin.kt             |   2 +
 app/src/main/res/layout/fragment_card.xml     |   4 +-
 .../layout/fragment_lessons_input_symbol.xml  |   4 +-
 .../layout/fragment_lessons_show_symbol.xml   |   4 +-
 .../main/res/layout/fragment_symbol_view.xml  |   4 +-
 app/src/main/res/values/strings.xml           |   1 -
 build.gradle                                  |   2 +-
 20 files changed, 332 insertions(+), 268 deletions(-)
 create mode 100644 app/src/androidTest/java/com/github/braillesystems/learnbraille/res/ResourceTest.kt

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 29f4ed06..ae3bdb82 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,3 +24,5 @@ There are handy DSL that allows write content in the typesafe way.
 
 - All app content should be placed into `com.github.braillesystems.learnbraille.res` package.
 - Use `DslTest.kt` file as DSL tutorial.
+
+Symbols that are not from particular alphabet and does not exist on classical american keyboard should be treated as special and added via `enum class`.
diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/res/ResourceTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/res/ResourceTest.kt
new file mode 100644
index 00000000..8779ddde
--- /dev/null
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/res/ResourceTest.kt
@@ -0,0 +1,49 @@
+package com.github.braillesystems.learnbraille.res
+
+import android.content.Context
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import com.github.braillesystems.learnbraille.utils.get
+import org.junit.Assert.assertNotNull
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ResourceTest {
+
+    private lateinit var context: Context
+
+    @Before
+    fun before() {
+        context = InstrumentationRegistry.getInstrumentation().targetContext
+    }
+
+    @Test
+    fun inputSymbolPrintRulesTest() {
+        content.symbols.keys.forEach {
+            assertNotNull(context.inputSymbolPrintRules[it])
+        }
+    }
+
+    @Test
+    fun showSymbolPrintRulesTest() {
+        content.symbols.keys.forEach {
+            assertNotNull(context.showSymbolPrintRules[it])
+        }
+    }
+
+    @Test
+    fun inputMarkerPrintRulesTest() {
+        content.markers.keys.forEach {
+            assertNotNull(context.inputMarkerPrintRules[it])
+        }
+    }
+
+    @Test
+    fun showMarkerPrintRulesTest() {
+        content.markers.keys.forEach {
+            assertNotNull(context.showMarkerPrintRules[it])
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt
index 665a01bf..850b7d22 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt
@@ -207,3 +207,5 @@ private val MIGRATION_17_18 = object : Migration(17, 18), KoinComponent {
         Timber.i("Actions table created")
     }
 }
+
+// TODO materials migration
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
index fe192a5c..f80b9f26 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepository.kt
@@ -3,7 +3,6 @@ package com.github.braillesystems.learnbraille.data.repository
 import com.github.braillesystems.learnbraille.data.entities.*
 import com.github.braillesystems.learnbraille.res.StepAnnotation
 import com.github.braillesystems.learnbraille.utils.devnull
-import com.github.braillesystems.learnbraille.utils.runIf
 import com.github.braillesystems.learnbraille.utils.scope
 import kotlinx.coroutines.launch
 
@@ -31,19 +30,13 @@ class TheoryRepositoryImpl(
     private val actionsRepository: MutableActionsRepository
 ) : MutableTheoryRepository {
 
-    private fun getProscribedAnnotation(): List<String> {
-        val result = arrayListOf<String>()
-        listOf(
-            !preferenceRepository.golubinaBookStepsEnabled to StepAnnotation.golubinaBookRequired,
-            !preferenceRepository.slateStylusStepsEnabled to StepAnnotation.slateStylusRequired
-        ).forEach {
-            runIf (it.first) { result.add(it.second) }
-        }
-        return result
-    }
-
-    private val proscribedAnnotations
-        get() = getProscribedAnnotation()
+    private val proscribedAnnotations: List<String>
+        get() = listOfNotNull(
+            if (preferenceRepository.golubinaBookStepsEnabled) null
+            else StepAnnotation.golubinaBookRequired,
+            if (preferenceRepository.slateStylusStepsEnabled) null
+            else StepAnnotation.slateStylusRequired
+        )
 
     @Suppress("ReturnCount")
     override suspend fun getNextStepAndUpdate(thisStep: Step, markThisAsPassed: Boolean): Step? {
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
index 08dc0ca0..54891c8d 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
@@ -61,12 +61,12 @@ val prepopulationData by data(
     decks {
         // All cards deck should always exist and be first in the list
         deck(DeckTags.all) { true }
+
         deck(DeckTags.allWithRus) { data ->
-            data is Symbol && data.type !in listOf(
-                SymbolType.greek,
-                SymbolType.latin
-            )
-                    || data !is Symbol
+            val isNative = data is Symbol
+                    && data.type != SymbolType.greek
+                    && data.type != SymbolType.latin
+            isNative || data !is Symbol
         }
         deck(DeckTags.ruLetters) { data ->
             data is Symbol && data.type == SymbolType.ru
@@ -86,10 +86,9 @@ val prepopulationData by data(
         deck(DeckTags.digits) { data ->
             data is Symbol && data.type == SymbolType.digit
         }
-        deck(DeckTags.math) {data ->
+        deck(DeckTags.math) { data ->
             data is Symbol && data.type == SymbolType.math
         }
-
     }
 }
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index f80100b0..89a44333 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -6,6 +6,7 @@ import com.github.braillesystems.learnbraille.data.dsl.lessons
 import com.github.braillesystems.learnbraille.data.entities.*
 import com.github.braillesystems.learnbraille.data.entities.BrailleDot.E
 import com.github.braillesystems.learnbraille.data.entities.BrailleDot.F
+import com.github.braillesystems.learnbraille.res.PunctuationSigns.Hyphen
 
 internal val golubinaIntroLessons by lessons {
 
@@ -917,7 +918,7 @@ internal val golubinaIntroLessons by lessons {
                     точки буквы Ц — в верхней трети шеститочия, точки дефиса — в самой нижней.
                     """
         )
-        +Show(content.symbols.getValue('—'))
+        +Show(content.symbols.getValue(Hyphen.c))
         +Info(
             """
                    Переверните страницу в пособии. На странице 31 найдите по центру знак "дефис",
@@ -927,11 +928,11 @@ internal val golubinaIntroLessons by lessons {
         +Info(
             """Введите по символам слово ПОЛ-ЛИМОНА"""
         )
-        inputChars("ПОЛ—ЛИМОНА")
+        inputChars("ПОЛ${Hyphen.c}ЛИМОНА")
         +Info(
             """И последнее слово, которое нужно ввести в этом уроке — местоимение ГДЕ-ЛИБО"""
         )
-        inputChars("ГДЕ—ЛИБО")
+        inputChars("ГДЕ${Hyphen.c}ЛИБО")
         +Info(
             """
                     Теперь рекомендуем Вам записать на брайлевском приборе изученные слова:
@@ -1270,7 +1271,7 @@ internal val golubinaIntroLessons by lessons {
                     В конце поставьте литературную точку.
                     """
         )
-        inputChars("ЛЕНИНГРАД—ГОРОД—ГЕРОЙ.")
+        inputChars("ЛЕНИНГРАД${Hyphen.c}ГОРОД${Hyphen.c}ГЕРОЙ.")
         +Info(
             """
                     Теперь запишите на брайлевском приборе то же самое предложение:
@@ -1302,7 +1303,7 @@ internal val golubinaIntroLessons by lessons {
                     Введите цифровой знак, запятую, дефис и точку"""
         )
         +Input(content.markers.getValue(MarkerType.NumberSign))
-        inputChars(",—.")
+        inputChars(",${Hyphen.c}.")
         +Info(
             """
                     Переходим к изучению точечного состава буквы Ы.
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index 7b417013..d518e6f0 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -1,6 +1,7 @@
 package com.github.braillesystems.learnbraille.res
 
 import android.content.Context
+import androidx.fragment.app.Fragment
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.dsl.known
 import com.github.braillesystems.learnbraille.data.dsl.markers
@@ -10,6 +11,9 @@ import com.github.braillesystems.learnbraille.data.entities.BrailleDot.E
 import com.github.braillesystems.learnbraille.data.entities.BrailleDot.F
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.data.entities.Symbol
+import com.github.braillesystems.learnbraille.res.MathSigns.*
+import com.github.braillesystems.learnbraille.res.PunctuationSigns.*
+import com.github.braillesystems.learnbraille.utils.contextNotNull
 import com.github.braillesystems.learnbraille.utils.rules
 import kotlinx.serialization.Serializable
 
@@ -38,9 +42,6 @@ enum class MarkerType {
  *
  * Always use this variable to get materials.
  */
-
-// TODO write a migration for lat, greek, etc
-
 val content by materials {
     +ruSymbols
     +punctuationSigns
@@ -55,6 +56,167 @@ val knownMaterials by known(
     'А', 'Б', 'Ц', 'Д', 'Е', 'Ф', 'Г'
 )
 
+
+private val ruSymbols by symbols(SymbolType.ru) {
+    // UTF-16: 0410-042F
+    symbol(char = 'А', brailleDots = BrailleDots(F, E, E, E, E, E))
+    symbol(char = 'Б', brailleDots = BrailleDots(F, F, E, E, E, E))
+    symbol(char = 'В', brailleDots = BrailleDots(E, F, E, F, F, F))
+    symbol(char = 'Г', brailleDots = BrailleDots(F, F, E, F, F, E))
+    symbol(char = 'Д', brailleDots = BrailleDots(F, E, E, F, F, E))
+    symbol(char = 'Е', brailleDots = BrailleDots(F, E, E, E, F, E))
+    symbol(char = 'Ё', brailleDots = BrailleDots(F, E, E, E, E, F))
+    symbol(char = 'Ж', brailleDots = BrailleDots(E, F, E, F, F, E))
+    symbol(char = 'З', brailleDots = BrailleDots(F, E, F, E, F, F))
+    symbol(char = 'И', brailleDots = BrailleDots(E, F, E, F, E, E))
+    symbol(char = 'Й', brailleDots = BrailleDots(F, F, F, F, E, F))
+    symbol(char = 'К', brailleDots = BrailleDots(F, E, F, E, E, E))
+    symbol(char = 'Л', brailleDots = BrailleDots(F, F, F, E, E, E))
+    symbol(char = 'М', brailleDots = BrailleDots(F, E, F, F, E, E))
+    symbol(char = 'Н', brailleDots = BrailleDots(F, E, F, F, F, E))
+    symbol(char = 'О', brailleDots = BrailleDots(F, E, F, E, F, E))
+    symbol(char = 'П', brailleDots = BrailleDots(F, F, F, F, E, E))
+    symbol(char = 'Р', brailleDots = BrailleDots(F, F, F, E, F, E))
+    symbol(char = 'С', brailleDots = BrailleDots(E, F, F, F, E, E))
+    symbol(char = 'Т', brailleDots = BrailleDots(E, F, F, F, F, E))
+    symbol(char = 'У', brailleDots = BrailleDots(F, E, F, E, E, F))
+    symbol(char = 'Ф', brailleDots = BrailleDots(F, F, E, F, E, E))
+    symbol(char = 'Х', brailleDots = BrailleDots(F, F, E, E, F, E))
+    symbol(char = 'Ц', brailleDots = BrailleDots(F, E, E, F, E, E))
+    symbol(char = 'Ч', brailleDots = BrailleDots(F, F, F, F, F, E))
+    symbol(char = 'Ш', brailleDots = BrailleDots(F, E, E, E, F, F))
+    symbol(char = 'Щ', brailleDots = BrailleDots(F, E, F, F, E, F))
+    symbol(char = 'Ъ', brailleDots = BrailleDots(F, F, F, E, F, F))
+    symbol(char = 'Ы', brailleDots = BrailleDots(E, F, F, F, E, F))
+    symbol(char = 'Ь', brailleDots = BrailleDots(E, F, F, F, F, F))
+    symbol(char = 'Э', brailleDots = BrailleDots(E, F, E, F, E, F))
+    symbol(char = 'Ю', brailleDots = BrailleDots(F, F, E, E, F, F))
+    symbol(char = 'Я', brailleDots = BrailleDots(F, F, E, F, E, F))
+}
+
+enum class PunctuationSigns(val c: Char) {
+    Hyphen('—'),
+    LeftQuotation('«'),
+    RightQuotation('»')
+}
+
+private val punctuationSigns by symbols(SymbolType.special) {
+    symbol(char = ',', brailleDots = BrailleDots(E, F, E, E, E, E)) // Comma
+    symbol(char = Hyphen.c, brailleDots = BrailleDots(E, E, F, E, E, F)) // Hyphen
+    symbol(char = '.', brailleDots = BrailleDots(E, F, E, E, F, F)) // Dot
+    symbol(char = '!', brailleDots = BrailleDots(E, F, F, E, F, E)) // Exclamation mark
+    symbol(char = '?', brailleDots = BrailleDots(E, F, E, E, E, F)) // Question mark
+    symbol(char = LeftQuotation.c, brailleDots = BrailleDots(E, F, F, E, E, F))
+    symbol(char = RightQuotation.c, brailleDots = BrailleDots(E, E, F, E, F, F))
+    symbol(char = '(', brailleDots = BrailleDots(F, F, E, E, E, F)) // Left parenthesis
+    symbol(char = ')', brailleDots = BrailleDots(E, E, F, F, F, E)) // Right parenthesis
+    symbol(char = '*', brailleDots = BrailleDots(E, E, F, E, F, E)) // Asterisk
+    symbol(char = ':', brailleDots = BrailleDots(E, F, E, E, F, E)) // Colon
+    symbol(char = ';', brailleDots = BrailleDots(E, F, F, E, E, E)) // Semicolon
+    symbol(char = '\'', brailleDots = BrailleDots(E, E, E, F, E, E)) // Stress
+}
+
+enum class MathSigns(val c: Char) {
+    DotMul('·'),
+    CrossMul('✕'),
+    Div('÷')
+}
+
+private val mathSigns by symbols(SymbolType.math) {
+    symbol(char = '+', brailleDots = BrailleDots(E, F, F, E, F, E)) // Plus
+    symbol(char = '-', brailleDots = BrailleDots(E, E, F, E, E, F)) // Minus
+    symbol(char = DotMul.c, brailleDots = BrailleDots(E, E, F, E, E, E)) // Dot multiplication
+    symbol(char = CrossMul.c, brailleDots = BrailleDots(E, F, F, E, E, F)) // Cross multiplication
+    symbol(char = '/', brailleDots = BrailleDots(E, E, F, E, F, F)) // Division (fraction)
+    symbol(char = Div.c, brailleDots = BrailleDots(E, F, E, E, F, F)) // Division
+    symbol(char = '=', brailleDots = BrailleDots(E, F, F, E, F, F)) // Equality
+}
+
+private val uebDigits by symbols(SymbolType.digit) {
+    // UTF-16: 0030-0039
+    symbol(char = '0', brailleDots = BrailleDots(E, F, E, F, F, E))
+    symbol(char = '1', brailleDots = BrailleDots(F, E, E, E, E, E))
+    symbol(char = '2', brailleDots = BrailleDots(F, F, E, E, E, E))
+    symbol(char = '3', brailleDots = BrailleDots(F, E, E, F, E, E))
+    symbol(char = '4', brailleDots = BrailleDots(F, E, E, F, F, E))
+    symbol(char = '5', brailleDots = BrailleDots(F, E, E, E, F, E))
+    symbol(char = '6', brailleDots = BrailleDots(F, F, E, F, E, E))
+    symbol(char = '7', brailleDots = BrailleDots(F, F, E, F, F, E))
+    symbol(char = '8', brailleDots = BrailleDots(F, F, E, E, F, E))
+    symbol(char = '9', brailleDots = BrailleDots(E, F, E, F, E, E))
+}
+
+private val latinLetters by symbols(SymbolType.latin) {
+    // UTF-16: 0041-005A
+    symbol(char = 'A', brailleDots = BrailleDots(F, E, E, E, E, E))
+    symbol(char = 'B', brailleDots = BrailleDots(F, F, E, E, E, E))
+    symbol(char = 'C', brailleDots = BrailleDots(F, E, E, F, E, E))
+    symbol(char = 'D', brailleDots = BrailleDots(F, E, E, F, F, E))
+    symbol(char = 'E', brailleDots = BrailleDots(F, E, E, E, F, E))
+    symbol(char = 'F', brailleDots = BrailleDots(F, F, E, F, E, E))
+    symbol(char = 'G', brailleDots = BrailleDots(F, F, E, F, F, E))
+    symbol(char = 'H', brailleDots = BrailleDots(F, F, E, E, F, E))
+    symbol(char = 'I', brailleDots = BrailleDots(E, F, E, F, E, E))
+    symbol(char = 'J', brailleDots = BrailleDots(E, F, E, F, F, E))
+    symbol(char = 'K', brailleDots = BrailleDots(F, E, F, E, E, E))
+    symbol(char = 'L', brailleDots = BrailleDots(F, F, F, E, E, E))
+    symbol(char = 'M', brailleDots = BrailleDots(F, E, F, F, E, E))
+    symbol(char = 'N', brailleDots = BrailleDots(F, E, F, F, F, E))
+    symbol(char = 'O', brailleDots = BrailleDots(F, E, F, E, F, E))
+    symbol(char = 'P', brailleDots = BrailleDots(F, F, F, F, E, E))
+    symbol(char = 'Q', brailleDots = BrailleDots(F, F, F, F, F, E))
+    symbol(char = 'R', brailleDots = BrailleDots(F, F, F, E, F, E))
+    symbol(char = 'S', brailleDots = BrailleDots(E, F, F, F, E, E))
+    symbol(char = 'T', brailleDots = BrailleDots(E, F, F, F, F, E))
+    symbol(char = 'U', brailleDots = BrailleDots(F, E, F, E, E, F))
+    symbol(char = 'V', brailleDots = BrailleDots(F, F, F, E, E, F))
+    symbol(char = 'W', brailleDots = BrailleDots(E, F, E, F, F, F))
+    symbol(char = 'X', brailleDots = BrailleDots(F, E, F, F, E, F))
+    symbol(char = 'Y', brailleDots = BrailleDots(F, E, F, F, F, F))
+    symbol(char = 'Z', brailleDots = BrailleDots(F, E, F, E, F, F))
+}
+
+private val greekLetters by symbols(SymbolType.greek) {
+    // Note: A - Alpha (Unicode char 0391); A - English (0041); А - Russian (0410)
+    // You may check the code by copying and pasting at https://r12a.github.io/app-conversion/
+    // Capital greek letters in UTF-16: 0391-03A9
+    symbol(char = 'Α', brailleDots = BrailleDots(F, E, E, E, E, E))
+    symbol(char = 'Β', brailleDots = BrailleDots(F, F, E, E, E, E))
+    symbol(char = 'Γ', brailleDots = BrailleDots(F, F, E, F, F, E))
+    symbol(char = 'Δ', brailleDots = BrailleDots(F, E, E, F, F, E))
+    symbol(char = 'Ε', brailleDots = BrailleDots(F, E, E, E, F, E))
+    symbol(char = 'Ζ', brailleDots = BrailleDots(F, E, F, E, F, F))
+    symbol(char = 'Η', brailleDots = BrailleDots(E, F, E, F, F, E))
+    symbol(char = 'Θ', brailleDots = BrailleDots(F, F, E, E, F, E))
+    symbol(char = 'Ι', brailleDots = BrailleDots(E, F, E, F, E, E))
+    symbol(char = 'Κ', brailleDots = BrailleDots(F, E, F, E, E, E))
+    symbol(char = 'Λ', brailleDots = BrailleDots(F, F, F, E, E, E))
+    symbol(char = 'Μ', brailleDots = BrailleDots(F, E, F, F, E, E))
+    symbol(char = 'Ν', brailleDots = BrailleDots(F, E, F, F, F, E))
+    symbol(char = 'Ξ', brailleDots = BrailleDots(F, E, F, F, E, F))
+    symbol(char = 'Ο', brailleDots = BrailleDots(F, E, F, E, F, E))
+    symbol(char = 'Π', brailleDots = BrailleDots(F, F, F, F, E, E))
+    symbol(char = 'Ρ', brailleDots = BrailleDots(F, F, F, E, F, E))
+    symbol(char = 'Σ', brailleDots = BrailleDots(E, F, F, F, E, E))
+    symbol(char = 'Τ', brailleDots = BrailleDots(E, F, F, F, F, E))
+    symbol(char = 'Υ', brailleDots = BrailleDots(F, E, F, E, E, F))
+    symbol(char = 'Φ', brailleDots = BrailleDots(F, F, E, F, E, E))
+    symbol(char = 'Χ', brailleDots = BrailleDots(F, E, E, F, E, E))
+    symbol(char = 'Ψ', brailleDots = BrailleDots(F, E, F, F, F, F))
+    symbol(char = 'Ω', brailleDots = BrailleDots(E, F, E, F, F, F))
+}
+
+private val ms by markers {
+    marker(MarkerType.GreekCapital, BrailleDots(E, E, E, F, F, F))
+    marker(MarkerType.LatinCapital, BrailleDots(E, E, E, F, E, F))
+    marker(MarkerType.LatinSmall, BrailleDots(E, E, E, E, E, F))
+    marker(MarkerType.RussianCapital, BrailleDots(E, E, E, F, F, E))
+    marker(MarkerType.BoldFont, BrailleDots(F, F, E, F, F, F))
+    marker(MarkerType.ItalicFont, BrailleDots(E, E, E, F, F, F))
+    marker(MarkerType.NumberSign, BrailleDots(E, E, F, F, F, F))
+}
+
+
 /*
  * Add here rules, how to display hints for symbols.
  *
@@ -62,6 +224,8 @@ val knownMaterials by known(
  * so use `Fragment.getString` outside of lambdas.
  */
 
+val Fragment.captionRules get() = contextNotNull.captionRules
+
 val Context.inputSymbolPrintRules by rules<Context, Char, String>(
     {
         val t = getString(R.string.input_letter_intro_template)
@@ -84,7 +248,6 @@ val Context.inputSymbolPrintRules by rules<Context, Char, String>(
     },
 
     {
-        val other = getString(R.string.input_special_intro_template)
         val dotIntro = getString(R.string.input_special_intro_dot)
         val commaIntro = getString(R.string.input_special_intro_comma)
         val hyphenIntro = getString(R.string.input_special_intro_hyphen)
@@ -102,24 +265,23 @@ val Context.inputSymbolPrintRules by rules<Context, Char, String>(
             when (c) {
                 '.' -> dotIntro
                 ',' -> commaIntro
-                '—' -> hyphenIntro
+                Hyphen.c -> hyphenIntro
                 '!' -> exclamationIntro
                 '?' -> questionIntro
-                '«' -> quotationLeftIntro
-                '»' -> quotationRightIntro
+                LeftQuotation.c -> quotationLeftIntro
+                RightQuotation.c -> quotationRightIntro
                 '(' -> parenthesisLeftIntro
                 ')' -> parenthesisRightIntro
                 '*' -> asteriskIntro
                 ':' -> colonIntro
                 ';' -> semicolonIntro
                 '\'' -> stressIntro
-                else -> other.format(c)
+                else -> error("Undefined symbol: $c")
             }
         }
     },
 
     {
-        val other = getString(R.string.input_math_intro_template)
         val plusIntro = getString(R.string.input_math_plus)
         val minusIntro = getString(R.string.input_math_minus)
         val dotMultIntro = getString(R.string.input_math_dot_mult)
@@ -131,12 +293,12 @@ val Context.inputSymbolPrintRules by rules<Context, Char, String>(
             when (c) {
                 '+' -> plusIntro
                 '-' -> minusIntro
-                '·' -> dotMultIntro
-                '✕' -> crossMultIntro
+                DotMul.c -> dotMultIntro
+                CrossMul.c -> crossMultIntro
                 '/' -> fracDivisionIntro
-                '÷' -> divisionIntro
+                Div.c -> divisionIntro
                 '=' -> equalityIntro
-                else -> other.format(c)
+                else -> error("Undefined symbol: $c")
             }
         }
     }
@@ -165,7 +327,6 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
     },
 
     {
-        val other = getString(R.string.show_special_intro_template)
         val dotIntro = getString(R.string.show_special_intro_dot)
         val commaIntro = getString(R.string.show_special_intro_comma)
         val hyphenIntro = getString(R.string.show_special_intro_hyphen)
@@ -183,24 +344,23 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
             when (c) {
                 '.' -> dotIntro
                 ',' -> commaIntro
-                '—' -> hyphenIntro
+                Hyphen.c -> hyphenIntro
                 '!' -> exclamationIntro
                 '?' -> questionIntro
-                '«' -> quotationLeftIntro
-                '»' -> quotationRightIntro
+                LeftQuotation.c -> quotationLeftIntro
+                RightQuotation.c -> quotationRightIntro
                 '(' -> parenthesisLeftIntro
                 ')' -> parenthesisRightIntro
                 '*' -> asteriskIntro
                 ':' -> colonIntro
                 ';' -> semicolonIntro
                 '\'' -> stressIntro
-                else -> other.format(c)
+                else -> error("Undefined symbol: $c")
             }
         }
     },
 
     {
-        val other = getString(R.string.show_math_intro_template)
         val plusIntro = getString(R.string.show_math_plus)
         val minusIntro = getString(R.string.show_math_minus)
         val dotMultIntro = getString(R.string.show_math_dot_mult)
@@ -212,56 +372,71 @@ val Context.showSymbolPrintRules by rules<Context, Char, String>(
             when (c) {
                 '+' -> plusIntro
                 '-' -> minusIntro
-                '·' -> dotMultIntro
-                '✕' -> crossMultIntro
+                DotMul.c -> dotMultIntro
+                CrossMul.c -> crossMultIntro
                 '/' -> fracDivisionIntro
-                '÷' -> divisionIntro
+                Div.c -> divisionIntro
                 '=' -> equalityIntro
-                else -> other.format(c)
+                else -> error("Undefined symbol: $c")
             }
         }
     }
 )
 
-fun getSpecialCaptionId(symbol: Symbol): Int? {
-    val specialCaptions = mapOf(
-        '.' to R.string.show_special_intro_dot, ',' to R.string.show_special_intro_comma,
-        '—' to R.string.show_special_intro_hyphen,
-        '!' to R.string.show_special_intro_exclamation,
-        '?' to R.string.show_special_intro_question,
-        '«' to R.string.show_special_intro_quotation_left,
-        '»' to R.string.show_special_intro_quotation_right,
-        '(' to R.string.show_special_intro_parenthesis_left,
-        ')' to R.string.show_special_intro_parenthesis_right,
-        '*' to R.string.show_special_intro_asterisk,
-        ':' to R.string.show_special_intro_colon,
-        ';' to R.string.show_special_intro_semicolon,
-        '\'' to R.string.show_special_intro_stress,
-        '+' to R.string.show_math_plus,
-        '-' to R.string.show_math_minus,
-        '·' to R.string.show_math_dot_mult,
-        '✕' to R.string.show_math_cross_mult,
-        '/' to R.string.show_math_division_fraction,
-        '÷' to R.string.show_math_division,
-        '=' to R.string.show_math_equality
-    )
-    return if (specialCaptions.containsKey(symbol.char)) specialCaptions[symbol.char] else null
-}
+val Context.captionRules by rules<Context, Symbol, String>(
+    {
+        val specialCaptions = mapOf(
+            '.' to R.string.show_special_intro_dot,
+            ',' to R.string.show_special_intro_comma,
+            Hyphen.c to R.string.show_special_intro_hyphen,
+            '!' to R.string.show_special_intro_exclamation,
+            '?' to R.string.show_special_intro_question,
+            LeftQuotation.c to R.string.show_special_intro_quotation_left,
+            RightQuotation.c to R.string.show_special_intro_quotation_right,
+            '(' to R.string.show_special_intro_parenthesis_left,
+            ')' to R.string.show_special_intro_parenthesis_right,
+            '*' to R.string.show_special_intro_asterisk,
+            ':' to R.string.show_special_intro_colon,
+            ';' to R.string.show_special_intro_semicolon,
+            '\'' to R.string.show_special_intro_stress,
+            '+' to R.string.show_math_plus,
+            '-' to R.string.show_math_minus,
+            DotMul.c to R.string.show_math_dot_mult,
+            CrossMul.c to R.string.show_math_cross_mult,
+            '/' to R.string.show_math_division_fraction,
+            Div.c to R.string.show_math_division,
+            '=' to R.string.show_math_equality
+        ).mapValues {
+            getString(it.value)
+        }
+        return@rules { s: Symbol ->
+            specialCaptions.containsKey(s.char)
+        } to { s: Symbol ->
+            specialCaptions.getValue(s.char)
+        }
+    },
 
-fun getCaptionTitleId(symbol: Symbol): Int {
-    val specialCaptionId = getSpecialCaptionId(symbol)
-    if (specialCaptionId != null) {
-        return specialCaptionId
-    }
-    return when (symbol.type) {
-        SymbolType.ru -> R.string.letter_caption_ru
-        SymbolType.greek -> R.string.letter_caption_greek
-        SymbolType.latin -> R.string.letter_caption_latin
-        SymbolType.digit -> R.string.letter_caption_digit
-        SymbolType.special -> R.string.letter_caption_special
-        else -> R.string.empty_string
+    {
+        val specialCaptions = mapOf(
+            SymbolType.ru to R.string.letter_caption_ru,
+            SymbolType.greek to R.string.letter_caption_greek,
+            SymbolType.latin to R.string.letter_caption_latin,
+            SymbolType.digit to R.string.letter_caption_digit,
+            SymbolType.special to R.string.letter_caption_special
+        ).mapValues {
+            getString(it.value)
+        }
+        return@rules { s: Symbol ->
+            specialCaptions.containsKey(s.type)
+        } to { s: Symbol ->
+            specialCaptions.getValue(s.type)
+        }
+    },
+
+    {
+        { _: Symbol -> true } to { _: Symbol -> "" }
     }
-}
+)
 
 val Context.inputMarkerPrintRules by rules<Context, MarkerType, String>(
     {
@@ -341,149 +516,3 @@ val Context.showMarkerPrintRules by rules<Context, MarkerType, String>(
         MarkerType.NumberSign::equals to { _: MarkerType -> s }
     }
 )
-
-private val ruSymbols by symbols(SymbolType.ru) {
-    // UTF-16: 0410-042F
-    symbol(char = 'А', brailleDots = BrailleDots(F, E, E, E, E, E))
-    symbol(char = 'Б', brailleDots = BrailleDots(F, F, E, E, E, E))
-    symbol(char = 'В', brailleDots = BrailleDots(E, F, E, F, F, F))
-    symbol(char = 'Г', brailleDots = BrailleDots(F, F, E, F, F, E))
-    symbol(char = 'Д', brailleDots = BrailleDots(F, E, E, F, F, E))
-    symbol(char = 'Е', brailleDots = BrailleDots(F, E, E, E, F, E))
-    symbol(char = 'Ё', brailleDots = BrailleDots(F, E, E, E, E, F))
-    symbol(char = 'Ж', brailleDots = BrailleDots(E, F, E, F, F, E))
-    symbol(char = 'З', brailleDots = BrailleDots(F, E, F, E, F, F))
-    symbol(char = 'И', brailleDots = BrailleDots(E, F, E, F, E, E))
-    symbol(char = 'Й', brailleDots = BrailleDots(F, F, F, F, E, F))
-    symbol(char = 'К', brailleDots = BrailleDots(F, E, F, E, E, E))
-    symbol(char = 'Л', brailleDots = BrailleDots(F, F, F, E, E, E))
-    symbol(char = 'М', brailleDots = BrailleDots(F, E, F, F, E, E))
-    symbol(char = 'Н', brailleDots = BrailleDots(F, E, F, F, F, E))
-    symbol(char = 'О', brailleDots = BrailleDots(F, E, F, E, F, E))
-    symbol(char = 'П', brailleDots = BrailleDots(F, F, F, F, E, E))
-    symbol(char = 'Р', brailleDots = BrailleDots(F, F, F, E, F, E))
-    symbol(char = 'С', brailleDots = BrailleDots(E, F, F, F, E, E))
-    symbol(char = 'Т', brailleDots = BrailleDots(E, F, F, F, F, E))
-    symbol(char = 'У', brailleDots = BrailleDots(F, E, F, E, E, F))
-    symbol(char = 'Ф', brailleDots = BrailleDots(F, F, E, F, E, E))
-    symbol(char = 'Х', brailleDots = BrailleDots(F, F, E, E, F, E))
-    symbol(char = 'Ц', brailleDots = BrailleDots(F, E, E, F, E, E))
-    symbol(char = 'Ч', brailleDots = BrailleDots(F, F, F, F, F, E))
-    symbol(char = 'Ш', brailleDots = BrailleDots(F, E, E, E, F, F))
-    symbol(char = 'Щ', brailleDots = BrailleDots(F, E, F, F, E, F))
-    symbol(char = 'Ъ', brailleDots = BrailleDots(F, F, F, E, F, F))
-    symbol(char = 'Ы', brailleDots = BrailleDots(E, F, F, F, E, F))
-    symbol(char = 'Ь', brailleDots = BrailleDots(E, F, F, F, F, F))
-    symbol(char = 'Э', brailleDots = BrailleDots(E, F, E, F, E, F))
-    symbol(char = 'Ю', brailleDots = BrailleDots(F, F, E, E, F, F))
-    symbol(char = 'Я', brailleDots = BrailleDots(F, F, E, F, E, F))
-}
-private val punctuationSigns by symbols(SymbolType.special) {
-    symbol(char = ',', brailleDots = BrailleDots(E, F, E, E, E, E)) // Comma
-    symbol(char = '—', brailleDots = BrailleDots(E, E, F, E, E, F)) // Hyphen
-    symbol(char = '.', brailleDots = BrailleDots(E, F, E, E, F, F)) // Dot
-    symbol(char = '!', brailleDots = BrailleDots(E, F, F, E, F, E)) // Exclamation mark
-    symbol(char = '?', brailleDots = BrailleDots(E, F, E, E, E, F)) // Question mark
-    symbol(char = '«', brailleDots = BrailleDots(E, F, F, E, E, F)) // Left quotation mark
-    symbol(char = '»', brailleDots = BrailleDots(E, E, F, E, F, F)) // Right quotation mark
-    symbol(char = '(', brailleDots = BrailleDots(F, F, E, E, E, F)) // Left parenthesis
-    symbol(char = ')', brailleDots = BrailleDots(E, E, F, F, F, E)) // Right parenthesis
-    symbol(char = '*', brailleDots = BrailleDots(E, E, F, E, F, E)) // Asterisk
-    symbol(char = ':', brailleDots = BrailleDots(E, F, E, E, F, E)) // Colon
-    symbol(char = ';', brailleDots = BrailleDots(E, F, F, E, E, E)) // Semicolon
-    symbol(char = '\'', brailleDots = BrailleDots(E, E, E, F, E, E)) // Stress
-}
-
-private val mathSigns by symbols(SymbolType.math) {
-    symbol(char = '+', brailleDots = BrailleDots(E, F, F, E, F, E)) // Plus
-    symbol(char = '-', brailleDots = BrailleDots(E, E, F, E, E, F)) // Minus
-    symbol(char = '·', brailleDots = BrailleDots(E, E, F, E, E, E)) // Dot multiplication
-    symbol(char = '✕', brailleDots = BrailleDots(E, F, F, E, E, F)) // Cross multiplication
-    symbol(char = '/', brailleDots = BrailleDots(E, E, F, E, F, F)) // Division (fraction)
-    symbol(char = '÷', brailleDots = BrailleDots(E, F, E, E, F, F)) // Division
-    symbol(char = '=', brailleDots = BrailleDots(E, F, F, E, F, F)) // Equality
-}
-
-private val uebDigits by symbols(SymbolType.digit) {
-    // UTF-16: 0030-0039
-    symbol(char = '0', brailleDots = BrailleDots(E, F, E, F, F, E))
-    symbol(char = '1', brailleDots = BrailleDots(F, E, E, E, E, E))
-    symbol(char = '2', brailleDots = BrailleDots(F, F, E, E, E, E))
-    symbol(char = '3', brailleDots = BrailleDots(F, E, E, F, E, E))
-    symbol(char = '4', brailleDots = BrailleDots(F, E, E, F, F, E))
-    symbol(char = '5', brailleDots = BrailleDots(F, E, E, E, F, E))
-    symbol(char = '6', brailleDots = BrailleDots(F, F, E, F, E, E))
-    symbol(char = '7', brailleDots = BrailleDots(F, F, E, F, F, E))
-    symbol(char = '8', brailleDots = BrailleDots(F, F, E, E, F, E))
-    symbol(char = '9', brailleDots = BrailleDots(E, F, E, F, E, E))
-}
-
-private val latinLetters by symbols(SymbolType.latin) {
-    // UTF-16: 0041-005A
-    symbol(char = 'A', brailleDots = BrailleDots(F, E, E, E, E, E))
-    symbol(char = 'B', brailleDots = BrailleDots(F, F, E, E, E, E))
-    symbol(char = 'C', brailleDots = BrailleDots(F, E, E, F, E, E))
-    symbol(char = 'D', brailleDots = BrailleDots(F, E, E, F, F, E))
-    symbol(char = 'E', brailleDots = BrailleDots(F, E, E, E, F, E))
-    symbol(char = 'F', brailleDots = BrailleDots(F, F, E, F, E, E))
-    symbol(char = 'G', brailleDots = BrailleDots(F, F, E, F, F, E))
-    symbol(char = 'H', brailleDots = BrailleDots(F, F, E, E, F, E))
-    symbol(char = 'I', brailleDots = BrailleDots(E, F, E, F, E, E))
-    symbol(char = 'J', brailleDots = BrailleDots(E, F, E, F, F, E))
-    symbol(char = 'K', brailleDots = BrailleDots(F, E, F, E, E, E))
-    symbol(char = 'L', brailleDots = BrailleDots(F, F, F, E, E, E))
-    symbol(char = 'M', brailleDots = BrailleDots(F, E, F, F, E, E))
-    symbol(char = 'N', brailleDots = BrailleDots(F, E, F, F, F, E))
-    symbol(char = 'O', brailleDots = BrailleDots(F, E, F, E, F, E))
-    symbol(char = 'P', brailleDots = BrailleDots(F, F, F, F, E, E))
-    symbol(char = 'Q', brailleDots = BrailleDots(F, F, F, F, F, E))
-    symbol(char = 'R', brailleDots = BrailleDots(F, F, F, E, F, E))
-    symbol(char = 'S', brailleDots = BrailleDots(E, F, F, F, E, E))
-    symbol(char = 'T', brailleDots = BrailleDots(E, F, F, F, F, E))
-    symbol(char = 'U', brailleDots = BrailleDots(F, E, F, E, E, F))
-    symbol(char = 'V', brailleDots = BrailleDots(F, F, F, E, E, F))
-    symbol(char = 'W', brailleDots = BrailleDots(E, F, E, F, F, F))
-    symbol(char = 'X', brailleDots = BrailleDots(F, E, F, F, E, F))
-    symbol(char = 'Y', brailleDots = BrailleDots(F, E, F, F, F, F))
-    symbol(char = 'Z', brailleDots = BrailleDots(F, E, F, E, F, F))
-}
-
-private val greekLetters by symbols(SymbolType.greek) {
-    // Note: A - Alpha (Unicode char 0391); A - English (0041); А - Russian (0410)
-    // You may check the code by copying and pasting at https://r12a.github.io/app-conversion/
-    // Capital greek letters in UTF-16: 0391-03A9
-    symbol(char = 'Α', brailleDots = BrailleDots(F, E, E, E, E, E))
-    symbol(char = 'Β', brailleDots = BrailleDots(F, F, E, E, E, E))
-    symbol(char = 'Γ', brailleDots = BrailleDots(F, F, E, F, F, E))
-    symbol(char = 'Δ', brailleDots = BrailleDots(F, E, E, F, F, E))
-    symbol(char = 'Ε', brailleDots = BrailleDots(F, E, E, E, F, E))
-    symbol(char = 'Ζ', brailleDots = BrailleDots(F, E, F, E, F, F))
-    symbol(char = 'Η', brailleDots = BrailleDots(E, F, E, F, F, E))
-    symbol(char = 'Θ', brailleDots = BrailleDots(F, F, E, E, F, E))
-    symbol(char = 'Ι', brailleDots = BrailleDots(E, F, E, F, E, E))
-    symbol(char = 'Κ', brailleDots = BrailleDots(F, E, F, E, E, E))
-    symbol(char = 'Λ', brailleDots = BrailleDots(F, F, F, E, E, E))
-    symbol(char = 'Μ', brailleDots = BrailleDots(F, E, F, F, E, E))
-    symbol(char = 'Ν', brailleDots = BrailleDots(F, E, F, F, F, E))
-    symbol(char = 'Ξ', brailleDots = BrailleDots(F, E, F, F, E, F))
-    symbol(char = 'Ο', brailleDots = BrailleDots(F, E, F, E, F, E))
-    symbol(char = 'Π', brailleDots = BrailleDots(F, F, F, F, E, E))
-    symbol(char = 'Ρ', brailleDots = BrailleDots(F, F, F, E, F, E))
-    symbol(char = 'Σ', brailleDots = BrailleDots(E, F, F, F, E, E))
-    symbol(char = 'Τ', brailleDots = BrailleDots(E, F, F, F, F, E))
-    symbol(char = 'Υ', brailleDots = BrailleDots(F, E, F, E, E, F))
-    symbol(char = 'Φ', brailleDots = BrailleDots(F, F, E, F, E, E))
-    symbol(char = 'Χ', brailleDots = BrailleDots(F, E, E, F, E, E))
-    symbol(char = 'Ψ', brailleDots = BrailleDots(F, E, F, F, F, F))
-    symbol(char = 'Ω', brailleDots = BrailleDots(E, F, E, F, F, F))
-}
-
-private val ms by markers {
-    marker(MarkerType.GreekCapital, BrailleDots(E, E, E, F, F, F))
-    marker(MarkerType.LatinCapital, BrailleDots(E, E, E, F, E, F))
-    marker(MarkerType.LatinSmall, BrailleDots(E, E, E, E, E, F))
-    marker(MarkerType.RussianCapital, BrailleDots(E, E, E, F, F, E))
-    marker(MarkerType.BoldFont, BrailleDots(F, F, E, F, F, F))
-    marker(MarkerType.ItalicFont, BrailleDots(E, E, E, F, F, F))
-    marker(MarkerType.NumberSign, BrailleDots(E, E, F, F, F, F))
-}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
index 7980c68d..b6de0f3d 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
@@ -8,11 +8,12 @@ import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.Material
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.databinding.FragmentSymbolViewBinding
-import com.github.braillesystems.learnbraille.res.getCaptionTitleId
+import com.github.braillesystems.learnbraille.res.captionRules
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.getFragmentStringArg
+import com.github.braillesystems.learnbraille.utils.getValue
 import com.github.braillesystems.learnbraille.utils.parse
 
 class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view_help) {
@@ -34,7 +35,7 @@ class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view
         require(m.data is Symbol)
 
         binding.letter.text = m.data.char.toString()
-        binding.letterCaptionTextView.text = getString(getCaptionTitleId(m.data))
+        binding.letterCaption.text = captionRules.getValue(m.data)
         binding.brailleDots.dotsState.display(m.data.brailleDots)
 
     }.root
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
index e61acd4a..4ad4f91c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
@@ -13,6 +13,7 @@ import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.databinding.FragmentCardBinding
+import com.github.braillesystems.learnbraille.res.captionRules
 import com.github.braillesystems.learnbraille.res.deckTagToName
 import com.github.braillesystems.learnbraille.res.inputMarkerPrintRules
 import com.github.braillesystems.learnbraille.ui.*
@@ -24,7 +25,6 @@ import com.github.braillesystems.learnbraille.ui.views.brailleDots
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.ui.views.subscribe
 import com.github.braillesystems.learnbraille.utils.*
-import kotlinx.android.synthetic.main.fragment_card.*
 import org.koin.android.ext.android.inject
 import org.koin.core.parameter.parametersOf
 import timber.log.Timber
@@ -105,11 +105,13 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
                     binding.letter.visibility = View.VISIBLE
                     binding.markerDescription.visibility = View.GONE
                     binding.letter.text = it.char.toString()
+                    binding.letterCaption.text = captionRules.getValue(it)
                 }
                 is MarkerSymbol -> {
                     binding.letter.visibility = View.GONE
                     binding.markerDescription.visibility = View.VISIBLE
                     binding.markerDescription.text = contextNotNull.inputMarkerPrintRules[it.type]
+                    binding.letterCaption.text = ""
                 }
             }
         })
@@ -160,13 +162,6 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             }
         )
 
-        viewModel.symbolCaptionId.observe(
-            viewLifecycleOwner,
-            Observer {
-                letter_caption_text_view.text = it?.let { it1 -> getString(it1) }
-            }
-        )
-
         viewModel.deckTag.observe(
             viewLifecycleOwner,
             Observer { tag ->
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
index b560a508..f5dfe5d9 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
@@ -5,7 +5,6 @@ import androidx.lifecycle.*
 import com.github.braillesystems.learnbraille.data.entities.*
 import com.github.braillesystems.learnbraille.data.repository.MutableActionsRepository
 import com.github.braillesystems.learnbraille.data.repository.MutablePracticeRepository
-import com.github.braillesystems.learnbraille.res.getCaptionTitleId
 import com.github.braillesystems.learnbraille.ui.screens.DotsChecker
 import com.github.braillesystems.learnbraille.ui.screens.MutableDotsChecker
 import com.github.braillesystems.learnbraille.utils.retryN
@@ -44,10 +43,6 @@ class CardViewModel(
     private val _symbol = MutableLiveData<MaterialData>()
     val symbol: LiveData<MaterialData> get() = _symbol
 
-    // not string! https://medium.com/androiddevelopers/locale-changes-and-the-androidviewmodel-antipattern-84eb677660d9
-    private val _symbolCaptionId = MutableLiveData<Int?>()
-    val symbolCaptionId: LiveData<Int?> get() = _symbolCaptionId
-
     private val _deckTag = MutableLiveData<String?>()
     val deckTag: LiveData<String?> get() = _deckTag
 
@@ -116,7 +111,6 @@ class CardViewModel(
 
         material.data.let {
             _symbol.value = it
-            if (it is Symbol) _symbolCaptionId.value = getCaptionTitleId(it)
             expectedDots = when (it) {
                 is Symbol -> it.brailleDots
                 is MarkerSymbol -> it.brailleDots
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt
index ae1d480c..dccb83d1 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/InputSymbolFragment.kt
@@ -13,7 +13,7 @@ import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.data.entities.Input
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputSymbolBinding
-import com.github.braillesystems.learnbraille.res.getCaptionTitleId
+import com.github.braillesystems.learnbraille.res.captionRules
 import com.github.braillesystems.learnbraille.ui.*
 import com.github.braillesystems.learnbraille.ui.screens.observeCheckedOnFly
 import com.github.braillesystems.learnbraille.ui.screens.observeEventHint
@@ -23,10 +23,7 @@ import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
 import com.github.braillesystems.learnbraille.ui.screens.theory.toNextStep
 import com.github.braillesystems.learnbraille.ui.screens.theory.toPrevStep
 import com.github.braillesystems.learnbraille.ui.views.*
-import com.github.braillesystems.learnbraille.utils.announce
-import com.github.braillesystems.learnbraille.utils.application
-import com.github.braillesystems.learnbraille.utils.checkedAnnounce
-import com.github.braillesystems.learnbraille.utils.checkedBuzz
+import com.github.braillesystems.learnbraille.utils.*
 import timber.log.Timber
 
 class InputSymbolFragment : AbstractStepFragment(R.string.lessons_help_input_symbol) {
@@ -57,7 +54,7 @@ class InputSymbolFragment : AbstractStepFragment(R.string.lessons_help_input_sym
         require(step.data.material.data is Symbol)
         val symbol = step.data.material.data
         letter.text = symbol.char.toString()
-        letterCaptionTextView.text = getString(getCaptionTitleId(symbol))
+        letterCaption.text = captionRules.getValue(symbol)
         brailleDots.dotsState.display(symbol.brailleDots)
         checkedAnnounce(printStringNotNullLogged(symbol.char, PrintMode.INPUT))
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt
index 2d9ac87b..caa8cdf1 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/ShowSymbolFragment.kt
@@ -8,13 +8,14 @@ import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.Show
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsShowSymbolBinding
-import com.github.braillesystems.learnbraille.res.getCaptionTitleId
+import com.github.braillesystems.learnbraille.res.captionRules
 import com.github.braillesystems.learnbraille.ui.PrintMode
 import com.github.braillesystems.learnbraille.ui.printStringNotNullLogged
 import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
+import com.github.braillesystems.learnbraille.utils.getValue
 import timber.log.Timber
 
 class ShowSymbolFragment : AbstractStepFragment(R.string.lessons_help_show_symbol) {
@@ -36,10 +37,10 @@ class ShowSymbolFragment : AbstractStepFragment(R.string.lessons_help_show_symbo
         require(step.data is Show)
         initialize(step, prevButton, nextButton)
 
-        step.data.material.apply{
+        step.data.material.apply {
             require(data is Symbol)
             letter.text = data.char.toString()
-            letterCaptionTextView.text = getString(getCaptionTitleId(data))
+            letterCaption.text = captionRules.getValue(data)
             brailleDots.dotsState.display(data.brailleDots)
             checkedAnnounce(printStringNotNullLogged(data.char, PrintMode.SHOW))
         }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
index f249cfa9..305afe1e 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
@@ -19,7 +19,7 @@ import org.koin.core.KoinComponent
 import org.koin.core.inject
 import timber.log.Timber
 
-class BrailleDotView : CheckBox {
+class BrailleDotView : androidx.appcompat.widget.AppCompatCheckBox {
 
     constructor(context: Context) : super(context)
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
index 649e63a9..f2044211 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
@@ -57,6 +57,8 @@ fun <T, R> Rules<T, R>.match(key: T): R? = matchF(key)?.invoke(key)
 
 operator fun <T, R> Rules<T, R>.get(x: T): R? = match(x)
 
+fun <T, R> Rules<T, R>.getValue(x: T): R = match(x) ?: error("No such rule for $x")
+
 /**
  * It is very useful to choose android text resource depending on some condition.
  * (In that case prevent lambda of capturing context that will be invalid next time fragment entered,
diff --git a/app/src/main/res/layout/fragment_card.xml b/app/src/main/res/layout/fragment_card.xml
index 987c5a59..0c56d976 100644
--- a/app/src/main/res/layout/fragment_card.xml
+++ b/app/src/main/res/layout/fragment_card.xml
@@ -17,8 +17,8 @@
         tools:context=".ui.screens.practice.CardFragment">
 
         <TextView
-            android:id="@+id/letter_caption_text_view"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:id="@+id/letter_caption"
+                app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/letter"
             style="@style/bigLetterCaptionStyle"/>
diff --git a/app/src/main/res/layout/fragment_lessons_input_symbol.xml b/app/src/main/res/layout/fragment_lessons_input_symbol.xml
index a15992a1..6ae2ee9b 100644
--- a/app/src/main/res/layout/fragment_lessons_input_symbol.xml
+++ b/app/src/main/res/layout/fragment_lessons_input_symbol.xml
@@ -15,8 +15,8 @@
         android:layout_height="match_parent">
 
         <TextView
-            android:id="@+id/letter_caption_text_view"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:id="@+id/letter_caption"
+                app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/letter"
             style="@style/bigLetterCaptionStyle"/>
diff --git a/app/src/main/res/layout/fragment_lessons_show_symbol.xml b/app/src/main/res/layout/fragment_lessons_show_symbol.xml
index c5c81bf0..c8d91fea 100644
--- a/app/src/main/res/layout/fragment_lessons_show_symbol.xml
+++ b/app/src/main/res/layout/fragment_lessons_show_symbol.xml
@@ -8,8 +8,8 @@
         android:layout_height="match_parent">
 
         <TextView
-            android:id="@+id/letter_caption_text_view"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:id="@+id/letter_caption"
+                app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/letter"
             style="@style/bigLetterCaptionStyle"/>
diff --git a/app/src/main/res/layout/fragment_symbol_view.xml b/app/src/main/res/layout/fragment_symbol_view.xml
index f67ae979..dfc66f87 100644
--- a/app/src/main/res/layout/fragment_symbol_view.xml
+++ b/app/src/main/res/layout/fragment_symbol_view.xml
@@ -8,8 +8,8 @@
         android:layout_height="match_parent">
 
         <TextView
-            android:id="@+id/letter_caption_text_view"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:id="@+id/letter_caption"
+                app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/letter"
             style="@style/bigLetterCaptionStyle"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b16e670..1ff9f2e6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,7 +112,6 @@
     <string name="letter_caption_latin">Латинская буква</string>
     <string name="letter_caption_digit">Цифра</string>
     <string name="letter_caption_special">Специальный символ</string>
-    <string name="empty_string"></string>
 
     <!--    QR-->
 
diff --git a/build.gradle b/build.gradle
index 16a30646..44d79739 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:$version_navigation"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"

From 1226aebecfe7f3e3170426cd7e88b6b6812c2aa3 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Fri, 25 Sep 2020 17:26:58 +0300
Subject: [PATCH 079/117] Fix detekt

---
 .../com/github/braillesystems/learnbraille/res/ResourceTest.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/res/ResourceTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/res/ResourceTest.kt
index 8779ddde..d6168c9a 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/res/ResourceTest.kt
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/res/ResourceTest.kt
@@ -46,4 +46,4 @@ class ResourceTest {
             assertNotNull(context.showMarkerPrintRules[it])
         }
     }
-}
\ No newline at end of file
+}

From 14ff5fbb1c947f403bd88315990117a4f30fd0f5 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Fri, 25 Sep 2020 19:12:32 +0300
Subject: [PATCH 080/117] Update code style

---
 .idea/codeStyles/Project.xml         | 15 +++------------
 .idea/codeStyles/codeStyleConfig.xml |  1 +
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ce1fc4fe..2b436cba 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,18 +3,9 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
         </value>
       </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index a55e7a17..6e6eec11 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
     <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
   </state>
 </component>
\ No newline at end of file

From 85c4825bfd5343169e12ffdbc489328734899f8e Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Fri, 25 Sep 2020 19:16:14 +0300
Subject: [PATCH 081/117] Refactor stats

---
 .../ui/screens/stats/StatsFragment.kt         | 23 ++++++++++---------
 .../learnbraille/utils/_Kotlin.kt             |  3 ++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
index 2a079721..51e4a846 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
@@ -13,6 +13,7 @@ import com.github.braillesystems.learnbraille.data.repository.ActionsRepository
 import com.github.braillesystems.learnbraille.databinding.FragmentStatsBinding
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
 import com.github.braillesystems.learnbraille.utils.Days
+import com.github.braillesystems.learnbraille.utils.forEach
 import com.github.braillesystems.learnbraille.utils.scope
 import com.github.braillesystems.learnbraille.utils.title
 import kotlinx.android.synthetic.main.fragment_stats.*
@@ -41,25 +42,25 @@ class StatsFragment : AbstractFragmentWithHelp(R.string.stats_help) {
         setHasOptionsMenu(true)
 
         scope(job).launch {
-            val statsList = listOf(stats_week to 7, stats_month to 30)
-            for (statsData in statsList) {
-                val actions: Actions = actionsRepository.actionsFrom(Days(statsData.second))
+            forEach(stats_week to 7, stats_month to 30) { (view, days) ->
+                val actions: Actions = actionsRepository.actionsFrom(Days(days))
+
                 val cardsMastered =
                     actions.count { it.type is PracticeSubmission && it.type.isCorrect }
                 val hintsUsed = actions.count { it.type is PracticeHintAction }
                 val totalAttempts = actions.count { it.type is PracticeSubmission }
+                view.apply {
+                    practice_mastered_cards.text = cardsMastered.toString()
+                    practice_hints.text = hintsUsed.toString()
+                    practice_total_attempts.text = totalAttempts.toString()
+                }
 
                 val theoryStepsPassed = actions.count { it.type is TheoryPassStep }
                 val theoryInputStepsPassed =
                     actions.count { it.type is TheoryPassStep && it.type.isInput }
-
-                statsData.first.apply {
-                    practice_mastered_cards.text = """$cardsMastered"""
-                    practice_hints.text = """$hintsUsed"""
-                    practice_total_attempts.text = """$totalAttempts"""
-
-                    theory_steps_passed.text = """$theoryStepsPassed"""
-                    theory_input_steps_passed.text = """$theoryInputStepsPassed"""
+                view.apply {
+                    theory_steps_passed.text = theoryStepsPassed.toString()
+                    theory_input_steps_passed.text = theoryInputStepsPassed.toString()
                 }
             }
         }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
index 4fd56adc..4ec693ed 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
@@ -12,7 +12,8 @@ inline fun <T> T?.side(block: (T) -> Unit) {
     if (this != null) block(this)
 }
 
-fun <T, R> T.turn(f: (T) -> R): R = f(this)
+inline fun <T> forEach(vararg xs: T, block: (T) -> Unit) = xs.forEach(block)
+inline fun <T> applyForEach(vararg xs: T, block: T.() -> Unit) = xs.forEach { it.block() }
 
 /**
  * Try to use sealed classes to avoid using `unreachable`.

From 6ca0e2803507b7b099bae03738dbe98977bc049b Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Fri, 25 Sep 2020 19:35:02 +0300
Subject: [PATCH 082/117] Refactor detekt warnings

---
 .../learnbraille/data/dsl/DataStorage.kt         |  6 ++++--
 .../learnbraille/utils/_KotlinTest.kt            |  2 +-
 detekt-config.yml                                | 16 ++++------------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
index 76ccd1e7..23f71f28 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/DataStorage.kt
@@ -33,9 +33,9 @@ class data(
 
 @DataBuilderMarker
 class DataBuilder(
-    private val _materials: MaterialsBuilder,
+    materials: MaterialsBuilder,
     private val stepAnnotationNames: List<StepAnnotationName>,
-    private val _knownMaterials: List<KnownMaterial>,
+    knownMaterials: List<KnownMaterial>,
     block: DataBuilder.() -> Unit
 ) : DataStorage {
 
@@ -43,6 +43,7 @@ class DataBuilder(
     override val users: List<User>
         get() = _users
 
+    private val _materials: MaterialsBuilder = materials
     override val materials: List<Material>
         get() = _materials.materials
 
@@ -74,6 +75,7 @@ class DataBuilder(
     override val stepsHasAnnotations: List<StepHasAnnotation>
         get() = _stepsHasAnnotations
 
+    private val _knownMaterials: List<KnownMaterial> = knownMaterials
     override val knownMaterials: List<KnownMaterial> by lazy {
         _knownMaterials.map { it.copy(userId = 1) }
     }
diff --git a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
index b784b4f6..8171b980 100644
--- a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
@@ -4,7 +4,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
 
-class KotlinTest {
+class _KotlinTest {
 
     @Test
     fun pairCompareTo() {
diff --git a/detekt-config.yml b/detekt-config.yml
index 1d05da16..f7275dc2 100644
--- a/detekt-config.yml
+++ b/detekt-config.yml
@@ -2,13 +2,11 @@
 
 complexity:
   TooManyFunctions:
-    active: false
+    excludes: ['**/utils/**', '**/DotsChecker.kt']
   LongMethod:
-    active: false
-  ComplexMethod:
-    active: false
+    excludes: ['**/*Fragment.kt', '**/*Application.kt']
   LongParameterList:
-    active: false
+    excludes: ['**/*Repository.kt']  # Dependency injection
 
 style:
   WildcardImport:
@@ -16,16 +14,10 @@ style:
   MagicNumber:
     active: false
 
-exceptions:
-  TooGenericExceptionCaught:
-    excludes: ['**/SpeechRecognition.kt']
-
 naming:
   MatchingDeclarationName:
     active: false
   ClassNaming:
-    active: false
-  ConstructorParameterNaming:
-    active: false
+    active: false  # Delegate classes
   MemberNameEqualsClassName:
     active: false

From 12c645423ea44abbf3824276ee5fbd208e8234e1 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Fri, 25 Sep 2020 21:13:39 +0300
Subject: [PATCH 083/117] Display last lesson bold in lessons list

---
 .../ui/screens/theory/lessons/LessonsListFragment.kt       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/lessons/LessonsListFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/lessons/LessonsListFragment.kt
index 13b25c07..2ea89c1b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/lessons/LessonsListFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/lessons/LessonsListFragment.kt
@@ -1,6 +1,7 @@
 package com.github.braillesystems.learnbraille.ui.screens.theory.lessons
 
 import android.annotation.SuppressLint
+import android.graphics.Typeface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -43,6 +44,7 @@ class LessonsListFragment : Fragment() {
         lifecycleScope.launch {
             val curr = theoryRepository.currentStep(COURSE.id)
             val lessons = theoryRepository.allCourseLessons(COURSE.id)
+            val last = theoryRepository.lastCourseStep(curr.courseId)
             val activeListener = object : LessonItemListener {
                 override fun onClick(item: Lesson) = toLastLessonStep(COURSE.id, item.id)
             }
@@ -56,6 +58,11 @@ class LessonsListFragment : Fragment() {
             val adapter = LessonsListAdapter(lessons) { item ->
                 lesson = item
                 lessonName.text = "${item.id}. ${item.name}"
+                lessonName.setTypeface(
+                    lessonName.typeface,
+                    if (item.id == last.lessonId) Typeface.BOLD
+                    else Typeface.NORMAL
+                )
                 if (item.id <= curr.lessonId) {
                     clickListener = activeListener
                     lessonName.setTextColor(

From 40e454f3deed0f50fd782c33ca203701aa6a3241 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sat, 26 Sep 2020 00:00:39 +0300
Subject: [PATCH 084/117] Fix style

---
 .../braillesystems/learnbraille/data/entities/Cards.kt      | 1 -
 .../com/github/braillesystems/learnbraille/res/Materials.kt | 1 -
 .../screens/theory/steps/input/AbstractInputStepFragment.kt | 2 +-
 .../ui/screens/theory/steps/show/ShowDotsFragment.kt        | 6 ++----
 .../ui/screens/theory/steps/show/ShowMarkerFragment.kt      | 6 +++---
 .../ui/screens/theory/steps/show/ShowSymbolFragment.kt      | 2 +-
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Cards.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Cards.kt
index de019556..e788ca27 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Cards.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/Cards.kt
@@ -2,7 +2,6 @@ package com.github.braillesystems.learnbraille.data.entities
 
 import androidx.room.*
 
-
 @Entity(tableName = "cards", primaryKeys = ["deck_id", "material_id"])
 data class Card(
     @ColumnInfo(name = "deck_id")
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
index 8c70569c..a6a2c6f8 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Materials.kt
@@ -309,7 +309,6 @@ val Context.inputSymbolPrintRules by rules<Context, Char, String>(
 )
 
 val Context.showSymbolPrintRules by rules<Context, Char, String>(
-
     {
         val t = getString(R.string.show_letter_intro_template)
         ruSymbols.map::containsKey to { c: Char -> t.format(c) }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
index 7dc9d18e..a2f27f05 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
@@ -68,7 +68,7 @@ abstract class AbstractInputStepFragment(helpMsgId: HelpMsgId) : AbstractStepFra
             viewModel.observeEventIncorrect(
                 viewLifecycleOwner, dotsState
             ) {
-                val notify = {
+                fun notify() {
                     toastIncorrect(data)
                     buzzer.checkedBuzz(
                         preferenceRepository.incorrectBuzzPattern,
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt
index 4f859780..e07f5545 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt
@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
-import androidx.core.text.parseAsHtml
 import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.ShowDots
@@ -16,7 +15,6 @@ import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBindin
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
-import com.github.braillesystems.learnbraille.utils.removeHtmlMarkup
 
 class ShowDotsFragment : AbstractStepFragment(R.string.lessons_help_show_dots) {
 
@@ -45,8 +43,8 @@ class ShowDotsFragment : AbstractStepFragment(R.string.lessons_help_show_dots) {
 
         val text = data.text
             ?: getString(R.string.lessons_show_dots_info_template).format(data.brailleDots.spelling)
-        stepBinding.textView?.text = text.parseAsHtml()
-        checkedAnnounce(text.removeHtmlMarkup())
+        infoTextView.text = text
+        checkedAnnounce(text)
         brailleDots.dotsState.display(data.brailleDots)
 
     }.root
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
index fd40f187..d56361ca 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
@@ -44,12 +44,12 @@ class ShowMarkerFragment : AbstractStepFragment(R.string.lessons_help_show_marke
 
         val stepData = step.data
         require(stepData is Show)
-
         val data = stepData.material.data
         require(data is MarkerSymbol)
+
         val text = showMarkerPrintRules.getValue(data.type)
-        stepBinding.textView?.text = text.parseAsHtml()
-        checkedAnnounce(text.removeHtmlMarkup())
+        infoTextView.text = text
+        checkedAnnounce(text)
         brailleDots.dotsState.display(data.brailleDots)
 
     }.root
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt
index c97b0aa4..2fd90fc1 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt
@@ -41,9 +41,9 @@ class ShowSymbolFragment : AbstractStepFragment(R.string.lessons_help_show_symbo
 
         val stepData = step.data
         require(stepData is Show)
-
         val data = stepData.material.data
         require(data is Symbol)
+
         letter.letter = data.char
         letterCaption.text = captionRules.getValue(data)
         checkedAnnounce(showSymbolPrintRules.getValue(data.char))

From 38e43f4d4e50ac940e7ff60a5ea4e3e29a9fd8dc Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sat, 26 Sep 2020 00:24:14 +0300
Subject: [PATCH 085/117] Move database.md to docs

---
 database.md => docs/database.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename database.md => docs/database.md (100%)

diff --git a/database.md b/docs/database.md
similarity index 100%
rename from database.md
rename to docs/database.md

From 2403edef0abe32033b07f9e886ec149cd59b7643 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 26 Sep 2020 17:34:58 +0300
Subject: [PATCH 086/117] (#241) fix Braille dots position on screen

---
 .../braillesystems/learnbraille/ui/views/BrailleDotsView.kt   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
index 305afe1e..6da0e3b7 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
@@ -1,5 +1,6 @@
 package com.github.braillesystems.learnbraille.ui.views
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Build
 import android.util.AttributeSet
@@ -19,7 +20,8 @@ import org.koin.core.KoinComponent
 import org.koin.core.inject
 import timber.log.Timber
 
-class BrailleDotView : androidx.appcompat.widget.AppCompatCheckBox {
+@SuppressLint("AppCompatCustomView") // Causes BrailleDotView misplacement
+class BrailleDotView : CheckBox {
 
     constructor(context: Context) : super(context)
 

From 19cb6eadfb806b4ff829308b6789cb35a6d5b66c Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 26 Sep 2020 18:39:01 +0300
Subject: [PATCH 087/117] #241 change lessons slightly

---
 .../learnbraille/res/GolubinaCourse.kt        | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index 89a44333..3267e619 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -1856,7 +1856,7 @@ internal val golubinaIntroLessons by lessons {
             """
                     Перепишите, используя брайлевский прибор, предложение со страницы 54 пособия:
                     <br>
-                    Летний Сад омывается реками: Невой, Мойкой, Фонтанкой и Лебяжьей Канавкой.
+                    <b>Летний Сад омывается реками: Невой, Мойкой, Фонтанкой и Лебяжьей Канавкой.</b>
             """
         ).annotate(StepAnnotation.slateStylusRequired, StepAnnotation.golubinaBookRequired)
         +Info(InfoInterpolation.run {
@@ -2017,9 +2017,9 @@ internal val golubinaIntroLessons by lessons {
         })
         +Info(
             """
-                    Знак ударения обозначается точкой 4 и ставится в клетке перед ударной гласной. 
+                    <b>Знак ударения</b> обозначается точкой 4 и ставится в клетке перед ударной гласной. 
                     <br>
-                    Например, в слове МОСКВА знак ударения будет стоять перед буквой А.
+                    Например, в слове <b>МОСКВА</b> знак ударения будет стоять перед буквой А.
                     """
         )
         showAndInputChars("\'")
@@ -2078,10 +2078,10 @@ internal val golubinaIntroLessons by lessons {
                     выделяемого слова или фразы, причём примыкают вплотную к тексту, как скобки
                     или кавычки.
                     <br>
-                    Знак курсивного шрифта обозначается точками 4, 5, 6 (совпадает с признаком большой
+                    <b>Знак курсивного шрифта</b> обозначается точками 4, 5, 6 (совпадает с признаком большой
                     латинской буквы).
                     <br>
-                    Знак жирного шрифта - точки 1, 2, 4, 5, 6 (то есть все, кроме третьей).
+                    <b>Знак жирного шрифта</b> - точки 1, 2, 4, 5, 6 (то есть все, кроме третьей).
                     """
         )
         +Show(content.markers.getValue(MarkerType.ItalicFont))
@@ -2135,6 +2135,19 @@ internal val golubinaIntroLessons by lessons {
         inputChars("2+")
         +Input(content.markers.getValue(MarkerType.NumberSign))
         inputChars("2=4")
+        +Info(
+            """
+                    Запишите на брайлевском приборе примеры:
+                    <br>
+                    ОДИН ПЛЮС ОДИН РАВНО ДВА
+                    <br>
+                    ТРИ МИНУС ОДИН РАВНО ДВА
+                    <br>
+                    после чего проверьте себя по третьей снизу строке на странице 65 в пособии.
+                    Обратите внимание: перед знаками арифметических действий надо ставить пробел,
+                    но после них пробел не делается.
+                    """
+        ).annotate(StepAnnotation.golubinaBookRequired, StepAnnotation.slateStylusRequired)
 
         +Info(InfoInterpolation.run {
             """

From a81052a22cc1df77816c7e4a7934c3c7d8788228 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 26 Sep 2020 19:15:57 +0300
Subject: [PATCH 088/117] #241 rename all-but-foreign-letters deck

---
 .../java/com/github/braillesystems/learnbraille/res/Data.kt     | 2 +-
 app/src/main/res/values/strings.xml                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
index 54891c8d..0aa5b324 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/Data.kt
@@ -113,7 +113,7 @@ val Context.deckTagToName: Map<String, String> by lazyWithContext {
     DeckTags.run {
         mapOf(
             all to getString(R.string.deck_name_all),
-            allWithRus to getString(R.string.deck_name_all_with_ru),
+            allWithRus to getString(R.string.deck_name_all_but_foreign),
             ruLetters to getString(R.string.deck_name_ru_letters),
             latinLetters to getString(R.string.deck_name_latin_letters),
             greekLetters to getString(R.string.deck_name_greek_letters),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1ff9f2e6..821cc502 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -137,7 +137,7 @@
     </string>
 
     <string name="deck_name_all">Все символы</string>
-    <string name="deck_name_all_with_ru">Все символы, кроме латинских и греческих букв</string>
+    <string name="deck_name_all_but_foreign">Все символы, кроме иностранных букв</string>
     <string name="deck_name_ru_letters">Русские буквы</string>
     <string name="deck_name_latin_letters">Латинские буквы</string>
     <string name="deck_name_greek_letters">Греческие буквы</string>

From 6e34062a79ffb4179037cd67f9c6cf854f01590a Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 26 Sep 2020 20:41:39 +0300
Subject: [PATCH 089/117] #223 fix hardcode in styles

---
 app/src/main/res/values/styles.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d7418f1b..29788f62 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -42,8 +42,8 @@
     <style name="brailleDots">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:scaleX">2.6</item>
-        <item name="android:scaleY">2.6</item>
+        <item name="android:scaleX">@dimen/braille_dots_scale_of_one_dot</item>
+        <item name="android:scaleY">@dimen/braille_dots_scale_of_one_dot</item>
         <item name="android:button">@drawable/round_checkbox</item>
         <item name="background">@color/colorBackground</item>
     </style>

From 42b0e5e0862e3544e655939cb4848339332271aa Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 26 Sep 2020 20:48:35 +0300
Subject: [PATCH 090/117] #223 fix detekt & fix a little mess

---
 .../ui/screens/browser/MarkerViewFragment.kt         |  2 ++
 .../ui/screens/browser/SymbolViewFragment.kt         |  4 +---
 .../learnbraille/ui/screens/practice/CardFragment.kt |  2 +-
 .../braillesystems/learnbraille/utils/Utils.kt       | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
index a14a4c81..414b5577 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
@@ -37,5 +37,7 @@ class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view
         binding.infoTextView.text = showMarkerPrintRules.getValue(m.data.type)
         binding.brailleDots.dotsState.display(m.data.brailleDots)
 
+        // TODO #223 add flip button & apply extended accessibility for it
+
     }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
index f828e446..aee82cf2 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
@@ -40,10 +40,8 @@ class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view
         letterCaption.text = captionRules.getValue(m.data)
         brailleDots.dotsState.display(m.data.brailleDots)
 
-        // TODO #223 add flip button & apply extended accessibility for it
-
         if (preferenceRepository.extendedAccessibilityEnabled) {
-            applyExtendedAccessibility(flipButton = flipButton)
+            applyExtendedAccessibility(rightButton = flipButton)
         }
 
     }.root
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
index 81c72c6e..fe5897b5 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
@@ -60,7 +60,7 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             applyExtendedAccessibility(
                 leftButton = binding.hintButton,
                 rightButton = binding.nextButton,
-                flipButton = binding.flipButton,
+                rightMiddleButton = binding.flipButton,
                 textView = binding.markerDescription
             )
         }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
index 2c203de1..72aa33d4 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
@@ -104,17 +104,17 @@ val Context.extendedTextSize: Float by lazyWithContext {
 fun Fragment.applyExtendedAccessibility(
     leftButton: Button? = null,
     rightButton: Button? = null,
-    flipButton: Button? = null,
     leftMiddleButton: Button? = null,
     rightMiddleButton: Button? = null,
     textView: TextView? = null
 ) {
     val width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
-    leftButton?.setSize(width = width)
-    rightButton?.setSize(width = width)
-    flipButton?.setSize(width=width)
-    leftMiddleButton?.setSize(width = width)
-    rightMiddleButton?.setSize(width = width)
+    forEach(
+        leftButton,
+        rightButton,
+        leftMiddleButton,
+        rightMiddleButton
+    ) { it?.setSize(width = width) }
     textView?.setTextSize(
         TypedValue.COMPLEX_UNIT_SP,
         contextNotNull.extendedTextSize

From b02e0bf3d9423c4e089bb75941c86e62f654cb40 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 26 Sep 2020 20:57:09 +0300
Subject: [PATCH 091/117] extended accessibility: change textView size in
 MarkerViewFragment

---
 .../learnbraille/ui/screens/browser/MarkerViewFragment.kt      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
index 414b5577..ddf11850 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
@@ -12,6 +12,7 @@ import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
+import com.github.braillesystems.learnbraille.utils.applyExtendedAccessibility
 import com.github.braillesystems.learnbraille.utils.getFragmentStringArg
 import com.github.braillesystems.learnbraille.utils.getValue
 import com.github.braillesystems.learnbraille.utils.parse
@@ -37,6 +38,8 @@ class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view
         binding.infoTextView.text = showMarkerPrintRules.getValue(m.data.type)
         binding.brailleDots.dotsState.display(m.data.brailleDots)
 
+        applyExtendedAccessibility(textView = binding.infoTextView)
+
         // TODO #223 add flip button & apply extended accessibility for it
 
     }.root

From aaae9ef9de27eff2bd5808b8eed9c0eee5b7c834 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sat, 26 Sep 2020 23:47:51 +0300
Subject: [PATCH 092/117] Check not using developers course

---
 .github/workflows/android.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 2d5ff33d..07234ec8 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -58,3 +58,5 @@ jobs:
         run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.12.0-RC1/detekt && chmod a+x detekt
       - name: Static check with detekt
         run: ./detekt -c detekt-config.yml --build-upon-default-config
+      - name: Check not using developer's course
+        run: grep UsersCourse app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt

From 1bc654b577d6b8b6aea742085e8345ada78c92df Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sat, 26 Sep 2020 23:51:06 +0300
Subject: [PATCH 093/117] Fix course

---
 .../braillesystems/learnbraille/LearnBrailleApplication.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
index 596d7fbb..eb584dbc 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
@@ -2,7 +2,7 @@ package com.github.braillesystems.learnbraille
 
 import android.app.Application
 import com.github.braillesystems.learnbraille.data.db.LearnBrailleDatabase
-import com.github.braillesystems.learnbraille.data.dsl.DevelopersCourse
+import com.github.braillesystems.learnbraille.data.dsl.UsersCourse
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.data.repository.*
 import com.github.braillesystems.learnbraille.ui.screens.practice.CardViewModelFactory
@@ -119,4 +119,4 @@ class LearnBrailleApplication : Application() {
 lateinit var koin: Koin
     private set
 
-val COURSE = DevelopersCourse
+val COURSE = UsersCourse(2)

From f7d4909fc02c6d7aadd92b4ba9b638b8da13fdd2 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sun, 27 Sep 2020 13:51:48 +0300
Subject: [PATCH 094/117] #223 disable shadow around dots

---
 app/src/main/res/drawable/left_border.xml  | 2 +-
 app/src/main/res/drawable/right_border.xml | 2 +-
 app/src/main/res/values/styles.xml         | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/drawable/left_border.xml b/app/src/main/res/drawable/left_border.xml
index d192e2fe..b179c88d 100644
--- a/app/src/main/res/drawable/left_border.xml
+++ b/app/src/main/res/drawable/left_border.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-            android:right="1dp"
+            android:right="154dp"
             android:top="15dp"
             android:bottom="15dp">
         <shape android:shape="rectangle">
diff --git a/app/src/main/res/drawable/right_border.xml b/app/src/main/res/drawable/right_border.xml
index 718e1edb..b9ca9b86 100644
--- a/app/src/main/res/drawable/right_border.xml
+++ b/app/src/main/res/drawable/right_border.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-            android:left="1dp"
+            android:left="154dp"
             android:top="15dp"
             android:bottom="15dp">
         <shape android:shape="rectangle">
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 29788f62..d2cfacdc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -45,7 +45,6 @@
         <item name="android:scaleX">@dimen/braille_dots_scale_of_one_dot</item>
         <item name="android:scaleY">@dimen/braille_dots_scale_of_one_dot</item>
         <item name="android:button">@drawable/round_checkbox</item>
-        <item name="background">@color/colorBackground</item>
     </style>
 
     <style name="bigLetterStyle">

From 5102be6ab305e1b616e27364e1abed21adc8c704 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sun, 27 Sep 2020 13:57:34 +0300
Subject: [PATCH 095/117] retryN refactored

---
 .../ui/screens/practice/CardViewModel.kt      | 13 +++----
 .../learnbraille/utils/_Kotlin.kt             |  5 ++-
 .../learnbraille/utils/_KotlinTest.kt         | 36 +++++++++++--------
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
index c7b4f623..b63beea3 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
@@ -120,11 +120,11 @@ class CardViewModel(
             _deckTag.value = deck.tag
         }
 
-        val material = retryN(
-            n = 5,
-            stop = { it.data !in materialsQueue },
-            get = { nextMaterial()!! }
-        ) ?: nextMaterial()!!
+        val material = retryN(5) {
+            val m = nextMaterial()
+            if (m.data in materialsQueue) null
+            else m
+        } ?: nextMaterial()
 
         if (material.data !in materialsQueue) {
             if (materialsQueue.size == nSkipMaterials) materialsQueue.poll()
@@ -139,10 +139,11 @@ class CardViewModel(
         }
     }
 
-    private suspend fun nextMaterial(): Material? =
+    private suspend fun nextMaterial(): Material =
         if (preferenceRepository.practiceUseOnlyKnownMaterials) {
             practiceRepository.randomKnownMaterial()
         } else {
             practiceRepository.randomMaterial()
         }
+            ?: error("Current deck should not be empty")
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
index 1df93910..ce8f4672 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
@@ -111,10 +111,9 @@ operator fun Date.plus(days: Days): Date =
 
 operator fun Date.minus(days: Days): Date = plus(-days)
 
-inline fun <T> retryN(n: Int, stop: (T) -> Boolean, get: () -> T): T? {
+inline fun <T : Any> retryN(n: Int, get: () -> T?): T? {
     repeat(n) {
-        val v = get()
-        if (stop(v)) return v
+        get()?.let { return it }
     }
     return null
 }
diff --git a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
index 8171b980..b9f7f137 100644
--- a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
@@ -1,7 +1,6 @@
 package com.github.braillesystems.learnbraille.utils
 
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
+import org.junit.Assert.*
 import org.junit.Test
 
 class _KotlinTest {
@@ -18,22 +17,29 @@ class _KotlinTest {
 
     @Test
     fun retryNTest() {
-        fun getNextNumber(currentNumber: Int, nextNumbers: IntArray, repeat: Int): Int? {
+        // Last try will succeed
+        fun getTrier(n: Int): () -> Int? {
             var i = 0
-            fun getNextNumber(): Int {
-                return nextNumbers[i++]
+            return {
+                ++i
+                if (i == n) n
+                else null
             }
-
-            fun ifNumberSameAsCurrent(number: Int) = number == currentNumber
-
-            return retryN(repeat, { !ifNumberSameAsCurrent(it) }, { getNextNumber() })
         }
 
-        // Find first number in a sequence different from specified number
-        assertEquals(1, getNextNumber(0, intArrayOf(1, 1, 1), 2))
-        assertEquals(2, getNextNumber(1, intArrayOf(1, 2, 3), 2))
-        assertEquals(2, getNextNumber(1, intArrayOf(1, 2, 3), 3))
-        assertEquals(null, getNextNumber(1, intArrayOf(1, 2, 3), 1))
-        assertEquals(5, getNextNumber(0, intArrayOf(0, 0, 0, 5, 1, 0, 4), 4))
+        assertNull(retryN(-1) { 1 })
+        assertNull(retryN(0) { 1 })
+        run {
+            val trier = getTrier(5)
+            assertNull(retryN(4, trier))
+        }
+        run {
+            val trier = getTrier(5)
+            assertEquals(5, retryN(5, trier))
+        }
+        run {
+            val trier = getTrier(5)
+            assertEquals(5, retryN(10, trier))
+        }
     }
 }

From d11df9b72a93e26125e5928db4dd688814f1addc Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sun, 27 Sep 2020 17:21:47 +0300
Subject: [PATCH 096/117] Apply reformatting

---
 .../main/res/drawable/ic_flip_white_24dp.xml  |  6 ++---
 app/src/main/res/drawable/left_border.xml     |  6 ++---
 app/src/main/res/drawable/right_border.xml    |  6 ++---
 app/src/main/res/layout/fragment_card.xml     | 24 +++++++++----------
 .../main/res/layout/fragment_symbol_view.xml  | 22 ++++++++---------
 5 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/app/src/main/res/drawable/ic_flip_white_24dp.xml b/app/src/main/res/drawable/ic_flip_white_24dp.xml
index 1c0c1983..947234a6 100644
--- a/app/src/main/res/drawable/ic_flip_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_flip_white_24dp.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M15,21h2v-2h-2v2zM19,9h2L21,7h-2v2zM3,5v14c0,1.1 0.9,2 2,2h3c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L6,19c-0.55,0 -1,-0.45 -1,-1L5,6c0,-0.55 0.45,-1 1,-1h2c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L5,3c-1.1,0 -2,0.9 -2,2zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM12,23c0.55,0 1,-0.45 1,-1L13,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v20c0,0.55 0.45,1 1,1zM19,17h2v-2h-2v2zM15,5h2L17,3h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2z"
-      android:fillColor="#ffffff"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M15,21h2v-2h-2v2zM19,9h2L21,7h-2v2zM3,5v14c0,1.1 0.9,2 2,2h3c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L6,19c-0.55,0 -1,-0.45 -1,-1L5,6c0,-0.55 0.45,-1 1,-1h2c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L5,3c-1.1,0 -2,0.9 -2,2zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM12,23c0.55,0 1,-0.45 1,-1L13,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v20c0,0.55 0.45,1 1,1zM19,17h2v-2h-2v2zM15,5h2L17,3h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/left_border.xml b/app/src/main/res/drawable/left_border.xml
index b179c88d..58fc9043 100644
--- a/app/src/main/res/drawable/left_border.xml
+++ b/app/src/main/res/drawable/left_border.xml
@@ -2,9 +2,9 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-            android:right="154dp"
-            android:top="15dp"
-            android:bottom="15dp">
+        android:bottom="15dp"
+        android:right="154dp"
+        android:top="15dp">
         <shape android:shape="rectangle">
             <solid android:color="@color/colorSecondary" />
         </shape>
diff --git a/app/src/main/res/drawable/right_border.xml b/app/src/main/res/drawable/right_border.xml
index b9ca9b86..80e932f5 100644
--- a/app/src/main/res/drawable/right_border.xml
+++ b/app/src/main/res/drawable/right_border.xml
@@ -2,9 +2,9 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-            android:left="154dp"
-            android:top="15dp"
-            android:bottom="15dp">
+        android:bottom="15dp"
+        android:left="154dp"
+        android:top="15dp">
         <shape android:shape="rectangle">
             <solid android:color="@color/colorSecondary" />
         </shape>
diff --git a/app/src/main/res/layout/fragment_card.xml b/app/src/main/res/layout/fragment_card.xml
index ba4d29cf..f5af9814 100644
--- a/app/src/main/res/layout/fragment_card.xml
+++ b/app/src/main/res/layout/fragment_card.xml
@@ -78,18 +78,18 @@
             tools:ignore="SpUsage" />
 
         <com.google.android.material.button.MaterialButton
-                android:id="@+id/flip_button"
-                style="@style/sideIconButtons"
-                android:layout_width="@dimen/side_buttons_width"
-                android:layout_height="@dimen/practice_buttons_small_height"
-                android:contentDescription="@string/flip_card"
-                app:backgroundTint="@color/colorSecondary"
-                app:icon="@drawable/ic_flip_white_24dp"
-                app:layout_constraintBottom_toTopOf="@+id/next_button"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="1.0"
-                app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
+            android:id="@+id/flip_button"
+            style="@style/sideIconButtons"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_small_height"
+            android:contentDescription="@string/flip_card"
+            app:backgroundTint="@color/colorSecondary"
+            app:icon="@drawable/ic_flip_white_24dp"
+            app:layout_constraintBottom_toTopOf="@+id/next_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0"
+            app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/next_button"
diff --git a/app/src/main/res/layout/fragment_symbol_view.xml b/app/src/main/res/layout/fragment_symbol_view.xml
index 677428f4..72674d3e 100644
--- a/app/src/main/res/layout/fragment_symbol_view.xml
+++ b/app/src/main/res/layout/fragment_symbol_view.xml
@@ -36,17 +36,17 @@
             app:layout_constraintVertical_bias="@dimen/practice_dots_vertical_bias" />
 
         <com.google.android.material.button.MaterialButton
-                android:id="@+id/flip_button"
-                style="@style/sideIconButtons"
-                android:layout_width="@dimen/side_buttons_width"
-                android:layout_height="@dimen/practice_buttons_height"
-                android:contentDescription="@string/flip_card"
-                app:icon="@drawable/ic_flip_white_24dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="@dimen/practice_buttons_vertical_bias"
-                app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
+            android:id="@+id/flip_button"
+            style="@style/sideIconButtons"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_height"
+            android:contentDescription="@string/flip_card"
+            app:icon="@drawable/ic_flip_white_24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="@dimen/practice_buttons_vertical_bias"
+            app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

From c03d0229f18518ace658708180e0225e6b0a8e79 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sun, 27 Sep 2020 17:24:41 +0300
Subject: [PATCH 097/117] Implement reflection for browser and practice (#223)

---
 .../repository/MaterialsRepositoryTest.kt     |   2 +
 .../data/repository/PreferenceRepository.kt   |   8 +
 .../learnbraille/ui/screens/DotsChecker.kt    |  52 +++----
 .../ui/screens/browser/MarkerViewFragment.kt  |  24 ++-
 .../ui/screens/browser/SymbolViewFragment.kt  |   8 +-
 .../ui/screens/practice/CardFragment.kt       |  24 +--
 .../steps/input/AbstractInputStepFragment.kt  |   8 +-
 .../theory/steps/show/ShowMarkerFragment.kt   |   2 -
 .../learnbraille/ui/views/BigLetterView.kt    |   2 +
 .../learnbraille/ui/views/BrailleDotsView.kt  | 144 +++++++++++++++---
 .../learnbraille/utils/Utils.kt               |  10 +-
 .../learnbraille/utils/_Kotlin.kt             |  10 +-
 app/src/main/res/layout/braille_dots_view.xml |   3 +-
 .../main/res/layout/fragment_marker_view.xml  |  13 ++
 app/src/main/res/values/strings.xml           |   7 +
 app/src/main/res/xml/settings_hierarchy.xml   |   8 +
 .../learnbraille/utils/_KotlinTest.kt         |  24 +++
 17 files changed, 276 insertions(+), 73 deletions(-)

diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepositoryTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepositoryTest.kt
index a98408d0..22dac0f2 100644
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepositoryTest.kt
+++ b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/MaterialsRepositoryTest.kt
@@ -178,6 +178,8 @@ class MaterialsRepositoryTest {
                     get() = unreachable
                 override val additionalQrCodeButtonEnabled: Boolean
                     get() = unreachable
+                override val isWriteModeFirst: Boolean
+                    get() = unreachable
                 override val currentUserId: DBid
                     get() = 1
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
index b5c962fd..3ce51ad4 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/repository/PreferenceRepository.kt
@@ -24,6 +24,7 @@ interface PreferenceRepository {
     val practiceUseOnlyKnownMaterials: Boolean
     val extendedAccessibilityEnabled: Boolean
     val additionalQrCodeButtonEnabled: Boolean
+    val isWriteModeFirst: Boolean
 
     val currentUserId: DBid
     suspend fun getCurrentUser(): User
@@ -114,6 +115,13 @@ class PreferenceRepositoryImpl(
         )
     }
 
+    override val isWriteModeFirst: Boolean by logged {
+        context.preferences.getBoolean(
+            context.getString(R.string.preferences_is_write_mode_first),
+            true
+        )
+    }
+
     override val currentUserId: DBid by logged {
         context.preferences.getLong(
             context.getString(R.string.preference_current_user), 1
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt
index 51d4cb83..6b57e048 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/DotsChecker.kt
@@ -200,48 +200,48 @@ private class DotsCheckerImpl : MutableDotsChecker {
 }
 
 @Suppress("LongParameterList")
-inline fun DotsChecker.observeCheckedOnFly(
+fun DotsChecker.observeCheckedOnFly(
     lifecycleOwner: LifecycleOwner,
-    dotsState: BrailleDotsState,
+    getDotsState: () -> BrailleDotsState,
     buzzer: Vibrator? = null,
     preferenceRepository: PreferenceRepository = get(),
-    crossinline block: () -> Unit = {},
-    crossinline softBlock: () -> Unit = {}
+    block: () -> Unit = {},
+    softBlock: () -> Unit = {}
 ) {
     if (preferenceRepository.inputOnFlyCheck) {
-        observeEventCorrect(lifecycleOwner, dotsState, buzzer = null, block = block)
+        observeEventCorrect(lifecycleOwner, getDotsState, buzzer = null, block = block)
         observeEventSoftCorrect(lifecycleOwner, buzzer = buzzer, block = softBlock)
     } else {
-        observeEventCorrect(lifecycleOwner, dotsState, buzzer) {
+        observeEventCorrect(lifecycleOwner, getDotsState, buzzer) {
             softBlock()
             block()
         }
     }
 }
 
-inline fun DotsChecker.observeEventCorrect(
+fun DotsChecker.observeEventCorrect(
     lifecycleOwner: LifecycleOwner,
-    dotsState: BrailleDotsState,
+    getDotsState: () -> BrailleDotsState,
     buzzer: Vibrator? = null,
     preferenceRepository: PreferenceRepository = get(),
-    crossinline block: () -> Unit = {}
+    block: () -> Unit = {}
 ): Unit = eventCorrect.observe(
     lifecycleOwner,
     Observer {
         if (!it) return@Observer
         Timber.i("Handle correct")
         buzzer.checkedBuzz(preferenceRepository.correctBuzzPattern)
-        dotsState.uncheck()
+        getDotsState().uncheck()
         block()
         onCorrectComplete()
     }
 )
 
-inline fun DotsChecker.observeEventSoftCorrect(
+fun DotsChecker.observeEventSoftCorrect(
     lifecycleOwner: LifecycleOwner,
     buzzer: Vibrator? = null,
     preferenceRepository: PreferenceRepository = get(),
-    crossinline block: () -> Unit = {}
+    block: () -> Unit = {}
 ): Unit = eventSoftCorrect.observe(
     lifecycleOwner,
     Observer {
@@ -253,50 +253,50 @@ inline fun DotsChecker.observeEventSoftCorrect(
     }
 )
 
-inline fun DotsChecker.observeEventIncorrect(
+fun DotsChecker.observeEventIncorrect(
     lifecycleOwner: LifecycleOwner,
-    dotsState: BrailleDotsState,
+    getDotsState: () -> BrailleDotsState,
     buzzer: Vibrator? = null,
     preferenceRepository: PreferenceRepository = get(),
-    crossinline block: () -> Unit = {}
+    block: () -> Unit = {}
 ): Unit = eventIncorrect.observe(
     lifecycleOwner,
     Observer {
         if (!it) return@Observer
-        Timber.i("Handle incorrect: entered = ${dotsState.spelling}")
+        Timber.i("Handle incorrect: entered = ${getDotsState().spelling}")
         buzzer.checkedBuzz(preferenceRepository.incorrectBuzzPattern)
-        dotsState.uncheck()
+        getDotsState().uncheck()
         block()
         onIncorrectComplete()
     }
 )
 
-inline fun DotsChecker.observeEventHint(
+fun DotsChecker.observeEventHint(
     lifecycleOwner: LifecycleOwner,
-    dotsState: BrailleDotsState,
-    crossinline block: (BrailleDots) -> Unit = {}
+    getDotsState: () -> BrailleDotsState,
+    block: (BrailleDots) -> Unit = {}
 ): Unit = eventHint.observe(
     lifecycleOwner,
     Observer { expectedDots ->
         if (expectedDots == null) return@Observer
         Timber.i("Handle hint")
-        dotsState.display(expectedDots)
+        getDotsState().display(expectedDots)
         BrailleTrainer.trySend(expectedDots)
         block(expectedDots)
         onHintComplete()
     }
 )
 
-inline fun DotsChecker.observeEventPassHint(
+fun DotsChecker.observeEventPassHint(
     lifecycleOwner: LifecycleOwner,
-    dotsState: BrailleDotsState,
-    crossinline block: () -> Unit = {}
+    getDotsState: () -> BrailleDotsState,
+    block: () -> Unit = {}
 ): Unit = eventPassHint.observe(
     lifecycleOwner,
     Observer {
         if (!it) return@Observer
-        dotsState.uncheck()
-        dotsState.clickable(true)
+        getDotsState().uncheck()
+        getDotsState().clickable(true)
         block()
         onPassHintComplete()
     }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
index ddf11850..c1388bd6 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
@@ -7,6 +7,7 @@ import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
 import com.github.braillesystems.learnbraille.data.entities.Material
+import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.databinding.FragmentMarkerViewBinding
 import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
@@ -16,9 +17,12 @@ import com.github.braillesystems.learnbraille.utils.applyExtendedAccessibility
 import com.github.braillesystems.learnbraille.utils.getFragmentStringArg
 import com.github.braillesystems.learnbraille.utils.getValue
 import com.github.braillesystems.learnbraille.utils.parse
+import org.koin.android.ext.android.inject
 
 class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view_help) {
 
+    private val preferenceRepository: PreferenceRepository by inject()
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -28,19 +32,25 @@ class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view
         R.layout.fragment_marker_view,
         container,
         false
-    ).also { binding ->
+    ).apply {
 
         setHasOptionsMenu(true)
 
         val m: Material = parse(Material.serializer(), getFragmentStringArg("material"))
         require(m.data is MarkerSymbol)
 
-        binding.infoTextView.text = showMarkerPrintRules.getValue(m.data.type)
-        binding.brailleDots.dotsState.display(m.data.brailleDots)
-
-        applyExtendedAccessibility(textView = binding.infoTextView)
-
-        // TODO #223 add flip button & apply extended accessibility for it
+        infoTextView.text = showMarkerPrintRules.getValue(m.data.type)
+        brailleDots.dotsState.display(m.data.brailleDots)
+        flipButton.setOnClickListener {
+            brailleDots.reflect().display(m.data.brailleDots)
+        }
+
+        if (preferenceRepository.extendedAccessibilityEnabled) {
+            applyExtendedAccessibility(
+                textView = infoTextView,
+                rightMiddleButton = flipButton
+            )
+        }
 
     }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
index aee82cf2..6a89f867 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
@@ -13,7 +13,10 @@ import com.github.braillesystems.learnbraille.res.captionRules
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
-import com.github.braillesystems.learnbraille.utils.*
+import com.github.braillesystems.learnbraille.utils.applyExtendedAccessibility
+import com.github.braillesystems.learnbraille.utils.getFragmentStringArg
+import com.github.braillesystems.learnbraille.utils.getValue
+import com.github.braillesystems.learnbraille.utils.parse
 import org.koin.android.ext.android.inject
 
 class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view_help) {
@@ -39,6 +42,9 @@ class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view
         letter.letter = m.data.char
         letterCaption.text = captionRules.getValue(m.data)
         brailleDots.dotsState.display(m.data.brailleDots)
+        flipButton.setOnClickListener {
+            brailleDots.reflect().display(m.data.brailleDots)
+        }
 
         if (preferenceRepository.extendedAccessibilityEnabled) {
             applyExtendedAccessibility(rightButton = flipButton)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
index fe5897b5..bdfd9ef3 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
@@ -73,10 +73,7 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
         val viewModel = ViewModelProvider(this, viewModelFactory)
             .get(CardViewModel::class.java)
 
-        dotsState.subscribe(View.OnClickListener {
-            viewModel.onSoftCheck()
-        })
-
+        dotsState.subscribe(viewModel)
 
         val buzzer: Vibrator? = activity?.getSystemService()
 
@@ -85,10 +82,14 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             override fun onJoystickLeft() = viewModel.onHint()
         })
 
-
         binding.cardViewModel = viewModel
         binding.lifecycleOwner = this@CardFragment
 
+        binding.flipButton.setOnClickListener {
+            dotsState = binding.brailleDots.reflect().apply {
+                dotsState.subscribe(viewModel)
+            }
+        }
 
         viewModel.symbol.observe(viewLifecycleOwner, Observer {
             if (it == null) return@Observer
@@ -109,13 +110,13 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
         })
 
         viewModel.observeCheckedOnFly(
-            viewLifecycleOwner, dotsState, buzzer,
+            viewLifecycleOwner, { dotsState }, buzzer,
             block = { title = title(viewModel) },
             softBlock = ::showCorrectToast
         )
 
         viewModel.observeEventIncorrect(
-            viewLifecycleOwner, dotsState, buzzer
+            viewLifecycleOwner, { dotsState }, buzzer
         ) {
             viewModel.symbol.value
                 ?.let { showIncorrectToast(inputPrint(it)) }
@@ -124,13 +125,13 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
         }
 
         viewModel.observeEventHint(
-            viewLifecycleOwner, dotsState
+            viewLifecycleOwner, { dotsState }
         ) { expectedDots ->
             showHintToast(expectedDots)
         }
 
         viewModel.observeEventPassHint(
-            viewLifecycleOwner, dotsState
+            viewLifecycleOwner, { dotsState }
         ) {
             viewModel.symbol.value?.let {
                 checkedAnnounce(inputPrint(it))
@@ -166,6 +167,11 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             else format(viewModel.nCorrect, viewModel.nTries)
         }
 
+    private fun BrailleDotsState.subscribe(viewModel: CardViewModel) =
+        subscribe(View.OnClickListener {
+            viewModel.onSoftCheck()
+        })
+
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.card_menu, menu)
     }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
index a2f27f05..30d13921 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
@@ -53,20 +53,20 @@ abstract class AbstractInputStepFragment(helpMsgId: HelpMsgId) : AbstractStepFra
             val buzzer: Vibrator? = activity?.getSystemService()
 
             viewModel.observeCheckedOnFly(
-                viewLifecycleOwner, dotsState, buzzer,
+                viewLifecycleOwner, { dotsState }, buzzer,
                 block = { toNextStep(step, markThisAsPassed = true) },
                 softBlock = { showCorrectToast() }
             )
 
             viewModel.observeEventHint(
-                viewLifecycleOwner, dotsState
+                viewLifecycleOwner, { dotsState }
             ) {
                 showHintToast(expectedDots)
                 userTouchedDots = true
             }
 
             viewModel.observeEventIncorrect(
-                viewLifecycleOwner, dotsState
+                viewLifecycleOwner, { dotsState }
             ) {
                 fun notify() {
                     toastIncorrect(data)
@@ -80,7 +80,7 @@ abstract class AbstractInputStepFragment(helpMsgId: HelpMsgId) : AbstractStepFra
             }
 
             viewModel.observeEventPassHint(
-                viewLifecycleOwner, dotsState
+                viewLifecycleOwner, { dotsState }
             ) {
                 onPassHint(data)
             }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
index d56361ca..d7e7025d 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
-import androidx.core.text.parseAsHtml
 import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
@@ -18,7 +17,6 @@ import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.getValue
-import com.github.braillesystems.learnbraille.utils.removeHtmlMarkup
 
 class ShowMarkerFragment : AbstractStepFragment(R.string.lessons_help_show_marker) {
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BigLetterView.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BigLetterView.kt
index 8f12990e..3f8fb765 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BigLetterView.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BigLetterView.kt
@@ -1,5 +1,6 @@
 package com.github.braillesystems.learnbraille.ui.views
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.TextView
@@ -8,6 +9,7 @@ import com.github.braillesystems.learnbraille.res.inputSymbolPrintRules
 import com.github.braillesystems.learnbraille.res.showSymbolPrintRules
 import com.github.braillesystems.learnbraille.utils.getValue
 
+@SuppressLint("AppCompatCustomView")
 open class BigLetterView : TextView {
 
     constructor(context: Context) : super(context)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
index 6da0e3b7..3a2f6377 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
@@ -8,6 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.CheckBox
+import androidx.annotation.RequiresApi
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.BrailleDot
@@ -15,6 +16,10 @@ import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.data.entities.list
 import com.github.braillesystems.learnbraille.data.entities.spelling
 import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode.Reading
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode.Writing
+import com.github.braillesystems.learnbraille.utils.chainify
+import com.github.braillesystems.learnbraille.utils.forEach
 import kotlinx.android.synthetic.main.braille_dots_view.view.*
 import org.koin.core.KoinComponent
 import org.koin.core.inject
@@ -39,6 +44,17 @@ class BrailleDotView : CheckBox {
     }
 }
 
+enum class BrailleDotsViewMode {
+    Reading, // 1, 2, 3 dots are on the LEFT
+    Writing  // 1, 2, 3 dots are on the RIGHT
+}
+
+val BrailleDotsViewMode.reflected: BrailleDotsViewMode
+    get() = when (this) {
+        Writing -> Reading
+        Reading -> Writing
+    }
+
 /**
  * Represents six Braille dots view.
  */
@@ -61,35 +77,125 @@ class BrailleDotsView : ConstraintLayout, KoinComponent {
             .from(context)
             .inflate(R.layout.braille_dots_view, this, true)
 
-        if (Build.VERSION.SDK_INT >= 22) {
-            if (preferenceRepository.traverseDotsInEnumerationOrder) {
-                dotButton2.accessibilityTraversalAfter = dotButton1.id
-                dotButton3.accessibilityTraversalAfter = dotButton2.id
-                dotButton4.accessibilityTraversalAfter = dotButton3.id
-                dotButton5.accessibilityTraversalAfter = dotButton4.id
-                dotButton6.accessibilityTraversalAfter = dotButton5.id
+        mode =
+            if (preferenceRepository.isWriteModeFirst) Writing
+            else Reading
+    }
+
+    var mode: BrailleDotsViewMode
+        set(value) {
+            setDescriptionMode(value)
+            reflectChecks()
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                setBackgroundMode(value)
             } else {
-                dotButton4.accessibilityTraversalAfter = dotButton1.id
-                dotButton2.accessibilityTraversalAfter = dotButton4.id
-                dotButton5.accessibilityTraversalAfter = dotButton2.id
-                dotButton3.accessibilityTraversalAfter = dotButton5.id
-                dotButton6.accessibilityTraversalAfter = dotButton3.id
+                Timber.w("Unable to set braille dots background due to low API level")
             }
-        } else {
-            Timber.i("API level < 22, unable co control accessibility traversal order")
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                setTraversalMode(value)
+            } else {
+                Timber.w("API level < 22, unable co control accessibility traversal order")
+            }
+
+            field = value
+        }
+
+    fun reflect(): BrailleDotsState {
+        mode = mode.reflected
+        return dotsState
+    }
+
+    private fun setDescriptionMode(mode: BrailleDotsViewMode) {
+        when (mode) {
+            Writing -> forEach(
+                dotButton4 to R.string.braille_dot_1,
+                dotButton5 to R.string.braille_dot_2,
+                dotButton6 to R.string.braille_dot_3,
+                dotButton1 to R.string.braille_dot_4,
+                dotButton2 to R.string.braille_dot_5,
+                dotButton3 to R.string.braille_dot_6
+            ) { (dotButton, id) ->
+                dotButton.contentDescription = context.getString(id)
+            }
+            Reading -> forEach(
+                dotButton1 to R.string.braille_dot_1,
+                dotButton2 to R.string.braille_dot_2,
+                dotButton3 to R.string.braille_dot_3,
+                dotButton4 to R.string.braille_dot_4,
+                dotButton5 to R.string.braille_dot_5,
+                dotButton6 to R.string.braille_dot_6
+            ) { (dotButton, id) ->
+                dotButton.contentDescription = context.getString(id)
+            }
+        }
+    }
+
+    private fun reflectChecks() = forEach(
+        dotButton1 to dotButton4,
+        dotButton2 to dotButton5,
+        dotButton3 to dotButton6
+    ) { (left, right) ->
+        left.isChecked = right.isChecked.also {
+            right.isChecked = left.isChecked
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP_MR1)
+    private fun setTraversalMode(mode: BrailleDotsViewMode) {
+        fun setAfter(next: BrailleDotView, prev: BrailleDotView) {
+            next.accessibilityTraversalAfter = prev.id
+        }
+
+        when (mode to preferenceRepository.traverseDotsInEnumerationOrder) {
+            Writing to true -> chainify(
+                dotButton4, dotButton5, dotButton6,
+                dotButton1, dotButton2, dotButton3,
+                block = ::setAfter
+            )
+            Writing to false -> chainify(
+                dotButton4, dotButton1, dotButton5,
+                dotButton2, dotButton6, dotButton3,
+                block = ::setAfter
+            )
+            Reading to true -> chainify(
+                dotButton1, dotButton2, dotButton3,
+                dotButton4, dotButton5, dotButton6,
+                block = ::setAfter
+            )
+            Reading to false -> chainify(
+                dotButton1, dotButton4, dotButton2,
+                dotButton5, dotButton3, dotButton6,
+                block = ::setAfter
+            )
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    private fun setBackgroundMode(mode: BrailleDotsViewMode) {
+        background = when (mode) {
+            Writing -> context.getDrawable(R.drawable.right_border)
+            Reading -> context.getDrawable(R.drawable.left_border)
         }
     }
 }
 
 val BrailleDotsView.dotsState: BrailleDotsState
     get() = BrailleDotsState(
-        arrayOf(
-            dotButton1, dotButton2, dotButton3,
-            dotButton4, dotButton5, dotButton6
-        )
+        when (mode) {
+            Writing -> listOf(
+                dotButton4, dotButton5, dotButton6,
+                dotButton1, dotButton2, dotButton3
+            )
+            Reading -> listOf(
+                dotButton1, dotButton2, dotButton3,
+                dotButton4, dotButton5, dotButton6
+            )
+        }
     )
 
-class BrailleDotsState(val checkBoxes: Array<CheckBox>)
+class BrailleDotsState(val checkBoxes: List<CheckBox>)
 
 val BrailleDotsState.spelling: String
     get() = brailleDots.spelling
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
index 72aa33d4..4dd35939 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
@@ -108,13 +108,19 @@ fun Fragment.applyExtendedAccessibility(
     rightMiddleButton: Button? = null,
     textView: TextView? = null
 ) {
-    val width = resources.getDimension(R.dimen.side_buttons_extended_width).toInt()
     forEach(
         leftButton,
         rightButton,
         leftMiddleButton,
         rightMiddleButton
-    ) { it?.setSize(width = width) }
+    ) {
+        it?.setSize(
+            width = resources
+                .getDimension(R.dimen.side_buttons_extended_width)
+                .toInt()
+        )
+    }
+
     textView?.setTextSize(
         TypedValue.COMPLEX_UNIT_SP,
         contextNotNull.extendedTextSize
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
index 1df93910..ce0a3003 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Kotlin.kt
@@ -15,12 +15,20 @@ inline fun <T> T?.side(block: (T) -> Unit) {
 inline fun <T> forEach(vararg xs: T, block: (T) -> Unit) = xs.forEach(block)
 inline fun <T> applyForEach(vararg xs: T, block: T.() -> Unit) = xs.forEach { it.block() }
 
+inline fun <T> chainify(vararg xs: T, block: (T, T) -> Unit) =
+    xs
+        .toList()
+        .windowed(size = 2) { it.first() to it.last() }
+        .forEach { (a, b) -> block(a, b) }
+
 /**
  * Try to use sealed classes to avoid using `unreachable`.
  */
 val unreachable: Nothing
     get() = error("Unreachable code executed")
 
+val Any?.devnull: Unit get() {}
+
 operator fun MatchGroupCollection.component1() = get(0)
 operator fun MatchGroupCollection.component2() = get(1)
 operator fun MatchGroupCollection.component3() = get(2)
@@ -36,8 +44,6 @@ operator fun <A, B> Pair<A, B>.compareTo(other: Pair<A, B>): Int
         else -> 1
     }
 
-val Any?.devnull: Unit get() {}
-
 fun String.removeHtmlMarkup() = Regex("""<[^>]*>|&""").replace(this, "")
 
 inline fun runIf(cond: Boolean, block: () -> Unit) {
diff --git a/app/src/main/res/layout/braille_dots_view.xml b/app/src/main/res/layout/braille_dots_view.xml
index 249e7f55..1535a5e8 100644
--- a/app/src/main/res/layout/braille_dots_view.xml
+++ b/app/src/main/res/layout/braille_dots_view.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/constraintLayoutButtons"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/left_border">
+    tools:background="@drawable/left_border">
 
     <com.github.braillesystems.learnbraille.ui.views.BrailleDotView
         android:id="@+id/dotButton1"
diff --git a/app/src/main/res/layout/fragment_marker_view.xml b/app/src/main/res/layout/fragment_marker_view.xml
index 2697dfea..7e7b520b 100644
--- a/app/src/main/res/layout/fragment_marker_view.xml
+++ b/app/src/main/res/layout/fragment_marker_view.xml
@@ -32,5 +32,18 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="@dimen/practice_dots_vertical_bias" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/flip_button"
+            style="@style/sideIconButtons"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_height"
+            android:contentDescription="@string/flip_card"
+            app:icon="@drawable/ic_flip_white_24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="@dimen/practice_buttons_vertical_bias"
+            app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fc6998af..aaf3598d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,6 +22,7 @@
     <string name="preference_practice_use_only_known_materials">practice_use_only_known_materials</string>
     <string name="preference_extended_accessibility">extended_accessibility</string>
     <string name="preference_additional_qrcode_button_enabled">additional_qrcode_button_enabled</string>
+    <string name="preferences_is_write_mode_first">is_write_mode_first</string>
 
     <string name="input_correct">Правильно!</string>
     <string name="input_incorrect">Неправильно!</string>
@@ -493,6 +494,12 @@
     <string name="preference_summary_additional_qrcode_button">
         Отображать в главном меню кнопку \"QR-код\" для игры с карточками Брайля.
     </string>
+    <!--    TODO-->
+    <string name="preference_title_is_write_mode_first">
+        Точки как для письма по умолчанию
+    </string>
+    <!--    TODO-->
+    <string name="preference_summary_is_write_mode_forst">TODO</string>
 
     <!--    Stats-->
 
diff --git a/app/src/main/res/xml/settings_hierarchy.xml b/app/src/main/res/xml/settings_hierarchy.xml
index cd03ee29..d616b703 100644
--- a/app/src/main/res/xml/settings_hierarchy.xml
+++ b/app/src/main/res/xml/settings_hierarchy.xml
@@ -65,6 +65,14 @@
         android:title="@string/preference_title_notifications"
         app:iconSpaceReserved="false" />
 
+    <androidx.preference.SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:key="@string/preferences_is_write_mode_first"
+        android:summary="@string/preference_summary_is_write_mode_forst"
+        android:theme="@style/SwitchPreferenceButton"
+        android:title="@string/preference_title_is_write_mode_first"
+        app:iconSpaceReserved="false" />
+
     <androidx.preference.SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="@string/preference_traverse_dots_in_enumeration_order"
diff --git a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
index 8171b980..dd569e42 100644
--- a/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
+++ b/app/src/test/java/com/github/braillesystems/learnbraille/utils/_KotlinTest.kt
@@ -6,6 +6,30 @@ import org.junit.Test
 
 class _KotlinTest {
 
+    @Test
+    fun chainifyTest() {
+        run {
+            val ans = mutableListOf<Pair<Int, Int>>()
+            chainify<Int> { a, b -> ans += a to b }
+            assertEquals(listOf<Pair<Int, Int>>(), ans)
+        }
+        run {
+            val ans = mutableListOf<Pair<Int, Int>>()
+            chainify(1) { a, b -> ans += a to b }
+            assertEquals(listOf<Pair<Int, Int>>(), ans)
+        }
+        run {
+            val ans = mutableListOf<Pair<Int, Int>>()
+            chainify(1, 2) { a, b -> ans += a to b }
+            assertEquals(listOf(1 to 2), ans)
+        }
+        run {
+            val ans = mutableListOf<Pair<Int, Int>>()
+            chainify(1, 2, 3) { a, b -> ans += a * 10 to b * 100 }
+            assertEquals(listOf(10 to 200, 20 to 300), ans)
+        }
+    }
+
     @Test
     fun pairCompareTo() {
         assertTrue((0 to 0) == (0 to 0))

From af6db138cf96e776c3af4daa5d2835b383c2529b Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sun, 27 Sep 2020 17:41:25 +0300
Subject: [PATCH 098/117] Remove theory repository test template

---
 .../data/repository/TheoryRepositoryTest.kt        | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepositoryTest.kt

diff --git a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepositoryTest.kt b/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepositoryTest.kt
deleted file mode 100644
index 0a69983e..00000000
--- a/app/src/androidTest/java/com/github/braillesystems/learnbraille/data/repository/TheoryRepositoryTest.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.github.braillesystems.learnbraille.data.repository
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class TheoryRepositoryTest {
-
-    @Test
-    fun theoryRepo() {
-        // TODO
-    }
-}

From a5031f9847c9c4e57aa356d570267adea145ed9c Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sun, 27 Sep 2020 17:42:27 +0300
Subject: [PATCH 099/117] Reformat

---
 .../ui/screens/theory/steps/show/ShowMarkerFragment.kt          | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
index d56361ca..d7e7025d 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
-import androidx.core.text.parseAsHtml
 import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
@@ -18,7 +17,6 @@ import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.getValue
-import com.github.braillesystems.learnbraille.utils.removeHtmlMarkup
 
 class ShowMarkerFragment : AbstractStepFragment(R.string.lessons_help_show_marker) {
 

From cc4a8e34df29152f72b6fee3bc80f4dba8f1e5e7 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sun, 27 Sep 2020 18:11:49 +0300
Subject: [PATCH 100/117] Display in browser always in reading mode by default

---
 .../learnbraille/ui/screens/browser/MarkerViewFragment.kt      | 3 +++
 .../learnbraille/ui/screens/browser/SymbolViewFragment.kt      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
index c1388bd6..db861386 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
@@ -11,6 +11,7 @@ import com.github.braillesystems.learnbraille.data.repository.PreferenceReposito
 import com.github.braillesystems.learnbraille.databinding.FragmentMarkerViewBinding
 import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.applyExtendedAccessibility
@@ -40,6 +41,8 @@ class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view
         require(m.data is MarkerSymbol)
 
         infoTextView.text = showMarkerPrintRules.getValue(m.data.type)
+        
+        brailleDots.mode = BrailleDotsViewMode.Reading
         brailleDots.dotsState.display(m.data.brailleDots)
         flipButton.setOnClickListener {
             brailleDots.reflect().display(m.data.brailleDots)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
index 6a89f867..59938c31 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
@@ -11,6 +11,7 @@ import com.github.braillesystems.learnbraille.data.repository.PreferenceReposito
 import com.github.braillesystems.learnbraille.databinding.FragmentSymbolViewBinding
 import com.github.braillesystems.learnbraille.res.captionRules
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.applyExtendedAccessibility
@@ -41,6 +42,8 @@ class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view
 
         letter.letter = m.data.char
         letterCaption.text = captionRules.getValue(m.data)
+
+        brailleDots.mode = BrailleDotsViewMode.Reading
         brailleDots.dotsState.display(m.data.brailleDots)
         flipButton.setOnClickListener {
             brailleDots.reflect().display(m.data.brailleDots)

From e30668c151b112e56388ccadc5984cb067eeca0e Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sun, 27 Sep 2020 22:11:38 +0300
Subject: [PATCH 101/117] Add flip to the steps (#223)

---
 .../learnbraille/LearnBrailleApplication.kt        |  4 ++--
 .../learnbraille/data/dsl/Courses.kt               |  9 +--------
 .../learnbraille/data/entities/StepData.kt         |  2 ++
 .../ui/screens/browser/MarkerViewFragment.kt       |  2 +-
 .../screens/theory/steps/AbstractStepFragment.kt   |  2 ++
 .../steps/input/AbstractInputStepFragment.kt       |  9 +++++++++
 .../theory/steps/input/InputDotsFragment.kt        |  8 ++++++--
 .../theory/steps/input/InputMarkerFragment.kt      |  2 ++
 .../theory/steps/input/InputSymbolFragment.kt      |  2 ++
 .../screens/theory/steps/show/ShowDotsFragment.kt  | 13 +++++++++++--
 .../theory/steps/show/ShowMarkerFragment.kt        |  6 ++++++
 .../theory/steps/show/ShowSymbolFragment.kt        |  6 ++++++
 .../res/layout/fragment_lessons_input_dots.xml     | 14 ++++++++++++++
 .../res/layout/fragment_lessons_input_marker.xml   | 14 ++++++++++++++
 .../res/layout/fragment_lessons_input_symbol.xml   | 14 ++++++++++++++
 .../main/res/layout/fragment_lessons_show_dots.xml | 14 ++++++++++++++
 .../res/layout/fragment_lessons_show_marker.xml    | 14 ++++++++++++++
 .../res/layout/fragment_lessons_show_symbol.xml    | 14 ++++++++++++++
 app/src/main/res/values/strings.xml                |  3 +++
 19 files changed, 137 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
index eb584dbc..596d7fbb 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
@@ -2,7 +2,7 @@ package com.github.braillesystems.learnbraille
 
 import android.app.Application
 import com.github.braillesystems.learnbraille.data.db.LearnBrailleDatabase
-import com.github.braillesystems.learnbraille.data.dsl.UsersCourse
+import com.github.braillesystems.learnbraille.data.dsl.DevelopersCourse
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.data.repository.*
 import com.github.braillesystems.learnbraille.ui.screens.practice.CardViewModelFactory
@@ -119,4 +119,4 @@ class LearnBrailleApplication : Application() {
 lateinit var koin: Koin
     private set
 
-val COURSE = UsersCourse(2)
+val COURSE = DevelopersCourse
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Courses.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Courses.kt
index 93720eb4..fed42911 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Courses.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/dsl/Courses.kt
@@ -9,14 +9,7 @@ import com.github.braillesystems.learnbraille.utils.side
 sealed class CourseID(val id: DBid)
 
 object DevelopersCourse : CourseID(1)
-
-class UsersCourse(id: DBid) : CourseID(id) {
-    init {
-        require(id > 1) {
-            "id == 1 stands for developers course"
-        }
-    }
-}
+object UsersCourse : CourseID(2)
 
 @DataBuilderMarker
 class CoursesBuilder(block: CoursesBuilder.() -> Unit) {
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt
index 6ca07ef8..ede280b8 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/entities/StepData.kt
@@ -76,6 +76,7 @@ sealed class BaseInput : StepData() {
 data class Input(
     val material: Material
 ) : BaseInput() {
+
     override val brailleDots: BrailleDots
         get() = when (material.data) {
             is OneBrailleSymbol -> material.data.brailleDots
@@ -108,6 +109,7 @@ sealed class BaseShow : StepData() {
 data class Show(
     val material: Material
 ) : BaseShow() {
+
     override val brailleDots: BrailleDots
         get() = when (material.data) {
             is OneBrailleSymbol -> material.data.brailleDots
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
index db861386..96921ed4 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
@@ -41,7 +41,7 @@ class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view
         require(m.data is MarkerSymbol)
 
         infoTextView.text = showMarkerPrintRules.getValue(m.data.type)
-        
+
         brailleDots.mode = BrailleDotsViewMode.Reading
         brailleDots.dotsState.display(m.data.brailleDots)
         flipButton.setOnClickListener {
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt
index dceb5ef1..020e434b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt
@@ -27,6 +27,7 @@ interface StepBinding {
     val prevButton: Button? get() = null
     val nextButton: Button? get() = null
     val hintButton: Button? get() = null
+    val flipButton: Button? get() = null
     val textView: TextView? get() = null
     val brailleDots: BrailleDotsView? get() = null
 }
@@ -77,6 +78,7 @@ abstract class AbstractStepFragment(helpMsgId: HelpMsgId) : AbstractFragmentWith
                     leftButton = prevButton,
                     rightButton = nextButton,
                     leftMiddleButton = hintButton,
+                    rightMiddleButton = flipButton,
                     textView = textView
                 )
             }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
index 30d13921..042f6408 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
@@ -52,6 +52,15 @@ abstract class AbstractInputStepFragment(helpMsgId: HelpMsgId) : AbstractStepFra
 
             val buzzer: Vibrator? = activity?.getSystemService()
 
+            stepBinding.flipButton?.setOnClickListener {
+                dotsState = stepBinding.brailleDots?.reflect()?.apply {
+                    subscribe(View.OnClickListener {
+                        viewModel.onSoftCheck()
+                        userTouchedDots = true
+                    })
+                } ?: error("Step with flip button should have brailleDots too")
+            }
+
             viewModel.observeCheckedOnFly(
                 viewLifecycleOwner, { dotsState }, buzzer,
                 block = { toNextStep(step, markThisAsPassed = true) },
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputDotsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputDotsFragment.kt
index ce0e3990..a6cb2a97 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputDotsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputDotsFragment.kt
@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
+import androidx.core.text.parseAsHtml
 import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.InputDots
@@ -13,6 +14,7 @@ import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputDo
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
 import com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
+import com.github.braillesystems.learnbraille.utils.removeHtmlMarkup
 
 class InputDotsFragment : AbstractInputStepFragment(R.string.lessons_help_input_dots) {
 
@@ -31,6 +33,8 @@ class InputDotsFragment : AbstractInputStepFragment(R.string.lessons_help_input_
             object : StepBinding {
                 override val prevButton: Button? = this@init.prevButton
                 override val nextButton: Button? = this@init.nextButton
+                override val flipButton: Button? = this@init.flipButton
+                override val hintButton: Button? = this@init.hintButton
                 override val textView: TextView? = this@init.infoTextView
                 override val brailleDots: BrailleDotsView? = this@init.brailleDots
             }
@@ -41,8 +45,8 @@ class InputDotsFragment : AbstractInputStepFragment(R.string.lessons_help_input_
         require(data is InputDots)
         val text = data.text
             ?: getString(R.string.lessons_show_dots_info_template).format(data.brailleDots.spelling)
-        infoTextView.text = text
-        checkedAnnounce(text)
+        infoTextView.text = text.parseAsHtml()
+        checkedAnnounce(text.removeHtmlMarkup())
 
         inputViewModel = viewModel
         lifecycleOwner = this@InputDotsFragment
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputMarkerFragment.kt
index 095098e5..c9806fb6 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputMarkerFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputMarkerFragment.kt
@@ -33,6 +33,8 @@ class InputMarkerFragment : AbstractInputStepFragment(R.string.lessons_help_inpu
             object : StepBinding {
                 override val prevButton: Button? = this@init.prevButton
                 override val nextButton: Button? = this@init.nextButton
+                override val flipButton: Button? = this@init.flipButton
+                override val hintButton: Button? = this@init.hintButton
                 override val textView: TextView? = this@init.infoTextView
                 override val brailleDots: BrailleDotsView? = this@init.brailleDots
             }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputSymbolFragment.kt
index 0c771c20..a64aa9d3 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputSymbolFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputSymbolFragment.kt
@@ -35,6 +35,8 @@ class InputSymbolFragment : AbstractInputStepFragment(R.string.lessons_help_inpu
             object : StepBinding {
                 override val prevButton: Button? = this@init.prevButton
                 override val nextButton: Button? = this@init.nextButton
+                override val flipButton: Button? = this@init.flipButton
+                override val hintButton: Button? = this@init.hintButton
                 override val brailleDots: BrailleDotsView? = this@init.brailleDots
             }
         }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt
index e07f5545..20e6f5cb 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt
@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
+import androidx.core.text.parseAsHtml
 import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.ShowDots
@@ -12,9 +13,11 @@ import com.github.braillesystems.learnbraille.data.entities.spelling
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsShowDotsBinding
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
+import com.github.braillesystems.learnbraille.utils.removeHtmlMarkup
 
 class ShowDotsFragment : AbstractStepFragment(R.string.lessons_help_show_dots) {
 
@@ -33,6 +36,7 @@ class ShowDotsFragment : AbstractStepFragment(R.string.lessons_help_show_dots) {
             object : StepBinding {
                 override val prevButton: Button? = this@init.prevButton
                 override val nextButton: Button? = this@init.nextButton
+                override val flipButton: Button? = this@init.flipButton
                 override val textView: TextView? = this@init.infoTextView
             }
         }
@@ -43,9 +47,14 @@ class ShowDotsFragment : AbstractStepFragment(R.string.lessons_help_show_dots) {
 
         val text = data.text
             ?: getString(R.string.lessons_show_dots_info_template).format(data.brailleDots.spelling)
-        infoTextView.text = text
-        checkedAnnounce(text)
+        infoTextView.text = text.parseAsHtml()
+        checkedAnnounce(text.removeHtmlMarkup())
+
+        brailleDots.mode = BrailleDotsViewMode.Writing
         brailleDots.dotsState.display(data.brailleDots)
+        flipButton.setOnClickListener {
+            brailleDots.reflect().display(data.brailleDots)
+        }
 
     }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
index d7e7025d..378ab1f0 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
@@ -13,6 +13,7 @@ import com.github.braillesystems.learnbraille.databinding.FragmentLessonsShowMar
 import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
@@ -35,6 +36,7 @@ class ShowMarkerFragment : AbstractStepFragment(R.string.lessons_help_show_marke
             object : StepBinding {
                 override val prevButton: Button? = this@init.prevButton
                 override val nextButton: Button? = this@init.nextButton
+                override val flipButton: Button? = this@init.flipButton
                 override val textView: TextView? = this@init.infoTextView
             }
         }
@@ -48,7 +50,11 @@ class ShowMarkerFragment : AbstractStepFragment(R.string.lessons_help_show_marke
         val text = showMarkerPrintRules.getValue(data.type)
         infoTextView.text = text
         checkedAnnounce(text)
+        brailleDots.mode = BrailleDotsViewMode.Writing
         brailleDots.dotsState.display(data.brailleDots)
+        flipButton.setOnClickListener {
+            brailleDots.reflect().display(data.brailleDots)
+        }
 
     }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt
index 2fd90fc1..fe39a9c2 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt
@@ -13,6 +13,7 @@ import com.github.braillesystems.learnbraille.res.captionRules
 import com.github.braillesystems.learnbraille.res.showSymbolPrintRules
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
@@ -35,6 +36,7 @@ class ShowSymbolFragment : AbstractStepFragment(R.string.lessons_help_show_symbo
             object : StepBinding {
                 override val prevButton: Button? = this@init.prevButton
                 override val nextButton: Button? = this@init.nextButton
+                override val flipButton: Button? = this@init.flipButton
             }
         }
     ).apply {
@@ -47,7 +49,11 @@ class ShowSymbolFragment : AbstractStepFragment(R.string.lessons_help_show_symbo
         letter.letter = data.char
         letterCaption.text = captionRules.getValue(data)
         checkedAnnounce(showSymbolPrintRules.getValue(data.char))
+        brailleDots.mode = BrailleDotsViewMode.Writing
         brailleDots.dotsState.display(data.brailleDots)
+        flipButton.setOnClickListener {
+            brailleDots.reflect().display(data.brailleDots)
+        }
 
     }.root
 }
diff --git a/app/src/main/res/layout/fragment_lessons_input_dots.xml b/app/src/main/res/layout/fragment_lessons_input_dots.xml
index 86c47e5a..464140f4 100644
--- a/app/src/main/res/layout/fragment_lessons_input_dots.xml
+++ b/app/src/main/res/layout/fragment_lessons_input_dots.xml
@@ -59,6 +59,20 @@
             app:shapeAppearanceOverlay="@style/sideLeftButtonsShape"
             tools:ignore="SpUsage" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/flip_button"
+            style="@style/sideIconButtons"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_small_height"
+            android:contentDescription="@string/flip_card"
+            app:backgroundTint="@color/colorSecondary"
+            app:icon="@drawable/ic_flip_white_24dp"
+            app:layout_constraintBottom_toTopOf="@+id/next_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0"
+            app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/prev_button"
             style="@style/sideIconButtons"
diff --git a/app/src/main/res/layout/fragment_lessons_input_marker.xml b/app/src/main/res/layout/fragment_lessons_input_marker.xml
index 86c47e5a..464140f4 100644
--- a/app/src/main/res/layout/fragment_lessons_input_marker.xml
+++ b/app/src/main/res/layout/fragment_lessons_input_marker.xml
@@ -59,6 +59,20 @@
             app:shapeAppearanceOverlay="@style/sideLeftButtonsShape"
             tools:ignore="SpUsage" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/flip_button"
+            style="@style/sideIconButtons"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_small_height"
+            android:contentDescription="@string/flip_card"
+            app:backgroundTint="@color/colorSecondary"
+            app:icon="@drawable/ic_flip_white_24dp"
+            app:layout_constraintBottom_toTopOf="@+id/next_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0"
+            app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/prev_button"
             style="@style/sideIconButtons"
diff --git a/app/src/main/res/layout/fragment_lessons_input_symbol.xml b/app/src/main/res/layout/fragment_lessons_input_symbol.xml
index 4836b1c5..1c120c4a 100644
--- a/app/src/main/res/layout/fragment_lessons_input_symbol.xml
+++ b/app/src/main/res/layout/fragment_lessons_input_symbol.xml
@@ -62,6 +62,20 @@
             app:shapeAppearanceOverlay="@style/sideLeftButtonsShape"
             tools:ignore="SpUsage" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/flip_button"
+            style="@style/sideIconButtons"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_small_height"
+            android:contentDescription="@string/flip_card"
+            app:backgroundTint="@color/colorSecondary"
+            app:icon="@drawable/ic_flip_white_24dp"
+            app:layout_constraintBottom_toTopOf="@+id/next_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0"
+            app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/prev_button"
             style="@style/sideIconButtons"
diff --git a/app/src/main/res/layout/fragment_lessons_show_dots.xml b/app/src/main/res/layout/fragment_lessons_show_dots.xml
index da0af3fe..fe99f147 100644
--- a/app/src/main/res/layout/fragment_lessons_show_dots.xml
+++ b/app/src/main/res/layout/fragment_lessons_show_dots.xml
@@ -34,6 +34,20 @@
 
         <!--        Buttons-->
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/flip_button"
+            style="@style/sideIconButtons"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_small_height"
+            android:contentDescription="@string/flip_card"
+            app:backgroundTint="@color/colorSecondary"
+            app:icon="@drawable/ic_flip_white_24dp"
+            app:layout_constraintBottom_toTopOf="@+id/next_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0"
+            app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/prev_button"
             style="@style/sideIconButtons"
diff --git a/app/src/main/res/layout/fragment_lessons_show_marker.xml b/app/src/main/res/layout/fragment_lessons_show_marker.xml
index da0af3fe..fe99f147 100644
--- a/app/src/main/res/layout/fragment_lessons_show_marker.xml
+++ b/app/src/main/res/layout/fragment_lessons_show_marker.xml
@@ -34,6 +34,20 @@
 
         <!--        Buttons-->
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/flip_button"
+            style="@style/sideIconButtons"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_small_height"
+            android:contentDescription="@string/flip_card"
+            app:backgroundTint="@color/colorSecondary"
+            app:icon="@drawable/ic_flip_white_24dp"
+            app:layout_constraintBottom_toTopOf="@+id/next_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0"
+            app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/prev_button"
             style="@style/sideIconButtons"
diff --git a/app/src/main/res/layout/fragment_lessons_show_symbol.xml b/app/src/main/res/layout/fragment_lessons_show_symbol.xml
index 9a1c4cde..05e0cf4c 100644
--- a/app/src/main/res/layout/fragment_lessons_show_symbol.xml
+++ b/app/src/main/res/layout/fragment_lessons_show_symbol.xml
@@ -37,6 +37,20 @@
 
         <!--        Buttons-->
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/flip_button"
+            style="@style/sideIconButtons"
+            android:layout_width="@dimen/side_buttons_width"
+            android:layout_height="@dimen/practice_buttons_small_height"
+            android:contentDescription="@string/flip_card"
+            app:backgroundTint="@color/colorSecondary"
+            app:icon="@drawable/ic_flip_white_24dp"
+            app:layout_constraintBottom_toTopOf="@+id/next_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0"
+            app:shapeAppearanceOverlay="@style/sideRightButtonsShape" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/prev_button"
             style="@style/sideIconButtons"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aaf3598d..9b748bc1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,6 +2,8 @@
     <!--    Note: "double quotes" make TalkBack emphasize a text between them-->
     <!--    & delimiter splits talkback sections in the help-->
 
+    <!--    TODO write about flip button to help-->
+
     <!--    App common-->
 
     <string name="app_name">Learn Braille</string>
@@ -523,5 +525,6 @@
     <string name="stats_property_input_steps_passed">Пройдено шагов с вводом</string>
     <string name="stats_section_7days">За последние 7 дней</string>
     <string name="stats_section_30days">За последние 30 дней</string>
+    <!--    TODO too long description-->
     <string name="flip_card">Режим как для письма (точки 123 слева) или как для чтения (точки 123 справа)</string>
 </resources>

From 6f668fe855df02cd7ff2bcafc61dc23fbaa6d7d7 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Mon, 28 Sep 2020 04:14:12 +0300
Subject: [PATCH 102/117] Add AbstractStep and fix dots traversal order

---
 .../learnbraille/ui/Messages.kt               |  11 ++
 .../ui/screens/AbstractFragment.kt            |  72 ++++++++++++
 .../ui/screens/AbstractFragmentWithHelp.kt    |  10 +-
 .../ui/screens/browser/BrowserFragment.kt     |   2 -
 .../ui/screens/browser/MarkerViewFragment.kt  |  34 +++---
 .../ui/screens/browser/SymbolViewFragment.kt  |  27 +++--
 .../ui/screens/exit/ExitFragment.kt           |   6 +-
 .../ui/screens/help/HelpFragment.kt           |   9 +-
 .../ui/screens/menu/MenuFragment.kt           |   5 +-
 .../ui/screens/practice/CardFragment.kt       |  36 +++---
 .../ui/screens/practice/DecksListFragment.kt  |  11 +-
 .../ui/screens/settings/SettingsFragment.kt   |   2 -
 .../ui/screens/stats/StatsFragment.kt         |   6 +-
 .../theory/lessons/LessonsListFragment.kt     |   7 +-
 .../theory/steps/AbstractStepFragment.kt      |  51 ++++----
 .../steps/info/AbstractInfoStepFragment.kt    |  16 +--
 .../theory/steps/info/FirstInfoFragment.kt    |  15 ++-
 .../screens/theory/steps/info/InfoFragment.kt |  17 ++-
 .../theory/steps/info/LastInfoFragment.kt     |  15 ++-
 .../steps/input/AbstractInputStepFragment.kt  | 111 +++++++++---------
 .../theory/steps/input/InputDotsFragment.kt   |  31 +++--
 .../theory/steps/input/InputMarkerFragment.kt |  31 +++--
 .../theory/steps/input/InputSymbolFragment.kt |  29 +++--
 .../steps/show/AbstractShowStepFragment.kt    |  20 ++++
 .../theory/steps/show/ShowDotsFragment.kt     |  33 ++----
 .../theory/steps/show/ShowMarkerFragment.kt   |  31 ++---
 .../theory/steps/show/ShowSymbolFragment.kt   |  33 +++---
 .../learnbraille/ui/views/BrailleDotsView.kt  |  95 ++++++++-------
 .../learnbraille/utils/Utils.kt               |  29 -----
 29 files changed, 423 insertions(+), 372 deletions(-)
 create mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/AbstractFragment.kt
 create mode 100644 app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/AbstractShowStepFragment.kt

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt
index eea7352d..84d62bee 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt
@@ -6,6 +6,8 @@ import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.*
 import com.github.braillesystems.learnbraille.res.inputMarkerPrintRules
 import com.github.braillesystems.learnbraille.res.inputSymbolPrintRules
+import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
+import com.github.braillesystems.learnbraille.res.showSymbolPrintRules
 import com.github.braillesystems.learnbraille.utils.*
 
 fun Fragment.showCorrectToast() = toast(getString(R.string.input_correct))
@@ -45,3 +47,12 @@ fun Context.inputPrint(data: MaterialData): String =
 
 fun Fragment.inputPrint(data: MaterialData): String =
     contextNotNull.inputPrint(data)
+
+fun Context.showPrint(data: MaterialData): String =
+    when (data) {
+        is Symbol -> showSymbolPrintRules.getValue(data.char)
+        is MarkerSymbol -> showMarkerPrintRules.getValue(data.type)
+    }
+
+fun Fragment.showPrint(data: MaterialData): String =
+    contextNotNull.showPrint(data)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/AbstractFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/AbstractFragment.kt
new file mode 100644
index 00000000..5bec4604
--- /dev/null
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/AbstractFragment.kt
@@ -0,0 +1,72 @@
+package com.github.braillesystems.learnbraille.ui.screens
+
+import android.util.TypedValue
+import android.view.View
+import android.widget.Button
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import com.github.braillesystems.learnbraille.R
+import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
+import com.github.braillesystems.learnbraille.utils.contextNotNull
+import com.github.braillesystems.learnbraille.utils.extendedTextSize
+import com.github.braillesystems.learnbraille.utils.forEach
+import com.github.braillesystems.learnbraille.utils.setSize
+import org.koin.android.ext.android.inject
+
+data class BrailleDotsInfo(
+    val view: BrailleDotsView,
+    val mode: BrailleDotsViewMode,
+    val prev: View,
+    val next: View
+)
+
+interface FragmentBinding {
+    val leftButton: Button? get() = null
+    val rightButton: Button? get() = null
+    val leftMiddleButton: Button? get() = null
+    val rightMiddleButton: Button? get() = null
+    val textView: TextView? get() = null
+    val brailleDotsInfo: BrailleDotsInfo? get() = null
+}
+
+abstract class AbstractFragment : Fragment() {
+
+    protected var binding: FragmentBinding = object : FragmentBinding {}
+    protected val preferenceRepository: PreferenceRepository by inject()
+
+    protected fun <B> B.ini(
+        getBinding: B.() -> FragmentBinding = {
+            object : FragmentBinding {}
+        }
+    ) = this.apply {
+        binding = getBinding().apply {
+            brailleDotsInfo?.let { (view, mode, prev, next) ->
+                view.setMode(mode, prev, next)
+            }
+            if (preferenceRepository.extendedAccessibilityEnabled) {
+                forEach(
+                    leftButton,
+                    rightButton,
+                    leftMiddleButton,
+                    rightMiddleButton
+                ) {
+                    it?.setSize(
+                        width = resources
+                            .getDimension(R.dimen.side_buttons_extended_width)
+                            .toInt()
+                    )
+                }
+                textView?.setTextSize(
+                    TypedValue.COMPLEX_UNIT_SP,
+                    contextNotNull.extendedTextSize
+                )
+            }
+        }
+
+        iniHelper()
+    }
+
+    protected open fun iniHelper() = Unit
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/AbstractFragmentWithHelp.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/AbstractFragmentWithHelp.kt
index 73bd6254..d7e6fcfc 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/AbstractFragmentWithHelp.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/AbstractFragmentWithHelp.kt
@@ -3,7 +3,6 @@ package com.github.braillesystems.learnbraille.ui.screens
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
-import androidx.fragment.app.Fragment
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.ui.screens.help.HelpFragmentDirections
 import com.github.braillesystems.learnbraille.utils.navigate
@@ -11,10 +10,11 @@ import timber.log.Timber
 
 typealias HelpMsgId = Int
 
-/**
- * Do not forget to add in onCreate `setHasOptionsMenu(true)`
- */
-abstract class AbstractFragmentWithHelp(private val helpMsgId: HelpMsgId) : Fragment() {
+abstract class AbstractFragmentWithHelp(private val helpMsgId: HelpMsgId) : AbstractFragment() {
+
+    override fun iniHelper() {
+        setHasOptionsMenu(true)
+    }
 
     protected open val helpMsg: String
         get() = getString(helpMsgId)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
index dc769d42..1d05185c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
@@ -20,7 +20,6 @@ import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHel
 import com.github.braillesystems.learnbraille.utils.getValue
 import com.github.braillesystems.learnbraille.utils.navigate
 import com.github.braillesystems.learnbraille.utils.stringify
-import com.github.braillesystems.learnbraille.utils.title
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 
@@ -39,7 +38,6 @@ class BrowserFragment : AbstractFragmentWithHelp(R.string.browser_help) {
         false
     ).also { binding ->
 
-        title = getString(R.string.browser_title)
         setHasOptionsMenu(true)
 
         lifecycleScope.launch {
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
index 96921ed4..021782b8 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
@@ -3,27 +3,27 @@ package com.github.braillesystems.learnbraille.ui.screens.browser
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
 import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
 import com.github.braillesystems.learnbraille.data.entities.Material
-import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.databinding.FragmentMarkerViewBinding
 import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
+import com.github.braillesystems.learnbraille.ui.screens.BrailleDotsInfo
+import com.github.braillesystems.learnbraille.ui.screens.FragmentBinding
 import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
-import com.github.braillesystems.learnbraille.utils.applyExtendedAccessibility
+import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.getFragmentStringArg
 import com.github.braillesystems.learnbraille.utils.getValue
 import com.github.braillesystems.learnbraille.utils.parse
-import org.koin.android.ext.android.inject
 
 class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view_help) {
 
-    private val preferenceRepository: PreferenceRepository by inject()
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -33,27 +33,27 @@ class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view
         R.layout.fragment_marker_view,
         container,
         false
-    ).apply {
-
-        setHasOptionsMenu(true)
+    ).ini {
+        object : FragmentBinding {
+            override val textView: TextView? = this@ini.infoTextView
+            override val rightButton: Button? = this@ini.flipButton
+            override val brailleDotsInfo: BrailleDotsInfo? = this@ini.run {
+                BrailleDotsInfo(brailleDots, BrailleDotsViewMode.Reading, infoTextView, flipButton)
+            }
+        }
+    }.apply {
 
         val m: Material = parse(Material.serializer(), getFragmentStringArg("material"))
         require(m.data is MarkerSymbol)
 
-        infoTextView.text = showMarkerPrintRules.getValue(m.data.type)
+        val text = showMarkerPrintRules.getValue(m.data.type)
+        infoTextView.text = text
+        checkedAnnounce(text)
 
-        brailleDots.mode = BrailleDotsViewMode.Reading
         brailleDots.dotsState.display(m.data.brailleDots)
         flipButton.setOnClickListener {
             brailleDots.reflect().display(m.data.brailleDots)
         }
 
-        if (preferenceRepository.extendedAccessibilityEnabled) {
-            applyExtendedAccessibility(
-                textView = infoTextView,
-                rightMiddleButton = flipButton
-            )
-        }
-
     }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
index 59938c31..d648a72d 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
@@ -3,27 +3,27 @@ package com.github.braillesystems.learnbraille.ui.screens.browser
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.widget.Button
 import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.Material
 import com.github.braillesystems.learnbraille.data.entities.Symbol
-import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.databinding.FragmentSymbolViewBinding
 import com.github.braillesystems.learnbraille.res.captionRules
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
+import com.github.braillesystems.learnbraille.ui.screens.BrailleDotsInfo
+import com.github.braillesystems.learnbraille.ui.screens.FragmentBinding
+import com.github.braillesystems.learnbraille.ui.showPrint
 import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
-import com.github.braillesystems.learnbraille.utils.applyExtendedAccessibility
+import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.getFragmentStringArg
 import com.github.braillesystems.learnbraille.utils.getValue
 import com.github.braillesystems.learnbraille.utils.parse
-import org.koin.android.ext.android.inject
 
 class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view_help) {
 
-    private val preferenceRepository: PreferenceRepository by inject()
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -33,25 +33,26 @@ class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view
         R.layout.fragment_symbol_view,
         container,
         false
-    ).apply {
-
-        setHasOptionsMenu(true)
+    ).ini {
+        object : FragmentBinding {
+            override val rightButton: Button? = this@ini.flipButton
+            override val brailleDotsInfo: BrailleDotsInfo? = this@ini.run {
+                BrailleDotsInfo(brailleDots, BrailleDotsViewMode.Reading, letter, flipButton)
+            }
+        }
+    }.apply {
 
         val m: Material = parse(Material.serializer(), getFragmentStringArg("material"))
         require(m.data is Symbol)
 
         letter.letter = m.data.char
         letterCaption.text = captionRules.getValue(m.data)
+        checkedAnnounce(showPrint(m.data))
 
-        brailleDots.mode = BrailleDotsViewMode.Reading
         brailleDots.dotsState.display(m.data.brailleDots)
         flipButton.setOnClickListener {
             brailleDots.reflect().display(m.data.brailleDots)
         }
 
-        if (preferenceRepository.extendedAccessibilityEnabled) {
-            applyExtendedAccessibility(rightButton = flipButton)
-        }
-
     }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
index ff50e0bf..b1f80132 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
@@ -4,15 +4,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.Fragment
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.databinding.FragmentExitBinding
+import com.github.braillesystems.learnbraille.ui.screens.AbstractFragment
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.exitToLauncher
 import com.github.braillesystems.learnbraille.utils.navigate
 import com.github.braillesystems.learnbraille.utils.title
 
-class ExitFragment : Fragment() {
+class ExitFragment : AbstractFragment() {
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -23,7 +23,7 @@ class ExitFragment : Fragment() {
         R.layout.fragment_exit,
         container,
         false
-    ).apply {
+    ).ini().apply {
 
         title = getString(R.string.exit_question)
         checkedAnnounce(title)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/help/HelpFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/help/HelpFragment.kt
index cd5407f0..23eb22a9 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/help/HelpFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/help/HelpFragment.kt
@@ -4,15 +4,14 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.Fragment
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.databinding.FragmentHelpBinding
+import com.github.braillesystems.learnbraille.ui.screens.AbstractFragment
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.getFragmentStringArg
 import com.github.braillesystems.learnbraille.utils.removeHtmlMarkup
-import com.github.braillesystems.learnbraille.utils.title
 
-class HelpFragment : Fragment() {
+class HelpFragment : AbstractFragment() {
 
     private val helpMessageArgName = "help_message"
 
@@ -24,9 +23,7 @@ class HelpFragment : Fragment() {
         R.layout.fragment_help,
         container,
         false
-    ).apply {
-
-        title = getString(R.string.help_title)
+    ).ini().apply {
 
         val content = getFragmentStringArg(helpMessageArgName)
         helpView.setSeparatedText(content)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/menu/MenuFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/menu/MenuFragment.kt
index 20d1a088..5a9e2ae9 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/menu/MenuFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/menu/MenuFragment.kt
@@ -12,7 +12,6 @@ import androidx.databinding.DataBindingUtil
 import com.github.braillesystems.learnbraille.COURSE
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.db.LearnBrailleDatabase
-import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.databinding.FragmentMenuBinding
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
 import com.github.braillesystems.learnbraille.ui.screens.theory.toLastCourseStep
@@ -24,7 +23,6 @@ import timber.log.Timber
 class MenuFragment : AbstractFragmentWithHelp(R.string.menu_help) {
 
     private val db: LearnBrailleDatabase by inject()
-    private val preferenceRepository: PreferenceRepository by inject()
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -35,10 +33,9 @@ class MenuFragment : AbstractFragmentWithHelp(R.string.menu_help) {
         R.layout.fragment_menu,
         container,
         false
-    ).also { binding ->
+    ).ini().also { binding ->
 
         title = getString(R.string.menu_actionbar_text_template).format(appName)
-        setHasOptionsMenu(true)
 
         val buttons = mutableListOf<MaterialButton>()
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
index bdfd9ef3..f4fcd56f 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
@@ -3,6 +3,8 @@ package com.github.braillesystems.learnbraille.ui.screens.practice
 import android.os.Bundle
 import android.os.Vibrator
 import android.view.*
+import android.widget.Button
+import android.widget.TextView
 import androidx.core.content.getSystemService
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
@@ -10,7 +12,6 @@ import androidx.lifecycle.ViewModelProvider
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
 import com.github.braillesystems.learnbraille.data.entities.Symbol
-import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.databinding.FragmentCardBinding
 import com.github.braillesystems.learnbraille.res.captionRules
 import com.github.braillesystems.learnbraille.res.deckTagToName
@@ -22,10 +23,7 @@ import com.github.braillesystems.learnbraille.ui.screens.*
 import com.github.braillesystems.learnbraille.ui.showCorrectToast
 import com.github.braillesystems.learnbraille.ui.showHintToast
 import com.github.braillesystems.learnbraille.ui.showIncorrectToast
-import com.github.braillesystems.learnbraille.ui.views.BrailleDotsState
-import com.github.braillesystems.learnbraille.ui.views.brailleDots
-import com.github.braillesystems.learnbraille.ui.views.dotsState
-import com.github.braillesystems.learnbraille.ui.views.subscribe
+import com.github.braillesystems.learnbraille.ui.views.*
 import com.github.braillesystems.learnbraille.utils.*
 import org.koin.android.ext.android.inject
 import org.koin.core.parameter.parametersOf
@@ -33,8 +31,6 @@ import timber.log.Timber
 
 class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
 
-    private val preferenceRepository: PreferenceRepository by inject()
-
     // This value can change during ViewModel lifetime (ViewModelProvider does not call
     // ViewModelFactory each time onCreateView runs). And once created ViewModel
     // should be able to use up to date dotsState.
@@ -49,22 +45,28 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
         R.layout.fragment_card,
         container,
         false
-    ).also { binding ->
+    ).ini {
+        object : FragmentBinding {
+            override val leftButton: Button? = this@ini.hintButton
+            override val rightButton: Button? = this@ini.nextButton
+            override val rightMiddleButton: Button? = this@ini.flipButton
+            override val textView: TextView? = this@ini.markerDescription
+            override val brailleDotsInfo: BrailleDotsInfo? = this@ini.run {
+                BrailleDotsInfo(
+                    brailleDots,
+                    if (preferenceRepository.isWriteModeFirst) BrailleDotsViewMode.Writing
+                    else BrailleDotsViewMode.Reading,
+                    hintButton, flipButton
+                )
+            }
+        }
+    }.also { binding ->
 
         Timber.i("onCreateView")
 
         title = title()
         setHasOptionsMenu(true)
 
-        if (preferenceRepository.extendedAccessibilityEnabled) {
-            applyExtendedAccessibility(
-                leftButton = binding.hintButton,
-                rightButton = binding.nextButton,
-                rightMiddleButton = binding.flipButton,
-                textView = binding.markerDescription
-            )
-        }
-
         dotsState = binding.brailleDots.dotsState
 
         val viewModelFactory: CardViewModelFactory by inject {
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/DecksListFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/DecksListFragment.kt
index 5816d222..d48de23f 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/DecksListFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/DecksListFragment.kt
@@ -7,27 +7,24 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.repository.DeckWithAvailability
 import com.github.braillesystems.learnbraille.data.repository.MutablePracticeRepository
-import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.databinding.DecksListItemBinding
 import com.github.braillesystems.learnbraille.databinding.FragmentDecksListBinding
 import com.github.braillesystems.learnbraille.res.deckTagToName
+import com.github.braillesystems.learnbraille.ui.screens.AbstractFragment
 import com.github.braillesystems.learnbraille.utils.application
 import com.github.braillesystems.learnbraille.utils.checkedToast
 import com.github.braillesystems.learnbraille.utils.navigate
-import com.github.braillesystems.learnbraille.utils.title
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 
-class DecksListFragment : Fragment() {
+class DecksListFragment : AbstractFragment() {
 
     private val practiceRepository: MutablePracticeRepository by inject()
-    private val preferenceRepository: PreferenceRepository by inject()
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -38,9 +35,7 @@ class DecksListFragment : Fragment() {
         R.layout.fragment_decks_list,
         container,
         false
-    ).apply {
-
-        title = getString(R.string.decks_list_title)
+    ).ini().apply {
 
         lifecycleScope.launch {
             val decks = practiceRepository.allDecksWithAvailability()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/settings/SettingsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/settings/SettingsFragment.kt
index bae9cf45..c9a45232 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/settings/SettingsFragment.kt
@@ -2,12 +2,10 @@ package com.github.braillesystems.learnbraille.ui.screens.settings
 
 import android.os.Bundle
 import com.github.braillesystems.learnbraille.R
-import com.github.braillesystems.learnbraille.utils.title
 
 class SettingsFragment : androidx.preference.PreferenceFragmentCompat() {
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.settings_hierarchy, rootKey)
-        title = getString(R.string.preferences_actionbar_title)
     }
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
index 51e4a846..f404903e 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/stats/StatsFragment.kt
@@ -15,7 +15,6 @@ import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHel
 import com.github.braillesystems.learnbraille.utils.Days
 import com.github.braillesystems.learnbraille.utils.forEach
 import com.github.braillesystems.learnbraille.utils.scope
-import com.github.braillesystems.learnbraille.utils.title
 import kotlinx.android.synthetic.main.fragment_stats.*
 import kotlinx.android.synthetic.main.fragment_stats_table.view.*
 import kotlinx.coroutines.Job
@@ -36,10 +35,7 @@ class StatsFragment : AbstractFragmentWithHelp(R.string.stats_help) {
         R.layout.fragment_stats,
         container,
         false
-    ).also {
-
-        title = getString(R.string.stats_title)
-        setHasOptionsMenu(true)
+    ).ini().also {
 
         scope(job).launch {
             forEach(stats_week to 7, stats_month to 30) { (view, days) ->
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/lessons/LessonsListFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/lessons/LessonsListFragment.kt
index 2ea89c1b..37addef9 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/lessons/LessonsListFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/lessons/LessonsListFragment.kt
@@ -7,7 +7,6 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.github.braillesystems.learnbraille.COURSE
@@ -16,14 +15,14 @@ import com.github.braillesystems.learnbraille.data.entities.Lesson
 import com.github.braillesystems.learnbraille.data.repository.TheoryRepository
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsListBinding
 import com.github.braillesystems.learnbraille.databinding.LessonsListItemBinding
+import com.github.braillesystems.learnbraille.ui.screens.AbstractFragment
 import com.github.braillesystems.learnbraille.ui.screens.theory.toLastLessonStep
 import com.github.braillesystems.learnbraille.utils.application
 import com.github.braillesystems.learnbraille.utils.checkedToast
-import com.github.braillesystems.learnbraille.utils.title
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 
-class LessonsListFragment : Fragment() {
+class LessonsListFragment : AbstractFragment() {
 
     private val theoryRepository: TheoryRepository by inject()
 
@@ -39,8 +38,6 @@ class LessonsListFragment : Fragment() {
         false
     ).apply {
 
-        title = getString(R.string.lessons_title_lessons_list)
-
         lifecycleScope.launch {
             val curr = theoryRepository.currentStep(COURSE.id)
             val lessons = theoryRepository.allCourseLessons(COURSE.id)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt
index 020e434b..20e85375 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt
@@ -6,22 +6,19 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.widget.Button
 import android.widget.TextView
-import androidx.databinding.ViewDataBinding
 import com.github.braillesystems.learnbraille.COURSE
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.Step
-import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
+import com.github.braillesystems.learnbraille.ui.screens.BrailleDotsInfo
+import com.github.braillesystems.learnbraille.ui.screens.FragmentBinding
 import com.github.braillesystems.learnbraille.ui.screens.HelpMsgId
 import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
 import com.github.braillesystems.learnbraille.ui.screens.theory.toCurrentStep
 import com.github.braillesystems.learnbraille.ui.screens.theory.toNextStep
 import com.github.braillesystems.learnbraille.ui.screens.theory.toPrevStep
-import com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
-import com.github.braillesystems.learnbraille.utils.applyExtendedAccessibility
 import com.github.braillesystems.learnbraille.utils.navigate
 import com.github.braillesystems.learnbraille.utils.title
-import org.koin.android.ext.android.inject
 
 interface StepBinding {
     val prevButton: Button? get() = null
@@ -29,7 +26,7 @@ interface StepBinding {
     val hintButton: Button? get() = null
     val flipButton: Button? get() = null
     val textView: TextView? get() = null
-    val brailleDots: BrailleDotsView? get() = null
+    val brailleDotsInfo: BrailleDotsInfo? get() = null
 }
 
 /**
@@ -37,8 +34,6 @@ interface StepBinding {
  */
 abstract class AbstractStepFragment(helpMsgId: HelpMsgId) : AbstractFragmentWithHelp(helpMsgId) {
 
-    protected val preferenceRepository: PreferenceRepository by inject()
-
     protected lateinit var step: Step
         private set
 
@@ -50,20 +45,23 @@ abstract class AbstractStepFragment(helpMsgId: HelpMsgId) : AbstractFragmentWith
             super.helpMsg, getString(R.string.lessons_help_common)
         )
 
-    protected fun <B : ViewDataBinding> B.init(
-        titleId: Int,
-        binding: B.() -> StepBinding
-    ): B = init(this, titleId, binding)
-
-    protected open fun <B> init(
-        b: B,
+    protected fun <B> B.iniStep(
         titleId: Int,
-        binding: B.() -> StepBinding
-    ): B = b.apply {
-        setHasOptionsMenu(true)
-
+        getBinding: B.() -> StepBinding
+    ) = ini {
+        getBinding().run {
+            object : FragmentBinding {
+                override val leftButton: Button? get() = this@run.prevButton
+                override val rightButton: Button? get() = this@run.nextButton
+                override val leftMiddleButton: Button? get() = this@run.hintButton
+                override val rightMiddleButton: Button? get() = this@run.flipButton
+                override val textView: TextView? get() = this@run.textView
+                override val brailleDotsInfo: BrailleDotsInfo? get() = this@run.brailleDotsInfo
+            }
+        }
+    }.apply {
         step = getStepArg()
-        stepBinding = binding()
+        stepBinding = getBinding()
 
         val msg = getString(titleId)
         title = if (preferenceRepository.extendedAccessibilityEnabled) {
@@ -73,21 +71,16 @@ abstract class AbstractStepFragment(helpMsgId: HelpMsgId) : AbstractFragmentWith
         }
 
         stepBinding.run {
-            if (preferenceRepository.extendedAccessibilityEnabled) {
-                applyExtendedAccessibility(
-                    leftButton = prevButton,
-                    rightButton = nextButton,
-                    leftMiddleButton = hintButton,
-                    rightMiddleButton = flipButton,
-                    textView = textView
-                )
-            }
             prevButton?.setOnClickListener { toPrevStep(step) }
             nextButton?.setOnClickListener { toNextStep(step, markThisAsPassed = true) }
             textView?.movementMethod = ScrollingMovementMethod()
         }
+
+        iniStepHelper()
     }
 
+    protected open fun iniStepHelper() = Unit
+
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(
             if (preferenceRepository.extendedAccessibilityEnabled) R.menu.steps_menu_hide
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/AbstractInfoStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/AbstractInfoStepFragment.kt
index 817833e3..60c05a0e 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/AbstractInfoStepFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/AbstractInfoStepFragment.kt
@@ -4,18 +4,14 @@ import androidx.core.text.parseAsHtml
 import com.github.braillesystems.learnbraille.data.entities.BaseInfo
 import com.github.braillesystems.learnbraille.ui.screens.HelpMsgId
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
-import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 
 abstract class AbstractInfoStepFragment(helpMsgId: HelpMsgId) : AbstractStepFragment(helpMsgId) {
 
-    override fun <B> init(b: B, titleId: Int, binding: B.() -> StepBinding): B =
-        super
-            .init(b, titleId, binding)
-            .also {
-                val data = step.data
-                require(data is BaseInfo)
-                stepBinding.textView?.text = data.text.parseAsHtml()
-                checkedAnnounce(data.text)
-            }
+    override fun iniStepHelper() {
+        val data = step.data
+        require(data is BaseInfo)
+        stepBinding.textView?.text = data.text.parseAsHtml()
+        checkedAnnounce(data.text)
+    }
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/FirstInfoFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/FirstInfoFragment.kt
index 67e5f5d8..4c8367cc 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/FirstInfoFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/FirstInfoFragment.kt
@@ -21,13 +21,12 @@ class FirstInfoFragment : AbstractInfoStepFragment(R.string.lessons_help_info) {
         R.layout.fragment_lesson_first_info,
         container,
         false
-    ).init(
-        titleId = R.string.lessons_title_info,
-        binding = {
-            object : StepBinding {
-                override val nextButton: Button? = this@init.nextButton
-                override val textView: TextView? = this@init.infoTextView
-            }
+    ).iniStep(
+        titleId = R.string.lessons_title_info
+    ) {
+        object : StepBinding {
+            override val nextButton: Button? = this@iniStep.nextButton
+            override val textView: TextView? = this@iniStep.infoTextView
         }
-    ).root
+    }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/InfoFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/InfoFragment.kt
index 476dc8ba..711b7a0e 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/InfoFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/InfoFragment.kt
@@ -21,14 +21,13 @@ class InfoFragment : AbstractInfoStepFragment(R.string.lessons_help_info) {
         R.layout.fragment_lessons_info,
         container,
         false
-    ).init(
-        titleId = R.string.lessons_title_info,
-        binding = {
-            object : StepBinding {
-                override val prevButton: Button? = this@init.prevButton
-                override val nextButton: Button? = this@init.nextButton
-                override val textView: TextView? = this@init.infoTextView
-            }
+    ).iniStep(
+        titleId = R.string.lessons_title_info
+    ) {
+        object : StepBinding {
+            override val prevButton: Button? = this@iniStep.prevButton
+            override val nextButton: Button? = this@iniStep.nextButton
+            override val textView: TextView? = this@iniStep.infoTextView
         }
-    ).root
+    }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/LastInfoFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/LastInfoFragment.kt
index e72486b9..8a81b866 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/LastInfoFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/info/LastInfoFragment.kt
@@ -21,13 +21,12 @@ class LastInfoFragment : AbstractInfoStepFragment(R.string.lessons_help_last_inf
         R.layout.fragment_lesson_last_info,
         container,
         false
-    ).init(
-        titleId = R.string.lessons_title_last_info,
-        binding = {
-            object : StepBinding {
-                override val prevButton: Button? = this@init.prevButton
-                override val textView: TextView? = this@init.infoTextView
-            }
+    ).iniStep(
+        titleId = R.string.lessons_title_last_info
+    ) {
+        object : StepBinding {
+            override val prevButton: Button? = this@iniStep.prevButton
+            override val textView: TextView? = this@iniStep.infoTextView
         }
-    ).root
+    }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
index 042f6408..1f4e26d5 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
@@ -8,7 +8,6 @@ import com.github.braillesystems.learnbraille.data.entities.BaseInput
 import com.github.braillesystems.learnbraille.data.entities.StepData
 import com.github.braillesystems.learnbraille.ui.screens.*
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
-import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
 import com.github.braillesystems.learnbraille.ui.screens.theory.toNextStep
 import com.github.braillesystems.learnbraille.ui.showCorrectToast
 import com.github.braillesystems.learnbraille.ui.showHintToast
@@ -27,73 +26,73 @@ abstract class AbstractInputStepFragment(helpMsgId: HelpMsgId) : AbstractStepFra
     protected lateinit var viewModel: InputViewModel
         private set
 
-    override fun <B> init(b: B, titleId: Int, binding: B.() -> StepBinding): B =
-        super.init(b, titleId, binding).also {
-            val data = step.data
-            require(data is BaseInput)
-            val expectedDots = data.brailleDots
+    override fun iniStepHelper() {
+        val data = step.data
+        require(data is BaseInput)
+        val expectedDots = data.brailleDots
 
-            var userTouchedDots = false
+        var userTouchedDots = false
 
-            dotsState = stepBinding.brailleDots!!.dotsState.apply {
-                uncheck()
-                clickable(true)
+        dotsState = stepBinding.brailleDotsInfo!!.view.dotsState.apply {
+            uncheck()
+            clickable(true)
+            subscribe(View.OnClickListener {
+                viewModel.onSoftCheck()
+                userTouchedDots = true
+            })
+        }
+
+        val viewModelFactory = InputViewModelFactory(
+            application, expectedDots
+        ) { dotsState.brailleDots }
+
+        viewModel = ViewModelProvider(this, viewModelFactory)
+            .get(InputViewModel::class.java)
+
+        val buzzer: Vibrator? = activity?.getSystemService()
+
+        stepBinding.flipButton?.setOnClickListener {
+            dotsState = stepBinding.brailleDotsInfo!!.view.reflect().apply {
                 subscribe(View.OnClickListener {
                     viewModel.onSoftCheck()
                     userTouchedDots = true
                 })
             }
+        }
 
-            val viewModelFactory = InputViewModelFactory(
-                application, expectedDots
-            ) { dotsState.brailleDots }
-            viewModel = ViewModelProvider(this, viewModelFactory)
-                .get(InputViewModel::class.java)
-
-            val buzzer: Vibrator? = activity?.getSystemService()
-
-            stepBinding.flipButton?.setOnClickListener {
-                dotsState = stepBinding.brailleDots?.reflect()?.apply {
-                    subscribe(View.OnClickListener {
-                        viewModel.onSoftCheck()
-                        userTouchedDots = true
-                    })
-                } ?: error("Step with flip button should have brailleDots too")
-            }
-
-            viewModel.observeCheckedOnFly(
-                viewLifecycleOwner, { dotsState }, buzzer,
-                block = { toNextStep(step, markThisAsPassed = true) },
-                softBlock = { showCorrectToast() }
-            )
-
-            viewModel.observeEventHint(
-                viewLifecycleOwner, { dotsState }
-            ) {
-                showHintToast(expectedDots)
-                userTouchedDots = true
-            }
+        viewModel.observeCheckedOnFly(
+            viewLifecycleOwner, { dotsState }, buzzer,
+            block = { toNextStep(step, markThisAsPassed = true) },
+            softBlock = { showCorrectToast() }
+        )
+
+        viewModel.observeEventHint(
+            viewLifecycleOwner, { dotsState }
+        ) {
+            showHintToast(expectedDots)
+            userTouchedDots = true
+        }
 
-            viewModel.observeEventIncorrect(
-                viewLifecycleOwner, { dotsState }
-            ) {
-                fun notify() {
-                    toastIncorrect(data)
-                    buzzer.checkedBuzz(
-                        preferenceRepository.incorrectBuzzPattern,
-                        preferenceRepository
-                    )
-                }
-                if (userTouchedDots) notify()
-                else toNextStep(step, markThisAsPassed = false) { notify() }
+        viewModel.observeEventIncorrect(
+            viewLifecycleOwner, { dotsState }
+        ) {
+            fun notify() {
+                toastIncorrect(data)
+                buzzer.checkedBuzz(
+                    preferenceRepository.incorrectBuzzPattern,
+                    preferenceRepository
+                )
             }
+            if (userTouchedDots) notify()
+            else toNextStep(step, markThisAsPassed = false) { notify() }
+        }
 
-            viewModel.observeEventPassHint(
-                viewLifecycleOwner, { dotsState }
-            ) {
-                onPassHint(data)
-            }
+        viewModel.observeEventPassHint(
+            viewLifecycleOwner, { dotsState }
+        ) {
+            onPassHint(data)
         }
+    }
 
     protected open fun toastIncorrect(data: StepData) {
         showIncorrectToast()
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputDotsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputDotsFragment.kt
index a6cb2a97..405941a4 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputDotsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputDotsFragment.kt
@@ -11,8 +11,9 @@ import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.InputDots
 import com.github.braillesystems.learnbraille.data.entities.spelling
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputDotsBinding
+import com.github.braillesystems.learnbraille.ui.screens.BrailleDotsInfo
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
-import com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.removeHtmlMarkup
 
@@ -27,19 +28,25 @@ class InputDotsFragment : AbstractInputStepFragment(R.string.lessons_help_input_
         R.layout.fragment_lessons_input_dots,
         container,
         false
-    ).init(
-        titleId = R.string.lessons_title_input_dots,
-        binding = {
-            object : StepBinding {
-                override val prevButton: Button? = this@init.prevButton
-                override val nextButton: Button? = this@init.nextButton
-                override val flipButton: Button? = this@init.flipButton
-                override val hintButton: Button? = this@init.hintButton
-                override val textView: TextView? = this@init.infoTextView
-                override val brailleDots: BrailleDotsView? = this@init.brailleDots
+    ).iniStep(
+        titleId = R.string.lessons_title_input_dots
+    ) {
+        object : StepBinding {
+            override val prevButton: Button? = this@iniStep.prevButton
+            override val nextButton: Button? = this@iniStep.nextButton
+            override val flipButton: Button? = this@iniStep.flipButton
+            override val hintButton: Button? = this@iniStep.hintButton
+            override val textView: TextView? = this@iniStep.infoTextView
+            override val brailleDotsInfo: BrailleDotsInfo? = this@iniStep.run {
+                BrailleDotsInfo(
+                    brailleDots,
+                    if (preferenceRepository.isWriteModeFirst) BrailleDotsViewMode.Writing
+                    else BrailleDotsViewMode.Reading,
+                    prevButton, flipButton
+                )
             }
         }
-    ).apply {
+    }.apply {
 
         val data = step.data
         require(data is InputDots)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputMarkerFragment.kt
index c9806fb6..9d117e42 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputMarkerFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputMarkerFragment.kt
@@ -11,8 +11,9 @@ import com.github.braillesystems.learnbraille.data.entities.Input
 import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputMarkerBinding
 import com.github.braillesystems.learnbraille.res.inputMarkerPrintRules
+import com.github.braillesystems.learnbraille.ui.screens.BrailleDotsInfo
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
-import com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.getValue
 
@@ -27,19 +28,25 @@ class InputMarkerFragment : AbstractInputStepFragment(R.string.lessons_help_inpu
         R.layout.fragment_lessons_input_marker,
         container,
         false
-    ).init(
-        titleId = R.string.lessons_title_input_symbol,
-        binding = {
-            object : StepBinding {
-                override val prevButton: Button? = this@init.prevButton
-                override val nextButton: Button? = this@init.nextButton
-                override val flipButton: Button? = this@init.flipButton
-                override val hintButton: Button? = this@init.hintButton
-                override val textView: TextView? = this@init.infoTextView
-                override val brailleDots: BrailleDotsView? = this@init.brailleDots
+    ).iniStep(
+        titleId = R.string.lessons_title_input_symbol
+    ) {
+        object : StepBinding {
+            override val prevButton: Button? = this@iniStep.prevButton
+            override val nextButton: Button? = this@iniStep.nextButton
+            override val flipButton: Button? = this@iniStep.flipButton
+            override val hintButton: Button? = this@iniStep.hintButton
+            override val textView: TextView? = this@iniStep.infoTextView
+            override val brailleDotsInfo: BrailleDotsInfo? = this@iniStep.run {
+                BrailleDotsInfo(
+                    brailleDots,
+                    if (preferenceRepository.isWriteModeFirst) BrailleDotsViewMode.Writing
+                    else BrailleDotsViewMode.Reading,
+                    prevButton, flipButton
+                )
             }
         }
-    ).apply {
+    }.apply {
 
         val stepData = step.data
         require(stepData is Input)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputSymbolFragment.kt
index a64aa9d3..93a5e9ca 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputSymbolFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/InputSymbolFragment.kt
@@ -12,9 +12,10 @@ import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsInputSymbolBinding
 import com.github.braillesystems.learnbraille.res.captionRules
 import com.github.braillesystems.learnbraille.res.inputSymbolPrintRules
+import com.github.braillesystems.learnbraille.ui.screens.BrailleDotsInfo
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
 import com.github.braillesystems.learnbraille.ui.showIncorrectToast
-import com.github.braillesystems.learnbraille.ui.views.BrailleDotsView
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.getValue
 
@@ -29,18 +30,24 @@ class InputSymbolFragment : AbstractInputStepFragment(R.string.lessons_help_inpu
         R.layout.fragment_lessons_input_symbol,
         container,
         false
-    ).init(
-        titleId = R.string.lessons_title_input_symbol,
-        binding = {
-            object : StepBinding {
-                override val prevButton: Button? = this@init.prevButton
-                override val nextButton: Button? = this@init.nextButton
-                override val flipButton: Button? = this@init.flipButton
-                override val hintButton: Button? = this@init.hintButton
-                override val brailleDots: BrailleDotsView? = this@init.brailleDots
+    ).iniStep(
+        titleId = R.string.lessons_title_input_symbol
+    ) {
+        object : StepBinding {
+            override val prevButton: Button? = this@iniStep.prevButton
+            override val nextButton: Button? = this@iniStep.nextButton
+            override val flipButton: Button? = this@iniStep.flipButton
+            override val hintButton: Button? = this@iniStep.hintButton
+            override val brailleDotsInfo: BrailleDotsInfo? = this@iniStep.run {
+                BrailleDotsInfo(
+                    brailleDots,
+                    if (preferenceRepository.isWriteModeFirst) BrailleDotsViewMode.Writing
+                    else BrailleDotsViewMode.Reading,
+                    prevButton, flipButton
+                )
             }
         }
-    ).apply {
+    }.apply {
 
         val stepData = step.data
         require(stepData is Input)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/AbstractShowStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/AbstractShowStepFragment.kt
new file mode 100644
index 00000000..47106b6d
--- /dev/null
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/AbstractShowStepFragment.kt
@@ -0,0 +1,20 @@
+package com.github.braillesystems.learnbraille.ui.screens.theory.steps.show
+
+import com.github.braillesystems.learnbraille.data.entities.BaseShow
+import com.github.braillesystems.learnbraille.ui.screens.HelpMsgId
+import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
+import com.github.braillesystems.learnbraille.ui.views.display
+import com.github.braillesystems.learnbraille.ui.views.dotsState
+
+abstract class AbstractShowStepFragment(helpMsgId: HelpMsgId) : AbstractStepFragment(helpMsgId) {
+
+    override fun iniStepHelper() {
+        val data = step.data
+        require(data is BaseShow)
+        stepBinding.brailleDotsInfo?.view?.dotsState?.display(data.brailleDots)
+            ?: error("Show step should have braille dots")
+        stepBinding.flipButton?.setOnClickListener {
+            stepBinding.brailleDotsInfo?.view?.reflect()?.display(data.brailleDots)
+        }
+    }
+}
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt
index 20e6f5cb..94ad8fff 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowDotsFragment.kt
@@ -11,15 +11,13 @@ import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.ShowDots
 import com.github.braillesystems.learnbraille.data.entities.spelling
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsShowDotsBinding
-import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
+import com.github.braillesystems.learnbraille.ui.screens.BrailleDotsInfo
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
 import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
-import com.github.braillesystems.learnbraille.ui.views.display
-import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.removeHtmlMarkup
 
-class ShowDotsFragment : AbstractStepFragment(R.string.lessons_help_show_dots) {
+class ShowDotsFragment : AbstractShowStepFragment(R.string.lessons_help_show_dots) {
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -30,31 +28,26 @@ class ShowDotsFragment : AbstractStepFragment(R.string.lessons_help_show_dots) {
         R.layout.fragment_lessons_show_dots,
         container,
         false
-    ).init(
-        titleId = R.string.lessons_title_show_dots,
-        binding = {
-            object : StepBinding {
-                override val prevButton: Button? = this@init.prevButton
-                override val nextButton: Button? = this@init.nextButton
-                override val flipButton: Button? = this@init.flipButton
-                override val textView: TextView? = this@init.infoTextView
+    ).iniStep(
+        titleId = R.string.lessons_title_show_dots
+    ) {
+        object : StepBinding {
+            override val prevButton: Button? = this@iniStep.prevButton
+            override val nextButton: Button? = this@iniStep.nextButton
+            override val flipButton: Button? = this@iniStep.flipButton
+            override val textView: TextView? = this@iniStep.infoTextView
+            override val brailleDotsInfo: BrailleDotsInfo? = this@iniStep.run {
+                BrailleDotsInfo(brailleDots, BrailleDotsViewMode.Reading, prevButton, flipButton)
             }
         }
-    ).apply {
+    }.apply {
 
         val data = step.data
         require(data is ShowDots)
-
         val text = data.text
             ?: getString(R.string.lessons_show_dots_info_template).format(data.brailleDots.spelling)
         infoTextView.text = text.parseAsHtml()
         checkedAnnounce(text.removeHtmlMarkup())
 
-        brailleDots.mode = BrailleDotsViewMode.Writing
-        brailleDots.dotsState.display(data.brailleDots)
-        flipButton.setOnClickListener {
-            brailleDots.reflect().display(data.brailleDots)
-        }
-
     }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
index 378ab1f0..8db9888b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowMarkerFragment.kt
@@ -11,15 +11,13 @@ import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
 import com.github.braillesystems.learnbraille.data.entities.Show
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsShowMarkerBinding
 import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
-import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
+import com.github.braillesystems.learnbraille.ui.screens.BrailleDotsInfo
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
 import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
-import com.github.braillesystems.learnbraille.ui.views.display
-import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.getValue
 
-class ShowMarkerFragment : AbstractStepFragment(R.string.lessons_help_show_marker) {
+class ShowMarkerFragment : AbstractShowStepFragment(R.string.lessons_help_show_marker) {
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -30,17 +28,19 @@ class ShowMarkerFragment : AbstractStepFragment(R.string.lessons_help_show_marke
         R.layout.fragment_lessons_show_marker,
         container,
         false
-    ).init(
-        titleId = R.string.lessons_title_show_symbol,
-        binding = {
-            object : StepBinding {
-                override val prevButton: Button? = this@init.prevButton
-                override val nextButton: Button? = this@init.nextButton
-                override val flipButton: Button? = this@init.flipButton
-                override val textView: TextView? = this@init.infoTextView
+    ).iniStep(
+        titleId = R.string.lessons_title_show_symbol
+    ) {
+        object : StepBinding {
+            override val prevButton: Button? = this@iniStep.prevButton
+            override val nextButton: Button? = this@iniStep.nextButton
+            override val flipButton: Button? = this@iniStep.flipButton
+            override val textView: TextView? = this@iniStep.infoTextView
+            override val brailleDotsInfo: BrailleDotsInfo? = this@iniStep.run {
+                BrailleDotsInfo(brailleDots, BrailleDotsViewMode.Reading, prevButton, flipButton)
             }
         }
-    ).apply {
+    }.apply {
 
         val stepData = step.data
         require(stepData is Show)
@@ -50,11 +50,6 @@ class ShowMarkerFragment : AbstractStepFragment(R.string.lessons_help_show_marke
         val text = showMarkerPrintRules.getValue(data.type)
         infoTextView.text = text
         checkedAnnounce(text)
-        brailleDots.mode = BrailleDotsViewMode.Writing
-        brailleDots.dotsState.display(data.brailleDots)
-        flipButton.setOnClickListener {
-            brailleDots.reflect().display(data.brailleDots)
-        }
 
     }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt
index fe39a9c2..8f4f8a88 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/ShowSymbolFragment.kt
@@ -10,16 +10,14 @@ import com.github.braillesystems.learnbraille.data.entities.Show
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.databinding.FragmentLessonsShowSymbolBinding
 import com.github.braillesystems.learnbraille.res.captionRules
-import com.github.braillesystems.learnbraille.res.showSymbolPrintRules
-import com.github.braillesystems.learnbraille.ui.screens.theory.steps.AbstractStepFragment
+import com.github.braillesystems.learnbraille.ui.screens.BrailleDotsInfo
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
+import com.github.braillesystems.learnbraille.ui.showPrint
 import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
-import com.github.braillesystems.learnbraille.ui.views.display
-import com.github.braillesystems.learnbraille.ui.views.dotsState
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.getValue
 
-class ShowSymbolFragment : AbstractStepFragment(R.string.lessons_help_show_symbol) {
+class ShowSymbolFragment : AbstractShowStepFragment(R.string.lessons_help_show_symbol) {
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -30,16 +28,18 @@ class ShowSymbolFragment : AbstractStepFragment(R.string.lessons_help_show_symbo
         R.layout.fragment_lessons_show_symbol,
         container,
         false
-    ).init(
-        titleId = R.string.lessons_title_show_symbol,
-        binding = {
-            object : StepBinding {
-                override val prevButton: Button? = this@init.prevButton
-                override val nextButton: Button? = this@init.nextButton
-                override val flipButton: Button? = this@init.flipButton
+    ).iniStep(
+        titleId = R.string.lessons_title_show_symbol
+    ) {
+        object : StepBinding {
+            override val prevButton: Button? = this@iniStep.prevButton
+            override val nextButton: Button? = this@iniStep.nextButton
+            override val flipButton: Button? = this@iniStep.flipButton
+            override val brailleDotsInfo: BrailleDotsInfo? = this@iniStep.run {
+                BrailleDotsInfo(brailleDots, BrailleDotsViewMode.Reading, prevButton, flipButton)
             }
         }
-    ).apply {
+    }.apply {
 
         val stepData = step.data
         require(stepData is Show)
@@ -48,12 +48,7 @@ class ShowSymbolFragment : AbstractStepFragment(R.string.lessons_help_show_symbo
 
         letter.letter = data.char
         letterCaption.text = captionRules.getValue(data)
-        checkedAnnounce(showSymbolPrintRules.getValue(data.char))
-        brailleDots.mode = BrailleDotsViewMode.Writing
-        brailleDots.dotsState.display(data.brailleDots)
-        flipButton.setOnClickListener {
-            brailleDots.reflect().display(data.brailleDots)
-        }
+        checkedAnnounce(showPrint(data))
 
     }.root
 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
index 3a2f6377..a631449b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
@@ -20,6 +20,7 @@ import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode.Readi
 import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode.Writing
 import com.github.braillesystems.learnbraille.utils.chainify
 import com.github.braillesystems.learnbraille.utils.forEach
+import com.github.braillesystems.learnbraille.utils.unreachable
 import kotlinx.android.synthetic.main.braille_dots_view.view.*
 import org.koin.core.KoinComponent
 import org.koin.core.inject
@@ -57,6 +58,8 @@ val BrailleDotsViewMode.reflected: BrailleDotsViewMode
 
 /**
  * Represents six Braille dots view.
+ *
+ * Initialize by `setMode` before usage.
  */
 class BrailleDotsView : ConstraintLayout, KoinComponent {
 
@@ -76,34 +79,40 @@ class BrailleDotsView : ConstraintLayout, KoinComponent {
         LayoutInflater
             .from(context)
             .inflate(R.layout.braille_dots_view, this, true)
-
-        mode =
-            if (preferenceRepository.isWriteModeFirst) Writing
-            else Reading
     }
 
-    var mode: BrailleDotsViewMode
-        set(value) {
-            setDescriptionMode(value)
-            reflectChecks()
+    // After changing traversal order neighbor views forget that braille dots are next
+    private lateinit var prevView: View
+    private lateinit var nextView: View
+    lateinit var mode: BrailleDotsViewMode
+        private set  // It is not possible to use lateinit var with custom setter
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-                setBackgroundMode(value)
-            } else {
-                Timber.w("Unable to set braille dots background due to low API level")
-            }
+    fun setMode(mode: BrailleDotsViewMode, prevView: View, nextView: View) {
+        this.prevView = prevView
+        this.nextView = nextView
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-                setTraversalMode(value)
-            } else {
-                Timber.w("API level < 22, unable co control accessibility traversal order")
-            }
+        setDescriptionMode(mode)
+        if (this::mode.isInitialized && this.mode != mode) {
+            reflectChecks()
+        }
 
-            field = value
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            setBackgroundMode(mode)
+        } else {
+            Timber.w("Unable to set braille dots background due to low API level")
         }
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            setTraversalMode(mode)
+        } else {
+            Timber.w("API level < 22, unable co control accessibility traversal order")
+        }
+
+        this.mode = mode
+    }
+
     fun reflect(): BrailleDotsState {
-        mode = mode.reflected
+        setMode(mode.reflected, prevView, nextView)
         return dotsState
     }
 
@@ -144,32 +153,30 @@ class BrailleDotsView : ConstraintLayout, KoinComponent {
 
     @RequiresApi(Build.VERSION_CODES.LOLLIPOP_MR1)
     private fun setTraversalMode(mode: BrailleDotsViewMode) {
-        fun setAfter(next: BrailleDotView, prev: BrailleDotView) {
+        val dotsOrder: Array<View> =
+            when (mode to preferenceRepository.traverseDotsInEnumerationOrder) {
+                Writing to true -> arrayOf(
+                    dotButton4, dotButton5, dotButton6,
+                    dotButton1, dotButton2, dotButton3
+                )
+                Writing to false -> arrayOf(
+                    dotButton4, dotButton1, dotButton5,
+                    dotButton2, dotButton6, dotButton3
+                )
+                Reading to true -> arrayOf(
+                    dotButton1, dotButton2, dotButton3,
+                    dotButton4, dotButton5, dotButton6
+                )
+                Reading to false -> arrayOf(
+                    dotButton1, dotButton4, dotButton2,
+                    dotButton5, dotButton3, dotButton6
+                )
+                else -> unreachable
+            }
+        chainify(prevView, *dotsOrder, nextView) { prev, next ->
+            prev.accessibilityTraversalBefore = next.id
             next.accessibilityTraversalAfter = prev.id
         }
-
-        when (mode to preferenceRepository.traverseDotsInEnumerationOrder) {
-            Writing to true -> chainify(
-                dotButton4, dotButton5, dotButton6,
-                dotButton1, dotButton2, dotButton3,
-                block = ::setAfter
-            )
-            Writing to false -> chainify(
-                dotButton4, dotButton1, dotButton5,
-                dotButton2, dotButton6, dotButton3,
-                block = ::setAfter
-            )
-            Reading to true -> chainify(
-                dotButton1, dotButton2, dotButton3,
-                dotButton4, dotButton5, dotButton6,
-                block = ::setAfter
-            )
-            Reading to false -> chainify(
-                dotButton1, dotButton4, dotButton2,
-                dotButton5, dotButton3, dotButton6,
-                block = ::setAfter
-            )
-        }
     }
 
     @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
index 4dd35939..2bd2ae90 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/Utils.kt
@@ -2,10 +2,7 @@ package com.github.braillesystems.learnbraille.utils
 
 import android.content.Context
 import android.os.Vibrator
-import android.util.TypedValue
 import android.view.accessibility.AccessibilityEvent
-import android.widget.Button
-import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.ActionBar
 import androidx.appcompat.app.AppCompatActivity
@@ -100,29 +97,3 @@ val Context.extendedTextSize: Float by lazyWithContext {
     // Size applied in runtime is different
     resources.getDimension(R.dimen.lessons_info_text_size) / 5 * 3
 }
-
-fun Fragment.applyExtendedAccessibility(
-    leftButton: Button? = null,
-    rightButton: Button? = null,
-    leftMiddleButton: Button? = null,
-    rightMiddleButton: Button? = null,
-    textView: TextView? = null
-) {
-    forEach(
-        leftButton,
-        rightButton,
-        leftMiddleButton,
-        rightMiddleButton
-    ) {
-        it?.setSize(
-            width = resources
-                .getDimension(R.dimen.side_buttons_extended_width)
-                .toInt()
-        )
-    }
-
-    textView?.setTextSize(
-        TypedValue.COMPLEX_UNIT_SP,
-        contextNotNull.extendedTextSize
-    )
-}

From ca3eb22c4892a15c9f24766270fcbfccf9f2e7d9 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Mon, 28 Sep 2020 04:23:26 +0300
Subject: [PATCH 103/117] Fix detekt

---
 .../braillesystems/learnbraille/ui/screens/AbstractFragment.kt  | 2 +-
 .../braillesystems/learnbraille/ui/views/BrailleDotsView.kt     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/AbstractFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/AbstractFragment.kt
index 5bec4604..58c7eb12 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/AbstractFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/AbstractFragment.kt
@@ -40,7 +40,7 @@ abstract class AbstractFragment : Fragment() {
         getBinding: B.() -> FragmentBinding = {
             object : FragmentBinding {}
         }
-    ) = this.apply {
+    ) = this.also {
         binding = getBinding().apply {
             brailleDotsInfo?.let { (view, mode, prev, next) ->
                 view.setMode(mode, prev, next)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
index a631449b..8e67d73b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
@@ -173,6 +173,7 @@ class BrailleDotsView : ConstraintLayout, KoinComponent {
                 )
                 else -> unreachable
             }
+        @Suppress("SpreadOperator")
         chainify(prevView, *dotsOrder, nextView) { prev, next ->
             prev.accessibilityTraversalBefore = next.id
             next.accessibilityTraversalAfter = prev.id

From 066c58fe2406d12e257ae685d731c1618187e928 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Mon, 28 Sep 2020 05:02:45 +0300
Subject: [PATCH 104/117] Fix #270 - checkable dots in the input mode

---
 .../learnbraille/ui/screens/browser/BrowserFragment.kt    | 4 +---
 .../learnbraille/ui/screens/practice/CardFragment.kt      | 8 +++++++-
 .../learnbraille/ui/screens/practice/CardViewModel.kt     | 3 ++-
 .../theory/steps/input/AbstractInputStepFragment.kt       | 7 +++++++
 detekt-config.yml                                         | 2 ++
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
index 1d05185c..eb8eaa15 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/BrowserFragment.kt
@@ -36,9 +36,7 @@ class BrowserFragment : AbstractFragmentWithHelp(R.string.browser_help) {
         R.layout.fragment_browser,
         container,
         false
-    ).also { binding ->
-
-        setHasOptionsMenu(true)
+    ).ini().also { binding ->
 
         lifecycleScope.launch {
             val deckId = browserRepository.currentDeckId
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
index f4fcd56f..62aeb0d3 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
@@ -65,7 +65,6 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
         Timber.i("onCreateView")
 
         title = title()
-        setHasOptionsMenu(true)
 
         dotsState = binding.brailleDots.dotsState
 
@@ -90,6 +89,9 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
         binding.flipButton.setOnClickListener {
             dotsState = binding.brailleDots.reflect().apply {
                 dotsState.subscribe(viewModel)
+                if (viewModel.state == DotsChecker.State.HINT) {
+                    viewModel.expectedDots?.let { display(it) }
+                }
             }
         }
 
@@ -161,6 +163,10 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             }
         )
 
+        if (viewModel.state == DotsChecker.State.HINT) {
+            viewModel.expectedDots?.let { dotsState.display(it) }
+        }
+
     }.root
 
     private fun title(viewModel: CardViewModel? = null): String =
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
index b63beea3..acb85db0 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardViewModel.kt
@@ -62,7 +62,8 @@ class CardViewModel(
     var nCorrect: Int = 0
         private set
 
-    private var expectedDots: BrailleDots? = null
+    var expectedDots: BrailleDots? = null
+        private set
 
     private val job = Job()
     private val uiScope = scope(job)
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
index 1f4e26d5..26049080 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
@@ -57,6 +57,9 @@ abstract class AbstractInputStepFragment(helpMsgId: HelpMsgId) : AbstractStepFra
                     viewModel.onSoftCheck()
                     userTouchedDots = true
                 })
+                if (viewModel.state == DotsChecker.State.HINT) {
+                    display(expectedDots)
+                }
             }
         }
 
@@ -92,6 +95,10 @@ abstract class AbstractInputStepFragment(helpMsgId: HelpMsgId) : AbstractStepFra
         ) {
             onPassHint(data)
         }
+
+        if (viewModel.state == DotsChecker.State.HINT) {
+            expectedDots.let { dotsState.display(it) }
+        }
     }
 
     protected open fun toastIncorrect(data: StepData) {
diff --git a/detekt-config.yml b/detekt-config.yml
index f7275dc2..2f0b3491 100644
--- a/detekt-config.yml
+++ b/detekt-config.yml
@@ -5,6 +5,8 @@ complexity:
     excludes: ['**/utils/**', '**/DotsChecker.kt']
   LongMethod:
     excludes: ['**/*Fragment.kt', '**/*Application.kt']
+  ComplexMethod:
+    excludes: ['**/*Fragment.kt']
   LongParameterList:
     excludes: ['**/*Repository.kt']  # Dependency injection
 

From 24c43da244e7a20fb9b3c0fcbdcc9914d292ec4e Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Mon, 28 Sep 2020 05:46:15 +0300
Subject: [PATCH 105/117] Add toasts with current dots mode

---
 .../learnbraille/LearnBrailleApplication.kt         |  4 ++--
 .../braillesystems/learnbraille/ui/Messages.kt      |  7 +++++++
 .../ui/screens/browser/MarkerViewFragment.kt        |  8 ++++----
 .../ui/screens/browser/SymbolViewFragment.kt        |  8 ++++----
 .../ui/screens/practice/CardFragment.kt             | 13 ++++++++-----
 .../ui/screens/theory/steps/AbstractStepFragment.kt |  8 ++++++++
 .../theory/steps/input/AbstractInputStepFragment.kt |  2 ++
 .../theory/steps/show/AbstractShowStepFragment.kt   |  2 ++
 app/src/main/res/values/strings.xml                 |  9 +++++++--
 9 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
index 596d7fbb..51dc64a5 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/LearnBrailleApplication.kt
@@ -2,7 +2,7 @@ package com.github.braillesystems.learnbraille
 
 import android.app.Application
 import com.github.braillesystems.learnbraille.data.db.LearnBrailleDatabase
-import com.github.braillesystems.learnbraille.data.dsl.DevelopersCourse
+import com.github.braillesystems.learnbraille.data.dsl.UsersCourse
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.data.repository.*
 import com.github.braillesystems.learnbraille.ui.screens.practice.CardViewModelFactory
@@ -119,4 +119,4 @@ class LearnBrailleApplication : Application() {
 lateinit var koin: Koin
     private set
 
-val COURSE = DevelopersCourse
+val COURSE = UsersCourse
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt
index 84d62bee..6e9626c9 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/Messages.kt
@@ -8,6 +8,7 @@ import com.github.braillesystems.learnbraille.res.inputMarkerPrintRules
 import com.github.braillesystems.learnbraille.res.inputSymbolPrintRules
 import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
 import com.github.braillesystems.learnbraille.res.showSymbolPrintRules
+import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.utils.*
 
 fun Fragment.showCorrectToast() = toast(getString(R.string.input_correct))
@@ -15,6 +16,12 @@ fun Fragment.showCorrectToast() = toast(getString(R.string.input_correct))
 fun Fragment.showIncorrectToast(hint: String = "") =
     toast("${getString(R.string.input_incorrect)} $hint")
 
+fun Fragment.dotsMode(mode: BrailleDotsViewMode): String =
+    when (mode) {
+        BrailleDotsViewMode.Writing -> getString(R.string.braille_dots_mode_writing)
+        BrailleDotsViewMode.Reading -> getString(R.string.braille_dots_mode_reading)
+    }
+
 private val Context.dotsHintRules by lazyWithContext<Context, List<String>> {
     listOf(
         getString(R.string.input_dots_hint_1),
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
index 021782b8..555f3cd3 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/MarkerViewFragment.kt
@@ -11,16 +11,14 @@ import com.github.braillesystems.learnbraille.data.entities.MarkerSymbol
 import com.github.braillesystems.learnbraille.data.entities.Material
 import com.github.braillesystems.learnbraille.databinding.FragmentMarkerViewBinding
 import com.github.braillesystems.learnbraille.res.showMarkerPrintRules
+import com.github.braillesystems.learnbraille.ui.dotsMode
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
 import com.github.braillesystems.learnbraille.ui.screens.BrailleDotsInfo
 import com.github.braillesystems.learnbraille.ui.screens.FragmentBinding
 import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
-import com.github.braillesystems.learnbraille.utils.checkedAnnounce
-import com.github.braillesystems.learnbraille.utils.getFragmentStringArg
-import com.github.braillesystems.learnbraille.utils.getValue
-import com.github.braillesystems.learnbraille.utils.parse
+import com.github.braillesystems.learnbraille.utils.*
 
 class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view_help) {
 
@@ -51,8 +49,10 @@ class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view
         checkedAnnounce(text)
 
         brailleDots.dotsState.display(m.data.brailleDots)
+        checkedToast(dotsMode(brailleDots.mode))
         flipButton.setOnClickListener {
             brailleDots.reflect().display(m.data.brailleDots)
+            checkedToast(dotsMode(brailleDots.mode))
         }
 
     }.root
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
index d648a72d..ef427766 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/browser/SymbolViewFragment.kt
@@ -10,6 +10,7 @@ import com.github.braillesystems.learnbraille.data.entities.Material
 import com.github.braillesystems.learnbraille.data.entities.Symbol
 import com.github.braillesystems.learnbraille.databinding.FragmentSymbolViewBinding
 import com.github.braillesystems.learnbraille.res.captionRules
+import com.github.braillesystems.learnbraille.ui.dotsMode
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
 import com.github.braillesystems.learnbraille.ui.screens.BrailleDotsInfo
 import com.github.braillesystems.learnbraille.ui.screens.FragmentBinding
@@ -17,10 +18,7 @@ import com.github.braillesystems.learnbraille.ui.showPrint
 import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.ui.views.display
 import com.github.braillesystems.learnbraille.ui.views.dotsState
-import com.github.braillesystems.learnbraille.utils.checkedAnnounce
-import com.github.braillesystems.learnbraille.utils.getFragmentStringArg
-import com.github.braillesystems.learnbraille.utils.getValue
-import com.github.braillesystems.learnbraille.utils.parse
+import com.github.braillesystems.learnbraille.utils.*
 
 class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view_help) {
 
@@ -50,8 +48,10 @@ class SymbolViewFragment : AbstractFragmentWithHelp(R.string.browser_symbol_view
         checkedAnnounce(showPrint(m.data))
 
         brailleDots.dotsState.display(m.data.brailleDots)
+        checkedToast(dotsMode(brailleDots.mode))
         flipButton.setOnClickListener {
             brailleDots.reflect().display(m.data.brailleDots)
+            checkedToast(dotsMode(brailleDots.mode))
         }
 
     }.root
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
index 62aeb0d3..8590d13b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
@@ -16,13 +16,10 @@ import com.github.braillesystems.learnbraille.databinding.FragmentCardBinding
 import com.github.braillesystems.learnbraille.res.captionRules
 import com.github.braillesystems.learnbraille.res.deckTagToName
 import com.github.braillesystems.learnbraille.res.inputMarkerPrintRules
+import com.github.braillesystems.learnbraille.ui.*
 import com.github.braillesystems.learnbraille.ui.brailletrainer.BrailleTrainer
 import com.github.braillesystems.learnbraille.ui.brailletrainer.BrailleTrainerSignalHandler
-import com.github.braillesystems.learnbraille.ui.inputPrint
 import com.github.braillesystems.learnbraille.ui.screens.*
-import com.github.braillesystems.learnbraille.ui.showCorrectToast
-import com.github.braillesystems.learnbraille.ui.showHintToast
-import com.github.braillesystems.learnbraille.ui.showIncorrectToast
 import com.github.braillesystems.learnbraille.ui.views.*
 import com.github.braillesystems.learnbraille.utils.*
 import org.koin.android.ext.android.inject
@@ -89,6 +86,7 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
         binding.flipButton.setOnClickListener {
             dotsState = binding.brailleDots.reflect().apply {
                 dotsState.subscribe(viewModel)
+                checkedToast(dotsMode(binding.brailleDots.mode))
                 if (viewModel.state == DotsChecker.State.HINT) {
                     viewModel.expectedDots?.let { display(it) }
                 }
@@ -159,7 +157,12 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
                 } else {
                     getString(R.string.practice_deck_name_disabled_template)
                 }
-                toast(template.format(deckTagToName.getValue(tag)))
+                toast(
+                    template.format(
+                        deckTagToName.getValue(tag),
+                        dotsMode(binding.brailleDots.mode)
+                    )
+                )
             }
         )
 
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt
index 20e85375..110f2a5c 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/AbstractStepFragment.kt
@@ -9,6 +9,7 @@ import android.widget.TextView
 import com.github.braillesystems.learnbraille.COURSE
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.entities.Step
+import com.github.braillesystems.learnbraille.ui.dotsMode
 import com.github.braillesystems.learnbraille.ui.screens.AbstractFragmentWithHelp
 import com.github.braillesystems.learnbraille.ui.screens.BrailleDotsInfo
 import com.github.braillesystems.learnbraille.ui.screens.FragmentBinding
@@ -17,6 +18,7 @@ import com.github.braillesystems.learnbraille.ui.screens.theory.getStepArg
 import com.github.braillesystems.learnbraille.ui.screens.theory.toCurrentStep
 import com.github.braillesystems.learnbraille.ui.screens.theory.toNextStep
 import com.github.braillesystems.learnbraille.ui.screens.theory.toPrevStep
+import com.github.braillesystems.learnbraille.utils.checkedToast
 import com.github.braillesystems.learnbraille.utils.navigate
 import com.github.braillesystems.learnbraille.utils.title
 
@@ -81,6 +83,12 @@ abstract class AbstractStepFragment(helpMsgId: HelpMsgId) : AbstractFragmentWith
 
     protected open fun iniStepHelper() = Unit
 
+    protected fun toastDotsMode() {
+        binding.brailleDotsInfo?.view?.mode?.let {
+            checkedToast(dotsMode(it))
+        }
+    }
+
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(
             if (preferenceRepository.extendedAccessibilityEnabled) R.menu.steps_menu_hide
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
index 26049080..58028265 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/input/AbstractInputStepFragment.kt
@@ -51,12 +51,14 @@ abstract class AbstractInputStepFragment(helpMsgId: HelpMsgId) : AbstractStepFra
 
         val buzzer: Vibrator? = activity?.getSystemService()
 
+        toastDotsMode()
         stepBinding.flipButton?.setOnClickListener {
             dotsState = stepBinding.brailleDotsInfo!!.view.reflect().apply {
                 subscribe(View.OnClickListener {
                     viewModel.onSoftCheck()
                     userTouchedDots = true
                 })
+                toastDotsMode()
                 if (viewModel.state == DotsChecker.State.HINT) {
                     display(expectedDots)
                 }
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/AbstractShowStepFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/AbstractShowStepFragment.kt
index 47106b6d..8f233250 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/AbstractShowStepFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/theory/steps/show/AbstractShowStepFragment.kt
@@ -13,8 +13,10 @@ abstract class AbstractShowStepFragment(helpMsgId: HelpMsgId) : AbstractStepFrag
         require(data is BaseShow)
         stepBinding.brailleDotsInfo?.view?.dotsState?.display(data.brailleDots)
             ?: error("Show step should have braille dots")
+        toastDotsMode()
         stepBinding.flipButton?.setOnClickListener {
             stepBinding.brailleDotsInfo?.view?.reflect()?.display(data.brailleDots)
+            toastDotsMode()
         }
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9b748bc1..858fddee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,6 +26,11 @@
     <string name="preference_additional_qrcode_button_enabled">additional_qrcode_button_enabled</string>
     <string name="preferences_is_write_mode_first">is_write_mode_first</string>
 
+    <!--    TODO-->
+    <string name="braille_dots_mode_writing">Режим как для письма</string>
+    <!--    TODO-->
+    <string name="braille_dots_mode_reading">Режим как для чтения</string>
+
     <string name="input_correct">Правильно!</string>
     <string name="input_incorrect">Неправильно!</string>
     <string name="input_loading">Подождите, задание загружается</string>
@@ -128,10 +133,10 @@
     <string name="practice_actionbar_title_template">Практика: %d из %d</string>
     <string name="practice_actionbar_title">Практика</string>
     <string name="practice_deck_name_enabled_template">
-        Колода: \"%s\"\nПовторять только изученные: включено
+        Колода: \"%s\"\n\"%s\"\nПовторять только изученные: включено
     </string>
     <string name="practice_deck_name_disabled_template">
-        Колода: \"%s\"\nПовторять только изученные: выключено
+        Колода: \"%s\"\n\"%s\"\nПовторять только изученные: выключено
     </string>
     <string name="decks_list_title">Список колод</string>
     <string name="decks_list_no_material_in_deck">

From e45abb15267d2d3aee449254ea31336fe4b34177 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Mon, 28 Sep 2020 06:04:53 +0300
Subject: [PATCH 106/117] Update database.md

---
 docs/database.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/database.md b/docs/database.md
index 6f9bdf8a..d96b99e2 100644
--- a/docs/database.md
+++ b/docs/database.md
@@ -93,3 +93,5 @@ Table cards {
 ```
 
 Update: `decks` does not have description.
+Update: `steps.step_data -> steps.data`.
+Update: `decks.name -> decks.tag`.

From 60c43573a89c31d03887f8620558eaca68334468 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Mon, 28 Sep 2020 06:08:16 +0300
Subject: [PATCH 107/117] Update database.md

---
 docs/database.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/database.md b/docs/database.md
index d96b99e2..6f9bdf8a 100644
--- a/docs/database.md
+++ b/docs/database.md
@@ -93,5 +93,3 @@ Table cards {
 ```
 
 Update: `decks` does not have description.
-Update: `steps.step_data -> steps.data`.
-Update: `decks.name -> decks.tag`.

From 4c7906ba5ec97883388b0748c1f925aade7ebd36 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Mon, 28 Sep 2020 06:12:36 +0300
Subject: [PATCH 108/117] Add 18-19 migration (#263)

---
 .../data/db/LearnBrailleDatabase.kt           | 125 +++++++++++++++++-
 1 file changed, 120 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt b/app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt
index e254d195..3f52dad7 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/data/db/LearnBrailleDatabase.kt
@@ -31,7 +31,7 @@ import timber.log.Timber
         CurrentStep::class, LastCourseStep::class, LastLessonStep::class,
         Action::class
     ],
-    version = 18,
+    version = 19,
     exportSchema = true
 )
 @TypeConverters(
@@ -133,7 +133,8 @@ abstract class LearnBrailleDatabase : RoomDatabase(), KoinComponent {
             })
             .addMigrations(
                 MIGRATION_16_17,
-                MIGRATION_17_18
+                MIGRATION_17_18,
+                MIGRATION_18_19
             )
             .build()
             .init()
@@ -200,7 +201,7 @@ private val MIGRATION_16_17 = object : Migration(16, 17), KoinComponent {
     }
 }
 
-private val MIGRATION_17_18 = object : Migration(17, 18), KoinComponent {
+private val MIGRATION_17_18 = object : Migration(17, 18) {
     override fun migrate(database: SupportSQLiteDatabase) {
         Timber.i("Start 17-18 migration")
         database.execSQL(Action.creationQuery)
@@ -208,5 +209,119 @@ private val MIGRATION_17_18 = object : Migration(17, 18), KoinComponent {
     }
 }
 
-// TODO migration that preserves current true user's position
-// TODO materials migration
+private val MIGRATION_18_19 = object : Migration(18, 19) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        Timber.i("Start 18-19 migration")
+
+        database.execSQL("delete from lessons")
+        database.execSQL("delete from steps")
+        database.execSQL("delete from decks")
+        database.execSQL("delete from cards")
+        database.execSQL("delete from materials")
+        database.execSQL("delete from step_has_annotations")
+        database.execSQL("delete from step_annotations")
+
+        Timber.i("Old data removed")
+
+        prepopulationData.run {
+            lessons?.forEach {
+                database.insert(
+                    "lessons",
+                    SQLiteDatabase.CONFLICT_ABORT,
+                    it.run {
+                        ContentValues().apply {
+                            put("id", id)
+                            put("course_id", courseId)
+                            put("name", name)
+                            put("description", description)
+                        }
+                    }
+                )
+            }
+
+            steps?.forEach {
+                database.insert(
+                    "steps",
+                    SQLiteDatabase.CONFLICT_ABORT,
+                    it.run {
+                        ContentValues().apply {
+                            put("id", id)
+                            put("course_id", courseId)
+                            put("lesson_id", lessonId)
+                            put("data", StepDataConverters().to(data))
+                        }
+                    }
+                )
+            }
+
+            decks?.forEach {
+                database.insert(
+                    "decks",
+                    SQLiteDatabase.CONFLICT_ABORT,
+                    it.run {
+                        ContentValues().apply {
+                            put("id", id)
+                            put("tag", tag)
+                        }
+                    }
+                )
+            }
+
+            cards?.forEach {
+                database.insert(
+                    "cards",
+                    SQLiteDatabase.CONFLICT_ABORT,
+                    it.run {
+                        ContentValues().apply {
+                            put("deck_id", deckId)
+                            put("material_id", materialId)
+                        }
+                    }
+                )
+            }
+
+            materials?.forEach {
+                database.insert(
+                    "materials",
+                    SQLiteDatabase.CONFLICT_ABORT,
+                    it.run {
+                        ContentValues().apply {
+                            put("id", id)
+                            put("data", MaterialDataTypeConverters().to(data))
+                        }
+                    }
+                )
+            }
+
+            stepAnnotations?.forEach {
+                database.insert(
+                    "step_annotations",
+                    SQLiteDatabase.CONFLICT_ABORT,
+                    it.run {
+                        ContentValues().apply {
+                            put("id", id)
+                            put("name", name)
+                        }
+                    }
+                )
+            }
+
+            stepsHasAnnotations?.forEach {
+                database.insert(
+                    "step_has_annotations",
+                    SQLiteDatabase.CONFLICT_ABORT,
+                    it.run {
+                        ContentValues().apply {
+                            put("course_id", courseId)
+                            put("lesson_id", lessonId)
+                            put("step_id", stepId)
+                            put("annotation_id", annotationId)
+                        }
+                    }
+                )
+            }
+        }
+
+        Timber.i("Finish 18-19 migration")
+    }
+}

From 054642d4544f69cd3cf1f549699b798404d2f0c0 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Mon, 28 Sep 2020 08:54:16 +0300
Subject: [PATCH 109/117] #263 suppress LongMethod warnings at
 LearnBrailleDatabase.kt

---
 detekt-config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/detekt-config.yml b/detekt-config.yml
index f7275dc2..778a6c54 100644
--- a/detekt-config.yml
+++ b/detekt-config.yml
@@ -4,7 +4,7 @@ complexity:
   TooManyFunctions:
     excludes: ['**/utils/**', '**/DotsChecker.kt']
   LongMethod:
-    excludes: ['**/*Fragment.kt', '**/*Application.kt']
+    excludes: ['**/*Fragment.kt', '**/*Application.kt', '**/LearnBrailleDatabase.kt']
   LongParameterList:
     excludes: ['**/*Repository.kt']  # Dependency injection
 

From a982e0e1d793c4b43a687f3f9c668f7974f80d56 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Mon, 28 Sep 2020 10:20:08 +0300
Subject: [PATCH 110/117] (#223) writing mode: traverse dots 4->5->6->1->2->3

---
 .../learnbraille/ui/views/BrailleDotsView.kt              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
index 8e67d73b..1c0a84d2 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
@@ -156,12 +156,12 @@ class BrailleDotsView : ConstraintLayout, KoinComponent {
         val dotsOrder: Array<View> =
             when (mode to preferenceRepository.traverseDotsInEnumerationOrder) {
                 Writing to true -> arrayOf(
-                    dotButton4, dotButton5, dotButton6,
-                    dotButton1, dotButton2, dotButton3
+                    dotButton1, dotButton2, dotButton3,
+                    dotButton4, dotButton5, dotButton6
                 )
                 Writing to false -> arrayOf(
-                    dotButton4, dotButton1, dotButton5,
-                    dotButton2, dotButton6, dotButton3
+                    dotButton1, dotButton2, dotButton3,
+                    dotButton4, dotButton5, dotButton6
                 )
                 Reading to true -> arrayOf(
                     dotButton1, dotButton2, dotButton3,

From 01f107abcd14c6218304b06c1789f8f9f10156ce Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Mon, 28 Sep 2020 11:07:08 +0300
Subject: [PATCH 111/117] (#223) update strings for Flip Columns button

---
 .../learnbraille/res/GolubinaCourse.kt        | 14 +++++++
 app/src/main/res/values/strings.xml           | 41 +++++++++++++------
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
index b93cae74..d0c51b4e 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/res/GolubinaCourse.kt
@@ -57,6 +57,20 @@ internal val golubinaIntroLessons by lessons {
             brailleDots = BrailleDots(F, E, E, E, E, E)
         )
         +InputDots(text = "Введите точку один", brailleDots = BrailleDots(F, E, E, E, E, E))
+        +Info(
+            """
+                В шаге с демонстрацией столбец с точками 1, 2, 3 находится слева,
+                а в шаге с вводом - справа, потому что буквы пишутся на обороте листа, а для чтения 
+                лист переворачивается.
+                <br>
+                Впрочем, порядок столбцов в этом приложении можно изменить кнопкой <b>"Режим письмо/чтение"</b>
+                справа на экране над кнопкой <b>"Вперёд"</b>.
+                <br>
+                В настройках можно отключить "При вводе столбец с точками 1, 2, 3 справа". Тогда
+                при заходе в любой шаг точки 1, 2, 3 будут слева, но это по-прежнему можно будет изменить,
+                нажав кнопку <b>"Режим письмо/чтение"</b>.
+                """
+        )
         +ShowDots(
             text = "Перед Вами символ шрифта Брайля - <br>" +
                     " точка номер три",
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 858fddee..a68ea371 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,8 +2,6 @@
     <!--    Note: "double quotes" make TalkBack emphasize a text between them-->
     <!--    & delimiter splits talkback sections in the help-->
 
-    <!--    TODO write about flip button to help-->
-
     <!--    App common-->
 
     <string name="app_name">Learn Braille</string>
@@ -26,10 +24,8 @@
     <string name="preference_additional_qrcode_button_enabled">additional_qrcode_button_enabled</string>
     <string name="preferences_is_write_mode_first">is_write_mode_first</string>
 
-    <!--    TODO-->
-    <string name="braille_dots_mode_writing">Режим как для письма</string>
-    <!--    TODO-->
-    <string name="braille_dots_mode_reading">Режим как для чтения</string>
+    <string name="braille_dots_mode_writing">Порядок точек: "письмо"</string>
+    <string name="braille_dots_mode_reading">Порядок точек: "чтение"</string>
 
     <string name="input_correct">Правильно!</string>
     <string name="input_incorrect">Неправильно!</string>
@@ -167,6 +163,9 @@
         По умолчанию выдаются только карточки с символами, изученными в разделе \"теория\". Чтобы
         повторять любые символы, измените это в настройках приложения.
         &<br>
+        <b>Шеститочие: письмо/чтение</b> (розовая кнопка справа по центру) - изменяет порядок столбцов: точки
+        1, 2, 3 справа (как при письме на брайлевском приборе) или слева (как при чтении).
+        &<br>
         <b>Выход в меню</b> приложения - кнопка вверху слева.
         &<br>
         <b>Список колод</b> - кнопка вверху справа.
@@ -309,6 +308,9 @@
         По нажатию кнопки \"подсказка\" выводится сообщение с правильным ответом, и точки
         переключаются в правильное положение. Чтобы пройти то же упражнение после подсказки, нужно
         нажать кнопку \"вперёд\".
+        &<br>
+        <b>Шеститочие: письмо/чтение</b> (розовая кнопка справа над кнопкой "вперёд") изменяет порядок столбцов: точки
+        1, 2, 3 справа (как при письме на брайлевском приборе) или слева (как при чтении).
          ]]>
     </string>
 
@@ -321,6 +323,9 @@
         Если нажать кнопку \"подсказка\", расположенную над кнопкой \"назад\", выведется сообщение
         с правильным ответом и точки переключатся в правильное состояние. Чтобы пройти то же
         упражнение после подсказки, нажмите кнопку \"вперёд\".
+        &<br>
+        <b>Шеститочие: письмо/чтение</b> (розовая кнопка справа над кнопкой "вперёд") изменяет порядок столбцов: точки
+        1, 2, 3 справа (как при письме на брайлевском приборе) или слева (как при чтении).
         ]]>
     </string>
 
@@ -334,6 +339,9 @@
         Если нажать кнопку \"подсказка\", расположенную над кнопкой \"назад\", выведется сообщение
         с правильным ответом и точки переключатся в правильное состояние. Чтобы пройти то же
         упражнение после подсказки, нажмите кнопку \"вперёд\".
+        &<br>
+        <b>Шеститочие: письмо/чтение</b> (розовая кнопка справа над кнопкой "вперёд") изменяет порядок столбцов: точки
+        1, 2, 3 справа (как при письме на брайлевском приборе) или слева (как при чтении).
         ]]>
     </string>
 
@@ -343,6 +351,9 @@
         <br><br>
         В верхней половине экрана крупным шрифтом выведен плоскопечатный символ, а в нижней части -
         его представление точечным шрифтом. Нужно изучить точечный символ.
+        &<br>
+        <b>Шеститочие: письмо/чтение</b> (розовая кнопка справа над кнопкой "вперёд") изменяет порядок столбцов: точки
+        1, 2, 3 справа (как при письме на брайлевском приборе) или слева (как при чтении).
         ]]>
     </string>
 
@@ -351,6 +362,9 @@
         Пошаговый курс - <b>шаг с демонстрацией точек.</b>
         <br><br>
         На экран выведен точечный символ. Внимательно изучите его.
+        &<br>
+        <b>Шеститочие: письмо/чтение</b> (розовая кнопка справа над кнопкой "вперёд") изменяет порядок столбцов: точки
+        1, 2, 3 справа (как при письме на брайлевском приборе) или слева (как при чтении).
         ]]>
     </string>
 
@@ -360,6 +374,9 @@
         <br><br>
         В верхней половине экрана словами описан специальный символ, а в шеститочии в нижней части
          - его точечный состав. Внимательно изучите этот символ.
+         &<br>
+        <b>Шеститочие: письмо/чтение</b> (розовая кнопка справа над кнопкой "вперёд") изменяет порядок столбцов: точки
+        1, 2, 3 справа (как при письме на брайлевском приборе) или слева (как при чтении).
         ]]>
     </string>
 
@@ -501,12 +518,13 @@
     <string name="preference_summary_additional_qrcode_button">
         Отображать в главном меню кнопку \"QR-код\" для игры с карточками Брайля.
     </string>
-    <!--    TODO-->
     <string name="preference_title_is_write_mode_first">
-        Точки как для письма по умолчанию
+        При вводе столбец с точками 1, 2, 3 справа
+    </string>
+    <string name="preference_summary_is_write_mode_forst">
+        При заходе в практику или шаг с вводом точек столбец с точками 1, 2, 3 находится справа,
+        как при письме на брайлевском приборе.
     </string>
-    <!--    TODO-->
-    <string name="preference_summary_is_write_mode_forst">TODO</string>
 
     <!--    Stats-->
 
@@ -530,6 +548,5 @@
     <string name="stats_property_input_steps_passed">Пройдено шагов с вводом</string>
     <string name="stats_section_7days">За последние 7 дней</string>
     <string name="stats_section_30days">За последние 30 дней</string>
-    <!--    TODO too long description-->
-    <string name="flip_card">Режим как для письма (точки 123 слева) или как для чтения (точки 123 справа)</string>
+    <string name="flip_card">Шеститочие: письмо/чтение</string>
 </resources>

From 28c6dfc00d4cc45fcf57d7e5ea5386f2d81ff9da Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Mon, 28 Sep 2020 11:30:28 +0300
Subject: [PATCH 112/117] #223 fix dots traverse order when Default Traversal
 Mode off

---
 .../braillesystems/learnbraille/ui/views/BrailleDotsView.kt   | 4 ++--
 app/src/main/res/values/strings.xml                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
index 1c0a84d2..c4dc0a99 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
@@ -160,8 +160,8 @@ class BrailleDotsView : ConstraintLayout, KoinComponent {
                     dotButton4, dotButton5, dotButton6
                 )
                 Writing to false -> arrayOf(
-                    dotButton1, dotButton2, dotButton3,
-                    dotButton4, dotButton5, dotButton6
+                    dotButton1, dotButton4, dotButton2,
+                    dotButton5, dotButton3, dotButton6
                 )
                 Reading to true -> arrayOf(
                     dotButton1, dotButton2, dotButton3,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a68ea371..4c2357f1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -487,7 +487,7 @@
     <string name="preference_title_traversal_order">Обход точек в порядке нумерации</string>
     <string name="preference_summary_traversal_order">Работает с Андроид 5.1. Если включено,
         программа экранного доступа обходит точки шеститочия в порядке 1-2-3-4-5-6,
-        иначе 1-4-2-5-3-6.
+        иначе 1-4-2-5-3-6 (при чтении). При письме, если включено - 4-5-6-1-2-3, иначе 4-1-5-2-6-3.
     </string>
     <string name="preference_title_on_fly_check">Проверка ввода \"на лету\"</string>
     <string name="preference_summary_on_fly_check">Выводить сообщение \"правильно\",

From 473c498cbc02f0a2ae8c8451065a7593e2134759 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Mon, 28 Sep 2020 12:19:02 +0300
Subject: [PATCH 113/117] fix typos and style issues in README.md,
 CONTRIBUTING.md

---
 CONTRIBUTING.md | 20 ++++++++++----------
 README.md       | 20 +++++++++++---------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 565fa15a..e8c8710a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,37 +8,37 @@ For building and running the app, your either need to download a virtual Android
 
 ## Git workflow
 
-- Write short and informative commit messages. Start them with reference to issue (begins with `#`). [How to Write a Git Commit Message](https://chris.beams.io/posts/git-commit/).
+- Write short and informative commit messages. Mention the issue you're working on (begins with `#`), e. g. `implement something(#0)`. [How to Write a Git Commit Message](https://chris.beams.io/posts/git-commit/).
 - Follow [a successful Git branching model](https://nvie.com/posts/a-successful-git-branching-model/).
 
 ## Coding style
 
 - Kotlin [coding conventions](https://kotlinlang.org/docs/reference/coding-conventions.html) + Java [google style guides](https://google.github.io/styleguide/javaguide.html) and [oracle](https://www.oracle.com/technetwork/java/codeconvtoc-136057.html).
-- Also look around each time you do something new to see, how such thing was formatted and impelemented before.
-- Set up Android Studio proper kotlin code style `editor -> code style -> kotlin -> set from -> predefined -> Kotlin style guide`.
+- Also look around each time you do something new to see, how such a thing was formatted and implemented before.
+- Set up Android Studio proper Kotlin code style `editor -> code style -> kotlin -> set from -> predefined -> Kotlin style guide`.
 - Apply autoformatting to edited files each time before commit.
 
 ## Adding content
 
-There are handy DSL that allows write content in the typesafe way.
+There is a handy DSL that allows writing content in a typesafe way.
 
 - All app content should be placed into `com.github.braillesystems.learnbraille.res` package.
 - Use `DslTest.kt` file as DSL tutorial.
 
-Information correctness should be checked in compile time or in app initialization runtime as much as possible. If some additional info is need, do not hardcode it. Just make request to the new DSL feature via github issues.
+Information correctness should be checked in compile-time or during app initialization runtime as much as possible. If some additional info is needed, do not hardcode it. Just request the new DSL feature via GitHub Issues.
 
-Adding rules, prevent lambda of capturing context that will be invalid next time fragment entered, so use `Fragment.getString` outside of lambdas.
+Adding rules, prevent lambda of capturing context that will be invalid next time the fragment entered, so use `Fragment.getString` outside of lambdas.
 
 #### Adding course
 
 1. Create lessons by `lessons` delegate.
-2. Create course in `CourseBuilder` and add lessons to it.
+2. Create a course in `CourseBuilder` and add lessons to it.
 
-Always use `com.github.braillesystems.learnbraille.res.content` value to get materials, they are indexed here in proper way.
+Always use `com.github.braillesystems.learnbraille.res.content` value to get materials, they are indexed here in a proper way.
 
 #### Adding deck
 
-1. Add new deck tag to `DeckTags`.
+1. Add a new deck tag to `DeckTags`.
 2. Map tag to deck's predicate in `DecksBuilder`.
 3. Map deck's tag to user-visible string in `deckTagToName`.
 
@@ -48,7 +48,7 @@ Always use `com.github.braillesystems.learnbraille.res.content` value to get mat
 2. Add created materials to the `contens` (`materials` delegate).
 3. Add to `inputSymbolPrintRules` and `showSymbolPrintRules`, or to `inputMarkerPrintRules` and `showMarkerPrintRules`.
 
-Symbols that are not from particular alphabet and does not exist on classical american keyboard should be treated as special and be added via `enum class`.
+Symbols that are not from a particular alphabet and do not exist on the classical American keyboard should be treated as special and be added via `enum class`.
 
 New materials can be marked as known by default in `knownMaterials` (`known` delegate).
 
diff --git a/README.md b/README.md
index a77c8ac2..4ad82ddf 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,16 @@
 # Learn Braille
 
 [![Actions Status](https://github.com/braille-systems/learn-braille/workflows/Android%20CI/badge.svg)](https://github.com/braille-systems/learn-braille/actions)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
-Learn Braille is an android application for teaching Braille writing system.
+Learn Braille is an Android application for teaching the tactile writing system created
+by Louis Braille.
 
-It is one of the few apps primarily designed for Russian Braille system, 
+It is one of the few apps primarily designed for the Russian Braille system, 
 but also other systems could be easily added.
 
-App can be used with 
-[braille trainer](https://github.com/braille-systems/braille-trainer)
+The app can be used with 
+[Braille Trainer](https://github.com/braille-systems/braille-trainer)
 and [tiles](https://github.com/braille-systems/braille-tiles)
 or without them.
 
@@ -18,14 +20,14 @@ Take a look at [wiki pages (Russian)](https://github.com/braille-systems/learn-b
 
 ## User's Guidelines
 
-The app is [available](https://play.google.com/store/apps/details?id=com.github.braillesystems.learnbraille&hl=ru) in the google play.
+The app is [available](https://play.google.com/store/apps/details?id=com.github.braillesystems.learnbraille&hl=ru) in the Google Play.
 
 ### System Requirements and limitations
 
 To successfully run this application, your smartphone or tablet PC must satisfy the following conditions:
-- Android 4.4 KitKat or higher (`5.1` is required for `google talkback` optimisations).
-- Screen of size not less then 4 inches.
+- Android 4.4 KitKat or higher (`5.1` is required for `Google TalkBack` optimizations).
+- Screen of size not less than 4 inches.
 
 For accessibility, you will require TalkBack service.
-It is pre-installed by default on a majority of devices.
-For others it is available in the Google Play.
+It is pre-installed by default on a majority of devices. <br>
+For others, it is available in the Google Play.

From 98bb4bc804ce61f3099359742f62312dc2815138 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Mon, 28 Sep 2020 12:20:30 +0300
Subject: [PATCH 114/117] release 1.2.0: update version name & version tag

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a501f5f1..37326860 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.github.braillesystems.learnbraille"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 13
-        versionName "1.1.0"
+        versionCode 14
+        versionName "1.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true

From c7914a8bf5683da92d565184719865a95ad518d9 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Mon, 28 Sep 2020 12:38:48 +0300
Subject: [PATCH 115/117] Remove app task on exit

---
 .../learnbraille/ui/screens/exit/ExitFragment.kt         | 9 +++++++--
 .../github/braillesystems/learnbraille/utils/_Android.kt | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
index ff50e0bf..b68378b3 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
@@ -1,5 +1,6 @@
 package com.github.braillesystems.learnbraille.ui.screens.exit
 
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -8,8 +9,8 @@ import androidx.fragment.app.Fragment
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.databinding.FragmentExitBinding
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
-import com.github.braillesystems.learnbraille.utils.exitToLauncher
 import com.github.braillesystems.learnbraille.utils.navigate
+import com.github.braillesystems.learnbraille.utils.navigateToLauncher
 import com.github.braillesystems.learnbraille.utils.title
 
 class ExitFragment : Fragment() {
@@ -29,7 +30,11 @@ class ExitFragment : Fragment() {
         checkedAnnounce(title)
 
         exitButton.setOnClickListener {
-            exitToLauncher()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                activity?.finishAndRemoveTask()
+            } else {
+                navigateToLauncher()
+            }
         }
 
         continueButton.setOnClickListener {
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
index 142d4b3f..064135fb 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/utils/_Android.kt
@@ -100,7 +100,7 @@ fun Fragment.navigate(action: NavDirections) = try {
     Timber.e(e, "Multitouch navigation")
 }
 
-fun Fragment.exitToLauncher() {
+fun Fragment.navigateToLauncher() {
     val intent = Intent(Intent.ACTION_MAIN).apply {
         addCategory(Intent.CATEGORY_HOME)
         flags = Intent.FLAG_ACTIVITY_CLEAR_TOP

From 9318f456fdde244fd2c1896b0e8312a61aae3cc1 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Mon, 28 Sep 2020 13:08:09 +0300
Subject: [PATCH 116/117] Do not remove the app from the system tray

---
 .../learnbraille/ui/screens/exit/ExitFragment.kt          | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
index 1b889c9d..9506a7df 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/exit/ExitFragment.kt
@@ -1,6 +1,5 @@
 package com.github.braillesystems.learnbraille.ui.screens.exit
 
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -30,11 +29,8 @@ class ExitFragment : AbstractFragment() {
         checkedAnnounce(title)
 
         exitButton.setOnClickListener {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                activity?.finishAndRemoveTask()
-            } else {
-                navigateToLauncher()
-            }
+            navigate(R.id.action_global_menuFragment)
+            navigateToLauncher()
         }
 
         continueButton.setOnClickListener {

From d039f9a9ec1c3c35400fa8157962c0a5fc880763 Mon Sep 17 00:00:00 2001
From: Valerii Zuev <valera.zuev.zva@gmail.com>
Date: Mon, 28 Sep 2020 13:24:32 +0300
Subject: [PATCH 117/117] release/1.0.2: ignore Lint DB error

---
 app/build.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 37326860..00aff17a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,6 +51,9 @@ android {
             suppress = true
         }
     }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {