diff --git a/androidsvg/build.gradle b/androidsvg/build.gradle index 228d3011c2..5f6ee408ed 100644 --- a/androidsvg/build.gradle +++ b/androidsvg/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 30 + compileSdkVersion versions.compileSdk buildToolsVersion versions.buildTools defaultConfig { diff --git a/app/src/debug/java/org/stepik/android/domain/debug/model/SplitTestData.kt b/app/src/debug/java/org/stepik/android/domain/debug/model/SplitTestData.kt index 7cd60d87a5..39368bd9c6 100644 --- a/app/src/debug/java/org/stepik/android/domain/debug/model/SplitTestData.kt +++ b/app/src/debug/java/org/stepik/android/domain/debug/model/SplitTestData.kt @@ -1,6 +1,6 @@ package org.stepik.android.domain.debug.model -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable data class SplitTestData( val splitTestName: String, diff --git a/app/src/debug/java/org/stepik/android/presentation/debug/DebugViewModel.kt b/app/src/debug/java/org/stepik/android/presentation/debug/DebugViewModel.kt index 991e3063bd..e3f5b53d6a 100644 --- a/app/src/debug/java/org/stepik/android/presentation/debug/DebugViewModel.kt +++ b/app/src/debug/java/org/stepik/android/presentation/debug/DebugViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.debug -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class DebugViewModel( diff --git a/app/src/debug/java/org/stepik/android/presentation/debug/InAppPurchasesViewModel.kt b/app/src/debug/java/org/stepik/android/presentation/debug/InAppPurchasesViewModel.kt index 0232ea333b..87235a1bbc 100644 --- a/app/src/debug/java/org/stepik/android/presentation/debug/InAppPurchasesViewModel.kt +++ b/app/src/debug/java/org/stepik/android/presentation/debug/InAppPurchasesViewModel.kt @@ -1,7 +1,7 @@ package org.stepik.android.presentation.debug -import ru.nobird.android.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel +import ru.nobird.app.presentation.redux.container.ReduxViewContainer class InAppPurchasesViewModel( reduxViewContainer: ReduxViewContainer diff --git a/app/src/debug/java/org/stepik/android/presentation/debug/SplitTestsViewModel.kt b/app/src/debug/java/org/stepik/android/presentation/debug/SplitTestsViewModel.kt index 6bbf6ef979..654439caef 100644 --- a/app/src/debug/java/org/stepik/android/presentation/debug/SplitTestsViewModel.kt +++ b/app/src/debug/java/org/stepik/android/presentation/debug/SplitTestsViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.debug -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class SplitTestsViewModel( diff --git a/app/src/debug/java/org/stepik/android/presentation/debug/reducer/DebugReducer.kt b/app/src/debug/java/org/stepik/android/presentation/debug/reducer/DebugReducer.kt index f71958c71b..e6cbf80068 100644 --- a/app/src/debug/java/org/stepik/android/presentation/debug/reducer/DebugReducer.kt +++ b/app/src/debug/java/org/stepik/android/presentation/debug/reducer/DebugReducer.kt @@ -4,7 +4,7 @@ import org.stepik.android.domain.debug.model.EndpointConfig import org.stepik.android.presentation.debug.DebugFeature.State import org.stepik.android.presentation.debug.DebugFeature.Message import org.stepik.android.presentation.debug.DebugFeature.Action -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class DebugReducer diff --git a/app/src/debug/java/org/stepik/android/presentation/debug/reducer/InAppPurchasesReducer.kt b/app/src/debug/java/org/stepik/android/presentation/debug/reducer/InAppPurchasesReducer.kt index 7c99c25d92..4449050dd4 100644 --- a/app/src/debug/java/org/stepik/android/presentation/debug/reducer/InAppPurchasesReducer.kt +++ b/app/src/debug/java/org/stepik/android/presentation/debug/reducer/InAppPurchasesReducer.kt @@ -3,9 +3,8 @@ package org.stepik.android.presentation.debug.reducer import org.stepik.android.presentation.debug.InAppPurchasesFeature.State import org.stepik.android.presentation.debug.InAppPurchasesFeature.Message import org.stepik.android.presentation.debug.InAppPurchasesFeature.Action -import ru.nobird.android.core.model.mutate -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class InAppPurchasesReducer diff --git a/app/src/debug/java/org/stepik/android/presentation/debug/reducer/SplitTestsReducer.kt b/app/src/debug/java/org/stepik/android/presentation/debug/reducer/SplitTestsReducer.kt index 73e542323c..d1e99c1174 100644 --- a/app/src/debug/java/org/stepik/android/presentation/debug/reducer/SplitTestsReducer.kt +++ b/app/src/debug/java/org/stepik/android/presentation/debug/reducer/SplitTestsReducer.kt @@ -3,8 +3,8 @@ package org.stepik.android.presentation.debug.reducer import org.stepik.android.presentation.debug.SplitTestsFeature.State import org.stepik.android.presentation.debug.SplitTestsFeature.Message import org.stepik.android.presentation.debug.SplitTestsFeature.Action -import ru.nobird.android.core.model.mutate -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.core.model.mutate +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class SplitTestsReducer diff --git a/app/src/debug/java/org/stepik/android/view/debug/ui/activity/InAppPurchasesActivity.kt b/app/src/debug/java/org/stepik/android/view/debug/ui/activity/InAppPurchasesActivity.kt index ca50964456..d0aacea865 100644 --- a/app/src/debug/java/org/stepik/android/view/debug/ui/activity/InAppPurchasesActivity.kt +++ b/app/src/debug/java/org/stepik/android/view/debug/ui/activity/InAppPurchasesActivity.kt @@ -21,7 +21,7 @@ import org.stepik.android.presentation.debug.InAppPurchasesFeature import org.stepik.android.presentation.debug.InAppPurchasesViewModel import org.stepik.android.view.debug.ui.adapter.delegate.InAppPurchaseAdapterDelegate import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.ui.adapters.DefaultDelegateAdapter import ru.nobird.android.view.redux.ui.extension.reduxViewModel import javax.inject.Inject diff --git a/app/src/debug/java/org/stepik/android/view/debug/ui/dialog/SplitTestsDialogFragment.kt b/app/src/debug/java/org/stepik/android/view/debug/ui/dialog/SplitTestsDialogFragment.kt index 346e17e1ec..cf935a2c72 100644 --- a/app/src/debug/java/org/stepik/android/view/debug/ui/dialog/SplitTestsDialogFragment.kt +++ b/app/src/debug/java/org/stepik/android/view/debug/ui/dialog/SplitTestsDialogFragment.kt @@ -19,7 +19,7 @@ import org.stepik.android.domain.debug.model.SplitTestData import org.stepik.android.presentation.debug.SplitTestsFeature import org.stepik.android.presentation.debug.SplitTestsViewModel import org.stepik.android.view.debug.ui.adapter.delegate.SplitTestDataAdapterDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.ui.adapters.DefaultDelegateAdapter import ru.nobird.android.view.redux.ui.extension.reduxViewModel import javax.inject.Inject diff --git a/app/src/debug/java/org/stepik/android/view/debug/ui/fragment/DebugFragment.kt b/app/src/debug/java/org/stepik/android/view/debug/ui/fragment/DebugFragment.kt index ab83cb8c12..ff5e1a0abb 100644 --- a/app/src/debug/java/org/stepik/android/view/debug/ui/fragment/DebugFragment.kt +++ b/app/src/debug/java/org/stepik/android/view/debug/ui/fragment/DebugFragment.kt @@ -14,7 +14,7 @@ import org.stepic.droid.util.copyTextToClipboard import org.stepik.android.presentation.debug.DebugFeature import org.stepik.android.presentation.debug.DebugViewModel import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.view.redux.ui.extension.reduxViewModel import javax.inject.Inject import android.content.Intent @@ -26,7 +26,8 @@ import org.stepik.android.view.debug.ui.activity.InAppPurchasesActivity import org.stepik.android.view.debug.ui.dialog.SplitTestsDialogFragment import ru.nobird.android.view.base.ui.extension.showIfNotExists -class DebugFragment : Fragment(R.layout.fragment_debug), ReduxView { +class DebugFragment : Fragment(R.layout.fragment_debug), + ReduxView { companion object { fun newInstance(): Fragment = DebugFragment() diff --git a/app/src/debug/java/org/stepik/android/view/injection/debug/DebugPresentationModule.kt b/app/src/debug/java/org/stepik/android/view/injection/debug/DebugPresentationModule.kt index 185b48b20a..e5fa1402d7 100644 --- a/app/src/debug/java/org/stepik/android/view/injection/debug/DebugPresentationModule.kt +++ b/app/src/debug/java/org/stepik/android/view/injection/debug/DebugPresentationModule.kt @@ -9,9 +9,9 @@ import org.stepik.android.presentation.debug.DebugFeature import org.stepik.android.presentation.debug.DebugViewModel import org.stepik.android.presentation.debug.dispatcher.DebugActionDispatcher import org.stepik.android.presentation.debug.reducer.DebugReducer -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object DebugPresentationModule { diff --git a/app/src/debug/java/org/stepik/android/view/injection/debug/InAppPurchasesPresentationModule.kt b/app/src/debug/java/org/stepik/android/view/injection/debug/InAppPurchasesPresentationModule.kt index 0442178971..8dc793e11a 100644 --- a/app/src/debug/java/org/stepik/android/view/injection/debug/InAppPurchasesPresentationModule.kt +++ b/app/src/debug/java/org/stepik/android/view/injection/debug/InAppPurchasesPresentationModule.kt @@ -9,9 +9,9 @@ import org.stepik.android.presentation.debug.InAppPurchasesFeature import org.stepik.android.presentation.debug.InAppPurchasesViewModel import org.stepik.android.presentation.debug.dispatcher.InAppPurchasesActionDispatcher import org.stepik.android.presentation.debug.reducer.InAppPurchasesReducer -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object InAppPurchasesPresentationModule { diff --git a/app/src/debug/java/org/stepik/android/view/injection/debug/SplitTestsPresentationModule.kt b/app/src/debug/java/org/stepik/android/view/injection/debug/SplitTestsPresentationModule.kt index 127bf67709..8296d78e53 100644 --- a/app/src/debug/java/org/stepik/android/view/injection/debug/SplitTestsPresentationModule.kt +++ b/app/src/debug/java/org/stepik/android/view/injection/debug/SplitTestsPresentationModule.kt @@ -9,9 +9,9 @@ import org.stepik.android.presentation.debug.SplitTestsFeature import org.stepik.android.presentation.debug.SplitTestsViewModel import org.stepik.android.presentation.debug.dispatcher.SplitTestsActionDispatcher import org.stepik.android.presentation.debug.reducer.SplitTestsReducer -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object SplitTestsPresentationModule { diff --git a/app/src/main/java/org/stepic/droid/code/data/AutocompleteDictionary.kt b/app/src/main/java/org/stepic/droid/code/data/AutocompleteDictionary.kt index 1bc3816d59..41e96a28cf 100644 --- a/app/src/main/java/org/stepic/droid/code/data/AutocompleteDictionary.kt +++ b/app/src/main/java/org/stepic/droid/code/data/AutocompleteDictionary.kt @@ -1,6 +1,6 @@ package org.stepic.droid.code.data -import ru.nobird.android.core.model.isNotOrdered +import ru.nobird.app.core.model.isNotOrdered /** * Class for fast search strings with common prefix diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/activity/StoriesActivity.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/activity/StoriesActivity.kt index 1fcb86df7c..fa5ab3413e 100644 --- a/app/src/main/java/org/stepic/droid/features/stories/ui/activity/StoriesActivity.kt +++ b/app/src/main/java/org/stepic/droid/features/stories/ui/activity/StoriesActivity.kt @@ -11,7 +11,7 @@ import org.stepic.droid.base.FragmentActivityBase import org.stepic.droid.features.stories.ui.delegate.StoriesActivityDelegate import org.stepik.android.presentation.story.StoryFeature import org.stepik.android.view.story.viewmodel.StoryViewModel -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.stories.ui.custom.DismissableLayout import ru.nobird.android.view.redux.ui.extension.reduxViewModel import javax.inject.Inject diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/StoriesActivityDelegate.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/StoriesActivityDelegate.kt index 7526c89f03..5b8c9063a4 100644 --- a/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/StoriesActivityDelegate.kt +++ b/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/StoriesActivityDelegate.kt @@ -9,7 +9,7 @@ import org.stepic.droid.R import org.stepic.droid.analytic.AmplitudeAnalytic import org.stepic.droid.analytic.Analytic import org.stepik.android.domain.story.model.StoryReaction -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.safeCast import ru.nobird.android.stories.model.Story import ru.nobird.android.stories.ui.adapter.StoriesPagerAdapter import ru.nobird.android.stories.ui.custom.DismissableLayout diff --git a/app/src/main/java/org/stepic/droid/persistence/downloads/resolvers/structure/UnitStructureResolverImpl.kt b/app/src/main/java/org/stepic/droid/persistence/downloads/resolvers/structure/UnitStructureResolverImpl.kt index 460d78ab49..9e008f38f1 100644 --- a/app/src/main/java/org/stepic/droid/persistence/downloads/resolvers/structure/UnitStructureResolverImpl.kt +++ b/app/src/main/java/org/stepic/droid/persistence/downloads/resolvers/structure/UnitStructureResolverImpl.kt @@ -12,7 +12,7 @@ import org.stepik.android.domain.progress.repository.ProgressRepository import org.stepik.android.domain.section.repository.SectionRepository import org.stepik.android.domain.unit.repository.UnitRepository import org.stepik.android.model.Unit -import ru.nobird.android.core.model.mapToLongArray +import ru.nobird.app.core.model.mapToLongArray import javax.inject.Inject @AppSingleton diff --git a/app/src/main/java/org/stepic/droid/persistence/model/DownloadItem.kt b/app/src/main/java/org/stepic/droid/persistence/model/DownloadItem.kt index 31b7458a2a..303b00e7bb 100644 --- a/app/src/main/java/org/stepic/droid/persistence/model/DownloadItem.kt +++ b/app/src/main/java/org/stepic/droid/persistence/model/DownloadItem.kt @@ -1,7 +1,7 @@ package org.stepic.droid.persistence.model import org.stepik.android.model.Course -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable data class DownloadItem( val course: Course, diff --git a/app/src/main/java/org/stepic/droid/persistence/model/StepPersistentWrapper.kt b/app/src/main/java/org/stepic/droid/persistence/model/StepPersistentWrapper.kt index b0b2425ae1..ededaf8bfb 100644 --- a/app/src/main/java/org/stepic/droid/persistence/model/StepPersistentWrapper.kt +++ b/app/src/main/java/org/stepic/droid/persistence/model/StepPersistentWrapper.kt @@ -7,7 +7,7 @@ import org.stepic.droid.util.AppConstants import org.stepik.android.model.Progressable import org.stepik.android.model.Step import org.stepik.android.model.Video -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable @Parcelize data class StepPersistentWrapper( diff --git a/app/src/main/java/org/stepik/android/cache/certificates/source/CertificateCacheDataSourceImpl.kt b/app/src/main/java/org/stepik/android/cache/certificates/source/CertificateCacheDataSourceImpl.kt index 5d4e19386f..cfabf5f371 100644 --- a/app/src/main/java/org/stepik/android/cache/certificates/source/CertificateCacheDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/cache/certificates/source/CertificateCacheDataSourceImpl.kt @@ -4,7 +4,7 @@ import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single import org.stepic.droid.storage.dao.IDao -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.cache.certificates.structure.DbStructureCertificate import org.stepik.android.data.certificate.source.CertificateCacheDataSource import org.stepik.android.model.Certificate diff --git a/app/src/main/java/org/stepik/android/cache/course_collection/CourseCollectionCacheDataSourceImpl.kt b/app/src/main/java/org/stepik/android/cache/course_collection/CourseCollectionCacheDataSourceImpl.kt index 2dad347bae..7792e23d98 100644 --- a/app/src/main/java/org/stepik/android/cache/course_collection/CourseCollectionCacheDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/cache/course_collection/CourseCollectionCacheDataSourceImpl.kt @@ -10,7 +10,7 @@ import org.stepik.android.data.course_collection.source.CourseCollectionCacheDat import org.stepik.android.domain.course_collection.model.CourseCollectionQuery import org.stepik.android.model.CourseCollection import org.stepik.android.model.PlatformType -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull import javax.inject.Inject class CourseCollectionCacheDataSourceImpl diff --git a/app/src/main/java/org/stepik/android/cache/course_payments/CoursePaymentsCacheDataSourceImpl.kt b/app/src/main/java/org/stepik/android/cache/course_payments/CoursePaymentsCacheDataSourceImpl.kt index b29ac4819d..ef5e47f081 100644 --- a/app/src/main/java/org/stepik/android/cache/course_payments/CoursePaymentsCacheDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/cache/course_payments/CoursePaymentsCacheDataSourceImpl.kt @@ -6,7 +6,7 @@ import org.stepic.droid.storage.dao.IDao import org.stepik.android.cache.course_payments.structure.DbStructureCoursePayments import org.stepik.android.data.course_payments.source.CoursePaymentsCacheDataSource import org.stepik.android.domain.course_payments.model.CoursePayment -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull import javax.inject.Inject class CoursePaymentsCacheDataSourceImpl diff --git a/app/src/main/java/org/stepik/android/cache/course_reviews/CourseReviewsCacheDataSourceImpl.kt b/app/src/main/java/org/stepik/android/cache/course_reviews/CourseReviewsCacheDataSourceImpl.kt index e75d9dbef9..5cd45498bc 100644 --- a/app/src/main/java/org/stepik/android/cache/course_reviews/CourseReviewsCacheDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/cache/course_reviews/CourseReviewsCacheDataSourceImpl.kt @@ -4,7 +4,7 @@ import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single import org.stepic.droid.storage.dao.IDao -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.cache.course_reviews.structure.DbStructureCourseReview import org.stepik.android.data.course_reviews.source.CourseReviewsCacheDataSource import org.stepik.android.domain.course_reviews.model.CourseReview diff --git a/app/src/main/java/org/stepik/android/cache/user_courses/UserCoursesCacheDataSourceImpl.kt b/app/src/main/java/org/stepik/android/cache/user_courses/UserCoursesCacheDataSourceImpl.kt index efff523846..96a8bbb57d 100644 --- a/app/src/main/java/org/stepik/android/cache/user_courses/UserCoursesCacheDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/cache/user_courses/UserCoursesCacheDataSourceImpl.kt @@ -7,7 +7,7 @@ import org.stepik.android.cache.user_courses.structure.DbStructureUserCourse import org.stepik.android.data.user_courses.source.UserCoursesCacheDataSource import org.stepik.android.domain.course_list.model.UserCourseQuery import org.stepik.android.domain.user_courses.model.UserCourse -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull import javax.inject.Inject class UserCoursesCacheDataSourceImpl diff --git a/app/src/main/java/org/stepik/android/data/base/repository/delegate/ListRepositoryDelegate.kt b/app/src/main/java/org/stepik/android/data/base/repository/delegate/ListRepositoryDelegate.kt index 3b461180a2..2eb04c4979 100644 --- a/app/src/main/java/org/stepik/android/data/base/repository/delegate/ListRepositoryDelegate.kt +++ b/app/src/main/java/org/stepik/android/data/base/repository/delegate/ListRepositoryDelegate.kt @@ -3,7 +3,7 @@ package org.stepik.android.data.base.repository.delegate import io.reactivex.Completable import io.reactivex.Single import org.stepik.android.domain.base.DataSourceType -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable import ru.nobird.android.domain.rx.doCompletableOnSuccess import ru.nobird.android.domain.rx.requireSize diff --git a/app/src/main/java/org/stepik/android/data/base/repository/delegate/SingleRepositoryDelegate.kt b/app/src/main/java/org/stepik/android/data/base/repository/delegate/SingleRepositoryDelegate.kt index da3567f190..7aad25b4f2 100644 --- a/app/src/main/java/org/stepik/android/data/base/repository/delegate/SingleRepositoryDelegate.kt +++ b/app/src/main/java/org/stepik/android/data/base/repository/delegate/SingleRepositoryDelegate.kt @@ -4,7 +4,7 @@ import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single import org.stepik.android.domain.base.DataSourceType -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable import ru.nobird.android.domain.rx.doCompletableOnSuccess class SingleRepositoryDelegate>( diff --git a/app/src/main/java/org/stepik/android/data/certificate/repository/CertificateRepositoryImpl.kt b/app/src/main/java/org/stepik/android/data/certificate/repository/CertificateRepositoryImpl.kt index a0c962d72f..a150cff92a 100644 --- a/app/src/main/java/org/stepik/android/data/certificate/repository/CertificateRepositoryImpl.kt +++ b/app/src/main/java/org/stepik/android/data/certificate/repository/CertificateRepositoryImpl.kt @@ -2,7 +2,7 @@ package org.stepik.android.data.certificate.repository import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import ru.nobird.android.domain.rx.doCompletableOnSuccess import org.stepik.android.data.certificate.source.CertificateCacheDataSource import org.stepik.android.data.certificate.source.CertificateRemoteDataSource diff --git a/app/src/main/java/org/stepik/android/data/certificate/source/CertificateCacheDataSource.kt b/app/src/main/java/org/stepik/android/data/certificate/source/CertificateCacheDataSource.kt index 7fcf464f09..93a8a9ce5e 100644 --- a/app/src/main/java/org/stepik/android/data/certificate/source/CertificateCacheDataSource.kt +++ b/app/src/main/java/org/stepik/android/data/certificate/source/CertificateCacheDataSource.kt @@ -3,7 +3,7 @@ package org.stepik.android.data.certificate.source import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.model.Certificate interface CertificateCacheDataSource { diff --git a/app/src/main/java/org/stepik/android/data/certificate/source/CertificateRemoteDataSource.kt b/app/src/main/java/org/stepik/android/data/certificate/source/CertificateRemoteDataSource.kt index 3094503e9e..55d565563e 100644 --- a/app/src/main/java/org/stepik/android/data/certificate/source/CertificateRemoteDataSource.kt +++ b/app/src/main/java/org/stepik/android/data/certificate/source/CertificateRemoteDataSource.kt @@ -2,7 +2,7 @@ package org.stepik.android.data.certificate.source import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.model.Certificate interface CertificateRemoteDataSource { diff --git a/app/src/main/java/org/stepik/android/data/course/repository/CourseRepositoryImpl.kt b/app/src/main/java/org/stepik/android/data/course/repository/CourseRepositoryImpl.kt index b43affbd95..06bfe4e70a 100644 --- a/app/src/main/java/org/stepik/android/data/course/repository/CourseRepositoryImpl.kt +++ b/app/src/main/java/org/stepik/android/data/course/repository/CourseRepositoryImpl.kt @@ -2,7 +2,7 @@ package org.stepik.android.data.course.repository import io.reactivex.Completable import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.data.base.repository.delegate.ListRepositoryDelegate import org.stepik.android.data.course.source.CourseCacheDataSource import org.stepik.android.data.course.source.CourseRemoteDataSource diff --git a/app/src/main/java/org/stepik/android/data/course/source/CourseRemoteDataSource.kt b/app/src/main/java/org/stepik/android/data/course/source/CourseRemoteDataSource.kt index d1bbccf6ac..0ec38714c5 100644 --- a/app/src/main/java/org/stepik/android/data/course/source/CourseRemoteDataSource.kt +++ b/app/src/main/java/org/stepik/android/data/course/source/CourseRemoteDataSource.kt @@ -1,7 +1,7 @@ package org.stepik.android.data.course.source import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.course_list.model.CourseListQuery import org.stepik.android.model.Course diff --git a/app/src/main/java/org/stepik/android/data/course_revenue/repository/CourseBenefitByMonthsRepositoryImpl.kt b/app/src/main/java/org/stepik/android/data/course_revenue/repository/CourseBenefitByMonthsRepositoryImpl.kt index 9e99733398..d7136efbee 100644 --- a/app/src/main/java/org/stepik/android/data/course_revenue/repository/CourseBenefitByMonthsRepositoryImpl.kt +++ b/app/src/main/java/org/stepik/android/data/course_revenue/repository/CourseBenefitByMonthsRepositoryImpl.kt @@ -4,7 +4,7 @@ import io.reactivex.Single import org.stepik.android.data.course_revenue.source.CourseBenefitByMonthsRemoteDataSource import org.stepik.android.domain.course_revenue.model.CourseBenefitByMonth import org.stepik.android.domain.course_revenue.repository.CourseBenefitByMonthsRepository -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import javax.inject.Inject class CourseBenefitByMonthsRepositoryImpl diff --git a/app/src/main/java/org/stepik/android/data/course_revenue/repository/CourseBenefitsRepositoryImpl.kt b/app/src/main/java/org/stepik/android/data/course_revenue/repository/CourseBenefitsRepositoryImpl.kt index 7a4e2a065d..285038c7ab 100644 --- a/app/src/main/java/org/stepik/android/data/course_revenue/repository/CourseBenefitsRepositoryImpl.kt +++ b/app/src/main/java/org/stepik/android/data/course_revenue/repository/CourseBenefitsRepositoryImpl.kt @@ -4,7 +4,7 @@ import io.reactivex.Single import org.stepik.android.data.course_revenue.source.CourseBenefitsRemoteDataSource import org.stepik.android.domain.course_revenue.model.CourseBenefit import org.stepik.android.domain.course_revenue.repository.CourseBenefitsRepository -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import javax.inject.Inject class CourseBenefitsRepositoryImpl diff --git a/app/src/main/java/org/stepik/android/data/course_revenue/source/CourseBenefitByMonthsRemoteDataSource.kt b/app/src/main/java/org/stepik/android/data/course_revenue/source/CourseBenefitByMonthsRemoteDataSource.kt index e293e8ccec..2363b84680 100644 --- a/app/src/main/java/org/stepik/android/data/course_revenue/source/CourseBenefitByMonthsRemoteDataSource.kt +++ b/app/src/main/java/org/stepik/android/data/course_revenue/source/CourseBenefitByMonthsRemoteDataSource.kt @@ -2,7 +2,7 @@ package org.stepik.android.data.course_revenue.source import io.reactivex.Single import org.stepik.android.domain.course_revenue.model.CourseBenefitByMonth -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList interface CourseBenefitByMonthsRemoteDataSource { fun getCourseBenefitByMonths(courseId: Long, page: Int = 1): Single> diff --git a/app/src/main/java/org/stepik/android/data/course_revenue/source/CourseBenefitsRemoteDataSource.kt b/app/src/main/java/org/stepik/android/data/course_revenue/source/CourseBenefitsRemoteDataSource.kt index 9ef126aba6..6b76ca6854 100644 --- a/app/src/main/java/org/stepik/android/data/course_revenue/source/CourseBenefitsRemoteDataSource.kt +++ b/app/src/main/java/org/stepik/android/data/course_revenue/source/CourseBenefitsRemoteDataSource.kt @@ -2,7 +2,7 @@ package org.stepik.android.data.course_revenue.source import io.reactivex.Single import org.stepik.android.domain.course_revenue.model.CourseBenefit -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList interface CourseBenefitsRemoteDataSource { fun getCourseBenefits(courseId: Long, page: Int = 1): Single> diff --git a/app/src/main/java/org/stepik/android/data/course_reviews/repository/CourseReviewsRepositoryImpl.kt b/app/src/main/java/org/stepik/android/data/course_reviews/repository/CourseReviewsRepositoryImpl.kt index 92f1a12d34..2d93f59c3c 100644 --- a/app/src/main/java/org/stepik/android/data/course_reviews/repository/CourseReviewsRepositoryImpl.kt +++ b/app/src/main/java/org/stepik/android/data/course_reviews/repository/CourseReviewsRepositoryImpl.kt @@ -3,7 +3,7 @@ package org.stepik.android.data.course_reviews.repository import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import ru.nobird.android.domain.rx.doCompletableOnSuccess import org.stepik.android.data.course_reviews.source.CourseReviewsCacheDataSource import org.stepik.android.data.course_reviews.source.CourseReviewsRemoteDataSource diff --git a/app/src/main/java/org/stepik/android/data/course_reviews/source/CourseReviewsCacheDataSource.kt b/app/src/main/java/org/stepik/android/data/course_reviews/source/CourseReviewsCacheDataSource.kt index 4287b57804..3d64f58601 100644 --- a/app/src/main/java/org/stepik/android/data/course_reviews/source/CourseReviewsCacheDataSource.kt +++ b/app/src/main/java/org/stepik/android/data/course_reviews/source/CourseReviewsCacheDataSource.kt @@ -3,7 +3,7 @@ package org.stepik.android.data.course_reviews.source import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.course_reviews.model.CourseReview interface CourseReviewsCacheDataSource { diff --git a/app/src/main/java/org/stepik/android/data/course_reviews/source/CourseReviewsRemoteDataSource.kt b/app/src/main/java/org/stepik/android/data/course_reviews/source/CourseReviewsRemoteDataSource.kt index 6e58147c57..d15eb825da 100644 --- a/app/src/main/java/org/stepik/android/data/course_reviews/source/CourseReviewsRemoteDataSource.kt +++ b/app/src/main/java/org/stepik/android/data/course_reviews/source/CourseReviewsRemoteDataSource.kt @@ -3,7 +3,7 @@ package org.stepik.android.data.course_reviews.source import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.course_reviews.model.CourseReview interface CourseReviewsRemoteDataSource { diff --git a/app/src/main/java/org/stepik/android/data/download/repository/DownloadRepositoryImpl.kt b/app/src/main/java/org/stepik/android/data/download/repository/DownloadRepositoryImpl.kt index fd5b1f5952..ff3682bd96 100644 --- a/app/src/main/java/org/stepik/android/data/download/repository/DownloadRepositoryImpl.kt +++ b/app/src/main/java/org/stepik/android/data/download/repository/DownloadRepositoryImpl.kt @@ -13,7 +13,7 @@ import org.stepic.droid.persistence.model.Structure import org.stepic.droid.persistence.model.SystemDownloadRecord import org.stepic.droid.persistence.storage.dao.PersistentItemDao import org.stepic.droid.persistence.storage.dao.SystemDownloadsDao -import ru.nobird.android.core.model.mapToLongArray +import ru.nobird.app.core.model.mapToLongArray import org.stepic.droid.util.plus import org.stepik.android.data.download.source.DownloadCacheDataSource import org.stepik.android.domain.course.repository.CourseRepository diff --git a/app/src/main/java/org/stepik/android/data/notification/repository/NotificationRepositoryImpl.kt b/app/src/main/java/org/stepik/android/data/notification/repository/NotificationRepositoryImpl.kt index 39fe35f0ae..d14b30c0ec 100644 --- a/app/src/main/java/org/stepik/android/data/notification/repository/NotificationRepositoryImpl.kt +++ b/app/src/main/java/org/stepik/android/data/notification/repository/NotificationRepositoryImpl.kt @@ -5,7 +5,7 @@ import io.reactivex.Single import org.stepic.droid.model.NotificationCategory import org.stepic.droid.notifications.model.Notification import org.stepic.droid.notifications.model.NotificationStatuses -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.data.notification.source.NotificationCacheDataSource import org.stepik.android.data.notification.source.NotificationRemoteDataSource import org.stepik.android.domain.notification.repository.NotificationRepository diff --git a/app/src/main/java/org/stepik/android/data/notification/source/NotificationRemoteDataSource.kt b/app/src/main/java/org/stepik/android/data/notification/source/NotificationRemoteDataSource.kt index afa8bfc076..9840a4f7e4 100644 --- a/app/src/main/java/org/stepik/android/data/notification/source/NotificationRemoteDataSource.kt +++ b/app/src/main/java/org/stepik/android/data/notification/source/NotificationRemoteDataSource.kt @@ -5,7 +5,7 @@ import io.reactivex.Single import org.stepic.droid.model.NotificationCategory import org.stepic.droid.notifications.model.Notification import org.stepic.droid.notifications.model.NotificationStatuses -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList interface NotificationRemoteDataSource { fun putNotifications(vararg notificationIds: Long, isRead: Boolean): Completable diff --git a/app/src/main/java/org/stepik/android/data/personal_deadlines/repository/DeadlinesRepositoryImpl.kt b/app/src/main/java/org/stepik/android/data/personal_deadlines/repository/DeadlinesRepositoryImpl.kt index 49a652642c..7804477ff4 100644 --- a/app/src/main/java/org/stepik/android/data/personal_deadlines/repository/DeadlinesRepositoryImpl.kt +++ b/app/src/main/java/org/stepik/android/data/personal_deadlines/repository/DeadlinesRepositoryImpl.kt @@ -3,7 +3,7 @@ package org.stepik.android.data.personal_deadlines.repository import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import ru.nobird.android.domain.rx.doCompletableOnSuccess import org.stepic.droid.util.then import org.stepic.droid.web.storage.model.StorageRecord diff --git a/app/src/main/java/org/stepik/android/data/personal_deadlines/source/DeadlinesRemoteDataSource.kt b/app/src/main/java/org/stepik/android/data/personal_deadlines/source/DeadlinesRemoteDataSource.kt index 35bac8ed61..8d02fb8a6f 100644 --- a/app/src/main/java/org/stepik/android/data/personal_deadlines/source/DeadlinesRemoteDataSource.kt +++ b/app/src/main/java/org/stepik/android/data/personal_deadlines/source/DeadlinesRemoteDataSource.kt @@ -3,7 +3,7 @@ package org.stepik.android.data.personal_deadlines.source import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepic.droid.web.storage.model.StorageRecord import org.stepik.android.domain.personal_deadlines.model.DeadlinesWrapper diff --git a/app/src/main/java/org/stepik/android/data/search_result/repository/SearchResultRepositoryImpl.kt b/app/src/main/java/org/stepik/android/data/search_result/repository/SearchResultRepositoryImpl.kt index aa0615a1c7..17bfde4990 100644 --- a/app/src/main/java/org/stepik/android/data/search_result/repository/SearchResultRepositoryImpl.kt +++ b/app/src/main/java/org/stepik/android/data/search_result/repository/SearchResultRepositoryImpl.kt @@ -1,7 +1,7 @@ package org.stepik.android.data.search_result.repository import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.data.search_result.source.SearchResultRemoteDataSource import org.stepik.android.domain.search_result.model.SearchResultQuery import org.stepik.android.domain.search_result.repository.SearchResultRepository diff --git a/app/src/main/java/org/stepik/android/data/search_result/source/SearchResultRemoteDataSource.kt b/app/src/main/java/org/stepik/android/data/search_result/source/SearchResultRemoteDataSource.kt index 1049a7564e..ecc8e743dc 100644 --- a/app/src/main/java/org/stepik/android/data/search_result/source/SearchResultRemoteDataSource.kt +++ b/app/src/main/java/org/stepik/android/data/search_result/source/SearchResultRemoteDataSource.kt @@ -1,7 +1,7 @@ package org.stepik.android.data.search_result.source import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.search_result.model.SearchResultQuery import org.stepik.android.model.SearchResult diff --git a/app/src/main/java/org/stepik/android/data/submission/repository/SubmissionRepositoryImpl.kt b/app/src/main/java/org/stepik/android/data/submission/repository/SubmissionRepositoryImpl.kt index eb1140b333..a635d5a223 100644 --- a/app/src/main/java/org/stepik/android/data/submission/repository/SubmissionRepositoryImpl.kt +++ b/app/src/main/java/org/stepik/android/data/submission/repository/SubmissionRepositoryImpl.kt @@ -2,7 +2,7 @@ package org.stepik.android.data.submission.repository import io.reactivex.Completable import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import ru.nobird.android.domain.rx.doCompletableOnSuccess import org.stepik.android.data.submission.source.SubmissionCacheDataSource import org.stepik.android.data.submission.source.SubmissionRemoteDataSource diff --git a/app/src/main/java/org/stepik/android/data/submission/source/SubmissionRemoteDataSource.kt b/app/src/main/java/org/stepik/android/data/submission/source/SubmissionRemoteDataSource.kt index da89c3f2f6..c575c40e82 100644 --- a/app/src/main/java/org/stepik/android/data/submission/source/SubmissionRemoteDataSource.kt +++ b/app/src/main/java/org/stepik/android/data/submission/source/SubmissionRemoteDataSource.kt @@ -1,7 +1,7 @@ package org.stepik.android.data.submission.source import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.filter.model.SubmissionsFilterQuery import org.stepik.android.model.Submission diff --git a/app/src/main/java/org/stepik/android/data/user_courses/repository/UserCoursesRepositoryImpl.kt b/app/src/main/java/org/stepik/android/data/user_courses/repository/UserCoursesRepositoryImpl.kt index f440907b00..65d501ab46 100644 --- a/app/src/main/java/org/stepik/android/data/user_courses/repository/UserCoursesRepositoryImpl.kt +++ b/app/src/main/java/org/stepik/android/data/user_courses/repository/UserCoursesRepositoryImpl.kt @@ -4,7 +4,7 @@ import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Observable import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import ru.nobird.android.domain.rx.doCompletableOnSuccess import org.stepik.android.data.user_courses.source.UserCoursesCacheDataSource import org.stepik.android.data.user_courses.source.UserCoursesRemoteDataSource diff --git a/app/src/main/java/org/stepik/android/data/user_courses/source/UserCoursesRemoteDataSource.kt b/app/src/main/java/org/stepik/android/data/user_courses/source/UserCoursesRemoteDataSource.kt index 332097056e..2bb79541ad 100644 --- a/app/src/main/java/org/stepik/android/data/user_courses/source/UserCoursesRemoteDataSource.kt +++ b/app/src/main/java/org/stepik/android/data/user_courses/source/UserCoursesRemoteDataSource.kt @@ -1,7 +1,7 @@ package org.stepik.android.data.user_courses.source import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.course_list.model.UserCourseQuery import org.stepik.android.domain.user_courses.model.UserCourse diff --git a/app/src/main/java/org/stepik/android/domain/achievement/model/AchievementItem.kt b/app/src/main/java/org/stepik/android/domain/achievement/model/AchievementItem.kt index 416170957a..adf28f6b79 100644 --- a/app/src/main/java/org/stepik/android/domain/achievement/model/AchievementItem.kt +++ b/app/src/main/java/org/stepik/android/domain/achievement/model/AchievementItem.kt @@ -5,7 +5,7 @@ import kotlinx.android.parcel.IgnoredOnParcel import kotlinx.android.parcel.Parcelize import org.stepik.android.model.achievements.Achievement import org.stepik.android.model.achievements.AchievementProgress -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable @Parcelize data class AchievementItem( diff --git a/app/src/main/java/org/stepik/android/domain/announcement/model/Announcement.kt b/app/src/main/java/org/stepik/android/domain/announcement/model/Announcement.kt index 88fd8ab52b..970246b802 100644 --- a/app/src/main/java/org/stepik/android/domain/announcement/model/Announcement.kt +++ b/app/src/main/java/org/stepik/android/domain/announcement/model/Announcement.kt @@ -3,7 +3,7 @@ package org.stepik.android.domain.announcement.model import androidx.room.Entity import androidx.room.PrimaryKey import com.google.gson.annotations.SerializedName -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable import java.util.Date @Entity diff --git a/app/src/main/java/org/stepik/android/domain/certificate/interactor/CertificatesInteractor.kt b/app/src/main/java/org/stepik/android/domain/certificate/interactor/CertificatesInteractor.kt index 6a2fb2f61a..adaa6e6ea6 100644 --- a/app/src/main/java/org/stepik/android/domain/certificate/interactor/CertificatesInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/certificate/interactor/CertificatesInteractor.kt @@ -2,7 +2,7 @@ package org.stepik.android.domain.certificate.interactor import io.reactivex.Single import org.stepic.droid.model.CertificateListItem -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.certificate.repository.CertificateRepository import org.stepik.android.domain.course.repository.CourseRepository diff --git a/app/src/main/java/org/stepik/android/domain/certificate/repository/CertificateRepository.kt b/app/src/main/java/org/stepik/android/domain/certificate/repository/CertificateRepository.kt index 826f5e2df2..1d575b6504 100644 --- a/app/src/main/java/org/stepik/android/domain/certificate/repository/CertificateRepository.kt +++ b/app/src/main/java/org/stepik/android/domain/certificate/repository/CertificateRepository.kt @@ -2,7 +2,7 @@ package org.stepik.android.domain.certificate.repository import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.base.DataSourceType import org.stepik.android.model.Certificate diff --git a/app/src/main/java/org/stepik/android/domain/comment/interactor/CommentInteractor.kt b/app/src/main/java/org/stepik/android/domain/comment/interactor/CommentInteractor.kt index b3788d8b2b..2289c0d9b0 100644 --- a/app/src/main/java/org/stepik/android/domain/comment/interactor/CommentInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/comment/interactor/CommentInteractor.kt @@ -1,7 +1,7 @@ package org.stepik.android.domain.comment.interactor import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.comment.mapper.CommentsDataMapper import org.stepik.android.domain.comment.model.CommentsData import org.stepik.android.domain.comment.repository.CommentRepository @@ -12,7 +12,7 @@ import org.stepik.android.model.comments.Comment import org.stepik.android.model.comments.DiscussionProxy import org.stepik.android.model.comments.Vote import org.stepik.android.presentation.comment.model.CommentItem -import ru.nobird.android.core.model.PaginationDirection +import ru.nobird.app.core.model.PaginationDirection import javax.inject.Inject import kotlin.math.max import kotlin.math.min diff --git a/app/src/main/java/org/stepik/android/domain/course/interactor/CourseStatsInteractor.kt b/app/src/main/java/org/stepik/android/domain/course/interactor/CourseStatsInteractor.kt index 1e8c472508..f38e57cf57 100644 --- a/app/src/main/java/org/stepik/android/domain/course/interactor/CourseStatsInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/course/interactor/CourseStatsInteractor.kt @@ -30,7 +30,7 @@ import org.stepik.android.model.Course import org.stepik.android.model.CourseReviewSummary import org.stepik.android.model.Progress import org.stepik.android.remote.mobile_tiers.model.MobileTierCalculation -import ru.nobird.android.core.model.mapToLongArray +import ru.nobird.app.core.model.mapToLongArray import javax.inject.Inject class CourseStatsInteractor diff --git a/app/src/main/java/org/stepik/android/domain/course/mapper/CourseStateMapper.kt b/app/src/main/java/org/stepik/android/domain/course/mapper/CourseStateMapper.kt index bc8dbf0db7..a8eb2ce160 100644 --- a/app/src/main/java/org/stepik/android/domain/course/mapper/CourseStateMapper.kt +++ b/app/src/main/java/org/stepik/android/domain/course/mapper/CourseStateMapper.kt @@ -2,7 +2,7 @@ package org.stepik.android.domain.course.mapper import org.stepik.android.domain.course.model.EnrollmentState import org.stepik.android.presentation.course.CourseView -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.safeCast import javax.inject.Inject class CourseStateMapper diff --git a/app/src/main/java/org/stepik/android/domain/course/repository/CourseRepository.kt b/app/src/main/java/org/stepik/android/domain/course/repository/CourseRepository.kt index a90c23179c..d08ccb54cc 100644 --- a/app/src/main/java/org/stepik/android/domain/course/repository/CourseRepository.kt +++ b/app/src/main/java/org/stepik/android/domain/course/repository/CourseRepository.kt @@ -3,7 +3,7 @@ package org.stepik.android.domain.course.repository import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.course_list.model.CourseListQuery import org.stepik.android.model.Course diff --git a/app/src/main/java/org/stepik/android/domain/course_calendar/interactor/CourseCalendarInteractor.kt b/app/src/main/java/org/stepik/android/domain/course_calendar/interactor/CourseCalendarInteractor.kt index 37f7f36a2f..860d16855a 100644 --- a/app/src/main/java/org/stepik/android/domain/course_calendar/interactor/CourseCalendarInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/course_calendar/interactor/CourseCalendarInteractor.kt @@ -6,7 +6,7 @@ import io.reactivex.Single import io.reactivex.rxkotlin.toObservable import org.stepic.droid.R import ru.nobird.android.domain.rx.doCompletableOnSuccess -import ru.nobird.android.core.model.mapToLongArray +import ru.nobird.app.core.model.mapToLongArray import org.stepik.android.domain.calendar.model.CalendarEventData import org.stepik.android.domain.calendar.model.CalendarItem import org.stepik.android.domain.calendar.repository.CalendarRepository diff --git a/app/src/main/java/org/stepik/android/domain/course_collection/interactor/CourseCollectionInteractor.kt b/app/src/main/java/org/stepik/android/domain/course_collection/interactor/CourseCollectionInteractor.kt index 7444f4b46f..4030e3e807 100644 --- a/app/src/main/java/org/stepik/android/domain/course_collection/interactor/CourseCollectionInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/course_collection/interactor/CourseCollectionInteractor.kt @@ -3,7 +3,7 @@ package org.stepik.android.domain.course_collection.interactor import io.reactivex.Flowable import io.reactivex.Single import io.reactivex.rxkotlin.Singles.zip -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.catalog.model.CatalogAuthor import org.stepik.android.domain.catalog.model.CatalogCourseList diff --git a/app/src/main/java/org/stepik/android/domain/course_collection/model/CourseCollectionQuery.kt b/app/src/main/java/org/stepik/android/domain/course_collection/model/CourseCollectionQuery.kt index c184e1fe27..a4863b9ef4 100644 --- a/app/src/main/java/org/stepik/android/domain/course_collection/model/CourseCollectionQuery.kt +++ b/app/src/main/java/org/stepik/android/domain/course_collection/model/CourseCollectionQuery.kt @@ -2,7 +2,7 @@ package org.stepik.android.domain.course_collection.model import com.google.gson.annotations.SerializedName import org.stepik.android.model.PlatformType -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull data class CourseCollectionQuery( @SerializedName("language") diff --git a/app/src/main/java/org/stepik/android/domain/course_collection/model/CourseCollectionResult.kt b/app/src/main/java/org/stepik/android/domain/course_collection/model/CourseCollectionResult.kt index 7cf623e799..b333771929 100644 --- a/app/src/main/java/org/stepik/android/domain/course_collection/model/CourseCollectionResult.kt +++ b/app/src/main/java/org/stepik/android/domain/course_collection/model/CourseCollectionResult.kt @@ -1,6 +1,6 @@ package org.stepik.android.domain.course_collection.model -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.course_list.model.CourseListItem import org.stepik.android.model.CourseCollection diff --git a/app/src/main/java/org/stepik/android/domain/course_content/interactor/CourseContentInteractor.kt b/app/src/main/java/org/stepik/android/domain/course_content/interactor/CourseContentInteractor.kt index 90b60080b9..06c3b2a6d6 100644 --- a/app/src/main/java/org/stepik/android/domain/course_content/interactor/CourseContentInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/course_content/interactor/CourseContentInteractor.kt @@ -10,7 +10,7 @@ import io.reactivex.schedulers.Schedulers import io.reactivex.subjects.PublishSubject import org.stepic.droid.analytic.AmplitudeAnalytic import org.stepic.droid.analytic.Analytic -import ru.nobird.android.core.model.mapToLongArray +import ru.nobird.app.core.model.mapToLongArray import org.stepic.droid.util.plus import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.exam.interactor.ExamSessionDataInteractor diff --git a/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListInteractor.kt b/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListInteractor.kt index b052c46207..f8b0bfa936 100644 --- a/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListInteractor.kt @@ -6,7 +6,7 @@ import io.reactivex.Observable import io.reactivex.Single import org.stepic.droid.adaptive.util.AdaptiveCoursesResolver import org.stepic.droid.configuration.RemoteConfig -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.course.analytic.CourseViewSource import org.stepik.android.domain.course.interactor.CourseStatsInteractor import org.stepik.android.domain.course.model.CourseStats diff --git a/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListSearchInteractor.kt b/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListSearchInteractor.kt index 82254d28bd..44c78ff516 100644 --- a/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListSearchInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListSearchInteractor.kt @@ -3,7 +3,7 @@ package org.stepik.android.domain.course_list.interactor import io.reactivex.Completable import io.reactivex.Observable import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepic.droid.util.then import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.course.analytic.CourseViewSource diff --git a/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListUserInteractor.kt b/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListUserInteractor.kt index d465dff402..d77a4d96d2 100644 --- a/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListUserInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListUserInteractor.kt @@ -4,7 +4,7 @@ import io.reactivex.Completable import io.reactivex.Single import okhttp3.ResponseBody import org.stepic.droid.preferences.SharedPreferenceHelper -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepic.droid.util.then import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.course.analytic.CourseViewSource diff --git a/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListVisitedInteractor.kt b/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListVisitedInteractor.kt index a9c3807586..bd2570ca0b 100644 --- a/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListVisitedInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListVisitedInteractor.kt @@ -2,7 +2,7 @@ package org.stepik.android.domain.course_list.interactor import io.reactivex.Flowable import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.course.analytic.CourseViewSource import org.stepik.android.domain.course.model.SourceTypeComposition import org.stepik.android.domain.course_list.model.CourseListItem diff --git a/app/src/main/java/org/stepik/android/domain/course_list/model/CourseListItem.kt b/app/src/main/java/org/stepik/android/domain/course_list/model/CourseListItem.kt index 4ee95417e1..0118e78cb8 100644 --- a/app/src/main/java/org/stepik/android/domain/course_list/model/CourseListItem.kt +++ b/app/src/main/java/org/stepik/android/domain/course_list/model/CourseListItem.kt @@ -5,7 +5,7 @@ import org.stepik.android.domain.catalog.model.CatalogCourseList import org.stepik.android.domain.course.analytic.CourseViewSource import org.stepik.android.domain.course.model.CourseStats import org.stepik.android.model.Course -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable sealed class CourseListItem { data class Data( diff --git a/app/src/main/java/org/stepik/android/domain/course_list/model/CourseListQuery.kt b/app/src/main/java/org/stepik/android/domain/course_list/model/CourseListQuery.kt index 07097d35fe..30d401016f 100644 --- a/app/src/main/java/org/stepik/android/domain/course_list/model/CourseListQuery.kt +++ b/app/src/main/java/org/stepik/android/domain/course_list/model/CourseListQuery.kt @@ -4,7 +4,7 @@ import android.os.Parcelable import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize import org.stepik.android.domain.filter.model.CourseListFilterQuery -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull import java.io.Serializable @Parcelize diff --git a/app/src/main/java/org/stepik/android/domain/course_purchase/analytic/BuyCourseIAPFlowStartAnalyticEvent.kt b/app/src/main/java/org/stepik/android/domain/course_purchase/analytic/BuyCourseIAPFlowStartAnalyticEvent.kt index 8fd1b4ac1f..3fef451a9d 100644 --- a/app/src/main/java/org/stepik/android/domain/course_purchase/analytic/BuyCourseIAPFlowStartAnalyticEvent.kt +++ b/app/src/main/java/org/stepik/android/domain/course_purchase/analytic/BuyCourseIAPFlowStartAnalyticEvent.kt @@ -1,7 +1,7 @@ package org.stepik.android.domain.course_purchase.analytic import org.stepik.android.domain.base.analytic.AnalyticEvent -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull class BuyCourseIAPFlowStartAnalyticEvent( courseId: Long, diff --git a/app/src/main/java/org/stepik/android/domain/course_purchase/analytic/BuyCourseIAPFlowSuccessAnalyticEvent.kt b/app/src/main/java/org/stepik/android/domain/course_purchase/analytic/BuyCourseIAPFlowSuccessAnalyticEvent.kt index ff6b286a25..a1b31a45c0 100644 --- a/app/src/main/java/org/stepik/android/domain/course_purchase/analytic/BuyCourseIAPFlowSuccessAnalyticEvent.kt +++ b/app/src/main/java/org/stepik/android/domain/course_purchase/analytic/BuyCourseIAPFlowSuccessAnalyticEvent.kt @@ -1,7 +1,7 @@ package org.stepik.android.domain.course_purchase.analytic import org.stepik.android.domain.base.analytic.AnalyticEvent -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull class BuyCourseIAPFlowSuccessAnalyticEvent( courseId: Long, diff --git a/app/src/main/java/org/stepik/android/domain/course_purchase/analytic/BuyCourseVerificationSuccessAnalyticEvent.kt b/app/src/main/java/org/stepik/android/domain/course_purchase/analytic/BuyCourseVerificationSuccessAnalyticEvent.kt index 8c56f729be..9de19bda31 100644 --- a/app/src/main/java/org/stepik/android/domain/course_purchase/analytic/BuyCourseVerificationSuccessAnalyticEvent.kt +++ b/app/src/main/java/org/stepik/android/domain/course_purchase/analytic/BuyCourseVerificationSuccessAnalyticEvent.kt @@ -1,7 +1,7 @@ package org.stepik.android.domain.course_purchase.analytic import org.stepik.android.domain.base.analytic.AnalyticEvent -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull class BuyCourseVerificationSuccessAnalyticEvent( courseId: Long, diff --git a/app/src/main/java/org/stepik/android/domain/course_revenue/interactor/CourseBenefitsInteractor.kt b/app/src/main/java/org/stepik/android/domain/course_revenue/interactor/CourseBenefitsInteractor.kt index ecdbdc45ad..eb59ad6f6a 100644 --- a/app/src/main/java/org/stepik/android/domain/course_revenue/interactor/CourseBenefitsInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/course_revenue/interactor/CourseBenefitsInteractor.kt @@ -14,8 +14,8 @@ import org.stepik.android.domain.course_revenue.repository.CourseBenefitsReposit import org.stepik.android.domain.profile.repository.ProfileRepository import org.stepik.android.domain.user.repository.UserRepository import org.stepik.android.model.user.User -import ru.nobird.android.core.model.PagedList -import ru.nobird.android.core.model.transform +import ru.nobird.app.core.model.PagedList +import ru.nobird.app.core.model.transform import ru.nobird.android.domain.rx.maybeFirst import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/domain/course_revenue/repository/CourseBenefitByMonthsRepository.kt b/app/src/main/java/org/stepik/android/domain/course_revenue/repository/CourseBenefitByMonthsRepository.kt index f0037f3171..0d326d1a5b 100644 --- a/app/src/main/java/org/stepik/android/domain/course_revenue/repository/CourseBenefitByMonthsRepository.kt +++ b/app/src/main/java/org/stepik/android/domain/course_revenue/repository/CourseBenefitByMonthsRepository.kt @@ -2,7 +2,7 @@ package org.stepik.android.domain.course_revenue.repository import io.reactivex.Single import org.stepik.android.domain.course_revenue.model.CourseBenefitByMonth -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList interface CourseBenefitByMonthsRepository { fun getCourseBenefitByMonths(courseId: Long, page: Int = 1): Single> diff --git a/app/src/main/java/org/stepik/android/domain/course_revenue/repository/CourseBenefitsRepository.kt b/app/src/main/java/org/stepik/android/domain/course_revenue/repository/CourseBenefitsRepository.kt index 72d848fd85..939b487a23 100644 --- a/app/src/main/java/org/stepik/android/domain/course_revenue/repository/CourseBenefitsRepository.kt +++ b/app/src/main/java/org/stepik/android/domain/course_revenue/repository/CourseBenefitsRepository.kt @@ -2,7 +2,7 @@ package org.stepik.android.domain.course_revenue.repository import io.reactivex.Single import org.stepik.android.domain.course_revenue.model.CourseBenefit -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList interface CourseBenefitsRepository { fun getCourseBenefits(courseId: Long, page: Int = 1): Single> diff --git a/app/src/main/java/org/stepik/android/domain/course_reviews/interactor/CourseReviewsInteractor.kt b/app/src/main/java/org/stepik/android/domain/course_reviews/interactor/CourseReviewsInteractor.kt index 1237e30e51..d3a6a4a4f3 100644 --- a/app/src/main/java/org/stepik/android/domain/course_reviews/interactor/CourseReviewsInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/course_reviews/interactor/CourseReviewsInteractor.kt @@ -5,7 +5,7 @@ import io.reactivex.Single import io.reactivex.rxkotlin.Maybes import io.reactivex.rxkotlin.Singles.zip import io.reactivex.rxkotlin.zipWith -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import ru.nobird.android.domain.rx.maybeFirst import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.course.repository.CourseReviewSummaryRepository diff --git a/app/src/main/java/org/stepik/android/domain/course_reviews/model/CourseReviewItem.kt b/app/src/main/java/org/stepik/android/domain/course_reviews/model/CourseReviewItem.kt index 6504bd3d3c..e649607b87 100644 --- a/app/src/main/java/org/stepik/android/domain/course_reviews/model/CourseReviewItem.kt +++ b/app/src/main/java/org/stepik/android/domain/course_reviews/model/CourseReviewItem.kt @@ -2,7 +2,7 @@ package org.stepik.android.domain.course_reviews.model import org.stepik.android.model.CourseReviewSummary import org.stepik.android.model.user.User -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable sealed class CourseReviewItem { data class Placeholder( diff --git a/app/src/main/java/org/stepik/android/domain/course_reviews/repository/CourseReviewsRepository.kt b/app/src/main/java/org/stepik/android/domain/course_reviews/repository/CourseReviewsRepository.kt index 9f2918b3c3..6b52393af8 100644 --- a/app/src/main/java/org/stepik/android/domain/course_reviews/repository/CourseReviewsRepository.kt +++ b/app/src/main/java/org/stepik/android/domain/course_reviews/repository/CourseReviewsRepository.kt @@ -3,7 +3,7 @@ package org.stepik.android.domain.course_reviews.repository import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.course_reviews.model.CourseReview diff --git a/app/src/main/java/org/stepik/android/domain/course_search/analytic/CourseContentSearchResultClicked.kt b/app/src/main/java/org/stepik/android/domain/course_search/analytic/CourseContentSearchResultClicked.kt index 9c1b084ed1..ced67d56ae 100644 --- a/app/src/main/java/org/stepik/android/domain/course_search/analytic/CourseContentSearchResultClicked.kt +++ b/app/src/main/java/org/stepik/android/domain/course_search/analytic/CourseContentSearchResultClicked.kt @@ -1,7 +1,7 @@ package org.stepik.android.domain.course_search.analytic import org.stepik.android.domain.base.analytic.AnalyticEvent -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull class CourseContentSearchResultClicked( val courseId: Long, diff --git a/app/src/main/java/org/stepik/android/domain/course_search/analytic/CourseContentSearchedAnalyticEvent.kt b/app/src/main/java/org/stepik/android/domain/course_search/analytic/CourseContentSearchedAnalyticEvent.kt index d6d6e5c436..f9508e2c47 100644 --- a/app/src/main/java/org/stepik/android/domain/course_search/analytic/CourseContentSearchedAnalyticEvent.kt +++ b/app/src/main/java/org/stepik/android/domain/course_search/analytic/CourseContentSearchedAnalyticEvent.kt @@ -1,7 +1,7 @@ package org.stepik.android.domain.course_search.analytic import org.stepik.android.domain.base.analytic.AnalyticEvent -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull class CourseContentSearchedAnalyticEvent( val courseId: Long, diff --git a/app/src/main/java/org/stepik/android/domain/course_search/interactor/CourseSearchInteractor.kt b/app/src/main/java/org/stepik/android/domain/course_search/interactor/CourseSearchInteractor.kt index d05cb87f7d..a5fb8abd18 100644 --- a/app/src/main/java/org/stepik/android/domain/course_search/interactor/CourseSearchInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/course_search/interactor/CourseSearchInteractor.kt @@ -26,8 +26,8 @@ import org.stepik.android.model.Section import org.stepik.android.model.SearchResult import org.stepik.android.model.comments.DiscussionThread import org.stepik.android.model.user.User -import ru.nobird.android.core.model.PagedList -import ru.nobird.android.core.model.mapPaged +import ru.nobird.app.core.model.PagedList +import ru.nobird.app.core.model.mapPaged import javax.inject.Inject class CourseSearchInteractor diff --git a/app/src/main/java/org/stepik/android/domain/course_search/model/CourseSearchResult.kt b/app/src/main/java/org/stepik/android/domain/course_search/model/CourseSearchResult.kt index f42cc62a57..b9cb89fdf0 100644 --- a/app/src/main/java/org/stepik/android/domain/course_search/model/CourseSearchResult.kt +++ b/app/src/main/java/org/stepik/android/domain/course_search/model/CourseSearchResult.kt @@ -6,7 +6,7 @@ import org.stepik.android.model.SearchResult import org.stepik.android.model.Section import org.stepik.android.model.user.User import org.stepik.android.model.Unit -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable data class CourseSearchResult( val searchResult: SearchResult, diff --git a/app/src/main/java/org/stepik/android/domain/course_search/model/CourseSearchResultListItem.kt b/app/src/main/java/org/stepik/android/domain/course_search/model/CourseSearchResultListItem.kt index 54461c3f36..7ee71a28b7 100644 --- a/app/src/main/java/org/stepik/android/domain/course_search/model/CourseSearchResultListItem.kt +++ b/app/src/main/java/org/stepik/android/domain/course_search/model/CourseSearchResultListItem.kt @@ -1,6 +1,6 @@ package org.stepik.android.domain.course_search.model -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable sealed class CourseSearchResultListItem { data class Data(val courseSearchResult: CourseSearchResult) : CourseSearchResultListItem(), Identifiable { diff --git a/app/src/main/java/org/stepik/android/domain/exam_session/model/ExamSession.kt b/app/src/main/java/org/stepik/android/domain/exam_session/model/ExamSession.kt index 3b92541a68..c0521d4826 100644 --- a/app/src/main/java/org/stepik/android/domain/exam_session/model/ExamSession.kt +++ b/app/src/main/java/org/stepik/android/domain/exam_session/model/ExamSession.kt @@ -3,7 +3,7 @@ package org.stepik.android.domain.exam_session.model import androidx.room.Entity import androidx.room.PrimaryKey import com.google.gson.annotations.SerializedName -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable import java.util.Date @Entity diff --git a/app/src/main/java/org/stepik/android/domain/filter/model/CourseListFilterQuery.kt b/app/src/main/java/org/stepik/android/domain/filter/model/CourseListFilterQuery.kt index 27de641dad..e8d9590d98 100644 --- a/app/src/main/java/org/stepik/android/domain/filter/model/CourseListFilterQuery.kt +++ b/app/src/main/java/org/stepik/android/domain/filter/model/CourseListFilterQuery.kt @@ -3,7 +3,7 @@ package org.stepik.android.domain.filter.model import android.os.Parcelable import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull import java.io.Serializable @Parcelize diff --git a/app/src/main/java/org/stepik/android/domain/filter/model/SubmissionsFilterQuery.kt b/app/src/main/java/org/stepik/android/domain/filter/model/SubmissionsFilterQuery.kt index f4ad67038d..8a6a98db69 100644 --- a/app/src/main/java/org/stepik/android/domain/filter/model/SubmissionsFilterQuery.kt +++ b/app/src/main/java/org/stepik/android/domain/filter/model/SubmissionsFilterQuery.kt @@ -3,7 +3,7 @@ package org.stepik.android.domain.filter.model import android.os.Parcelable import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull @Parcelize data class SubmissionsFilterQuery( diff --git a/app/src/main/java/org/stepik/android/domain/notification/interactor/CourseNotificationInteractor.kt b/app/src/main/java/org/stepik/android/domain/notification/interactor/CourseNotificationInteractor.kt index ae97f25008..7e2035980f 100644 --- a/app/src/main/java/org/stepik/android/domain/notification/interactor/CourseNotificationInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/notification/interactor/CourseNotificationInteractor.kt @@ -1,7 +1,7 @@ package org.stepik.android.domain.notification.interactor import io.reactivex.Completable -import ru.nobird.android.core.model.mapToLongArray +import ru.nobird.app.core.model.mapToLongArray import org.stepik.android.domain.notification.repository.NotificationRepository import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/domain/notification/repository/NotificationRepository.kt b/app/src/main/java/org/stepik/android/domain/notification/repository/NotificationRepository.kt index b53c36ddf2..104749e46c 100644 --- a/app/src/main/java/org/stepik/android/domain/notification/repository/NotificationRepository.kt +++ b/app/src/main/java/org/stepik/android/domain/notification/repository/NotificationRepository.kt @@ -5,7 +5,7 @@ import io.reactivex.Single import org.stepic.droid.model.NotificationCategory import org.stepic.droid.notifications.model.Notification import org.stepic.droid.notifications.model.NotificationStatuses -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList interface NotificationRepository { fun putNotifications(vararg notificationIds: Long, isRead: Boolean): Completable diff --git a/app/src/main/java/org/stepik/android/domain/personal_deadlines/repository/DeadlinesRepository.kt b/app/src/main/java/org/stepik/android/domain/personal_deadlines/repository/DeadlinesRepository.kt index 91bfbffeb5..1ef092fda5 100644 --- a/app/src/main/java/org/stepik/android/domain/personal_deadlines/repository/DeadlinesRepository.kt +++ b/app/src/main/java/org/stepik/android/domain/personal_deadlines/repository/DeadlinesRepository.kt @@ -3,7 +3,7 @@ package org.stepik.android.domain.personal_deadlines.repository import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepic.droid.web.storage.model.StorageRecord import org.stepik.android.domain.personal_deadlines.model.DeadlinesWrapper diff --git a/app/src/main/java/org/stepik/android/domain/personal_deadlines/resolver/DeadlinesResolverImpl.kt b/app/src/main/java/org/stepik/android/domain/personal_deadlines/resolver/DeadlinesResolverImpl.kt index 416a89b1d9..33a912354a 100644 --- a/app/src/main/java/org/stepik/android/domain/personal_deadlines/resolver/DeadlinesResolverImpl.kt +++ b/app/src/main/java/org/stepik/android/domain/personal_deadlines/resolver/DeadlinesResolverImpl.kt @@ -2,7 +2,7 @@ package org.stepik.android.domain.personal_deadlines.resolver import io.reactivex.Single import org.stepic.droid.util.AppConstants -import ru.nobird.android.core.model.mapToLongArray +import ru.nobird.app.core.model.mapToLongArray import org.stepik.android.domain.course.repository.CourseRepository import org.stepik.android.domain.lesson.repository.LessonRepository import org.stepik.android.domain.personal_deadlines.model.Deadline diff --git a/app/src/main/java/org/stepik/android/domain/proctor_session/model/ProctorSession.kt b/app/src/main/java/org/stepik/android/domain/proctor_session/model/ProctorSession.kt index 1e9600a7d5..27284c40f7 100644 --- a/app/src/main/java/org/stepik/android/domain/proctor_session/model/ProctorSession.kt +++ b/app/src/main/java/org/stepik/android/domain/proctor_session/model/ProctorSession.kt @@ -3,7 +3,7 @@ package org.stepik.android.domain.proctor_session.model import androidx.room.Entity import androidx.room.PrimaryKey import com.google.gson.annotations.SerializedName -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable import java.util.Date @Entity diff --git a/app/src/main/java/org/stepik/android/domain/progress/interactor/LocalProgressInteractor.kt b/app/src/main/java/org/stepik/android/domain/progress/interactor/LocalProgressInteractor.kt index ea9c9b2ee4..b1d9d4f317 100644 --- a/app/src/main/java/org/stepik/android/domain/progress/interactor/LocalProgressInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/progress/interactor/LocalProgressInteractor.kt @@ -5,7 +5,7 @@ import io.reactivex.Single import io.reactivex.rxkotlin.Singles.zip import io.reactivex.rxkotlin.toObservable import io.reactivex.subjects.PublishSubject -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.assignment.repository.AssignmentRepository import org.stepik.android.domain.course.repository.CourseRepository import org.stepik.android.domain.progress.mapper.getProgresses diff --git a/app/src/main/java/org/stepik/android/domain/review_instruction/model/ReviewInstruction.kt b/app/src/main/java/org/stepik/android/domain/review_instruction/model/ReviewInstruction.kt index 264e81d919..4df651fb0f 100644 --- a/app/src/main/java/org/stepik/android/domain/review_instruction/model/ReviewInstruction.kt +++ b/app/src/main/java/org/stepik/android/domain/review_instruction/model/ReviewInstruction.kt @@ -6,7 +6,7 @@ import androidx.room.PrimaryKey import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize import org.stepik.android.model.ReviewStrategyType -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable @Entity @Parcelize diff --git a/app/src/main/java/org/stepik/android/domain/review_instruction/model/ReviewInstructionData.kt b/app/src/main/java/org/stepik/android/domain/review_instruction/model/ReviewInstructionData.kt index 40bc25411f..787f792734 100644 --- a/app/src/main/java/org/stepik/android/domain/review_instruction/model/ReviewInstructionData.kt +++ b/app/src/main/java/org/stepik/android/domain/review_instruction/model/ReviewInstructionData.kt @@ -3,7 +3,7 @@ package org.stepik.android.domain.review_instruction.model import android.os.Parcelable import kotlinx.android.parcel.Parcelize import org.stepik.android.domain.rubric.model.Rubric -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable @Parcelize data class ReviewInstructionData( diff --git a/app/src/main/java/org/stepik/android/domain/review_session/model/ReviewSession.kt b/app/src/main/java/org/stepik/android/domain/review_session/model/ReviewSession.kt index 051279d602..9e9a2dde8f 100644 --- a/app/src/main/java/org/stepik/android/domain/review_session/model/ReviewSession.kt +++ b/app/src/main/java/org/stepik/android/domain/review_session/model/ReviewSession.kt @@ -4,7 +4,7 @@ import androidx.room.Embedded import androidx.room.Entity import androidx.room.PrimaryKey import com.google.gson.annotations.SerializedName -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable import java.util.Date @Entity diff --git a/app/src/main/java/org/stepik/android/domain/review_session/model/ReviewSessionData.kt b/app/src/main/java/org/stepik/android/domain/review_session/model/ReviewSessionData.kt index 2fee36efbf..95fefcce11 100644 --- a/app/src/main/java/org/stepik/android/domain/review_session/model/ReviewSessionData.kt +++ b/app/src/main/java/org/stepik/android/domain/review_session/model/ReviewSessionData.kt @@ -2,7 +2,7 @@ package org.stepik.android.domain.review_session.model import org.stepik.android.model.Submission import org.stepik.android.model.attempts.Attempt -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable data class ReviewSessionData( val session: ReviewSession, diff --git a/app/src/main/java/org/stepik/android/domain/search_result/model/SearchResultQuery.kt b/app/src/main/java/org/stepik/android/domain/search_result/model/SearchResultQuery.kt index d7183d9977..c587296f2b 100644 --- a/app/src/main/java/org/stepik/android/domain/search_result/model/SearchResultQuery.kt +++ b/app/src/main/java/org/stepik/android/domain/search_result/model/SearchResultQuery.kt @@ -1,7 +1,7 @@ package org.stepik.android.domain.search_result.model import org.stepik.android.domain.filter.model.CourseListFilterQuery -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull import java.io.Serializable data class SearchResultQuery( diff --git a/app/src/main/java/org/stepik/android/domain/search_result/repository/SearchResultRepository.kt b/app/src/main/java/org/stepik/android/domain/search_result/repository/SearchResultRepository.kt index e4573cd8ae..1aff57f628 100644 --- a/app/src/main/java/org/stepik/android/domain/search_result/repository/SearchResultRepository.kt +++ b/app/src/main/java/org/stepik/android/domain/search_result/repository/SearchResultRepository.kt @@ -1,7 +1,7 @@ package org.stepik.android.domain.search_result.repository import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.search_result.model.SearchResultQuery import org.stepik.android.model.SearchResult diff --git a/app/src/main/java/org/stepik/android/domain/solutions/interactor/SolutionsInteractor.kt b/app/src/main/java/org/stepik/android/domain/solutions/interactor/SolutionsInteractor.kt index cf2d265f38..a75b1f765c 100644 --- a/app/src/main/java/org/stepik/android/domain/solutions/interactor/SolutionsInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/solutions/interactor/SolutionsInteractor.kt @@ -4,7 +4,7 @@ import io.reactivex.Completable import io.reactivex.Observable import io.reactivex.Single import io.reactivex.rxkotlin.toObservable -import ru.nobird.android.core.model.mapToLongArray +import ru.nobird.app.core.model.mapToLongArray import ru.nobird.android.domain.rx.maybeFirst import org.stepik.android.domain.attempt.repository.AttemptRepository import org.stepik.android.domain.base.DataSourceType diff --git a/app/src/main/java/org/stepik/android/domain/submission/interactor/SubmissionInteractor.kt b/app/src/main/java/org/stepik/android/domain/submission/interactor/SubmissionInteractor.kt index 3461b42478..dd0338ca8f 100644 --- a/app/src/main/java/org/stepik/android/domain/submission/interactor/SubmissionInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/submission/interactor/SubmissionInteractor.kt @@ -4,8 +4,8 @@ import io.reactivex.Single import io.reactivex.rxkotlin.Singles.zip import io.reactivex.rxkotlin.toObservable import org.stepic.droid.preferences.UserPreferences -import ru.nobird.android.core.model.PagedList -import ru.nobird.android.core.model.mapToLongArray +import ru.nobird.app.core.model.PagedList +import ru.nobird.app.core.model.mapToLongArray import org.stepik.android.domain.attempt.repository.AttemptRepository import org.stepik.android.domain.filter.model.SubmissionsFilterQuery import org.stepik.android.domain.review_instruction.model.ReviewInstruction @@ -17,7 +17,7 @@ import org.stepik.android.model.attempts.Attempt import org.stepik.android.domain.submission.model.SubmissionItem import org.stepik.android.domain.user.repository.UserRepository import org.stepik.android.model.user.User -import ru.nobird.android.core.model.transform +import ru.nobird.app.core.model.transform import javax.inject.Inject class SubmissionInteractor diff --git a/app/src/main/java/org/stepik/android/domain/submission/model/SubmissionItem.kt b/app/src/main/java/org/stepik/android/domain/submission/model/SubmissionItem.kt index 6882deb427..5345f44de0 100644 --- a/app/src/main/java/org/stepik/android/domain/submission/model/SubmissionItem.kt +++ b/app/src/main/java/org/stepik/android/domain/submission/model/SubmissionItem.kt @@ -4,7 +4,7 @@ import org.stepik.android.domain.review_session.model.ReviewSessionData import org.stepik.android.model.Submission import org.stepik.android.model.attempts.Attempt import org.stepik.android.model.user.User -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable sealed class SubmissionItem { data class Data( diff --git a/app/src/main/java/org/stepik/android/domain/submission/repository/SubmissionRepository.kt b/app/src/main/java/org/stepik/android/domain/submission/repository/SubmissionRepository.kt index f5adc83588..46f8ae14a2 100644 --- a/app/src/main/java/org/stepik/android/domain/submission/repository/SubmissionRepository.kt +++ b/app/src/main/java/org/stepik/android/domain/submission/repository/SubmissionRepository.kt @@ -2,7 +2,7 @@ package org.stepik.android.domain.submission.repository import io.reactivex.Completable import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.filter.model.SubmissionsFilterQuery import org.stepik.android.model.Submission diff --git a/app/src/main/java/org/stepik/android/domain/user_courses/repository/UserCoursesRepository.kt b/app/src/main/java/org/stepik/android/domain/user_courses/repository/UserCoursesRepository.kt index 74944af3eb..902434f4c0 100644 --- a/app/src/main/java/org/stepik/android/domain/user_courses/repository/UserCoursesRepository.kt +++ b/app/src/main/java/org/stepik/android/domain/user_courses/repository/UserCoursesRepository.kt @@ -3,7 +3,7 @@ package org.stepik.android.domain.user_courses.repository import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.course_list.model.UserCourseQuery import org.stepik.android.domain.user_courses.model.UserCourse diff --git a/app/src/main/java/org/stepik/android/domain/user_reviews/model/UserCourseReviewItem.kt b/app/src/main/java/org/stepik/android/domain/user_reviews/model/UserCourseReviewItem.kt index 704c4eead0..aaca6150fe 100644 --- a/app/src/main/java/org/stepik/android/domain/user_reviews/model/UserCourseReviewItem.kt +++ b/app/src/main/java/org/stepik/android/domain/user_reviews/model/UserCourseReviewItem.kt @@ -2,7 +2,7 @@ package org.stepik.android.domain.user_reviews.model import org.stepik.android.domain.course_reviews.model.CourseReview import org.stepik.android.model.Course -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable sealed class UserCourseReviewItem { data class PotentialReviewHeader(val potentialReviewCount: Int) : UserCourseReviewItem() diff --git a/app/src/main/java/org/stepik/android/domain/wishlist/interactor/CourseListWishInteractor.kt b/app/src/main/java/org/stepik/android/domain/wishlist/interactor/CourseListWishInteractor.kt index 754b69cf5b..140a17456d 100644 --- a/app/src/main/java/org/stepik/android/domain/wishlist/interactor/CourseListWishInteractor.kt +++ b/app/src/main/java/org/stepik/android/domain/wishlist/interactor/CourseListWishInteractor.kt @@ -8,7 +8,7 @@ import org.stepik.android.domain.course_list.interactor.CourseListInteractor import org.stepik.android.domain.course_list.model.CourseListItem import org.stepik.android.domain.wishlist.model.WishlistEntry import org.stepik.android.domain.wishlist.repository.WishlistRepository -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import javax.inject.Inject class CourseListWishInteractor diff --git a/app/src/main/java/org/stepik/android/presentation/base/injection/DaggerViewModelFactory.kt b/app/src/main/java/org/stepik/android/presentation/base/injection/DaggerViewModelFactory.kt index dbe1cd8d01..d18034b7d2 100644 --- a/app/src/main/java/org/stepik/android/presentation/base/injection/DaggerViewModelFactory.kt +++ b/app/src/main/java/org/stepik/android/presentation/base/injection/DaggerViewModelFactory.kt @@ -11,6 +11,6 @@ constructor( private val viewModelMap: Map, @JvmSuppressWildcards Provider> ) : ViewModelProvider.Factory { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T = + override fun create(modelClass: Class): T = viewModelMap[modelClass]?.get() as T } \ No newline at end of file diff --git a/app/src/main/java/org/stepik/android/presentation/catalog/CatalogViewModel.kt b/app/src/main/java/org/stepik/android/presentation/catalog/CatalogViewModel.kt index 7fef1e20e9..aee9f517d5 100644 --- a/app/src/main/java/org/stepik/android/presentation/catalog/CatalogViewModel.kt +++ b/app/src/main/java/org/stepik/android/presentation/catalog/CatalogViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.catalog -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class CatalogViewModel( diff --git a/app/src/main/java/org/stepik/android/presentation/catalog/reducer/CatalogReducer.kt b/app/src/main/java/org/stepik/android/presentation/catalog/reducer/CatalogReducer.kt index 8f0281c878..9dd4c858da 100644 --- a/app/src/main/java/org/stepik/android/presentation/catalog/reducer/CatalogReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/catalog/reducer/CatalogReducer.kt @@ -21,8 +21,8 @@ import org.stepik.android.presentation.stories.StoriesFeature import org.stepik.android.presentation.stories.reducer.StoriesReducer import org.stepik.android.presentation.user_courses.UserCoursesFeature import org.stepik.android.presentation.wishlist.WishlistFeature -import ru.nobird.android.core.model.safeCast -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.core.model.safeCast +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class CatalogReducer diff --git a/app/src/main/java/org/stepik/android/presentation/certificate/CertificatesPresenter.kt b/app/src/main/java/org/stepik/android/presentation/certificate/CertificatesPresenter.kt index 815ffcdcb4..fd44619668 100644 --- a/app/src/main/java/org/stepik/android/presentation/certificate/CertificatesPresenter.kt +++ b/app/src/main/java/org/stepik/android/presentation/certificate/CertificatesPresenter.kt @@ -9,13 +9,13 @@ import io.reactivex.rxkotlin.subscribeBy import org.stepic.droid.di.qualifiers.BackgroundScheduler import org.stepic.droid.di.qualifiers.MainScheduler import org.stepic.droid.model.CertificateListItem -import ru.nobird.android.core.model.PagedList -import ru.nobird.android.core.model.concatWithPagedList +import ru.nobird.app.core.model.PagedList +import ru.nobird.app.core.model.concatWithPagedList import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.certificate.interactor.CertificatesInteractor import org.stepik.android.model.Certificate import org.stepik.android.presentation.base.PresenterBase -import ru.nobird.android.core.model.transform +import ru.nobird.app.core.model.transform import javax.inject.Inject class CertificatesPresenter diff --git a/app/src/main/java/org/stepik/android/presentation/certificate/CertificatesView.kt b/app/src/main/java/org/stepik/android/presentation/certificate/CertificatesView.kt index f6e812cc18..b3aa2ad898 100644 --- a/app/src/main/java/org/stepik/android/presentation/certificate/CertificatesView.kt +++ b/app/src/main/java/org/stepik/android/presentation/certificate/CertificatesView.kt @@ -2,7 +2,7 @@ package org.stepik.android.presentation.certificate import org.stepic.droid.model.CertificateListItem import org.stepik.android.model.Certificate -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList interface CertificatesView { sealed class State { diff --git a/app/src/main/java/org/stepik/android/presentation/comment/CommentsPresenter.kt b/app/src/main/java/org/stepik/android/presentation/comment/CommentsPresenter.kt index a4f70ed3fd..b340851db3 100644 --- a/app/src/main/java/org/stepik/android/presentation/comment/CommentsPresenter.kt +++ b/app/src/main/java/org/stepik/android/presentation/comment/CommentsPresenter.kt @@ -24,7 +24,7 @@ import org.stepik.android.presentation.base.PresenterBase import org.stepik.android.presentation.comment.mapper.CommentsStateMapper import org.stepik.android.presentation.comment.model.CommentItem import org.stepik.android.view.injection.step.StepDiscussionBus -import ru.nobird.android.core.model.PaginationDirection +import ru.nobird.app.core.model.PaginationDirection import javax.inject.Inject class CommentsPresenter diff --git a/app/src/main/java/org/stepik/android/presentation/comment/CommentsView.kt b/app/src/main/java/org/stepik/android/presentation/comment/CommentsView.kt index 88b8b1147b..10ce3b891f 100644 --- a/app/src/main/java/org/stepik/android/presentation/comment/CommentsView.kt +++ b/app/src/main/java/org/stepik/android/presentation/comment/CommentsView.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.comment -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.discussion_proxy.model.DiscussionOrder import org.stepik.android.model.Step import org.stepik.android.model.Submission diff --git a/app/src/main/java/org/stepik/android/presentation/comment/mapper/CommentsStateMapper.kt b/app/src/main/java/org/stepik/android/presentation/comment/mapper/CommentsStateMapper.kt index 471536e569..f39037726f 100644 --- a/app/src/main/java/org/stepik/android/presentation/comment/mapper/CommentsStateMapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/comment/mapper/CommentsStateMapper.kt @@ -1,13 +1,13 @@ package org.stepik.android.presentation.comment.mapper -import ru.nobird.android.core.model.PagedList -import ru.nobird.android.core.model.PaginationDirection -import ru.nobird.android.core.model.mutate -import ru.nobird.android.core.model.mapPaged -import ru.nobird.android.core.model.transform -import ru.nobird.android.core.model.insert -import ru.nobird.android.core.model.plus -import ru.nobird.android.core.model.filterNot +import ru.nobird.app.core.model.PagedList +import ru.nobird.app.core.model.PaginationDirection +import ru.nobird.app.core.model.mutate +import ru.nobird.app.core.model.mapPaged +import ru.nobird.app.core.model.transform +import ru.nobird.app.core.model.insert +import ru.nobird.app.core.model.plus +import ru.nobird.app.core.model.filterNot import org.stepik.android.model.comments.Vote import org.stepik.android.presentation.comment.CommentsView import org.stepik.android.presentation.comment.model.CommentItem diff --git a/app/src/main/java/org/stepik/android/presentation/comment/model/CommentItem.kt b/app/src/main/java/org/stepik/android/presentation/comment/model/CommentItem.kt index 4d0c8f324c..52ee0c352d 100644 --- a/app/src/main/java/org/stepik/android/presentation/comment/model/CommentItem.kt +++ b/app/src/main/java/org/stepik/android/presentation/comment/model/CommentItem.kt @@ -6,7 +6,7 @@ import org.stepik.android.model.attempts.Attempt import org.stepik.android.model.comments.Comment import org.stepik.android.model.comments.Vote import org.stepik.android.model.user.User -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable sealed class CommentItem { data class Data( diff --git a/app/src/main/java/org/stepik/android/presentation/course/CoursePresenter.kt b/app/src/main/java/org/stepik/android/presentation/course/CoursePresenter.kt index 5e93129fa0..9087710c4d 100644 --- a/app/src/main/java/org/stepik/android/presentation/course/CoursePresenter.kt +++ b/app/src/main/java/org/stepik/android/presentation/course/CoursePresenter.kt @@ -48,7 +48,7 @@ import org.stepik.android.view.injection.course_list.UserCoursesOperationBus import org.stepik.android.view.injection.course_list.WishlistOperationBus import org.stepik.android.view.injection.solutions.SolutionsBus import org.stepik.android.view.injection.solutions.SolutionsSentBus -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.safeCast import ru.nobird.android.presentation.base.PresenterBase import ru.nobird.android.presentation.base.PresenterViewContainer import ru.nobird.android.presentation.base.delegate.PresenterDelegate diff --git a/app/src/main/java/org/stepik/android/presentation/course_complete/CourseCompleteViewModel.kt b/app/src/main/java/org/stepik/android/presentation/course_complete/CourseCompleteViewModel.kt index 4a4a9cff72..51fbea0a82 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_complete/CourseCompleteViewModel.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_complete/CourseCompleteViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.course_complete -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class CourseCompleteViewModel( diff --git a/app/src/main/java/org/stepik/android/presentation/course_complete/reducer/CourseCompleteReducer.kt b/app/src/main/java/org/stepik/android/presentation/course_complete/reducer/CourseCompleteReducer.kt index fc2c548324..4b70fcb609 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_complete/reducer/CourseCompleteReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_complete/reducer/CourseCompleteReducer.kt @@ -3,7 +3,7 @@ package org.stepik.android.presentation.course_complete.reducer import org.stepik.android.presentation.course_complete.CourseCompleteFeature.State import org.stepik.android.presentation.course_complete.CourseCompleteFeature.Message import org.stepik.android.presentation.course_complete.CourseCompleteFeature.Action -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class CourseCompleteReducer diff --git a/app/src/main/java/org/stepik/android/presentation/course_content/mapper/CourseContentStateMapper.kt b/app/src/main/java/org/stepik/android/presentation/course_content/mapper/CourseContentStateMapper.kt index 368b7e439c..4025dd198a 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_content/mapper/CourseContentStateMapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_content/mapper/CourseContentStateMapper.kt @@ -9,7 +9,7 @@ import org.stepik.android.presentation.course_content.CourseContentView import org.stepik.android.presentation.personal_deadlines.model.PersonalDeadlinesState import org.stepik.android.view.course_content.model.CourseContentItem import org.stepik.android.view.course_content.model.CourseContentSectionDate -import ru.nobird.android.core.model.isNullOrEmpty +import ru.nobird.app.core.model.isNullOrEmpty import javax.inject.Inject class CourseContentStateMapper diff --git a/app/src/main/java/org/stepik/android/presentation/course_continue_redux/reducer/CourseContinueReducer.kt b/app/src/main/java/org/stepik/android/presentation/course_continue_redux/reducer/CourseContinueReducer.kt index c9a0d95bd4..9e745d6d72 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_continue_redux/reducer/CourseContinueReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_continue_redux/reducer/CourseContinueReducer.kt @@ -3,7 +3,7 @@ package org.stepik.android.presentation.course_continue_redux.reducer import org.stepik.android.presentation.course_continue_redux.CourseContinueFeature.State import org.stepik.android.presentation.course_continue_redux.CourseContinueFeature.Message import org.stepik.android.presentation.course_continue_redux.CourseContinueFeature.Action -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class CourseContinueReducer diff --git a/app/src/main/java/org/stepik/android/presentation/course_list/CourseListCollectionPresenter.kt b/app/src/main/java/org/stepik/android/presentation/course_list/CourseListCollectionPresenter.kt index b2a3cc2621..526ff258fe 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list/CourseListCollectionPresenter.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list/CourseListCollectionPresenter.kt @@ -23,9 +23,9 @@ import org.stepik.android.presentation.course_list.mapper.CourseListStateMapper import org.stepik.android.view.injection.course.EnrollmentCourseUpdates import org.stepik.android.view.injection.course_list.UserCoursesOperationBus import org.stepik.android.view.injection.course_list.WishlistOperationBus -import ru.nobird.android.core.model.cast -import ru.nobird.android.core.model.safeCast -import ru.nobird.android.core.model.slice +import ru.nobird.app.core.model.cast +import ru.nobird.app.core.model.safeCast +import ru.nobird.app.core.model.slice import ru.nobird.android.domain.rx.emptyOnErrorStub import ru.nobird.android.presentation.base.PresenterBase import ru.nobird.android.presentation.base.PresenterViewContainer diff --git a/app/src/main/java/org/stepik/android/presentation/course_list/CourseListQueryPresenter.kt b/app/src/main/java/org/stepik/android/presentation/course_list/CourseListQueryPresenter.kt index 3a99d5ba9f..9bd82e71fb 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list/CourseListQueryPresenter.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list/CourseListQueryPresenter.kt @@ -25,8 +25,8 @@ import org.stepik.android.presentation.filter.FilterQueryView import org.stepik.android.view.injection.course.EnrollmentCourseUpdates import org.stepik.android.view.injection.course_list.UserCoursesOperationBus import org.stepik.android.view.injection.course_list.WishlistOperationBus -import ru.nobird.android.core.model.cast -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.cast +import ru.nobird.app.core.model.safeCast import ru.nobird.android.domain.rx.emptyOnErrorStub import ru.nobird.android.presentation.base.PresenterBase import ru.nobird.android.presentation.base.PresenterViewContainer diff --git a/app/src/main/java/org/stepik/android/presentation/course_list/CourseListSearchPresenter.kt b/app/src/main/java/org/stepik/android/presentation/course_list/CourseListSearchPresenter.kt index 3d1df05105..85b8676eb8 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list/CourseListSearchPresenter.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list/CourseListSearchPresenter.kt @@ -26,8 +26,8 @@ import org.stepik.android.presentation.filter.FilterQueryView import org.stepik.android.view.injection.course.EnrollmentCourseUpdates import org.stepik.android.view.injection.course_list.UserCoursesOperationBus import org.stepik.android.view.injection.course_list.WishlistOperationBus -import ru.nobird.android.core.model.cast -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.cast +import ru.nobird.app.core.model.safeCast import ru.nobird.android.presentation.base.PresenterBase import ru.nobird.android.presentation.base.PresenterViewContainer import ru.nobird.android.presentation.base.delegate.PresenterDelegate diff --git a/app/src/main/java/org/stepik/android/presentation/course_list/CourseListUserPresenter.kt b/app/src/main/java/org/stepik/android/presentation/course_list/CourseListUserPresenter.kt index 59f47ee17b..8e93353c86 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list/CourseListUserPresenter.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list/CourseListUserPresenter.kt @@ -31,7 +31,7 @@ import org.stepik.android.view.injection.course_list.UserCoursesOperationBus import org.stepik.android.view.injection.course_list.UserCoursesUpdateBus import org.stepik.android.view.injection.course_list.WishlistOperationBus import retrofit2.HttpException -import ru.nobird.android.core.model.slice +import ru.nobird.app.core.model.slice import ru.nobird.android.presentation.base.PresenterBase import ru.nobird.android.presentation.base.PresenterViewContainer import ru.nobird.android.presentation.base.delegate.PresenterDelegate diff --git a/app/src/main/java/org/stepik/android/presentation/course_list/CourseListView.kt b/app/src/main/java/org/stepik/android/presentation/course_list/CourseListView.kt index 64792d582a..db855c9d18 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list/CourseListView.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list/CourseListView.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.course_list -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.course_list.model.CourseListItem import org.stepik.android.presentation.course_continue.CourseContinueView diff --git a/app/src/main/java/org/stepik/android/presentation/course_list/CourseListWishPresenter.kt b/app/src/main/java/org/stepik/android/presentation/course_list/CourseListWishPresenter.kt index b2a680aeca..f3f733e206 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list/CourseListWishPresenter.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list/CourseListWishPresenter.kt @@ -24,9 +24,9 @@ import org.stepik.android.presentation.course_list.mapper.CourseListWishStateMap import org.stepik.android.view.injection.course.EnrollmentCourseUpdates import org.stepik.android.view.injection.course_list.UserCoursesOperationBus import org.stepik.android.view.injection.course_list.WishlistOperationBus -import ru.nobird.android.core.model.cast -import ru.nobird.android.core.model.safeCast -import ru.nobird.android.core.model.slice +import ru.nobird.app.core.model.cast +import ru.nobird.app.core.model.safeCast +import ru.nobird.app.core.model.slice import ru.nobird.android.domain.rx.emptyOnErrorStub import ru.nobird.android.presentation.base.PresenterBase import ru.nobird.android.presentation.base.PresenterViewContainer diff --git a/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListCollectionStateMapper.kt b/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListCollectionStateMapper.kt index fa7aaf3afc..48387340e3 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListCollectionStateMapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListCollectionStateMapper.kt @@ -5,7 +5,7 @@ import org.stepik.android.domain.course_collection.model.CourseCollectionResult import org.stepik.android.domain.course_list.model.CourseListItem import org.stepik.android.presentation.course_list.CourseListCollectionView import org.stepik.android.presentation.course_list.CourseListView -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.safeCast import javax.inject.Inject class CourseListCollectionStateMapper diff --git a/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListQueryStateMapper.kt b/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListQueryStateMapper.kt index 4c55524c0a..0000c3d3c7 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListQueryStateMapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListQueryStateMapper.kt @@ -1,13 +1,13 @@ package org.stepik.android.presentation.course_list.mapper -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.course.model.SourceTypeComposition import org.stepik.android.domain.course_list.model.CourseListItem import org.stepik.android.domain.course_list.model.CourseListQuery import org.stepik.android.presentation.course_list.CourseListQueryView import org.stepik.android.presentation.course_list.CourseListView -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.safeCast import javax.inject.Inject class CourseListQueryStateMapper diff --git a/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListStateMapper.kt b/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListStateMapper.kt index 405b74171a..c1a9872743 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListStateMapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListStateMapper.kt @@ -1,8 +1,8 @@ package org.stepik.android.presentation.course_list.mapper -import ru.nobird.android.core.model.PagedList -import ru.nobird.android.core.model.mapPaged -import ru.nobird.android.core.model.plus +import ru.nobird.app.core.model.PagedList +import ru.nobird.app.core.model.mapPaged +import ru.nobird.app.core.model.plus import org.stepik.android.domain.course.mapper.CourseStatsMapper import org.stepik.android.domain.course_list.model.CourseListItem import org.stepik.android.domain.user_courses.model.UserCourse diff --git a/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListUserStateMapper.kt b/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListUserStateMapper.kt index ad78eabbcf..7dc25f21df 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListUserStateMapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListUserStateMapper.kt @@ -1,13 +1,13 @@ package org.stepik.android.presentation.course_list.mapper import org.stepic.droid.util.DateTimeHelper -import ru.nobird.android.core.model.PagedList -import ru.nobird.android.core.model.mutate -import ru.nobird.android.core.model.insert -import ru.nobird.android.core.model.slice -import ru.nobird.android.core.model.filterNot -import ru.nobird.android.core.model.plus -import ru.nobird.android.core.model.transform +import ru.nobird.app.core.model.PagedList +import ru.nobird.app.core.model.mutate +import ru.nobird.app.core.model.insert +import ru.nobird.app.core.model.slice +import ru.nobird.app.core.model.filterNot +import ru.nobird.app.core.model.plus +import ru.nobird.app.core.model.transform import org.stepik.android.domain.course_list.model.CourseListItem import org.stepik.android.domain.course_list.model.UserCourseQuery import org.stepik.android.domain.course_list.model.UserCoursesLoaded diff --git a/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListWishStateMapper.kt b/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListWishStateMapper.kt index 4c0103a8b7..85a0de4a84 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListWishStateMapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list/mapper/CourseListWishStateMapper.kt @@ -4,7 +4,7 @@ import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.course_list.model.CourseListItem import org.stepik.android.presentation.course_list.CourseListView import org.stepik.android.presentation.course_list.CourseListWishView -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.safeCast import javax.inject.Inject class CourseListWishStateMapper diff --git a/app/src/main/java/org/stepik/android/presentation/course_list_redux/CourseListFeature.kt b/app/src/main/java/org/stepik/android/presentation/course_list_redux/CourseListFeature.kt index 3ade9f452a..b340ab2f6c 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list_redux/CourseListFeature.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list_redux/CourseListFeature.kt @@ -1,10 +1,10 @@ package org.stepik.android.presentation.course_list_redux -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.catalog.model.CatalogCourseList import org.stepik.android.domain.course.analytic.CourseViewSource import org.stepik.android.domain.course_list.model.CourseListItem -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable interface CourseListFeature { sealed class State { diff --git a/app/src/main/java/org/stepik/android/presentation/course_list_redux/mapper/CourseListStateMapper.kt b/app/src/main/java/org/stepik/android/presentation/course_list_redux/mapper/CourseListStateMapper.kt index c44a3198dc..ac3aa1e39c 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list_redux/mapper/CourseListStateMapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list_redux/mapper/CourseListStateMapper.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.course_list_redux.mapper -import ru.nobird.android.core.model.mapPaged +import ru.nobird.app.core.model.mapPaged import org.stepik.android.domain.course.mapper.CourseStatsMapper import org.stepik.android.domain.course_list.model.CourseListItem import org.stepik.android.domain.user_courses.model.UserCourse diff --git a/app/src/main/java/org/stepik/android/presentation/course_list_redux/model/CatalogBlockStateWrapper.kt b/app/src/main/java/org/stepik/android/presentation/course_list_redux/model/CatalogBlockStateWrapper.kt index 5cf4f1e61a..923be5e6c1 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list_redux/model/CatalogBlockStateWrapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list_redux/model/CatalogBlockStateWrapper.kt @@ -8,7 +8,7 @@ import org.stepik.android.domain.catalog.model.CatalogBlockContent.Companion.REC import org.stepik.android.domain.catalog.model.CatalogBlockContent.Companion.SIMPLE_COURSE_LISTS import org.stepik.android.domain.catalog.model.CatalogBlockContent.Companion.SPECIALIZATIONS import org.stepik.android.presentation.course_list_redux.CourseListFeature -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable sealed class CatalogBlockStateWrapper : Identifiable { data class FullCourseList( diff --git a/app/src/main/java/org/stepik/android/presentation/course_list_redux/reducer/CourseListReducer.kt b/app/src/main/java/org/stepik/android/presentation/course_list_redux/reducer/CourseListReducer.kt index b4b159c414..550ebf31b0 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_list_redux/reducer/CourseListReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_list_redux/reducer/CourseListReducer.kt @@ -5,7 +5,7 @@ import org.stepik.android.presentation.course_list_redux.CourseListFeature.State import org.stepik.android.presentation.course_list_redux.CourseListFeature.Message import org.stepik.android.presentation.course_list_redux.CourseListFeature.Action import org.stepik.android.presentation.course_list_redux.mapper.CourseListStateMapper -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class CourseListReducer diff --git a/app/src/main/java/org/stepik/android/presentation/course_purchase/CoursePurchaseViewModel.kt b/app/src/main/java/org/stepik/android/presentation/course_purchase/CoursePurchaseViewModel.kt index 2802ae32cf..4ddc40077b 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_purchase/CoursePurchaseViewModel.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_purchase/CoursePurchaseViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.course_purchase -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class CoursePurchaseViewModel( diff --git a/app/src/main/java/org/stepik/android/presentation/course_purchase/reducer/CoursePurchaseReducer.kt b/app/src/main/java/org/stepik/android/presentation/course_purchase/reducer/CoursePurchaseReducer.kt index bb58d07203..84b5992699 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_purchase/reducer/CoursePurchaseReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_purchase/reducer/CoursePurchaseReducer.kt @@ -20,7 +20,7 @@ import org.stepik.android.presentation.course_purchase.CoursePurchaseFeature.Act import org.stepik.android.presentation.course_purchase.CoursePurchaseFeature import org.stepik.android.presentation.wishlist.WishlistOperationFeature import org.stepik.android.presentation.wishlist.reducer.WishlistOperationReducer -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class CoursePurchaseReducer diff --git a/app/src/main/java/org/stepik/android/presentation/course_revenue/CourseBenefitsFeature.kt b/app/src/main/java/org/stepik/android/presentation/course_revenue/CourseBenefitsFeature.kt index 9a41d32e7d..644a78c736 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_revenue/CourseBenefitsFeature.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_revenue/CourseBenefitsFeature.kt @@ -2,7 +2,7 @@ package org.stepik.android.presentation.course_revenue import org.stepik.android.domain.course_revenue.model.CourseBeneficiary import org.stepik.android.domain.course_revenue.model.CourseBenefitListItem -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList interface CourseBenefitsFeature { sealed class State { diff --git a/app/src/main/java/org/stepik/android/presentation/course_revenue/CourseBenefitsMonthlyFeature.kt b/app/src/main/java/org/stepik/android/presentation/course_revenue/CourseBenefitsMonthlyFeature.kt index 581db652f9..cb165a6809 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_revenue/CourseBenefitsMonthlyFeature.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_revenue/CourseBenefitsMonthlyFeature.kt @@ -1,7 +1,7 @@ package org.stepik.android.presentation.course_revenue import org.stepik.android.domain.course_revenue.model.CourseBenefitByMonthListItem -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList interface CourseBenefitsMonthlyFeature { sealed class State { diff --git a/app/src/main/java/org/stepik/android/presentation/course_revenue/CourseRevenueViewModel.kt b/app/src/main/java/org/stepik/android/presentation/course_revenue/CourseRevenueViewModel.kt index 8f101fd506..480272a80a 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_revenue/CourseRevenueViewModel.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_revenue/CourseRevenueViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.course_revenue -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class CourseRevenueViewModel( diff --git a/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseBenefitSummaryReducer.kt b/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseBenefitSummaryReducer.kt index e8793f172f..7641453d3d 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseBenefitSummaryReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseBenefitSummaryReducer.kt @@ -4,7 +4,7 @@ import org.stepik.android.domain.course_revenue.model.CourseBenefitSummary import org.stepik.android.presentation.course_revenue.CourseBenefitSummaryFeature.State import org.stepik.android.presentation.course_revenue.CourseBenefitSummaryFeature.Message import org.stepik.android.presentation.course_revenue.CourseBenefitSummaryFeature.Action -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class CourseBenefitSummaryReducer diff --git a/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseBenefitsMonthlyReducer.kt b/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseBenefitsMonthlyReducer.kt index 851112deac..2299e2c860 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseBenefitsMonthlyReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseBenefitsMonthlyReducer.kt @@ -4,8 +4,8 @@ import org.stepik.android.domain.course_revenue.model.CourseBenefitByMonthListIt import org.stepik.android.presentation.course_revenue.CourseBenefitsMonthlyFeature.State import org.stepik.android.presentation.course_revenue.CourseBenefitsMonthlyFeature.Message import org.stepik.android.presentation.course_revenue.CourseBenefitsMonthlyFeature.Action -import ru.nobird.android.core.model.concatWithPagedList -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.core.model.concatWithPagedList +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class CourseBenefitsMonthlyReducer diff --git a/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseBenefitsReducer.kt b/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseBenefitsReducer.kt index 45aacec890..b321d4aac8 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseBenefitsReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseBenefitsReducer.kt @@ -4,8 +4,8 @@ import org.stepik.android.domain.course_revenue.model.CourseBenefitListItem import org.stepik.android.presentation.course_revenue.CourseBenefitsFeature.State import org.stepik.android.presentation.course_revenue.CourseBenefitsFeature.Message import org.stepik.android.presentation.course_revenue.CourseBenefitsFeature.Action -import ru.nobird.android.core.model.concatWithPagedList -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.core.model.concatWithPagedList +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class CourseBenefitsReducer diff --git a/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseRevenueReducer.kt b/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseRevenueReducer.kt index 2fbe0564a1..644af64315 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseRevenueReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_revenue/reducer/CourseRevenueReducer.kt @@ -7,7 +7,7 @@ import org.stepik.android.presentation.course_revenue.CourseRevenueFeature.Messa import org.stepik.android.presentation.course_revenue.CourseRevenueFeature.Action import org.stepik.android.presentation.course_revenue.CourseBenefitsFeature import org.stepik.android.presentation.course_revenue.CourseBenefitsMonthlyFeature -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class CourseRevenueReducer diff --git a/app/src/main/java/org/stepik/android/presentation/course_reviews/CourseReviewsPresenter.kt b/app/src/main/java/org/stepik/android/presentation/course_reviews/CourseReviewsPresenter.kt index df52418a6f..cf06263aae 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_reviews/CourseReviewsPresenter.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_reviews/CourseReviewsPresenter.kt @@ -11,8 +11,8 @@ import org.stepic.droid.analytic.Analytic import org.stepic.droid.di.qualifiers.BackgroundScheduler import org.stepic.droid.di.qualifiers.CourseId import org.stepic.droid.di.qualifiers.MainScheduler -import ru.nobird.android.core.model.PagedList -import ru.nobird.android.core.model.concatWithPagedList +import ru.nobird.app.core.model.PagedList +import ru.nobird.app.core.model.concatWithPagedList import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.course_reviews.analytic.CourseReviewDeletedAnalyticEvent import org.stepik.android.domain.course_reviews.analytic.CourseReviewViewSource diff --git a/app/src/main/java/org/stepik/android/presentation/course_reviews/CourseReviewsView.kt b/app/src/main/java/org/stepik/android/presentation/course_reviews/CourseReviewsView.kt index 7d8d970c67..c7074d2340 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_reviews/CourseReviewsView.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_reviews/CourseReviewsView.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.course_reviews -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.course_reviews.model.CourseReviewItem diff --git a/app/src/main/java/org/stepik/android/presentation/course_reviews/mapper/CourseReviewsStateMapper.kt b/app/src/main/java/org/stepik/android/presentation/course_reviews/mapper/CourseReviewsStateMapper.kt index e282292953..e02a7809fd 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_reviews/mapper/CourseReviewsStateMapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_reviews/mapper/CourseReviewsStateMapper.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.course_reviews.mapper -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.base.DataSourceType import org.stepik.android.domain.course_reviews.model.CourseReviewItem import org.stepik.android.presentation.course_reviews.CourseReviewsView diff --git a/app/src/main/java/org/stepik/android/presentation/course_search/CourseSearchFeature.kt b/app/src/main/java/org/stepik/android/presentation/course_search/CourseSearchFeature.kt index 352891e37e..1b9e5725a8 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_search/CourseSearchFeature.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_search/CourseSearchFeature.kt @@ -2,7 +2,7 @@ package org.stepik.android.presentation.course_search import org.stepik.android.domain.base.analytic.AnalyticEvent import org.stepik.android.domain.course_search.model.CourseSearchResultListItem -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList interface CourseSearchFeature { sealed class State { diff --git a/app/src/main/java/org/stepik/android/presentation/course_search/CourseSearchViewModel.kt b/app/src/main/java/org/stepik/android/presentation/course_search/CourseSearchViewModel.kt index 03672075d5..dab77d0c37 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_search/CourseSearchViewModel.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_search/CourseSearchViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.course_search -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class CourseSearchViewModel( diff --git a/app/src/main/java/org/stepik/android/presentation/course_search/mapper/CourseSearchResultItemsMapper.kt b/app/src/main/java/org/stepik/android/presentation/course_search/mapper/CourseSearchResultItemsMapper.kt index 457610d68f..aae9df8d3f 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_search/mapper/CourseSearchResultItemsMapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_search/mapper/CourseSearchResultItemsMapper.kt @@ -1,8 +1,8 @@ package org.stepik.android.presentation.course_search.mapper import org.stepik.android.domain.course_search.model.CourseSearchResultListItem -import ru.nobird.android.core.model.PagedList -import ru.nobird.android.core.model.transform +import ru.nobird.app.core.model.PagedList +import ru.nobird.app.core.model.transform import javax.inject.Inject class CourseSearchResultItemsMapper diff --git a/app/src/main/java/org/stepik/android/presentation/course_search/reducer/CourseSearchReducer.kt b/app/src/main/java/org/stepik/android/presentation/course_search/reducer/CourseSearchReducer.kt index 4011910340..f836d54178 100644 --- a/app/src/main/java/org/stepik/android/presentation/course_search/reducer/CourseSearchReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/course_search/reducer/CourseSearchReducer.kt @@ -6,9 +6,9 @@ import org.stepik.android.presentation.course_search.CourseSearchFeature.State import org.stepik.android.presentation.course_search.CourseSearchFeature.Message import org.stepik.android.presentation.course_search.CourseSearchFeature.Action import org.stepik.android.presentation.course_search.mapper.CourseSearchResultItemsMapper -import ru.nobird.android.core.model.PagedList -import ru.nobird.android.core.model.concatWithPagedList -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.core.model.PagedList +import ru.nobird.app.core.model.concatWithPagedList +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class CourseSearchReducer diff --git a/app/src/main/java/org/stepik/android/presentation/download/mapper/DownloadItemsStateMapper.kt b/app/src/main/java/org/stepik/android/presentation/download/mapper/DownloadItemsStateMapper.kt index f1d1632b19..9a22176a29 100644 --- a/app/src/main/java/org/stepik/android/presentation/download/mapper/DownloadItemsStateMapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/download/mapper/DownloadItemsStateMapper.kt @@ -2,7 +2,7 @@ package org.stepik.android.presentation.download.mapper import org.stepic.droid.persistence.model.DownloadItem import org.stepic.droid.persistence.model.DownloadProgress -import ru.nobird.android.core.model.mutate +import ru.nobird.app.core.model.mutate import org.stepik.android.presentation.download.DownloadView import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/presentation/filter/reducer/FiltersReducer.kt b/app/src/main/java/org/stepik/android/presentation/filter/reducer/FiltersReducer.kt index e4a8bf5e6b..bdb41f327d 100644 --- a/app/src/main/java/org/stepik/android/presentation/filter/reducer/FiltersReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/filter/reducer/FiltersReducer.kt @@ -3,7 +3,7 @@ package org.stepik.android.presentation.filter.reducer import org.stepik.android.presentation.filter.FiltersFeature.State import org.stepik.android.presentation.filter.FiltersFeature.Message import org.stepik.android.presentation.filter.FiltersFeature.Action -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class FiltersReducer diff --git a/app/src/main/java/org/stepik/android/presentation/lesson_demo/LessonDemoViewModel.kt b/app/src/main/java/org/stepik/android/presentation/lesson_demo/LessonDemoViewModel.kt index 6c04600f61..286dbd1e9c 100644 --- a/app/src/main/java/org/stepik/android/presentation/lesson_demo/LessonDemoViewModel.kt +++ b/app/src/main/java/org/stepik/android/presentation/lesson_demo/LessonDemoViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.lesson_demo -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class LessonDemoViewModel( diff --git a/app/src/main/java/org/stepik/android/presentation/lesson_demo/reducer/LessonDemoReducer.kt b/app/src/main/java/org/stepik/android/presentation/lesson_demo/reducer/LessonDemoReducer.kt index 06c6841b1f..7fa8d67114 100644 --- a/app/src/main/java/org/stepik/android/presentation/lesson_demo/reducer/LessonDemoReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/lesson_demo/reducer/LessonDemoReducer.kt @@ -7,7 +7,7 @@ import org.stepik.android.presentation.lesson_demo.LessonDemoFeature.Message import org.stepik.android.presentation.lesson_demo.LessonDemoFeature.Action import org.stepik.android.presentation.wishlist.WishlistOperationFeature import org.stepik.android.presentation.wishlist.reducer.WishlistOperationReducer -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class LessonDemoReducer diff --git a/app/src/main/java/org/stepik/android/presentation/profile_courses/ProfileCoursesPresenter.kt b/app/src/main/java/org/stepik/android/presentation/profile_courses/ProfileCoursesPresenter.kt index 7fbd99976d..77730a731b 100644 --- a/app/src/main/java/org/stepik/android/presentation/profile_courses/ProfileCoursesPresenter.kt +++ b/app/src/main/java/org/stepik/android/presentation/profile_courses/ProfileCoursesPresenter.kt @@ -8,8 +8,8 @@ import io.reactivex.rxkotlin.subscribeBy import org.stepic.droid.di.qualifiers.BackgroundScheduler import org.stepic.droid.di.qualifiers.MainScheduler import ru.nobird.android.domain.rx.emptyOnErrorStub -import ru.nobird.android.core.model.mapPaged -import ru.nobird.android.core.model.mapToLongArray +import ru.nobird.app.core.model.mapPaged +import ru.nobird.app.core.model.mapToLongArray import org.stepik.android.domain.course.analytic.CourseViewSource import org.stepik.android.domain.course_list.interactor.CourseListInteractor import org.stepik.android.domain.course_list.model.CourseListItem diff --git a/app/src/main/java/org/stepik/android/presentation/profile_courses/ProfileCoursesView.kt b/app/src/main/java/org/stepik/android/presentation/profile_courses/ProfileCoursesView.kt index dbcabaecdd..d6dba83c2d 100644 --- a/app/src/main/java/org/stepik/android/presentation/profile_courses/ProfileCoursesView.kt +++ b/app/src/main/java/org/stepik/android/presentation/profile_courses/ProfileCoursesView.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.profile_courses -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.course_list.model.CourseListItem import org.stepik.android.presentation.course_continue.CourseContinueView diff --git a/app/src/main/java/org/stepik/android/presentation/redux/RefCounterExtension.kt b/app/src/main/java/org/stepik/android/presentation/redux/RefCounterExtension.kt index 19d241eae0..c3ab6614fe 100644 --- a/app/src/main/java/org/stepik/android/presentation/redux/RefCounterExtension.kt +++ b/app/src/main/java/org/stepik/android/presentation/redux/RefCounterExtension.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.redux -import ru.nobird.android.presentation.redux.feature.Feature +import ru.nobird.app.presentation.redux.feature.Feature fun Feature.wrapWithRefCounter(): Feature = object : Feature by this { diff --git a/app/src/main/java/org/stepik/android/presentation/solutions/mapper/SolutionsStateMapper.kt b/app/src/main/java/org/stepik/android/presentation/solutions/mapper/SolutionsStateMapper.kt index ab3af093a0..09b7ea8f37 100644 --- a/app/src/main/java/org/stepik/android/presentation/solutions/mapper/SolutionsStateMapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/solutions/mapper/SolutionsStateMapper.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.solutions.mapper -import ru.nobird.android.core.model.mutate +import ru.nobird.app.core.model.mutate import org.stepik.android.domain.solutions.model.SolutionItem import org.stepik.android.model.Submission import org.stepik.android.presentation.solutions.SolutionsView diff --git a/app/src/main/java/org/stepik/android/presentation/step_quiz/StepQuizViewModel.kt b/app/src/main/java/org/stepik/android/presentation/step_quiz/StepQuizViewModel.kt index 2b2b8e45c3..b3ad1e72bc 100644 --- a/app/src/main/java/org/stepik/android/presentation/step_quiz/StepQuizViewModel.kt +++ b/app/src/main/java/org/stepik/android/presentation/step_quiz/StepQuizViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.step_quiz -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class StepQuizViewModel( diff --git a/app/src/main/java/org/stepik/android/presentation/step_quiz/dispatcher/StepQuizActionDispatcher.kt b/app/src/main/java/org/stepik/android/presentation/step_quiz/dispatcher/StepQuizActionDispatcher.kt index 5f920babba..8cd50ce89e 100644 --- a/app/src/main/java/org/stepik/android/presentation/step_quiz/dispatcher/StepQuizActionDispatcher.kt +++ b/app/src/main/java/org/stepik/android/presentation/step_quiz/dispatcher/StepQuizActionDispatcher.kt @@ -22,7 +22,7 @@ import org.stepik.android.model.Reply import org.stepik.android.model.Submission import org.stepik.android.presentation.step_quiz.StepQuizFeature import org.stepik.android.view.injection.step_quiz.CodePreferenceBus -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull import ru.nobird.android.domain.rx.emptyOnErrorStub import ru.nobird.android.presentation.redux.dispatcher.RxActionDispatcher import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/presentation/step_quiz/reducer/StepQuizReducer.kt b/app/src/main/java/org/stepik/android/presentation/step_quiz/reducer/StepQuizReducer.kt index 8c0741b5e6..a6a1059d2b 100644 --- a/app/src/main/java/org/stepik/android/presentation/step_quiz/reducer/StepQuizReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/step_quiz/reducer/StepQuizReducer.kt @@ -8,7 +8,7 @@ import org.stepik.android.presentation.step_quiz.StepQuizFeature.State import org.stepik.android.presentation.step_quiz.StepQuizFeature.Message import org.stepik.android.presentation.step_quiz.StepQuizFeature.Action import org.stepik.android.view.step_quiz.resolver.StepQuizFormResolver -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import java.util.Calendar import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/presentation/step_quiz_review/StepQuizReviewTeacherViewModel.kt b/app/src/main/java/org/stepik/android/presentation/step_quiz_review/StepQuizReviewTeacherViewModel.kt index 296f8414c9..9999526f81 100644 --- a/app/src/main/java/org/stepik/android/presentation/step_quiz_review/StepQuizReviewTeacherViewModel.kt +++ b/app/src/main/java/org/stepik/android/presentation/step_quiz_review/StepQuizReviewTeacherViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.step_quiz_review -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class StepQuizReviewTeacherViewModel( diff --git a/app/src/main/java/org/stepik/android/presentation/step_quiz_review/StepQuizReviewViewModel.kt b/app/src/main/java/org/stepik/android/presentation/step_quiz_review/StepQuizReviewViewModel.kt index fc046a7210..388950e163 100644 --- a/app/src/main/java/org/stepik/android/presentation/step_quiz_review/StepQuizReviewViewModel.kt +++ b/app/src/main/java/org/stepik/android/presentation/step_quiz_review/StepQuizReviewViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.step_quiz_review -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class StepQuizReviewViewModel( diff --git a/app/src/main/java/org/stepik/android/presentation/step_quiz_review/reducer/StepQuizReviewReducer.kt b/app/src/main/java/org/stepik/android/presentation/step_quiz_review/reducer/StepQuizReviewReducer.kt index 2ee9d46e43..5d2023e3b7 100644 --- a/app/src/main/java/org/stepik/android/presentation/step_quiz_review/reducer/StepQuizReviewReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/step_quiz_review/reducer/StepQuizReviewReducer.kt @@ -9,8 +9,8 @@ import org.stepik.android.presentation.step_quiz.reducer.StepQuizReducer import org.stepik.android.presentation.step_quiz_review.StepQuizReviewFeature.State import org.stepik.android.presentation.step_quiz_review.StepQuizReviewFeature.Action import org.stepik.android.presentation.step_quiz_review.StepQuizReviewFeature.Message -import ru.nobird.android.core.model.safeCast -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.core.model.safeCast +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class StepQuizReviewReducer diff --git a/app/src/main/java/org/stepik/android/presentation/step_quiz_review/reducer/StepQuizReviewTeacherReducer.kt b/app/src/main/java/org/stepik/android/presentation/step_quiz_review/reducer/StepQuizReviewTeacherReducer.kt index 8b7455fdec..e8424f1555 100644 --- a/app/src/main/java/org/stepik/android/presentation/step_quiz_review/reducer/StepQuizReviewTeacherReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/step_quiz_review/reducer/StepQuizReviewTeacherReducer.kt @@ -5,7 +5,7 @@ import org.stepik.android.presentation.step_quiz.reducer.StepQuizReducer import org.stepik.android.presentation.step_quiz_review.StepQuizReviewTeacherFeature.Action import org.stepik.android.presentation.step_quiz_review.StepQuizReviewTeacherFeature.Message import org.stepik.android.presentation.step_quiz_review.StepQuizReviewTeacherFeature.State -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class StepQuizReviewTeacherReducer diff --git a/app/src/main/java/org/stepik/android/presentation/stories/reducer/StoriesReducer.kt b/app/src/main/java/org/stepik/android/presentation/stories/reducer/StoriesReducer.kt index 7707803450..4e42d9a547 100644 --- a/app/src/main/java/org/stepik/android/presentation/stories/reducer/StoriesReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/stories/reducer/StoriesReducer.kt @@ -3,7 +3,7 @@ import org.stepik.android.presentation.stories.StoriesFeature.State import org.stepik.android.presentation.stories.StoriesFeature.Message import org.stepik.android.presentation.stories.StoriesFeature.Action -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class StoriesReducer diff --git a/app/src/main/java/org/stepik/android/presentation/story/StoryReducer.kt b/app/src/main/java/org/stepik/android/presentation/story/StoryReducer.kt index 049a4cc33a..7f676681f4 100644 --- a/app/src/main/java/org/stepik/android/presentation/story/StoryReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/story/StoryReducer.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.story -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import org.stepik.android.presentation.story.StoryFeature.State import org.stepik.android.presentation.story.StoryFeature.Message import org.stepik.android.presentation.story.StoryFeature.Action diff --git a/app/src/main/java/org/stepik/android/presentation/submission/SubmissionsPresenter.kt b/app/src/main/java/org/stepik/android/presentation/submission/SubmissionsPresenter.kt index 9c6a8174d8..d4670b0053 100644 --- a/app/src/main/java/org/stepik/android/presentation/submission/SubmissionsPresenter.kt +++ b/app/src/main/java/org/stepik/android/presentation/submission/SubmissionsPresenter.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.submission -import ru.nobird.android.core.model.plus +import ru.nobird.app.core.model.plus import org.stepik.android.domain.submission.interactor.SubmissionInteractor import io.reactivex.Scheduler import io.reactivex.rxkotlin.plusAssign diff --git a/app/src/main/java/org/stepik/android/presentation/submission/SubmissionsView.kt b/app/src/main/java/org/stepik/android/presentation/submission/SubmissionsView.kt index d06ef95c91..796da778c0 100644 --- a/app/src/main/java/org/stepik/android/presentation/submission/SubmissionsView.kt +++ b/app/src/main/java/org/stepik/android/presentation/submission/SubmissionsView.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.submission -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.domain.filter.model.SubmissionsFilterQuery import org.stepik.android.domain.submission.model.SubmissionItem diff --git a/app/src/main/java/org/stepik/android/presentation/user_reviews/UserReviewsViewModel.kt b/app/src/main/java/org/stepik/android/presentation/user_reviews/UserReviewsViewModel.kt index 852495d2ee..7f2399e7fa 100644 --- a/app/src/main/java/org/stepik/android/presentation/user_reviews/UserReviewsViewModel.kt +++ b/app/src/main/java/org/stepik/android/presentation/user_reviews/UserReviewsViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.user_reviews -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class UserReviewsViewModel( diff --git a/app/src/main/java/org/stepik/android/presentation/user_reviews/mapper/UserReviewsStateMapper.kt b/app/src/main/java/org/stepik/android/presentation/user_reviews/mapper/UserReviewsStateMapper.kt index 22187fa7b4..bf12aafb87 100644 --- a/app/src/main/java/org/stepik/android/presentation/user_reviews/mapper/UserReviewsStateMapper.kt +++ b/app/src/main/java/org/stepik/android/presentation/user_reviews/mapper/UserReviewsStateMapper.kt @@ -3,7 +3,7 @@ package org.stepik.android.presentation.user_reviews.mapper import org.stepik.android.domain.course_reviews.model.CourseReview import org.stepik.android.domain.user_reviews.model.UserCourseReviewItem import org.stepik.android.presentation.user_reviews.UserReviewsFeature -import ru.nobird.android.core.model.mutate +import ru.nobird.app.core.model.mutate import javax.inject.Inject class UserReviewsStateMapper diff --git a/app/src/main/java/org/stepik/android/presentation/user_reviews/reducer/UserReviewsReducer.kt b/app/src/main/java/org/stepik/android/presentation/user_reviews/reducer/UserReviewsReducer.kt index 1c30e8595e..b27c6ebaac 100644 --- a/app/src/main/java/org/stepik/android/presentation/user_reviews/reducer/UserReviewsReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/user_reviews/reducer/UserReviewsReducer.kt @@ -4,7 +4,7 @@ import org.stepik.android.presentation.user_reviews.UserReviewsFeature.State import org.stepik.android.presentation.user_reviews.UserReviewsFeature.Message import org.stepik.android.presentation.user_reviews.UserReviewsFeature.Action import org.stepik.android.presentation.user_reviews.mapper.UserReviewsStateMapper -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class UserReviewsReducer diff --git a/app/src/main/java/org/stepik/android/presentation/wishlist/WishlistViewModel.kt b/app/src/main/java/org/stepik/android/presentation/wishlist/WishlistViewModel.kt index 25f17031c7..af148afb6f 100644 --- a/app/src/main/java/org/stepik/android/presentation/wishlist/WishlistViewModel.kt +++ b/app/src/main/java/org/stepik/android/presentation/wishlist/WishlistViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.wishlist -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class WishlistViewModel( diff --git a/app/src/main/java/org/stepik/android/presentation/wishlist/reducer/WishlistOperationReducer.kt b/app/src/main/java/org/stepik/android/presentation/wishlist/reducer/WishlistOperationReducer.kt index a5694d264b..022c409f8b 100644 --- a/app/src/main/java/org/stepik/android/presentation/wishlist/reducer/WishlistOperationReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/wishlist/reducer/WishlistOperationReducer.kt @@ -6,7 +6,7 @@ import org.stepik.android.presentation.wishlist.WishlistOperationFeature.State import org.stepik.android.presentation.wishlist.WishlistOperationFeature.Message import org.stepik.android.presentation.wishlist.WishlistOperationFeature.Action import org.stepik.android.presentation.wishlist.model.WishlistAction -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class WishlistOperationReducer diff --git a/app/src/main/java/org/stepik/android/presentation/wishlist/reducer/WishlistReducer.kt b/app/src/main/java/org/stepik/android/presentation/wishlist/reducer/WishlistReducer.kt index 79c7a62f59..777a28b751 100644 --- a/app/src/main/java/org/stepik/android/presentation/wishlist/reducer/WishlistReducer.kt +++ b/app/src/main/java/org/stepik/android/presentation/wishlist/reducer/WishlistReducer.kt @@ -4,8 +4,8 @@ import org.stepik.android.presentation.wishlist.WishlistFeature.State import org.stepik.android.presentation.wishlist.WishlistFeature.Message import org.stepik.android.presentation.wishlist.WishlistFeature.Action import org.stepik.android.presentation.wishlist.model.WishlistAction -import ru.nobird.android.core.model.mutate -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.core.model.mutate +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class WishlistReducer diff --git a/app/src/main/java/org/stepik/android/remote/base/ReactiveCollectionsExtensions.kt b/app/src/main/java/org/stepik/android/remote/base/ReactiveCollectionsExtensions.kt index a55a8d32c2..7d4247f246 100644 --- a/app/src/main/java/org/stepik/android/remote/base/ReactiveCollectionsExtensions.kt +++ b/app/src/main/java/org/stepik/android/remote/base/ReactiveCollectionsExtensions.kt @@ -1,8 +1,8 @@ package org.stepik.android.remote.base import io.reactivex.Single -import ru.nobird.android.core.model.PagedList -import ru.nobird.android.core.model.concatWithPagedList +import ru.nobird.app.core.model.PagedList +import ru.nobird.app.core.model.concatWithPagedList import org.stepik.android.remote.base.mapper.toPagedList import org.stepik.android.remote.base.model.MetaResponse diff --git a/app/src/main/java/org/stepik/android/remote/base/mapper/MetaResponsePageMapper.kt b/app/src/main/java/org/stepik/android/remote/base/mapper/MetaResponsePageMapper.kt index 6a492e9d24..c1afa277e5 100644 --- a/app/src/main/java/org/stepik/android/remote/base/mapper/MetaResponsePageMapper.kt +++ b/app/src/main/java/org/stepik/android/remote/base/mapper/MetaResponsePageMapper.kt @@ -1,6 +1,6 @@ package org.stepik.android.remote.base.mapper -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.remote.base.model.MetaResponse inline fun R.toPagedList(selector: (R) -> List): PagedList = diff --git a/app/src/main/java/org/stepik/android/remote/certificate/source/CertificateRemoteDataSourceImpl.kt b/app/src/main/java/org/stepik/android/remote/certificate/source/CertificateRemoteDataSourceImpl.kt index ceea573d84..a78bba7efb 100644 --- a/app/src/main/java/org/stepik/android/remote/certificate/source/CertificateRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/remote/certificate/source/CertificateRemoteDataSourceImpl.kt @@ -2,7 +2,7 @@ package org.stepik.android.remote.certificate.source import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.data.certificate.source.CertificateRemoteDataSource import org.stepik.android.model.Certificate import org.stepik.android.remote.base.mapper.toPagedList diff --git a/app/src/main/java/org/stepik/android/remote/course/source/CourseRemoteDataSourceImpl.kt b/app/src/main/java/org/stepik/android/remote/course/source/CourseRemoteDataSourceImpl.kt index 44190eb70d..bcacbaa071 100644 --- a/app/src/main/java/org/stepik/android/remote/course/source/CourseRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/remote/course/source/CourseRemoteDataSourceImpl.kt @@ -2,7 +2,7 @@ package org.stepik.android.remote.course.source import io.reactivex.Single import io.reactivex.functions.Function -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.data.course.source.CourseRemoteDataSource import org.stepik.android.domain.course_list.model.CourseListQuery import org.stepik.android.model.Course diff --git a/app/src/main/java/org/stepik/android/remote/course_revenue/CourseBenefitByMonthsRemoteDataSourceImpl.kt b/app/src/main/java/org/stepik/android/remote/course_revenue/CourseBenefitByMonthsRemoteDataSourceImpl.kt index 1c10b4beed..42cf10e263 100644 --- a/app/src/main/java/org/stepik/android/remote/course_revenue/CourseBenefitByMonthsRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/remote/course_revenue/CourseBenefitByMonthsRemoteDataSourceImpl.kt @@ -6,7 +6,7 @@ import org.stepik.android.domain.course_revenue.model.CourseBenefitByMonth import org.stepik.android.remote.base.mapper.toPagedList import org.stepik.android.remote.course_revenue.model.CourseBenefitByMonthsResponse import org.stepik.android.remote.course_revenue.service.CourseBenefitByMonthsService -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import javax.inject.Inject class CourseBenefitByMonthsRemoteDataSourceImpl diff --git a/app/src/main/java/org/stepik/android/remote/course_revenue/CourseBenefitsRemoteDataSourceImpl.kt b/app/src/main/java/org/stepik/android/remote/course_revenue/CourseBenefitsRemoteDataSourceImpl.kt index 6da899f05e..813d6c34d5 100644 --- a/app/src/main/java/org/stepik/android/remote/course_revenue/CourseBenefitsRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/remote/course_revenue/CourseBenefitsRemoteDataSourceImpl.kt @@ -6,7 +6,7 @@ import org.stepik.android.domain.course_revenue.model.CourseBenefit import org.stepik.android.remote.base.mapper.toPagedList import org.stepik.android.remote.course_revenue.model.CourseBenefitsResponse import org.stepik.android.remote.course_revenue.service.CourseBenefitsService -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import javax.inject.Inject class CourseBenefitsRemoteDataSourceImpl diff --git a/app/src/main/java/org/stepik/android/remote/course_reviews/CourseReviewsRemoteDataSourceImpl.kt b/app/src/main/java/org/stepik/android/remote/course_reviews/CourseReviewsRemoteDataSourceImpl.kt index d8fe9b196d..5a4b89c9b4 100644 --- a/app/src/main/java/org/stepik/android/remote/course_reviews/CourseReviewsRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/remote/course_reviews/CourseReviewsRemoteDataSourceImpl.kt @@ -3,7 +3,7 @@ package org.stepik.android.remote.course_reviews import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import ru.nobird.android.domain.rx.maybeFirst import org.stepik.android.data.course_reviews.source.CourseReviewsRemoteDataSource import org.stepik.android.domain.course_reviews.model.CourseReview diff --git a/app/src/main/java/org/stepik/android/remote/notification/NotificationRemoteDataSourceImpl.kt b/app/src/main/java/org/stepik/android/remote/notification/NotificationRemoteDataSourceImpl.kt index 13aef77a47..8db95d4392 100644 --- a/app/src/main/java/org/stepik/android/remote/notification/NotificationRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/remote/notification/NotificationRemoteDataSourceImpl.kt @@ -5,7 +5,7 @@ import io.reactivex.Single import org.stepic.droid.model.NotificationCategory import org.stepic.droid.notifications.model.Notification import org.stepic.droid.notifications.model.NotificationStatuses -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.data.notification.source.NotificationRemoteDataSource import org.stepik.android.remote.base.mapper.toPagedList import org.stepik.android.remote.notification.model.NotificationRequest diff --git a/app/src/main/java/org/stepik/android/remote/personal_deadlines/DeadlinesRemoteDataSourceImpl.kt b/app/src/main/java/org/stepik/android/remote/personal_deadlines/DeadlinesRemoteDataSourceImpl.kt index 3699cf7cfb..bcbc9124f4 100644 --- a/app/src/main/java/org/stepik/android/remote/personal_deadlines/DeadlinesRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/remote/personal_deadlines/DeadlinesRemoteDataSourceImpl.kt @@ -4,7 +4,7 @@ import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single import org.stepic.droid.preferences.SharedPreferenceHelper -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import ru.nobird.android.domain.rx.toMaybe import org.stepic.droid.web.storage.model.StorageRecord import org.stepik.android.data.personal_deadlines.getKindOfRecord diff --git a/app/src/main/java/org/stepik/android/remote/search_result/SearchResultRemoteDataSourceImpl.kt b/app/src/main/java/org/stepik/android/remote/search_result/SearchResultRemoteDataSourceImpl.kt index 15b1ad29d0..c817ea453a 100644 --- a/app/src/main/java/org/stepik/android/remote/search_result/SearchResultRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/remote/search_result/SearchResultRemoteDataSourceImpl.kt @@ -1,7 +1,7 @@ package org.stepik.android.remote.search_result import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.data.search_result.source.SearchResultRemoteDataSource import org.stepik.android.domain.search_result.model.SearchResultQuery import org.stepik.android.model.SearchResult diff --git a/app/src/main/java/org/stepik/android/remote/submission/SubmissionRemoteDataSourceImpl.kt b/app/src/main/java/org/stepik/android/remote/submission/SubmissionRemoteDataSourceImpl.kt index 9e3e747b1e..8c6cb27487 100644 --- a/app/src/main/java/org/stepik/android/remote/submission/SubmissionRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/remote/submission/SubmissionRemoteDataSourceImpl.kt @@ -2,7 +2,7 @@ package org.stepik.android.remote.submission import io.reactivex.Single import io.reactivex.functions.Function -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.data.submission.source.SubmissionRemoteDataSource import org.stepik.android.domain.filter.model.SubmissionsFilterQuery import org.stepik.android.model.Submission diff --git a/app/src/main/java/org/stepik/android/remote/user_courses/UserCoursesRemoteDataSourceImpl.kt b/app/src/main/java/org/stepik/android/remote/user_courses/UserCoursesRemoteDataSourceImpl.kt index d8158cbef4..c46143191e 100644 --- a/app/src/main/java/org/stepik/android/remote/user_courses/UserCoursesRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/stepik/android/remote/user_courses/UserCoursesRemoteDataSourceImpl.kt @@ -1,7 +1,7 @@ package org.stepik.android.remote.user_courses import io.reactivex.Single -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import ru.nobird.android.domain.rx.first import org.stepik.android.data.user_courses.source.UserCoursesRemoteDataSource import org.stepik.android.domain.course_list.model.UserCourseQuery diff --git a/app/src/main/java/org/stepik/android/remote/user_courses/mapper/UserCourseQueryMapper.kt b/app/src/main/java/org/stepik/android/remote/user_courses/mapper/UserCourseQueryMapper.kt index 9956172f82..9039cba3a2 100644 --- a/app/src/main/java/org/stepik/android/remote/user_courses/mapper/UserCourseQueryMapper.kt +++ b/app/src/main/java/org/stepik/android/remote/user_courses/mapper/UserCourseQueryMapper.kt @@ -1,7 +1,7 @@ package org.stepik.android.remote.user_courses.mapper import org.stepik.android.domain.course_list.model.UserCourseQuery -import ru.nobird.android.core.model.mapOfNotNull +import ru.nobird.app.core.model.mapOfNotNull import javax.inject.Inject class UserCourseQueryMapper diff --git a/app/src/main/java/org/stepik/android/view/catalog/model/CatalogItem.kt b/app/src/main/java/org/stepik/android/view/catalog/model/CatalogItem.kt index 56ab9f9f6d..c581c8f7bc 100644 --- a/app/src/main/java/org/stepik/android/view/catalog/model/CatalogItem.kt +++ b/app/src/main/java/org/stepik/android/view/catalog/model/CatalogItem.kt @@ -3,7 +3,7 @@ package org.stepik.android.view.catalog.model import org.stepik.android.presentation.course_list_redux.model.CatalogBlockStateWrapper import org.stepik.android.presentation.filter.FiltersFeature import org.stepik.android.presentation.stories.StoriesFeature -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable sealed class CatalogItem { data class Stories(val state: StoriesFeature.State) : CatalogItem(), Identifiable { diff --git a/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/AuthorListAdapterDelegate.kt b/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/AuthorListAdapterDelegate.kt index e00fcffc18..20214cf550 100644 --- a/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/AuthorListAdapterDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/AuthorListAdapterDelegate.kt @@ -14,7 +14,7 @@ import org.stepik.android.view.base.ui.adapter.layoutmanager.TableLayoutManager import org.stepik.android.view.catalog.mapper.AuthorCountMapper import org.stepik.android.view.catalog.model.CatalogItem import org.stepik.android.view.catalog.ui.delegate.CatalogBlockHeaderDelegate -import ru.nobird.android.core.model.cast +import ru.nobird.app.core.model.cast import ru.nobird.android.ui.adapterdelegates.AdapterDelegate import ru.nobird.android.ui.adapterdelegates.DelegateViewHolder import ru.nobird.android.ui.adapters.DefaultDelegateAdapter diff --git a/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/CourseListAdapterDelegate.kt b/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/CourseListAdapterDelegate.kt index 209a447940..92bfca28ca 100644 --- a/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/CourseListAdapterDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/CourseListAdapterDelegate.kt @@ -30,7 +30,7 @@ import org.stepik.android.view.course_list.ui.adapter.delegate.CourseListItemAda import org.stepik.android.view.course_list.ui.adapter.delegate.CourseListPlaceHolderAdapterDelegate import org.stepik.android.view.course_list.ui.adapter.delegate.CourseListViewAllAdapterDelegate import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.safeCast import ru.nobird.android.ui.adapterdelegates.AdapterDelegate import ru.nobird.android.ui.adapterdelegates.DelegateViewHolder import ru.nobird.android.ui.adapters.DefaultDelegateAdapter diff --git a/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/OfflineAdapterDelegate.kt b/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/OfflineAdapterDelegate.kt index 37945ee7ba..7c5b82747f 100644 --- a/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/OfflineAdapterDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/OfflineAdapterDelegate.kt @@ -9,7 +9,7 @@ import kotlinx.android.extensions.LayoutContainer import kotlinx.android.synthetic.main.error_no_connection_with_button_small.* import org.stepic.droid.R import org.stepik.android.view.catalog.model.CatalogItem -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.safeCast import ru.nobird.android.ui.adapterdelegates.AdapterDelegate import ru.nobird.android.ui.adapterdelegates.DelegateViewHolder diff --git a/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/SimpleCourseListsDefaultAdapterDelegate.kt b/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/SimpleCourseListsDefaultAdapterDelegate.kt index e0c4bb4558..cddc907566 100644 --- a/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/SimpleCourseListsDefaultAdapterDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/SimpleCourseListsDefaultAdapterDelegate.kt @@ -15,7 +15,7 @@ import org.stepik.android.view.base.ui.adapter.layoutmanager.TableLayoutManager import org.stepik.android.view.catalog.mapper.CourseCountMapper import org.stepik.android.view.catalog.model.CatalogItem import org.stepik.android.view.catalog.ui.delegate.CatalogBlockHeaderDelegate -import ru.nobird.android.core.model.cast +import ru.nobird.app.core.model.cast import ru.nobird.android.ui.adapterdelegates.AdapterDelegate import ru.nobird.android.ui.adapterdelegates.DelegateViewHolder import ru.nobird.android.ui.adapters.DefaultDelegateAdapter diff --git a/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/SimpleCourseListsGridAdapterDelegate.kt b/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/SimpleCourseListsGridAdapterDelegate.kt index 26ec24dd96..e09588b244 100644 --- a/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/SimpleCourseListsGridAdapterDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/SimpleCourseListsGridAdapterDelegate.kt @@ -16,7 +16,7 @@ import org.stepik.android.presentation.course_list_redux.model.CatalogBlockState import org.stepik.android.view.catalog.mapper.CourseCountMapper import org.stepik.android.view.catalog.model.CatalogItem import org.stepik.android.view.catalog.ui.delegate.CatalogBlockHeaderDelegate -import ru.nobird.android.core.model.cast +import ru.nobird.app.core.model.cast import ru.nobird.android.ui.adapterdelegates.AdapterDelegate import ru.nobird.android.ui.adapterdelegates.DelegateViewHolder import ru.nobird.android.ui.adapters.DefaultDelegateAdapter diff --git a/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/SpecializationListAdapterDelegate.kt b/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/SpecializationListAdapterDelegate.kt index 09d196038c..6a220538ed 100644 --- a/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/SpecializationListAdapterDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/catalog/ui/adapter/delegate/SpecializationListAdapterDelegate.kt @@ -12,7 +12,7 @@ import org.stepik.android.domain.catalog.model.CatalogSpecialization import org.stepik.android.presentation.course_list_redux.model.CatalogBlockStateWrapper import org.stepik.android.view.base.ui.adapter.layoutmanager.TableLayoutManager import org.stepik.android.view.catalog.model.CatalogItem -import ru.nobird.android.core.model.cast +import ru.nobird.app.core.model.cast import ru.nobird.android.ui.adapterdelegates.AdapterDelegate import ru.nobird.android.ui.adapterdelegates.DelegateViewHolder import ru.nobird.android.ui.adapters.DefaultDelegateAdapter diff --git a/app/src/main/java/org/stepik/android/view/catalog/ui/fragment/CatalogFragment.kt b/app/src/main/java/org/stepik/android/view/catalog/ui/fragment/CatalogFragment.kt index 8408197fd2..603d31a519 100644 --- a/app/src/main/java/org/stepik/android/view/catalog/ui/fragment/CatalogFragment.kt +++ b/app/src/main/java/org/stepik/android/view/catalog/ui/fragment/CatalogFragment.kt @@ -61,7 +61,7 @@ import org.stepik.android.view.course_list.ui.activity.CourseListSearchActivity import org.stepik.android.view.filter.ui.dialog.FilterBottomSheetDialogFragment import org.stepik.android.view.injection.course_list.factory.CourseListAdapterDelegateFactory import org.stepik.android.view.injection.course_list.factory.RecommendedCourseListAdapterDelegateFactory -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.stories.model.Story import ru.nobird.android.stories.transition.SharedTransitionIntentBuilder import ru.nobird.android.stories.transition.SharedTransitionsManager diff --git a/app/src/main/java/org/stepik/android/view/certificate/ui/activity/CertificatesActivity.kt b/app/src/main/java/org/stepik/android/view/certificate/ui/activity/CertificatesActivity.kt index 6dc00534b2..64d997ad99 100644 --- a/app/src/main/java/org/stepik/android/view/certificate/ui/activity/CertificatesActivity.kt +++ b/app/src/main/java/org/stepik/android/view/certificate/ui/activity/CertificatesActivity.kt @@ -28,7 +28,7 @@ import org.stepik.android.view.certificate.ui.adapter.delegate.CertificatesAdapt import org.stepik.android.view.certificate.ui.dialog.CertificateNameChangeConfirmationDialog import org.stepik.android.view.certificate.ui.dialog.CertificateNameChangeDialog import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.core.model.PaginationDirection +import ru.nobird.app.core.model.PaginationDirection import ru.nobird.android.ui.adapters.DefaultDelegateAdapter import ru.nobird.android.view.base.ui.extension.setOnPaginationListener import ru.nobird.android.view.base.ui.extension.showIfNotExists diff --git a/app/src/main/java/org/stepik/android/view/course/ui/delegates/CourseHeaderDelegate.kt b/app/src/main/java/org/stepik/android/view/course/ui/delegates/CourseHeaderDelegate.kt index ff4c267941..010e7e7dd2 100644 --- a/app/src/main/java/org/stepik/android/view/course/ui/delegates/CourseHeaderDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/course/ui/delegates/CourseHeaderDelegate.kt @@ -51,7 +51,7 @@ import org.stepik.android.view.base.ui.extension.ColorExtensions import org.stepik.android.view.course.mapper.DisplayPriceMapper import org.stepik.android.view.course.resolver.CoursePromoCodeResolver import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.safeCast import ru.nobird.android.view.base.ui.extension.getAllQueryParameters import ru.nobird.android.view.base.ui.extension.getDrawableCompat import java.util.TimeZone diff --git a/app/src/main/java/org/stepik/android/view/course_complete/ui/dialog/CourseCompleteBottomSheetDialogFragment.kt b/app/src/main/java/org/stepik/android/view/course_complete/ui/dialog/CourseCompleteBottomSheetDialogFragment.kt index 3e48687801..9b5d0a157f 100644 --- a/app/src/main/java/org/stepik/android/view/course_complete/ui/dialog/CourseCompleteBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/stepik/android/view/course_complete/ui/dialog/CourseCompleteBottomSheetDialogFragment.kt @@ -40,7 +40,7 @@ import org.stepik.android.presentation.course_complete.CourseCompleteFeature import org.stepik.android.presentation.course_complete.CourseCompleteViewModel import org.stepik.android.view.course.routing.CourseScreenTab import org.stepik.android.view.course_complete.model.CourseCompleteDialogViewInfo -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.view.base.ui.delegate.ViewStateDelegate import ru.nobird.android.view.base.ui.extension.argument import ru.nobird.android.view.redux.ui.extension.reduxViewModel diff --git a/app/src/main/java/org/stepik/android/view/course_list/ui/delegate/CoursePropertiesDelegate.kt b/app/src/main/java/org/stepik/android/view/course_list/ui/delegate/CoursePropertiesDelegate.kt index 216c7f24c9..abb61ef15f 100644 --- a/app/src/main/java/org/stepik/android/view/course_list/ui/delegate/CoursePropertiesDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/course_list/ui/delegate/CoursePropertiesDelegate.kt @@ -15,7 +15,7 @@ import org.stepik.android.domain.course.model.EnrollmentState import org.stepik.android.domain.course_list.model.CourseListItem import org.stepik.android.domain.user_courses.model.UserCourse import org.stepik.android.model.Course -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.safeCast import java.util.Locale class CoursePropertiesDelegate( diff --git a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListCollectionFragment.kt b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListCollectionFragment.kt index da522077ee..1bfb183a3c 100644 --- a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListCollectionFragment.kt +++ b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListCollectionFragment.kt @@ -31,7 +31,7 @@ import org.stepik.android.view.course_list.delegate.CourseContinueViewDelegate import org.stepik.android.view.course_list.delegate.CourseListViewDelegate import org.stepik.android.view.course_list.ui.adapter.decorator.CourseListCollectionHeaderDecoration import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.core.model.PaginationDirection +import ru.nobird.app.core.model.PaginationDirection import ru.nobird.android.view.base.ui.extension.argument import ru.nobird.android.view.base.ui.extension.setOnPaginationListener import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListPopularFragment.kt b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListPopularFragment.kt index 6a8b4e2d76..462745ac68 100644 --- a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListPopularFragment.kt +++ b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListPopularFragment.kt @@ -30,7 +30,7 @@ import org.stepik.android.view.course_list.delegate.CourseContinueViewDelegate import org.stepik.android.view.course_list.delegate.CourseListViewDelegate import org.stepik.android.view.course_list.resolver.TableLayoutHorizontalSpanCountResolver import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.core.model.PaginationDirection +import ru.nobird.app.core.model.PaginationDirection import ru.nobird.android.view.base.ui.extension.setOnPaginationListener import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListQueryFragment.kt b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListQueryFragment.kt index 22875ab2be..585732923b 100644 --- a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListQueryFragment.kt +++ b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListQueryFragment.kt @@ -33,7 +33,7 @@ import org.stepik.android.view.course_list.delegate.CourseContinueViewDelegate import org.stepik.android.view.course_list.delegate.CourseListViewDelegate import org.stepik.android.view.filter.ui.dialog.FilterBottomSheetDialogFragment import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.core.model.PaginationDirection +import ru.nobird.app.core.model.PaginationDirection import ru.nobird.android.view.base.ui.extension.argument import ru.nobird.android.view.base.ui.extension.setOnPaginationListener import ru.nobird.android.view.base.ui.extension.showIfNotExists diff --git a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListSearchFragment.kt b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListSearchFragment.kt index 0ee42c4650..fdcb8c7d59 100644 --- a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListSearchFragment.kt +++ b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListSearchFragment.kt @@ -47,7 +47,7 @@ import org.stepik.android.view.course_list.delegate.CourseContinueViewDelegate import org.stepik.android.view.course_list.delegate.CourseListViewDelegate import org.stepik.android.view.filter.ui.dialog.FilterBottomSheetDialogFragment import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.core.model.PaginationDirection +import ru.nobird.app.core.model.PaginationDirection import ru.nobird.android.view.base.ui.extension.argument import ru.nobird.android.view.base.ui.extension.setOnPaginationListener import ru.nobird.android.view.base.ui.extension.showIfNotExists diff --git a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListUserFragment.kt b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListUserFragment.kt index f33f84d9e4..15f3615a18 100644 --- a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListUserFragment.kt +++ b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListUserFragment.kt @@ -29,7 +29,7 @@ import org.stepik.android.view.course.mapper.DisplayPriceMapper import org.stepik.android.view.course_list.delegate.CourseContinueViewDelegate import org.stepik.android.view.course_list.delegate.CourseListViewDelegate import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.core.model.PaginationDirection +import ru.nobird.app.core.model.PaginationDirection import ru.nobird.android.view.base.ui.extension.argument import ru.nobird.android.view.base.ui.extension.setOnPaginationListener import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListUserHorizontalFragment.kt b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListUserHorizontalFragment.kt index fb8f17a55d..30ddd31af8 100644 --- a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListUserHorizontalFragment.kt +++ b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListUserHorizontalFragment.kt @@ -31,7 +31,7 @@ import org.stepik.android.view.course_list.delegate.CourseContinueViewDelegate import org.stepik.android.view.course_list.delegate.CourseListViewDelegate import org.stepik.android.view.course_list.resolver.TableLayoutHorizontalSpanCountResolver import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.core.model.PaginationDirection +import ru.nobird.app.core.model.PaginationDirection import ru.nobird.android.view.base.ui.extension.setOnPaginationListener import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListWishFragment.kt b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListWishFragment.kt index eaa75dfc57..9f31e52808 100644 --- a/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListWishFragment.kt +++ b/app/src/main/java/org/stepik/android/view/course_list/ui/fragment/CourseListWishFragment.kt @@ -29,7 +29,7 @@ import org.stepik.android.view.course.mapper.DisplayPriceMapper import org.stepik.android.view.course_list.delegate.CourseContinueViewDelegate import org.stepik.android.view.course_list.delegate.CourseListViewDelegate import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.core.model.PaginationDirection +import ru.nobird.app.core.model.PaginationDirection import ru.nobird.android.view.base.ui.extension.setOnPaginationListener import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/view/course_purchase/ui/dialog/CoursePurchaseBottomSheetDialogFragment.kt b/app/src/main/java/org/stepik/android/view/course_purchase/ui/dialog/CoursePurchaseBottomSheetDialogFragment.kt index b67fe15b98..b8feb7379a 100644 --- a/app/src/main/java/org/stepik/android/view/course_purchase/ui/dialog/CoursePurchaseBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/stepik/android/view/course_purchase/ui/dialog/CoursePurchaseBottomSheetDialogFragment.kt @@ -29,7 +29,7 @@ import org.stepik.android.view.course.mapper.DisplayPriceMapper import org.stepik.android.view.course.resolver.CoursePromoCodeResolver import org.stepik.android.view.course_purchase.delegate.PromoCodeViewDelegate import org.stepik.android.view.course_purchase.delegate.WishlistViewDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.view.base.ui.extension.argument import ru.nobird.android.view.redux.ui.extension.reduxViewModel import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/view/course_revenue/model/CourseBenefitOperationItem.kt b/app/src/main/java/org/stepik/android/view/course_revenue/model/CourseBenefitOperationItem.kt index c6cd067b8c..31594e6d92 100644 --- a/app/src/main/java/org/stepik/android/view/course_revenue/model/CourseBenefitOperationItem.kt +++ b/app/src/main/java/org/stepik/android/view/course_revenue/model/CourseBenefitOperationItem.kt @@ -2,7 +2,7 @@ package org.stepik.android.view.course_revenue.model import org.stepik.android.presentation.course_revenue.CourseBenefitsFeature import org.stepik.android.presentation.course_revenue.CourseBenefitsMonthlyFeature -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable sealed class CourseBenefitOperationItem { data class CourseBenefits( diff --git a/app/src/main/java/org/stepik/android/view/course_revenue/ui/activity/CourseRevenueActivity.kt b/app/src/main/java/org/stepik/android/view/course_revenue/ui/activity/CourseRevenueActivity.kt index a1e9178d6f..1565c9e3cf 100644 --- a/app/src/main/java/org/stepik/android/view/course_revenue/ui/activity/CourseRevenueActivity.kt +++ b/app/src/main/java/org/stepik/android/view/course_revenue/ui/activity/CourseRevenueActivity.kt @@ -31,7 +31,7 @@ import org.stepik.android.view.course_revenue.ui.adapter.delegate.CourseBenefits import org.stepik.android.view.course_revenue.ui.delegate.CourseBenefitSummaryViewDelegate import org.stepik.android.view.course_revenue.ui.adapter.delegate.CourseBenefitsMonthlyListAdapterDelegate import org.stepik.android.view.course_revenue.ui.dialog.TransactionBottomSheetDialogFragment -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.ui.adapters.DefaultDelegateAdapter import ru.nobird.android.view.base.ui.delegate.ViewStateDelegate import ru.nobird.android.view.base.ui.extension.showIfNotExists diff --git a/app/src/main/java/org/stepik/android/view/course_revenue/ui/adapter/delegate/CourseBenefitsListAdapterDelegate.kt b/app/src/main/java/org/stepik/android/view/course_revenue/ui/adapter/delegate/CourseBenefitsListAdapterDelegate.kt index 583f7d14fe..4ef2c702d3 100644 --- a/app/src/main/java/org/stepik/android/view/course_revenue/ui/adapter/delegate/CourseBenefitsListAdapterDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/course_revenue/ui/adapter/delegate/CourseBenefitsListAdapterDelegate.kt @@ -14,7 +14,7 @@ import org.stepik.android.domain.course_revenue.model.CourseBenefitListItem import org.stepik.android.presentation.course_revenue.CourseBenefitsFeature import org.stepik.android.view.course_revenue.mapper.RevenuePriceMapper import org.stepik.android.view.course_revenue.model.CourseBenefitOperationItem -import ru.nobird.android.core.model.PaginationDirection +import ru.nobird.app.core.model.PaginationDirection import ru.nobird.android.ui.adapterdelegates.AdapterDelegate import ru.nobird.android.ui.adapterdelegates.DelegateViewHolder import ru.nobird.android.ui.adapters.DefaultDelegateAdapter diff --git a/app/src/main/java/org/stepik/android/view/course_revenue/ui/adapter/delegate/CourseBenefitsMonthlyListAdapterDelegate.kt b/app/src/main/java/org/stepik/android/view/course_revenue/ui/adapter/delegate/CourseBenefitsMonthlyListAdapterDelegate.kt index d3f7e1398d..eb8efb9377 100644 --- a/app/src/main/java/org/stepik/android/view/course_revenue/ui/adapter/delegate/CourseBenefitsMonthlyListAdapterDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/course_revenue/ui/adapter/delegate/CourseBenefitsMonthlyListAdapterDelegate.kt @@ -14,7 +14,7 @@ import org.stepik.android.domain.course_revenue.model.CourseBenefitByMonthListIt import org.stepik.android.presentation.course_revenue.CourseBenefitsMonthlyFeature import org.stepik.android.view.course_revenue.mapper.RevenuePriceMapper import org.stepik.android.view.course_revenue.model.CourseBenefitOperationItem -import ru.nobird.android.core.model.PaginationDirection +import ru.nobird.app.core.model.PaginationDirection import ru.nobird.android.ui.adapterdelegates.AdapterDelegate import ru.nobird.android.ui.adapterdelegates.DelegateViewHolder import ru.nobird.android.ui.adapters.DefaultDelegateAdapter diff --git a/app/src/main/java/org/stepik/android/view/course_search/dialog/CourseSearchDialogFragment.kt b/app/src/main/java/org/stepik/android/view/course_search/dialog/CourseSearchDialogFragment.kt index a413c604d4..ced73f891d 100644 --- a/app/src/main/java/org/stepik/android/view/course_search/dialog/CourseSearchDialogFragment.kt +++ b/app/src/main/java/org/stepik/android/view/course_search/dialog/CourseSearchDialogFragment.kt @@ -32,8 +32,8 @@ import org.stepik.android.presentation.course_search.CourseSearchFeature import org.stepik.android.presentation.course_search.CourseSearchViewModel import org.stepik.android.view.course_search.adapter.delegate.CourseSearchResultAdapterDelegate import org.stepik.android.view.lesson.ui.activity.LessonActivity -import ru.nobird.android.core.model.PaginationDirection -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.core.model.PaginationDirection +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.ui.adapterdelegates.dsl.adapterDelegate import ru.nobird.android.ui.adapters.DefaultDelegateAdapter import ru.nobird.android.view.base.ui.delegate.ViewStateDelegate diff --git a/app/src/main/java/org/stepik/android/view/filter/ui/dialog/FilterBottomSheetDialogFragment.kt b/app/src/main/java/org/stepik/android/view/filter/ui/dialog/FilterBottomSheetDialogFragment.kt index 62e0c65e7b..7ff86bb5bd 100644 --- a/app/src/main/java/org/stepik/android/view/filter/ui/dialog/FilterBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/stepik/android/view/filter/ui/dialog/FilterBottomSheetDialogFragment.kt @@ -18,7 +18,7 @@ import org.stepic.droid.model.StepikFilter import org.stepic.droid.preferences.SharedPreferenceHelper import org.stepik.android.domain.filter.model.CourseListFilterQuery import org.stepik.android.view.catalog.ui.fragment.CatalogFragment -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.safeCast import ru.nobird.android.view.base.ui.extension.argument import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/view/injection/catalog/CatalogBlockPresentationModule.kt b/app/src/main/java/org/stepik/android/view/injection/catalog/CatalogBlockPresentationModule.kt index cb10c82177..ab3c363fd8 100644 --- a/app/src/main/java/org/stepik/android/view/injection/catalog/CatalogBlockPresentationModule.kt +++ b/app/src/main/java/org/stepik/android/view/injection/catalog/CatalogBlockPresentationModule.kt @@ -20,11 +20,11 @@ import org.stepik.android.presentation.stories.StoriesFeature import org.stepik.android.presentation.stories.dispatcher.StoriesActionDispatcher import org.stepik.android.presentation.user_courses.dispatcher.UserCoursesActionDispatcher import org.stepik.android.presentation.wishlist.dispatcher.WishlistActionDispatcher -import ru.nobird.android.core.model.safeCast -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.transform -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.core.model.safeCast +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.transform +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object CatalogBlockPresentationModule { diff --git a/app/src/main/java/org/stepik/android/view/injection/course_complete/CourseCompletePresentationModule.kt b/app/src/main/java/org/stepik/android/view/injection/course_complete/CourseCompletePresentationModule.kt index 6eaaf4b7c6..572ef3fc30 100644 --- a/app/src/main/java/org/stepik/android/view/injection/course_complete/CourseCompletePresentationModule.kt +++ b/app/src/main/java/org/stepik/android/view/injection/course_complete/CourseCompletePresentationModule.kt @@ -9,9 +9,9 @@ import org.stepik.android.presentation.course_complete.CourseCompleteFeature import org.stepik.android.presentation.course_complete.CourseCompleteViewModel import org.stepik.android.presentation.course_complete.dispatcher.CourseCompleteActionDispatcher import org.stepik.android.presentation.course_complete.reducer.CourseCompleteReducer -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object CourseCompletePresentationModule { diff --git a/app/src/main/java/org/stepik/android/view/injection/course_purchase/CoursePurchasePresentationModule.kt b/app/src/main/java/org/stepik/android/view/injection/course_purchase/CoursePurchasePresentationModule.kt index c1c83c6a6c..c0490cfbeb 100644 --- a/app/src/main/java/org/stepik/android/view/injection/course_purchase/CoursePurchasePresentationModule.kt +++ b/app/src/main/java/org/stepik/android/view/injection/course_purchase/CoursePurchasePresentationModule.kt @@ -10,11 +10,11 @@ import org.stepik.android.presentation.course_purchase.CoursePurchaseViewModel import org.stepik.android.presentation.course_purchase.dispatcher.CoursePurchaseActionDispatcher import org.stepik.android.presentation.wishlist.dispatcher.WishlistOperationActionDispatcher import org.stepik.android.presentation.course_purchase.reducer.CoursePurchaseReducer -import ru.nobird.android.core.model.safeCast -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.transform -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.core.model.safeCast +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.transform +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object CoursePurchasePresentationModule { diff --git a/app/src/main/java/org/stepik/android/view/injection/course_revenue/CourseRevenuePresentationModule.kt b/app/src/main/java/org/stepik/android/view/injection/course_revenue/CourseRevenuePresentationModule.kt index e205d8cf10..3868e5f4a6 100644 --- a/app/src/main/java/org/stepik/android/view/injection/course_revenue/CourseRevenuePresentationModule.kt +++ b/app/src/main/java/org/stepik/android/view/injection/course_revenue/CourseRevenuePresentationModule.kt @@ -15,11 +15,11 @@ import org.stepik.android.presentation.course_revenue.dispatcher.CourseBenefitsA import org.stepik.android.presentation.course_revenue.dispatcher.CourseBenefitsMonthlyActionDispatcher import org.stepik.android.presentation.course_revenue.dispatcher.CourseRevenueActionDispatcher import org.stepik.android.presentation.course_revenue.reducer.CourseRevenueReducer -import ru.nobird.android.core.model.safeCast -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.transform -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.core.model.safeCast +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.transform +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object CourseRevenuePresentationModule { diff --git a/app/src/main/java/org/stepik/android/view/injection/course_search/CourseSearchPresentationModule.kt b/app/src/main/java/org/stepik/android/view/injection/course_search/CourseSearchPresentationModule.kt index f8e8d28f71..bc4e027e89 100644 --- a/app/src/main/java/org/stepik/android/view/injection/course_search/CourseSearchPresentationModule.kt +++ b/app/src/main/java/org/stepik/android/view/injection/course_search/CourseSearchPresentationModule.kt @@ -9,9 +9,9 @@ import org.stepik.android.presentation.course_search.CourseSearchFeature import org.stepik.android.presentation.course_search.CourseSearchViewModel import org.stepik.android.presentation.course_search.dispatcher.CourseSearchActionDispatcher import org.stepik.android.presentation.course_search.reducer.CourseSearchReducer -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object CourseSearchPresentationModule { diff --git a/app/src/main/java/org/stepik/android/view/injection/lesson_demo/LessonDemoPresentationModule.kt b/app/src/main/java/org/stepik/android/view/injection/lesson_demo/LessonDemoPresentationModule.kt index 1172e06c83..e124696fde 100644 --- a/app/src/main/java/org/stepik/android/view/injection/lesson_demo/LessonDemoPresentationModule.kt +++ b/app/src/main/java/org/stepik/android/view/injection/lesson_demo/LessonDemoPresentationModule.kt @@ -12,11 +12,11 @@ import org.stepik.android.presentation.lesson_demo.dispatcher.LessonDemoActionDi import org.stepik.android.presentation.lesson_demo.reducer.LessonDemoReducer import org.stepik.android.presentation.wishlist.WishlistOperationFeature import org.stepik.android.presentation.wishlist.dispatcher.WishlistOperationActionDispatcher -import ru.nobird.android.core.model.safeCast -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.transform -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.core.model.safeCast +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.transform +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object LessonDemoPresentationModule { diff --git a/app/src/main/java/org/stepik/android/view/injection/step_quiz/StepQuizPresentationModule.kt b/app/src/main/java/org/stepik/android/view/injection/step_quiz/StepQuizPresentationModule.kt index 8926ff0250..2c5f2207c1 100644 --- a/app/src/main/java/org/stepik/android/view/injection/step_quiz/StepQuizPresentationModule.kt +++ b/app/src/main/java/org/stepik/android/view/injection/step_quiz/StepQuizPresentationModule.kt @@ -17,11 +17,11 @@ import org.stepik.android.presentation.step_quiz_review.dispatcher.StepQuizRevie import org.stepik.android.presentation.step_quiz_review.dispatcher.StepQuizReviewTeacherActionDispatcher import org.stepik.android.presentation.step_quiz_review.reducer.StepQuizReviewReducer import org.stepik.android.presentation.step_quiz_review.reducer.StepQuizReviewTeacherReducer -import ru.nobird.android.core.model.safeCast -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.transform -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.core.model.safeCast +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.transform +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object StepQuizPresentationModule { diff --git a/app/src/main/java/org/stepik/android/view/injection/stories/StoriesPresentationModule.kt b/app/src/main/java/org/stepik/android/view/injection/stories/StoriesPresentationModule.kt index 3a370120c4..27beacd199 100644 --- a/app/src/main/java/org/stepik/android/view/injection/stories/StoriesPresentationModule.kt +++ b/app/src/main/java/org/stepik/android/view/injection/stories/StoriesPresentationModule.kt @@ -9,9 +9,9 @@ import org.stepik.android.presentation.stories.StoriesFeature import org.stepik.android.presentation.stories.dispatcher.StoriesActionDispatcher import org.stepik.android.presentation.stories.reducer.StoriesReducer import org.stepik.android.view.stories.viewmodel.StoriesViewModel -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module internal object StoriesPresentationModule { diff --git a/app/src/main/java/org/stepik/android/view/injection/story/StoryPresentationModule.kt b/app/src/main/java/org/stepik/android/view/injection/story/StoryPresentationModule.kt index 5db3da5ec4..1b180a7a73 100644 --- a/app/src/main/java/org/stepik/android/view/injection/story/StoryPresentationModule.kt +++ b/app/src/main/java/org/stepik/android/view/injection/story/StoryPresentationModule.kt @@ -9,9 +9,9 @@ import org.stepik.android.presentation.story.StoryActionDispatcher import org.stepik.android.presentation.story.StoryFeature import org.stepik.android.presentation.story.StoryReducer import org.stepik.android.view.story.viewmodel.StoryViewModel -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module internal object StoryPresentationModule { diff --git a/app/src/main/java/org/stepik/android/view/injection/user_reviews/UserReviewsPresentationModule.kt b/app/src/main/java/org/stepik/android/view/injection/user_reviews/UserReviewsPresentationModule.kt index bd28c242ae..43968dce3f 100644 --- a/app/src/main/java/org/stepik/android/view/injection/user_reviews/UserReviewsPresentationModule.kt +++ b/app/src/main/java/org/stepik/android/view/injection/user_reviews/UserReviewsPresentationModule.kt @@ -10,10 +10,10 @@ import org.stepik.android.presentation.user_reviews.UserReviewsFeature import org.stepik.android.presentation.user_reviews.UserReviewsViewModel import org.stepik.android.presentation.user_reviews.dispatcher.UserReviewsActionDispatcher import org.stepik.android.presentation.user_reviews.reducer.UserReviewsReducer -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.Feature -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.Feature +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object UserReviewsPresentationModule { diff --git a/app/src/main/java/org/stepik/android/view/injection/wishlist/WishlistPresentationModule.kt b/app/src/main/java/org/stepik/android/view/injection/wishlist/WishlistPresentationModule.kt index 20ca1b07c1..908e03c828 100644 --- a/app/src/main/java/org/stepik/android/view/injection/wishlist/WishlistPresentationModule.kt +++ b/app/src/main/java/org/stepik/android/view/injection/wishlist/WishlistPresentationModule.kt @@ -9,9 +9,9 @@ import org.stepik.android.presentation.wishlist.WishlistFeature import org.stepik.android.presentation.wishlist.WishlistViewModel import org.stepik.android.presentation.wishlist.dispatcher.WishlistActionDispatcher import org.stepik.android.presentation.wishlist.reducer.WishlistReducer -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object WishlistPresentationModule { diff --git a/app/src/main/java/org/stepik/android/view/learning_actions/model/LearningActionsItem.kt b/app/src/main/java/org/stepik/android/view/learning_actions/model/LearningActionsItem.kt index 98e3d731e4..131a61bebc 100644 --- a/app/src/main/java/org/stepik/android/view/learning_actions/model/LearningActionsItem.kt +++ b/app/src/main/java/org/stepik/android/view/learning_actions/model/LearningActionsItem.kt @@ -2,7 +2,7 @@ package org.stepik.android.view.learning_actions.model import org.stepik.android.presentation.user_reviews.UserReviewsFeature import org.stepik.android.presentation.wishlist.WishlistFeature -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable sealed class LearningActionsItem { data class Wishlist(val state: WishlistFeature.State) : LearningActionsItem(), Identifiable { diff --git a/app/src/main/java/org/stepik/android/view/learning_actions/ui/fragment/LearningActionsFragment.kt b/app/src/main/java/org/stepik/android/view/learning_actions/ui/fragment/LearningActionsFragment.kt index 96b4dbd790..c4986976c0 100644 --- a/app/src/main/java/org/stepik/android/view/learning_actions/ui/fragment/LearningActionsFragment.kt +++ b/app/src/main/java/org/stepik/android/view/learning_actions/ui/fragment/LearningActionsFragment.kt @@ -19,8 +19,8 @@ import org.stepik.android.view.injection.learning_actions.LearningActionsCompone import org.stepik.android.view.learning_actions.model.LearningActionsItem import org.stepik.android.view.learning_actions.ui.adapter.delegate.UserReviewsActionAdapterDelegate import org.stepik.android.view.learning_actions.ui.adapter.delegate.WishlistActionAdapterDelegate -import ru.nobird.android.core.model.mutate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.core.model.mutate +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.ui.adapters.DefaultDelegateAdapter import ru.nobird.android.view.redux.ui.extension.reduxViewModel import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/view/lesson_demo/ui/dialog/LessonDemoCompleteBottomSheetDialogFragment.kt b/app/src/main/java/org/stepik/android/view/lesson_demo/ui/dialog/LessonDemoCompleteBottomSheetDialogFragment.kt index 628cc2d4df..309068027a 100644 --- a/app/src/main/java/org/stepik/android/view/lesson_demo/ui/dialog/LessonDemoCompleteBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/stepik/android/view/lesson_demo/ui/dialog/LessonDemoCompleteBottomSheetDialogFragment.kt @@ -32,7 +32,7 @@ import org.stepik.android.view.course.resolver.CoursePromoCodeResolver import org.stepik.android.view.course.routing.CourseScreenTab import org.stepik.android.view.course_purchase.delegate.WishlistViewDelegate import org.stepik.android.view.course_purchase.ui.dialog.CoursePurchaseBottomSheetDialogFragment -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.view.base.ui.delegate.ViewStateDelegate import ru.nobird.android.view.base.ui.extension.argument import ru.nobird.android.view.base.ui.extension.showIfNotExists diff --git a/app/src/main/java/org/stepik/android/view/profile_edit/ui/activity/ProfileEditActivity.kt b/app/src/main/java/org/stepik/android/view/profile_edit/ui/activity/ProfileEditActivity.kt index deefa744ba..dd5a556b01 100644 --- a/app/src/main/java/org/stepik/android/view/profile_edit/ui/activity/ProfileEditActivity.kt +++ b/app/src/main/java/org/stepik/android/view/profile_edit/ui/activity/ProfileEditActivity.kt @@ -17,7 +17,7 @@ import org.stepic.droid.base.App import org.stepic.droid.core.ScreenManager import org.stepic.droid.ui.util.initCenteredToolbar import org.stepic.droid.ui.util.snackbar -import ru.nobird.android.core.model.mutate +import ru.nobird.app.core.model.mutate import org.stepik.android.model.user.Profile import org.stepik.android.presentation.profile_edit.ProfileEditPresenter import org.stepik.android.presentation.profile_edit.ProfileEditView diff --git a/app/src/main/java/org/stepik/android/view/step_quiz/ui/fragment/DefaultStepQuizFragment.kt b/app/src/main/java/org/stepik/android/view/step_quiz/ui/fragment/DefaultStepQuizFragment.kt index d9d37b4fb8..a2923893ac 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz/ui/fragment/DefaultStepQuizFragment.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz/ui/fragment/DefaultStepQuizFragment.kt @@ -31,7 +31,7 @@ import org.stepik.android.view.step_quiz.ui.delegate.StepQuizFeedbackBlocksDeleg import org.stepik.android.view.step_quiz.ui.delegate.StepQuizFormDelegate import org.stepik.android.view.step_quiz.ui.factory.StepQuizViewStateDelegateFactory import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.view.base.ui.extension.argument import ru.nobird.android.view.base.ui.extension.showIfNotExists import javax.inject.Inject diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_choice/model/Choice.kt b/app/src/main/java/org/stepik/android/view/step_quiz_choice/model/Choice.kt index 673de21fbc..caf61510c8 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_choice/model/Choice.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_choice/model/Choice.kt @@ -1,6 +1,6 @@ package org.stepik.android.view.step_quiz_choice.model -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable data class Choice( val option: String, diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_choice/ui/fragment/ChoiceStepQuizFragment.kt b/app/src/main/java/org/stepik/android/view/step_quiz_choice/ui/fragment/ChoiceStepQuizFragment.kt index 03dbbb9e0a..f6e61ae688 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_choice/ui/fragment/ChoiceStepQuizFragment.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_choice/ui/fragment/ChoiceStepQuizFragment.kt @@ -8,7 +8,7 @@ import org.stepik.android.presentation.step_quiz.StepQuizFeature import org.stepik.android.view.step_quiz.ui.delegate.StepQuizFormDelegate import org.stepik.android.view.step_quiz.ui.fragment.DefaultStepQuizFragment import org.stepik.android.view.step_quiz_choice.ui.delegate.ChoiceStepQuizFormDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView class ChoiceStepQuizFragment : DefaultStepQuizFragment(), diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_code/ui/fragment/CodeStepQuizFragment.kt b/app/src/main/java/org/stepik/android/view/step_quiz_code/ui/fragment/CodeStepQuizFragment.kt index 7ddc277bb7..28feedcda0 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_code/ui/fragment/CodeStepQuizFragment.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_code/ui/fragment/CodeStepQuizFragment.kt @@ -15,7 +15,7 @@ import org.stepik.android.view.step_quiz_code.ui.delegate.CodeLayoutDelegate import org.stepik.android.view.step_quiz_code.ui.delegate.CodeQuizInstructionDelegate import org.stepik.android.view.step_quiz_code.ui.delegate.CodeStepQuizFormDelegate import org.stepik.android.view.step_quiz_fullscreen_code.ui.dialog.CodeStepQuizFullScreenDialogFragment -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.view.base.ui.extension.showIfNotExists class CodeStepQuizFragment : diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_fill_blanks/ui/delegate/FillBlanksStepQuizFormDelegate.kt b/app/src/main/java/org/stepik/android/view/step_quiz_fill_blanks/ui/delegate/FillBlanksStepQuizFormDelegate.kt index a624a5a26b..277f62fb33 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_fill_blanks/ui/delegate/FillBlanksStepQuizFormDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_fill_blanks/ui/delegate/FillBlanksStepQuizFormDelegate.kt @@ -6,7 +6,7 @@ import com.google.android.flexbox.FlexboxLayoutManager import kotlinx.android.synthetic.main.fragment_step_quiz.view.* import kotlinx.android.synthetic.main.layout_step_quiz_fill_blanks.view.* import org.stepic.droid.R -import ru.nobird.android.core.model.mutate +import ru.nobird.app.core.model.mutate import org.stepik.android.model.Reply import org.stepik.android.presentation.step_quiz.StepQuizFeature import org.stepik.android.presentation.step_quiz.model.ReplyResult diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_fill_blanks/ui/fragment/FillBlanksStepQuizFragment.kt b/app/src/main/java/org/stepik/android/view/step_quiz_fill_blanks/ui/fragment/FillBlanksStepQuizFragment.kt index 20dd92528b..349abca96f 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_fill_blanks/ui/fragment/FillBlanksStepQuizFragment.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_fill_blanks/ui/fragment/FillBlanksStepQuizFragment.kt @@ -8,7 +8,7 @@ import org.stepik.android.presentation.step_quiz.StepQuizFeature import org.stepik.android.view.step_quiz.ui.delegate.StepQuizFormDelegate import org.stepik.android.view.step_quiz.ui.fragment.DefaultStepQuizFragment import org.stepik.android.view.step_quiz_fill_blanks.ui.delegate.FillBlanksStepQuizFormDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView class FillBlanksStepQuizFragment : DefaultStepQuizFragment(), diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_fill_blanks/ui/model/FillBlanksItem.kt b/app/src/main/java/org/stepik/android/view/step_quiz_fill_blanks/ui/model/FillBlanksItem.kt index 9e6c4889ef..008d715d05 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_fill_blanks/ui/model/FillBlanksItem.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_fill_blanks/ui/model/FillBlanksItem.kt @@ -1,6 +1,6 @@ package org.stepik.android.view.step_quiz_fill_blanks.ui.model -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable sealed class FillBlanksItem : Identifiable { data class Text( diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_matching/ui/delegate/MatchingStepQuizFormDelegate.kt b/app/src/main/java/org/stepik/android/view/step_quiz_matching/ui/delegate/MatchingStepQuizFormDelegate.kt index 3efde6f4aa..86bbca4e25 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_matching/ui/delegate/MatchingStepQuizFormDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_matching/ui/delegate/MatchingStepQuizFormDelegate.kt @@ -15,7 +15,7 @@ import org.stepik.android.view.step_quiz_matching.ui.adapter.delegate.MatchingIt import org.stepik.android.view.step_quiz_matching.ui.adapter.delegate.MatchingItemTitleAdapterDelegate import org.stepik.android.view.step_quiz_matching.ui.mapper.MatchingItemMapper import org.stepik.android.view.step_quiz_matching.ui.model.MatchingItem -import ru.nobird.android.core.model.swap +import ru.nobird.app.core.model.swap import ru.nobird.android.ui.adapters.DefaultDelegateAdapter class MatchingStepQuizFormDelegate( diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_matching/ui/model/MatchingItem.kt b/app/src/main/java/org/stepik/android/view/step_quiz_matching/ui/model/MatchingItem.kt index a9ad931d00..e4f604662c 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_matching/ui/model/MatchingItem.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_matching/ui/model/MatchingItem.kt @@ -1,6 +1,6 @@ package org.stepik.android.view.step_quiz_matching.ui.model -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable sealed class MatchingItem : Identifiable { data class Title( diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_review/ui/delegate/StepQuizReviewDelegate.kt b/app/src/main/java/org/stepik/android/view/step_quiz_review/ui/delegate/StepQuizReviewDelegate.kt index dc797a90b2..d785c43f1c 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_review/ui/delegate/StepQuizReviewDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_review/ui/delegate/StepQuizReviewDelegate.kt @@ -21,7 +21,7 @@ import org.stepik.android.view.step_quiz.ui.delegate.StepQuizDelegate import org.stepik.android.view.step_quiz.ui.delegate.StepQuizFeedbackBlocksDelegate import org.stepik.android.view.step_quiz_review.ui.widget.ReviewStatusView import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.core.model.safeCast +import ru.nobird.app.core.model.safeCast class StepQuizReviewDelegate( override val containerView: View, diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_review/ui/fragment/StepQuizReviewFragment.kt b/app/src/main/java/org/stepik/android/view/step_quiz_review/ui/fragment/StepQuizReviewFragment.kt index d4fa72c5fd..86487f2512 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_review/ui/fragment/StepQuizReviewFragment.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_review/ui/fragment/StepQuizReviewFragment.kt @@ -40,7 +40,7 @@ import org.stepik.android.view.step_quiz_review.ui.delegate.StepQuizReviewDelega import org.stepik.android.view.step_quiz_review.ui.factory.StepQuizFormReviewFactory import org.stepik.android.view.submission.ui.dialog.SubmissionsDialogFragment import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.view.base.ui.extension.argument import ru.nobird.android.view.base.ui.extension.showIfNotExists import ru.nobird.android.view.redux.ui.extension.reduxViewModel diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_review/ui/fragment/StepQuizReviewTeacherFragment.kt b/app/src/main/java/org/stepik/android/view/step_quiz_review/ui/fragment/StepQuizReviewTeacherFragment.kt index 497e92cedf..35c191be67 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_review/ui/fragment/StepQuizReviewTeacherFragment.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_review/ui/fragment/StepQuizReviewTeacherFragment.kt @@ -39,8 +39,8 @@ import org.stepik.android.view.step_quiz.ui.factory.StepQuizFormFactory import org.stepik.android.view.step_quiz.ui.factory.StepQuizViewStateDelegateFactory import org.stepik.android.view.step_quiz_review.ui.factory.StepQuizFormReviewFactory import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.core.model.safeCast -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.core.model.safeCast +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.view.base.ui.extension.argument import ru.nobird.android.view.base.ui.extension.toPx import ru.nobird.android.view.redux.ui.extension.reduxViewModel diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_sorting/ui/delegate/SortingStepQuizFormDelegate.kt b/app/src/main/java/org/stepik/android/view/step_quiz_sorting/ui/delegate/SortingStepQuizFormDelegate.kt index 29f67a386a..9d65dc17b8 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_sorting/ui/delegate/SortingStepQuizFormDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_sorting/ui/delegate/SortingStepQuizFormDelegate.kt @@ -14,7 +14,7 @@ import org.stepik.android.view.step_quiz.ui.delegate.StepQuizFormDelegate import org.stepik.android.view.step_quiz_sorting.ui.adapter.delegate.SortingOptionAdapterDelegate import org.stepik.android.view.step_quiz_sorting.ui.mapper.SortingOptionMapper import org.stepik.android.view.step_quiz_sorting.ui.model.SortingOption -import ru.nobird.android.core.model.swap +import ru.nobird.app.core.model.swap import ru.nobird.android.ui.adapters.DefaultDelegateAdapter class SortingStepQuizFormDelegate( diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_sorting/ui/fragment/SortingStepQuizFragment.kt b/app/src/main/java/org/stepik/android/view/step_quiz_sorting/ui/fragment/SortingStepQuizFragment.kt index c2d16b8811..65fcf75ef8 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_sorting/ui/fragment/SortingStepQuizFragment.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_sorting/ui/fragment/SortingStepQuizFragment.kt @@ -8,7 +8,7 @@ import org.stepik.android.presentation.step_quiz.StepQuizFeature import org.stepik.android.view.step_quiz.ui.delegate.StepQuizFormDelegate import org.stepik.android.view.step_quiz.ui.fragment.DefaultStepQuizFragment import org.stepik.android.view.step_quiz_sorting.ui.delegate.SortingStepQuizFormDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView class SortingStepQuizFragment : DefaultStepQuizFragment(), diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_sorting/ui/model/SortingOption.kt b/app/src/main/java/org/stepik/android/view/step_quiz_sorting/ui/model/SortingOption.kt index dea0e5e3a9..c2532ac395 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_sorting/ui/model/SortingOption.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_sorting/ui/model/SortingOption.kt @@ -1,6 +1,6 @@ package org.stepik.android.view.step_quiz_sorting.ui.model -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable data class SortingOption( override val id: Int, diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_sql/ui/fragment/SqlStepQuizFragment.kt b/app/src/main/java/org/stepik/android/view/step_quiz_sql/ui/fragment/SqlStepQuizFragment.kt index cbef0c621b..a8b0ba837d 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_sql/ui/fragment/SqlStepQuizFragment.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_sql/ui/fragment/SqlStepQuizFragment.kt @@ -10,7 +10,7 @@ import org.stepik.android.view.step_quiz.ui.delegate.StepQuizFormDelegate import org.stepik.android.view.step_quiz.ui.fragment.DefaultStepQuizFragment import org.stepik.android.view.step_quiz_fullscreen_code.ui.dialog.CodeStepQuizFullScreenDialogFragment import org.stepik.android.view.step_quiz_sql.ui.delegate.SqlStepQuizFormDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.view.base.ui.extension.showIfNotExists class SqlStepQuizFragment : diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_table/ui/delegate/TableStepQuizFormDelegate.kt b/app/src/main/java/org/stepik/android/view/step_quiz_table/ui/delegate/TableStepQuizFormDelegate.kt index 744751bd36..d18ec2a157 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_table/ui/delegate/TableStepQuizFormDelegate.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_table/ui/delegate/TableStepQuizFormDelegate.kt @@ -19,7 +19,7 @@ import org.stepik.android.view.step_quiz_table.ui.adapter.delegate.TableSelectio import org.stepik.android.view.step_quiz_table.ui.fragment.TableColumnSelectionBottomSheetDialogFragment import org.stepik.android.view.step_quiz_table.ui.mapper.TableSelectionItemMapper import org.stepik.android.view.step_quiz_table.ui.model.TableSelectionItem -import ru.nobird.android.core.model.mutate +import ru.nobird.app.core.model.mutate import ru.nobird.android.ui.adapters.DefaultDelegateAdapter import ru.nobird.android.view.base.ui.extension.showIfNotExists diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_table/ui/fragment/TableStepQuizFragment.kt b/app/src/main/java/org/stepik/android/view/step_quiz_table/ui/fragment/TableStepQuizFragment.kt index 54b1adcbba..e0a93ccdcb 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_table/ui/fragment/TableStepQuizFragment.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_table/ui/fragment/TableStepQuizFragment.kt @@ -9,7 +9,7 @@ import org.stepik.android.presentation.step_quiz.StepQuizFeature import org.stepik.android.view.step_quiz.ui.delegate.StepQuizFormDelegate import org.stepik.android.view.step_quiz.ui.fragment.DefaultStepQuizFragment import org.stepik.android.view.step_quiz_table.ui.delegate.TableStepQuizFormDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView class TableStepQuizFragment : DefaultStepQuizFragment(), diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_table/ui/model/TableSelectionItem.kt b/app/src/main/java/org/stepik/android/view/step_quiz_table/ui/model/TableSelectionItem.kt index 44939cce84..1d1a1934db 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_table/ui/model/TableSelectionItem.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_table/ui/model/TableSelectionItem.kt @@ -1,7 +1,7 @@ package org.stepik.android.view.step_quiz_table.ui.model import org.stepik.android.model.Cell -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable data class TableSelectionItem( override val id: Int, diff --git a/app/src/main/java/org/stepik/android/view/step_quiz_text/ui/fragment/TextStepQuizFragment.kt b/app/src/main/java/org/stepik/android/view/step_quiz_text/ui/fragment/TextStepQuizFragment.kt index 548cd913e3..6ededf2de7 100644 --- a/app/src/main/java/org/stepik/android/view/step_quiz_text/ui/fragment/TextStepQuizFragment.kt +++ b/app/src/main/java/org/stepik/android/view/step_quiz_text/ui/fragment/TextStepQuizFragment.kt @@ -8,7 +8,7 @@ import org.stepik.android.presentation.step_quiz.StepQuizFeature import org.stepik.android.view.step_quiz.ui.delegate.StepQuizFormDelegate import org.stepik.android.view.step_quiz.ui.fragment.DefaultStepQuizFragment import org.stepik.android.view.step_quiz_text.ui.delegate.TextStepQuizFormDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView class TextStepQuizFragment : DefaultStepQuizFragment(), diff --git a/app/src/main/java/org/stepik/android/view/stories/ui/fragment/StoriesFragment.kt b/app/src/main/java/org/stepik/android/view/stories/ui/fragment/StoriesFragment.kt index 9337ac9377..fdf282a40b 100644 --- a/app/src/main/java/org/stepik/android/view/stories/ui/fragment/StoriesFragment.kt +++ b/app/src/main/java/org/stepik/android/view/stories/ui/fragment/StoriesFragment.kt @@ -14,7 +14,7 @@ import org.stepic.droid.features.stories.ui.activity.StoriesActivity import org.stepic.droid.features.stories.ui.adapter.StoriesAdapter import org.stepik.android.presentation.stories.StoriesFeature import org.stepik.android.view.stories.viewmodel.StoriesViewModel -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.stories.transition.SharedTransitionIntentBuilder import ru.nobird.android.stories.transition.SharedTransitionsManager import ru.nobird.android.stories.ui.delegate.SharedTransitionContainerDelegate diff --git a/app/src/main/java/org/stepik/android/view/stories/viewmodel/StoriesViewModel.kt b/app/src/main/java/org/stepik/android/view/stories/viewmodel/StoriesViewModel.kt index b850f74707..2b7fb425d3 100644 --- a/app/src/main/java/org/stepik/android/view/stories/viewmodel/StoriesViewModel.kt +++ b/app/src/main/java/org/stepik/android/view/stories/viewmodel/StoriesViewModel.kt @@ -1,7 +1,7 @@ package org.stepik.android.view.stories.viewmodel import org.stepik.android.presentation.stories.StoriesFeature -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class StoriesViewModel( diff --git a/app/src/main/java/org/stepik/android/view/story/viewmodel/StoryViewModel.kt b/app/src/main/java/org/stepik/android/view/story/viewmodel/StoryViewModel.kt index 0fd151598c..828bf8b19c 100644 --- a/app/src/main/java/org/stepik/android/view/story/viewmodel/StoryViewModel.kt +++ b/app/src/main/java/org/stepik/android/view/story/viewmodel/StoryViewModel.kt @@ -1,7 +1,7 @@ package org.stepik.android.view.story.viewmodel import org.stepik.android.presentation.story.StoryFeature -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class StoryViewModel( diff --git a/app/src/main/java/org/stepik/android/view/submission/ui/dialog/SubmissionsDialogFragment.kt b/app/src/main/java/org/stepik/android/view/submission/ui/dialog/SubmissionsDialogFragment.kt index 81036cbbdb..9231cedaee 100644 --- a/app/src/main/java/org/stepik/android/view/submission/ui/dialog/SubmissionsDialogFragment.kt +++ b/app/src/main/java/org/stepik/android/view/submission/ui/dialog/SubmissionsDialogFragment.kt @@ -45,7 +45,7 @@ import org.stepik.android.view.step_quiz_review.routing.StepQuizReviewDeepLinkBu import org.stepik.android.view.submission.routing.SubmissionDeepLinkBuilder import org.stepik.android.view.submission.ui.adapter.delegate.SubmissionDataAdapterDelegate import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.core.model.PaginationDirection +import ru.nobird.app.core.model.PaginationDirection import ru.nobird.android.ui.adapterdelegates.dsl.adapterDelegate import ru.nobird.android.ui.adapters.DefaultDelegateAdapter import ru.nobird.android.view.base.ui.extension.argument diff --git a/app/src/main/java/org/stepik/android/view/user_reviews/ui/fragment/UserReviewsFragment.kt b/app/src/main/java/org/stepik/android/view/user_reviews/ui/fragment/UserReviewsFragment.kt index d710708850..841cbce7d2 100644 --- a/app/src/main/java/org/stepik/android/view/user_reviews/ui/fragment/UserReviewsFragment.kt +++ b/app/src/main/java/org/stepik/android/view/user_reviews/ui/fragment/UserReviewsFragment.kt @@ -31,7 +31,7 @@ import org.stepik.android.view.user_reviews.ui.adapter.delegate.UserReviewsPoten import org.stepik.android.view.user_reviews.ui.adapter.delegate.UserReviewsPotentialHeaderAdapterDelegate import org.stepik.android.view.user_reviews.ui.adapter.delegate.UserReviewsReviewedAdapterDelegate import org.stepik.android.view.user_reviews.ui.adapter.delegate.UserReviewsReviewedHeaderAdapterDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.ui.adapters.DefaultDelegateAdapter import ru.nobird.android.view.base.ui.delegate.ViewStateDelegate import ru.nobird.android.view.base.ui.extension.showIfNotExists diff --git a/app/src/stageDebuggable/java/org/stepik/android/domain/debug/model/SplitTestData.kt b/app/src/stageDebuggable/java/org/stepik/android/domain/debug/model/SplitTestData.kt index 7cd60d87a5..39368bd9c6 100644 --- a/app/src/stageDebuggable/java/org/stepik/android/domain/debug/model/SplitTestData.kt +++ b/app/src/stageDebuggable/java/org/stepik/android/domain/debug/model/SplitTestData.kt @@ -1,6 +1,6 @@ package org.stepik.android.domain.debug.model -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable data class SplitTestData( val splitTestName: String, diff --git a/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/DebugViewModel.kt b/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/DebugViewModel.kt index 991e3063bd..e3f5b53d6a 100644 --- a/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/DebugViewModel.kt +++ b/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/DebugViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.debug -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class DebugViewModel( diff --git a/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/InAppPurchasesViewModel.kt b/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/InAppPurchasesViewModel.kt index 0232ea333b..af3ed5b156 100644 --- a/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/InAppPurchasesViewModel.kt +++ b/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/InAppPurchasesViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.debug -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class InAppPurchasesViewModel( diff --git a/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/SplitTestsViewModel.kt b/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/SplitTestsViewModel.kt index 6bbf6ef979..654439caef 100644 --- a/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/SplitTestsViewModel.kt +++ b/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/SplitTestsViewModel.kt @@ -1,6 +1,6 @@ package org.stepik.android.presentation.debug -import ru.nobird.android.presentation.redux.container.ReduxViewContainer +import ru.nobird.app.presentation.redux.container.ReduxViewContainer import ru.nobird.android.view.redux.viewmodel.ReduxViewModel class SplitTestsViewModel( diff --git a/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/reducer/DebugReducer.kt b/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/reducer/DebugReducer.kt index f71958c71b..e6cbf80068 100644 --- a/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/reducer/DebugReducer.kt +++ b/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/reducer/DebugReducer.kt @@ -4,7 +4,7 @@ import org.stepik.android.domain.debug.model.EndpointConfig import org.stepik.android.presentation.debug.DebugFeature.State import org.stepik.android.presentation.debug.DebugFeature.Message import org.stepik.android.presentation.debug.DebugFeature.Action -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class DebugReducer diff --git a/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/reducer/InAppPurchasesReducer.kt b/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/reducer/InAppPurchasesReducer.kt index 7c99c25d92..5e6b441ec2 100644 --- a/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/reducer/InAppPurchasesReducer.kt +++ b/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/reducer/InAppPurchasesReducer.kt @@ -3,9 +3,9 @@ package org.stepik.android.presentation.debug.reducer import org.stepik.android.presentation.debug.InAppPurchasesFeature.State import org.stepik.android.presentation.debug.InAppPurchasesFeature.Message import org.stepik.android.presentation.debug.InAppPurchasesFeature.Action -import ru.nobird.android.core.model.mutate +import ru.nobird.app.core.model.mutate -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class InAppPurchasesReducer diff --git a/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/reducer/SplitTestsReducer.kt b/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/reducer/SplitTestsReducer.kt index 73e542323c..d1e99c1174 100644 --- a/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/reducer/SplitTestsReducer.kt +++ b/app/src/stageDebuggable/java/org/stepik/android/presentation/debug/reducer/SplitTestsReducer.kt @@ -3,8 +3,8 @@ package org.stepik.android.presentation.debug.reducer import org.stepik.android.presentation.debug.SplitTestsFeature.State import org.stepik.android.presentation.debug.SplitTestsFeature.Message import org.stepik.android.presentation.debug.SplitTestsFeature.Action -import ru.nobird.android.core.model.mutate -import ru.nobird.android.presentation.redux.reducer.StateReducer +import ru.nobird.app.core.model.mutate +import ru.nobird.app.presentation.redux.reducer.StateReducer import javax.inject.Inject class SplitTestsReducer diff --git a/app/src/stageDebuggable/java/org/stepik/android/view/debug/ui/activity/InAppPurchasesActivity.kt b/app/src/stageDebuggable/java/org/stepik/android/view/debug/ui/activity/InAppPurchasesActivity.kt index ca50964456..d0aacea865 100644 --- a/app/src/stageDebuggable/java/org/stepik/android/view/debug/ui/activity/InAppPurchasesActivity.kt +++ b/app/src/stageDebuggable/java/org/stepik/android/view/debug/ui/activity/InAppPurchasesActivity.kt @@ -21,7 +21,7 @@ import org.stepik.android.presentation.debug.InAppPurchasesFeature import org.stepik.android.presentation.debug.InAppPurchasesViewModel import org.stepik.android.view.debug.ui.adapter.delegate.InAppPurchaseAdapterDelegate import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.ui.adapters.DefaultDelegateAdapter import ru.nobird.android.view.redux.ui.extension.reduxViewModel import javax.inject.Inject diff --git a/app/src/stageDebuggable/java/org/stepik/android/view/debug/ui/dialog/SplitTestsDialogFragment.kt b/app/src/stageDebuggable/java/org/stepik/android/view/debug/ui/dialog/SplitTestsDialogFragment.kt index 346e17e1ec..cf935a2c72 100644 --- a/app/src/stageDebuggable/java/org/stepik/android/view/debug/ui/dialog/SplitTestsDialogFragment.kt +++ b/app/src/stageDebuggable/java/org/stepik/android/view/debug/ui/dialog/SplitTestsDialogFragment.kt @@ -19,7 +19,7 @@ import org.stepik.android.domain.debug.model.SplitTestData import org.stepik.android.presentation.debug.SplitTestsFeature import org.stepik.android.presentation.debug.SplitTestsViewModel import org.stepik.android.view.debug.ui.adapter.delegate.SplitTestDataAdapterDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.ui.adapters.DefaultDelegateAdapter import ru.nobird.android.view.redux.ui.extension.reduxViewModel import javax.inject.Inject diff --git a/app/src/stageDebuggable/java/org/stepik/android/view/debug/ui/fragment/DebugFragment.kt b/app/src/stageDebuggable/java/org/stepik/android/view/debug/ui/fragment/DebugFragment.kt index ab83cb8c12..9962150201 100644 --- a/app/src/stageDebuggable/java/org/stepik/android/view/debug/ui/fragment/DebugFragment.kt +++ b/app/src/stageDebuggable/java/org/stepik/android/view/debug/ui/fragment/DebugFragment.kt @@ -14,7 +14,7 @@ import org.stepic.droid.util.copyTextToClipboard import org.stepik.android.presentation.debug.DebugFeature import org.stepik.android.presentation.debug.DebugViewModel import org.stepik.android.view.ui.delegate.ViewStateDelegate -import ru.nobird.android.presentation.redux.container.ReduxView +import ru.nobird.app.presentation.redux.container.ReduxView import ru.nobird.android.view.redux.ui.extension.reduxViewModel import javax.inject.Inject import android.content.Intent diff --git a/app/src/stageDebuggable/java/org/stepik/android/view/injection/debug/DebugPresentationModule.kt b/app/src/stageDebuggable/java/org/stepik/android/view/injection/debug/DebugPresentationModule.kt index 185b48b20a..e5fa1402d7 100644 --- a/app/src/stageDebuggable/java/org/stepik/android/view/injection/debug/DebugPresentationModule.kt +++ b/app/src/stageDebuggable/java/org/stepik/android/view/injection/debug/DebugPresentationModule.kt @@ -9,9 +9,9 @@ import org.stepik.android.presentation.debug.DebugFeature import org.stepik.android.presentation.debug.DebugViewModel import org.stepik.android.presentation.debug.dispatcher.DebugActionDispatcher import org.stepik.android.presentation.debug.reducer.DebugReducer -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object DebugPresentationModule { diff --git a/app/src/stageDebuggable/java/org/stepik/android/view/injection/debug/InAppPurchasesPresentationModule.kt b/app/src/stageDebuggable/java/org/stepik/android/view/injection/debug/InAppPurchasesPresentationModule.kt index 0442178971..8dc793e11a 100644 --- a/app/src/stageDebuggable/java/org/stepik/android/view/injection/debug/InAppPurchasesPresentationModule.kt +++ b/app/src/stageDebuggable/java/org/stepik/android/view/injection/debug/InAppPurchasesPresentationModule.kt @@ -9,9 +9,9 @@ import org.stepik.android.presentation.debug.InAppPurchasesFeature import org.stepik.android.presentation.debug.InAppPurchasesViewModel import org.stepik.android.presentation.debug.dispatcher.InAppPurchasesActionDispatcher import org.stepik.android.presentation.debug.reducer.InAppPurchasesReducer -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object InAppPurchasesPresentationModule { diff --git a/app/src/stageDebuggable/java/org/stepik/android/view/injection/debug/SplitTestsPresentationModule.kt b/app/src/stageDebuggable/java/org/stepik/android/view/injection/debug/SplitTestsPresentationModule.kt index 127bf67709..8296d78e53 100644 --- a/app/src/stageDebuggable/java/org/stepik/android/view/injection/debug/SplitTestsPresentationModule.kt +++ b/app/src/stageDebuggable/java/org/stepik/android/view/injection/debug/SplitTestsPresentationModule.kt @@ -9,9 +9,9 @@ import org.stepik.android.presentation.debug.SplitTestsFeature import org.stepik.android.presentation.debug.SplitTestsViewModel import org.stepik.android.presentation.debug.dispatcher.SplitTestsActionDispatcher import org.stepik.android.presentation.debug.reducer.SplitTestsReducer -import ru.nobird.android.presentation.redux.container.wrapWithViewContainer -import ru.nobird.android.presentation.redux.dispatcher.wrapWithActionDispatcher -import ru.nobird.android.presentation.redux.feature.ReduxFeature +import ru.nobird.app.presentation.redux.container.wrapWithViewContainer +import ru.nobird.app.presentation.redux.dispatcher.wrapWithActionDispatcher +import ru.nobird.app.presentation.redux.feature.ReduxFeature @Module object SplitTestsPresentationModule { diff --git a/app/src/test/java/org/stepik/android/data/search/SearchRepositoryTest.kt b/app/src/test/java/org/stepik/android/data/search/SearchRepositoryTest.kt index 8a304f608d..b503c0df92 100644 --- a/app/src/test/java/org/stepik/android/data/search/SearchRepositoryTest.kt +++ b/app/src/test/java/org/stepik/android/data/search/SearchRepositoryTest.kt @@ -9,7 +9,7 @@ import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.Mockito.mock import org.mockito.junit.MockitoJUnitRunner -import ru.nobird.android.core.model.PagedList +import ru.nobird.app.core.model.PagedList import org.stepik.android.data.search_result.repository.SearchResultRepositoryImpl import org.stepik.android.data.search_result.source.SearchResultRemoteDataSource import org.stepik.android.domain.filter.model.CourseListFilterQuery diff --git a/billing/build.gradle b/billing/build.gradle index 604cd1e168..3f9d27da64 100644 --- a/billing/build.gradle +++ b/billing/build.gradle @@ -41,6 +41,7 @@ dependencies { implementation libraries.rxRelay implementation libraries.domainRx implementation libraries.viewInjection + implementation libraries.model testImplementation libraries.junit testImplementation libraries.robolectric diff --git a/dependencies.gradle b/dependencies.gradle index 583a197dd9..bb8669258f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ ext.versions = [ minSdk : 21, targetSdk : 30, - compileSdk : 30, + compileSdk : 31, buildTools : '30.0.2', androidGradlePlugin : '7.0.1', @@ -38,13 +38,13 @@ ext.versions = [ archComponents : '2.2.0', media : '1.1.0', multidex : '2.0.1', - adapters : '1.1.0', + adapters : '1.1.1', presentationBase : '1.1.1', - presentationRedux : '1.1.0', - viewUI : '1.0.11', - viewRedux : '1.0.9', - viewInjection : '1.0.1', - model : '1.0.6', + presentationRedux : '1.3.0', + viewUI : '1.1.0', + viewRedux : '1.3.0', + viewInjection : '1.1.0', + model : '1.0.7', domainRx : '1.0.1', viewBindingDelegate : '1.4.7', multisnaprecycler : '2.0.3', @@ -161,14 +161,14 @@ ext.libraries = [ adapters : "ru.nobird.android.ui:adapters:$versions.adapters", adapterDelegates : "ru.nobird.android.ui:adapter-delegates:$versions.adapters", presentationBase : "ru.nobird.android.presentation:base:$versions.presentationBase", - presentationRedux : "ru.nobird.android.presentation:redux:$versions.presentationRedux", + presentationRedux : "ru.nobird.app.presentation:presentation-redux:$versions.presentationRedux", presentationReduxRx : "ru.nobird.android.presentation:redux-rx:$versions.presentationRedux", viewUI : "ru.nobird.android.view:ui:$versions.viewUI", viewRedux : "ru.nobird.android.view:redux:$versions.viewRedux", ], domainRx : "ru.nobird.android.domain:rx:$versions.domainRx", viewInjection : "ru.nobird.android.view:injection:$versions.viewInjection", - model : "ru.nobird.android.core:model:$versions.model", + model : "ru.nobird.app.core:model:$versions.model", viewBindingDelegate : "com.github.kirich1409:viewbindingpropertydelegate-noreflection:$versions.viewBindingDelegate", multisnaprecycler : "com.github.takusemba:multisnaprecyclerview:$versions.multisnaprecycler", diff --git a/model/src/main/java/org/stepik/android/model/Assignment.kt b/model/src/main/java/org/stepik/android/model/Assignment.kt index b8fd93af29..29313778fd 100644 --- a/model/src/main/java/org/stepik/android/model/Assignment.kt +++ b/model/src/main/java/org/stepik/android/model/Assignment.kt @@ -1,7 +1,7 @@ package org.stepik.android.model import com.google.gson.annotations.SerializedName -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable import java.util.* class Assignment( diff --git a/model/src/main/java/org/stepik/android/model/Cell.kt b/model/src/main/java/org/stepik/android/model/Cell.kt index 5374234cf0..d8248fb736 100644 --- a/model/src/main/java/org/stepik/android/model/Cell.kt +++ b/model/src/main/java/org/stepik/android/model/Cell.kt @@ -3,7 +3,7 @@ package org.stepik.android.model import android.os.Parcelable import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable @Parcelize data class Cell( diff --git a/model/src/main/java/org/stepik/android/model/Course.kt b/model/src/main/java/org/stepik/android/model/Course.kt index a6d8af9fda..2b6dec0d2c 100644 --- a/model/src/main/java/org/stepik/android/model/Course.kt +++ b/model/src/main/java/org/stepik/android/model/Course.kt @@ -3,7 +3,7 @@ package org.stepik.android.model import android.os.Parcelable import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable import java.util.Date @Parcelize diff --git a/model/src/main/java/org/stepik/android/model/CourseCollection.kt b/model/src/main/java/org/stepik/android/model/CourseCollection.kt index 457939dd87..471f399963 100644 --- a/model/src/main/java/org/stepik/android/model/CourseCollection.kt +++ b/model/src/main/java/org/stepik/android/model/CourseCollection.kt @@ -3,7 +3,7 @@ package org.stepik.android.model import android.os.Parcelable import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable @Parcelize data class CourseCollection( diff --git a/model/src/main/java/org/stepik/android/model/Lesson.kt b/model/src/main/java/org/stepik/android/model/Lesson.kt index 491d6eeea6..0efd602d75 100644 --- a/model/src/main/java/org/stepik/android/model/Lesson.kt +++ b/model/src/main/java/org/stepik/android/model/Lesson.kt @@ -4,7 +4,7 @@ import android.os.Parcelable import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.IgnoredOnParcel import kotlinx.android.parcel.Parcelize -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable import java.util.Date @Parcelize diff --git a/model/src/main/java/org/stepik/android/model/PlatformType.kt b/model/src/main/java/org/stepik/android/model/PlatformType.kt index 0a67697aea..97e54f3e76 100644 --- a/model/src/main/java/org/stepik/android/model/PlatformType.kt +++ b/model/src/main/java/org/stepik/android/model/PlatformType.kt @@ -1,6 +1,6 @@ package org.stepik.android.model -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable enum class PlatformType( override val id: Int, diff --git a/model/src/main/java/org/stepik/android/model/Progress.kt b/model/src/main/java/org/stepik/android/model/Progress.kt index b95cf1cfab..8290fe87fd 100644 --- a/model/src/main/java/org/stepik/android/model/Progress.kt +++ b/model/src/main/java/org/stepik/android/model/Progress.kt @@ -3,7 +3,7 @@ package org.stepik.android.model import android.os.Parcelable import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable @Parcelize data class Progress( diff --git a/model/src/main/java/org/stepik/android/model/Section.kt b/model/src/main/java/org/stepik/android/model/Section.kt index 74f669f6c4..084fa97016 100644 --- a/model/src/main/java/org/stepik/android/model/Section.kt +++ b/model/src/main/java/org/stepik/android/model/Section.kt @@ -3,7 +3,7 @@ package org.stepik.android.model import android.os.Parcelable import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable import java.util.Date @Parcelize diff --git a/model/src/main/java/org/stepik/android/model/Unit.kt b/model/src/main/java/org/stepik/android/model/Unit.kt index 50e666f26f..e22763bea8 100644 --- a/model/src/main/java/org/stepik/android/model/Unit.kt +++ b/model/src/main/java/org/stepik/android/model/Unit.kt @@ -3,7 +3,7 @@ package org.stepik.android.model import android.os.Parcelable import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable import java.util.Date @Parcelize diff --git a/model/src/main/java/org/stepik/android/model/user/EmailAddress.kt b/model/src/main/java/org/stepik/android/model/user/EmailAddress.kt index 6a0bb6a271..ed19daf327 100644 --- a/model/src/main/java/org/stepik/android/model/user/EmailAddress.kt +++ b/model/src/main/java/org/stepik/android/model/user/EmailAddress.kt @@ -1,7 +1,7 @@ package org.stepik.android.model.user import com.google.gson.annotations.SerializedName -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable data class EmailAddress( @SerializedName("id") diff --git a/model/src/main/java/org/stepik/android/model/user/User.kt b/model/src/main/java/org/stepik/android/model/user/User.kt index b88a5a40a3..99e5949674 100644 --- a/model/src/main/java/org/stepik/android/model/user/User.kt +++ b/model/src/main/java/org/stepik/android/model/user/User.kt @@ -3,7 +3,7 @@ package org.stepik.android.model.user import android.os.Parcelable import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize -import ru.nobird.android.core.model.Identifiable +import ru.nobird.app.core.model.Identifiable import java.util.Date @Parcelize diff --git a/model/src/main/java/org/stepik/android/model/util/ParcelableExtensions.kt b/model/src/main/java/org/stepik/android/model/util/ParcelableExtensions.kt index 56f9febea7..ed06de2927 100644 --- a/model/src/main/java/org/stepik/android/model/util/ParcelableExtensions.kt +++ b/model/src/main/java/org/stepik/android/model/util/ParcelableExtensions.kt @@ -2,7 +2,7 @@ package org.stepik.android.model.util import android.os.Parcel import android.os.Parcelable -import ru.nobird.android.core.model.putNullable +import ru.nobird.app.core.model.putNullable import java.util.Date private fun getParcelableWriter(flags: Int): Parcel.(Parcelable) -> Unit = { writeParcelable(it, flags) }