diff --git a/app/build.gradle.kts b/app/build.gradle.kts index fe005df2..d283fac7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -10,11 +10,11 @@ plugins { } android { - namespace = "com.meloda.app.fast" + namespace = "dev.meloda.fast" compileSdk = Configs.compileSdk defaultConfig { - applicationId = "com.meloda.app.fast" + applicationId = "dev.meloda.fast" minSdk = Configs.minSdk targetSdk = Configs.targetSdk versionCode = Configs.appCode diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 463cee7a..34bda5d6 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -20,4 +20,4 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile --keep class com.meloda.app.fast.** +-keep class dev.meloda.fast.** diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4a0fcea5..7b5eaee2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ { diff --git a/app/src/main/kotlin/com/meloda/app/fast/receiver/DownloadManagerReceiver.kt b/app/src/main/kotlin/com/meloda/app/fast/receiver/DownloadManagerReceiver.kt index 7b514d11..ae682080 100644 --- a/app/src/main/kotlin/com/meloda/app/fast/receiver/DownloadManagerReceiver.kt +++ b/app/src/main/kotlin/com/meloda/app/fast/receiver/DownloadManagerReceiver.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.receiver +package dev.meloda.fast.receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/app/src/main/kotlin/com/meloda/app/fast/service/OnlineService.kt b/app/src/main/kotlin/com/meloda/app/fast/service/OnlineService.kt index 120e03ff..76bb8c0d 100644 --- a/app/src/main/kotlin/com/meloda/app/fast/service/OnlineService.kt +++ b/app/src/main/kotlin/com/meloda/app/fast/service/OnlineService.kt @@ -1,12 +1,12 @@ -package com.meloda.app.fast.service +package dev.meloda.fast.service import android.app.Service import android.content.Intent import android.os.IBinder import android.util.Log -import com.meloda.app.fast.common.UserConfig -import com.meloda.app.fast.common.extensions.createTimerFlow -import com.meloda.app.fast.data.api.account.AccountUseCase +import dev.meloda.fast.common.UserConfig +import dev.meloda.fast.common.extensions.createTimerFlow +import dev.meloda.fast.data.api.account.AccountUseCase import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/kotlin/com/meloda/app/fast/service/longpolling/LongPollingService.kt b/app/src/main/kotlin/com/meloda/app/fast/service/longpolling/LongPollingService.kt index d12fa870..96a4a383 100644 --- a/app/src/main/kotlin/com/meloda/app/fast/service/longpolling/LongPollingService.kt +++ b/app/src/main/kotlin/com/meloda/app/fast/service/longpolling/LongPollingService.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.service.longpolling +package dev.meloda.fast.service.longpolling import android.app.PendingIntent import android.app.Service @@ -11,20 +11,20 @@ import android.util.Log import androidx.core.app.NotificationCompat import androidx.core.app.ServiceCompat import com.conena.nanokt.android.app.stopForegroundCompat -import com.meloda.app.fast.common.AppConstants -import com.meloda.app.fast.common.LongPollController -import com.meloda.app.fast.common.UserConfig -import com.meloda.app.fast.common.VkConstants -import com.meloda.app.fast.common.extensions.listenValue -import com.meloda.app.fast.common.model.LongPollState -import com.meloda.app.fast.data.LongPollUpdatesParser -import com.meloda.app.fast.data.LongPollUseCase -import com.meloda.app.fast.data.processState -import com.meloda.app.fast.datastore.AppSettings -import com.meloda.app.fast.model.api.data.LongPollUpdates -import com.meloda.app.fast.model.api.data.VkLongPollData -import com.meloda.app.fast.ui.R -import com.meloda.app.fast.util.NotificationsUtils +import dev.meloda.fast.common.AppConstants +import dev.meloda.fast.common.LongPollController +import dev.meloda.fast.common.UserConfig +import dev.meloda.fast.common.VkConstants +import dev.meloda.fast.common.extensions.listenValue +import dev.meloda.fast.common.model.LongPollState +import dev.meloda.fast.data.LongPollUpdatesParser +import dev.meloda.fast.data.LongPollUseCase +import dev.meloda.fast.data.processState +import dev.meloda.fast.datastore.AppSettings +import dev.meloda.fast.model.api.data.LongPollUpdates +import dev.meloda.fast.model.api.data.VkLongPollData +import dev.meloda.fast.ui.R +import dev.meloda.fast.util.NotificationsUtils import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/kotlin/com/meloda/app/fast/service/longpolling/di/LongPollModule.kt b/app/src/main/kotlin/com/meloda/app/fast/service/longpolling/di/LongPollModule.kt index 68a42c2f..346580a2 100644 --- a/app/src/main/kotlin/com/meloda/app/fast/service/longpolling/di/LongPollModule.kt +++ b/app/src/main/kotlin/com/meloda/app/fast/service/longpolling/di/LongPollModule.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.service.longpolling.di +package dev.meloda.fast.service.longpolling.di -import com.meloda.app.fast.data.LongPollUpdatesParser -import com.meloda.app.fast.data.LongPollUseCase -import com.meloda.app.fast.data.LongPollUseCaseImpl +import dev.meloda.fast.data.LongPollUpdatesParser +import dev.meloda.fast.data.LongPollUseCase +import dev.meloda.fast.data.LongPollUseCaseImpl import org.koin.core.module.dsl.singleOf import org.koin.dsl.bind import org.koin.dsl.module diff --git a/app/src/main/kotlin/com/meloda/app/fast/util/NotificationsUtils.kt b/app/src/main/kotlin/com/meloda/app/fast/util/NotificationsUtils.kt index cdc89e33..bf2cfb72 100644 --- a/app/src/main/kotlin/com/meloda/app/fast/util/NotificationsUtils.kt +++ b/app/src/main/kotlin/com/meloda/app/fast/util/NotificationsUtils.kt @@ -1,12 +1,12 @@ -package com.meloda.app.fast.util +package dev.meloda.fast.util import android.annotation.SuppressLint import android.app.PendingIntent import android.content.Context import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat -import com.meloda.app.fast.common.AppConstants -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.common.AppConstants +import dev.meloda.fast.ui.R as UiR object NotificationsUtils { diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index 394009eb..9798f5f9 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -6,10 +6,10 @@ plugins { alias(libs.plugins.kotlin.compose.compiler) } -group = "com.meloda.app.fast.common" +group = "dev.meloda.fast.common" android { - namespace = "com.meloda.app.fast.common" + namespace = "dev.meloda.fast.common" compileSdk = Configs.compileSdk defaultConfig { diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/AppConstants.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/AppConstants.kt index d8f700b9..a7a0bff9 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/AppConstants.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/AppConstants.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common +package dev.meloda.fast.common object AppConstants { diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/LongPollController.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/LongPollController.kt index 23555a90..bca70625 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/LongPollController.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/LongPollController.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.common +package dev.meloda.fast.common -import com.meloda.app.fast.common.model.LongPollState +import dev.meloda.fast.common.model.LongPollState import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/UserConfig.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/UserConfig.kt index 490a615b..c34be6a1 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/UserConfig.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/UserConfig.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common +package dev.meloda.fast.common import android.content.SharedPreferences import androidx.core.content.edit diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/VkConstants.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/VkConstants.kt index d126da24..886c461f 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/VkConstants.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/VkConstants.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common +package dev.meloda.fast.common object VkConstants { diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/di/CommonModule.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/di/CommonModule.kt index 33a363c8..b2509fd8 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/di/CommonModule.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/di/CommonModule.kt @@ -1,10 +1,10 @@ -package com.meloda.app.fast.common.di +package dev.meloda.fast.common.di import coil.ImageLoader -import com.meloda.app.fast.common.LongPollController -import com.meloda.app.fast.common.LongPollControllerImpl -import com.meloda.app.fast.common.provider.ResourceProvider -import com.meloda.app.fast.common.provider.ResourceProviderImpl +import dev.meloda.fast.common.LongPollController +import dev.meloda.fast.common.LongPollControllerImpl +import dev.meloda.fast.common.provider.ResourceProvider +import dev.meloda.fast.common.provider.ResourceProviderImpl import org.koin.core.module.dsl.singleOf import org.koin.dsl.bind import org.koin.dsl.module diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/CustomNavType.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/CustomNavType.kt index 664cea87..b2de1833 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/CustomNavType.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/CustomNavType.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common.extensions +package dev.meloda.fast.common.extensions import android.os.Bundle import android.os.Parcelable diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/Extensions.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/Extensions.kt index 640b0c44..87082ffe 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/Extensions.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/Extensions.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common.extensions +package dev.meloda.fast.common.extensions import android.app.Activity import android.content.Context @@ -33,7 +33,7 @@ fun Context.restartApp() { activity.startActivity( Intent( this, - Class.forName("com.meloda.app.fast.MainActivity") + Class.forName("dev.meloda.fast.MainActivity") ) ) } diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/StringsExtensions.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/StringsExtensions.kt index e547bc87..6567f9d5 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/StringsExtensions.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/StringsExtensions.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common.extensions +package dev.meloda.fast.common.extensions inline fun String?.ifEmpty(defaultValue: () -> String?): String? = if (this?.isEmpty() == true) defaultValue() else this diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/navigation/NavigationExtensions.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/navigation/NavigationExtensions.kt index c5a7ad42..430460ce 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/navigation/NavigationExtensions.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/extensions/navigation/NavigationExtensions.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common.extensions.navigation +package dev.meloda.fast.common.extensions.navigation import androidx.compose.runtime.Composable import androidx.compose.runtime.remember diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/model/ApiLanguage.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/model/ApiLanguage.kt index f39e772c..0397bd4f 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/model/ApiLanguage.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/model/ApiLanguage.kt @@ -1,3 +1,3 @@ -package com.meloda.app.fast.common.model +package dev.meloda.fast.common.model data class ApiLanguage(val value: String) diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/model/DarkMode.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/model/DarkMode.kt index 46cb9757..62d8ec4c 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/model/DarkMode.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/model/DarkMode.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common.model +package dev.meloda.fast.common.model private const val MODE_NIGHT_NO = 1 private const val MODE_NIGHT_YES = 2 diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/model/LongPollState.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/model/LongPollState.kt index 6098faa7..5f16974e 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/model/LongPollState.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/model/LongPollState.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common.model +package dev.meloda.fast.common.model sealed class LongPollState { data object Stopped : LongPollState() diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/model/UiImage.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/model/UiImage.kt index 39763821..d1e3af71 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/model/UiImage.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/model/UiImage.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common.model +package dev.meloda.fast.common.model import android.graphics.drawable.Drawable import androidx.annotation.ColorInt diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/model/UiText.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/model/UiText.kt index 21f115ae..bf4f547f 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/model/UiText.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/model/UiText.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common.model +package dev.meloda.fast.common.model import android.content.res.Resources import androidx.annotation.PluralsRes diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/provider/Provider.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/provider/Provider.kt index 5918cef0..f4914805 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/provider/Provider.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/provider/Provider.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common.provider +package dev.meloda.fast.common.provider interface Provider { fun provide(): T? diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/provider/ResourceProvider.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/provider/ResourceProvider.kt index a9872d60..1224c085 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/provider/ResourceProvider.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/provider/ResourceProvider.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common.provider +package dev.meloda.fast.common.provider import android.content.res.Resources diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/util/AndroidUtils.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/util/AndroidUtils.kt index dc31b740..e5849f8d 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/util/AndroidUtils.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/util/AndroidUtils.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common.util +package dev.meloda.fast.common.util import android.content.ClipData import android.content.ClipboardManager @@ -15,7 +15,7 @@ import java.io.FileOutputStream private object BuildConfig { const val DEBUG = true - const val APPLICATION_ID = "com.meloda.app.fast" + const val APPLICATION_ID = "dev.meloda.fast" } object AndroidUtils { diff --git a/core/common/src/main/kotlin/com/meloda/app/fast/common/util/TimeUtils.kt b/core/common/src/main/kotlin/com/meloda/app/fast/common/util/TimeUtils.kt index 468c439e..cbc93241 100644 --- a/core/common/src/main/kotlin/com/meloda/app/fast/common/util/TimeUtils.kt +++ b/core/common/src/main/kotlin/com/meloda/app/fast/common/util/TimeUtils.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.common.util +package dev.meloda.fast.common.util import android.content.res.Resources import com.conena.nanokt.jvm.util.dayOfMonth @@ -9,7 +9,7 @@ import com.conena.nanokt.jvm.util.minute import com.conena.nanokt.jvm.util.month import com.conena.nanokt.jvm.util.second import com.conena.nanokt.jvm.util.year -import com.meloda.app.fast.common.R +import dev.meloda.fast.common.R import java.text.SimpleDateFormat import java.util.Calendar import java.util.Date diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts index 73ebf969..bf997504 100644 --- a/core/data/build.gradle.kts +++ b/core/data/build.gradle.kts @@ -3,10 +3,10 @@ plugins { alias(libs.plugins.org.jetbrains.kotlin.android) } -group = "com.meloda.app.fast.data" +group = "dev.meloda.fast.data" android { - namespace = "com.meloda.app.fast.data" + namespace = "dev.meloda.fast.data" compileSdk = Configs.compileSdk defaultConfig { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/LongPollUpdatesParser.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/LongPollUpdatesParser.kt index fe21602a..9e421df5 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/LongPollUpdatesParser.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/LongPollUpdatesParser.kt @@ -1,15 +1,15 @@ -package com.meloda.app.fast.data +package dev.meloda.fast.data import android.util.Log -import com.meloda.app.fast.common.UserConfig -import com.meloda.app.fast.common.VkConstants -import com.meloda.app.fast.common.extensions.asInt -import com.meloda.app.fast.common.extensions.listenValue -import com.meloda.app.fast.common.extensions.toList -import com.meloda.app.fast.data.api.messages.MessagesUseCase -import com.meloda.app.fast.model.ApiEvent -import com.meloda.app.fast.model.InteractionType -import com.meloda.app.fast.model.LongPollEvent +import dev.meloda.fast.common.UserConfig +import dev.meloda.fast.common.VkConstants +import dev.meloda.fast.common.extensions.asInt +import dev.meloda.fast.common.extensions.listenValue +import dev.meloda.fast.common.extensions.toList +import dev.meloda.fast.data.api.messages.MessagesUseCase +import dev.meloda.fast.model.ApiEvent +import dev.meloda.fast.model.InteractionType +import dev.meloda.fast.model.LongPollEvent import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/LongPollUseCase.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/LongPollUseCase.kt index dd5acee8..ecb23679 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/LongPollUseCase.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/LongPollUseCase.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.data +package dev.meloda.fast.data -import com.meloda.app.fast.model.api.data.LongPollUpdates -import com.meloda.app.fast.model.api.data.VkLongPollData +import dev.meloda.fast.model.api.data.LongPollUpdates +import dev.meloda.fast.model.api.data.VkLongPollData import kotlinx.coroutines.flow.Flow interface LongPollUseCase { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/LongPollUseCaseImpl.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/LongPollUseCaseImpl.kt index 568d36c6..f0eacd47 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/LongPollUseCaseImpl.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/LongPollUseCaseImpl.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.data +package dev.meloda.fast.data -import com.meloda.app.fast.data.api.longpoll.LongPollRepository -import com.meloda.app.fast.model.api.data.LongPollUpdates -import com.meloda.app.fast.model.api.data.VkLongPollData +import dev.meloda.fast.data.api.longpoll.LongPollRepository +import dev.meloda.fast.model.api.data.LongPollUpdates +import dev.meloda.fast.model.api.data.VkLongPollData import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/State.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/State.kt index 64ced55a..dc8b29d6 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/State.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/State.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.data +package dev.meloda.fast.data -import com.meloda.app.fast.network.OAuthErrorDomain -import com.meloda.app.fast.network.RestApiErrorDomain -import com.meloda.app.fast.network.VkErrorCode +import dev.meloda.fast.network.OAuthErrorDomain +import dev.meloda.fast.network.RestApiErrorDomain +import dev.meloda.fast.network.VkErrorCode import com.slack.eithernet.ApiResult sealed class State { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/VkGroupsMap.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/VkGroupsMap.kt index 3c92b118..7722c6a3 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/VkGroupsMap.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/VkGroupsMap.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.data +package dev.meloda.fast.data -import com.meloda.app.fast.model.api.data.VkMessageData -import com.meloda.app.fast.model.api.domain.VkConversation -import com.meloda.app.fast.model.api.domain.VkGroupDomain -import com.meloda.app.fast.model.api.domain.VkMessage +import dev.meloda.fast.model.api.data.VkMessageData +import dev.meloda.fast.model.api.domain.VkConversation +import dev.meloda.fast.model.api.domain.VkGroupDomain +import dev.meloda.fast.model.api.domain.VkMessage import kotlin.math.abs class VkGroupsMap( diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/VkMemoryCache.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/VkMemoryCache.kt index 4f3bf277..2a1d491e 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/VkMemoryCache.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/VkMemoryCache.kt @@ -1,10 +1,10 @@ -package com.meloda.app.fast.data +package dev.meloda.fast.data -import com.meloda.app.fast.model.api.domain.VkContactDomain -import com.meloda.app.fast.model.api.domain.VkConversation -import com.meloda.app.fast.model.api.domain.VkGroupDomain -import com.meloda.app.fast.model.api.domain.VkMessage -import com.meloda.app.fast.model.api.domain.VkUser +import dev.meloda.fast.model.api.domain.VkContactDomain +import dev.meloda.fast.model.api.domain.VkConversation +import dev.meloda.fast.model.api.domain.VkGroupDomain +import dev.meloda.fast.model.api.domain.VkMessage +import dev.meloda.fast.model.api.domain.VkUser import kotlin.math.abs object VkMemoryCache { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/VkUsersMap.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/VkUsersMap.kt index 60c14f91..b867eac3 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/VkUsersMap.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/VkUsersMap.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.data +package dev.meloda.fast.data -import com.meloda.app.fast.model.api.data.VkMessageData -import com.meloda.app.fast.model.api.domain.VkConversation -import com.meloda.app.fast.model.api.domain.VkMessage -import com.meloda.app.fast.model.api.domain.VkUser +import dev.meloda.fast.model.api.data.VkMessageData +import dev.meloda.fast.model.api.domain.VkConversation +import dev.meloda.fast.model.api.domain.VkMessage +import dev.meloda.fast.model.api.domain.VkUser class VkUsersMap( private val users: List diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountRepository.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountRepository.kt index a3430777..9180868c 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountRepository.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountRepository.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.data.api.account +package dev.meloda.fast.data.api.account -import com.meloda.app.fast.network.RestApiErrorDomain +import dev.meloda.fast.network.RestApiErrorDomain import com.slack.eithernet.ApiResult interface AccountRepository { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountRepositoryImpl.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountRepositoryImpl.kt index 41daf90c..3d2b54b8 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountRepositoryImpl.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountRepositoryImpl.kt @@ -1,10 +1,10 @@ -package com.meloda.app.fast.data.api.account +package dev.meloda.fast.data.api.account import android.os.Build -import com.meloda.app.fast.model.api.asInt -import com.meloda.app.fast.network.RestApiErrorDomain -import com.meloda.app.fast.network.mapApiDefault -import com.meloda.app.fast.network.service.account.AccountService +import dev.meloda.fast.model.api.asInt +import dev.meloda.fast.network.RestApiErrorDomain +import dev.meloda.fast.network.mapApiDefault +import dev.meloda.fast.network.service.account.AccountService import com.slack.eithernet.ApiResult import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountUseCase.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountUseCase.kt index c52c312f..c6284e63 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountUseCase.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountUseCase.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.data.api.account +package dev.meloda.fast.data.api.account -import com.meloda.app.fast.data.State +import dev.meloda.fast.data.State import kotlinx.coroutines.flow.Flow interface AccountUseCase { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountUseCaseImpl.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountUseCaseImpl.kt index 7bdafefc..6af97538 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountUseCaseImpl.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/account/AccountUseCaseImpl.kt @@ -1,19 +1,19 @@ -package com.meloda.app.fast.data.api.account +package dev.meloda.fast.data.api.account -import com.meloda.app.fast.data.State +import dev.meloda.fast.data.State import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow // TODO: 05/05/2024, Danil Nikolaev: implement class AccountUseCaseImpl( - private val accountRepository: com.meloda.app.fast.data.api.account.AccountRepository -) : com.meloda.app.fast.data.api.account.AccountUseCase { + private val accountRepository: dev.meloda.fast.data.api.account.AccountRepository +) : dev.meloda.fast.data.api.account.AccountUseCase { override suspend fun setOnline( voip: Boolean, accessToken: String ): Flow> = flow { -// emit(com.meloda.app.fast.data.State.Loading) +// emit(dev.meloda.fast.data.State.Loading) // // val newState = accountRepository.setOnline( // params = AccountSetOnlineRequest( @@ -21,9 +21,9 @@ class AccountUseCaseImpl( // accessToken = accessToken // ) // ).fold( -// onSuccess = { response -> com.meloda.app.fast.data.State.Success(response) }, -// onNetworkFailure = { com.meloda.app.fast.data.State.Error.ConnectionError }, -// onUnknownFailure = { com.meloda.app.fast.data.State.UNKNOWN_ERROR }, +// onSuccess = { response -> dev.meloda.fast.data.State.Success(response) }, +// onNetworkFailure = { dev.meloda.fast.data.State.Error.ConnectionError }, +// onUnknownFailure = { dev.meloda.fast.data.State.UNKNOWN_ERROR }, // onHttpFailure = { result -> result.error.toStateApiError() }, // onApiFailure = { result -> result.error.toStateApiError() } // ) @@ -32,15 +32,15 @@ class AccountUseCaseImpl( override suspend fun setOffline( accessToken: String - ): Flow> = flow { - emit(com.meloda.app.fast.data.State.Loading) + ): Flow> = flow { + emit(dev.meloda.fast.data.State.Loading) // val newState = accountRepository.setOffline( // params = AccountSetOfflineRequest(accessToken = accessToken) // ).fold( -// onSuccess = { response -> com.meloda.app.fast.data.State.Success(response) }, -// onNetworkFailure = { com.meloda.app.fast.data.State.Error.ConnectionError }, -// onUnknownFailure = { com.meloda.app.fast.data.State.UNKNOWN_ERROR }, +// onSuccess = { response -> dev.meloda.fast.data.State.Success(response) }, +// onNetworkFailure = { dev.meloda.fast.data.State.Error.ConnectionError }, +// onUnknownFailure = { dev.meloda.fast.data.State.UNKNOWN_ERROR }, // onHttpFailure = { result -> result.error.toStateApiError() }, // onApiFailure = { result -> result.error.toStateApiError() } // ) diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/audios/AudiosRepository.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/audios/AudiosRepository.kt index 33df923a..5e26e154 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/audios/AudiosRepository.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/audios/AudiosRepository.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.data.api.audios +package dev.meloda.fast.data.api.audios -import com.meloda.app.fast.model.api.responses.AudiosGetUploadServerResponse -import com.meloda.app.fast.network.ApiResponse -import com.meloda.app.fast.network.RestApiError -import com.meloda.app.fast.network.service.audios.AudiosService +import dev.meloda.fast.model.api.responses.AudiosGetUploadServerResponse +import dev.meloda.fast.network.ApiResponse +import dev.meloda.fast.network.RestApiError +import dev.meloda.fast.network.service.audios.AudiosService import com.slack.eithernet.ApiResult import okhttp3.MultipartBody diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/auth/AuthRepository.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/auth/AuthRepository.kt index 0bf11055..08215d90 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/auth/AuthRepository.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/auth/AuthRepository.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.data.api.auth +package dev.meloda.fast.data.api.auth -import com.meloda.app.fast.model.api.responses.ValidatePhoneResponse -import com.meloda.app.fast.network.RestApiErrorDomain +import dev.meloda.fast.model.api.responses.ValidatePhoneResponse +import dev.meloda.fast.network.RestApiErrorDomain import com.slack.eithernet.ApiResult interface AuthRepository { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/auth/AuthRepositoryImpl.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/auth/AuthRepositoryImpl.kt index fd32eab9..b9af106e 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/auth/AuthRepositoryImpl.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/auth/AuthRepositoryImpl.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.data.api.auth +package dev.meloda.fast.data.api.auth -import com.meloda.app.fast.model.api.responses.ValidatePhoneResponse -import com.meloda.app.fast.network.RestApiErrorDomain -import com.meloda.app.fast.network.mapApiDefault -import com.meloda.app.fast.network.service.auth.AuthService +import dev.meloda.fast.model.api.responses.ValidatePhoneResponse +import dev.meloda.fast.network.RestApiErrorDomain +import dev.meloda.fast.network.mapApiDefault +import dev.meloda.fast.network.service.auth.AuthService import com.slack.eithernet.ApiResult import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/conversations/ConversationsRepository.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/conversations/ConversationsRepository.kt index de2f64f6..bb95625d 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/conversations/ConversationsRepository.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/conversations/ConversationsRepository.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.data.api.conversations +package dev.meloda.fast.data.api.conversations -import com.meloda.app.fast.model.api.domain.VkConversation -import com.meloda.app.fast.network.RestApiErrorDomain +import dev.meloda.fast.model.api.domain.VkConversation +import dev.meloda.fast.network.RestApiErrorDomain import com.slack.eithernet.ApiResult interface ConversationsRepository { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/conversations/ConversationsRepositoryImpl.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/conversations/ConversationsRepositoryImpl.kt index 2af0c929..bec92d4c 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/conversations/ConversationsRepositoryImpl.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/conversations/ConversationsRepositoryImpl.kt @@ -1,24 +1,24 @@ -package com.meloda.app.fast.data.api.conversations +package dev.meloda.fast.data.api.conversations -import com.meloda.app.fast.common.VkConstants -import com.meloda.app.fast.data.VkGroupsMap -import com.meloda.app.fast.data.VkMemoryCache -import com.meloda.app.fast.data.VkUsersMap -import com.meloda.app.fast.database.dao.ConversationDao -import com.meloda.app.fast.model.api.data.VkContactData -import com.meloda.app.fast.model.api.data.VkGroupData -import com.meloda.app.fast.model.api.data.VkUserData -import com.meloda.app.fast.model.api.data.asDomain -import com.meloda.app.fast.model.api.domain.VkConversation -import com.meloda.app.fast.model.api.domain.asEntity -import com.meloda.app.fast.model.api.requests.ConversationsDeleteRequest -import com.meloda.app.fast.model.api.requests.ConversationsGetRequest -import com.meloda.app.fast.model.api.requests.ConversationsPinRequest -import com.meloda.app.fast.model.api.requests.ConversationsUnpinRequest -import com.meloda.app.fast.network.RestApiErrorDomain -import com.meloda.app.fast.network.mapApiDefault -import com.meloda.app.fast.network.mapApiResult -import com.meloda.app.fast.network.service.conversations.ConversationsService +import dev.meloda.fast.common.VkConstants +import dev.meloda.fast.data.VkGroupsMap +import dev.meloda.fast.data.VkMemoryCache +import dev.meloda.fast.data.VkUsersMap +import dev.meloda.fast.database.dao.ConversationDao +import dev.meloda.fast.model.api.data.VkContactData +import dev.meloda.fast.model.api.data.VkGroupData +import dev.meloda.fast.model.api.data.VkUserData +import dev.meloda.fast.model.api.data.asDomain +import dev.meloda.fast.model.api.domain.VkConversation +import dev.meloda.fast.model.api.domain.asEntity +import dev.meloda.fast.model.api.requests.ConversationsDeleteRequest +import dev.meloda.fast.model.api.requests.ConversationsGetRequest +import dev.meloda.fast.model.api.requests.ConversationsPinRequest +import dev.meloda.fast.model.api.requests.ConversationsUnpinRequest +import dev.meloda.fast.network.RestApiErrorDomain +import dev.meloda.fast.network.mapApiDefault +import dev.meloda.fast.network.mapApiResult +import dev.meloda.fast.network.service.conversations.ConversationsService import com.slack.eithernet.ApiResult import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/conversations/ConversationsUseCase.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/conversations/ConversationsUseCase.kt index e6663ea5..e00c3dde 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/conversations/ConversationsUseCase.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/conversations/ConversationsUseCase.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.data.api.conversations +package dev.meloda.fast.data.api.conversations -import com.meloda.app.fast.data.State -import com.meloda.app.fast.model.api.domain.VkConversation +import dev.meloda.fast.data.State +import dev.meloda.fast.model.api.domain.VkConversation import kotlinx.coroutines.flow.Flow interface ConversationsUseCase { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/files/FilesRepository.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/files/FilesRepository.kt index 57930be2..748dd3a2 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/files/FilesRepository.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/files/FilesRepository.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.data.api.files +package dev.meloda.fast.data.api.files -import com.meloda.app.fast.network.service.files.FilesService +import dev.meloda.fast.network.service.files.FilesService import okhttp3.MultipartBody class FilesRepository( diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/friends/FriendsRepository.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/friends/FriendsRepository.kt index 498cbfab..0f37d866 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/friends/FriendsRepository.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/friends/FriendsRepository.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.data.api.friends +package dev.meloda.fast.data.api.friends -import com.meloda.app.fast.model.FriendsInfo -import com.meloda.app.fast.model.api.domain.VkUser -import com.meloda.app.fast.network.RestApiErrorDomain +import dev.meloda.fast.model.FriendsInfo +import dev.meloda.fast.model.api.domain.VkUser +import dev.meloda.fast.network.RestApiErrorDomain import com.slack.eithernet.ApiResult interface FriendsRepository { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/friends/FriendsRepositoryImpl.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/friends/FriendsRepositoryImpl.kt index 0c43874b..0abb9519 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/friends/FriendsRepositoryImpl.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/friends/FriendsRepositoryImpl.kt @@ -1,18 +1,18 @@ -package com.meloda.app.fast.data.api.friends +package dev.meloda.fast.data.api.friends -import com.meloda.app.fast.common.VkConstants -import com.meloda.app.fast.data.VkMemoryCache -import com.meloda.app.fast.database.dao.UsersDao -import com.meloda.app.fast.model.FriendsInfo -import com.meloda.app.fast.model.api.data.VkUserData -import com.meloda.app.fast.model.api.domain.VkUser -import com.meloda.app.fast.model.api.domain.asEntity -import com.meloda.app.fast.model.api.requests.GetFriendsRequest -import com.meloda.app.fast.model.api.requests.GetOnlineFriendsRequest -import com.meloda.app.fast.network.RestApiErrorDomain -import com.meloda.app.fast.network.mapApiDefault -import com.meloda.app.fast.network.mapApiResult -import com.meloda.app.fast.network.service.friends.FriendsService +import dev.meloda.fast.common.VkConstants +import dev.meloda.fast.data.VkMemoryCache +import dev.meloda.fast.database.dao.UsersDao +import dev.meloda.fast.model.FriendsInfo +import dev.meloda.fast.model.api.data.VkUserData +import dev.meloda.fast.model.api.domain.VkUser +import dev.meloda.fast.model.api.domain.asEntity +import dev.meloda.fast.model.api.requests.GetFriendsRequest +import dev.meloda.fast.model.api.requests.GetOnlineFriendsRequest +import dev.meloda.fast.network.RestApiErrorDomain +import dev.meloda.fast.network.mapApiDefault +import dev.meloda.fast.network.mapApiResult +import dev.meloda.fast.network.service.friends.FriendsService import com.slack.eithernet.ApiResult import com.slack.eithernet.successOrElse import kotlinx.coroutines.Dispatchers diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/friends/FriendsUseCase.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/friends/FriendsUseCase.kt index 90749324..5da33616 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/friends/FriendsUseCase.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/friends/FriendsUseCase.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.data.api.friends +package dev.meloda.fast.data.api.friends -import com.meloda.app.fast.data.State -import com.meloda.app.fast.model.FriendsInfo -import com.meloda.app.fast.model.api.domain.VkUser +import dev.meloda.fast.data.State +import dev.meloda.fast.model.FriendsInfo +import dev.meloda.fast.model.api.domain.VkUser import kotlinx.coroutines.flow.Flow interface FriendsUseCase { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/longpoll/LongPollRepository.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/longpoll/LongPollRepository.kt index 16033e7c..ceb2b0cb 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/longpoll/LongPollRepository.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/longpoll/LongPollRepository.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.data.api.longpoll +package dev.meloda.fast.data.api.longpoll -import com.meloda.app.fast.model.api.data.LongPollUpdates -import com.meloda.app.fast.model.api.data.VkLongPollData -import com.meloda.app.fast.network.RestApiErrorDomain +import dev.meloda.fast.model.api.data.LongPollUpdates +import dev.meloda.fast.model.api.data.VkLongPollData +import dev.meloda.fast.network.RestApiErrorDomain import com.slack.eithernet.ApiResult interface LongPollRepository { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/longpoll/LongPollRepositoryImpl.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/longpoll/LongPollRepositoryImpl.kt index cf5d201b..3dbf7b9b 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/longpoll/LongPollRepositoryImpl.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/longpoll/LongPollRepositoryImpl.kt @@ -1,14 +1,14 @@ -package com.meloda.app.fast.data.api.longpoll +package dev.meloda.fast.data.api.longpoll -import com.meloda.app.fast.model.api.data.LongPollUpdates -import com.meloda.app.fast.model.api.data.VkLongPollData -import com.meloda.app.fast.model.api.requests.LongPollGetUpdatesRequest -import com.meloda.app.fast.model.api.requests.MessagesGetLongPollServerRequest -import com.meloda.app.fast.network.RestApiErrorDomain -import com.meloda.app.fast.network.mapApiResult -import com.meloda.app.fast.network.mapDefault -import com.meloda.app.fast.network.service.longpoll.LongPollService -import com.meloda.app.fast.network.service.messages.MessagesService +import dev.meloda.fast.model.api.data.LongPollUpdates +import dev.meloda.fast.model.api.data.VkLongPollData +import dev.meloda.fast.model.api.requests.LongPollGetUpdatesRequest +import dev.meloda.fast.model.api.requests.MessagesGetLongPollServerRequest +import dev.meloda.fast.network.RestApiErrorDomain +import dev.meloda.fast.network.mapApiResult +import dev.meloda.fast.network.mapDefault +import dev.meloda.fast.network.service.longpoll.LongPollService +import dev.meloda.fast.network.service.messages.MessagesService import com.slack.eithernet.ApiResult import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesHistoryInfo.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesHistoryInfo.kt index da247855..484f5e92 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesHistoryInfo.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesHistoryInfo.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.data.api.messages +package dev.meloda.fast.data.api.messages -import com.meloda.app.fast.model.api.domain.VkConversation -import com.meloda.app.fast.model.api.domain.VkMessage +import dev.meloda.fast.model.api.domain.VkConversation +import dev.meloda.fast.model.api.domain.VkMessage data class MessagesHistoryInfo( val messages: List, diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesRepository.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesRepository.kt index ef5c5f99..f1721fab 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesRepository.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesRepository.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.data.api.messages +package dev.meloda.fast.data.api.messages -import com.meloda.app.fast.model.api.domain.VkAttachment -import com.meloda.app.fast.model.api.domain.VkAttachmentHistoryMessage -import com.meloda.app.fast.model.api.domain.VkMessage -import com.meloda.app.fast.network.RestApiErrorDomain +import dev.meloda.fast.model.api.domain.VkAttachment +import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage +import dev.meloda.fast.model.api.domain.VkMessage +import dev.meloda.fast.network.RestApiErrorDomain import com.slack.eithernet.ApiResult interface MessagesRepository { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesRepositoryImpl.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesRepositoryImpl.kt index 86cebb3e..ded9b1ff 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesRepositoryImpl.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesRepositoryImpl.kt @@ -1,28 +1,28 @@ -package com.meloda.app.fast.data.api.messages +package dev.meloda.fast.data.api.messages -import com.meloda.app.fast.common.VkConstants -import com.meloda.app.fast.data.VkGroupsMap -import com.meloda.app.fast.data.VkMemoryCache -import com.meloda.app.fast.data.VkUsersMap -import com.meloda.app.fast.database.dao.MessageDao -import com.meloda.app.fast.model.api.data.VkAttachmentHistoryMessageData -import com.meloda.app.fast.model.api.data.VkContactData -import com.meloda.app.fast.model.api.data.VkGroupData -import com.meloda.app.fast.model.api.data.VkUserData -import com.meloda.app.fast.model.api.data.asDomain -import com.meloda.app.fast.model.api.domain.VkAttachment -import com.meloda.app.fast.model.api.domain.VkAttachmentHistoryMessage -import com.meloda.app.fast.model.api.domain.VkMessage -import com.meloda.app.fast.model.api.domain.asEntity -import com.meloda.app.fast.model.api.requests.MessagesGetByIdRequest -import com.meloda.app.fast.model.api.requests.MessagesGetHistoryAttachmentsRequest -import com.meloda.app.fast.model.api.requests.MessagesGetHistoryRequest -import com.meloda.app.fast.model.api.requests.MessagesMarkAsReadRequest -import com.meloda.app.fast.model.api.requests.MessagesSendRequest -import com.meloda.app.fast.network.RestApiErrorDomain -import com.meloda.app.fast.network.mapApiDefault -import com.meloda.app.fast.network.mapApiResult -import com.meloda.app.fast.network.service.messages.MessagesService +import dev.meloda.fast.common.VkConstants +import dev.meloda.fast.data.VkGroupsMap +import dev.meloda.fast.data.VkMemoryCache +import dev.meloda.fast.data.VkUsersMap +import dev.meloda.fast.database.dao.MessageDao +import dev.meloda.fast.model.api.data.VkAttachmentHistoryMessageData +import dev.meloda.fast.model.api.data.VkContactData +import dev.meloda.fast.model.api.data.VkGroupData +import dev.meloda.fast.model.api.data.VkUserData +import dev.meloda.fast.model.api.data.asDomain +import dev.meloda.fast.model.api.domain.VkAttachment +import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage +import dev.meloda.fast.model.api.domain.VkMessage +import dev.meloda.fast.model.api.domain.asEntity +import dev.meloda.fast.model.api.requests.MessagesGetByIdRequest +import dev.meloda.fast.model.api.requests.MessagesGetHistoryAttachmentsRequest +import dev.meloda.fast.model.api.requests.MessagesGetHistoryRequest +import dev.meloda.fast.model.api.requests.MessagesMarkAsReadRequest +import dev.meloda.fast.model.api.requests.MessagesSendRequest +import dev.meloda.fast.network.RestApiErrorDomain +import dev.meloda.fast.network.mapApiDefault +import dev.meloda.fast.network.mapApiResult +import dev.meloda.fast.network.service.messages.MessagesService import com.slack.eithernet.ApiResult import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesUseCase.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesUseCase.kt index 48924102..9ec3fc90 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesUseCase.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/messages/MessagesUseCase.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.data.api.messages +package dev.meloda.fast.data.api.messages -import com.meloda.app.fast.data.State -import com.meloda.app.fast.model.api.domain.VkAttachment -import com.meloda.app.fast.model.api.domain.VkAttachmentHistoryMessage -import com.meloda.app.fast.model.api.domain.VkMessage +import dev.meloda.fast.data.State +import dev.meloda.fast.model.api.domain.VkAttachment +import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage +import dev.meloda.fast.model.api.domain.VkMessage import kotlinx.coroutines.flow.Flow interface MessagesUseCase { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/oauth/OAuthRepository.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/oauth/OAuthRepository.kt index 98389087..4c4e3723 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/oauth/OAuthRepository.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/oauth/OAuthRepository.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.data.api.oauth +package dev.meloda.fast.data.api.oauth -import com.meloda.app.fast.model.api.responses.AuthDirectResponse +import dev.meloda.fast.model.api.responses.AuthDirectResponse interface OAuthRepository { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/oauth/OAuthRepositoryImpl.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/oauth/OAuthRepositoryImpl.kt index 4c59a017..7292b610 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/oauth/OAuthRepositoryImpl.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/oauth/OAuthRepositoryImpl.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.data.api.oauth +package dev.meloda.fast.data.api.oauth -import com.meloda.app.fast.common.VkConstants -import com.meloda.app.fast.model.api.requests.AuthDirectRequest -import com.meloda.app.fast.model.api.responses.AuthDirectResponse -import com.meloda.app.fast.network.service.oauth.OAuthService +import dev.meloda.fast.common.VkConstants +import dev.meloda.fast.model.api.requests.AuthDirectRequest +import dev.meloda.fast.model.api.responses.AuthDirectResponse +import dev.meloda.fast.network.service.oauth.OAuthService import com.slack.eithernet.ApiResult import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/photos/PhotosRepository.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/photos/PhotosRepository.kt index 02ea7544..efea4f13 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/photos/PhotosRepository.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/photos/PhotosRepository.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.data.api.photos +package dev.meloda.fast.data.api.photos -import com.meloda.app.fast.model.api.requests.PhotosSaveMessagePhotoRequest -import com.meloda.app.fast.network.service.photos.PhotosService +import dev.meloda.fast.model.api.requests.PhotosSaveMessagePhotoRequest +import dev.meloda.fast.network.service.photos.PhotosService import okhttp3.MultipartBody class PhotosRepository( diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersRepository.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersRepository.kt index 90b48048..eac02481 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersRepository.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersRepository.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.data.api.users +package dev.meloda.fast.data.api.users -import com.meloda.app.fast.model.api.domain.VkUser -import com.meloda.app.fast.network.RestApiErrorDomain +import dev.meloda.fast.model.api.domain.VkUser +import dev.meloda.fast.network.RestApiErrorDomain import com.slack.eithernet.ApiResult interface UsersRepository { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersRepositoryImpl.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersRepositoryImpl.kt index e4ca3860..d206e66e 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersRepositoryImpl.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersRepositoryImpl.kt @@ -1,16 +1,16 @@ -package com.meloda.app.fast.data.api.users +package dev.meloda.fast.data.api.users -import com.meloda.app.fast.data.VkMemoryCache -import com.meloda.app.fast.database.dao.UsersDao -import com.meloda.app.fast.model.api.data.VkUserData -import com.meloda.app.fast.model.api.domain.VkUser -import com.meloda.app.fast.model.api.domain.asEntity -import com.meloda.app.fast.model.api.requests.UsersGetRequest -import com.meloda.app.fast.model.database.VkUserEntity -import com.meloda.app.fast.model.database.asExternalModel -import com.meloda.app.fast.network.RestApiErrorDomain -import com.meloda.app.fast.network.mapApiResult -import com.meloda.app.fast.network.service.users.UsersService +import dev.meloda.fast.data.VkMemoryCache +import dev.meloda.fast.database.dao.UsersDao +import dev.meloda.fast.model.api.data.VkUserData +import dev.meloda.fast.model.api.domain.VkUser +import dev.meloda.fast.model.api.domain.asEntity +import dev.meloda.fast.model.api.requests.UsersGetRequest +import dev.meloda.fast.model.database.VkUserEntity +import dev.meloda.fast.model.database.asExternalModel +import dev.meloda.fast.network.RestApiErrorDomain +import dev.meloda.fast.network.mapApiResult +import dev.meloda.fast.network.service.users.UsersService import com.slack.eithernet.ApiResult import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersUseCase.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersUseCase.kt index 569cd9a2..dedd6fd9 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersUseCase.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersUseCase.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.data.api.users +package dev.meloda.fast.data.api.users -import com.meloda.app.fast.data.State -import com.meloda.app.fast.model.api.domain.VkUser +import dev.meloda.fast.data.State +import dev.meloda.fast.model.api.domain.VkUser import kotlinx.coroutines.flow.Flow interface UsersUseCase { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersUseCaseImpl.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersUseCaseImpl.kt index ddc26ba2..c2d6a0d0 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersUseCaseImpl.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/users/UsersUseCaseImpl.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.data.api.users +package dev.meloda.fast.data.api.users -import com.meloda.app.fast.data.State -import com.meloda.app.fast.data.mapToState -import com.meloda.app.fast.model.api.domain.VkUser +import dev.meloda.fast.data.State +import dev.meloda.fast.data.mapToState +import dev.meloda.fast.model.api.domain.VkUser import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/videos/VideosRepository.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/videos/VideosRepository.kt index ecb7b178..6335333a 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/api/videos/VideosRepository.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/api/videos/VideosRepository.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.data.api.videos +package dev.meloda.fast.data.api.videos -import com.meloda.app.fast.network.service.videos.VideosService +import dev.meloda.fast.network.service.videos.VideosService import okhttp3.MultipartBody class VideosRepository( diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/db/AccountsRepository.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/db/AccountsRepository.kt index 42055a52..97c5fe67 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/db/AccountsRepository.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/db/AccountsRepository.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.data.db +package dev.meloda.fast.data.db -import com.meloda.app.fast.model.database.AccountEntity +import dev.meloda.fast.model.database.AccountEntity interface AccountsRepository { diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/db/AccountsRepositoryImpl.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/db/AccountsRepositoryImpl.kt index 4d0ad47d..ae5e254b 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/db/AccountsRepositoryImpl.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/db/AccountsRepositoryImpl.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.data.db +package dev.meloda.fast.data.db -import com.meloda.app.fast.database.dao.AccountDao -import com.meloda.app.fast.model.database.AccountEntity +import dev.meloda.fast.database.dao.AccountDao +import dev.meloda.fast.model.database.AccountEntity class AccountsRepositoryImpl( private val accountDao: AccountDao diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/db/GetCurrentAccountUseCase.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/db/GetCurrentAccountUseCase.kt index 3dc10d1d..f2add353 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/db/GetCurrentAccountUseCase.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/db/GetCurrentAccountUseCase.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.data.db +package dev.meloda.fast.data.db -import com.meloda.app.fast.common.UserConfig -import com.meloda.app.fast.model.database.AccountEntity +import dev.meloda.fast.common.UserConfig +import dev.meloda.fast.model.database.AccountEntity import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/data/src/main/kotlin/com/meloda/app/fast/data/di/DataModule.kt b/core/data/src/main/kotlin/com/meloda/app/fast/data/di/DataModule.kt index e836d6b7..f767357e 100644 --- a/core/data/src/main/kotlin/com/meloda/app/fast/data/di/DataModule.kt +++ b/core/data/src/main/kotlin/com/meloda/app/fast/data/di/DataModule.kt @@ -1,36 +1,36 @@ -package com.meloda.app.fast.data.di +package dev.meloda.fast.data.di -import com.meloda.app.fast.common.di.commonModule -import com.meloda.app.fast.data.api.account.AccountRepository -import com.meloda.app.fast.data.api.account.AccountRepositoryImpl -import com.meloda.app.fast.data.api.account.AccountUseCase -import com.meloda.app.fast.data.api.account.AccountUseCaseImpl -import com.meloda.app.fast.data.api.audios.AudiosRepository -import com.meloda.app.fast.data.api.auth.AuthRepository -import com.meloda.app.fast.data.api.auth.AuthRepositoryImpl -import com.meloda.app.fast.data.api.conversations.ConversationsRepository -import com.meloda.app.fast.data.api.conversations.ConversationsRepositoryImpl -import com.meloda.app.fast.data.api.files.FilesRepository -import com.meloda.app.fast.data.api.friends.FriendsRepository -import com.meloda.app.fast.data.api.friends.FriendsRepositoryImpl -import com.meloda.app.fast.data.api.longpoll.LongPollRepository -import com.meloda.app.fast.data.api.longpoll.LongPollRepositoryImpl -import com.meloda.app.fast.data.api.messages.MessagesRepository -import com.meloda.app.fast.data.api.messages.MessagesRepositoryImpl -import com.meloda.app.fast.data.api.oauth.OAuthRepository -import com.meloda.app.fast.data.api.oauth.OAuthRepositoryImpl -import com.meloda.app.fast.data.api.photos.PhotosRepository -import com.meloda.app.fast.data.api.users.UsersRepository -import com.meloda.app.fast.data.api.users.UsersRepositoryImpl -import com.meloda.app.fast.data.api.users.UsersUseCase -import com.meloda.app.fast.data.api.users.UsersUseCaseImpl -import com.meloda.app.fast.data.api.videos.VideosRepository -import com.meloda.app.fast.data.db.AccountsRepository -import com.meloda.app.fast.data.db.AccountsRepositoryImpl -import com.meloda.app.fast.data.db.GetCurrentAccountUseCase -import com.meloda.app.fast.database.di.databaseModule -import com.meloda.app.fast.datastore.di.dataStoreModule -import com.meloda.app.fast.network.di.networkModule +import dev.meloda.fast.common.di.commonModule +import dev.meloda.fast.data.api.account.AccountRepository +import dev.meloda.fast.data.api.account.AccountRepositoryImpl +import dev.meloda.fast.data.api.account.AccountUseCase +import dev.meloda.fast.data.api.account.AccountUseCaseImpl +import dev.meloda.fast.data.api.audios.AudiosRepository +import dev.meloda.fast.data.api.auth.AuthRepository +import dev.meloda.fast.data.api.auth.AuthRepositoryImpl +import dev.meloda.fast.data.api.conversations.ConversationsRepository +import dev.meloda.fast.data.api.conversations.ConversationsRepositoryImpl +import dev.meloda.fast.data.api.files.FilesRepository +import dev.meloda.fast.data.api.friends.FriendsRepository +import dev.meloda.fast.data.api.friends.FriendsRepositoryImpl +import dev.meloda.fast.data.api.longpoll.LongPollRepository +import dev.meloda.fast.data.api.longpoll.LongPollRepositoryImpl +import dev.meloda.fast.data.api.messages.MessagesRepository +import dev.meloda.fast.data.api.messages.MessagesRepositoryImpl +import dev.meloda.fast.data.api.oauth.OAuthRepository +import dev.meloda.fast.data.api.oauth.OAuthRepositoryImpl +import dev.meloda.fast.data.api.photos.PhotosRepository +import dev.meloda.fast.data.api.users.UsersRepository +import dev.meloda.fast.data.api.users.UsersRepositoryImpl +import dev.meloda.fast.data.api.users.UsersUseCase +import dev.meloda.fast.data.api.users.UsersUseCaseImpl +import dev.meloda.fast.data.api.videos.VideosRepository +import dev.meloda.fast.data.db.AccountsRepository +import dev.meloda.fast.data.db.AccountsRepositoryImpl +import dev.meloda.fast.data.db.GetCurrentAccountUseCase +import dev.meloda.fast.database.di.databaseModule +import dev.meloda.fast.datastore.di.dataStoreModule +import dev.meloda.fast.network.di.networkModule import org.koin.core.module.dsl.singleOf import org.koin.dsl.bind import org.koin.dsl.module diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts index bc87cf96..cd6634f3 100644 --- a/core/database/build.gradle.kts +++ b/core/database/build.gradle.kts @@ -4,10 +4,10 @@ plugins { alias(libs.plugins.com.google.devtools.ksp) } -group = "com.meloda.app.fast.database" +group = "dev.meloda.fast.database" android { - namespace = "com.meloda.app.fast.database" + namespace = "dev.meloda.fast.database" compileSdk = Configs.compileSdk defaultConfig { diff --git a/core/database/src/main/kotlin/com/meloda/app/fast/database/AccountsDatabase.kt b/core/database/src/main/kotlin/com/meloda/app/fast/database/AccountsDatabase.kt index ec7a0a67..0f31410e 100644 --- a/core/database/src/main/kotlin/com/meloda/app/fast/database/AccountsDatabase.kt +++ b/core/database/src/main/kotlin/com/meloda/app/fast/database/AccountsDatabase.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.database +package dev.meloda.fast.database import androidx.room.Database import androidx.room.RoomDatabase -import com.meloda.app.fast.database.dao.AccountDao -import com.meloda.app.fast.model.database.AccountEntity +import dev.meloda.fast.database.dao.AccountDao +import dev.meloda.fast.model.database.AccountEntity @Database( entities = [AccountEntity::class], diff --git a/core/database/src/main/kotlin/com/meloda/app/fast/database/CacheDatabase.kt b/core/database/src/main/kotlin/com/meloda/app/fast/database/CacheDatabase.kt index 842f835f..82c3f90d 100644 --- a/core/database/src/main/kotlin/com/meloda/app/fast/database/CacheDatabase.kt +++ b/core/database/src/main/kotlin/com/meloda/app/fast/database/CacheDatabase.kt @@ -1,17 +1,17 @@ -package com.meloda.app.fast.database +package dev.meloda.fast.database import androidx.room.Database import androidx.room.RoomDatabase import androidx.room.TypeConverters -import com.meloda.app.fast.database.dao.ConversationDao -import com.meloda.app.fast.database.dao.GroupDao -import com.meloda.app.fast.database.dao.MessageDao -import com.meloda.app.fast.database.dao.UsersDao -import com.meloda.app.fast.database.typeconverters.Converters -import com.meloda.app.fast.model.database.VkConversationEntity -import com.meloda.app.fast.model.database.VkGroupEntity -import com.meloda.app.fast.model.database.VkMessageEntity -import com.meloda.app.fast.model.database.VkUserEntity +import dev.meloda.fast.database.dao.ConversationDao +import dev.meloda.fast.database.dao.GroupDao +import dev.meloda.fast.database.dao.MessageDao +import dev.meloda.fast.database.dao.UsersDao +import dev.meloda.fast.database.typeconverters.Converters +import dev.meloda.fast.model.database.VkConversationEntity +import dev.meloda.fast.model.database.VkGroupEntity +import dev.meloda.fast.model.database.VkMessageEntity +import dev.meloda.fast.model.database.VkUserEntity @Database( entities = [ diff --git a/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/AccountDao.kt b/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/AccountDao.kt index ba396cdf..2ed58fa8 100644 --- a/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/AccountDao.kt +++ b/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/AccountDao.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.database.dao +package dev.meloda.fast.database.dao import androidx.room.Dao import androidx.room.Query -import com.meloda.app.fast.model.database.AccountEntity +import dev.meloda.fast.model.database.AccountEntity @Dao abstract class AccountDao : EntityDao { diff --git a/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/ConversationDao.kt b/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/ConversationDao.kt index 1124c8bd..a435fb94 100644 --- a/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/ConversationDao.kt +++ b/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/ConversationDao.kt @@ -1,10 +1,10 @@ -package com.meloda.app.fast.database.dao +package dev.meloda.fast.database.dao import androidx.room.Dao import androidx.room.Query import androidx.room.Transaction -import com.meloda.app.fast.model.database.ConversationWithMessage -import com.meloda.app.fast.model.database.VkConversationEntity +import dev.meloda.fast.model.database.ConversationWithMessage +import dev.meloda.fast.model.database.VkConversationEntity @Dao abstract class ConversationDao : EntityDao { diff --git a/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/EntityDao.kt b/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/EntityDao.kt index a6ab07a0..4b1e3aa4 100644 --- a/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/EntityDao.kt +++ b/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/EntityDao.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.database.dao +package dev.meloda.fast.database.dao import androidx.room.Delete import androidx.room.Insert diff --git a/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/GroupDao.kt b/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/GroupDao.kt index 1fabe1ce..8fad32c3 100644 --- a/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/GroupDao.kt +++ b/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/GroupDao.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.database.dao +package dev.meloda.fast.database.dao import androidx.room.Dao import androidx.room.Query -import com.meloda.app.fast.model.database.VkGroupEntity +import dev.meloda.fast.model.database.VkGroupEntity @Dao abstract class GroupDao : EntityDao { diff --git a/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/MessageDao.kt b/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/MessageDao.kt index 597c406f..3a5d844d 100644 --- a/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/MessageDao.kt +++ b/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/MessageDao.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.database.dao +package dev.meloda.fast.database.dao import androidx.room.Dao import androidx.room.Query -import com.meloda.app.fast.model.database.VkMessageEntity +import dev.meloda.fast.model.database.VkMessageEntity @Dao abstract class MessageDao : EntityDao { diff --git a/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/UsersDao.kt b/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/UsersDao.kt index a9cd10f5..a2ca9b23 100644 --- a/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/UsersDao.kt +++ b/core/database/src/main/kotlin/com/meloda/app/fast/database/dao/UsersDao.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.database.dao +package dev.meloda.fast.database.dao import androidx.room.Dao import androidx.room.Query -import com.meloda.app.fast.model.database.VkUserEntity +import dev.meloda.fast.model.database.VkUserEntity @Dao abstract class UsersDao : EntityDao { diff --git a/core/database/src/main/kotlin/com/meloda/app/fast/database/di/DatabaseModule.kt b/core/database/src/main/kotlin/com/meloda/app/fast/database/di/DatabaseModule.kt index 9cbd0a8a..ff7adfb8 100644 --- a/core/database/src/main/kotlin/com/meloda/app/fast/database/di/DatabaseModule.kt +++ b/core/database/src/main/kotlin/com/meloda/app/fast/database/di/DatabaseModule.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.database.di +package dev.meloda.fast.database.di import androidx.room.Room -import com.meloda.app.fast.database.AccountsDatabase +import dev.meloda.fast.database.AccountsDatabase import org.koin.core.scope.Scope import org.koin.dsl.module @@ -12,7 +12,7 @@ val databaseModule = module { single { get().accountDao() } single { - Room.databaseBuilder(get(), com.meloda.app.fast.database.CacheDatabase::class.java, "cache") + Room.databaseBuilder(get(), dev.meloda.fast.database.CacheDatabase::class.java, "cache") .fallbackToDestructiveMigration() .build() } @@ -22,4 +22,4 @@ val databaseModule = module { single { cacheDB().conversationDao() } } -private fun Scope.cacheDB(): com.meloda.app.fast.database.CacheDatabase = get() +private fun Scope.cacheDB(): dev.meloda.fast.database.CacheDatabase = get() diff --git a/core/database/src/main/kotlin/com/meloda/app/fast/database/typeconverters/Converters.kt b/core/database/src/main/kotlin/com/meloda/app/fast/database/typeconverters/Converters.kt index 791c769e..589e705b 100644 --- a/core/database/src/main/kotlin/com/meloda/app/fast/database/typeconverters/Converters.kt +++ b/core/database/src/main/kotlin/com/meloda/app/fast/database/typeconverters/Converters.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.database.typeconverters +package dev.meloda.fast.database.typeconverters import androidx.room.TypeConverter diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts index 136839e6..8c7785f3 100644 --- a/core/datastore/build.gradle.kts +++ b/core/datastore/build.gradle.kts @@ -3,10 +3,10 @@ plugins { alias(libs.plugins.org.jetbrains.kotlin.android) } -group = "com.meloda.app.fast.datastore" +group = "dev.meloda.fast.datastore" android { - namespace = "com.meloda.app.fast.datastore" + namespace = "dev.meloda.fast.datastore" compileSdk = Configs.compileSdk defaultConfig { diff --git a/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/AppSettings.kt b/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/AppSettings.kt index f0f96510..fff17db4 100644 --- a/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/AppSettings.kt +++ b/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/AppSettings.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.datastore +package dev.meloda.fast.datastore import android.content.SharedPreferences import androidx.core.content.edit -import com.meloda.app.fast.common.model.DarkMode +import dev.meloda.fast.common.model.DarkMode import kotlin.properties.Delegates import kotlin.reflect.KClass diff --git a/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/SettingsKeys.kt b/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/SettingsKeys.kt index e4ec8b0a..cd0f34a4 100644 --- a/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/SettingsKeys.kt +++ b/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/SettingsKeys.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.datastore +package dev.meloda.fast.datastore import androidx.appcompat.app.AppCompatDelegate diff --git a/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/UserSettings.kt b/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/UserSettings.kt index 473de2d0..c103201b 100644 --- a/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/UserSettings.kt +++ b/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/UserSettings.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.datastore +package dev.meloda.fast.datastore -import com.meloda.app.fast.common.model.DarkMode +import dev.meloda.fast.common.model.DarkMode import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/di/DataStoreModule.kt b/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/di/DataStoreModule.kt index 7a595007..d0f66888 100644 --- a/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/di/DataStoreModule.kt +++ b/core/datastore/src/main/kotlin/com/meloda/app/fast/datastore/di/DataStoreModule.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.datastore.di +package dev.meloda.fast.datastore.di -import com.meloda.app.fast.datastore.UserSettings -import com.meloda.app.fast.datastore.UserSettingsImpl +import dev.meloda.fast.datastore.UserSettings +import dev.meloda.fast.datastore.UserSettingsImpl import org.koin.core.module.dsl.singleOf import org.koin.dsl.bind import org.koin.dsl.module diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index 81874cf7..544dd601 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -4,10 +4,10 @@ plugins { alias(libs.plugins.kotlin.compose.compiler) } -group = "com.meloda.app.fast.designsystem" +group = "dev.meloda.fast.designsystem" android { - namespace = "com.meloda.app.fast.designsystem" + namespace = "dev.meloda.fast.designsystem" compileSdk = Configs.compileSdk diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts index 5d0c71c3..a0cdea44 100644 --- a/core/model/build.gradle.kts +++ b/core/model/build.gradle.kts @@ -4,10 +4,10 @@ plugins { alias(libs.plugins.com.google.devtools.ksp) } -group = "com.meloda.app.fast.model" +group = "dev.meloda.fast.model" android { - namespace = "com.meloda.app.fast.model" + namespace = "dev.meloda.fast.model" compileSdk = Configs.compileSdk defaultConfig { diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/ApiEvent.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/ApiEvent.kt index 15bd2b47..286b47f5 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/ApiEvent.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/ApiEvent.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model; +package dev.meloda.fast.model; enum class ApiEvent(val value: Int) { MESSAGE_SET_FLAGS(2), diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/BaseError.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/BaseError.kt index 1aa057b3..b2a8cb64 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/BaseError.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/BaseError.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model +package dev.meloda.fast.model import androidx.compose.runtime.Immutable diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/FriendsInfo.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/FriendsInfo.kt index e8224a56..393ac4bd 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/FriendsInfo.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/FriendsInfo.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model +package dev.meloda.fast.model -import com.meloda.app.fast.model.api.domain.VkUser +import dev.meloda.fast.model.api.domain.VkUser data class FriendsInfo( val friends: List, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/InteractionType.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/InteractionType.kt index fd98ad15..e63a358f 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/InteractionType.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/InteractionType.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model +package dev.meloda.fast.model sealed class InteractionType(val value: Int) { data object Typing : InteractionType(1) diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/LongPollEvent.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/LongPollEvent.kt index 25d1c95e..3acf2ca3 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/LongPollEvent.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/LongPollEvent.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model +package dev.meloda.fast.model -import com.meloda.app.fast.model.api.domain.VkMessage +import dev.meloda.fast.model.api.domain.VkMessage sealed interface LongPollEvent { diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/Extensions.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/Extensions.kt index 7718eddf..878f0e9c 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/Extensions.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/Extensions.kt @@ -1,3 +1,3 @@ -package com.meloda.app.fast.model.api +package dev.meloda.fast.model.api fun Boolean.asInt(): Int = if (this) 1 else 0 diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/PeerType.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/PeerType.kt index 901ee5b3..4789e59b 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/PeerType.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/PeerType.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api; +package dev.meloda.fast.model.api; enum class PeerType(val value: String) { USER("user"), diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/AttachmentType.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/AttachmentType.kt index 00677feb..9b4d5124 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/AttachmentType.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/AttachmentType.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data import android.util.Log diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/LongPollUpdates.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/LongPollUpdates.kt index 000452ed..2928212e 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/LongPollUpdates.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/LongPollUpdates.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkArticleData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkArticleData.kt index c8e0d28e..fc6de91d 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkArticleData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkArticleData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkArticleDomain +import dev.meloda.fast.model.api.domain.VkArticleDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkArtistData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkArtistData.kt index b745fb83..ce70d039 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkArtistData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkArtistData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkArtistDomain +import dev.meloda.fast.model.api.domain.VkArtistDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAttachmentData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAttachmentData.kt index 0dacaf3f..fa9a53da 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAttachmentData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAttachmentData.kt @@ -1,3 +1,3 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data interface VkAttachmentData diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAttachmentHistoryMessageData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAttachmentHistoryMessageData.kt index 016dd5eb..f59b9978 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAttachmentHistoryMessageData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAttachmentHistoryMessageData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkAttachmentHistoryMessage +import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAttachmentItemData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAttachmentItemData.kt index db1570f6..7959d170 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAttachmentItemData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAttachmentItemData.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkAttachment -import com.meloda.app.fast.model.api.domain.VkUnknownAttachment +import dev.meloda.fast.model.api.domain.VkAttachment +import dev.meloda.fast.model.api.domain.VkUnknownAttachment import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAudioData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAudioData.kt index 173c20f4..3bb2c562 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAudioData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAudioData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkAudioDomain +import dev.meloda.fast.model.api.domain.VkAudioDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAudioMessageData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAudioMessageData.kt index 7b92aa30..f4645134 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAudioMessageData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAudioMessageData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkAudioMessageDomain +import dev.meloda.fast.model.api.domain.VkAudioMessageDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAudioPlaylistData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAudioPlaylistData.kt index 1b83eba8..1f42373d 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAudioPlaylistData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkAudioPlaylistData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkAudioPlaylistDomain +import dev.meloda.fast.model.api.domain.VkAudioPlaylistDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkCallData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkCallData.kt index 3163f123..6725a7cd 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkCallData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkCallData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkCallDomain +import dev.meloda.fast.model.api.domain.VkCallDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkChatData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkChatData.kt index c1e7f8f7..46f81ea8 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkChatData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkChatData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkChatDomain +import dev.meloda.fast.model.api.domain.VkChatDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkChatMemberData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkChatMemberData.kt index e47bfc77..8768f809 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkChatMemberData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkChatMemberData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkChatMemberDomain +import dev.meloda.fast.model.api.domain.VkChatMemberDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkContactData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkContactData.kt index 04edec9a..c20835b0 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkContactData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkContactData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkContactDomain +import dev.meloda.fast.model.api.domain.VkContactDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkConversationData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkConversationData.kt index a75aa58c..ee6044c7 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkConversationData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkConversationData.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.PeerType -import com.meloda.app.fast.model.api.domain.VkConversation -import com.meloda.app.fast.model.api.domain.VkMessage +import dev.meloda.fast.model.api.PeerType +import dev.meloda.fast.model.api.domain.VkConversation +import dev.meloda.fast.model.api.domain.VkMessage import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkCuratorData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkCuratorData.kt index 522e7517..397e9cc4 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkCuratorData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkCuratorData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkCuratorDomain +import dev.meloda.fast.model.api.domain.VkCuratorDomain import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkEventData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkEventData.kt index bf12dff9..3b5c8eca 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkEventData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkEventData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkEventDomain +import dev.meloda.fast.model.api.domain.VkEventDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkFileData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkFileData.kt index 5580e26d..b956c67a 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkFileData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkFileData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkFileDomain +import dev.meloda.fast.model.api.domain.VkFileDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGiftData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGiftData.kt index 628fd1a8..2ac9e6be 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGiftData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGiftData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkGiftDomain +import dev.meloda.fast.model.api.domain.VkGiftDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGraffitiData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGraffitiData.kt index a465eb7e..c9750e43 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGraffitiData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGraffitiData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkGraffitiDomain +import dev.meloda.fast.model.api.domain.VkGraffitiDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGroupCallData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGroupCallData.kt index 17a1577f..7f7ae60e 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGroupCallData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGroupCallData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkGroupCallDomain +import dev.meloda.fast.model.api.domain.VkGroupCallDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGroupData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGroupData.kt index 36014196..f1e8824f 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGroupData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkGroupData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkGroupDomain +import dev.meloda.fast.model.api.domain.VkGroupDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass import kotlin.math.abs diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkLinkData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkLinkData.kt index 9829d0af..cf1bedb5 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkLinkData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkLinkData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkLinkDomain +import dev.meloda.fast.model.api.domain.VkLinkDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkLongPollData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkLongPollData.kt index 2a74fafb..d3041a1b 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkLongPollData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkLongPollData.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkMessageData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkMessageData.kt index 479e87be..c4ee04ab 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkMessageData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkMessageData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkMessage +import dev.meloda.fast.model.api.domain.VkMessage import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkMiniAppData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkMiniAppData.kt index 8b1f5a1b..0d9fd9d4 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkMiniAppData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkMiniAppData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkMiniAppDomain +import dev.meloda.fast.model.api.domain.VkMiniAppDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkNarrativeData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkNarrativeData.kt index 53cec2f1..1ca7d937 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkNarrativeData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkNarrativeData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkNarrativeDomain +import dev.meloda.fast.model.api.domain.VkNarrativeDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPhotoData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPhotoData.kt index 5a33551d..9e9c965e 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPhotoData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPhotoData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkPhotoDomain +import dev.meloda.fast.model.api.domain.VkPhotoDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPinnedMessageData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPinnedMessageData.kt index 94537848..2b4b523a 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPinnedMessageData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPinnedMessageData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkMessage +import dev.meloda.fast.model.api.domain.VkMessage import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPodcastData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPodcastData.kt index 7eda8a0b..c3410f56 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPodcastData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPodcastData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkPodcastDomain +import dev.meloda.fast.model.api.domain.VkPodcastDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPollData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPollData.kt index 427e2d44..f2542a5c 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPollData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkPollData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkPollDomain +import dev.meloda.fast.model.api.domain.VkPollDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkStickerData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkStickerData.kt index 2ae63006..5282f16a 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkStickerData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkStickerData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkStickerDomain +import dev.meloda.fast.model.api.domain.VkStickerDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkStoryData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkStoryData.kt index 29a769c4..2341317a 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkStoryData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkStoryData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkStoryDomain +import dev.meloda.fast.model.api.domain.VkStoryDomain import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkUserData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkUserData.kt index fb2dae74..3603bd50 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkUserData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkUserData.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.OnlineStatus -import com.meloda.app.fast.model.api.domain.VkUser +import dev.meloda.fast.model.api.domain.OnlineStatus +import dev.meloda.fast.model.api.domain.VkUser import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkVideoData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkVideoData.kt index fb9abf1d..8e9f3d5d 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkVideoData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkVideoData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkVideoDomain +import dev.meloda.fast.model.api.domain.VkVideoDomain import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkWallData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkWallData.kt index c9d96882..d3c77fae 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkWallData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkWallData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkWallDomain +import dev.meloda.fast.model.api.domain.VkWallDomain import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkWallReplyData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkWallReplyData.kt index dc0d05e7..8906e618 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkWallReplyData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkWallReplyData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkWallReplyDomain +import dev.meloda.fast.model.api.domain.VkWallReplyDomain import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkWidgetData.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkWidgetData.kt index c855799c..07dfe16a 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkWidgetData.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/data/VkWidgetData.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.data +package dev.meloda.fast.model.api.data -import com.meloda.app.fast.model.api.domain.VkWidgetDomain +import dev.meloda.fast.model.api.domain.VkWidgetDomain import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkArticleDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkArticleDomain.kt index fead8b38..55301fa4 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkArticleDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkArticleDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkArticleDomain( val id: Int diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkArtistDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkArtistDomain.kt index 967c3a1c..2a1ed425 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkArtistDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkArtistDomain.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType -import com.meloda.app.fast.model.api.data.VkArtistData +import dev.meloda.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.VkArtistData data class VkArtistDomain( val id: String, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAttachment.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAttachment.kt index 8378b747..ce176c78 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAttachment.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAttachment.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType interface VkAttachment { val type: AttachmentType diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAttachmentHistoryMessage.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAttachmentHistoryMessage.kt index 66bac811..15c62990 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAttachmentHistoryMessage.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAttachmentHistoryMessage.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain data class VkAttachmentHistoryMessage( val messageId: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAudioDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAudioDomain.kt index 86e12fc2..9e11d8ef 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAudioDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAudioDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkAudioDomain( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAudioMessageDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAudioMessageDomain.kt index 078a6a3c..3b3fa0f8 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAudioMessageDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAudioMessageDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkAudioMessageDomain( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAudioPlaylistDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAudioPlaylistDomain.kt index 448e3fb9..39a6b039 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAudioPlaylistDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkAudioPlaylistDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkAudioPlaylistDomain( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkCallDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkCallDomain.kt index 4dcf5d6f..efced050 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkCallDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkCallDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkCallDomain( val initiatorId: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkChatDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkChatDomain.kt index 7274a2f8..a12860a2 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkChatDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkChatDomain.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain data class VkChatDomain( val type: String, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkChatMemberDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkChatMemberDomain.kt index 19b80a78..7c045442 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkChatMemberDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkChatMemberDomain.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain data class VkChatMemberDomain( val memberId: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkContactDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkContactDomain.kt index ef0813a7..37cea639 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkContactDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkContactDomain.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain data class VkContactDomain( val name: String, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkConversation.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkConversation.kt index da80797e..5eb47897 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkConversation.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkConversation.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.PeerType -import com.meloda.app.fast.model.database.VkConversationEntity +import dev.meloda.fast.model.api.PeerType +import dev.meloda.fast.model.database.VkConversationEntity data class VkConversation( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkCuratorDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkCuratorDomain.kt index 585cab51..f94af5b0 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkCuratorDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkCuratorDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkCuratorDomain( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkEventDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkEventDomain.kt index 4d5fd6df..24c8cefc 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkEventDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkEventDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkEventDomain( val id: Int diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkFileDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkFileDomain.kt index 8f67f891..e9e17829 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkFileDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkFileDomain.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType -import com.meloda.app.fast.model.api.data.VkFileData +import dev.meloda.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.VkFileData import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGiftDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGiftDomain.kt index 66603706..cca67bb6 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGiftDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGiftDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkGiftDomain( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGraffitiDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGraffitiDomain.kt index 6be8947d..95a60baf 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGraffitiDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGraffitiDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkGraffitiDomain( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGroupCallDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGroupCallDomain.kt index 42f5e890..cb7b097b 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGroupCallDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGroupCallDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkGroupCallDomain( val initiatorId: Int diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGroupDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGroupDomain.kt index 01b86d00..f40e264f 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGroupDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkGroupDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.database.VkGroupEntity +import dev.meloda.fast.model.database.VkGroupEntity data class VkGroupDomain( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkLinkDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkLinkDomain.kt index 65b4e8c4..c00d37c5 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkLinkDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkLinkDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkLinkDomain( val url: String, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkMessage.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkMessage.kt index cacd2982..9e86f436 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkMessage.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkMessage.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.database.VkMessageEntity +import dev.meloda.fast.model.database.VkMessageEntity data class VkMessage( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkMiniAppDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkMiniAppDomain.kt index 4cee1053..661e3113 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkMiniAppDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkMiniAppDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkMiniAppDomain( val link: String diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkNarrativeDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkNarrativeDomain.kt index 38e674c5..26aac65b 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkNarrativeDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkNarrativeDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkNarrativeDomain( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkPhotoDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkPhotoDomain.kt index 8e8da465..22cdfaa2 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkPhotoDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkPhotoDomain.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType -import com.meloda.app.fast.model.api.data.VkPhotoData +import dev.meloda.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.VkPhotoData import java.util.Stack diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkPodcastDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkPodcastDomain.kt index 7efa9247..fdb323eb 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkPodcastDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkPodcastDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkPodcastDomain( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkPollDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkPollDomain.kt index 5824d03e..dbdb5cc0 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkPollDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkPollDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkPollDomain( val id: Int diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkStickerDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkStickerDomain.kt index 8c1c6c86..57ff0d78 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkStickerDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkStickerDomain.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType -import com.meloda.app.fast.model.api.data.VkStickerData +import dev.meloda.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.VkStickerData data class VkStickerDomain( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkStoryDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkStoryDomain.kt index 16681466..7b1ce7c0 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkStoryDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkStoryDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkStoryDomain( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkUnknownAttachment.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkUnknownAttachment.kt index bc507d5a..7aea2171 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkUnknownAttachment.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkUnknownAttachment.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data object VkUnknownAttachment : VkAttachment { override val type: AttachmentType = AttachmentType.UNKNOWN diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkUser.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkUser.kt index 8aecc876..1ade78cb 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkUser.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkUser.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.database.VkUserEntity +import dev.meloda.fast.model.database.VkUserEntity data class VkUser( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkVideoDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkVideoDomain.kt index ab348e42..10f2c1f0 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkVideoDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkVideoDomain.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType -import com.meloda.app.fast.model.api.data.VkVideoData +import dev.meloda.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.VkVideoData import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkWallDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkWallDomain.kt index 46b053ac..c2fdb0fd 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkWallDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkWallDomain.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType -import com.meloda.app.fast.model.api.data.VkAttachmentItemData +import dev.meloda.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.VkAttachmentItemData data class VkWallDomain( val id: Int, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkWallReplyDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkWallReplyDomain.kt index 29f03731..8ca0b72c 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkWallReplyDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkWallReplyDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkWallReplyDomain( val id: Int diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkWidgetDomain.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkWidgetDomain.kt index 8a285a8f..8e3c459a 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkWidgetDomain.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/domain/VkWidgetDomain.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.domain +package dev.meloda.fast.model.api.domain -import com.meloda.app.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.data.AttachmentType data class VkWidgetDomain( val id: Int diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/ConversationsRequest.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/ConversationsRequest.kt index 7c3a0d8d..62a91322 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/ConversationsRequest.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/ConversationsRequest.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.requests +package dev.meloda.fast.model.api.requests data class ConversationsGetRequest( val count: Int? = null, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/FriendsRequest.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/FriendsRequest.kt index fb46dabb..ac209f69 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/FriendsRequest.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/FriendsRequest.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.requests +package dev.meloda.fast.model.api.requests data class GetFriendsRequest( val order: String?, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/LongPollRequests.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/LongPollRequests.kt index 8ef0ed87..f3458ca6 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/LongPollRequests.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/LongPollRequests.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.requests +package dev.meloda.fast.model.api.requests data class LongPollGetUpdatesRequest( val act: String = "a_check", diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/MessagesRequest.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/MessagesRequest.kt index 8ca4b34b..00ab745f 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/MessagesRequest.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/MessagesRequest.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.model.api.requests +package dev.meloda.fast.model.api.requests -import com.meloda.app.fast.model.api.asInt -import com.meloda.app.fast.model.api.domain.VkAttachment +import dev.meloda.fast.model.api.asInt +import dev.meloda.fast.model.api.domain.VkAttachment data class MessagesGetHistoryRequest( val count: Int? = null, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/OAuthRequest.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/OAuthRequest.kt index 7a408b52..c90bacee 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/OAuthRequest.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/OAuthRequest.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.requests +package dev.meloda.fast.model.api.requests data class AuthDirectRequest( val grantType: String, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/PhotosRequests.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/PhotosRequests.kt index 37c0f32b..24b3ae7a 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/PhotosRequests.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/PhotosRequests.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.requests +package dev.meloda.fast.model.api.requests data class PhotosSaveMessagePhotoRequest( val photo: String, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/UsersRequest.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/UsersRequest.kt index 155b9260..1ae5ccad 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/UsersRequest.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/requests/UsersRequest.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.requests +package dev.meloda.fast.model.api.requests data class UsersGetRequest( val userIds: List? = null, diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/AudiosResponses.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/AudiosResponses.kt index d1acc304..a167c76f 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/AudiosResponses.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/AudiosResponses.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.responses +package dev.meloda.fast.model.api.responses import com.squareup.moshi.Json diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/AuthResponse.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/AuthResponse.kt index ff5ecca4..6a628767 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/AuthResponse.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/AuthResponse.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.responses +package dev.meloda.fast.model.api.responses import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/ConversationsResponse.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/ConversationsResponse.kt index 32008454..1fb02ea4 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/ConversationsResponse.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/ConversationsResponse.kt @@ -1,10 +1,10 @@ -package com.meloda.app.fast.model.api.responses +package dev.meloda.fast.model.api.responses -import com.meloda.app.fast.model.api.data.VkContactData -import com.meloda.app.fast.model.api.data.VkConversationData -import com.meloda.app.fast.model.api.data.VkGroupData -import com.meloda.app.fast.model.api.data.VkMessageData -import com.meloda.app.fast.model.api.data.VkUserData +import dev.meloda.fast.model.api.data.VkContactData +import dev.meloda.fast.model.api.data.VkConversationData +import dev.meloda.fast.model.api.data.VkGroupData +import dev.meloda.fast.model.api.data.VkMessageData +import dev.meloda.fast.model.api.data.VkUserData import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/FilesResponses.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/FilesResponses.kt index e15fde9b..5767ee0e 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/FilesResponses.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/FilesResponses.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.model.api.responses +package dev.meloda.fast.model.api.responses -import com.meloda.app.fast.model.api.data.VkAudioMessageData -import com.meloda.app.fast.model.api.data.VkFileData +import dev.meloda.fast.model.api.data.VkAudioMessageData +import dev.meloda.fast.model.api.data.VkFileData import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/FriendsResponse.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/FriendsResponse.kt index bf49f447..d9df0555 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/FriendsResponse.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/FriendsResponse.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.model.api.responses +package dev.meloda.fast.model.api.responses -import com.meloda.app.fast.model.api.data.VkUserData +import dev.meloda.fast.model.api.data.VkUserData import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/MessagesResponse.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/MessagesResponse.kt index 558ae7e4..cd7df491 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/MessagesResponse.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/MessagesResponse.kt @@ -1,12 +1,12 @@ -package com.meloda.app.fast.model.api.responses +package dev.meloda.fast.model.api.responses -import com.meloda.app.fast.model.api.data.VkAttachmentHistoryMessageData -import com.meloda.app.fast.model.api.data.VkChatMemberData -import com.meloda.app.fast.model.api.data.VkContactData -import com.meloda.app.fast.model.api.data.VkConversationData -import com.meloda.app.fast.model.api.data.VkGroupData -import com.meloda.app.fast.model.api.data.VkMessageData -import com.meloda.app.fast.model.api.data.VkUserData +import dev.meloda.fast.model.api.data.VkAttachmentHistoryMessageData +import dev.meloda.fast.model.api.data.VkChatMemberData +import dev.meloda.fast.model.api.data.VkContactData +import dev.meloda.fast.model.api.data.VkConversationData +import dev.meloda.fast.model.api.data.VkGroupData +import dev.meloda.fast.model.api.data.VkMessageData +import dev.meloda.fast.model.api.data.VkUserData import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/OAuthResponse.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/OAuthResponse.kt index 7514b416..99d893d9 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/OAuthResponse.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/OAuthResponse.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.responses +package dev.meloda.fast.model.api.responses import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/PhotosResponses.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/PhotosResponses.kt index 95fa5b86..3138cc6b 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/PhotosResponses.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/PhotosResponses.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.responses +package dev.meloda.fast.model.api.responses import com.squareup.moshi.Json diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/VideosResponses.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/VideosResponses.kt index b4166b94..49888a3b 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/VideosResponses.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/api/responses/VideosResponses.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.api.responses +package dev.meloda.fast.model.api.responses import com.squareup.moshi.Json diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/database/AccountEntity.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/database/AccountEntity.kt index bf3f8fbe..65b9d2e5 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/database/AccountEntity.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/database/AccountEntity.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.database +package dev.meloda.fast.model.database import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/database/ConversationWithMessage.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/database/ConversationWithMessage.kt index ee859279..32c5f5dd 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/database/ConversationWithMessage.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/database/ConversationWithMessage.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.database +package dev.meloda.fast.model.database import androidx.room.Embedded import androidx.room.Relation diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkConversationEntity.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkConversationEntity.kt index c11b74f5..9f5f67dc 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkConversationEntity.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkConversationEntity.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.model.database +package dev.meloda.fast.model.database import androidx.room.Entity import androidx.room.PrimaryKey -import com.meloda.app.fast.model.api.PeerType -import com.meloda.app.fast.model.api.domain.VkConversation +import dev.meloda.fast.model.api.PeerType +import dev.meloda.fast.model.api.domain.VkConversation @Entity(tableName = "conversations") data class VkConversationEntity( diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkGroupEntity.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkGroupEntity.kt index 16653a91..b93df715 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkGroupEntity.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkGroupEntity.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.model.database +package dev.meloda.fast.model.database import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkMessageEntity.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkMessageEntity.kt index 8f349d42..1eb9e8b5 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkMessageEntity.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkMessageEntity.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.model.database +package dev.meloda.fast.model.database import androidx.room.Entity import androidx.room.PrimaryKey -import com.meloda.app.fast.model.api.domain.VkMessage -import com.meloda.app.fast.model.api.domain.VkUnknownAttachment +import dev.meloda.fast.model.api.domain.VkMessage +import dev.meloda.fast.model.api.domain.VkUnknownAttachment @Entity(tableName = "messages") data class VkMessageEntity( diff --git a/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkUserEntity.kt b/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkUserEntity.kt index 17756159..e384900d 100644 --- a/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkUserEntity.kt +++ b/core/model/src/main/kotlin/com/meloda/app/fast/model/database/VkUserEntity.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.model.database +package dev.meloda.fast.model.database import androidx.room.Entity import androidx.room.PrimaryKey -import com.meloda.app.fast.model.api.domain.OnlineStatus -import com.meloda.app.fast.model.api.domain.VkUser +import dev.meloda.fast.model.api.domain.OnlineStatus +import dev.meloda.fast.model.api.domain.VkUser @Entity(tableName = "users") data class VkUserEntity( diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts index b48ab9e9..88f63b3e 100644 --- a/core/network/build.gradle.kts +++ b/core/network/build.gradle.kts @@ -4,10 +4,10 @@ plugins { alias(libs.plugins.com.google.devtools.ksp) } -group = "com.meloda.app.fast.network" +group = "dev.meloda.fast.network" android { - namespace = "com.meloda.app.fast.network" + namespace = "dev.meloda.fast.network" compileSdk = Configs.compileSdk defaultConfig { diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/ApiResponse.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/ApiResponse.kt index 0227c882..d77f9e8d 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/ApiResponse.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/ApiResponse.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.network +package dev.meloda.fast.network import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/Extensions.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/Extensions.kt index 98d386f5..d62d936c 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/Extensions.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/Extensions.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.network +package dev.meloda.fast.network import com.slack.eithernet.ApiResult diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/JsonConverter.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/JsonConverter.kt index da6745db..f7ebc034 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/JsonConverter.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/JsonConverter.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.network +package dev.meloda.fast.network import java.lang.reflect.Type diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/MoshiConverter.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/MoshiConverter.kt index cd21fb9d..95df4fdc 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/MoshiConverter.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/MoshiConverter.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.network +package dev.meloda.fast.network import com.squareup.moshi.Moshi import java.lang.reflect.Type diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/OAuthErrorDomain.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/OAuthErrorDomain.kt index 8b3bfb8d..61537aea 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/OAuthErrorDomain.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/OAuthErrorDomain.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.network +package dev.meloda.fast.network sealed class OAuthErrorDomain { diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/OAuthResponse.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/OAuthResponse.kt index 7e0325ab..2952862c 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/OAuthResponse.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/OAuthResponse.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.network +package dev.meloda.fast.network sealed interface OAuthResponse { data class Success(val response: R) : OAuthResponse diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/OAuthResultCallFactory.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/OAuthResultCallFactory.kt index ea32438c..5111188f 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/OAuthResultCallFactory.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/OAuthResultCallFactory.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.network +package dev.meloda.fast.network -import com.meloda.app.fast.model.api.responses.AuthDirectErrorOnlyResponse +import dev.meloda.fast.model.api.responses.AuthDirectErrorOnlyResponse import com.squareup.moshi.Moshi import okhttp3.Request import okio.Timeout diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/ResponseConverterFactory.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/ResponseConverterFactory.kt index 09c346e3..d4af413e 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/ResponseConverterFactory.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/ResponseConverterFactory.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.network +package dev.meloda.fast.network import android.util.Log import com.slack.eithernet.ApiException diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/RestApiError.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/RestApiError.kt index dd2441a0..596bb877 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/RestApiError.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/RestApiError.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.network +package dev.meloda.fast.network import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/RestApiErrorDomain.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/RestApiErrorDomain.kt index 1bc5dbc8..f0763960 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/RestApiErrorDomain.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/RestApiErrorDomain.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.network +package dev.meloda.fast.network data class RestApiErrorDomain( val code: Int, diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/ValidationType.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/ValidationType.kt index 75115751..d8b260b5 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/ValidationType.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/ValidationType.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.network; +package dev.meloda.fast.network; enum class ValidationType(val value: String) { APP("2fa_app"), diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/VkErrorCode.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/VkErrorCode.kt index f861d807..42aaae91 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/VkErrorCode.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/VkErrorCode.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.network +package dev.meloda.fast.network enum class VkErrorCode(val code: Int) { UNKNOWN_ERROR(1), diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/VkOAuthError.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/VkOAuthError.kt index f21984d2..544497b6 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/VkOAuthError.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/VkOAuthError.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.network +package dev.meloda.fast.network enum class VkOAuthError(val value: String) { UNKNOWN("unknown_error"), diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/VkOAuthErrorType.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/VkOAuthErrorType.kt index 54093971..ff90b9b3 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/VkOAuthErrorType.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/VkOAuthErrorType.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.network; +package dev.meloda.fast.network; enum class VkOAuthErrorType(val value: String) { WRONG_OTP_FORMAT("otp_format_is_incorrect"), diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/di/NetworkModule.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/di/NetworkModule.kt index a3ca84d1..bbed6a8b 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/di/NetworkModule.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/di/NetworkModule.kt @@ -1,27 +1,27 @@ -package com.meloda.app.fast.network.di +package dev.meloda.fast.network.di import com.chuckerteam.chucker.api.ChuckerCollector import com.chuckerteam.chucker.api.ChuckerInterceptor -import com.meloda.app.fast.common.AppConstants -import com.meloda.app.fast.network.JsonConverter -import com.meloda.app.fast.network.MoshiConverter -import com.meloda.app.fast.network.OAuthResultCallFactory -import com.meloda.app.fast.network.ResponseConverterFactory -import com.meloda.app.fast.network.interceptor.AccessTokenInterceptor -import com.meloda.app.fast.network.interceptor.LanguageInterceptor -import com.meloda.app.fast.network.interceptor.VersionInterceptor -import com.meloda.app.fast.network.service.account.AccountService -import com.meloda.app.fast.network.service.audios.AudiosService -import com.meloda.app.fast.network.service.auth.AuthService -import com.meloda.app.fast.network.service.conversations.ConversationsService -import com.meloda.app.fast.network.service.files.FilesService -import com.meloda.app.fast.network.service.friends.FriendsService -import com.meloda.app.fast.network.service.longpoll.LongPollService -import com.meloda.app.fast.network.service.messages.MessagesService -import com.meloda.app.fast.network.service.oauth.OAuthService -import com.meloda.app.fast.network.service.photos.PhotosService -import com.meloda.app.fast.network.service.users.UsersService -import com.meloda.app.fast.network.service.videos.VideosService +import dev.meloda.fast.common.AppConstants +import dev.meloda.fast.network.JsonConverter +import dev.meloda.fast.network.MoshiConverter +import dev.meloda.fast.network.OAuthResultCallFactory +import dev.meloda.fast.network.ResponseConverterFactory +import dev.meloda.fast.network.interceptor.AccessTokenInterceptor +import dev.meloda.fast.network.interceptor.LanguageInterceptor +import dev.meloda.fast.network.interceptor.VersionInterceptor +import dev.meloda.fast.network.service.account.AccountService +import dev.meloda.fast.network.service.audios.AudiosService +import dev.meloda.fast.network.service.auth.AuthService +import dev.meloda.fast.network.service.conversations.ConversationsService +import dev.meloda.fast.network.service.files.FilesService +import dev.meloda.fast.network.service.friends.FriendsService +import dev.meloda.fast.network.service.longpoll.LongPollService +import dev.meloda.fast.network.service.messages.MessagesService +import dev.meloda.fast.network.service.oauth.OAuthService +import dev.meloda.fast.network.service.photos.PhotosService +import dev.meloda.fast.network.service.users.UsersService +import dev.meloda.fast.network.service.videos.VideosService import com.slack.eithernet.ApiResultCallAdapterFactory import com.slack.eithernet.ApiResultConverterFactory import com.squareup.moshi.Moshi diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/interceptor/AccessTokenInterceptor.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/interceptor/AccessTokenInterceptor.kt index c38ed1dc..8d9a7ec5 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/interceptor/AccessTokenInterceptor.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/interceptor/AccessTokenInterceptor.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.network.interceptor +package dev.meloda.fast.network.interceptor import androidx.core.net.toUri -import com.meloda.app.fast.common.UserConfig +import dev.meloda.fast.common.UserConfig import okhttp3.Interceptor import okhttp3.Response import java.net.URLEncoder diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/interceptor/LanguageInterceptor.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/interceptor/LanguageInterceptor.kt index f6e0db55..8a627b1d 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/interceptor/LanguageInterceptor.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/interceptor/LanguageInterceptor.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.network.interceptor +package dev.meloda.fast.network.interceptor import androidx.core.net.toUri -import com.meloda.app.fast.common.model.ApiLanguage -import com.meloda.app.fast.common.provider.Provider +import dev.meloda.fast.common.model.ApiLanguage +import dev.meloda.fast.common.provider.Provider import okhttp3.Interceptor import okhttp3.Response import java.net.URLEncoder diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/interceptor/VersionInterceptor.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/interceptor/VersionInterceptor.kt index 37312864..3100df14 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/interceptor/VersionInterceptor.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/interceptor/VersionInterceptor.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.network.interceptor +package dev.meloda.fast.network.interceptor import androidx.core.net.toUri -import com.meloda.app.fast.common.AppConstants +import dev.meloda.fast.common.AppConstants import okhttp3.Interceptor import okhttp3.Response import java.net.URLEncoder diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/account/AccountService.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/account/AccountService.kt index bf26805c..e1da6ff5 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/account/AccountService.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/account/AccountService.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.network.service.account +package dev.meloda.fast.network.service.account -import com.meloda.app.fast.network.ApiResponse -import com.meloda.app.fast.network.RestApiError +import dev.meloda.fast.network.ApiResponse +import dev.meloda.fast.network.RestApiError import com.slack.eithernet.ApiResult import retrofit2.http.FieldMap import retrofit2.http.FormUrlEncoded diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/account/AccountUrls.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/account/AccountUrls.kt index 3849db17..649baeb0 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/account/AccountUrls.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/account/AccountUrls.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.network.service.account +package dev.meloda.fast.network.service.account -import com.meloda.app.fast.common.AppConstants +import dev.meloda.fast.common.AppConstants object AccountUrls { private const val URL = AppConstants.URL_API diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/audios/AudiosService.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/audios/AudiosService.kt index 24b54741..20ac259f 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/audios/AudiosService.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/audios/AudiosService.kt @@ -1,10 +1,10 @@ -package com.meloda.app.fast.network.service.audios +package dev.meloda.fast.network.service.audios -import com.meloda.app.fast.model.api.data.VkAudioData -import com.meloda.app.fast.model.api.responses.AudiosGetUploadServerResponse -import com.meloda.app.fast.model.api.responses.AudiosUploadResponse -import com.meloda.app.fast.network.ApiResponse -import com.meloda.app.fast.network.RestApiError +import dev.meloda.fast.model.api.data.VkAudioData +import dev.meloda.fast.model.api.responses.AudiosGetUploadServerResponse +import dev.meloda.fast.model.api.responses.AudiosUploadResponse +import dev.meloda.fast.network.ApiResponse +import dev.meloda.fast.network.RestApiError import com.slack.eithernet.ApiResult import okhttp3.MultipartBody import retrofit2.http.FieldMap diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/audios/AudiosUrls.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/audios/AudiosUrls.kt index 6e49195c..e2306aa9 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/audios/AudiosUrls.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/audios/AudiosUrls.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.network.service.audios +package dev.meloda.fast.network.service.audios -import com.meloda.app.fast.common.AppConstants +import dev.meloda.fast.common.AppConstants object AudiosUrls { diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/auth/AuthService.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/auth/AuthService.kt index 6d017f1f..18606900 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/auth/AuthService.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/auth/AuthService.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.network.service.auth +package dev.meloda.fast.network.service.auth -import com.meloda.app.fast.model.api.responses.ValidateLoginResponse -import com.meloda.app.fast.model.api.responses.ValidatePhoneResponse -import com.meloda.app.fast.network.ApiResponse -import com.meloda.app.fast.network.RestApiError +import dev.meloda.fast.model.api.responses.ValidateLoginResponse +import dev.meloda.fast.model.api.responses.ValidatePhoneResponse +import dev.meloda.fast.network.ApiResponse +import dev.meloda.fast.network.RestApiError import com.slack.eithernet.ApiResult import retrofit2.http.GET import retrofit2.http.Query diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/auth/AuthUrls.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/auth/AuthUrls.kt index bfce1fe4..7f03b1ed 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/auth/AuthUrls.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/auth/AuthUrls.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.network.service.auth +package dev.meloda.fast.network.service.auth -import com.meloda.app.fast.common.AppConstants +import dev.meloda.fast.common.AppConstants object AuthUrls { private const val URL = AppConstants.URL_API diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/conversations/ConversationsService.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/conversations/ConversationsService.kt index 8c9c1acd..b03277ba 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/conversations/ConversationsService.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/conversations/ConversationsService.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.network.service.conversations +package dev.meloda.fast.network.service.conversations -import com.meloda.app.fast.model.api.responses.ConversationsDeleteResponse -import com.meloda.app.fast.model.api.responses.ConversationsGetResponse -import com.meloda.app.fast.network.ApiResponse -import com.meloda.app.fast.network.RestApiError +import dev.meloda.fast.model.api.responses.ConversationsDeleteResponse +import dev.meloda.fast.model.api.responses.ConversationsGetResponse +import dev.meloda.fast.network.ApiResponse +import dev.meloda.fast.network.RestApiError import com.slack.eithernet.ApiResult import retrofit2.http.FieldMap import retrofit2.http.FormUrlEncoded diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/conversations/ConversationsUrls.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/conversations/ConversationsUrls.kt index 24ca304c..56b9fc0e 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/conversations/ConversationsUrls.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/conversations/ConversationsUrls.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.network.service.conversations +package dev.meloda.fast.network.service.conversations -import com.meloda.app.fast.common.AppConstants +import dev.meloda.fast.common.AppConstants object ConversationsUrls { diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/files/FilesService.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/files/FilesService.kt index f7d41479..ee8d7970 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/files/FilesService.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/files/FilesService.kt @@ -1,10 +1,10 @@ -package com.meloda.app.fast.network.service.files +package dev.meloda.fast.network.service.files -import com.meloda.app.fast.model.api.responses.FilesGetMessagesUploadServerResponse -import com.meloda.app.fast.model.api.responses.FilesSaveFileResponse -import com.meloda.app.fast.model.api.responses.FilesUploadFileResponse -import com.meloda.app.fast.network.ApiResponse -import com.meloda.app.fast.network.RestApiError +import dev.meloda.fast.model.api.responses.FilesGetMessagesUploadServerResponse +import dev.meloda.fast.model.api.responses.FilesSaveFileResponse +import dev.meloda.fast.model.api.responses.FilesUploadFileResponse +import dev.meloda.fast.network.ApiResponse +import dev.meloda.fast.network.RestApiError import com.slack.eithernet.ApiResult import okhttp3.MultipartBody import retrofit2.http.FieldMap diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/files/FilesUrls.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/files/FilesUrls.kt index 5ec9f2c5..c54f6798 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/files/FilesUrls.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/files/FilesUrls.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.network.service.files +package dev.meloda.fast.network.service.files -import com.meloda.app.fast.common.AppConstants +import dev.meloda.fast.common.AppConstants object FilesUrls { diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/friends/FriendsService.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/friends/FriendsService.kt index cb81ab49..35069f7d 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/friends/FriendsService.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/friends/FriendsService.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.network.service.friends +package dev.meloda.fast.network.service.friends -import com.meloda.app.fast.model.api.responses.GetFriendsResponse -import com.meloda.app.fast.network.ApiResponse -import com.meloda.app.fast.network.RestApiError +import dev.meloda.fast.model.api.responses.GetFriendsResponse +import dev.meloda.fast.network.ApiResponse +import dev.meloda.fast.network.RestApiError import com.slack.eithernet.ApiResult import retrofit2.http.FieldMap import retrofit2.http.FormUrlEncoded diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/friends/FriendsUrls.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/friends/FriendsUrls.kt index 6e431e86..2cfad40b 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/friends/FriendsUrls.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/friends/FriendsUrls.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.network.service.friends +package dev.meloda.fast.network.service.friends -import com.meloda.app.fast.common.AppConstants +import dev.meloda.fast.common.AppConstants object FriendsUrls { diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/longpoll/LongPollService.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/longpoll/LongPollService.kt index fc8b9fdf..a22f5f12 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/longpoll/LongPollService.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/longpoll/LongPollService.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.network.service.longpoll +package dev.meloda.fast.network.service.longpoll -import com.meloda.app.fast.model.api.data.LongPollUpdates -import com.meloda.app.fast.network.RestApiError +import dev.meloda.fast.model.api.data.LongPollUpdates +import dev.meloda.fast.network.RestApiError import com.slack.eithernet.ApiResult import retrofit2.http.GET import retrofit2.http.QueryMap diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/messages/MessagesService.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/messages/MessagesService.kt index d579520c..25f1b6ad 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/messages/MessagesService.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/messages/MessagesService.kt @@ -1,11 +1,11 @@ -package com.meloda.app.fast.network.service.messages +package dev.meloda.fast.network.service.messages -import com.meloda.app.fast.model.api.data.VkLongPollData -import com.meloda.app.fast.model.api.responses.MessagesGetByIdResponse -import com.meloda.app.fast.model.api.responses.MessagesGetHistoryAttachmentsResponse -import com.meloda.app.fast.model.api.responses.MessagesGetHistoryResponse -import com.meloda.app.fast.network.ApiResponse -import com.meloda.app.fast.network.RestApiError +import dev.meloda.fast.model.api.data.VkLongPollData +import dev.meloda.fast.model.api.responses.MessagesGetByIdResponse +import dev.meloda.fast.model.api.responses.MessagesGetHistoryAttachmentsResponse +import dev.meloda.fast.model.api.responses.MessagesGetHistoryResponse +import dev.meloda.fast.network.ApiResponse +import dev.meloda.fast.network.RestApiError import com.slack.eithernet.ApiResult import retrofit2.http.FieldMap import retrofit2.http.FormUrlEncoded diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/messages/MessagesUrls.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/messages/MessagesUrls.kt index 13d77f21..a3785574 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/messages/MessagesUrls.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/messages/MessagesUrls.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.network.service.messages +package dev.meloda.fast.network.service.messages -import com.meloda.app.fast.common.AppConstants +import dev.meloda.fast.common.AppConstants object MessagesUrls { diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/oauth/OAuthService.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/oauth/OAuthService.kt index c716b90e..427258b8 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/oauth/OAuthService.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/oauth/OAuthService.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.network.service.oauth +package dev.meloda.fast.network.service.oauth -import com.meloda.app.fast.model.api.responses.AuthDirectResponse -import com.meloda.app.fast.model.api.responses.GetAnonymousTokenResponse +import dev.meloda.fast.model.api.responses.AuthDirectResponse +import dev.meloda.fast.model.api.responses.GetAnonymousTokenResponse import com.slack.eithernet.ApiResult import com.slack.eithernet.DecodeErrorBody import retrofit2.http.GET diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/oauth/OAuthUrls.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/oauth/OAuthUrls.kt index 87562ea6..c9a6c593 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/oauth/OAuthUrls.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/oauth/OAuthUrls.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.network.service.oauth +package dev.meloda.fast.network.service.oauth -import com.meloda.app.fast.common.AppConstants +import dev.meloda.fast.common.AppConstants object OAuthUrls { private const val URL = AppConstants.URL_OAUTH diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/photos/PhotoUrls.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/photos/PhotoUrls.kt index 4d97d8f4..55abdbac 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/photos/PhotoUrls.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/photos/PhotoUrls.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.network.service.photos +package dev.meloda.fast.network.service.photos -import com.meloda.app.fast.common.AppConstants +import dev.meloda.fast.common.AppConstants object PhotoUrls { diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/photos/PhotosService.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/photos/PhotosService.kt index 23bbd4c0..6b958b6c 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/photos/PhotosService.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/photos/PhotosService.kt @@ -1,10 +1,10 @@ -package com.meloda.app.fast.network.service.photos +package dev.meloda.fast.network.service.photos -import com.meloda.app.fast.model.api.data.VkPhotoData -import com.meloda.app.fast.model.api.responses.PhotosGetMessagesUploadServerResponse -import com.meloda.app.fast.model.api.responses.PhotosUploadPhotoResponse -import com.meloda.app.fast.network.ApiResponse -import com.meloda.app.fast.network.RestApiError +import dev.meloda.fast.model.api.data.VkPhotoData +import dev.meloda.fast.model.api.responses.PhotosGetMessagesUploadServerResponse +import dev.meloda.fast.model.api.responses.PhotosUploadPhotoResponse +import dev.meloda.fast.network.ApiResponse +import dev.meloda.fast.network.RestApiError import com.slack.eithernet.ApiResult import okhttp3.MultipartBody import retrofit2.http.FieldMap diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/users/UsersService.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/users/UsersService.kt index 372f2c26..8a491aa9 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/users/UsersService.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/users/UsersService.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.network.service.users +package dev.meloda.fast.network.service.users -import com.meloda.app.fast.model.api.data.VkUserData -import com.meloda.app.fast.network.ApiResponse -import com.meloda.app.fast.network.RestApiError +import dev.meloda.fast.model.api.data.VkUserData +import dev.meloda.fast.network.ApiResponse +import dev.meloda.fast.network.RestApiError import com.slack.eithernet.ApiResult import retrofit2.http.FieldMap import retrofit2.http.FormUrlEncoded diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/users/UsersUrls.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/users/UsersUrls.kt index 11c6a6b2..152d37f4 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/users/UsersUrls.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/users/UsersUrls.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.network.service.users +package dev.meloda.fast.network.service.users -import com.meloda.app.fast.common.AppConstants +import dev.meloda.fast.common.AppConstants object UsersUrls { diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/videos/VideosService.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/videos/VideosService.kt index f4163f9a..b7cdda21 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/videos/VideosService.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/videos/VideosService.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.network.service.videos +package dev.meloda.fast.network.service.videos -import com.meloda.app.fast.model.api.responses.VideosSaveResponse -import com.meloda.app.fast.model.api.responses.VideosUploadResponse -import com.meloda.app.fast.network.ApiResponse -import com.meloda.app.fast.network.RestApiError +import dev.meloda.fast.model.api.responses.VideosSaveResponse +import dev.meloda.fast.model.api.responses.VideosUploadResponse +import dev.meloda.fast.network.ApiResponse +import dev.meloda.fast.network.RestApiError import com.slack.eithernet.ApiResult import okhttp3.MultipartBody import retrofit2.http.Multipart diff --git a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/videos/VideosUrls.kt b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/videos/VideosUrls.kt index ebf43453..f95a13f7 100644 --- a/core/network/src/main/kotlin/com/meloda/app/fast/network/service/videos/VideosUrls.kt +++ b/core/network/src/main/kotlin/com/meloda/app/fast/network/service/videos/VideosUrls.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.network.service.videos +package dev.meloda.fast.network.service.videos -import com.meloda.app.fast.common.AppConstants +import dev.meloda.fast.common.AppConstants object VideosUrls { diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 660b6919..a1dea308 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -4,10 +4,10 @@ plugins { alias(libs.plugins.kotlin.compose.compiler) } -group = "com.meloda.app.fast.ui" +group = "dev.meloda.fast.ui" android { - namespace = "com.meloda.app.fast.ui" + namespace = "dev.meloda.fast.ui" compileSdk = Configs.compileSdk defaultConfig { diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/basic/AutoFill.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/basic/AutoFill.kt index 0244eb51..41711e14 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/basic/AutoFill.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/basic/AutoFill.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.basic +package dev.meloda.fast.ui.basic import android.os.Build import android.view.autofill.AutofillManager diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/basic/ContentAlpha.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/basic/ContentAlpha.kt index b5a4d985..75cd135d 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/basic/ContentAlpha.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/basic/ContentAlpha.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.basic +package dev.meloda.fast.ui.basic /* * Copyright 2020 The Android Open Source Project @@ -22,7 +22,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.compositionLocalOf import androidx.compose.ui.graphics.luminance -import com.meloda.app.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.ui.theme.LocalThemeConfig /** * Default alpha levels used by Material components. diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/basic/LocalContentAlpha.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/basic/LocalContentAlpha.kt index 8e95e9a5..8f84ce5f 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/basic/LocalContentAlpha.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/basic/LocalContentAlpha.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.basic +package dev.meloda.fast.ui.basic import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/AnimatedDots.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/AnimatedDots.kt index 32a09a64..71a8bf5b 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/AnimatedDots.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/AnimatedDots.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.components +package dev.meloda.fast.ui.components // TODO: 26.08.2023, Danil Nikolaev: rewrite diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/ErrorView.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/ErrorView.kt index fc59558e..1d43f793 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/ErrorView.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/ErrorView.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.components +package dev.meloda.fast.ui.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/FullScreenLoader.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/FullScreenLoader.kt index 7a08d294..3ca765eb 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/FullScreenLoader.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/FullScreenLoader.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.components +package dev.meloda.fast.ui.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/MaterialDialog.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/MaterialDialog.kt index f35da48a..740bfde7 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/MaterialDialog.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/MaterialDialog.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.components +package dev.meloda.fast.ui.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.clickable @@ -33,8 +33,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.layout.onPlaced import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties -import com.meloda.app.fast.ui.util.ImmutableList -import com.meloda.app.fast.ui.util.ImmutableList.Companion.toImmutableList +import dev.meloda.fast.ui.util.ImmutableList +import dev.meloda.fast.ui.util.ImmutableList.Companion.toImmutableList @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/NoItemsView.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/NoItemsView.kt index f790d984..b87ca10c 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/NoItemsView.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/NoItemsView.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.components +package dev.meloda.fast.ui.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -9,7 +9,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import com.meloda.app.fast.ui.R +import dev.meloda.fast.ui.R @Composable fun NoItemsView( diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/TextFieldError.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/TextFieldError.kt index 3cb8f9ab..50fee3c5 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/TextFieldError.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/components/TextFieldError.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.components +package dev.meloda.fast.ui.components import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.meloda.app.fast.ui.R +import dev.meloda.fast.ui.R @Composable fun TextFieldErrorText( diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/model/TabItem.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/model/TabItem.kt index b13f1d6b..efd3a153 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/model/TabItem.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/model/TabItem.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.model +package dev.meloda.fast.ui.model data class TabItem( val titleResId: Int?, diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/model/ThemeConfig.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/model/ThemeConfig.kt index 11ac2b70..a24ee3fd 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/model/ThemeConfig.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/model/ThemeConfig.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.model +package dev.meloda.fast.ui.model data class ThemeConfig( val darkMode: Boolean, diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/theme/AppTheme.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/theme/AppTheme.kt index 7410488a..be1b33fc 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/theme/AppTheme.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/theme/AppTheme.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.theme +package dev.meloda.fast.ui.theme import android.app.Activity import android.os.Build @@ -20,8 +20,8 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.core.view.WindowCompat -import com.meloda.app.fast.ui.R -import com.meloda.app.fast.ui.model.ThemeConfig +import dev.meloda.fast.ui.R +import dev.meloda.fast.ui.model.ThemeConfig import dev.chrisbanes.haze.HazeState private val googleSansFonts = FontFamily( diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/theme/ClassicColorScheme.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/theme/ClassicColorScheme.kt index 7227e685..a17f9c84 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/theme/ClassicColorScheme.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/theme/ClassicColorScheme.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.theme +package dev.meloda.fast.ui.theme import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/util/Extensions.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/util/Extensions.kt index 36482cd3..e7ba4986 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/util/Extensions.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/util/Extensions.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.util +package dev.meloda.fast.ui.util import android.content.res.Configuration import android.os.PowerManager @@ -16,8 +16,8 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.core.content.getSystemService -import com.meloda.app.fast.common.model.DarkMode -import com.meloda.app.fast.common.model.UiText +import dev.meloda.fast.common.model.DarkMode +import dev.meloda.fast.common.model.UiText @Composable fun UiText?.getString(): String? { diff --git a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/util/ImmutableList.kt b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/util/ImmutableList.kt index b5d1fa5f..12a7b1c5 100644 --- a/core/ui/src/main/kotlin/com/meloda/app/fast/ui/util/ImmutableList.kt +++ b/core/ui/src/main/kotlin/com/meloda/app/fast/ui/util/ImmutableList.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.ui.util +package dev.meloda.fast.ui.util import androidx.compose.runtime.Immutable diff --git a/feature/auth/build.gradle.kts b/feature/auth/build.gradle.kts index b564fcaa..133f68a4 100644 --- a/feature/auth/build.gradle.kts +++ b/feature/auth/build.gradle.kts @@ -17,7 +17,7 @@ plugins { alias(libs.plugins.kotlin.serialization) } -group = "com.meloda.app.fast.auth" +group = "dev.meloda.fast.auth" androidComponents { onVariants { variant -> @@ -43,7 +43,7 @@ androidComponents { } android { - namespace = "com.meloda.app.fast.auth" + namespace = "dev.meloda.fast.auth" compileSdk = Configs.compileSdk defaultConfig { diff --git a/feature/auth/captcha/build.gradle.kts b/feature/auth/captcha/build.gradle.kts index 92af2212..cb58c0e6 100644 --- a/feature/auth/captcha/build.gradle.kts +++ b/feature/auth/captcha/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } android { - namespace = "com.meloda.app.fast.captcha" + namespace = "dev.meloda.fast.captcha" compileSdk = Configs.compileSdk defaultConfig { diff --git a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/CaptchaViewModel.kt b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/CaptchaViewModel.kt index 23a38b4b..e48c54c9 100644 --- a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/CaptchaViewModel.kt +++ b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/CaptchaViewModel.kt @@ -1,12 +1,12 @@ -package com.meloda.app.fast.auth.captcha +package dev.meloda.fast.auth.captcha import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel -import com.meloda.app.fast.auth.captcha.model.CaptchaScreenState -import com.meloda.app.fast.auth.captcha.navigation.Captcha -import com.meloda.app.fast.auth.captcha.validation.CaptchaValidator -import com.meloda.app.fast.common.extensions.setValue -import com.meloda.app.fast.common.extensions.updateValue +import dev.meloda.fast.auth.captcha.model.CaptchaScreenState +import dev.meloda.fast.auth.captcha.navigation.Captcha +import dev.meloda.fast.auth.captcha.validation.CaptchaValidator +import dev.meloda.fast.common.extensions.setValue +import dev.meloda.fast.common.extensions.updateValue import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update diff --git a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/di/CaptchaDI.kt b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/di/CaptchaDI.kt index af9147e1..c63fce8e 100644 --- a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/di/CaptchaDI.kt +++ b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/di/CaptchaDI.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.auth.captcha.di +package dev.meloda.fast.auth.captcha.di -import com.meloda.app.fast.auth.captcha.CaptchaViewModel -import com.meloda.app.fast.auth.captcha.CaptchaViewModelImpl -import com.meloda.app.fast.auth.captcha.validation.CaptchaValidator +import dev.meloda.fast.auth.captcha.CaptchaViewModel +import dev.meloda.fast.auth.captcha.CaptchaViewModelImpl +import dev.meloda.fast.auth.captcha.validation.CaptchaValidator import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.core.module.dsl.singleOf import org.koin.dsl.bind diff --git a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/model/CaptchaScreenState.kt b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/model/CaptchaScreenState.kt index 2dd53721..93e59754 100644 --- a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/model/CaptchaScreenState.kt +++ b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/model/CaptchaScreenState.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.auth.captcha.model +package dev.meloda.fast.auth.captcha.model data class CaptchaScreenState( val captchaImageUrl: String, diff --git a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/model/CaptchaValidationResult.kt b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/model/CaptchaValidationResult.kt index 836ae4c9..84b4e0af 100644 --- a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/model/CaptchaValidationResult.kt +++ b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/model/CaptchaValidationResult.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.auth.captcha.model +package dev.meloda.fast.auth.captcha.model sealed class CaptchaValidationResult { data object Empty : CaptchaValidationResult() diff --git a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/navigation/CaptchaNavigation.kt b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/navigation/CaptchaNavigation.kt index b2e345c7..b415a2fa 100644 --- a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/navigation/CaptchaNavigation.kt +++ b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/navigation/CaptchaNavigation.kt @@ -1,11 +1,11 @@ -package com.meloda.app.fast.auth.captcha.navigation +package dev.meloda.fast.auth.captcha.navigation import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable import androidx.navigation.toRoute -import com.meloda.app.fast.auth.captcha.presentation.CaptchaRoute +import dev.meloda.fast.auth.captcha.presentation.CaptchaRoute import kotlinx.serialization.Serializable @Serializable diff --git a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/presentation/CaptchaScreen.kt b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/presentation/CaptchaScreen.kt index d1961716..aec2ebd2 100644 --- a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/presentation/CaptchaScreen.kt +++ b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/presentation/CaptchaScreen.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.auth.captcha.presentation +package dev.meloda.fast.auth.captcha.presentation import androidx.activity.compose.BackHandler import androidx.compose.animation.AnimatedVisibility @@ -47,14 +47,14 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.compose.AsyncImage -import com.meloda.app.fast.auth.captcha.CaptchaViewModel -import com.meloda.app.fast.auth.captcha.CaptchaViewModelImpl -import com.meloda.app.fast.auth.captcha.model.CaptchaScreenState -import com.meloda.app.fast.ui.components.ActionInvokeDismiss -import com.meloda.app.fast.ui.components.MaterialDialog -import com.meloda.app.fast.ui.components.TextFieldErrorText +import dev.meloda.fast.auth.captcha.CaptchaViewModel +import dev.meloda.fast.auth.captcha.CaptchaViewModelImpl +import dev.meloda.fast.auth.captcha.model.CaptchaScreenState +import dev.meloda.fast.ui.components.ActionInvokeDismiss +import dev.meloda.fast.ui.components.MaterialDialog +import dev.meloda.fast.ui.components.TextFieldErrorText import org.koin.androidx.compose.koinViewModel -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR @Composable fun CaptchaRoute( diff --git a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/validation/CaptchaValidator.kt b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/validation/CaptchaValidator.kt index 555a84a7..8a3ffedd 100644 --- a/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/validation/CaptchaValidator.kt +++ b/feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/validation/CaptchaValidator.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.auth.captcha.validation +package dev.meloda.fast.auth.captcha.validation -import com.meloda.app.fast.auth.captcha.model.CaptchaScreenState -import com.meloda.app.fast.auth.captcha.model.CaptchaValidationResult +import dev.meloda.fast.auth.captcha.model.CaptchaScreenState +import dev.meloda.fast.auth.captcha.model.CaptchaValidationResult class CaptchaValidator { diff --git a/feature/auth/login/build.gradle.kts b/feature/auth/login/build.gradle.kts index a9a9d1bf..898eca6c 100644 --- a/feature/auth/login/build.gradle.kts +++ b/feature/auth/login/build.gradle.kts @@ -40,7 +40,7 @@ androidComponents { } android { - namespace = "com.meloda.app.fast.auth.login" + namespace = "dev.meloda.fast.auth.login" compileSdk = Configs.compileSdk defaultConfig { diff --git a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/LoginViewModel.kt b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/LoginViewModel.kt index af1da7d5..a9fa32fd 100644 --- a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/LoginViewModel.kt +++ b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/LoginViewModel.kt @@ -3,22 +3,22 @@ package com.meloda.fast.auth.login import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.meloda.app.fast.auth.login.BuildConfig -import com.meloda.app.fast.common.LongPollController -import com.meloda.app.fast.common.UserConfig -import com.meloda.app.fast.common.VkConstants -import com.meloda.app.fast.common.extensions.listenValue -import com.meloda.app.fast.common.extensions.setValue -import com.meloda.app.fast.common.extensions.updateValue -import com.meloda.app.fast.common.model.LongPollState -import com.meloda.app.fast.data.State -import com.meloda.app.fast.data.api.users.UsersUseCase -import com.meloda.app.fast.data.db.AccountsRepository -import com.meloda.app.fast.data.processState -import com.meloda.app.fast.datastore.AppSettings -import com.meloda.app.fast.datastore.UserSettings -import com.meloda.app.fast.model.database.AccountEntity -import com.meloda.app.fast.network.OAuthErrorDomain +import dev.meloda.fast.auth.login.BuildConfig +import dev.meloda.fast.common.LongPollController +import dev.meloda.fast.common.UserConfig +import dev.meloda.fast.common.VkConstants +import dev.meloda.fast.common.extensions.listenValue +import dev.meloda.fast.common.extensions.setValue +import dev.meloda.fast.common.extensions.updateValue +import dev.meloda.fast.common.model.LongPollState +import dev.meloda.fast.data.State +import dev.meloda.fast.data.api.users.UsersUseCase +import dev.meloda.fast.data.db.AccountsRepository +import dev.meloda.fast.data.processState +import dev.meloda.fast.datastore.AppSettings +import dev.meloda.fast.datastore.UserSettings +import dev.meloda.fast.model.database.AccountEntity +import dev.meloda.fast.network.OAuthErrorDomain import com.meloda.fast.auth.login.model.CaptchaArguments import com.meloda.fast.auth.login.model.LoginError import com.meloda.fast.auth.login.model.LoginScreenState diff --git a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/OAuthUseCase.kt b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/OAuthUseCase.kt index a1874906..692feb62 100644 --- a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/OAuthUseCase.kt +++ b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/OAuthUseCase.kt @@ -1,6 +1,6 @@ package com.meloda.fast.auth.login -import com.meloda.app.fast.data.State +import dev.meloda.fast.data.State import com.meloda.fast.auth.login.model.AuthInfo import kotlinx.coroutines.flow.Flow diff --git a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/OAuthUseCaseImpl.kt b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/OAuthUseCaseImpl.kt index 6486d9d8..1283f3a0 100644 --- a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/OAuthUseCaseImpl.kt +++ b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/OAuthUseCaseImpl.kt @@ -1,11 +1,11 @@ package com.meloda.fast.auth.login -import com.meloda.app.fast.data.State -import com.meloda.app.fast.data.api.oauth.OAuthRepository -import com.meloda.app.fast.network.OAuthErrorDomain -import com.meloda.app.fast.network.ValidationType -import com.meloda.app.fast.network.VkOAuthError -import com.meloda.app.fast.network.VkOAuthErrorType +import dev.meloda.fast.data.State +import dev.meloda.fast.data.api.oauth.OAuthRepository +import dev.meloda.fast.network.OAuthErrorDomain +import dev.meloda.fast.network.ValidationType +import dev.meloda.fast.network.VkOAuthError +import dev.meloda.fast.network.VkOAuthErrorType import com.meloda.fast.auth.login.model.AuthInfo import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/navigation/LoginNavigation.kt b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/navigation/LoginNavigation.kt index edbf4613..1c077e1d 100644 --- a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/navigation/LoginNavigation.kt +++ b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/navigation/LoginNavigation.kt @@ -4,7 +4,7 @@ import androidx.navigation.NavBackStackEntry import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable -import com.meloda.app.fast.common.extensions.navigation.sharedViewModel +import dev.meloda.fast.common.extensions.navigation.sharedViewModel import com.meloda.fast.auth.login.LoginViewModel import com.meloda.fast.auth.login.LoginViewModelImpl import com.meloda.fast.auth.login.model.CaptchaArguments diff --git a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/presentation/LoginScreen.kt b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/presentation/LoginScreen.kt index 598d7a87..465d9c07 100644 --- a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/presentation/LoginScreen.kt +++ b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/presentation/LoginScreen.kt @@ -50,14 +50,14 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.meloda.app.fast.ui.basic.autoFillRequestHandler -import com.meloda.app.fast.ui.basic.connectNode -import com.meloda.app.fast.ui.basic.defaultFocusChangeAutoFill -import com.meloda.app.fast.ui.components.MaterialDialog -import com.meloda.app.fast.ui.components.TextFieldErrorText -import com.meloda.app.fast.ui.theme.LocalThemeConfig -import com.meloda.app.fast.ui.util.handleEnterKey -import com.meloda.app.fast.ui.util.handleTabKey +import dev.meloda.fast.ui.basic.autoFillRequestHandler +import dev.meloda.fast.ui.basic.connectNode +import dev.meloda.fast.ui.basic.defaultFocusChangeAutoFill +import dev.meloda.fast.ui.components.MaterialDialog +import dev.meloda.fast.ui.components.TextFieldErrorText +import dev.meloda.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.ui.util.handleEnterKey +import dev.meloda.fast.ui.util.handleTabKey import com.meloda.fast.auth.login.LoginViewModel import com.meloda.fast.auth.login.LoginViewModelImpl import com.meloda.fast.auth.login.model.CaptchaArguments @@ -66,7 +66,7 @@ import com.meloda.fast.auth.login.model.LoginScreenState import com.meloda.fast.auth.login.model.LoginUserBannedArguments import com.meloda.fast.auth.login.model.LoginValidationArguments import org.koin.androidx.compose.koinViewModel -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR @Composable fun LoginRoute( diff --git a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/presentation/LogoScreen.kt b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/presentation/LogoScreen.kt index 672f41b8..63ea9808 100644 --- a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/presentation/LogoScreen.kt +++ b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/presentation/LogoScreen.kt @@ -31,11 +31,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.meloda.app.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.ui.theme.LocalThemeConfig import com.meloda.fast.auth.login.LoginViewModel import com.meloda.fast.auth.login.LoginViewModelImpl import org.koin.androidx.compose.koinViewModel -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR @Composable fun LogoRoute( diff --git a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/validation/LoginValidator.kt b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/validation/LoginValidator.kt index 8ae9bd4a..7cb6e264 100644 --- a/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/validation/LoginValidator.kt +++ b/feature/auth/login/src/main/kotlin/com/meloda/fast/auth/login/validation/LoginValidator.kt @@ -1,6 +1,6 @@ package com.meloda.fast.auth.login.validation -import com.meloda.app.fast.common.extensions.addIf +import dev.meloda.fast.common.extensions.addIf import com.meloda.fast.auth.login.model.LoginScreenState import com.meloda.fast.auth.login.model.LoginValidationResult diff --git a/feature/auth/src/main/kotlin/com/meloda/app/fast/auth/AuthGraph.kt b/feature/auth/src/main/kotlin/com/meloda/app/fast/auth/AuthGraph.kt index 086bc224..6c311d17 100644 --- a/feature/auth/src/main/kotlin/com/meloda/app/fast/auth/AuthGraph.kt +++ b/feature/auth/src/main/kotlin/com/meloda/app/fast/auth/AuthGraph.kt @@ -1,19 +1,19 @@ -package com.meloda.app.fast.auth +package dev.meloda.fast.auth import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.navigation -import com.meloda.app.fast.auth.captcha.navigation.captchaScreen -import com.meloda.app.fast.auth.captcha.navigation.navigateToCaptcha -import com.meloda.app.fast.auth.captcha.navigation.setCaptchaResult -import com.meloda.app.fast.auth.validation.model.ValidationArguments -import com.meloda.app.fast.auth.validation.navigation.navigateToValidation -import com.meloda.app.fast.auth.validation.navigation.setValidationResult -import com.meloda.app.fast.auth.validation.navigation.validationScreen -import com.meloda.app.fast.model.BaseError -import com.meloda.app.fast.userbanned.model.UserBannedArguments -import com.meloda.app.fast.userbanned.navigation.navigateToUserBanned -import com.meloda.app.fast.userbanned.navigation.userBannedRoute +import dev.meloda.fast.auth.captcha.navigation.captchaScreen +import dev.meloda.fast.auth.captcha.navigation.navigateToCaptcha +import dev.meloda.fast.auth.captcha.navigation.setCaptchaResult +import dev.meloda.fast.auth.validation.model.ValidationArguments +import dev.meloda.fast.auth.validation.navigation.navigateToValidation +import dev.meloda.fast.auth.validation.navigation.setValidationResult +import dev.meloda.fast.auth.validation.navigation.validationScreen +import dev.meloda.fast.model.BaseError +import dev.meloda.fast.userbanned.model.UserBannedArguments +import dev.meloda.fast.userbanned.navigation.navigateToUserBanned +import dev.meloda.fast.userbanned.navigation.userBannedRoute import com.meloda.fast.auth.login.navigation.Logo import com.meloda.fast.auth.login.navigation.loginScreen import com.meloda.fast.auth.login.navigation.navigateToLogin diff --git a/feature/auth/src/main/kotlin/com/meloda/app/fast/auth/AuthModule.kt b/feature/auth/src/main/kotlin/com/meloda/app/fast/auth/AuthModule.kt index d818230f..fb920ed1 100644 --- a/feature/auth/src/main/kotlin/com/meloda/app/fast/auth/AuthModule.kt +++ b/feature/auth/src/main/kotlin/com/meloda/app/fast/auth/AuthModule.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.auth +package dev.meloda.fast.auth -import com.meloda.app.fast.auth.captcha.di.captchaModule -import com.meloda.app.fast.auth.validation.di.validationModule +import dev.meloda.fast.auth.captcha.di.captchaModule +import dev.meloda.fast.auth.validation.di.validationModule import com.meloda.fast.auth.login.di.loginModule import org.koin.dsl.module diff --git a/feature/auth/userbanned/build.gradle.kts b/feature/auth/userbanned/build.gradle.kts index e95377fb..ebf3ff3e 100644 --- a/feature/auth/userbanned/build.gradle.kts +++ b/feature/auth/userbanned/build.gradle.kts @@ -7,10 +7,10 @@ plugins { alias(libs.plugins.org.jetbrains.kotlin.plugin.parcelize) } -group = "com.meloda.app.fast.userbanned" +group = "dev.meloda.fast.userbanned" android { - namespace = "com.meloda.app.fast.userbanned" + namespace = "dev.meloda.fast.userbanned" compileSdk = Configs.compileSdk defaultConfig { diff --git a/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/model/UserBannedArguments.kt b/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/model/UserBannedArguments.kt index e114e0a7..d6092e9b 100644 --- a/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/model/UserBannedArguments.kt +++ b/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/model/UserBannedArguments.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.userbanned.model +package dev.meloda.fast.userbanned.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/model/UserBannedScreenState.kt b/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/model/UserBannedScreenState.kt index 80d2b48c..5ca1f369 100644 --- a/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/model/UserBannedScreenState.kt +++ b/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/model/UserBannedScreenState.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.userbanned.model +package dev.meloda.fast.userbanned.model data class UserBannedScreenState( val userName: String, diff --git a/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/navigation/UserBannedNavigation.kt b/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/navigation/UserBannedNavigation.kt index bed6e811..cc52ecd2 100644 --- a/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/navigation/UserBannedNavigation.kt +++ b/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/navigation/UserBannedNavigation.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.userbanned.navigation +package dev.meloda.fast.userbanned.navigation import android.os.Bundle import androidx.core.os.BundleCompat @@ -7,8 +7,8 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.toRoute -import com.meloda.app.fast.userbanned.model.UserBannedArguments -import com.meloda.app.fast.userbanned.presentation.UserBannedRoute +import dev.meloda.fast.userbanned.model.UserBannedArguments +import dev.meloda.fast.userbanned.presentation.UserBannedRoute import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json diff --git a/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/presentation/UserBannedScreen.kt b/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/presentation/UserBannedScreen.kt index 9e3d4e72..99e025aa 100644 --- a/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/presentation/UserBannedScreen.kt +++ b/feature/auth/userbanned/src/main/kotlin/com/meloda/app/fast/userbanned/presentation/UserBannedScreen.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.userbanned.presentation +package dev.meloda.fast.userbanned.presentation import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -23,8 +23,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.meloda.app.fast.userbanned.model.UserBannedScreenState -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.userbanned.model.UserBannedScreenState +import dev.meloda.fast.ui.R as UiR @Preview @Composable diff --git a/feature/auth/validation/build.gradle.kts b/feature/auth/validation/build.gradle.kts index 8921644a..358189b9 100644 --- a/feature/auth/validation/build.gradle.kts +++ b/feature/auth/validation/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } android { - namespace = "com.meloda.app.fast.validation" + namespace = "dev.meloda.fast.validation" compileSdk = Configs.compileSdk defaultConfig { diff --git a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/AuthUseCase.kt b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/AuthUseCase.kt index b9311f85..3e324108 100644 --- a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/AuthUseCase.kt +++ b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/AuthUseCase.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.auth.validation +package dev.meloda.fast.auth.validation -import com.meloda.app.fast.data.State -import com.meloda.app.fast.model.api.responses.ValidatePhoneResponse +import dev.meloda.fast.data.State +import dev.meloda.fast.model.api.responses.ValidatePhoneResponse import kotlinx.coroutines.flow.Flow interface AuthUseCase { diff --git a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/AuthUseCaseImpl.kt b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/AuthUseCaseImpl.kt index 022d919b..ad0f594e 100644 --- a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/AuthUseCaseImpl.kt +++ b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/AuthUseCaseImpl.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.auth.validation +package dev.meloda.fast.auth.validation -import com.meloda.app.fast.data.State -import com.meloda.app.fast.data.api.auth.AuthRepository -import com.meloda.app.fast.data.mapToState -import com.meloda.app.fast.model.api.responses.ValidatePhoneResponse +import dev.meloda.fast.data.State +import dev.meloda.fast.data.api.auth.AuthRepository +import dev.meloda.fast.data.mapToState +import dev.meloda.fast.model.api.responses.ValidatePhoneResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/ValidationViewModel.kt b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/ValidationViewModel.kt index dd969b0c..8388b9f2 100644 --- a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/ValidationViewModel.kt +++ b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/ValidationViewModel.kt @@ -1,17 +1,17 @@ -package com.meloda.app.fast.auth.validation +package dev.meloda.fast.auth.validation import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.meloda.app.fast.auth.validation.model.ValidationScreenState -import com.meloda.app.fast.auth.validation.model.ValidationType -import com.meloda.app.fast.auth.validation.navigation.Validation -import com.meloda.app.fast.auth.validation.validation.ValidationValidator -import com.meloda.app.fast.common.extensions.createTimerFlow -import com.meloda.app.fast.common.extensions.listenValue -import com.meloda.app.fast.common.extensions.setValue -import com.meloda.app.fast.common.extensions.updateValue -import com.meloda.app.fast.data.processState +import dev.meloda.fast.auth.validation.model.ValidationScreenState +import dev.meloda.fast.auth.validation.model.ValidationType +import dev.meloda.fast.auth.validation.navigation.Validation +import dev.meloda.fast.auth.validation.validation.ValidationValidator +import dev.meloda.fast.common.extensions.createTimerFlow +import dev.meloda.fast.common.extensions.listenValue +import dev.meloda.fast.common.extensions.setValue +import dev.meloda.fast.common.extensions.updateValue +import dev.meloda.fast.data.processState import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/di/ValidationModule.kt b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/di/ValidationModule.kt index 671066c3..606f88ca 100644 --- a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/di/ValidationModule.kt +++ b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/di/ValidationModule.kt @@ -1,10 +1,10 @@ -package com.meloda.app.fast.auth.validation.di +package dev.meloda.fast.auth.validation.di -import com.meloda.app.fast.auth.validation.AuthUseCase -import com.meloda.app.fast.auth.validation.AuthUseCaseImpl -import com.meloda.app.fast.auth.validation.ValidationViewModel -import com.meloda.app.fast.auth.validation.ValidationViewModelImpl -import com.meloda.app.fast.auth.validation.validation.ValidationValidator +import dev.meloda.fast.auth.validation.AuthUseCase +import dev.meloda.fast.auth.validation.AuthUseCaseImpl +import dev.meloda.fast.auth.validation.ValidationViewModel +import dev.meloda.fast.auth.validation.ValidationViewModelImpl +import dev.meloda.fast.auth.validation.validation.ValidationValidator import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.core.module.dsl.singleOf import org.koin.dsl.bind diff --git a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationArguments.kt b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationArguments.kt index d3d6c41c..9baa590e 100644 --- a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationArguments.kt +++ b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationArguments.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.auth.validation.model +package dev.meloda.fast.auth.validation.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationScreenState.kt b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationScreenState.kt index cf9fab77..6435066f 100644 --- a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationScreenState.kt +++ b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationScreenState.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.auth.validation.model +package dev.meloda.fast.auth.validation.model data class ValidationScreenState( val code: String?, diff --git a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationType.kt b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationType.kt index 8e1c0114..fa0404d4 100644 --- a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationType.kt +++ b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationType.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.auth.validation.model +package dev.meloda.fast.auth.validation.model enum class ValidationType(val value: String) { SMS("sms"), APP("2fa_app"); diff --git a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationValidationResult.kt b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationValidationResult.kt index 3955e6c6..78ff129b 100644 --- a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationValidationResult.kt +++ b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/model/ValidationValidationResult.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.auth.validation.model +package dev.meloda.fast.auth.validation.model sealed class ValidationValidationResult { data object Empty : ValidationValidationResult() diff --git a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/navigation/ValidationNavigation.kt b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/navigation/ValidationNavigation.kt index 04f3975d..8b2144e1 100644 --- a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/navigation/ValidationNavigation.kt +++ b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/navigation/ValidationNavigation.kt @@ -1,13 +1,13 @@ -package com.meloda.app.fast.auth.validation.navigation +package dev.meloda.fast.auth.validation.navigation import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable import androidx.navigation.toRoute -import com.meloda.app.fast.auth.validation.model.ValidationArguments -import com.meloda.app.fast.auth.validation.presentation.ValidationRoute -import com.meloda.app.fast.common.extensions.customNavType +import dev.meloda.fast.auth.validation.model.ValidationArguments +import dev.meloda.fast.auth.validation.presentation.ValidationRoute +import dev.meloda.fast.common.extensions.customNavType import kotlinx.serialization.Serializable import kotlin.reflect.typeOf diff --git a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/presentation/ValidationScreen.kt b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/presentation/ValidationScreen.kt index de549994..1271e512 100644 --- a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/presentation/ValidationScreen.kt +++ b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/presentation/ValidationScreen.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.auth.validation.presentation +package dev.meloda.fast.auth.validation.presentation import androidx.activity.compose.BackHandler import androidx.compose.animation.AnimatedVisibility @@ -45,15 +45,15 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.meloda.app.fast.auth.validation.ValidationViewModel -import com.meloda.app.fast.auth.validation.ValidationViewModelImpl -import com.meloda.app.fast.auth.validation.model.ValidationScreenState -import com.meloda.app.fast.auth.validation.model.ValidationType -import com.meloda.app.fast.ui.components.ActionInvokeDismiss -import com.meloda.app.fast.ui.components.MaterialDialog -import com.meloda.app.fast.ui.components.TextFieldErrorText +import dev.meloda.fast.auth.validation.ValidationViewModel +import dev.meloda.fast.auth.validation.ValidationViewModelImpl +import dev.meloda.fast.auth.validation.model.ValidationScreenState +import dev.meloda.fast.auth.validation.model.ValidationType +import dev.meloda.fast.ui.components.ActionInvokeDismiss +import dev.meloda.fast.ui.components.MaterialDialog +import dev.meloda.fast.ui.components.TextFieldErrorText import org.koin.androidx.compose.koinViewModel -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR @Composable fun ValidationRoute( diff --git a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/validation/ValidationValidator.kt b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/validation/ValidationValidator.kt index ea9af800..e4451d9d 100644 --- a/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/validation/ValidationValidator.kt +++ b/feature/auth/validation/src/main/kotlin/com/meloda/app/fast/auth/validation/validation/ValidationValidator.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.auth.validation.validation +package dev.meloda.fast.auth.validation.validation -import com.meloda.app.fast.auth.validation.model.ValidationScreenState -import com.meloda.app.fast.auth.validation.model.ValidationValidationResult +import dev.meloda.fast.auth.validation.model.ValidationScreenState +import dev.meloda.fast.auth.validation.model.ValidationValidationResult class ValidationValidator { diff --git a/feature/chatmaterials/build.gradle.kts b/feature/chatmaterials/build.gradle.kts index 1ede0187..373ece5e 100644 --- a/feature/chatmaterials/build.gradle.kts +++ b/feature/chatmaterials/build.gradle.kts @@ -6,10 +6,10 @@ plugins { alias(libs.plugins.org.jetbrains.kotlin.plugin.parcelize) } -group = "com.meloda.app.fast.chatmaterials" +group = "dev.meloda.fast.chatmaterials" android { - namespace = "com.meloda.app.fast.chatmaterials" + namespace = "dev.meloda.fast.chatmaterials" compileSdk = Configs.compileSdk defaultConfig { diff --git a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/ChatMaterialsViewModel.kt b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/ChatMaterialsViewModel.kt index 9d0d02ce..89645518 100644 --- a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/ChatMaterialsViewModel.kt +++ b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/ChatMaterialsViewModel.kt @@ -1,16 +1,16 @@ -package com.meloda.app.fast.chatmaterials +package dev.meloda.fast.chatmaterials import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel -import com.meloda.app.fast.chatmaterials.model.ChatMaterialsScreenState -import com.meloda.app.fast.chatmaterials.navigation.ChatMaterials -import com.meloda.app.fast.chatmaterials.util.asPresentation -import com.meloda.app.fast.common.extensions.listenValue -import com.meloda.app.fast.common.extensions.setValue -import com.meloda.app.fast.data.api.messages.MessagesUseCase -import com.meloda.app.fast.data.processState -import com.meloda.app.fast.model.BaseError -import com.meloda.app.fast.model.api.domain.VkAttachmentHistoryMessage +import dev.meloda.fast.chatmaterials.model.ChatMaterialsScreenState +import dev.meloda.fast.chatmaterials.navigation.ChatMaterials +import dev.meloda.fast.chatmaterials.util.asPresentation +import dev.meloda.fast.common.extensions.listenValue +import dev.meloda.fast.common.extensions.setValue +import dev.meloda.fast.data.api.messages.MessagesUseCase +import dev.meloda.fast.data.processState +import dev.meloda.fast.model.BaseError +import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update diff --git a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/di/ChatMaterialsModule.kt b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/di/ChatMaterialsModule.kt index 9179ed12..95f2222b 100644 --- a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/di/ChatMaterialsModule.kt +++ b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/di/ChatMaterialsModule.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.chatmaterials.di +package dev.meloda.fast.chatmaterials.di -import com.meloda.app.fast.chatmaterials.ChatMaterialsViewModelImpl +import dev.meloda.fast.chatmaterials.ChatMaterialsViewModelImpl import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.dsl.module diff --git a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/model/ChatMaterialsScreenState.kt b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/model/ChatMaterialsScreenState.kt index 6ca03509..3d8ee96d 100644 --- a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/model/ChatMaterialsScreenState.kt +++ b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/model/ChatMaterialsScreenState.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.chatmaterials.model +package dev.meloda.fast.chatmaterials.model import androidx.compose.runtime.Immutable diff --git a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/model/UiChatMaterial.kt b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/model/UiChatMaterial.kt index 1084b29f..788d900d 100644 --- a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/model/UiChatMaterial.kt +++ b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/model/UiChatMaterial.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.chatmaterials.model +package dev.meloda.fast.chatmaterials.model sealed class UiChatMaterial { diff --git a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/navigation/ChatMaterialsNavigation.kt b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/navigation/ChatMaterialsNavigation.kt index a92ba5d2..b169b702 100644 --- a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/navigation/ChatMaterialsNavigation.kt +++ b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/navigation/ChatMaterialsNavigation.kt @@ -1,11 +1,11 @@ -package com.meloda.app.fast.chatmaterials.navigation +package dev.meloda.fast.chatmaterials.navigation import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable import androidx.navigation.toRoute -import com.meloda.app.fast.chatmaterials.presentation.ChatMaterialsRoute +import dev.meloda.fast.chatmaterials.presentation.ChatMaterialsRoute import kotlinx.serialization.Serializable @Serializable diff --git a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/presentation/ChatMaterialItem.kt b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/presentation/ChatMaterialItem.kt index 6ee6ee96..a279578e 100644 --- a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/presentation/ChatMaterialItem.kt +++ b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/presentation/ChatMaterialItem.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.chatmaterials.presentation +package dev.meloda.fast.chatmaterials.presentation import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -11,7 +11,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.layout.ContentScale import coil.compose.AsyncImage -import com.meloda.app.fast.chatmaterials.model.UiChatMaterial +import dev.meloda.fast.chatmaterials.model.UiChatMaterial @Composable fun ChatMaterialItem(item: UiChatMaterial) { diff --git a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/presentation/ChatMaterialsScreen.kt b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/presentation/ChatMaterialsScreen.kt index 29c80c6f..363d4063 100644 --- a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/presentation/ChatMaterialsScreen.kt +++ b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/presentation/ChatMaterialsScreen.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.chatmaterials.presentation +package dev.meloda.fast.chatmaterials.presentation import android.annotation.SuppressLint import android.util.Log @@ -61,12 +61,12 @@ import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.meloda.app.fast.chatmaterials.ChatMaterialsViewModel -import com.meloda.app.fast.chatmaterials.ChatMaterialsViewModelImpl -import com.meloda.app.fast.chatmaterials.model.ChatMaterialsScreenState -import com.meloda.app.fast.datastore.UserSettings -import com.meloda.app.fast.ui.R -import com.meloda.app.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.chatmaterials.ChatMaterialsViewModel +import dev.meloda.fast.chatmaterials.ChatMaterialsViewModelImpl +import dev.meloda.fast.chatmaterials.model.ChatMaterialsScreenState +import dev.meloda.fast.datastore.UserSettings +import dev.meloda.fast.ui.R +import dev.meloda.fast.ui.theme.LocalThemeConfig import dev.chrisbanes.haze.HazeState import dev.chrisbanes.haze.haze import dev.chrisbanes.haze.hazeChild diff --git a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/util/ChatMaterialMapper.kt b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/util/ChatMaterialMapper.kt index 6c1d99a7..484e6a6d 100644 --- a/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/util/ChatMaterialMapper.kt +++ b/feature/chatmaterials/src/main/kotlin/com/meloda/app/fast/chatmaterials/util/ChatMaterialMapper.kt @@ -1,13 +1,13 @@ -package com.meloda.app.fast.chatmaterials.util +package dev.meloda.fast.chatmaterials.util -import com.meloda.app.fast.chatmaterials.model.UiChatMaterial -import com.meloda.app.fast.model.api.data.AttachmentType -import com.meloda.app.fast.model.api.domain.VkAttachmentHistoryMessage -import com.meloda.app.fast.model.api.domain.VkAudioDomain -import com.meloda.app.fast.model.api.domain.VkFileDomain -import com.meloda.app.fast.model.api.domain.VkLinkDomain -import com.meloda.app.fast.model.api.domain.VkPhotoDomain -import com.meloda.app.fast.model.api.domain.VkVideoDomain +import dev.meloda.fast.chatmaterials.model.UiChatMaterial +import dev.meloda.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage +import dev.meloda.fast.model.api.domain.VkAudioDomain +import dev.meloda.fast.model.api.domain.VkFileDomain +import dev.meloda.fast.model.api.domain.VkLinkDomain +import dev.meloda.fast.model.api.domain.VkPhotoDomain +import dev.meloda.fast.model.api.domain.VkVideoDomain import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/conversations/build.gradle.kts b/feature/conversations/build.gradle.kts index 2c4c5f0e..94d4eb04 100644 --- a/feature/conversations/build.gradle.kts +++ b/feature/conversations/build.gradle.kts @@ -6,10 +6,10 @@ plugins { alias(libs.plugins.kotlin.serialization) } -group = "com.meloda.app.fast.conversations" +group = "dev.meloda.fast.conversations" android { - namespace = "com.meloda.app.fast.conversations" + namespace = "dev.meloda.fast.conversations" compileSdk = Configs.compileSdk defaultConfig { diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/ConversationsViewModel.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/ConversationsViewModel.kt index 9532f2ac..26d6db21 100644 --- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/ConversationsViewModel.kt +++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/ConversationsViewModel.kt @@ -1,31 +1,31 @@ -package com.meloda.app.fast.conversations +package dev.meloda.fast.conversations import android.content.res.Resources import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.conena.nanokt.collections.indexOfFirstOrNull -import com.meloda.app.fast.common.extensions.createTimerFlow -import com.meloda.app.fast.common.extensions.findWithIndex -import com.meloda.app.fast.common.extensions.listenValue -import com.meloda.app.fast.common.extensions.setValue -import com.meloda.app.fast.conversations.model.ConversationOption -import com.meloda.app.fast.conversations.model.ConversationsScreenState -import com.meloda.app.fast.conversations.model.ConversationsShowOptions -import com.meloda.app.fast.conversations.model.UiConversation -import com.meloda.app.fast.conversations.util.asPresentation -import com.meloda.app.fast.conversations.util.extractAvatar -import com.meloda.app.fast.data.LongPollUpdatesParser -import com.meloda.app.fast.data.State -import com.meloda.app.fast.data.api.conversations.ConversationsUseCase -import com.meloda.app.fast.data.api.messages.MessagesUseCase -import com.meloda.app.fast.data.processState -import com.meloda.app.fast.datastore.UserSettings -import com.meloda.app.fast.model.BaseError -import com.meloda.app.fast.model.InteractionType -import com.meloda.app.fast.model.LongPollEvent -import com.meloda.app.fast.model.api.domain.VkConversation -import com.meloda.app.fast.network.VkErrorCode -import com.meloda.app.fast.ui.util.ImmutableList +import dev.meloda.fast.common.extensions.createTimerFlow +import dev.meloda.fast.common.extensions.findWithIndex +import dev.meloda.fast.common.extensions.listenValue +import dev.meloda.fast.common.extensions.setValue +import dev.meloda.fast.conversations.model.ConversationOption +import dev.meloda.fast.conversations.model.ConversationsScreenState +import dev.meloda.fast.conversations.model.ConversationsShowOptions +import dev.meloda.fast.conversations.model.UiConversation +import dev.meloda.fast.conversations.util.asPresentation +import dev.meloda.fast.conversations.util.extractAvatar +import dev.meloda.fast.data.LongPollUpdatesParser +import dev.meloda.fast.data.State +import dev.meloda.fast.data.api.conversations.ConversationsUseCase +import dev.meloda.fast.data.api.messages.MessagesUseCase +import dev.meloda.fast.data.processState +import dev.meloda.fast.datastore.UserSettings +import dev.meloda.fast.model.BaseError +import dev.meloda.fast.model.InteractionType +import dev.meloda.fast.model.LongPollEvent +import dev.meloda.fast.model.api.domain.VkConversation +import dev.meloda.fast.network.VkErrorCode +import dev.meloda.fast.ui.util.ImmutableList import kotlinx.coroutines.Job import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/data/ConversationsUseCaseImpl.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/data/ConversationsUseCaseImpl.kt index 28ec4fd8..fed98919 100644 --- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/data/ConversationsUseCaseImpl.kt +++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/data/ConversationsUseCaseImpl.kt @@ -1,10 +1,10 @@ -package com.meloda.app.fast.conversations.data +package dev.meloda.fast.conversations.data -import com.meloda.app.fast.data.State -import com.meloda.app.fast.data.api.conversations.ConversationsRepository -import com.meloda.app.fast.data.api.conversations.ConversationsUseCase -import com.meloda.app.fast.data.mapToState -import com.meloda.app.fast.model.api.domain.VkConversation +import dev.meloda.fast.data.State +import dev.meloda.fast.data.api.conversations.ConversationsRepository +import dev.meloda.fast.data.api.conversations.ConversationsUseCase +import dev.meloda.fast.data.mapToState +import dev.meloda.fast.model.api.domain.VkConversation import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow @@ -21,8 +21,8 @@ class ConversationsUseCaseImpl( // filter: String, // extended: Boolean?, // startMessageId: Int? -// ): Flow> = flow { -// emit(com.meloda.app.fast.network.State.Loading) +// ): Flow> = flow { +// emit(dev.meloda.fast.network.State.Loading) // // val newState = conversationsRepository.getConversations( // params = ConversationsGetRequest( @@ -34,9 +34,9 @@ class ConversationsUseCaseImpl( // startMessageId = startMessageId // ) // ).fold( -// onSuccess = { response -> com.meloda.app.fast.network.State.Success(response.toDomain()) }, -// onNetworkFailure = { com.meloda.app.fast.network.State.Error.ConnectionError }, -// onUnknownFailure = { com.meloda.app.fast.network.State.UNKNOWN_ERROR }, +// onSuccess = { response -> dev.meloda.fast.network.State.Success(response.toDomain()) }, +// onNetworkFailure = { dev.meloda.fast.network.State.Error.ConnectionError }, +// onUnknownFailure = { dev.meloda.fast.network.State.UNKNOWN_ERROR }, // onHttpFailure = { result -> result.error.toStateApiError() }, // onApiFailure = { result -> result.error.toStateApiError() } // ) @@ -45,30 +45,30 @@ class ConversationsUseCaseImpl( // // -// override fun pin(peerId: Int): Flow> = flow { -// emit(com.meloda.app.fast.network.State.Loading) +// override fun pin(peerId: Int): Flow> = flow { +// emit(dev.meloda.fast.network.State.Loading) // // val newState = conversationsRepository.pin( // ConversationsPinRequest(peerId = peerId) // ).fold( -// onSuccess = { com.meloda.app.fast.network.State.Success(Unit) }, -// onNetworkFailure = { com.meloda.app.fast.network.State.Error.ConnectionError }, -// onUnknownFailure = { com.meloda.app.fast.network.State.UNKNOWN_ERROR }, +// onSuccess = { dev.meloda.fast.network.State.Success(Unit) }, +// onNetworkFailure = { dev.meloda.fast.network.State.Error.ConnectionError }, +// onUnknownFailure = { dev.meloda.fast.network.State.UNKNOWN_ERROR }, // onHttpFailure = { result -> result.error.toStateApiError() }, // onApiFailure = { result -> result.error.toStateApiError() } // ) // emit(newState) // } // -// override fun unpin(peerId: Int): Flow> = flow { -// emit(com.meloda.app.fast.network.State.Loading) +// override fun unpin(peerId: Int): Flow> = flow { +// emit(dev.meloda.fast.network.State.Loading) // // val newState = conversationsRepository.unpin( // ConversationsUnpinRequest(peerId = peerId) // ).fold( -// onSuccess = { com.meloda.app.fast.network.State.Success(Unit) }, -// onNetworkFailure = { com.meloda.app.fast.network.State.Error.ConnectionError }, -// onUnknownFailure = { com.meloda.app.fast.network.State.UNKNOWN_ERROR }, +// onSuccess = { dev.meloda.fast.network.State.Success(Unit) }, +// onNetworkFailure = { dev.meloda.fast.network.State.Error.ConnectionError }, +// onUnknownFailure = { dev.meloda.fast.network.State.UNKNOWN_ERROR }, // onHttpFailure = { result -> result.error.toStateApiError() }, // onApiFailure = { result -> result.error.toStateApiError() } // ) diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/di/ConversationsModule.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/di/ConversationsModule.kt index c92b12ec..9110c57f 100644 --- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/di/ConversationsModule.kt +++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/di/ConversationsModule.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.conversations.di +package dev.meloda.fast.conversations.di -import com.meloda.app.fast.conversations.ConversationsViewModelImpl -import com.meloda.app.fast.conversations.data.ConversationsUseCaseImpl -import com.meloda.app.fast.data.api.conversations.ConversationsUseCase +import dev.meloda.fast.conversations.ConversationsViewModelImpl +import dev.meloda.fast.conversations.data.ConversationsUseCaseImpl +import dev.meloda.fast.data.api.conversations.ConversationsUseCase import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.core.module.dsl.singleOf import org.koin.dsl.bind diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ActionState.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ActionState.kt index 853b9cd5..cd947872 100644 --- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ActionState.kt +++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ActionState.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.conversations.model +package dev.meloda.fast.conversations.model enum class ActionState { PHANTOM, CALL_IN_PROGRESS, NONE; diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ConversationOption.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ConversationOption.kt index f35ebc78..451ffa1a 100644 --- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ConversationOption.kt +++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ConversationOption.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.conversations.model +package dev.meloda.fast.conversations.model -import com.meloda.app.fast.common.model.UiImage -import com.meloda.app.fast.common.model.UiText -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.common.model.UiImage +import dev.meloda.fast.common.model.UiText +import dev.meloda.fast.ui.R as UiR sealed class ConversationOption( val title: UiText, diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ConversationsScreenState.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ConversationsScreenState.kt index 1daa0f79..1af63362 100644 --- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ConversationsScreenState.kt +++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ConversationsScreenState.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.conversations.model +package dev.meloda.fast.conversations.model import androidx.compose.runtime.Immutable diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ConversationsShowOptions.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ConversationsShowOptions.kt index 0aae0e4f..df0700ec 100644 --- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ConversationsShowOptions.kt +++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/ConversationsShowOptions.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.conversations.model +package dev.meloda.fast.conversations.model data class ConversationsShowOptions( val showDeleteDialog: Int?, diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/UiConversation.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/UiConversation.kt index ded71320..172df568 100644 --- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/UiConversation.kt +++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/model/UiConversation.kt @@ -1,11 +1,11 @@ -package com.meloda.app.fast.conversations.model +package dev.meloda.fast.conversations.model import androidx.compose.runtime.Immutable import androidx.compose.ui.text.AnnotatedString -import com.meloda.app.fast.common.model.UiImage -import com.meloda.app.fast.model.api.PeerType -import com.meloda.app.fast.model.api.domain.VkMessage -import com.meloda.app.fast.ui.util.ImmutableList +import dev.meloda.fast.common.model.UiImage +import dev.meloda.fast.model.api.PeerType +import dev.meloda.fast.model.api.domain.VkMessage +import dev.meloda.fast.ui.util.ImmutableList @Immutable data class UiConversation( diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/navigation/ConversationsNavigation.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/navigation/ConversationsNavigation.kt index 1866249b..20cb4e90 100644 --- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/navigation/ConversationsNavigation.kt +++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/navigation/ConversationsNavigation.kt @@ -1,13 +1,13 @@ -package com.meloda.app.fast.conversations.navigation +package dev.meloda.fast.conversations.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable -import com.meloda.app.fast.common.extensions.navigation.sharedViewModel -import com.meloda.app.fast.conversations.ConversationsViewModel -import com.meloda.app.fast.conversations.ConversationsViewModelImpl -import com.meloda.app.fast.conversations.presentation.ConversationsRoute -import com.meloda.app.fast.model.BaseError +import dev.meloda.fast.common.extensions.navigation.sharedViewModel +import dev.meloda.fast.conversations.ConversationsViewModel +import dev.meloda.fast.conversations.ConversationsViewModelImpl +import dev.meloda.fast.conversations.presentation.ConversationsRoute +import dev.meloda.fast.model.BaseError import kotlinx.serialization.Serializable @Serializable diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationItem.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationItem.kt index 1bf96c15..0bcc9dba 100644 --- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationItem.kt +++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationItem.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.conversations.presentation +package dev.meloda.fast.conversations.presentation import android.graphics.drawable.ColorDrawable import androidx.compose.animation.AnimatedVisibility @@ -52,14 +52,14 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage -import com.meloda.app.fast.common.model.UiImage -import com.meloda.app.fast.conversations.model.ConversationOption -import com.meloda.app.fast.conversations.model.UiConversation -import com.meloda.app.fast.ui.basic.ContentAlpha -import com.meloda.app.fast.ui.basic.LocalContentAlpha -import com.meloda.app.fast.ui.components.DotsFlashing -import com.meloda.app.fast.ui.util.getString -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.common.model.UiImage +import dev.meloda.fast.conversations.model.ConversationOption +import dev.meloda.fast.conversations.model.UiConversation +import dev.meloda.fast.ui.basic.ContentAlpha +import dev.meloda.fast.ui.basic.LocalContentAlpha +import dev.meloda.fast.ui.components.DotsFlashing +import dev.meloda.fast.ui.util.getString +import dev.meloda.fast.ui.R as UiR val BirthdayColor = Color(0xffb00b69) diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationsList.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationsList.kt index 31b7afb9..e8ff7f0b 100644 --- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationsList.kt +++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationsList.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.conversations.presentation +package dev.meloda.fast.conversations.presentation import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -23,11 +23,11 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.meloda.app.fast.common.UserConfig -import com.meloda.app.fast.conversations.model.ConversationOption -import com.meloda.app.fast.conversations.model.ConversationsScreenState -import com.meloda.app.fast.conversations.model.UiConversation -import com.meloda.app.fast.ui.theme.LocalBottomPadding +import dev.meloda.fast.common.UserConfig +import dev.meloda.fast.conversations.model.ConversationOption +import dev.meloda.fast.conversations.model.ConversationsScreenState +import dev.meloda.fast.conversations.model.UiConversation +import dev.meloda.fast.ui.theme.LocalBottomPadding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationsScreen.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationsScreen.kt index 7f5610a5..bbd37b1c 100644 --- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationsScreen.kt +++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationsScreen.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.conversations.presentation +package dev.meloda.fast.conversations.presentation import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateColorAsState @@ -66,20 +66,20 @@ import androidx.core.view.HapticFeedbackConstantsCompat import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.imageLoader import coil.request.ImageRequest -import com.meloda.app.fast.conversations.ConversationsViewModel -import com.meloda.app.fast.conversations.ConversationsViewModelImpl -import com.meloda.app.fast.conversations.model.ConversationOption -import com.meloda.app.fast.conversations.model.ConversationsScreenState -import com.meloda.app.fast.conversations.model.UiConversation -import com.meloda.app.fast.datastore.UserSettings -import com.meloda.app.fast.model.BaseError -import com.meloda.app.fast.ui.components.ErrorView -import com.meloda.app.fast.ui.components.FullScreenLoader -import com.meloda.app.fast.ui.components.MaterialDialog -import com.meloda.app.fast.ui.theme.LocalBottomPadding -import com.meloda.app.fast.ui.theme.LocalHazeState -import com.meloda.app.fast.ui.theme.LocalThemeConfig -import com.meloda.app.fast.ui.util.isScrollingUp +import dev.meloda.fast.conversations.ConversationsViewModel +import dev.meloda.fast.conversations.ConversationsViewModelImpl +import dev.meloda.fast.conversations.model.ConversationOption +import dev.meloda.fast.conversations.model.ConversationsScreenState +import dev.meloda.fast.conversations.model.UiConversation +import dev.meloda.fast.datastore.UserSettings +import dev.meloda.fast.model.BaseError +import dev.meloda.fast.ui.components.ErrorView +import dev.meloda.fast.ui.components.FullScreenLoader +import dev.meloda.fast.ui.components.MaterialDialog +import dev.meloda.fast.ui.theme.LocalBottomPadding +import dev.meloda.fast.ui.theme.LocalHazeState +import dev.meloda.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.ui.util.isScrollingUp import dev.chrisbanes.haze.haze import dev.chrisbanes.haze.hazeChild import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi @@ -87,7 +87,7 @@ import dev.chrisbanes.haze.materials.HazeMaterials import kotlinx.coroutines.launch import org.koin.androidx.compose.koinViewModel import org.koin.compose.koinInject -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR @Composable fun ConversationsRoute( diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/util/ConversationDomainMapper.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/util/ConversationDomainMapper.kt index 079ba7fa..f408fb57 100644 --- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/util/ConversationDomainMapper.kt +++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/util/ConversationDomainMapper.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.conversations.util +package dev.meloda.fast.conversations.util import android.content.res.Resources import androidx.compose.ui.graphics.Color @@ -9,27 +9,27 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.withStyle import com.conena.nanokt.jvm.util.dayOfMonth import com.conena.nanokt.jvm.util.month -import com.meloda.app.fast.common.model.UiImage -import com.meloda.app.fast.common.model.UiText -import com.meloda.app.fast.common.UserConfig -import com.meloda.app.fast.common.extensions.orDots -import com.meloda.app.fast.common.model.parseString -import com.meloda.app.fast.common.util.TimeUtils -import com.meloda.app.fast.conversations.model.ActionState -import com.meloda.app.fast.conversations.model.UiConversation -import com.meloda.app.fast.data.VkMemoryCache -import com.meloda.app.fast.model.InteractionType -import com.meloda.app.fast.model.api.PeerType -import com.meloda.app.fast.model.api.data.AttachmentType -import com.meloda.app.fast.model.api.domain.VkAttachment -import com.meloda.app.fast.model.api.domain.VkConversation -import com.meloda.app.fast.model.api.domain.VkMessage -import com.meloda.app.fast.ui.util.ImmutableList +import dev.meloda.fast.common.model.UiImage +import dev.meloda.fast.common.model.UiText +import dev.meloda.fast.common.UserConfig +import dev.meloda.fast.common.extensions.orDots +import dev.meloda.fast.common.model.parseString +import dev.meloda.fast.common.util.TimeUtils +import dev.meloda.fast.conversations.model.ActionState +import dev.meloda.fast.conversations.model.UiConversation +import dev.meloda.fast.data.VkMemoryCache +import dev.meloda.fast.model.InteractionType +import dev.meloda.fast.model.api.PeerType +import dev.meloda.fast.model.api.data.AttachmentType +import dev.meloda.fast.model.api.domain.VkAttachment +import dev.meloda.fast.model.api.domain.VkConversation +import dev.meloda.fast.model.api.domain.VkMessage +import dev.meloda.fast.ui.util.ImmutableList import java.util.Calendar import java.util.Locale import kotlin.math.ln import kotlin.math.pow -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR fun VkConversation.asPresentation( resources: Resources, diff --git a/feature/friends/build.gradle.kts b/feature/friends/build.gradle.kts index 32bbba21..8fd44baa 100644 --- a/feature/friends/build.gradle.kts +++ b/feature/friends/build.gradle.kts @@ -6,10 +6,10 @@ plugins { alias(libs.plugins.kotlin.serialization) } -group = "com.meloda.app.fast.friends" +group = "dev.meloda.fast.friends" android { - namespace = "com.meloda.app.fast.friends" + namespace = "dev.meloda.fast.friends" compileSdk = Configs.compileSdk defaultConfig { diff --git a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/FriendsViewModel.kt b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/FriendsViewModel.kt index 299f7b90..dbbee942 100644 --- a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/FriendsViewModel.kt +++ b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/FriendsViewModel.kt @@ -1,17 +1,17 @@ -package com.meloda.app.fast.friends +package dev.meloda.fast.friends import androidx.lifecycle.ViewModel -import com.meloda.app.fast.common.extensions.listenValue -import com.meloda.app.fast.common.extensions.setValue -import com.meloda.app.fast.data.State -import com.meloda.app.fast.data.api.friends.FriendsUseCase -import com.meloda.app.fast.data.processState -import com.meloda.app.fast.datastore.UserSettings -import com.meloda.app.fast.friends.model.FriendsScreenState -import com.meloda.app.fast.friends.util.asPresentation -import com.meloda.app.fast.model.BaseError -import com.meloda.app.fast.model.api.domain.VkUser -import com.meloda.app.fast.network.VkErrorCode +import dev.meloda.fast.common.extensions.listenValue +import dev.meloda.fast.common.extensions.setValue +import dev.meloda.fast.data.State +import dev.meloda.fast.data.api.friends.FriendsUseCase +import dev.meloda.fast.data.processState +import dev.meloda.fast.datastore.UserSettings +import dev.meloda.fast.friends.model.FriendsScreenState +import dev.meloda.fast.friends.util.asPresentation +import dev.meloda.fast.model.BaseError +import dev.meloda.fast.model.api.domain.VkUser +import dev.meloda.fast.network.VkErrorCode import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update diff --git a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/di/FriendsModule.kt b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/di/FriendsModule.kt index 79de007b..e7b39df1 100644 --- a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/di/FriendsModule.kt +++ b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/di/FriendsModule.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.friends.di +package dev.meloda.fast.friends.di -import com.meloda.app.fast.data.api.friends.FriendsUseCase -import com.meloda.app.fast.friends.FriendsViewModelImpl -import com.meloda.app.fast.friends.domain.FriendsUseCaseImpl +import dev.meloda.fast.data.api.friends.FriendsUseCase +import dev.meloda.fast.friends.FriendsViewModelImpl +import dev.meloda.fast.friends.domain.FriendsUseCaseImpl import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.core.module.dsl.singleOf import org.koin.dsl.bind diff --git a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/domain/FriendsUseCaseImpl.kt b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/domain/FriendsUseCaseImpl.kt index 72dba287..d2b3b715 100644 --- a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/domain/FriendsUseCaseImpl.kt +++ b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/domain/FriendsUseCaseImpl.kt @@ -1,11 +1,11 @@ -package com.meloda.app.fast.friends.domain +package dev.meloda.fast.friends.domain -import com.meloda.app.fast.data.State -import com.meloda.app.fast.data.api.friends.FriendsRepository -import com.meloda.app.fast.data.api.friends.FriendsUseCase -import com.meloda.app.fast.data.mapToState -import com.meloda.app.fast.model.FriendsInfo -import com.meloda.app.fast.model.api.domain.VkUser +import dev.meloda.fast.data.State +import dev.meloda.fast.data.api.friends.FriendsRepository +import dev.meloda.fast.data.api.friends.FriendsUseCase +import dev.meloda.fast.data.mapToState +import dev.meloda.fast.model.FriendsInfo +import dev.meloda.fast.model.api.domain.VkUser import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/model/FriendsScreenState.kt b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/model/FriendsScreenState.kt index edc8a82e..55e23a84 100644 --- a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/model/FriendsScreenState.kt +++ b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/model/FriendsScreenState.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.friends.model +package dev.meloda.fast.friends.model import androidx.compose.runtime.Immutable diff --git a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/model/OnlineState.kt b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/model/OnlineState.kt index 6cafe35f..99ed01c3 100644 --- a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/model/OnlineState.kt +++ b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/model/OnlineState.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.friends.model +package dev.meloda.fast.friends.model enum class OnlineState { OFFLINE, ONLINE, ONLINE_MOBILE diff --git a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/model/UiFriend.kt b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/model/UiFriend.kt index 68489e70..3c40a83f 100644 --- a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/model/UiFriend.kt +++ b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/model/UiFriend.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.friends.model +package dev.meloda.fast.friends.model -import com.meloda.app.fast.common.model.UiImage -import com.meloda.app.fast.model.api.domain.OnlineStatus +import dev.meloda.fast.common.model.UiImage +import dev.meloda.fast.model.api.domain.OnlineStatus data class UiFriend( val userId: Int, diff --git a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/navigation/FriendsNavigation.kt b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/navigation/FriendsNavigation.kt index 6e240e4d..301398f8 100644 --- a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/navigation/FriendsNavigation.kt +++ b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/navigation/FriendsNavigation.kt @@ -1,13 +1,13 @@ -package com.meloda.app.fast.friends.navigation +package dev.meloda.fast.friends.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable -import com.meloda.app.fast.common.extensions.navigation.sharedViewModel -import com.meloda.app.fast.friends.FriendsViewModel -import com.meloda.app.fast.friends.FriendsViewModelImpl -import com.meloda.app.fast.friends.presentation.FriendsRoute -import com.meloda.app.fast.model.BaseError +import dev.meloda.fast.common.extensions.navigation.sharedViewModel +import dev.meloda.fast.friends.FriendsViewModel +import dev.meloda.fast.friends.FriendsViewModelImpl +import dev.meloda.fast.friends.presentation.FriendsRoute +import dev.meloda.fast.model.BaseError import kotlinx.serialization.Serializable @Serializable diff --git a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendItem.kt b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendItem.kt index c6a1fc93..29e0fc0b 100644 --- a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendItem.kt +++ b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendItem.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.friends.presentation +package dev.meloda.fast.friends.presentation import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -23,8 +23,8 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage -import com.meloda.app.fast.ui.R -import com.meloda.app.fast.friends.model.UiFriend +import dev.meloda.fast.ui.R +import dev.meloda.fast.friends.model.UiFriend @Composable fun FriendItem( diff --git a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsList.kt b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsList.kt index 8a0deadd..6098937c 100644 --- a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsList.kt +++ b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsList.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.friends.presentation +package dev.meloda.fast.friends.presentation import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -20,10 +20,10 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.meloda.app.fast.friends.model.FriendsScreenState -import com.meloda.app.fast.friends.model.UiFriend -import com.meloda.app.fast.ui.theme.LocalBottomPadding -import com.meloda.app.fast.ui.util.ImmutableList +import dev.meloda.fast.friends.model.FriendsScreenState +import dev.meloda.fast.friends.model.UiFriend +import dev.meloda.fast.ui.theme.LocalBottomPadding +import dev.meloda.fast.ui.util.ImmutableList import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsScreen.kt b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsScreen.kt index 15bf126a..1b10b855 100644 --- a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsScreen.kt +++ b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsScreen.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.friends.presentation +package dev.meloda.fast.friends.presentation import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.FastOutLinearInEasing @@ -49,25 +49,25 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.imageLoader import coil.request.ImageRequest -import com.meloda.app.fast.datastore.UserSettings -import com.meloda.app.fast.friends.FriendsViewModel -import com.meloda.app.fast.friends.FriendsViewModelImpl -import com.meloda.app.fast.friends.model.FriendsScreenState -import com.meloda.app.fast.model.BaseError -import com.meloda.app.fast.ui.components.ErrorView -import com.meloda.app.fast.ui.components.FullScreenLoader -import com.meloda.app.fast.ui.components.NoItemsView -import com.meloda.app.fast.ui.model.TabItem -import com.meloda.app.fast.ui.theme.LocalHazeState -import com.meloda.app.fast.ui.theme.LocalThemeConfig -import com.meloda.app.fast.ui.util.ImmutableList +import dev.meloda.fast.datastore.UserSettings +import dev.meloda.fast.friends.FriendsViewModel +import dev.meloda.fast.friends.FriendsViewModelImpl +import dev.meloda.fast.friends.model.FriendsScreenState +import dev.meloda.fast.model.BaseError +import dev.meloda.fast.ui.components.ErrorView +import dev.meloda.fast.ui.components.FullScreenLoader +import dev.meloda.fast.ui.components.NoItemsView +import dev.meloda.fast.ui.model.TabItem +import dev.meloda.fast.ui.theme.LocalHazeState +import dev.meloda.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.ui.util.ImmutableList import dev.chrisbanes.haze.haze import dev.chrisbanes.haze.hazeChild import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi import dev.chrisbanes.haze.materials.HazeMaterials import org.koin.androidx.compose.koinViewModel import org.koin.compose.koinInject -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR @Composable fun FriendsRoute( diff --git a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/util/FriendMapper.kt b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/util/FriendMapper.kt index 55585cbc..61fea395 100644 --- a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/util/FriendMapper.kt +++ b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/util/FriendMapper.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.friends.util +package dev.meloda.fast.friends.util -import com.meloda.app.fast.common.model.UiImage -import com.meloda.app.fast.data.VkMemoryCache -import com.meloda.app.fast.friends.model.UiFriend -import com.meloda.app.fast.model.api.domain.VkUser +import dev.meloda.fast.common.model.UiImage +import dev.meloda.fast.data.VkMemoryCache +import dev.meloda.fast.friends.model.UiFriend +import dev.meloda.fast.model.api.domain.VkUser fun VkUser.asPresentation( useContactNames: Boolean = false diff --git a/feature/languagepicker/build.gradle.kts b/feature/languagepicker/build.gradle.kts index 0e94bf9b..6f093e39 100644 --- a/feature/languagepicker/build.gradle.kts +++ b/feature/languagepicker/build.gradle.kts @@ -6,10 +6,10 @@ plugins { alias(libs.plugins.kotlin.serialization) } -group = "com.meloda.app.fast.languagepicker" +group = "dev.meloda.fast.languagepicker" android { - namespace = "com.meloda.app.fast.languagepicker" + namespace = "dev.meloda.fast.languagepicker" compileSdk = Configs.compileSdk defaultConfig { diff --git a/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/LanguagePickerViewModel.kt b/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/LanguagePickerViewModel.kt index 573bc53b..cc282cc9 100644 --- a/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/LanguagePickerViewModel.kt +++ b/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/LanguagePickerViewModel.kt @@ -1,18 +1,18 @@ -package com.meloda.app.fast.languagepicker +package dev.meloda.fast.languagepicker import android.content.res.Resources import androidx.appcompat.app.AppCompatDelegate import androidx.core.os.LocaleListCompat import androidx.lifecycle.ViewModel -import com.meloda.app.fast.common.model.UiText -import com.meloda.app.fast.common.extensions.setValue -import com.meloda.app.fast.common.model.parseString -import com.meloda.app.fast.languagepicker.model.LanguagePickerScreenState -import com.meloda.app.fast.languagepicker.model.SelectableLanguage +import dev.meloda.fast.common.model.UiText +import dev.meloda.fast.common.extensions.setValue +import dev.meloda.fast.common.model.parseString +import dev.meloda.fast.languagepicker.model.LanguagePickerScreenState +import dev.meloda.fast.languagepicker.model.SelectableLanguage import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR interface LanguagePickerViewModel { val screenState: StateFlow diff --git a/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/di/LanguagePickerModule.kt b/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/di/LanguagePickerModule.kt index 70896fe4..669cf33a 100644 --- a/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/di/LanguagePickerModule.kt +++ b/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/di/LanguagePickerModule.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.languagepicker.di +package dev.meloda.fast.languagepicker.di -import com.meloda.app.fast.languagepicker.LanguagePickerViewModelImpl +import dev.meloda.fast.languagepicker.LanguagePickerViewModelImpl import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.dsl.module diff --git a/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/model/LanguagePickerScreenState.kt b/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/model/LanguagePickerScreenState.kt index f6110221..e3d4f152 100644 --- a/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/model/LanguagePickerScreenState.kt +++ b/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/model/LanguagePickerScreenState.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.languagepicker.model +package dev.meloda.fast.languagepicker.model import androidx.compose.runtime.Immutable diff --git a/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/model/SelectableLanguage.kt b/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/model/SelectableLanguage.kt index 1e8a66c7..505e4c62 100644 --- a/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/model/SelectableLanguage.kt +++ b/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/model/SelectableLanguage.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.languagepicker.model +package dev.meloda.fast.languagepicker.model data class SelectableLanguage( val local: String, diff --git a/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/navigation/LanguagePickerNavigation.kt b/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/navigation/LanguagePickerNavigation.kt index 65260d5b..1881d26b 100644 --- a/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/navigation/LanguagePickerNavigation.kt +++ b/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/navigation/LanguagePickerNavigation.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.languagepicker.navigation +package dev.meloda.fast.languagepicker.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable -import com.meloda.app.fast.languagepicker.presentation.LanguagePickerRoute +import dev.meloda.fast.languagepicker.presentation.LanguagePickerRoute import kotlinx.serialization.Serializable @Serializable diff --git a/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/presentation/LanguagePickerScreen.kt b/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/presentation/LanguagePickerScreen.kt index f85d0956..8a283ff7 100644 --- a/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/presentation/LanguagePickerScreen.kt +++ b/feature/languagepicker/src/main/kotlin/com/meloda/app/fast/languagepicker/presentation/LanguagePickerScreen.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.languagepicker.presentation +package dev.meloda.fast.languagepicker.presentation import android.content.Intent import android.net.Uri @@ -54,12 +54,12 @@ import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.LifecycleResumeEffect import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.meloda.app.fast.languagepicker.LanguagePickerViewModel -import com.meloda.app.fast.languagepicker.LanguagePickerViewModelImpl -import com.meloda.app.fast.languagepicker.model.LanguagePickerScreenState -import com.meloda.app.fast.languagepicker.model.SelectableLanguage +import dev.meloda.fast.languagepicker.LanguagePickerViewModel +import dev.meloda.fast.languagepicker.LanguagePickerViewModelImpl +import dev.meloda.fast.languagepicker.model.LanguagePickerScreenState +import dev.meloda.fast.languagepicker.model.SelectableLanguage import org.koin.androidx.compose.koinViewModel -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR @Composable fun LanguagePickerRoute( diff --git a/feature/messageshistory/build.gradle.kts b/feature/messageshistory/build.gradle.kts index 66e27e9e..45772727 100644 --- a/feature/messageshistory/build.gradle.kts +++ b/feature/messageshistory/build.gradle.kts @@ -6,10 +6,10 @@ plugins { alias(libs.plugins.org.jetbrains.kotlin.plugin.parcelize) } -group = "com.meloda.app.fast.messageshistory" +group = "dev.meloda.fast.messageshistory" android { - namespace = "com.meloda.app.fast.messageshistory" + namespace = "dev.meloda.fast.messageshistory" compileSdk = Configs.compileSdk defaultConfig { diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/MessagesHistoryViewModel.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/MessagesHistoryViewModel.kt index 7efb6cfc..e236366b 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/MessagesHistoryViewModel.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/MessagesHistoryViewModel.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.messageshistory +package dev.meloda.fast.messageshistory import android.content.SharedPreferences import android.util.Log @@ -9,30 +9,30 @@ import androidx.lifecycle.viewModelScope import com.conena.nanokt.collections.indexOfFirstOrNull import com.conena.nanokt.collections.indexOfOrNull import com.conena.nanokt.text.isEmptyOrBlank -import com.meloda.app.fast.common.UserConfig -import com.meloda.app.fast.common.extensions.listenValue -import com.meloda.app.fast.common.extensions.setValue -import com.meloda.app.fast.common.extensions.updateValue -import com.meloda.app.fast.common.provider.ResourceProvider -import com.meloda.app.fast.data.LongPollUpdatesParser -import com.meloda.app.fast.data.VkMemoryCache -import com.meloda.app.fast.data.api.conversations.ConversationsUseCase -import com.meloda.app.fast.data.api.messages.MessagesUseCase -import com.meloda.app.fast.data.processState -import com.meloda.app.fast.datastore.AppSettings -import com.meloda.app.fast.datastore.SettingsKeys -import com.meloda.app.fast.datastore.UserSettings -import com.meloda.app.fast.messageshistory.model.ActionMode -import com.meloda.app.fast.messageshistory.model.MessagesHistoryScreenState -import com.meloda.app.fast.messageshistory.model.UiItem -import com.meloda.app.fast.messageshistory.navigation.MessagesHistory -import com.meloda.app.fast.messageshistory.util.asPresentation -import com.meloda.app.fast.messageshistory.util.extractAvatar -import com.meloda.app.fast.messageshistory.util.extractTitle -import com.meloda.app.fast.model.BaseError -import com.meloda.app.fast.model.LongPollEvent -import com.meloda.app.fast.model.api.domain.VkAttachment -import com.meloda.app.fast.model.api.domain.VkMessage +import dev.meloda.fast.common.UserConfig +import dev.meloda.fast.common.extensions.listenValue +import dev.meloda.fast.common.extensions.setValue +import dev.meloda.fast.common.extensions.updateValue +import dev.meloda.fast.common.provider.ResourceProvider +import dev.meloda.fast.data.LongPollUpdatesParser +import dev.meloda.fast.data.VkMemoryCache +import dev.meloda.fast.data.api.conversations.ConversationsUseCase +import dev.meloda.fast.data.api.messages.MessagesUseCase +import dev.meloda.fast.data.processState +import dev.meloda.fast.datastore.AppSettings +import dev.meloda.fast.datastore.SettingsKeys +import dev.meloda.fast.datastore.UserSettings +import dev.meloda.fast.messageshistory.model.ActionMode +import dev.meloda.fast.messageshistory.model.MessagesHistoryScreenState +import dev.meloda.fast.messageshistory.model.UiItem +import dev.meloda.fast.messageshistory.navigation.MessagesHistory +import dev.meloda.fast.messageshistory.util.asPresentation +import dev.meloda.fast.messageshistory.util.extractAvatar +import dev.meloda.fast.messageshistory.util.extractTitle +import dev.meloda.fast.model.BaseError +import dev.meloda.fast.model.LongPollEvent +import dev.meloda.fast.model.api.domain.VkAttachment +import dev.meloda.fast.model.api.domain.VkMessage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/di/MessagesHistoryModule.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/di/MessagesHistoryModule.kt index a8bd7860..91f6acf6 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/di/MessagesHistoryModule.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/di/MessagesHistoryModule.kt @@ -1,10 +1,10 @@ -package com.meloda.app.fast.messageshistory.di +package dev.meloda.fast.messageshistory.di -import com.meloda.app.fast.data.api.messages.MessagesUseCase -import com.meloda.app.fast.messageshistory.MessagesHistoryViewModel -import com.meloda.app.fast.messageshistory.MessagesHistoryViewModelImpl -import com.meloda.app.fast.messageshistory.domain.MessagesUseCaseImpl -import com.meloda.app.fast.messageshistory.validation.MessagesHistoryValidator +import dev.meloda.fast.data.api.messages.MessagesUseCase +import dev.meloda.fast.messageshistory.MessagesHistoryViewModel +import dev.meloda.fast.messageshistory.MessagesHistoryViewModelImpl +import dev.meloda.fast.messageshistory.domain.MessagesUseCaseImpl +import dev.meloda.fast.messageshistory.validation.MessagesHistoryValidator import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.core.module.dsl.singleOf import org.koin.dsl.bind diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/domain/MessagesUseCaseImpl.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/domain/MessagesUseCaseImpl.kt index 18e6ac68..71d649db 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/domain/MessagesUseCaseImpl.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/domain/MessagesUseCaseImpl.kt @@ -1,13 +1,13 @@ -package com.meloda.app.fast.messageshistory.domain +package dev.meloda.fast.messageshistory.domain -import com.meloda.app.fast.data.State -import com.meloda.app.fast.data.api.messages.MessagesHistoryInfo -import com.meloda.app.fast.data.api.messages.MessagesRepository -import com.meloda.app.fast.data.api.messages.MessagesUseCase -import com.meloda.app.fast.data.mapToState -import com.meloda.app.fast.model.api.domain.VkAttachment -import com.meloda.app.fast.model.api.domain.VkAttachmentHistoryMessage -import com.meloda.app.fast.model.api.domain.VkMessage +import dev.meloda.fast.data.State +import dev.meloda.fast.data.api.messages.MessagesHistoryInfo +import dev.meloda.fast.data.api.messages.MessagesRepository +import dev.meloda.fast.data.api.messages.MessagesUseCase +import dev.meloda.fast.data.mapToState +import dev.meloda.fast.model.api.domain.VkAttachment +import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage +import dev.meloda.fast.model.api.domain.VkMessage import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/ActionMode.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/ActionMode.kt index a7bd55ae..ed9b52fa 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/ActionMode.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/ActionMode.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.messageshistory.model +package dev.meloda.fast.messageshistory.model sealed class ActionMode { diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/MessagesHistoryArguments.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/MessagesHistoryArguments.kt index c773fbe9..2ecd656d 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/MessagesHistoryArguments.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/MessagesHistoryArguments.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.messageshistory.model +package dev.meloda.fast.messageshistory.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/MessagesHistoryScreenState.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/MessagesHistoryScreenState.kt index 630bdce4..7264fcd6 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/MessagesHistoryScreenState.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/MessagesHistoryScreenState.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.messageshistory.model +package dev.meloda.fast.messageshistory.model import androidx.compose.runtime.Immutable -import com.meloda.app.fast.common.model.UiImage -import com.meloda.app.fast.model.api.domain.VkAttachment +import dev.meloda.fast.common.model.UiImage +import dev.meloda.fast.model.api.domain.VkAttachment @Immutable data class MessagesHistoryScreenState( diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/MessagesHistoryValidationResult.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/MessagesHistoryValidationResult.kt index 9598feb4..84a139e7 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/MessagesHistoryValidationResult.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/MessagesHistoryValidationResult.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.messageshistory.model +package dev.meloda.fast.messageshistory.model sealed interface MessagesHistoryValidationResult { diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/UiItem.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/UiItem.kt index cefdcf74..f2a98738 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/UiItem.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/model/UiItem.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.messageshistory.model +package dev.meloda.fast.messageshistory.model import androidx.compose.ui.text.AnnotatedString -import com.meloda.app.fast.common.model.UiImage +import dev.meloda.fast.common.model.UiImage sealed class UiItem( open val id: Int, diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/navigation/MessagesHistoryNavigation.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/navigation/MessagesHistoryNavigation.kt index 4e735c6e..913e20e9 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/navigation/MessagesHistoryNavigation.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/navigation/MessagesHistoryNavigation.kt @@ -1,14 +1,14 @@ -package com.meloda.app.fast.messageshistory.navigation +package dev.meloda.fast.messageshistory.navigation import androidx.lifecycle.SavedStateHandle import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable import androidx.navigation.toRoute -import com.meloda.app.fast.common.extensions.customNavType -import com.meloda.app.fast.messageshistory.model.MessagesHistoryArguments -import com.meloda.app.fast.messageshistory.presentation.MessagesHistoryRoute -import com.meloda.app.fast.model.BaseError +import dev.meloda.fast.common.extensions.customNavType +import dev.meloda.fast.messageshistory.model.MessagesHistoryArguments +import dev.meloda.fast.messageshistory.presentation.MessagesHistoryRoute +import dev.meloda.fast.model.BaseError import kotlinx.serialization.Serializable import kotlin.reflect.typeOf diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/ActionMessageItem.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/ActionMessageItem.kt index a6d5ee23..faa0608e 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/ActionMessageItem.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/ActionMessageItem.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.messageshistory.presentation +package dev.meloda.fast.messageshistory.presentation import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -16,7 +16,7 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.meloda.app.fast.messageshistory.model.UiItem +import dev.meloda.fast.messageshistory.model.UiItem @Composable fun ActionMessageItem( diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/IncomingMessageBubble.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/IncomingMessageBubble.kt index 5c325fda..a000ae57 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/IncomingMessageBubble.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/IncomingMessageBubble.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.messageshistory.presentation +package dev.meloda.fast.messageshistory.presentation import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.Image @@ -25,7 +25,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import coil.compose.rememberAsyncImagePainter import coil.imageLoader -import com.meloda.app.fast.messageshistory.model.UiItem +import dev.meloda.fast.messageshistory.model.UiItem @Composable fun IncomingMessageBubble( diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/MessageBubble.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/MessageBubble.kt index b4fb2670..c61d3503 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/MessageBubble.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/MessageBubble.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.messageshistory.presentation +package dev.meloda.fast.messageshistory.presentation import androidx.compose.animation.animateContentSize import androidx.compose.foundation.background diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/MessagesHistoryScreen.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/MessagesHistoryScreen.kt index f6090fda..dee4ce74 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/MessagesHistoryScreen.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/MessagesHistoryScreen.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.messageshistory.presentation +package dev.meloda.fast.messageshistory.presentation import android.content.SharedPreferences import androidx.compose.animation.animateContentSize @@ -72,17 +72,17 @@ import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import androidx.core.view.HapticFeedbackConstantsCompat import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.meloda.app.fast.datastore.SettingsKeys -import com.meloda.app.fast.datastore.UserSettings -import com.meloda.app.fast.messageshistory.MessagesHistoryViewModel -import com.meloda.app.fast.messageshistory.MessagesHistoryViewModelImpl -import com.meloda.app.fast.messageshistory.model.ActionMode -import com.meloda.app.fast.messageshistory.model.MessagesHistoryScreenState -import com.meloda.app.fast.messageshistory.util.firstMessage -import com.meloda.app.fast.messageshistory.util.indexOfMessageByCmId -import com.meloda.app.fast.model.BaseError -import com.meloda.app.fast.ui.theme.LocalThemeConfig -import com.meloda.app.fast.ui.util.ImmutableList +import dev.meloda.fast.datastore.SettingsKeys +import dev.meloda.fast.datastore.UserSettings +import dev.meloda.fast.messageshistory.MessagesHistoryViewModel +import dev.meloda.fast.messageshistory.MessagesHistoryViewModelImpl +import dev.meloda.fast.messageshistory.model.ActionMode +import dev.meloda.fast.messageshistory.model.MessagesHistoryScreenState +import dev.meloda.fast.messageshistory.util.firstMessage +import dev.meloda.fast.messageshistory.util.indexOfMessageByCmId +import dev.meloda.fast.model.BaseError +import dev.meloda.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.ui.util.ImmutableList import dev.chrisbanes.haze.HazeState import dev.chrisbanes.haze.hazeChild import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi @@ -90,7 +90,7 @@ import dev.chrisbanes.haze.materials.HazeMaterials import kotlinx.coroutines.launch import org.koin.androidx.compose.koinViewModel import org.koin.compose.koinInject -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR @Composable fun MessagesHistoryRoute( diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/MessagesList.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/MessagesList.kt index 85ba2a44..d7f7c2d0 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/MessagesList.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/MessagesList.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.messageshistory.presentation +package dev.meloda.fast.messageshistory.presentation import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.layout.Column @@ -17,9 +17,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.meloda.app.fast.messageshistory.model.UiItem -import com.meloda.app.fast.ui.theme.LocalThemeConfig -import com.meloda.app.fast.ui.util.ImmutableList +import dev.meloda.fast.messageshistory.model.UiItem +import dev.meloda.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.ui.util.ImmutableList import dev.chrisbanes.haze.HazeState import dev.chrisbanes.haze.haze import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/OutgoingMessageBubble.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/OutgoingMessageBubble.kt index 4a703814..dc1ad033 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/OutgoingMessageBubble.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/presentation/OutgoingMessageBubble.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.messageshistory.presentation +package dev.meloda.fast.messageshistory.presentation import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -13,8 +13,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.meloda.app.fast.common.extensions.orDots -import com.meloda.app.fast.messageshistory.model.UiItem +import dev.meloda.fast.common.extensions.orDots +import dev.meloda.fast.messageshistory.model.UiItem @Composable fun OutgoingMessageBubble( diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/util/Ext.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/util/Ext.kt index bf326d38..7cbab6cf 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/util/Ext.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/util/Ext.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.messageshistory.util +package dev.meloda.fast.messageshistory.util -import com.meloda.app.fast.messageshistory.model.UiItem +import dev.meloda.fast.messageshistory.model.UiItem fun List.firstMessage(): UiItem.Message = first() as UiItem.Message diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/util/MessageMapper.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/util/MessageMapper.kt index 2fee8b82..1bb1ebac 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/util/MessageMapper.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/util/MessageMapper.kt @@ -1,25 +1,25 @@ -package com.meloda.app.fast.messageshistory.util +package dev.meloda.fast.messageshistory.util import android.content.res.Resources import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.font.FontWeight -import com.meloda.app.fast.common.UserConfig -import com.meloda.app.fast.common.extensions.orDots -import com.meloda.app.fast.common.model.UiImage -import com.meloda.app.fast.common.model.UiText -import com.meloda.app.fast.common.model.parseString -import com.meloda.app.fast.common.provider.ResourceProvider -import com.meloda.app.fast.data.VkMemoryCache -import com.meloda.app.fast.messageshistory.model.UiItem -import com.meloda.app.fast.model.api.PeerType -import com.meloda.app.fast.model.api.domain.VkConversation -import com.meloda.app.fast.model.api.domain.VkMessage -import com.meloda.app.fast.ui.R +import dev.meloda.fast.common.UserConfig +import dev.meloda.fast.common.extensions.orDots +import dev.meloda.fast.common.model.UiImage +import dev.meloda.fast.common.model.UiText +import dev.meloda.fast.common.model.parseString +import dev.meloda.fast.common.provider.ResourceProvider +import dev.meloda.fast.data.VkMemoryCache +import dev.meloda.fast.messageshistory.model.UiItem +import dev.meloda.fast.model.api.PeerType +import dev.meloda.fast.model.api.domain.VkConversation +import dev.meloda.fast.model.api.domain.VkMessage +import dev.meloda.fast.ui.R import java.text.SimpleDateFormat import java.util.Locale -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR private fun isAccount(fromId: Int) = fromId == UserConfig.userId diff --git a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/validation/MessagesHistoryValidator.kt b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/validation/MessagesHistoryValidator.kt index 3b65aa35..41f2f81d 100644 --- a/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/validation/MessagesHistoryValidator.kt +++ b/feature/messageshistory/src/main/kotlin/com/meloda/app/fast/messageshistory/validation/MessagesHistoryValidator.kt @@ -1,8 +1,8 @@ -package com.meloda.app.fast.messageshistory.validation +package dev.meloda.fast.messageshistory.validation -import com.meloda.app.fast.common.extensions.addIf -import com.meloda.app.fast.messageshistory.model.MessagesHistoryScreenState -import com.meloda.app.fast.messageshistory.model.MessagesHistoryValidationResult +import dev.meloda.fast.common.extensions.addIf +import dev.meloda.fast.messageshistory.model.MessagesHistoryScreenState +import dev.meloda.fast.messageshistory.model.MessagesHistoryValidationResult class MessagesHistoryValidator { diff --git a/feature/photoviewer/build.gradle.kts b/feature/photoviewer/build.gradle.kts index 104beb23..c669bf19 100644 --- a/feature/photoviewer/build.gradle.kts +++ b/feature/photoviewer/build.gradle.kts @@ -4,10 +4,10 @@ plugins { alias(libs.plugins.kotlin.compose.compiler) } -group = "com.meloda.app.fast.photoviewer" +group = "dev.meloda.fast.photoviewer" android { - namespace = "com.meloda.app.fast.photoviewer" + namespace = "dev.meloda.fast.photoviewer" compileSdk = Configs.compileSdk defaultConfig { diff --git a/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/PhotoViewViewModel.kt b/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/PhotoViewViewModel.kt index 6c19ee09..2f54aae5 100644 --- a/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/PhotoViewViewModel.kt +++ b/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/PhotoViewViewModel.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.photoviewer +package dev.meloda.fast.photoviewer import androidx.lifecycle.ViewModel -import com.meloda.app.fast.common.extensions.setValue -import com.meloda.app.fast.photoviewer.model.PhotoViewArguments -import com.meloda.app.fast.photoviewer.model.PhotoViewState +import dev.meloda.fast.common.extensions.setValue +import dev.meloda.fast.photoviewer.model.PhotoViewArguments +import dev.meloda.fast.photoviewer.model.PhotoViewState import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/di/PhotoViewDI.kt b/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/di/PhotoViewDI.kt index e7818e51..9da0cec5 100644 --- a/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/di/PhotoViewDI.kt +++ b/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/di/PhotoViewDI.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.photoviewer.di +package dev.meloda.fast.photoviewer.di -import com.meloda.app.fast.photoviewer.PhotoViewViewModel -import com.meloda.app.fast.photoviewer.PhotoViewViewModelImpl +import dev.meloda.fast.photoviewer.PhotoViewViewModel +import dev.meloda.fast.photoviewer.PhotoViewViewModelImpl import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.dsl.bind import org.koin.dsl.module diff --git a/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/model/PhotoViewArguments.kt b/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/model/PhotoViewArguments.kt index b04a3cfe..30e5963b 100644 --- a/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/model/PhotoViewArguments.kt +++ b/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/model/PhotoViewArguments.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.photoviewer.model +package dev.meloda.fast.photoviewer.model import androidx.compose.runtime.Immutable -import com.meloda.app.fast.common.model.UiImage +import dev.meloda.fast.common.model.UiImage @Immutable data class PhotoViewArguments( diff --git a/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/model/PhotoViewState.kt b/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/model/PhotoViewState.kt index 62570f1c..6ec96ea4 100644 --- a/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/model/PhotoViewState.kt +++ b/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/model/PhotoViewState.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.photoviewer.model +package dev.meloda.fast.photoviewer.model import androidx.compose.runtime.Immutable -import com.meloda.app.fast.common.model.UiImage +import dev.meloda.fast.common.model.UiImage @Immutable data class PhotoViewState( diff --git a/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/presentation/PhotoViewScreenContent.kt b/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/presentation/PhotoViewScreenContent.kt index e4530352..3454fb16 100644 --- a/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/presentation/PhotoViewScreenContent.kt +++ b/feature/photoviewer/src/main/kotlin/com/meloda/app/fast/photoviewer/presentation/PhotoViewScreenContent.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.photoviewer.presentation +package dev.meloda.fast.photoviewer.presentation import android.graphics.drawable.ColorDrawable import android.widget.Toast @@ -44,9 +44,9 @@ import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.compose.AsyncImage -import com.meloda.app.fast.common.model.UiImage -import com.meloda.app.fast.photoviewer.PhotoViewViewModel -import com.meloda.app.fast.photoviewer.model.PhotoViewState +import dev.meloda.fast.common.model.UiImage +import dev.meloda.fast.photoviewer.PhotoViewViewModel +import dev.meloda.fast.photoviewer.model.PhotoViewState @OptIn( ExperimentalFoundationApi::class, diff --git a/feature/profile/build.gradle.kts b/feature/profile/build.gradle.kts index ed3b4f6e..eda651a9 100644 --- a/feature/profile/build.gradle.kts +++ b/feature/profile/build.gradle.kts @@ -6,10 +6,10 @@ plugins { alias(libs.plugins.kotlin.serialization) } -group = "com.meloda.app.fast.profile" +group = "dev.meloda.fast.profile" android { - namespace = "com.meloda.app.fast.profile" + namespace = "dev.meloda.fast.profile" compileSdk = Configs.compileSdk defaultConfig { diff --git a/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/ProfileViewModel.kt b/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/ProfileViewModel.kt index 4140c960..bb372a07 100644 --- a/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/ProfileViewModel.kt +++ b/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/ProfileViewModel.kt @@ -1,16 +1,16 @@ -package com.meloda.app.fast.profile +package dev.meloda.fast.profile import androidx.lifecycle.ViewModel -import com.meloda.app.fast.common.UserConfig -import com.meloda.app.fast.common.VkConstants -import com.meloda.app.fast.common.extensions.listenValue -import com.meloda.app.fast.common.extensions.setValue -import com.meloda.app.fast.data.State -import com.meloda.app.fast.data.api.users.UsersUseCase -import com.meloda.app.fast.data.processState -import com.meloda.app.fast.model.BaseError -import com.meloda.app.fast.network.VkErrorCode -import com.meloda.app.fast.profile.model.ProfileScreenState +import dev.meloda.fast.common.UserConfig +import dev.meloda.fast.common.VkConstants +import dev.meloda.fast.common.extensions.listenValue +import dev.meloda.fast.common.extensions.setValue +import dev.meloda.fast.data.State +import dev.meloda.fast.data.api.users.UsersUseCase +import dev.meloda.fast.data.processState +import dev.meloda.fast.model.BaseError +import dev.meloda.fast.network.VkErrorCode +import dev.meloda.fast.profile.model.ProfileScreenState import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/di/ProfileModule.kt b/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/di/ProfileModule.kt index e8da925b..f4383c12 100644 --- a/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/di/ProfileModule.kt +++ b/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/di/ProfileModule.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.profile.di +package dev.meloda.fast.profile.di -import com.meloda.app.fast.profile.ProfileViewModelImpl +import dev.meloda.fast.profile.ProfileViewModelImpl import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.dsl.module diff --git a/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/model/ProfileScreenState.kt b/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/model/ProfileScreenState.kt index daa6133f..17b338e6 100644 --- a/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/model/ProfileScreenState.kt +++ b/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/model/ProfileScreenState.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.profile.model +package dev.meloda.fast.profile.model data class ProfileScreenState( val isLoading: Boolean, diff --git a/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/navigation/ProfileRoute.kt b/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/navigation/ProfileRoute.kt index 19bc584f..4a2c6c32 100644 --- a/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/navigation/ProfileRoute.kt +++ b/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/navigation/ProfileRoute.kt @@ -1,13 +1,13 @@ -package com.meloda.app.fast.profile.navigation +package dev.meloda.fast.profile.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable -import com.meloda.app.fast.common.extensions.navigation.sharedViewModel -import com.meloda.app.fast.model.BaseError -import com.meloda.app.fast.profile.ProfileViewModel -import com.meloda.app.fast.profile.ProfileViewModelImpl -import com.meloda.app.fast.profile.presentation.ProfileRoute +import dev.meloda.fast.common.extensions.navigation.sharedViewModel +import dev.meloda.fast.model.BaseError +import dev.meloda.fast.profile.ProfileViewModel +import dev.meloda.fast.profile.ProfileViewModelImpl +import dev.meloda.fast.profile.presentation.ProfileRoute import kotlinx.serialization.Serializable @Serializable diff --git a/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/presentation/ProfileScreen.kt b/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/presentation/ProfileScreen.kt index 58580fca..87b655cd 100644 --- a/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/presentation/ProfileScreen.kt +++ b/feature/profile/src/main/kotlin/com/meloda/app/fast/profile/presentation/ProfileScreen.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.profile.presentation +package dev.meloda.fast.profile.presentation import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -34,13 +34,13 @@ import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.compose.AsyncImage -import com.meloda.app.fast.model.BaseError -import com.meloda.app.fast.profile.ProfileViewModel -import com.meloda.app.fast.profile.ProfileViewModelImpl -import com.meloda.app.fast.profile.model.ProfileScreenState +import dev.meloda.fast.model.BaseError +import dev.meloda.fast.profile.ProfileViewModel +import dev.meloda.fast.profile.ProfileViewModelImpl +import dev.meloda.fast.profile.model.ProfileScreenState import org.koin.androidx.compose.koinViewModel -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR @Composable fun ProfileRoute( diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts index bc8e0809..91e0571a 100644 --- a/feature/settings/build.gradle.kts +++ b/feature/settings/build.gradle.kts @@ -6,10 +6,10 @@ plugins { alias(libs.plugins.kotlin.serialization) } -group = "com.meloda.app.fast.settings" +group = "dev.meloda.fast.settings" android { - namespace = "com.meloda.app.fast.settings" + namespace = "dev.meloda.fast.settings" compileSdk = Configs.compileSdk defaultConfig { diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/SettingsViewModel.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/SettingsViewModel.kt index c96b0c1b..b12f3737 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/SettingsViewModel.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/SettingsViewModel.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.settings +package dev.meloda.fast.settings import android.content.res.Resources import android.os.Build @@ -6,29 +6,29 @@ import androidx.appcompat.app.AppCompatDelegate import androidx.core.view.HapticFeedbackConstantsCompat import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.meloda.app.fast.common.LongPollController -import com.meloda.app.fast.common.UserConfig -import com.meloda.app.fast.common.extensions.findWithIndex -import com.meloda.app.fast.common.extensions.isSdkAtLeast -import com.meloda.app.fast.common.extensions.setValue -import com.meloda.app.fast.common.model.DarkMode -import com.meloda.app.fast.common.model.LongPollState -import com.meloda.app.fast.common.model.UiText -import com.meloda.app.fast.data.db.AccountsRepository -import com.meloda.app.fast.datastore.AppSettings -import com.meloda.app.fast.datastore.SettingsKeys -import com.meloda.app.fast.datastore.UserSettings -import com.meloda.app.fast.model.database.AccountEntity -import com.meloda.app.fast.settings.model.SettingsItem -import com.meloda.app.fast.settings.model.SettingsScreenState -import com.meloda.app.fast.settings.model.SettingsShowOptions -import com.meloda.app.fast.settings.model.TextProvider +import dev.meloda.fast.common.LongPollController +import dev.meloda.fast.common.UserConfig +import dev.meloda.fast.common.extensions.findWithIndex +import dev.meloda.fast.common.extensions.isSdkAtLeast +import dev.meloda.fast.common.extensions.setValue +import dev.meloda.fast.common.model.DarkMode +import dev.meloda.fast.common.model.LongPollState +import dev.meloda.fast.common.model.UiText +import dev.meloda.fast.data.db.AccountsRepository +import dev.meloda.fast.datastore.AppSettings +import dev.meloda.fast.datastore.SettingsKeys +import dev.meloda.fast.datastore.UserSettings +import dev.meloda.fast.model.database.AccountEntity +import dev.meloda.fast.settings.model.SettingsItem +import dev.meloda.fast.settings.model.SettingsScreenState +import dev.meloda.fast.settings.model.SettingsShowOptions +import dev.meloda.fast.settings.model.TextProvider import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR interface SettingsViewModel { diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/di/SettingsModule.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/di/SettingsModule.kt index c5d86875..1cfb19d0 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/di/SettingsModule.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/di/SettingsModule.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.settings.di +package dev.meloda.fast.settings.di -import com.meloda.app.fast.settings.SettingsViewModel -import com.meloda.app.fast.settings.SettingsViewModelImpl +import dev.meloda.fast.settings.SettingsViewModel +import dev.meloda.fast.settings.SettingsViewModelImpl import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.dsl.bind import org.koin.dsl.module diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/SettingsItem.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/SettingsItem.kt index 147b0ddc..b50f9307 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/SettingsItem.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/SettingsItem.kt @@ -1,10 +1,10 @@ -package com.meloda.app.fast.settings.model +package dev.meloda.fast.settings.model import android.content.res.Resources import androidx.compose.runtime.Immutable -import com.meloda.app.fast.common.model.UiText -import com.meloda.app.fast.common.model.parseString -import com.meloda.app.fast.datastore.AppSettings +import dev.meloda.fast.common.model.UiText +import dev.meloda.fast.common.model.parseString +import dev.meloda.fast.datastore.AppSettings import kotlin.reflect.KClass @Immutable diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/SettingsScreenState.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/SettingsScreenState.kt index 38dd7a3e..be71268a 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/SettingsScreenState.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/SettingsScreenState.kt @@ -1,7 +1,7 @@ -package com.meloda.app.fast.settings.model +package dev.meloda.fast.settings.model import androidx.compose.runtime.Immutable -import com.meloda.app.fast.datastore.AppSettings +import dev.meloda.fast.datastore.AppSettings @Immutable data class SettingsScreenState( diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/SettingsShowOptions.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/SettingsShowOptions.kt index 0aa33bb7..83d82a3e 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/SettingsShowOptions.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/SettingsShowOptions.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.settings.model +package dev.meloda.fast.settings.model data class SettingsShowOptions( val showLogOut: Boolean, diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/TextProvider.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/TextProvider.kt index ff5dfb70..ea0c3b1f 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/TextProvider.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/TextProvider.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.settings.model +package dev.meloda.fast.settings.model -import com.meloda.app.fast.common.model.UiText +import dev.meloda.fast.common.model.UiText fun interface TextProvider> { fun provideText(item: S): UiText? diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/TitleProvider.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/TitleProvider.kt index bfcd9a1b..002de840 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/TitleProvider.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/TitleProvider.kt @@ -1,6 +1,6 @@ -package com.meloda.app.fast.settings.model +package dev.meloda.fast.settings.model -import com.meloda.app.fast.common.model.UiText +import dev.meloda.fast.common.model.UiText fun interface TitleProvider> { fun provideTitle(item: S): UiText? diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/UiItem.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/UiItem.kt index 3163cd7f..9205c312 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/UiItem.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/model/UiItem.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.settings.model +package dev.meloda.fast.settings.model import androidx.compose.runtime.Immutable diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/navigation/SettingsNavigation.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/navigation/SettingsNavigation.kt index f5798ed5..d9e1ae61 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/navigation/SettingsNavigation.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/navigation/SettingsNavigation.kt @@ -1,9 +1,9 @@ -package com.meloda.app.fast.settings.navigation +package dev.meloda.fast.settings.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable -import com.meloda.app.fast.settings.presentation.SettingsRoute +import dev.meloda.fast.settings.presentation.SettingsRoute import kotlinx.serialization.Serializable @Serializable diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/SettingsScreen.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/SettingsScreen.kt index 6bbbebb7..d27c5346 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/SettingsScreen.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/SettingsScreen.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.settings.presentation +package dev.meloda.fast.settings.presentation import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.WindowInsets @@ -30,28 +30,28 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.LayoutDirection import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.meloda.app.fast.common.UserConfig -import com.meloda.app.fast.datastore.SettingsKeys -import com.meloda.app.fast.settings.HapticType -import com.meloda.app.fast.settings.SettingsViewModel -import com.meloda.app.fast.settings.SettingsViewModelImpl -import com.meloda.app.fast.settings.model.SettingsScreenState -import com.meloda.app.fast.settings.model.UiItem -import com.meloda.app.fast.settings.presentation.item.ListItem -import com.meloda.app.fast.settings.presentation.item.SwitchItem -import com.meloda.app.fast.settings.presentation.item.TextFieldItem -import com.meloda.app.fast.settings.presentation.item.TitleItem -import com.meloda.app.fast.settings.presentation.item.TitleTextItem -import com.meloda.app.fast.ui.components.ActionInvokeDismiss -import com.meloda.app.fast.ui.components.MaterialDialog -import com.meloda.app.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.common.UserConfig +import dev.meloda.fast.datastore.SettingsKeys +import dev.meloda.fast.settings.HapticType +import dev.meloda.fast.settings.SettingsViewModel +import dev.meloda.fast.settings.SettingsViewModelImpl +import dev.meloda.fast.settings.model.SettingsScreenState +import dev.meloda.fast.settings.model.UiItem +import dev.meloda.fast.settings.presentation.item.ListItem +import dev.meloda.fast.settings.presentation.item.SwitchItem +import dev.meloda.fast.settings.presentation.item.TextFieldItem +import dev.meloda.fast.settings.presentation.item.TitleItem +import dev.meloda.fast.settings.presentation.item.TitleTextItem +import dev.meloda.fast.ui.components.ActionInvokeDismiss +import dev.meloda.fast.ui.components.MaterialDialog +import dev.meloda.fast.ui.theme.LocalThemeConfig import dev.chrisbanes.haze.HazeState import dev.chrisbanes.haze.haze import dev.chrisbanes.haze.hazeChild import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi import dev.chrisbanes.haze.materials.HazeMaterials import org.koin.androidx.compose.koinViewModel -import com.meloda.app.fast.ui.R as UiR +import dev.meloda.fast.ui.R as UiR @Composable fun SettingsRoute( diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/ListItem.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/ListItem.kt index 1273b73f..04c3c473 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/ListItem.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/ListItem.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.settings.presentation.item +package dev.meloda.fast.settings.presentation.item import androidx.compose.animation.animateContentSize import androidx.compose.foundation.ExperimentalFoundationApi @@ -25,16 +25,16 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.meloda.app.fast.settings.model.UiItem -import com.meloda.app.fast.ui.R -import com.meloda.app.fast.ui.basic.ContentAlpha -import com.meloda.app.fast.ui.basic.LocalContentAlpha -import com.meloda.app.fast.ui.components.ActionInvokeDismiss -import com.meloda.app.fast.ui.components.MaterialDialog -import com.meloda.app.fast.ui.components.SelectionType -import com.meloda.app.fast.ui.theme.LocalThemeConfig -import com.meloda.app.fast.ui.util.ImmutableList -import com.meloda.app.fast.ui.util.ImmutableList.Companion.toImmutableList +import dev.meloda.fast.settings.model.UiItem +import dev.meloda.fast.ui.R +import dev.meloda.fast.ui.basic.ContentAlpha +import dev.meloda.fast.ui.basic.LocalContentAlpha +import dev.meloda.fast.ui.components.ActionInvokeDismiss +import dev.meloda.fast.ui.components.MaterialDialog +import dev.meloda.fast.ui.components.SelectionType +import dev.meloda.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.ui.util.ImmutableList +import dev.meloda.fast.ui.util.ImmutableList.Companion.toImmutableList @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/SwitchItem.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/SwitchItem.kt index d62d9b92..47d153f4 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/SwitchItem.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/SwitchItem.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.settings.presentation.item +package dev.meloda.fast.settings.presentation.item import androidx.compose.animation.animateContentSize import androidx.compose.foundation.ExperimentalFoundationApi @@ -19,10 +19,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.meloda.app.fast.settings.model.UiItem -import com.meloda.app.fast.ui.basic.ContentAlpha -import com.meloda.app.fast.ui.basic.LocalContentAlpha -import com.meloda.app.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.settings.model.UiItem +import dev.meloda.fast.ui.basic.ContentAlpha +import dev.meloda.fast.ui.basic.LocalContentAlpha +import dev.meloda.fast.ui.theme.LocalThemeConfig @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/TextFieldItem.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/TextFieldItem.kt index 77fbd5b0..698382a7 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/TextFieldItem.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/TextFieldItem.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.settings.presentation.item +package dev.meloda.fast.settings.presentation.item import androidx.compose.animation.animateContentSize import androidx.compose.foundation.ExperimentalFoundationApi @@ -32,13 +32,13 @@ import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.meloda.app.fast.settings.model.UiItem -import com.meloda.app.fast.ui.R -import com.meloda.app.fast.ui.basic.ContentAlpha -import com.meloda.app.fast.ui.basic.LocalContentAlpha -import com.meloda.app.fast.ui.components.ActionInvokeDismiss -import com.meloda.app.fast.ui.components.MaterialDialog -import com.meloda.app.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.settings.model.UiItem +import dev.meloda.fast.ui.R +import dev.meloda.fast.ui.basic.ContentAlpha +import dev.meloda.fast.ui.basic.LocalContentAlpha +import dev.meloda.fast.ui.components.ActionInvokeDismiss +import dev.meloda.fast.ui.components.MaterialDialog +import dev.meloda.fast.ui.theme.LocalThemeConfig @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/TitleItem.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/TitleItem.kt index 25430af6..1849387f 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/TitleItem.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/TitleItem.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.settings.presentation.item +package dev.meloda.fast.settings.presentation.item import androidx.compose.animation.animateContentSize import androidx.compose.foundation.layout.padding @@ -8,8 +8,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.meloda.app.fast.settings.model.UiItem -import com.meloda.app.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.settings.model.UiItem +import dev.meloda.fast.ui.theme.LocalThemeConfig @Composable fun TitleItem( diff --git a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/TitleTextItem.kt b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/TitleTextItem.kt index 75a9123f..667c7c07 100644 --- a/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/TitleTextItem.kt +++ b/feature/settings/src/main/kotlin/com/meloda/app/fast/settings/presentation/item/TitleTextItem.kt @@ -1,4 +1,4 @@ -package com.meloda.app.fast.settings.presentation.item +package dev.meloda.fast.settings.presentation.item import androidx.compose.animation.animateContentSize import androidx.compose.foundation.ExperimentalFoundationApi @@ -18,10 +18,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.meloda.app.fast.settings.model.UiItem -import com.meloda.app.fast.ui.basic.ContentAlpha -import com.meloda.app.fast.ui.basic.LocalContentAlpha -import com.meloda.app.fast.ui.theme.LocalThemeConfig +import dev.meloda.fast.settings.model.UiItem +import dev.meloda.fast.ui.basic.ContentAlpha +import dev.meloda.fast.ui.basic.LocalContentAlpha +import dev.meloda.fast.ui.theme.LocalThemeConfig @OptIn(ExperimentalFoundationApi::class) @Composable