Merge pull request #944 from StepicOrg/release/1.208

Release/1.208

androidsvg/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion versions.compileSdk
     buildToolsVersion versions.buildTools
 
     defaultConfig {

app/build.gradle

@@ -83,6 +83,12 @@ android {
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
+
+            firebaseCrashlytics {
+                nativeSymbolUploadEnabled true
+                strippedNativeLibsDir 'build/intermediates/stripped_native_libs/release/out/lib'
+                unstrippedNativeLibsDir 'build/intermediates/merged_native_libs/release/out/lib'
+            }
         }
         debug {
             minifyEnabled false
@@ -236,6 +242,7 @@ dependencies {
     implementation(libraries.crashlytics) {
         transitive = true
     }
+    implementation libraries.crashlyticsNdk
 
     testImplementation libraries.junit
     testImplementation libraries.robolectric
@@ -263,6 +270,10 @@ dependencies {
     releaseImplementation libraries.flipperNoop
 }
 
+afterEvaluate {
+    bundleRelease { finalizedBy(":app:uploadCrashlyticsSymbolFileRelease")}
+}
+
 apply plugin: 'com.google.gms.google-services'
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Release")) {
     apply plugin: 'com.getkeepsafe.dexcount'

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,

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(

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<InAppPurchasesFeature.State, InAppPurchasesFeature.Message, InAppPurchasesFeature.Action.ViewAction>

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(

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

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

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

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

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

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<DebugFeature.State, DebugFeature.Action.ViewAction> {
+class DebugFragment : Fragment(R.layout.fragment_debug),
+    ReduxView<DebugFeature.State, DebugFeature.Action.ViewAction> {
     companion object {
         fun newInstance(): Fragment =
             DebugFragment()

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 {

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 {

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 {

app/src/main/AndroidManifest.xml

@@ -8,11 +8,6 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="18" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="18" />
-    <uses-permission android:name="android.permission.STORAGE" />
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.WRITE_CALENDAR" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

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

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

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

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

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,

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(

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

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

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

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

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

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
 

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<ID, Item : Identifiable<ID>>(

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

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 {

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 {

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

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
 

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

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

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<PagedList<CourseBenefitByMonth>>

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<PagedList<CourseBenefit>>

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