From ca257c4e4e68b1b60df9bed84f77bc8f579d7517 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 3 Oct 2020 11:56:21 +0300
Subject: [PATCH 1/8] #278 add text on braille dots

---
 .idea/codeStyles/codeStyleConfig.xml          |  1 +
 .../learnbraille/ui/views/BrailleDotsView.kt  | 42 +++++++++----------
 app/src/main/res/drawable/round_checkbox.xml  |  6 +--
 app/src/main/res/layout/braille_dots_view.xml |  6 +++
 app/src/main/res/values/strings.xml           |  7 ++++
 app/src/main/res/values/styles.xml            |  5 ++-
 6 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 79ee123c..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/ui/views/BrailleDotsView.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
index c4dc0a99..2783ef3e 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
@@ -117,27 +117,27 @@ class BrailleDotsView : ConstraintLayout, KoinComponent {
     }
 
     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)
-            }
+        val dotsMapping = when (mode) {
+            Writing -> listOf(
+                Triple(dotButton4, R.string.braille_dot_1, R.string.braille_dot_1_text),
+                Triple(dotButton5, R.string.braille_dot_2, R.string.braille_dot_2_text),
+                Triple(dotButton6, R.string.braille_dot_3, R.string.braille_dot_3_text),
+                Triple(dotButton1, R.string.braille_dot_4, R.string.braille_dot_4_text),
+                Triple(dotButton2, R.string.braille_dot_5, R.string.braille_dot_5_text),
+                Triple(dotButton3, R.string.braille_dot_6, R.string.braille_dot_6_text)
+            )
+            Reading -> listOf(
+                Triple(dotButton1, R.string.braille_dot_1, R.string.braille_dot_1_text),
+                Triple(dotButton2, R.string.braille_dot_2, R.string.braille_dot_2_text),
+                Triple(dotButton3, R.string.braille_dot_3, R.string.braille_dot_3_text),
+                Triple(dotButton4, R.string.braille_dot_4, R.string.braille_dot_4_text),
+                Triple(dotButton5, R.string.braille_dot_5, R.string.braille_dot_5_text),
+                Triple(dotButton6, R.string.braille_dot_6, R.string.braille_dot_6_text)
+            )
+        }
+        dotsMapping.forEach{ (dotButton, desc_id, caption_id) ->
+            dotButton.contentDescription = context.getString(desc_id)
+            dotButton.text = context.getString(caption_id)
         }
     }
 
diff --git a/app/src/main/res/drawable/round_checkbox.xml b/app/src/main/res/drawable/round_checkbox.xml
index cd049921..e67a3adc 100644
--- a/app/src/main/res/drawable/round_checkbox.xml
+++ b/app/src/main/res/drawable/round_checkbox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/checked_round_checkbox" android:state_checked="true" />
-    <item android:drawable="@drawable/checked_round_checkbox" android:state_pressed="true" />
-    <item android:drawable="@drawable/unchecked_round_checkbox" android:state_pressed="false" />
+    <item android:color="@color/colorBackground" android:drawable="@drawable/checked_round_checkbox" android:state_checked="true" />
+    <item android:color="@color/colorBackground" android:drawable="@drawable/checked_round_checkbox" android:state_pressed="true" />
+    <item android:color="@color/colorPrimary" android:drawable="@drawable/unchecked_round_checkbox" android:state_pressed="false" />
 </selector>
\ 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 1535a5e8..9408f492 100644
--- a/app/src/main/res/layout/braille_dots_view.xml
+++ b/app/src/main/res/layout/braille_dots_view.xml
@@ -15,6 +15,7 @@
         android:layout_marginEnd="@dimen/braille_dots_inner_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_inner_vertical_margin"
         android:contentDescription="@string/braille_dot_1"
+        android:text="@string/braille_dot_1_text"
         app:layout_constraintBottom_toTopOf="@+id/dotButton2"
         app:layout_constraintEnd_toStartOf="@+id/dotButton4"
         app:layout_constraintHorizontal_bias="0.5"
@@ -30,6 +31,7 @@
         android:layout_marginEnd="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_inner_vertical_margin"
         android:contentDescription="@string/braille_dot_2"
+        android:text="@string/braille_dot_2_text"
         app:layout_constraintBottom_toTopOf="@+id/dotButton3"
         app:layout_constraintEnd_toStartOf="@+id/dotButton5"
         app:layout_constraintHorizontal_bias="0.5"
@@ -44,6 +46,7 @@
         android:layout_marginEnd="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_outer_vertical_margin"
         android:contentDescription="@string/braille_dot_3"
+        android:text="@string/braille_dot_3_text"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/dotButton6"
         app:layout_constraintHorizontal_bias="0.5"
@@ -58,6 +61,7 @@
         android:layout_marginEnd="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_inner_vertical_margin"
         android:contentDescription="@string/braille_dot_4"
+        android:text="@string/braille_dot_4_text"
         app:layout_constraintBottom_toTopOf="@+id/dotButton5"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -72,6 +76,7 @@
         android:layout_marginEnd="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_inner_vertical_margin"
         android:contentDescription="@string/braille_dot_5"
+        android:text="@string/braille_dot_5_text"
         app:layout_constraintBottom_toTopOf="@+id/dotButton6"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -86,6 +91,7 @@
         android:layout_marginEnd="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_outer_vertical_margin"
         android:contentDescription="@string/braille_dot_6"
+        android:text="@string/braille_dot_6_text"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4c2357f1..50322d8f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -405,6 +405,13 @@
     <string name="braille_dot_5">точка пять</string>
     <string name="braille_dot_6">точка шесть</string>
 
+    <string name="braille_dot_1_text">1</string>
+    <string name="braille_dot_2_text">2</string>
+    <string name="braille_dot_3_text">3</string>
+    <string name="braille_dot_4_text">4</string>
+    <string name="braille_dot_5_text">5</string>
+    <string name="braille_dot_6_text">6</string>
+
     <!--    Action menu-->
 
     <string name="menu_title_help">Справка</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d2cfacdc..87514914 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -44,7 +44,10 @@
         <item name="android:layout_height">wrap_content</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="android:button">@null</item>
+        <item name="android:background">@drawable/round_checkbox</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">@drawable/round_checkbox</item>
     </style>
 
     <style name="bigLetterStyle">

From fb0d4f89f89bcfe0e9cf5b4859c885c4f0348482 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 3 Oct 2020 11:57:15 +0300
Subject: [PATCH 2/8] #278 replace flipColumns toasts with announcement for
 accessibility

---
 .../ui/screens/browser/MarkerViewFragment.kt      |  4 ----
 .../ui/screens/browser/SymbolViewFragment.kt      |  2 --
 .../ui/screens/practice/CardFragment.kt           |  6 +-----
 .../screens/theory/steps/AbstractStepFragment.kt  |  9 +--------
 .../steps/input/AbstractInputStepFragment.kt      |  2 --
 .../theory/steps/show/AbstractShowStepFragment.kt |  2 --
 .../learnbraille/ui/views/BrailleDotsView.kt      | 15 +++++++++++----
 app/src/main/res/values/strings.xml               |  4 ++--
 8 files changed, 15 insertions(+), 29 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 555f3cd3..3e1a82a6 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,7 +11,6 @@ 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
@@ -47,12 +46,9 @@ class MarkerViewFragment : AbstractFragmentWithHelp(R.string.browser_marker_view
         val text = showMarkerPrintRules.getValue(m.data.type)
         infoTextView.text = text
         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 ef427766..dd29e978 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
@@ -48,10 +48,8 @@ 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 8590d13b..2ea31ff6 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
@@ -86,7 +86,6 @@ 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) }
                 }
@@ -158,10 +157,7 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
                     getString(R.string.practice_deck_name_disabled_template)
                 }
                 toast(
-                    template.format(
-                        deckTagToName.getValue(tag),
-                        dotsMode(binding.brailleDots.mode)
-                    )
+                    template.format(deckTagToName.getValue(tag))
                 )
             }
         )
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 110f2a5c..1d9bc363 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,7 +9,6 @@ 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
@@ -18,7 +17,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.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.navigate
 import com.github.braillesystems.learnbraille.utils.title
 
@@ -83,12 +82,6 @@ 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 58028265..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
@@ -51,14 +51,12 @@ 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 8f233250..47106b6d 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,10 +13,8 @@ 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/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/BrailleDotsView.kt
index 2783ef3e..75d5ef2d 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
@@ -18,9 +18,7 @@ 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 com.github.braillesystems.learnbraille.utils.unreachable
+import com.github.braillesystems.learnbraille.utils.*
 import kotlinx.android.synthetic.main.braille_dots_view.view.*
 import org.koin.core.KoinComponent
 import org.koin.core.inject
@@ -108,6 +106,15 @@ class BrailleDotsView : ConstraintLayout, KoinComponent {
             Timber.w("API level < 22, unable co control accessibility traversal order")
         }
 
+        runIf(preferenceRepository.additionalAnnouncementsEnabled) {
+            context.announce(
+                when (mode) {
+                    Writing -> context.getString(R.string.braille_dots_mode_writing)
+                    Reading -> context.getString(R.string.braille_dots_mode_reading)
+                }
+            )
+        }
+
         this.mode = mode
     }
 
@@ -135,7 +142,7 @@ class BrailleDotsView : ConstraintLayout, KoinComponent {
                 Triple(dotButton6, R.string.braille_dot_6, R.string.braille_dot_6_text)
             )
         }
-        dotsMapping.forEach{ (dotButton, desc_id, caption_id) ->
+        dotsMapping.forEach { (dotButton, desc_id, caption_id) ->
             dotButton.contentDescription = context.getString(desc_id)
             dotButton.text = context.getString(caption_id)
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 50322d8f..721cb503 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -129,10 +129,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 1f3c0904bd58976e0ea98c3723014c814c50f246 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 3 Oct 2020 12:31:33 +0300
Subject: [PATCH 3/8] #278 refine dots captions appearance

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

diff --git a/app/src/main/res/layout/braille_dots_view.xml b/app/src/main/res/layout/braille_dots_view.xml
index 9408f492..b17e598b 100644
--- a/app/src/main/res/layout/braille_dots_view.xml
+++ b/app/src/main/res/layout/braille_dots_view.xml
@@ -61,6 +61,7 @@
         android:layout_marginEnd="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_inner_vertical_margin"
         android:contentDescription="@string/braille_dot_4"
+        android:paddingEnd="@dimen/braille_dots_right_column_text_padding"
         android:text="@string/braille_dot_4_text"
         app:layout_constraintBottom_toTopOf="@+id/dotButton5"
         app:layout_constraintEnd_toEndOf="parent"
@@ -76,6 +77,7 @@
         android:layout_marginEnd="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_inner_vertical_margin"
         android:contentDescription="@string/braille_dot_5"
+        android:paddingEnd="@dimen/braille_dots_right_column_text_padding"
         android:text="@string/braille_dot_5_text"
         app:layout_constraintBottom_toTopOf="@+id/dotButton6"
         app:layout_constraintEnd_toEndOf="parent"
@@ -91,6 +93,7 @@
         android:layout_marginEnd="@dimen/braille_dots_outer_horizontal_margin"
         android:layout_marginBottom="@dimen/braille_dots_outer_vertical_margin"
         android:contentDescription="@string/braille_dot_6"
+        android:paddingEnd="@dimen/braille_dots_right_column_text_padding"
         android:text="@string/braille_dot_6_text"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index cacf9cb5..bd2407b8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,6 +8,8 @@
     <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</dimen>
+    <!-- For whatever reason dots numbers in the right column appear not strictly in the middle, so we use padding to fix it-->
+    <dimen name="braille_dots_right_column_text_padding">1dp</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 87514914..e8b9706a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -48,6 +48,7 @@
         <item name="android:background">@drawable/round_checkbox</item>
         <item name="android:gravity">center</item>
         <item name="android:textColor">@drawable/round_checkbox</item>
+        <item name="android:fontFamily">sans-serif-light</item>
     </style>
 
     <style name="bigLetterStyle">

From 1ac762b7eaa814dff374b6568f8a74d4dd0a5cea Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 3 Oct 2020 13:48:22 +0300
Subject: [PATCH 4/8] #278 always announce dots reflection

---
 .../learnbraille/ui/views/BrailleDotsView.kt       | 14 ++++++--------
 app/src/main/res/drawable/to_progress.xml          | 10 ----------
 2 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 app/src/main/res/drawable/to_progress.xml

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 75d5ef2d..d4551ec8 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
@@ -106,14 +106,12 @@ class BrailleDotsView : ConstraintLayout, KoinComponent {
             Timber.w("API level < 22, unable co control accessibility traversal order")
         }
 
-        runIf(preferenceRepository.additionalAnnouncementsEnabled) {
-            context.announce(
-                when (mode) {
-                    Writing -> context.getString(R.string.braille_dots_mode_writing)
-                    Reading -> context.getString(R.string.braille_dots_mode_reading)
-                }
-            )
-        }
+        context.announce(
+            when (mode) {
+                Writing -> context.getString(R.string.braille_dots_mode_writing)
+                Reading -> context.getString(R.string.braille_dots_mode_reading)
+            }
+        )
 
         this.mode = mode
     }
diff --git a/app/src/main/res/drawable/to_progress.xml b/app/src/main/res/drawable/to_progress.xml
deleted file mode 100644
index fd4c2672..00000000
--- a/app/src/main/res/drawable/to_progress.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z" />
-</vector>
\ No newline at end of file

From 708647dfa1d5ed6ca2c593eb502d88ed87e89890 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Sat, 17 Oct 2020 11:35:37 +0300
Subject: [PATCH 5/8] (#278) braille dots: tweak paddings

---
 .idea/codeStyles/codeStyleConfig.xml       | 1 -
 app/src/main/res/values-sw320dp/dimens.xml | 2 ++
 app/src/main/res/values-sw360dp/dimens.xml | 2 ++
 app/src/main/res/values-sw400dp/dimens.xml | 2 ++
 app/src/main/res/values-sw600dp/dimens.xml | 2 ++
 app/src/main/res/values-sw720dp/dimens.xml | 2 ++
 6 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 6e6eec11..79ee123c 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,6 +1,5 @@
 <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/res/values-sw320dp/dimens.xml b/app/src/main/res/values-sw320dp/dimens.xml
index f95fc631..63de5629 100644
--- a/app/src/main/res/values-sw320dp/dimens.xml
+++ b/app/src/main/res/values-sw320dp/dimens.xml
@@ -9,6 +9,8 @@
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">1.1</dimen>
 
+    <dimen name="braille_dots_right_column_text_padding">0dp</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-sw360dp/dimens.xml b/app/src/main/res/values-sw360dp/dimens.xml
index 9fb5067e..584c44fb 100644
--- a/app/src/main/res/values-sw360dp/dimens.xml
+++ b/app/src/main/res/values-sw360dp/dimens.xml
@@ -9,6 +9,8 @@
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">1.25</dimen>
 
+    <dimen name="braille_dots_right_column_text_padding">0dp</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>
diff --git a/app/src/main/res/values-sw400dp/dimens.xml b/app/src/main/res/values-sw400dp/dimens.xml
index e0e9ebe7..38fac6e3 100644
--- a/app/src/main/res/values-sw400dp/dimens.xml
+++ b/app/src/main/res/values-sw400dp/dimens.xml
@@ -9,6 +9,8 @@
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">1.5</dimen>
 
+    <dimen name="braille_dots_right_column_text_padding">0dp</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-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 32c7b84c..90791389 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -9,6 +9,8 @@
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">1.8</dimen>
 
+    <dimen name="braille_dots_right_column_text_padding">1dp</dimen>
+
     <dimen name="side_buttons_extended_width">80dp</dimen>
     <dimen name="side_buttons_width">65dp</dimen>
     <dimen name="practice_buttons_height">300dp</dimen>
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
index 70f79b1a..4722a3d3 100644
--- a/app/src/main/res/values-sw720dp/dimens.xml
+++ b/app/src/main/res/values-sw720dp/dimens.xml
@@ -9,6 +9,8 @@
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">2.1</dimen>
 
+    <dimen name="braille_dots_right_column_text_padding">1dp</dimen>
+
     <dimen name="side_buttons_extended_width">90dp</dimen>
     <dimen name="side_buttons_width">75dp</dimen>
     <dimen name="practice_buttons_height">320dp</dimen>

From 1d180b047a80fad3ce191a1574d42cd210d78fa5 Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Sun, 18 Oct 2020 18:17:18 +0300
Subject: [PATCH 6/8] Fix hints in input dots step

---
 .../learnbraille/ui/Messages.kt               | 34 ++++++++++++++-----
 .../steps/input/AbstractInputStepFragment.kt  |  7 +++-
 .../theory/steps/input/InputDotsFragment.kt   | 10 ++++++
 app/src/main/res/values/strings.xml           | 20 +++++++----
 4 files changed, 55 insertions(+), 16 deletions(-)

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 6e9626c9..f9759767 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
@@ -22,23 +22,39 @@ fun Fragment.dotsMode(mode: BrailleDotsViewMode): String =
         BrailleDotsViewMode.Reading -> getString(R.string.braille_dots_mode_reading)
     }
 
-private val Context.dotsHintRules by lazyWithContext<Context, List<String>> {
+private val Context.dotsReadingHintRules by lazyWithContext<Context, List<String>> {
     listOf(
-        getString(R.string.input_dots_hint_1),
-        getString(R.string.input_dots_hint_2),
-        getString(R.string.input_dots_hint_3),
-        getString(R.string.input_dots_hint_4),
-        getString(R.string.input_dots_hint_5),
-        getString(R.string.input_dots_hint_6)
+        getString(R.string.input_dots_reading_hint_1),
+        getString(R.string.input_dots_reading_hint_2),
+        getString(R.string.input_dots_reading_hint_3),
+        getString(R.string.input_dots_reading_hint_4),
+        getString(R.string.input_dots_reading_hint_5),
+        getString(R.string.input_dots_reading_hint_6)
     )
 }
 
-fun Fragment.showHintDotsToast(expectedDots: BrailleDots) {
+private val Context.dotsWritingHintRules by lazyWithContext<Context, List<String>> {
+    listOf(
+        getString(R.string.input_dots_writing_hint_1),
+        getString(R.string.input_dots_writing_hint_2),
+        getString(R.string.input_dots_writing_hint_3),
+        getString(R.string.input_dots_writing_hint_4),
+        getString(R.string.input_dots_writing_hint_5),
+        getString(R.string.input_dots_writing_hint_6)
+    )
+}
+
+fun Fragment.showHintDotsToast(expectedDots: BrailleDots, mode: BrailleDotsViewMode) {
     val template = getString(R.string.input_dots_hint_template)
     val hint = expectedDots
         .filled
         .joinToString(separator = ", ") {
-            contextNotNull.dotsHintRules[it - 1]
+            contextNotNull.run {
+                when (mode) {
+                    BrailleDotsViewMode.Reading -> dotsReadingHintRules[it - 1]
+                    BrailleDotsViewMode.Writing -> dotsWritingHintRules[it - 1]
+                }
+            }
         }
     checkedToast(template.format(hint))
 }
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..ca7176e1 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
@@ -5,6 +5,7 @@ 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.BrailleDots
 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
@@ -72,7 +73,7 @@ abstract class AbstractInputStepFragment(helpMsgId: HelpMsgId) : AbstractStepFra
         viewModel.observeEventHint(
             viewLifecycleOwner, { dotsState }
         ) {
-            showHintToast(expectedDots)
+            toastHint(expectedDots)
             userTouchedDots = true
         }
 
@@ -105,5 +106,9 @@ abstract class AbstractInputStepFragment(helpMsgId: HelpMsgId) : AbstractStepFra
         showIncorrectToast()
     }
 
+    protected open fun toastHint(expectedDots: BrailleDots) {
+        showHintToast(expectedDots)
+    }
+
     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
index 405941a4..6d50deac 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
@@ -8,11 +8,13 @@ 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.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.BrailleDotsInfo
 import com.github.braillesystems.learnbraille.ui.screens.theory.steps.StepBinding
+import com.github.braillesystems.learnbraille.ui.showHintDotsToast
 import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode
 import com.github.braillesystems.learnbraille.utils.checkedAnnounce
 import com.github.braillesystems.learnbraille.utils.removeHtmlMarkup
@@ -59,4 +61,12 @@ class InputDotsFragment : AbstractInputStepFragment(R.string.lessons_help_input_
         lifecycleOwner = this@InputDotsFragment
 
     }.root
+
+    override fun toastHint(expectedDots: BrailleDots) {
+        showHintDotsToast(
+            expectedDots,
+            stepBinding.brailleDotsInfo?.view?.mode
+                ?: error("Input dots step should have dots")
+        )
+    }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 721cb503..c91bf56f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,12 +32,20 @@
     <string name="input_loading">Подождите, задание загружается</string>
     <string name="input_hint_template">Ответ: точки %s</string>
     <string name="input_dots_hint_template">Ответ: %s</string>
-    <string name="input_dots_hint_1">точка 1 слева сверху</string>
-    <string name="input_dots_hint_2">точка 2 слева посередине</string>
-    <string name="input_dots_hint_3">точка 3 слева снизу</string>
-    <string name="input_dots_hint_4">точка 4 справа сверху</string>
-    <string name="input_dots_hint_5">точка 5 справа посередине</string>
-    <string name="input_dots_hint_6">точка 6 справа снизу</string>
+
+    <string name="input_dots_reading_hint_1">точка 1 слева сверху</string>
+    <string name="input_dots_reading_hint_2">точка 2 слева посередине</string>
+    <string name="input_dots_reading_hint_3">точка 3 слева снизу</string>
+    <string name="input_dots_reading_hint_4">точка 4 справа сверху</string>
+    <string name="input_dots_reading_hint_5">точка 5 справа посередине</string>
+    <string name="input_dots_reading_hint_6">точка 6 справа снизу</string>
+
+    <string name="input_dots_writing_hint_4">точка 4 слева сверху</string>
+    <string name="input_dots_writing_hint_5">точка 5 слева посередине</string>
+    <string name="input_dots_writing_hint_6">точка 6 слева снизу</string>
+    <string name="input_dots_writing_hint_1">точка 1 справа сверху</string>
+    <string name="input_dots_writing_hint_2">точка 2 справа посередине</string>
+    <string name="input_dots_writing_hint_3">точка 3 справа снизу</string>
 
     <string name="input_letter_intro_template">Введите букву: %s</string>
     <string name="input_latin_letter_intro_template">Введите латинскую букву: %s</string>

From d1f96b0d202615807a0d609f44f077512261d683 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Mon, 19 Oct 2020 13:14:20 +0300
Subject: [PATCH 7/8] #287 rename theory -> learning

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c91bf56f..75f8aa0c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -168,7 +168,7 @@
         который нужно ввести в шеститочии в нижней половине экрана и нажать кнопку <b>\“далее\”</b>
         справа.
         &<br>
-        По умолчанию выдаются только карточки с символами, изученными в разделе \"теория\". Чтобы
+        По умолчанию выдаются только карточки с символами, изученными в разделе \"Обучение\". Чтобы
         повторять любые символы, измените это в настройках приложения.
         &<br>
         <b>Шеститочие: письмо/чтение</b> (розовая кнопка справа по центру) - изменяет порядок столбцов: точки
@@ -205,7 +205,7 @@
 
     <!--    Menu-->
 
-    <string name="menu_continue">ТЕОРИЯ</string>
+    <string name="menu_continue">ОБУЧЕНИЕ</string>
     <string name="menu_practice">ПРАКТИКА</string>
     <string name="menu_browser">СИМВОЛЫ</string>
     <string name="menu_stats">СТАТИСТИКА</string>
@@ -224,7 +224,7 @@
         <![CDATA[
         <b>Обучение системе Луи Брайля: главное меню.</b>
         &<br><br>
-        <b>Теория:</b> пошаговые уроки с демонстрацией плоскопечатных и
+        <b>Обучение:</b> пошаговые уроки с демонстрацией плоскопечатных и
         рельефно-точечных символов крупным шрифтом, вводом символов и поясняющими комментариями.
         &<br>
         <b>Практика:</b> Повторение символов.
@@ -448,7 +448,7 @@
     <string name="browser_help">
         <![CDATA[
         В данном разделе можно просмотреть точечный состав любой буквы,
-        цифры или специального символа. Буквы расположены здесь в порядке \"зрячего\" алфавита,
+        цифры или специального символа. Буквы расположены здесь в алфавитном порядке,
         а не в порядке \"ключа Брайля\", как они изучаются в курсе.
         &<br>
         Помните, что при написании чисел нужно вначале ставить цифровой знак. При написании слов на
@@ -492,10 +492,10 @@
     <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>
@@ -511,7 +511,7 @@
     </string>
     <string name="preference_title_only_seen_materials">Повторять только изученное</string>
     <string name="preference_summary_only_seen_materials">
-        В разделе \"Практика\" повторять только символы, пройденные в разделе \"Теория\".
+        В разделе \"Практика\" повторять только символы, пройденные в разделе \"Обучение\".
     </string>
     <string name="preference_title_additional_announcements">
         Автоозвучка текстов
@@ -524,8 +524,8 @@
         Режим повышенной доступности
     </string>
     <string name="preference_summary_extended_accessibility">
-        Крупный шрифт в разделе \"теория\". Дополнительные кнопки выхода (удобно при использовании программы
-        экранного доступа). Шире боковые кнопки в практике и теории.
+        Крупный шрифт в разделе \"Обучение\". Дополнительные кнопки выхода (удобно при использовании программы
+        экранного доступа). Шире боковые кнопки в практике и обучении.
     </string>
     <string name="preference_title_additional_qrcode_button">
         Возможность сканировать QR-код
@@ -558,7 +558,7 @@
     <string name="stats_property_mastered_card">Пройдено карточек</string>
     <string name="stats_property_hints_used">Потребовалось подсказок</string>
     <string name="stats_property_total_attempts">Потрачено попыток</string>
-    <string name="stats_title_theory">Теория:</string>
+    <string name="stats_title_theory">Обучение:</string>
     <string name="stats_property_steps_passed">Пройдено шагов</string>
     <string name="stats_property_input_steps_passed">Пройдено шагов с вводом</string>
     <string name="stats_section_7days">За последние 7 дней</string>

From 455268dff94ab9c368cf5cbc8eaf4bff5429aee9 Mon Sep 17 00:00:00 2001
From: zuevval <valera.zuev.zva@gmail.com>
Date: Mon, 19 Oct 2020 13:40:42 +0300
Subject: [PATCH 8/8] release/1.2.1: update version code & version name

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

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