From d169964ae60a2fb3481d2b28372a9c247056808b Mon Sep 17 00:00:00 2001
From: Andrey Stoyan <andrey.stoyan.csam@gmail.com>
Date: Mon, 19 Aug 2024 11:22:45 +0300
Subject: [PATCH] Restore buildability #333

---
 .idea/codeStyles/Project.xml                  |   6 +-
 .idea/deploymentTargetSelector.xml            |  10 +
 .idea/kotlinc.xml                             |   6 +
 .idea/migrations.xml                          |  10 +
 .idea/other.xml                               | 252 ++++++++++++++++++
 .idea/runConfigurations.xml                   |  12 -
 app/build.gradle                              |  85 +++---
 app/src/main/AndroidManifest.xml              |  11 +-
 .../data/db/LearnBrailleDatabase.kt           |   4 +-
 .../learnbraille/data/entities/Actions.kt     |   9 +-
 .../data/entities/MaterialData.kt             |   9 +-
 .../learnbraille/data/entities/StepData.kt    |   8 +-
 .../ui/brailletrainer/BrailleTrainer.kt       |   4 +-
 .../ui/screens/AbstractFragmentWithHelp.kt    |   3 +-
 .../learnbraille/ui/screens/DotsChecker.kt    |   4 +-
 .../ui/screens/stats/StatsFragment.kt         |  21 +-
 .../learnbraille/ui/views/BrailleDotsView.kt  |  23 +-
 .../learnbraille/ui/views/HelpView.kt         |   4 +-
 .../learnbraille/utils/Utils.kt               |   4 +-
 build.gradle                                  |  41 +--
 gradle.properties                             |   3 +
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 gradlew                                       |   0
 settings.gradle                               |  22 ++
 24 files changed, 412 insertions(+), 143 deletions(-)
 create mode 100644 .idea/deploymentTargetSelector.xml
 create mode 100644 .idea/kotlinc.xml
 create mode 100644 .idea/migrations.xml
 create mode 100644 .idea/other.xml
 delete mode 100644 .idea/runConfigurations.xml
 mode change 100644 => 100755 gradlew

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 7a748e40..feb0c694 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,9 +3,9 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <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" />
+          <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="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 00000000..b268ef36
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 00000000..fdf8d994
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.9.0" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 00000000..f8051a6f
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/other.xml b/.idea/other.xml
new file mode 100644
index 00000000..4604c446
--- /dev/null
+++ b/.idea/other.xml
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="direct_access_persist.xml">
+    <option name="deviceSelectionList">
+      <list>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="27" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="F01L" />
+          <option name="id" value="F01L" />
+          <option name="manufacturer" value="FUJITSU" />
+          <option name="name" value="F-01L" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1280" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="28" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="SH-01L" />
+          <option name="id" value="SH-01L" />
+          <option name="manufacturer" value="SHARP" />
+          <option name="name" value="AQUOS sense2 SH-01L" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a51" />
+          <option name="id" value="a51" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A51" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="akita" />
+          <option name="id" value="akita" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b0q" />
+          <option name="id" value="b0q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S22 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="32" />
+          <option name="brand" value="google" />
+          <option name="codename" value="bluejay" />
+          <option name="id" value="bluejay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="crownqlteue" />
+          <option name="id" value="crownqlteue" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Note9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2220" />
+          <option name="screenY" value="1080" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm3q" />
+          <option name="id" value="dm3q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S23 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix_camera" />
+          <option name="id" value="felix_camera" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold (Camera-enabled)" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8uwifi" />
+          <option name="id" value="gts8uwifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8 Ultra" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1848" />
+          <option name="screenY" value="2960" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="husky" />
+          <option name="id" value="husky" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8 Pro" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="java" />
+          <option name="id" value="java" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="G20" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="lynx" />
+          <option name="id" value="lynx" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="google" />
+          <option name="codename" value="oriole" />
+          <option name="id" value="oriole" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="panther" />
+          <option name="id" value="panther" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q5q" />
+          <option name="id" value="q5q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold5" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1812" />
+          <option name="screenY" value="2176" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="r11" />
+          <option name="id" value="r11" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Watch" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="384" />
+          <option name="screenY" value="384" />
+          <option name="type" value="WEAR_OS" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="redfin" />
+          <option name="id" value="redfin" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 5" />
+          <option name="screenDensity" value="440" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="shiba" />
+          <option name="id" value="shiba" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tangorpro" />
+          <option name="id" value="tangorpro" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Tablet" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="x1q" />
+          <option name="id" value="x1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S20" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3200" />
+        </PersistentDeviceSelectionData>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460d..00000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 28bbaaeb..e0da1948 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,31 +1,33 @@
-apply plugin: 'com.android.application'
-
-apply plugin: 'kotlin-android'
-
-apply plugin: 'kotlin-android-extensions'
-
-apply plugin: 'kotlin-kapt'
-
-apply plugin: 'androidx.navigation.safeargs'
-
-apply plugin: 'kotlinx-serialization'
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.plugin.serialization'
+    id 'androidx.navigation.safeargs.kotlin'
+    id 'org.jetbrains.kotlin.kapt'
+    id 'org.jetbrains.dokka'
+}
 
-apply plugin: 'org.jetbrains.dokka'
+android {
+    namespace 'com.github.braillesystems.learnbraille'
+    lint {
+        abortOnError false
+        disable 'MissingTranslation'
+    }
+}
 
 android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 30
-    buildToolsVersion "29.0.3"
-    dataBinding {
-        enabled = true
+    kotlinOptions {
+        jvmTarget = "1.8"
     }
+    compileSdkVersion 34
     defaultConfig {
         applicationId "com.github.braillesystems.learnbraille"
-        minSdkVersion 19
-        targetSdkVersion 30
+        minSdkVersion 24
+        targetSdkVersion 34
         versionCode 21
         versionName "1.3.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -51,22 +53,22 @@ android {
             suppress = true
         }
     }
-    lintOptions {
-        abortOnError false
+    buildFeatures {
+        viewBinding true
+        dataBinding true
     }
 }
 
 dependencies {
     def lifecycle_version = "2.2.0"
-    def koin_version = '2.1.5'
+    def koin_version = '3.5.6'
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.core:core-ktx:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
 
     // Usb serial
     implementation 'com.github.felHR85:UsbSerial:6.1.0'
@@ -76,50 +78,41 @@ dependencies {
     kapt "androidx.room:room-compiler:$version_room"
     implementation "androidx.room:room-ktx:$version_room"
     testImplementation "androidx.room:room-testing:$version_room"
-    implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
+    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
 
     // Testing
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 
     // Navigation
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.2.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.2.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
 
     // Timber logging
-    implementation 'com.jakewharton.timber:timber:4.7.1'
+    implementation 'com.jakewharton.timber:timber:5.0.1'
 
     // Lifecycle
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
 
     //Design
-    implementation 'com.google.android.material:material:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.material:material:1.12.0'
 
     // Serialization
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" // or "kotlin-stdlib-jdk8"
     // Downgraded to '0.14.0' because of https://github.com/Kotlin/kotlinx.serialization/issues/576
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0" // JVM dependency
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1'
 
     // Koin
-    implementation "org.koin:koin-core:$koin_version"
-    implementation "org.koin:koin-core-ext:$koin_version"
-    implementation "org.koin:koin-android:$koin_version"
-    implementation "org.koin:koin-android-viewmodel:$koin_version"
-    implementation "org.koin:koin-android-ext:$koin_version"
+    implementation "io.insert-koin:koin-core:$koin_version"
+    implementation "io.insert-koin:koin-android:$koin_version"
+    implementation "io.insert-koin:koin-android-compat:$koin_version"
 
     // Many methods
     implementation 'com.android.support:multidex:1.0.3'
 
     //Settings
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
 
     // Playing musical notes
     implementation 'com.github.braille-systems:perfectTune:bc09ec2890'
 }
-
-android {
-    lintOptions {
-        disable 'MissingTranslation'
-    }
-}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 30863e5c..ac1e272b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.github.braillesystems.learnbraille">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <application
         android:name="com.github.braillesystems.learnbraille.LearnBrailleApplication"
         android:allowBackup="false"
-        tools:replace="android:allowBackup"
         android:icon="@mipmap/icon_univ"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/icon_univ_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name="com.github.braillesystems.learnbraille.ui.screens.MainActivity">
+        android:theme="@style/AppTheme"
+        tools:replace="android:allowBackup">
+        <activity
+            android:name="com.github.braillesystems.learnbraille.ui.screens.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />
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 dbe224bc..a2ea1f71 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
@@ -18,8 +18,8 @@ import com.github.braillesystems.learnbraille.utils.logged
 import com.github.braillesystems.learnbraille.utils.scope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import org.koin.core.KoinComponent
-import org.koin.core.get
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
 import timber.log.Timber
 
 @Database(
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 b2f0aa5c..4b21b0a9 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
@@ -2,8 +2,9 @@ package com.github.braillesystems.learnbraille.data.entities
 
 import androidx.room.*
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UnstableDefault
+import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.encodeToStream
 import java.util.*
 
 @Entity(tableName = "actions")
@@ -60,11 +61,9 @@ data class TheoryPassStep(val isInput: Boolean) : TheoryActions()
 
 class ActionTypeConverters {
 
-    @UnstableDefault
     @TypeConverter
-    fun to(t: ActionType) = Json.stringify(ActionType.serializer(), t)
+    fun to(t: ActionType) = Json.encodeToString(ActionType.serializer(), t)
 
-    @UnstableDefault
     @TypeConverter
-    fun from(s: String) = Json.parse(ActionType.serializer(), s)
+    fun from(s: String) = Json.decodeFromString(ActionType.serializer(), s)
 }
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 a1ea408f..1e65074c 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
@@ -4,7 +4,8 @@ import androidx.room.TypeConverter
 import com.github.braillesystems.learnbraille.res.MarkerType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UnstableDefault
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 @Serializable
@@ -12,13 +13,11 @@ sealed class MaterialData
 
 class MaterialDataTypeConverters {
 
-    @UnstableDefault
     @TypeConverter
-    fun to(md: MaterialData): String = Json.stringify(MaterialData.serializer(), md)
+    fun to(md: MaterialData): String = Json.encodeToString(MaterialData.serializer(), md)
 
-    @UnstableDefault
     @TypeConverter
-    fun from(s: String): MaterialData = Json.parse(MaterialData.serializer(), s)
+    fun from(s: String): MaterialData = Json.decodeFromString(MaterialData.serializer(), s)
 }
 
 typealias SymbolType = String
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 25ab9b00..348d909d 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
@@ -3,7 +3,7 @@ package com.github.braillesystems.learnbraille.data.entities
 import androidx.room.TypeConverter
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UnstableDefault
+import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 
 /**
@@ -17,13 +17,11 @@ sealed class StepData
 
 class StepDataConverters {
 
-    @UnstableDefault
     @TypeConverter
-    fun to(stepData: StepData) = Json.stringify(StepData.serializer(), stepData)
+    fun to(stepData: StepData) = Json.encodeToString(StepData.serializer(), stepData)
 
-    @UnstableDefault
     @TypeConverter
-    fun from(string: String) = Json.parse(StepData.serializer(), string)
+    fun from(string: String) = Json.decodeFromString(StepData.serializer(), string)
 }
 
 typealias HtmlText = String
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/brailletrainer/BrailleTrainer.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/brailletrainer/BrailleTrainer.kt
index 156bac28..492a733e 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/brailletrainer/BrailleTrainer.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/brailletrainer/BrailleTrainer.kt
@@ -4,8 +4,8 @@ import android.app.Activity
 import com.github.braillesystems.learnbraille.data.entities.BrailleDots
 import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.utils.runIf
-import org.koin.core.KoinComponent
-import org.koin.core.get
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
 
 object BrailleTrainer : KoinComponent {
 
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 d7e6fcfc..44ec2815 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
@@ -34,8 +34,7 @@ abstract class AbstractFragmentWithHelp(private val helpMsgId: HelpMsgId) : Abst
 
     private fun navigateToHelp(helpMsg: String) {
         Timber.i("Navigate to help")
-        val action = HelpFragmentDirections.actionGlobalHelpFragment()
-        action.helpMessage = helpMsg
+        val action = HelpFragmentDirections.actionGlobalHelpFragment(helpMsg)
         navigate(action)
     }
 }
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 6b57e048..49614801 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
@@ -10,8 +10,8 @@ import com.github.braillesystems.learnbraille.data.repository.PreferenceReposito
 import com.github.braillesystems.learnbraille.ui.brailletrainer.BrailleTrainer
 import com.github.braillesystems.learnbraille.ui.views.*
 import com.github.braillesystems.learnbraille.utils.checkedBuzz
-import org.koin.core.KoinComponent
-import org.koin.core.get
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
 import timber.log.Timber
 
 /**
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 f404903e..00c1ab6c 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,8 +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 kotlinx.android.synthetic.main.fragment_stats.*
-import kotlinx.android.synthetic.main.fragment_stats_table.view.*
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
@@ -35,10 +33,10 @@ class StatsFragment : AbstractFragmentWithHelp(R.string.stats_help) {
         R.layout.fragment_stats,
         container,
         false
-    ).ini().also {
+    ).ini().also { binding ->
 
         scope(job).launch {
-            forEach(stats_week to 7, stats_month to 30) { (view, days) ->
+            forEach(binding.statsWeek to 7, binding.statsMonth to 30) { (view, days) ->
                 val actions: Actions = actionsRepository.actionsFrom(Days(days))
 
                 val cardsMastered =
@@ -46,18 +44,13 @@ class StatsFragment : AbstractFragmentWithHelp(R.string.stats_help) {
                 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()
+                    practiceMasteredCards.text = cardsMastered.toString()
+                    practiceHints.text = hintsUsed.toString()
+                    practiceTotalAttempts.text = totalAttempts.toString()
                 }
 
-                val theoryStepsPassed = actions.count { it.type is TheoryPassStep }
-                val theoryInputStepsPassed =
-                    actions.count { it.type is TheoryPassStep && it.type.isInput }
-                view.apply {
-                    theory_steps_passed.text = theoryStepsPassed.toString()
-                    theory_input_steps_passed.text = theoryInputStepsPassed.toString()
-                }
+                view.theoryStepsPassed.text = actions.count { it.type is TheoryPassStep }.toString()
+                view.theoryInputStepsPassed.text = actions.count { it.type is TheoryPassStep && it.type.isInput }.toString()
             }
         }
 
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 7708f24e..dac2c666 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
@@ -10,18 +10,19 @@ import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.CheckBox
 import androidx.annotation.RequiresApi
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.databinding.DataBindingUtil
 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.spelling
 import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
+import com.github.braillesystems.learnbraille.databinding.BrailleDotsViewBinding
 import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode.Reading
 import com.github.braillesystems.learnbraille.ui.views.BrailleDotsViewMode.Writing
 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
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import timber.log.Timber
 
 @SuppressLint("AppCompatCustomView") // Causes BrailleDotView misplacement
@@ -62,6 +63,12 @@ val BrailleDotsViewMode.reflected: BrailleDotsViewMode
 class BrailleDotsView : ConstraintLayout, KoinComponent {
 
     private val preferenceRepository: PreferenceRepository by inject()
+    val dotButton1: BrailleDotView
+    val dotButton2: BrailleDotView
+    val dotButton3: BrailleDotView
+    val dotButton4: BrailleDotView
+    val dotButton5: BrailleDotView
+    val dotButton6: BrailleDotView
 
     constructor(context: Context) : super(context)
 
@@ -74,9 +81,13 @@ class BrailleDotsView : ConstraintLayout, KoinComponent {
     )
 
     init {
-        LayoutInflater
-            .from(context)
-            .inflate(R.layout.braille_dots_view, this, true)
+        val binding = BrailleDotsViewBinding.inflate(LayoutInflater.from(context), this, false)
+        dotButton1 = binding.dotButton1
+        dotButton2 = binding.dotButton2
+        dotButton3 = binding.dotButton3
+        dotButton4 = binding.dotButton4
+        dotButton5 = binding.dotButton5
+        dotButton6 = binding.dotButton6
     }
 
     // After changing traversal order neighbor views forget that braille dots are next
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/HelpView.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/HelpView.kt
index f9cb3434..4a4e175b 100644
--- a/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/HelpView.kt
+++ b/app/src/main/java/com/github/braillesystems/learnbraille/ui/views/HelpView.kt
@@ -9,8 +9,8 @@ import androidx.core.text.parseAsHtml
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.data.repository.PreferenceRepository
 import com.github.braillesystems.learnbraille.utils.extendedTextSize
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
 class HelpView : LinearLayout, KoinComponent {
 
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 2bd2ae90..088b2d24 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
@@ -89,8 +89,8 @@ 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)
+fun <T> stringify(s: SerializationStrategy<T>, obj: T) = Json.encodeToString(s, obj)
+fun <T> parse(d: DeserializationStrategy<T>, s: String) = Json.decodeFromString(d, s)
 
 
 val Context.extendedTextSize: Float by lazyWithContext {
diff --git a/build.gradle b/build.gradle
index 4dcf30c4..481d61b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,37 +2,22 @@
 
 buildscript {
     ext {
-        // Downgraded from '1.3.72', annotation processing error in compiler
-        // Then upgraded to '1.3.61' because of https://github.com/Kotlin/kotlinx.serialization/issues/576
-        kotlin_version = '1.3.61'
-        version_navigation = '1.0.0'
-        version_room = "2.2.5"
+        kotlin_version = '1.9.0'
+        version_navigation = '2.7.7'
+        version_room = "2.6.1"
         version_dokka="0.9.18"
     }
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        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"
-        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
-    }
 }
 
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        maven { url "https://jitpack.io" }
-    }
+plugins {
+    id 'com.android.application' version '8.5.2' apply false
+    id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
+    id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlin_version" apply false
+    id 'androidx.navigation.safeargs.kotlin' version "$version_navigation" apply false
+    id 'org.jetbrains.kotlin.kapt' version "$kotlin_version" apply false
+    id 'org.jetbrains.dokka' version "$version_dokka" apply false
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
+//tasks.register('clean', Delete) {
+//    delete rootProject.buildDir
+//}
diff --git a/gradle.properties b/gradle.properties
index 23339e0d..e1c0ed09 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,3 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
+android.defaults.buildfeatures.buildconfig=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bb82d3a3..b31af637 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jun 25 00:38:40 MSK 2020
+#Sat Aug 17 12:30:42 MSK 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/settings.gradle b/settings.gradle
index a44c2430..7061356a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,24 @@
+pluginManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven { url "https://jitpack.io" }
+    }
+}
+
 include ':app'
 rootProject.name='LearnBraille'