Merge branch 'develop'

Author: RznNike

app/build.gradle.kts

@@ -14,7 +14,7 @@ android {
     namespace = "ru.rznnike.eyehealthmanager"
 
     compileSdk = rootProject.extra["TARGET_SDK"] as Int
-    buildToolsVersion = "35.0.0"
+    buildToolsVersion = "36.0.0"
 
     signingConfigs {
         create("config") {
@@ -40,6 +40,7 @@ android {
         targetSdk = rootProject.extra["TARGET_SDK"] as Int
         versionCode = rootProject.extra["VERSION_CODE"] as Int
         versionName = rootProject.extra["VERSION_NAME"] as String
+        @Suppress("DEPRECATION")
         resourceConfigurations += setOf("en", "ru")
     }
 
@@ -112,7 +113,6 @@ android {
         abi.enableSplit = false
         language.enableSplit = false
     }
-    @Suppress("UnstableApiUsage")
     testOptions {
         unitTests.all {
             it.useJUnitPlatform()
@@ -130,29 +130,30 @@ dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:" + rootProject.extra["desugaringVersion"])
 
     // AndroidX
-    implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.appcompat:appcompat:1.7.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.2.1")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    val lifecycleVersion = "2.8.6"
+    val lifecycleVersion = "2.9.3"
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-process:$lifecycleVersion")
     implementation("androidx.preference:preference-ktx:1.2.1")
     implementation("androidx.viewpager2:viewpager2:1.1.0")
-    implementation("androidx.annotation:annotation:1.9.0")
-    implementation("androidx.fragment:fragment-ktx:1.8.4")
-    implementation("androidx.window:window:1.3.0")
+    implementation("androidx.annotation:annotation:1.9.1")
+    implementation("androidx.fragment:fragment-ktx:1.8.9")
+    implementation("androidx.window:window:1.4.0")
+    implementation("androidx.documentfile:documentfile:1.1.0")
 
     // Coroutines
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:" + rootProject.extra["coroutinesVersion"])
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:" + rootProject.extra["coroutinesVersion"])
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:" + rootProject.extra["coroutinesVersion"])
 
     // Material
-    implementation("com.google.android.material:material:1.12.0")
+    implementation("com.google.android.material:material:1.13.0")
 
     // Firebase
-    implementation("com.google.firebase:firebase-crashlytics-ktx:19.2.0")
-    implementation("com.google.firebase:firebase-messaging:24.0.2")
+    implementation("com.google.firebase:firebase-crashlytics-ktx:19.4.4")
+    implementation("com.google.firebase:firebase-messaging:25.0.0")
 
     // Koin
     // https://github.com/InsertKoinIO/koin
@@ -183,7 +184,7 @@ dependencies {
 
     // Image loader
     // https://github.com/coil-kt/coil
-    implementation("io.coil-kt:coil:2.7.0")
+    implementation("io.coil-kt.coil3:coil:3.3.0")
 
     // MPAndroidChart
     // https://github.com/PhilJay/MPAndroidChart
@@ -194,7 +195,7 @@ dependencies {
 
     // ViewBinding
     // https://github.com/kirich1409/ViewBindingPropertyDelegate
-    implementation("com.github.kirich1409:viewbindingpropertydelegate-noreflection:1.5.9")
+    implementation("dev.androidbroadcast.vbpd:vbpd:2.0.4")
 
     // FlexboxLayoutManager
     // https://github.com/google/flexbox-layout
@@ -206,9 +207,9 @@ dependencies {
 
     // Mocks for testing
     // https://github.com/mockito/mockito
-    val mockitoVersion = "5.14.2"
+    val mockitoVersion = "5.19.0"
     testImplementation("org.mockito:mockito-core:$mockitoVersion")
     testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion")
     // https://github.com/mockito/mockito-kotlin
-    testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:6.0.0")
 }

app/src/main/AndroidManifest.xml

@@ -22,7 +22,7 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
             android:exported="true"
-            tools:ignore="LockedOrientationActivity">
+            tools:ignore="DiscouragedApi,LockedOrientationActivity">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/ru/rznnike/eyehealthmanager/app/Screens.kt

@@ -50,6 +50,7 @@ import ru.rznnike.eyehealthmanager.domain.model.test.astigmatism.AstigmatismAnsw
 import ru.rznnike.eyehealthmanager.domain.model.test.daltonism.DaltonismAnomalyType
 import ru.rznnike.eyehealthmanager.domain.model.common.DayPart
 import ru.rznnike.eyehealthmanager.domain.model.test.nearfar.NearFarAnswerType
+import androidx.core.net.toUri
 
 object Screens {
     object Flow {
@@ -182,7 +183,7 @@ object Screens {
         fun actionAppSettings() = ActivityScreen("actionAppSettings") { context ->
             Intent(
                 Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
-                Uri.parse("package:" + context.packageName)
+                ("package:" + context.packageName).toUri()
             ).apply {
                 addCategory(Intent.CATEGORY_DEFAULT)
                 flags = Intent.FLAG_ACTIVITY_NEW_TASK
@@ -197,7 +198,7 @@ object Screens {
             Intent(
                 Intent.ACTION_VIEW
             ).apply {
-                data = Uri.parse(link)
+                data = link.toUri()
                 setPackage(specificPackage)
             }
         }
@@ -222,7 +223,7 @@ object Screens {
                 Intent(
                     Intent.ACTION_SENDTO
                 ).apply {
-                    data = Uri.parse("mailto:")
+                    data = "mailto:".toUri()
                     putExtra(Intent.EXTRA_EMAIL, arrayOf(email))
                     putExtra(Intent.EXTRA_SUBJECT, subject)
                 },

app/src/main/java/ru/rznnike/eyehealthmanager/app/ui/activity/AppActivity.kt

@@ -9,10 +9,10 @@ import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.updatePadding
-import by.kirich1409.viewbindingdelegate.viewBinding
 import com.github.terrakok.cicerone.Navigator
 import com.github.terrakok.cicerone.NavigatorHolder
 import com.google.android.material.snackbar.Snackbar
+import dev.androidbroadcast.vbpd.viewBinding
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import moxy.presenter.InjectPresenter
@@ -27,6 +27,7 @@ import ru.rznnike.eyehealthmanager.app.dispatcher.notifier.SystemMessage
 import ru.rznnike.eyehealthmanager.app.global.ui.activity.BaseActivity
 import ru.rznnike.eyehealthmanager.app.navigation.AppRouter
 import ru.rznnike.eyehealthmanager.app.navigation.SupportAppNavigation
+import ru.rznnike.eyehealthmanager.app.notification.Notificator
 import ru.rznnike.eyehealthmanager.app.presentation.app.AppPresenter
 import ru.rznnike.eyehealthmanager.app.presentation.app.AppView
 import ru.rznnike.eyehealthmanager.app.utils.extensions.addSystemWindowInsetToMargin
@@ -39,7 +40,6 @@ import ru.rznnike.eyehealthmanager.app.utils.extensions.setVisible
 import ru.rznnike.eyehealthmanager.databinding.ActivityBinding
 import ru.rznnike.eyehealthmanager.databinding.ViewSnackbarBottomBinding
 import ru.rznnike.eyehealthmanager.databinding.ViewSnackbarTopBinding
-import ru.rznnike.eyehealthmanager.app.notification.Notificator
 import ru.rznnike.eyehealthmanager.domain.global.CoroutineScopeProvider
 import ru.rznnike.eyehealthmanager.domain.model.notification.Notification
 import ru.rznnike.eyehealthmanager.domain.model.notification.toNotification

app/src/main/java/ru/rznnike/eyehealthmanager/app/ui/fragment/acuity/doctor/AcuityDoctorResultFragment.kt

@@ -3,7 +3,7 @@ package ru.rznnike.eyehealthmanager.app.ui.fragment.acuity.doctor
 import android.os.Bundle
 import android.view.View
 import androidx.core.widget.addTextChangedListener
-import by.kirich1409.viewbindingdelegate.viewBinding
+import dev.androidbroadcast.vbpd.viewBinding
 import moxy.presenter.InjectPresenter
 import ru.rznnike.eyehealthmanager.R
 import ru.rznnike.eyehealthmanager.app.dialog.showDatePicker

app/src/main/java/ru/rznnike/eyehealthmanager/app/ui/fragment/acuity/info/AcuityInfoFragment.kt

@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
-import by.kirich1409.viewbindingdelegate.viewBinding
+import dev.androidbroadcast.vbpd.viewBinding
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.IItem
 import com.mikepenz.fastadapter.adapters.ItemAdapter

app/src/main/java/ru/rznnike/eyehealthmanager/app/ui/fragment/acuity/instruction/AcuityInstructionFragment.kt

@@ -2,7 +2,7 @@ package ru.rznnike.eyehealthmanager.app.ui.fragment.acuity.instruction
 
 import android.os.Bundle
 import android.view.View
-import by.kirich1409.viewbindingdelegate.viewBinding
+import dev.androidbroadcast.vbpd.viewBinding
 import moxy.presenter.InjectPresenter
 import moxy.presenter.ProvidePresenter
 import ru.rznnike.eyehealthmanager.R

app/src/main/java/ru/rznnike/eyehealthmanager/app/ui/fragment/acuity/result/AcuityResultFragment.kt

@@ -2,7 +2,7 @@ package ru.rznnike.eyehealthmanager.app.ui.fragment.acuity.result
 
 import android.os.Bundle
 import android.view.View
-import by.kirich1409.viewbindingdelegate.viewBinding
+import dev.androidbroadcast.vbpd.viewBinding
 import moxy.presenter.InjectPresenter
 import moxy.presenter.ProvidePresenter
 import ru.rznnike.eyehealthmanager.R

app/src/main/java/ru/rznnike/eyehealthmanager/app/ui/fragment/acuity/test/AcuityTestFragment.kt

@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.annotation.DrawableRes
 import androidx.core.view.updateLayoutParams
-import by.kirich1409.viewbindingdelegate.viewBinding
+import dev.androidbroadcast.vbpd.viewBinding
 import com.google.android.flexbox.FlexDirection
 import com.google.android.flexbox.FlexboxLayoutManager
 import com.google.android.flexbox.JustifyContent

app/src/main/java/ru/rznnike/eyehealthmanager/app/ui/fragment/analysis/parameters/AnalysisParametersFragment.kt

@@ -2,7 +2,7 @@ package ru.rznnike.eyehealthmanager.app.ui.fragment.analysis.parameters
 
 import android.os.Bundle
 import android.view.View
-import by.kirich1409.viewbindingdelegate.viewBinding
+import dev.androidbroadcast.vbpd.viewBinding
 import moxy.presenter.InjectPresenter
 import ru.rznnike.eyehealthmanager.R
 import ru.rznnike.eyehealthmanager.app.dialog.alert.AlertDialogAction