From c5ff3e398da554ee0410d9720c7d8e324c42710e Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Tue, 18 Sep 2018 12:44:41 +0300
Subject: [PATCH 01/30] add stories kit

---
 app/build.gradle    | 1 +
 build.gradle        | 2 ++
 dependencies.gradle | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 15e8b066ce..a5cccd132e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -172,6 +172,7 @@ dependencies {
     implementation libraries.MPAndroidChart
 
     implementation libraries.shortcutBadger
+    implementation libraries.StoriesKit
 
     debugImplementation libraries.leakCanary
     releaseImplementation libraries.leakCanaryNoOp
diff --git a/build.gradle b/build.gradle
index 654a132d6b..a9961a9fa1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,7 @@ buildscript {
         google()
         maven { url "https://jitpack.io" }
         maven { url "https://maven.fabric.io/public" }
+        maven { url "https://dl.bintray.com/eadm/ru.nobird.android" }
     }
     dependencies {
         classpath gradlePlugins.android
@@ -27,6 +28,7 @@ allprojects {
         jcenter()
         google()
         maven { url "https://jitpack.io" }
+        maven { url "https://dl.bintray.com/eadm/ru.nobird.android" }
     }
 }
 
diff --git a/dependencies.gradle b/dependencies.gradle
index 26602e7074..0ff19b4bfc 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -59,6 +59,7 @@ ext.versions = [
         MPAndroidChart       : 'v3.0.3',
 
         shortcutBadger       : '1.1.19@aar',
+        StoriesKit           : '1.0.0@aar',
 
         stetho               : '1.4.2',
         leakCanary           : '1.5.1',
@@ -144,6 +145,7 @@ ext.libraries = [
         MPAndroidChart       : "com.github.PhilJay:MPAndroidChart:$versions.MPAndroidChart",
 
         shortcutBadger       : "me.leolin:ShortcutBadger:$versions.shortcutBadger",
+        StoriesKit           : "ru.nobird.android:storieskit:$versions.StoriesKit",
 
         // Developer Tools
         leakCanary           : "com.squareup.leakcanary:leakcanary-android:$versions.leakCanary",

From d3902c81131b2663d058c1f8ad846c18410503a2 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Tue, 18 Sep 2018 12:44:56 +0300
Subject: [PATCH 02/30] fix null cursor handling

---
 .../droid/persistence/storage/dao/SystemDownloadsDaoImpl.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/stepic/droid/persistence/storage/dao/SystemDownloadsDaoImpl.kt b/app/src/main/java/org/stepic/droid/persistence/storage/dao/SystemDownloadsDaoImpl.kt
index 8c1511cd5e..464ab9d48c 100644
--- a/app/src/main/java/org/stepic/droid/persistence/storage/dao/SystemDownloadsDaoImpl.kt
+++ b/app/src/main/java/org/stepic/droid/persistence/storage/dao/SystemDownloadsDaoImpl.kt
@@ -16,7 +16,7 @@ constructor(
         Observable.just(emptyList())
     } else {
         Observable.create<SystemDownloadRecord> { emitter ->
-            downloadManager.query(DownloadManager.Query().setFilterById(*ids)).use { cursor ->
+            downloadManager.query(DownloadManager.Query().setFilterById(*ids))?.use { cursor ->
                 while (cursor.moveToNext()) {
                     emitter.onNext(SystemDownloadRecord(
                             id = cursor.getLong(cursor.getColumnIndex(DownloadManager.COLUMN_ID)),

From ec3db3f8fdfdeb905b30110d2480266d2d32af04 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Tue, 18 Sep 2018 13:17:25 +0300
Subject: [PATCH 03/30] add story templates model

---
 .../org/stepik/android/model/StoryTemplate.kt | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 model/src/main/java/org/stepik/android/model/StoryTemplate.kt

diff --git a/model/src/main/java/org/stepik/android/model/StoryTemplate.kt b/model/src/main/java/org/stepik/android/model/StoryTemplate.kt
new file mode 100644
index 0000000000..9bb8555983
--- /dev/null
+++ b/model/src/main/java/org/stepik/android/model/StoryTemplate.kt
@@ -0,0 +1,56 @@
+package org.stepik.android.model
+
+import com.google.gson.annotations.SerializedName
+
+data class StoryTemplate(
+        val id: Long,
+        val cover: String,
+        val title: String,
+
+        @SerializedName("is_published")
+        val isPublished: Boolean,
+
+        val parts: List<Part>,
+
+        val language: String,
+        val position: Int,
+        val version: Int
+) {
+    data class Part(
+            val duration: Long,
+            val image: String,
+            val position: Int,
+            val type: String,
+
+            val button: Button?,
+            val text: Text?
+    )
+
+    data class Text(
+            @SerializedName("background_style")
+            val backgroundStyle: String,
+
+            @SerializedName("text")
+            val text: String,
+
+            @SerializedName("text_color")
+            val textColor: String,
+
+            @SerializedName("title")
+            val title: String
+    )
+
+    data class Button(
+            @SerializedName("background_color")
+            val backgroundColor: String,
+
+            @SerializedName("text_color")
+            val textColor: String,
+
+            @SerializedName("title")
+            val title: String,
+
+            @SerializedName("url")
+            val url: String
+    )
+}
\ No newline at end of file

From 59084d4dc200b3b10461d2a7e49816a59e8a0132 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Tue, 18 Sep 2018 14:53:12 +0300
Subject: [PATCH 04/30] StoryTemplates dao + api call + repository

---
 .../stepic/droid/di/network/NetworkModule.kt  |  5 ++
 .../droid/di/storage/StorageComponent.kt      |  4 ++
 .../stepic/droid/di/storage/StorageModule.kt  |  6 +++
 .../stories/model/ViewedStoryTemplate.kt      |  3 ++
 .../repository/StoryTemplatesRepository.kt    | 13 +++++
 .../StoryTemplatesRepositoryImpl.kt           | 52 +++++++++++++++++++
 .../dao/ViewedStoryTemplatesDaoImpl.kt        | 32 ++++++++++++
 .../DbStructureViewedStoryTemplates.kt        | 21 ++++++++
 .../storage/operations/DatabaseFacade.kt      |  5 +-
 .../main/java/org/stepic/droid/web/Api.java   |  4 ++
 .../java/org/stepic/droid/web/ApiImpl.java    | 10 +++-
 .../droid/web/StepicRestLoggedService.java    |  8 +++
 .../story_templates/StoryTemplatesResponse.kt | 13 +++++
 13 files changed, 174 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/org/stepic/droid/features/stories/model/ViewedStoryTemplate.kt
 create mode 100644 app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepository.kt
 create mode 100644 app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepositoryImpl.kt
 create mode 100644 app/src/main/java/org/stepic/droid/features/stories/storage/dao/ViewedStoryTemplatesDaoImpl.kt
 create mode 100644 app/src/main/java/org/stepic/droid/features/stories/storage/structure/DbStructureViewedStoryTemplates.kt
 create mode 100644 app/src/main/java/org/stepic/droid/web/model/story_templates/StoryTemplatesResponse.kt

diff --git a/app/src/main/java/org/stepic/droid/di/network/NetworkModule.kt b/app/src/main/java/org/stepic/droid/di/network/NetworkModule.kt
index 62a6c54b00..95e79d30cb 100644
--- a/app/src/main/java/org/stepic/droid/di/network/NetworkModule.kt
+++ b/app/src/main/java/org/stepic/droid/di/network/NetworkModule.kt
@@ -8,6 +8,8 @@ import org.stepic.droid.features.achievements.repository.AchievementsRepository
 import org.stepic.droid.features.achievements.repository.AchievementsRepositoryImpl
 import org.stepic.droid.features.deadlines.repository.DeadlinesRepository
 import org.stepic.droid.features.deadlines.repository.DeadlinesRepositoryImpl
+import org.stepic.droid.features.stories.repository.StoryTemplatesRepository
+import org.stepic.droid.features.stories.repository.StoryTemplatesRepositoryImpl
 import org.stepic.droid.web.ApiImpl
 import org.stepic.droid.web.StepicRestLoggedService
 import org.stepic.droid.web.achievements.AchievementsService
@@ -23,6 +25,9 @@ abstract class NetworkModule {
     @AppSingleton
     abstract fun bindAchievementsRepository(achievementsRepositoryImpl: AchievementsRepositoryImpl): AchievementsRepository
 
+    @Binds
+    abstract fun bindStoryTemplatesRepository(storyTemplatesRepositoryImpl: StoryTemplatesRepositoryImpl): StoryTemplatesRepository
+
     @Module
     companion object {
         @Provides
diff --git a/app/src/main/java/org/stepic/droid/di/storage/StorageComponent.kt b/app/src/main/java/org/stepic/droid/di/storage/StorageComponent.kt
index 6520e4ed7b..8636ecda86 100644
--- a/app/src/main/java/org/stepic/droid/di/storage/StorageComponent.kt
+++ b/app/src/main/java/org/stepic/droid/di/storage/StorageComponent.kt
@@ -5,8 +5,10 @@ import dagger.BindsInstance
 import dagger.Component
 import org.stepic.droid.features.deadlines.storage.dao.DeadlinesBannerDao
 import org.stepic.droid.features.deadlines.storage.operations.DeadlinesRecordOperations
+import org.stepic.droid.features.stories.model.ViewedStoryTemplate
 import org.stepic.droid.persistence.storage.dao.PersistentItemDao
 import org.stepic.droid.persistence.storage.dao.PersistentStateDao
+import org.stepic.droid.storage.dao.IDao
 import org.stepic.droid.storage.operations.DatabaseFacade
 
 @Component(modules = [StorageModule::class])
@@ -27,4 +29,6 @@ interface StorageComponent {
     val deadlinesBannerDao: DeadlinesBannerDao
     val persistentItemDao: PersistentItemDao
     val persistentStateDao: PersistentStateDao
+
+    val viewedStoryTemplatesDao: IDao<ViewedStoryTemplate>
 }
diff --git a/app/src/main/java/org/stepic/droid/di/storage/StorageModule.kt b/app/src/main/java/org/stepic/droid/di/storage/StorageModule.kt
index a59d6679ec..9d50ce776c 100644
--- a/app/src/main/java/org/stepic/droid/di/storage/StorageModule.kt
+++ b/app/src/main/java/org/stepic/droid/di/storage/StorageModule.kt
@@ -15,6 +15,8 @@ import org.stepic.droid.features.deadlines.storage.operations.DeadlinesRecordOpe
 import org.stepic.droid.features.deadlines.storage.operations.DeadlinesRecordOperationsImpl
 import org.stepic.droid.features.deadlines.storage.dao.PersonalDeadlinesDao
 import org.stepic.droid.features.deadlines.storage.dao.PersonalDeadlinesDaoImpl
+import org.stepic.droid.features.stories.model.ViewedStoryTemplate
+import org.stepic.droid.features.stories.storage.dao.ViewedStoryTemplatesDaoImpl
 import org.stepic.droid.jsonHelpers.adapters.UTCDateAdapter
 import org.stepic.droid.model.*
 import org.stepic.droid.model.code.CodeSubmission
@@ -136,6 +138,10 @@ abstract class StorageModule {
     @Binds
     internal abstract fun providePersistentStateDao(persistentStateDaoImpl: PersistentStateDaoImpl): PersistentStateDao
 
+    @StorageSingleton
+    @Binds
+    internal abstract fun provideViewedStoryTemplatesDao(viewedStoryTemplatesDaoImpl: ViewedStoryTemplatesDaoImpl): IDao<ViewedStoryTemplate>
+
     @Module
     companion object {
 
diff --git a/app/src/main/java/org/stepic/droid/features/stories/model/ViewedStoryTemplate.kt b/app/src/main/java/org/stepic/droid/features/stories/model/ViewedStoryTemplate.kt
new file mode 100644
index 0000000000..87e213e7c6
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/features/stories/model/ViewedStoryTemplate.kt
@@ -0,0 +1,3 @@
+package org.stepic.droid.features.stories.model
+
+class ViewedStoryTemplate(val storyTemplateId: Long)
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepository.kt b/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepository.kt
new file mode 100644
index 0000000000..523ad6e259
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepository.kt
@@ -0,0 +1,13 @@
+package org.stepic.droid.features.stories.repository
+
+import io.reactivex.Completable
+import io.reactivex.Single
+import org.stepik.android.model.StoryTemplate
+
+interface StoryTemplatesRepository {
+    fun getStoryTemplates(): Single<List<StoryTemplate>>
+
+    fun getViewedStoriesIds(): Single<Set<Long>>
+
+    fun markStoryAsViewed(storyTemplateId: Long): Completable
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepositoryImpl.kt b/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepositoryImpl.kt
new file mode 100644
index 0000000000..58011d4378
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepositoryImpl.kt
@@ -0,0 +1,52 @@
+package org.stepic.droid.features.stories.repository
+
+import io.reactivex.Completable
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.reactivex.rxkotlin.toObservable
+import org.stepic.droid.di.AppSingleton
+import org.stepic.droid.features.stories.model.ViewedStoryTemplate
+import org.stepic.droid.storage.dao.IDao
+import org.stepic.droid.web.Api
+import org.stepic.droid.web.model.story_templates.StoryTemplatesResponse
+import org.stepik.android.model.StoryTemplate
+import javax.inject.Inject
+
+@AppSingleton
+class StoryTemplatesRepositoryImpl
+@Inject
+constructor(
+        private val api: Api,
+        private val viewedStoryTemplateDao: IDao<ViewedStoryTemplate>
+) : StoryTemplatesRepository {
+    override fun getStoryTemplates(): Single<List<StoryTemplate>> =
+            getStoryTemplatesByPage(1)
+                    .concatMap { it.storyTemplates.toObservable() }
+                    .toList()
+                    .map { it.sortedBy(StoryTemplate::position) }
+
+    private fun getStoryTemplatesByPage(page: Int): Observable<StoryTemplatesResponse> =
+            api.getStoryTemplates(page)
+                    .concatMap {
+                        val templatesObservable = Observable.just(it)
+                        if (it.meta.hasNext) {
+                            templatesObservable.concatWith(getStoryTemplatesByPage(it.meta.page + 1))
+                        } else {
+                            templatesObservable
+                        }
+                    }
+
+    override fun getViewedStoriesIds(): Single<Set<Long>> = Single.create { emitter ->
+        emitter.onSuccess(
+                viewedStoryTemplateDao
+                        .getAll()
+                        .asSequence()
+                        .map(ViewedStoryTemplate::storyTemplateId)
+                        .toSet()
+        )
+    }
+
+    override fun markStoryAsViewed(storyTemplateId: Long): Completable = Completable.fromAction {
+        viewedStoryTemplateDao.insertOrReplace(ViewedStoryTemplate(storyTemplateId))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/features/stories/storage/dao/ViewedStoryTemplatesDaoImpl.kt b/app/src/main/java/org/stepic/droid/features/stories/storage/dao/ViewedStoryTemplatesDaoImpl.kt
new file mode 100644
index 0000000000..2f658b2d55
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/features/stories/storage/dao/ViewedStoryTemplatesDaoImpl.kt
@@ -0,0 +1,32 @@
+package org.stepic.droid.features.stories.storage.dao
+
+import android.content.ContentValues
+import android.database.Cursor
+import org.stepic.droid.di.storage.StorageSingleton
+import org.stepic.droid.features.stories.model.ViewedStoryTemplate
+import org.stepic.droid.features.stories.storage.structure.DbStructureViewedStoryTemplates
+import org.stepic.droid.storage.dao.DaoBase
+import org.stepic.droid.storage.operations.DatabaseOperations
+import javax.inject.Inject
+
+@StorageSingleton
+class ViewedStoryTemplatesDaoImpl
+@Inject
+constructor(databaseOperations: DatabaseOperations): DaoBase<ViewedStoryTemplate>(databaseOperations) {
+    override fun getDbName(): String =
+            DbStructureViewedStoryTemplates.VIEWED_STORY_TEMPLATES
+
+    override fun getDefaultPrimaryColumn(): String =
+            DbStructureViewedStoryTemplates.Columns.ID
+
+    override fun getDefaultPrimaryValue(persistentObject: ViewedStoryTemplate): String =
+            persistentObject.storyTemplateId.toString()
+
+    override fun getContentValues(persistentObject: ViewedStoryTemplate): ContentValues = ContentValues(1).apply {
+        put(DbStructureViewedStoryTemplates.Columns.ID, persistentObject.storyTemplateId)
+    }
+
+    override fun parsePersistentObject(cursor: Cursor): ViewedStoryTemplate =
+            ViewedStoryTemplate(cursor.getLong(cursor.getColumnIndex(DbStructureViewedStoryTemplates.Columns.ID)))
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/features/stories/storage/structure/DbStructureViewedStoryTemplates.kt b/app/src/main/java/org/stepic/droid/features/stories/storage/structure/DbStructureViewedStoryTemplates.kt
new file mode 100644
index 0000000000..85a4d9411d
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/features/stories/storage/structure/DbStructureViewedStoryTemplates.kt
@@ -0,0 +1,21 @@
+package org.stepic.droid.features.stories.storage.structure
+
+import android.database.sqlite.SQLiteDatabase
+
+object DbStructureViewedStoryTemplates {
+    const val VIEWED_STORY_TEMPLATES = "viewed_story_templates"
+
+    object Columns {
+        const val ID = "id"
+    }
+
+    fun createTable(db: SQLiteDatabase) {
+        val sql = """
+            CREATE TABLE IF NOT EXISTS $VIEWED_STORY_TEMPLATES (
+                ${Columns.ID} LONG,
+                PRIMARY KEY(${Columns.ID})
+            )""".trimIndent()
+
+        db.execSQL(sql)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/storage/operations/DatabaseFacade.kt b/app/src/main/java/org/stepic/droid/storage/operations/DatabaseFacade.kt
index 4da258aafd..9dc7c73445 100644
--- a/app/src/main/java/org/stepic/droid/storage/operations/DatabaseFacade.kt
+++ b/app/src/main/java/org/stepic/droid/storage/operations/DatabaseFacade.kt
@@ -12,6 +12,7 @@ import org.stepic.droid.notifications.model.Notification
 import org.stepic.droid.storage.dao.AdaptiveExpDao
 import org.stepic.droid.storage.dao.IDao
 import org.stepic.droid.features.deadlines.storage.dao.PersonalDeadlinesDao
+import org.stepic.droid.features.stories.model.ViewedStoryTemplate
 import org.stepic.droid.storage.dao.SearchQueryDao
 import org.stepic.droid.storage.structure.*
 import org.stepic.droid.util.AppConstants
@@ -48,7 +49,8 @@ class DatabaseFacade
         private val externalVideoUrlDao: IDao<DbVideoUrl>,
         private val blockDao: IDao<BlockPersistentWrapper>,
         private val personalDeadlinesDao: PersonalDeadlinesDao,
-        private val deadlinesBannerDao: DeadlinesBannerDao
+        private val deadlinesBannerDao: DeadlinesBannerDao,
+        private val viewedStoryTemplatesDao: IDao<ViewedStoryTemplate>
 ) {
 
     fun dropDatabase() {
@@ -73,6 +75,7 @@ class DatabaseFacade
         adaptiveExpDao.removeAll()
         personalDeadlinesDao.removeAll()
         deadlinesBannerDao.removeAll()
+        viewedStoryTemplatesDao.removeAll()
     }
 
     fun getCourseDao(table: Table) =
diff --git a/app/src/main/java/org/stepic/droid/web/Api.java b/app/src/main/java/org/stepic/droid/web/Api.java
index 2572cb3b0d..38c5c49b38 100644
--- a/app/src/main/java/org/stepic/droid/web/Api.java
+++ b/app/src/main/java/org/stepic/droid/web/Api.java
@@ -4,6 +4,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.stepic.droid.web.model.story_templates.StoryTemplatesResponse;
 import org.stepik.android.model.adaptive.RatingItem;
 import org.stepik.android.model.Course;
 import org.stepic.droid.model.NotificationCategory;
@@ -21,6 +22,7 @@
 import java.util.List;
 
 import io.reactivex.Completable;
+import io.reactivex.Observable;
 import io.reactivex.Single;
 import retrofit2.Call;
 
@@ -185,4 +187,6 @@ enum TokenType {
     Completable putRating(long courseId, long exp);
 
     Single<RatingRestoreResponse> restoreRating(long courseId);
+
+    Observable<StoryTemplatesResponse> getStoryTemplates(int page);
 }
diff --git a/app/src/main/java/org/stepic/droid/web/ApiImpl.java b/app/src/main/java/org/stepic/droid/web/ApiImpl.java
index 661bbae231..c323de1af9 100644
--- a/app/src/main/java/org/stepic/droid/web/ApiImpl.java
+++ b/app/src/main/java/org/stepic/droid/web/ApiImpl.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -21,6 +22,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.stepic.droid.R;
+import org.stepic.droid.util.CompatibilityExtensionsKt;
+import org.stepic.droid.web.model.story_templates.StoryTemplatesResponse;
 import org.stepik.android.model.adaptive.RatingItem;
 import org.stepic.droid.analytic.Analytic;
 import org.stepic.droid.configuration.Config;
@@ -82,6 +85,7 @@
 import javax.inject.Inject;
 
 import io.reactivex.Completable;
+import io.reactivex.Observable;
 import io.reactivex.Single;
 import io.reactivex.functions.Function;
 import kotlin.Unit;
@@ -927,7 +931,11 @@ public Single<RatingRestoreResponse> restoreRating(long courseId) {
     }
 
 
-
+    @Override
+    public Observable<StoryTemplatesResponse> getStoryTemplates(int page) {
+        final Locale locale = CompatibilityExtensionsKt.getDefaultLocale(Resources.getSystem().getConfiguration());
+        return loggedService.getStoryTemplate(page, false, locale.getLanguage());
+    }
 
     @Override
     public Single<SearchResultResponse> getSearchResultsOfTag(int page, @NotNull Tag tag) {
diff --git a/app/src/main/java/org/stepic/droid/web/StepicRestLoggedService.java b/app/src/main/java/org/stepic/droid/web/StepicRestLoggedService.java
index 4f2cffd56f..d09b70983a 100644
--- a/app/src/main/java/org/stepic/droid/web/StepicRestLoggedService.java
+++ b/app/src/main/java/org/stepic/droid/web/StepicRestLoggedService.java
@@ -3,11 +3,13 @@
 import org.jetbrains.annotations.Nullable;
 import org.stepic.droid.web.model.adaptive.RecommendationReactionsRequest;
 import org.stepic.droid.web.model.adaptive.RecommendationsResponse;
+import org.stepic.droid.web.model.story_templates.StoryTemplatesResponse;
 import org.stepik.android.model.EnrollmentWrapper;
 
 import java.util.List;
 
 import io.reactivex.Completable;
+import io.reactivex.Observable;
 import io.reactivex.Single;
 import retrofit2.Call;
 import retrofit2.http.Body;
@@ -244,4 +246,10 @@ Single<RecommendationsResponse> getNextRecommendations(
     Completable createRecommendationReaction(
             @Body final RecommendationReactionsRequest reactionsRequest
     );
+
+    Observable<StoryTemplatesResponse> getStoryTemplate(
+            @Query("page") final int page,
+            @Query("is_published") final boolean isPublished,
+            @Query("language") final String language
+    );
 }
diff --git a/app/src/main/java/org/stepic/droid/web/model/story_templates/StoryTemplatesResponse.kt b/app/src/main/java/org/stepic/droid/web/model/story_templates/StoryTemplatesResponse.kt
new file mode 100644
index 0000000000..328ce424a6
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/web/model/story_templates/StoryTemplatesResponse.kt
@@ -0,0 +1,13 @@
+package org.stepic.droid.web.model.story_templates
+
+import com.google.gson.annotations.SerializedName
+import org.stepic.droid.web.MetaResponseBase
+import org.stepik.android.model.Meta
+import org.stepik.android.model.StoryTemplate
+
+class StoryTemplatesResponse(
+        meta: Meta,
+
+        @SerializedName("story-templates")
+        val storyTemplates: List<StoryTemplate>
+) : MetaResponseBase(meta)
\ No newline at end of file

From 1855434d5cdb4d63a329dd6eab19fbe158544f77 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Tue, 18 Sep 2018 15:34:49 +0300
Subject: [PATCH 05/30] use support version of stories kit

---
 dependencies.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 0ff19b4bfc..3eb9b1ff4c 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -145,7 +145,7 @@ ext.libraries = [
         MPAndroidChart       : "com.github.PhilJay:MPAndroidChart:$versions.MPAndroidChart",
 
         shortcutBadger       : "me.leolin:ShortcutBadger:$versions.shortcutBadger",
-        StoriesKit           : "ru.nobird.android:storieskit:$versions.StoriesKit",
+        StoriesKit           : "ru.nobird.android:storieskitsupport:$versions.StoriesKit",
 
         // Developer Tools
         leakCanary           : "com.squareup.leakcanary:leakcanary-android:$versions.leakCanary",

From f57fc0139f6a132b5e174e4f6674b5e7153c8b9c Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Tue, 18 Sep 2018 15:55:52 +0300
Subject: [PATCH 06/30] add StoriesActivity + delegate

---
 app/src/main/AndroidManifest.xml              |  4 +++
 .../stories/ui/activity/StoriesActivity.kt    | 22 ++++++++++++++++
 .../ui/delegate/StoriesActivityDelegate.kt    | 25 +++++++++++++++++++
 app/src/main/res/layout/activity_stories.xml  | 12 +++++++++
 4 files changed, 63 insertions(+)
 create mode 100644 app/src/main/java/org/stepic/droid/features/stories/ui/activity/StoriesActivity.kt
 create mode 100644 app/src/main/java/org/stepic/droid/features/stories/ui/delegate/StoriesActivityDelegate.kt
 create mode 100644 app/src/main/res/layout/activity_stories.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bbaeb972db..95dd2b1004 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -373,6 +373,10 @@
         <activity
             android:name=".features.achievements.ui.activity.AchievementsListActivity" />
 
+        <activity
+            android:name=".features.stories.ui.activity.StoriesActivity"
+            android:theme="@style/StoryActivityTheme" />
+
         <receiver
             android:name="org.stepic.droid.receivers.DownloadClickReceiver"
             android:exported="true">
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
new file mode 100644
index 0000000000..15368bf751
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/activity/StoriesActivity.kt
@@ -0,0 +1,22 @@
+package org.stepic.droid.features.stories.ui.activity
+
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import org.stepic.droid.R
+import org.stepic.droid.features.stories.ui.delegate.StoriesActivityDelegate
+
+class StoriesActivity : AppCompatActivity() {
+    private lateinit var storiesDelegate: StoriesActivityDelegate
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_stories)
+        storiesDelegate = StoriesActivityDelegate(this)
+        storiesDelegate.onCreate(savedInstanceState)
+    }
+
+    override fun onPause() {
+        storiesDelegate.onPause()
+        super.onPause()
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..ea9cf9f7f1
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/StoriesActivityDelegate.kt
@@ -0,0 +1,25 @@
+package org.stepic.droid.features.stories.ui.delegate
+
+import android.os.Bundle
+import android.support.v4.view.ViewPager
+import android.support.v7.app.AppCompatActivity
+import kotlinx.android.synthetic.main.activity_stories.*
+import ru.nobird.android.stories.ui.custom.DismissableLayout
+import ru.nobird.android.stories.ui.delegate.StoriesActivityDelegateBase
+import ru.nobird.android.stories.ui.delegate.StoryPartViewDelegate
+
+class StoriesActivityDelegate(
+        activity: AppCompatActivity
+) : StoriesActivityDelegateBase(activity) {
+    override val dismissableLayout: DismissableLayout =
+            activity.content
+
+    override val storiesViewPager: ViewPager =
+            activity.storiesPager
+
+    override val arguments: Bundle =
+            activity.intent.extras ?: Bundle.EMPTY
+
+    override val storyPartDelegates: List<StoryPartViewDelegate> =
+            listOf()
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_stories.xml b/app/src/main/res/layout/activity_stories.xml
new file mode 100644
index 0000000000..0b3119b292
--- /dev/null
+++ b/app/src/main/res/layout/activity_stories.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ru.nobird.android.stories.ui.custom.DismissableLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content"
+    android:layout_alignParentTop="true"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <android.support.v4.view.ViewPager
+        android:id="@+id/storiesPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</ru.nobird.android.stories.ui.custom.DismissableLayout>
\ No newline at end of file

From c16692b0f91087c06c126574de0e56b5e865a852 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Tue, 18 Sep 2018 17:03:31 +0300
Subject: [PATCH 07/30] story template mapper + plain text with button story
 part

---
 .../stories/mapper/StoryTemplatesMapper.kt    | 22 ++++++++++++
 .../model/PlainTextWithButtonStoryPart.kt     | 35 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 app/src/main/java/org/stepic/droid/features/stories/mapper/StoryTemplatesMapper.kt
 create mode 100644 app/src/main/java/org/stepic/droid/features/stories/model/PlainTextWithButtonStoryPart.kt

diff --git a/app/src/main/java/org/stepic/droid/features/stories/mapper/StoryTemplatesMapper.kt b/app/src/main/java/org/stepic/droid/features/stories/mapper/StoryTemplatesMapper.kt
new file mode 100644
index 0000000000..8b1d82ac80
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/features/stories/mapper/StoryTemplatesMapper.kt
@@ -0,0 +1,22 @@
+package org.stepic.droid.features.stories.mapper
+
+import org.stepic.droid.features.stories.model.PlainTextWithButtonStoryPart
+import org.stepik.android.model.StoryTemplate
+import ru.nobird.android.stories.model.Story
+import ru.nobird.android.stories.model.StoryPart
+
+fun StoryTemplate.toStory(): Story =
+        Story(
+                id,
+                title,
+                cover,
+                parts.map(StoryTemplate.Part::toStoryPart)
+        )
+
+fun StoryTemplate.Part.toStoryPart(): StoryPart =
+        PlainTextWithButtonStoryPart(
+                duration * 1000, // convert seconds to ms
+                image,
+                button,
+                text
+        )
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/features/stories/model/PlainTextWithButtonStoryPart.kt b/app/src/main/java/org/stepic/droid/features/stories/model/PlainTextWithButtonStoryPart.kt
new file mode 100644
index 0000000000..ffcad31009
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/features/stories/model/PlainTextWithButtonStoryPart.kt
@@ -0,0 +1,35 @@
+package org.stepic.droid.features.stories.model
+
+import android.os.Parcel
+import android.os.Parcelable
+import org.stepik.android.model.StoryTemplate
+import ru.nobird.android.stories.model.StoryPart
+
+class PlainTextWithButtonStoryPart(
+        duration: Long,
+        image: String,
+
+        val button: StoryTemplate.Button?,
+        val text: StoryTemplate.Text?
+): StoryPart(duration, image) {
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeLong(duration)
+        parcel.writeString(cover)
+        parcel.writeParcelable(button, flags)
+        parcel.writeParcelable(text, flags)
+    }
+
+    override fun describeContents(): Int = 0
+
+    companion object CREATOR : Parcelable.Creator<PlainTextWithButtonStoryPart> {
+        override fun createFromParcel(parcel: Parcel) = PlainTextWithButtonStoryPart(
+                parcel.readLong(),
+                parcel.readString(),
+                parcel.readParcelable(StoryTemplate.Button::class.java.classLoader),
+                parcel.readParcelable(StoryTemplate.Text::class.java.classLoader)
+        )
+
+        override fun newArray(size: Int) =
+                arrayOfNulls<PlainTextWithButtonStoryPart>(size)
+    }
+}
\ No newline at end of file

From 073db9c060ba6c3c14ed9554985efc744b223b65 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Tue, 18 Sep 2018 17:04:14 +0300
Subject: [PATCH 08/30] stories view MVP

---
 .../stories/presentation/StoriesPresenter.kt  | 68 +++++++++++++++++++
 .../stories/presentation/StoriesView.kt       | 14 ++++
 .../StoryTemplatesRepositoryImpl.kt           | 11 ++-
 .../org/stepik/android/model/StoryTemplate.kt | 48 ++++++++++++-
 4 files changed, 138 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/org/stepic/droid/features/stories/presentation/StoriesPresenter.kt
 create mode 100644 app/src/main/java/org/stepic/droid/features/stories/presentation/StoriesView.kt

diff --git a/app/src/main/java/org/stepic/droid/features/stories/presentation/StoriesPresenter.kt b/app/src/main/java/org/stepic/droid/features/stories/presentation/StoriesPresenter.kt
new file mode 100644
index 0000000000..4ef906ffca
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/features/stories/presentation/StoriesPresenter.kt
@@ -0,0 +1,68 @@
+package org.stepic.droid.features.stories.presentation
+
+import io.reactivex.Scheduler
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.Singles.zip
+import io.reactivex.rxkotlin.subscribeBy
+import org.stepic.droid.core.presenters.PresenterBase
+import org.stepic.droid.di.qualifiers.BackgroundScheduler
+import org.stepic.droid.di.qualifiers.MainScheduler
+import org.stepic.droid.features.stories.mapper.toStory
+import org.stepic.droid.features.stories.repository.StoryTemplatesRepository
+import org.stepic.droid.util.addDisposable
+import org.stepik.android.model.StoryTemplate
+import javax.inject.Inject
+
+class StoriesPresenter
+@Inject
+constructor(
+        private val storiesRepository: StoryTemplatesRepository,
+
+        @BackgroundScheduler
+        private val backgroundScheduler: Scheduler,
+        @MainScheduler
+        private val mainScheduler: Scheduler
+) : PresenterBase<StoriesView>() {
+    private var state : StoriesView.State = StoriesView.State.Idle
+        set(value) {
+            field = value
+            view?.setState(value)
+        }
+
+    private val compositeDisposable = CompositeDisposable()
+
+    init {
+        fetchStories()
+    }
+
+    private fun fetchStories() {
+        if (state != StoriesView.State.Idle) return
+        state = StoriesView.State.Loading
+
+        compositeDisposable addDisposable
+                zip(storiesRepository.getStoryTemplates().map { it.map(StoryTemplate::toStory) }, storiesRepository.getViewedStoriesIds())
+                        .subscribeOn(backgroundScheduler)
+                        .observeOn(mainScheduler)
+                        .subscribeBy({
+                            state = StoriesView.State.Empty
+                        }) { (stories, viewedIds) ->
+                            state = StoriesView.State.Success(stories, viewedIds)
+                        }
+    }
+
+    override fun attachView(view: StoriesView) {
+        super.attachView(view)
+        view.setState(state)
+    }
+
+    fun onStoryViewed(storyId: Long) {
+        compositeDisposable addDisposable storiesRepository
+                .markStoryAsViewed(storyId)
+                .subscribeBy({ /* ignore */ }) {
+                    val state = this.state
+                    if (state is StoriesView.State.Success) {
+                        this.state = state.copy(viewedStoriesIds = state.viewedStoriesIds + storyId)
+                    }
+                }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/features/stories/presentation/StoriesView.kt b/app/src/main/java/org/stepic/droid/features/stories/presentation/StoriesView.kt
new file mode 100644
index 0000000000..27cd716a86
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/features/stories/presentation/StoriesView.kt
@@ -0,0 +1,14 @@
+package org.stepic.droid.features.stories.presentation
+
+import ru.nobird.android.stories.model.Story
+
+interface StoriesView {
+    fun setState(state: State)
+
+    sealed class State {
+        object Idle : State()
+        object Loading : State()
+        object Empty : State()
+        data class Success(val stories: List<Story>, val viewedStoriesIds: Set<Long>) : State()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepositoryImpl.kt b/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepositoryImpl.kt
index 58011d4378..1ef4729a27 100644
--- a/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepositoryImpl.kt
+++ b/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepositoryImpl.kt
@@ -19,11 +19,20 @@ constructor(
         private val api: Api,
         private val viewedStoryTemplateDao: IDao<ViewedStoryTemplate>
 ) : StoryTemplatesRepository {
+    companion object {
+        const val STORY_TEMPLATES_VERSION = 1
+    }
+
     override fun getStoryTemplates(): Single<List<StoryTemplate>> =
             getStoryTemplatesByPage(1)
                     .concatMap { it.storyTemplates.toObservable() }
                     .toList()
-                    .map { it.sortedBy(StoryTemplate::position) }
+                    .map {
+                        it.asSequence()
+                                .filter { template -> template.version <= STORY_TEMPLATES_VERSION }
+                                .sortedBy(StoryTemplate::position)
+                                .toList()
+                    }
 
     private fun getStoryTemplatesByPage(page: Int): Observable<StoryTemplatesResponse> =
             api.getStoryTemplates(page)
diff --git a/model/src/main/java/org/stepik/android/model/StoryTemplate.kt b/model/src/main/java/org/stepik/android/model/StoryTemplate.kt
index 9bb8555983..945cf87bd8 100644
--- a/model/src/main/java/org/stepik/android/model/StoryTemplate.kt
+++ b/model/src/main/java/org/stepik/android/model/StoryTemplate.kt
@@ -1,5 +1,7 @@
 package org.stepik.android.model
 
+import android.os.Parcel
+import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
 
 data class StoryTemplate(
@@ -38,7 +40,28 @@ data class StoryTemplate(
 
             @SerializedName("title")
             val title: String
-    )
+    ) : Parcelable {
+        override fun writeToParcel(parcel: Parcel, flags: Int) {
+            parcel.writeString(backgroundStyle)
+            parcel.writeString(text)
+            parcel.writeString(textColor)
+            parcel.writeString(title)
+        }
+
+        override fun describeContents(): Int = 0
+
+        companion object CREATOR : Parcelable.Creator<Text> {
+            override fun createFromParcel(parcel: Parcel) = Text(
+                    parcel.readString(),
+                    parcel.readString(),
+                    parcel.readString(),
+                    parcel.readString()
+            )
+
+            override fun newArray(size: Int) =
+                    arrayOfNulls<Text?>(size)
+        }
+    }
 
     data class Button(
             @SerializedName("background_color")
@@ -52,5 +75,26 @@ data class StoryTemplate(
 
             @SerializedName("url")
             val url: String
-    )
+    ) : Parcelable {
+        override fun writeToParcel(parcel: Parcel, flags: Int) {
+            parcel.writeString(backgroundColor)
+            parcel.writeString(textColor)
+            parcel.writeString(title)
+            parcel.writeString(url)
+        }
+
+        override fun describeContents(): Int = 0
+
+        companion object CREATOR : Parcelable.Creator<Button> {
+            override fun createFromParcel(parcel: Parcel) = Button(
+                    parcel.readString(),
+                    parcel.readString(),
+                    parcel.readString(),
+                    parcel.readString()
+            )
+
+            override fun newArray(size: Int) =
+                    arrayOfNulls<Button?>(size)
+        }
+    }
 }
\ No newline at end of file

From 2d16dd1f0575b2a1cfe72e0ba8f2583f3ce5588c Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Tue, 18 Sep 2018 17:50:05 +0300
Subject: [PATCH 09/30] stories adapter

---
 .../stories/ui/adapter/StoriesAdapter.kt      | 87 +++++++++++++++++++
 .../main/res/drawable/active_story_marker.xml |  8 ++
 app/src/main/res/layout/activity_stories.xml  |  3 +-
 .../res/layout/view_stories_container.xml     |  8 ++
 app/src/main/res/layout/view_story.xml        | 31 +++++++
 5 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
 create mode 100644 app/src/main/res/drawable/active_story_marker.xml
 create mode 100644 app/src/main/res/layout/view_stories_container.xml
 create mode 100644 app/src/main/res/layout/view_story.xml

diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
new file mode 100644
index 0000000000..0032045c37
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
@@ -0,0 +1,87 @@
+package org.stepic.droid.features.stories.ui.adapter
+
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.bumptech.glide.Glide
+import kotlinx.android.synthetic.main.view_story.view.*
+import org.stepic.droid.R
+import org.stepic.droid.ui.util.RoundedBitmapImageViewTarget
+import org.stepic.droid.ui.util.changeVisibility
+import ru.nobird.android.stories.model.Story
+
+class StoriesAdapter(private val onStoryClicked: (Story, Int) -> Unit) : RecyclerView.Adapter<StoriesAdapter.StoryViewHolder>() {
+    var stories: List<Story> = emptyList()
+        private set
+
+    var viewedStoryIds: Set<Long> = emptySet()
+        private set
+
+    fun setData(stories: List<Story>, viewedStoryIds: Set<Long>) {
+        var updateNeeded = false
+        if (this.stories != stories) {
+            this.stories = stories
+            updateNeeded = true
+        }
+
+        if (this.viewedStoryIds != viewedStoryIds) {
+            if (updateNeeded) {
+                this.viewedStoryIds = viewedStoryIds
+            } else {
+                val diff = viewedStoryIds - this.viewedStoryIds
+                diff.forEach { storyId ->
+                    val index = stories.indexOfFirst { it.id == storyId }
+                    if (index != -1) {
+                        notifyItemChanged(index)
+                    }
+                }
+            }
+        }
+
+        if (updateNeeded) {
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = StoryViewHolder(
+            LayoutInflater.from(parent.context).inflate(R.layout.view_story, parent, false)
+    )
+
+
+    override fun getItemCount() = stories.size
+
+    override fun onBindViewHolder(holder: StoryViewHolder, position: Int) {
+        holder.bind(position)
+    }
+
+    inner class StoryViewHolder(root: View) : RecyclerView.ViewHolder(root) {
+        private val cover = root.storyCover
+        private val title = root.storyTitle
+        private val activeStoryMarker = root.activeStoryMarker
+
+        private val coverTarget = RoundedBitmapImageViewTarget(1f, cover)
+
+        init {
+            root.setOnClickListener {
+                if (adapterPosition in stories.indices) {
+                    onStoryClicked(stories[adapterPosition], adapterPosition)
+                }
+            }
+        }
+
+        fun bind(position: Int) {
+            val story = stories[position]
+            title.text = story.title
+
+            Glide.with(cover.context)
+                    .load(story.cover)
+                    .asBitmap()
+                    .placeholder(R.drawable.general_placeholder)
+                    .centerCrop()
+                    .into(coverTarget)
+
+            activeStoryMarker.changeVisibility(!viewedStoryIds.contains(story.id))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/active_story_marker.xml b/app/src/main/res/drawable/active_story_marker.xml
new file mode 100644
index 0000000000..e0780d97fd
--- /dev/null
+++ b/app/src/main/res/drawable/active_story_marker.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="16dp" />
+    <solid android:color="@android:color/transparent"/>
+    <stroke android:width="2dp" android:color="@color/new_accent_color" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_stories.xml b/app/src/main/res/layout/activity_stories.xml
index 0b3119b292..edc389843c 100644
--- a/app/src/main/res/layout/activity_stories.xml
+++ b/app/src/main/res/layout/activity_stories.xml
@@ -4,7 +4,8 @@
     android:id="@+id/content"
     android:layout_alignParentTop="true"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/new_accent_color">
     <android.support.v4.view.ViewPager
         android:id="@+id/storiesPager"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/view_stories_container.xml b/app/src/main/res/layout/view_stories_container.xml
new file mode 100644
index 0000000000..6e22e173e2
--- /dev/null
+++ b/app/src/main/res/layout/view_stories_container.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="96dp"
+    android:padding="8dp"
+    android:clipToPadding="false" />
+
diff --git a/app/src/main/res/layout/view_story.xml b/app/src/main/res/layout/view_story.xml
new file mode 100644
index 0000000000..c4f4744286
--- /dev/null
+++ b/app/src/main/res/layout/view_story.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="96dp"
+    android:layout_height="96dp"
+    android:layout_margin="8dp"
+    android:foreground="?selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/storyCover"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="8dp"
+        android:contentDescription="@null"/>
+
+    <View
+        android:id="@+id/activeStoryMarker"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/active_story_marker"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/storyTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|start"
+        android:gravity="start"
+        android:layout_margin="16dp" />
+
+</FrameLayout>
\ No newline at end of file

From 6424b5d6fd7a2bbd360dc5f1e68e142caa188ed8 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Tue, 18 Sep 2018 19:06:03 +0300
Subject: [PATCH 10/30] plaint text with button story part delegate

---
 app/src/main/AndroidManifest.xml              |  3 +-
 .../stories/ui/activity/StoriesActivity.kt    |  3 +-
 .../stories/ui/adapter/StoriesAdapter.kt      |  3 +-
 .../PlainTextWithButtonStoryPartDelegate.kt   | 92 +++++++++++++++++++
 .../ui/delegate/StoriesActivityDelegate.kt    |  2 +-
 .../main/res/drawable/active_story_marker.xml |  2 +-
 .../drawable/stories_text_background_dark.xml |  7 ++
 .../stories_text_background_light.xml         |  7 ++
 .../view_story_plain_text_with_button.xml     | 55 +++++++++++
 app/src/main/res/values/dimens.xml            |  2 +
 10 files changed, 171 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
 create mode 100644 app/src/main/res/drawable/stories_text_background_dark.xml
 create mode 100644 app/src/main/res/drawable/stories_text_background_light.xml
 create mode 100644 app/src/main/res/layout/view_story_plain_text_with_button.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 95dd2b1004..75bc8939bf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -375,7 +375,8 @@
 
         <activity
             android:name=".features.stories.ui.activity.StoriesActivity"
-            android:theme="@style/StoryActivityTheme" />
+            android:theme="@style/StoryActivityTheme"
+            android:screenOrientation="portrait" />
 
         <receiver
             android:name="org.stepic.droid.receivers.DownloadClickReceiver"
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 15368bf751..f418eca24b 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
@@ -3,9 +3,10 @@ package org.stepic.droid.features.stories.ui.activity
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import org.stepic.droid.R
+import org.stepic.droid.base.FragmentActivityBase
 import org.stepic.droid.features.stories.ui.delegate.StoriesActivityDelegate
 
-class StoriesActivity : AppCompatActivity() {
+class StoriesActivity : FragmentActivityBase() {
     private lateinit var storiesDelegate: StoriesActivityDelegate
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
index 0032045c37..83ab2ff788 100644
--- a/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
@@ -60,7 +60,8 @@ class StoriesAdapter(private val onStoryClicked: (Story, Int) -> Unit) : Recycle
         private val title = root.storyTitle
         private val activeStoryMarker = root.activeStoryMarker
 
-        private val coverTarget = RoundedBitmapImageViewTarget(1f, cover)
+        private val coverTarget = RoundedBitmapImageViewTarget(
+                root.context.resources.getDimension(R.dimen.stories_default_corner_radius), cover)
 
         init {
             root.setOnClickListener {
diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
new file mode 100644
index 0000000000..eebaf713dd
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
@@ -0,0 +1,92 @@
+package org.stepic.droid.features.stories.ui.delegate
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.GradientDrawable
+import android.net.Uri
+import android.os.Build
+import android.support.annotation.ColorInt
+import android.support.annotation.DrawableRes
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import kotlinx.android.synthetic.main.view_story_plain_text_with_button.view.*
+import org.stepic.droid.R
+import org.stepic.droid.features.stories.model.PlainTextWithButtonStoryPart
+import org.stepic.droid.ui.util.changeVisibility
+import org.stepik.android.model.StoryTemplate
+import ru.nobird.android.stories.model.StoryPart
+import ru.nobird.android.stories.ui.custom.StoryView
+import ru.nobird.android.stories.ui.delegate.StoryPartViewDelegate
+
+class PlainTextWithButtonStoryPartDelegate(private val context: Context) : StoryPartViewDelegate() {
+    companion object {
+        private const val DARK_BACKGROUND_STYLE = "dark"
+    }
+
+    override fun isForViewType(part: StoryPart): Boolean =
+            part is PlainTextWithButtonStoryPart
+
+    override fun onBindView(storyView: StoryView, container: ViewGroup, position: Int, part: StoryPart): View =
+            LayoutInflater.from(container.context).inflate(R.layout.view_story_plain_text_with_button, container, false).apply {
+                part as PlainTextWithButtonStoryPart
+
+                setUpText(this, part.text)
+                setUpButton(this, part.button)
+            }
+
+    private fun setUpText(view: View, text: StoryTemplate.Text?) {
+        val storyTextContainer = view.storyTextContainer
+        if (text != null) {
+            @DrawableRes val textBackgroundRes = if (text.backgroundStyle == DARK_BACKGROUND_STYLE) {
+                R.drawable.stories_text_background_dark
+            } else {
+                R.drawable.stories_text_background_light
+            }
+            storyTextContainer.setBackgroundResource(textBackgroundRes)
+
+            val storyTitle = view.storyTitle
+            val storyText = view.storyText
+
+            @ColorInt val textColor = text.textColor.toInt(16)
+
+            storyTitle.setTextColor(textColor)
+            storyText.setTextColor(textColor)
+
+            storyTitle.text = text.title
+            storyText.text = text.text
+
+            storyTextContainer.changeVisibility(true)
+        } else {
+            storyTextContainer.changeVisibility(false)
+        }
+    }
+
+    private fun setUpButton(view: View, button: StoryTemplate.Button?) {
+        val storyButton = view.storyButton
+        if (button != null) {
+            val backgroundDrawable = GradientDrawable()
+            backgroundDrawable.setColor(button.backgroundColor.toInt(16))
+            backgroundDrawable.cornerRadius = view.context.resources.getDimension(R.dimen.stories_default_corner_radius)
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
+                @Suppress("DEPRECATION")
+                storyButton.setBackgroundDrawable(backgroundDrawable)
+            } else {
+                storyButton.background = backgroundDrawable
+            }
+
+            storyButton.setTextColor(button.textColor.toInt(16))
+
+            storyButton.text = button.title
+            storyButton.setOnClickListener {
+                val uri = Uri.parse(button.url)
+                context.startActivity(Intent(Intent.ACTION_VIEW, uri))
+            }
+
+            storyButton.changeVisibility(true)
+        } else {
+            storyButton.changeVisibility(false)
+        }
+    }
+}
\ No newline at end of file
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 ea9cf9f7f1..3a1dbc2f55 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
@@ -21,5 +21,5 @@ class StoriesActivityDelegate(
             activity.intent.extras ?: Bundle.EMPTY
 
     override val storyPartDelegates: List<StoryPartViewDelegate> =
-            listOf()
+            listOf(PlainTextWithButtonStoryPartDelegate(activity))
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/active_story_marker.xml b/app/src/main/res/drawable/active_story_marker.xml
index e0780d97fd..0ed41b678b 100644
--- a/app/src/main/res/drawable/active_story_marker.xml
+++ b/app/src/main/res/drawable/active_story_marker.xml
@@ -2,7 +2,7 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/stories_default_corner_radius" />
     <solid android:color="@android:color/transparent"/>
     <stroke android:width="2dp" android:color="@color/new_accent_color" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/stories_text_background_dark.xml b/app/src/main/res/drawable/stories_text_background_dark.xml
new file mode 100644
index 0000000000..e8e3aedf89
--- /dev/null
+++ b/app/src/main/res/drawable/stories_text_background_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="16dp" />
+    <solid android:color="@color/fast_continue_learning_opacity" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/stories_text_background_light.xml b/app/src/main/res/drawable/stories_text_background_light.xml
new file mode 100644
index 0000000000..e2d92147f3
--- /dev/null
+++ b/app/src/main/res/drawable/stories_text_background_light.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="16dp" />
+    <solid android:color="#DAFFFFFF" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_story_plain_text_with_button.xml b/app/src/main/res/layout/view_story_plain_text_with_button.xml
new file mode 100644
index 0000000000..c33a9e0f0d
--- /dev/null
+++ b/app/src/main/res/layout/view_story_plain_text_with_button.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/storyCover"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:contentDescription="@null" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_gravity="bottom"
+        android:gravity="center_horizontal">
+
+        <LinearLayout
+            android:id="@+id/storyTextContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="start"
+            android:layout_margin="16dp">
+
+            <TextView
+                android:id="@+id/storyTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:gravity="start" />
+
+            <TextView
+                android:id="@+id/storyText"
+                android:layout_marginTop="8dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="start" />
+
+        </LinearLayout>
+
+        <android.support.v7.widget.AppCompatButton
+            android:id="@+id/storyButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:foreground="?selectableItemBackground" />
+
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 016515cd85..0ab4122559 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -195,4 +195,6 @@
 
     <dimen name="achievement_tile_height">80dp</dimen>
     <dimen name="achievement_details_dialog_width">@dimen/wrap_content</dimen>
+
+    <dimen name="stories_default_corner_radius">16dp</dimen>
 </resources>

From 4d8a7e22772c6bd4cace672eb45f8dfb56f51ddd Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Wed, 19 Sep 2018 12:25:55 +0300
Subject: [PATCH 11/30] update db to 35

---
 .../java/org/stepic/droid/storage/DatabaseHelper.java  | 10 ++++++++++
 .../droid/storage/migration/MigrationFrom34To35.kt     | 10 ++++++++++
 .../org/stepic/droid/storage/structure/DatabaseInfo.kt |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/org/stepic/droid/storage/migration/MigrationFrom34To35.kt

diff --git a/app/src/main/java/org/stepic/droid/storage/DatabaseHelper.java b/app/src/main/java/org/stepic/droid/storage/DatabaseHelper.java
index 651b36d8ff..2a25718604 100644
--- a/app/src/main/java/org/stepic/droid/storage/DatabaseHelper.java
+++ b/app/src/main/java/org/stepic/droid/storage/DatabaseHelper.java
@@ -7,6 +7,7 @@
 import org.stepic.droid.features.deadlines.storage.structure.DbStructureDeadlines;
 import org.stepic.droid.features.deadlines.storage.structure.DbStructureDeadlinesBanner;
 import org.stepic.droid.storage.migration.MigrationFrom33To34;
+import org.stepic.droid.storage.migration.MigrationFrom34To35;
 import org.stepic.droid.storage.structure.DatabaseInfo;
 import org.stepic.droid.storage.structure.DbStructureAdaptiveExp;
 import org.stepic.droid.storage.structure.DbStructureAssignment;
@@ -100,6 +101,7 @@ public void onCreate(SQLiteDatabase db) {
         upgradeFrom31To32(db);
         upgradeFrom32To33(db);
         upgradeFrom33To34(db);
+        upgradeFrom34To35(db);
     }
 
 
@@ -278,6 +280,14 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         if (oldVersion < 34) {
             upgradeFrom33To34(db);
         }
+
+        if (oldVersion < 35) {
+            upgradeFrom34To35(db);
+        }
+    }
+
+    private void upgradeFrom34To35(SQLiteDatabase db) {
+        MigrationFrom34To35.INSTANCE.migrate(db);
     }
 
     private void upgradeFrom33To34(SQLiteDatabase db) {
diff --git a/app/src/main/java/org/stepic/droid/storage/migration/MigrationFrom34To35.kt b/app/src/main/java/org/stepic/droid/storage/migration/MigrationFrom34To35.kt
new file mode 100644
index 0000000000..ecea68a7df
--- /dev/null
+++ b/app/src/main/java/org/stepic/droid/storage/migration/MigrationFrom34To35.kt
@@ -0,0 +1,10 @@
+package org.stepic.droid.storage.migration
+
+import android.database.sqlite.SQLiteDatabase
+import org.stepic.droid.features.stories.storage.structure.DbStructureViewedStoryTemplates
+
+object MigrationFrom34To35 : Migration {
+    override fun migrate(db: SQLiteDatabase) {
+        DbStructureViewedStoryTemplates.createTable(db)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/storage/structure/DatabaseInfo.kt b/app/src/main/java/org/stepic/droid/storage/structure/DatabaseInfo.kt
index 48f5627eac..a6c4588518 100644
--- a/app/src/main/java/org/stepic/droid/storage/structure/DatabaseInfo.kt
+++ b/app/src/main/java/org/stepic/droid/storage/structure/DatabaseInfo.kt
@@ -2,5 +2,5 @@ package org.stepic.droid.storage.structure
 
 object DatabaseInfo {
     const val FILE_NAME = "stepic_database.db"
-    const val VERSION = 34
+    const val VERSION = 35
 }

From 2f0649915c404b2cdd8b7105e298a37b2c2cfeb4 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Wed, 19 Sep 2018 13:20:18 +0300
Subject: [PATCH 12/30] stories catalog block

---
 .../stories/ui/adapter/StoriesAdapter.kt      | 17 ++++-
 .../droid/ui/adapters/CatalogAdapter.kt       | 74 +++++++++++++++++--
 .../droid/ui/fragments/CatalogFragment.kt     | 17 ++++-
 .../droid/web/StepicRestLoggedService.java    |  1 +
 .../drawable-v21/story_view_foreground.xml    | 18 +++++
 .../res/drawable/story_view_foreground.xml    | 14 ++++
 .../res/layout/view_stories_container.xml     | 34 ++++++++-
 app/src/main/res/layout/view_story.xml        | 13 ++--
 .../res/layout/view_story_placeholder.xml     |  8 ++
 app/src/main/res/values/dimens.xml            |  1 +
 10 files changed, 174 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/res/drawable-v21/story_view_foreground.xml
 create mode 100644 app/src/main/res/drawable/story_view_foreground.xml
 create mode 100644 app/src/main/res/layout/view_story_placeholder.xml

diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
index 83ab2ff788..a7f3ba0d01 100644
--- a/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
@@ -1,5 +1,7 @@
 package org.stepic.droid.features.stories.ui.adapter
 
+import android.graphics.BitmapFactory
+import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
@@ -56,12 +58,19 @@ class StoriesAdapter(private val onStoryClicked: (Story, Int) -> Unit) : Recycle
     }
 
     inner class StoryViewHolder(root: View) : RecyclerView.ViewHolder(root) {
-        private val cover = root.storyCover
         private val title = root.storyTitle
         private val activeStoryMarker = root.activeStoryMarker
 
         private val coverTarget = RoundedBitmapImageViewTarget(
-                root.context.resources.getDimension(R.dimen.stories_default_corner_radius), cover)
+                root.context.resources.getDimension(R.dimen.stories_default_corner_radius), root.storyCover)
+
+        private val coursePlaceholderDrawable by lazy {
+            val resources = root.context.resources
+            val coursePlaceholderBitmap = BitmapFactory.decodeResource(resources, R.drawable.general_placeholder)
+            val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(resources, coursePlaceholderBitmap)
+            circularBitmapDrawable.cornerRadius = resources.getDimension(R.dimen.stories_default_corner_radius)
+            return@lazy circularBitmapDrawable
+        }
 
         init {
             root.setOnClickListener {
@@ -75,10 +84,10 @@ class StoriesAdapter(private val onStoryClicked: (Story, Int) -> Unit) : Recycle
             val story = stories[position]
             title.text = story.title
 
-            Glide.with(cover.context)
+            Glide.with(itemView.context)
                     .load(story.cover)
                     .asBitmap()
-                    .placeholder(R.drawable.general_placeholder)
+                    .placeholder(coursePlaceholderDrawable)
                     .centerCrop()
                     .into(coverTarget)
 
diff --git a/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt b/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt
index f0b784e6af..39c32eba25 100644
--- a/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt
+++ b/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt
@@ -10,17 +10,24 @@ import kotlinx.android.synthetic.main.catalog_item.view.*
 import kotlinx.android.synthetic.main.view_catalog_no_internet_clickable.view.*
 import kotlinx.android.synthetic.main.view_catalog_tags.view.*
 import kotlinx.android.synthetic.main.view_course_languages.view.*
+import kotlinx.android.synthetic.main.view_stories_container.view.*
 import org.stepic.droid.R
+import org.stepic.droid.features.stories.presentation.StoriesView
+import org.stepic.droid.features.stories.ui.adapter.StoriesAdapter
 import org.stepic.droid.model.*
+import org.stepic.droid.ui.util.changeVisibility
+import org.stepic.droid.ui.util.hideAllChildren
 import org.stepic.droid.ui.util.setHeight
 import org.stepik.android.model.Tag
+import ru.nobird.android.stories.model.Story
 import java.util.*
 
 class CatalogAdapter(
         private val courseListItems: List<CoursesCarouselInfo>,
         private val onFiltersChanged: (EnumSet<StepikFilter>) -> Unit,
         private val onRetry: () -> Unit,
-        private val onTagClicked: (Tag) -> Unit
+        private val onTagClicked: (Tag) -> Unit,
+        private val onStoryClicked: (Story, Int) -> Unit
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     companion object {
@@ -29,11 +36,14 @@ class CatalogAdapter(
         private const val POPULAR_TYPE = 2
         private const val OFFLINE_TYPE = 3
         private const val TAGS_TYPE = 4
+        private const val STORIES_TYPE = 5
 
-        private const val PRE_CAROUSEL_COUNT = 2
+        private const val PRE_CAROUSEL_COUNT = 3
         private const val POST_CAROUSEL_COUNT = 1
-        private const val LANGUAGE_INDEX = 0
-        private const val TAGS_INDEX = 1
+
+        private const val STORIES_INDEX = 0
+        private const val LANGUAGE_INDEX = 1
+        private const val TAGS_INDEX = 2
     }
 
     private var filters: EnumSet<StepikFilter>? = null
@@ -43,6 +53,12 @@ class CatalogAdapter(
     var isOfflineMode: Boolean = false
         private set
 
+    var storiesState: StoriesView.State = StoriesView.State.Idle
+        set(value) {
+            field = value
+            notifyItemChanged(STORIES_INDEX)
+        }
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val layoutInflater = LayoutInflater.from(parent.context)
         return when (viewType) {
@@ -62,6 +78,10 @@ class CatalogAdapter(
                 val view = layoutInflater.inflate(R.layout.view_catalog_tags, parent, false)
                 TagsViewHolder(view, onTagClicked)
             }
+            STORIES_TYPE -> {
+                val view = layoutInflater.inflate(R.layout.view_stories_container, parent, false)
+                StoriesViewHolder(view, onStoryClicked)
+            }
             else -> throw IllegalStateException("CatalogAdapter viewType = $viewType is unsupported")
         }
     }
@@ -90,6 +110,10 @@ class CatalogAdapter(
                 holder as TagsViewHolder
                 holder.bindTags(tags)
             }
+            STORIES_TYPE -> {
+                holder as StoriesViewHolder
+                holder.bindState(storiesState)
+            }
         }
     }
 
@@ -136,14 +160,16 @@ class CatalogAdapter(
 
     private fun getItemViewTypeInOfflineMode(adapterPosition: Int): Int =
             when (adapterPosition) {
+                STORIES_INDEX  -> STORIES_TYPE
                 LANGUAGE_INDEX -> LANGUAGES_TYPE
-                1 -> OFFLINE_TYPE
-                2 -> POPULAR_TYPE
+                LANGUAGE_INDEX + 1 -> OFFLINE_TYPE
+                LANGUAGE_INDEX + 2 -> POPULAR_TYPE
                 else -> throw IllegalStateException("Catalog recycler type is not identified in offline mode")
             }
 
     private fun getItemViewTypeInOnlineMode(adapterPosition: Int): Int =
             when (adapterPosition) {
+                STORIES_INDEX -> STORIES_TYPE
                 LANGUAGE_INDEX -> LANGUAGES_TYPE
                 TAGS_INDEX -> TAGS_TYPE
                 in PRE_CAROUSEL_COUNT until PRE_CAROUSEL_COUNT + courseListItems.size -> CAROUSEL_TYPE
@@ -275,4 +301,40 @@ class CatalogAdapter(
             notifyItemChanged(TAGS_INDEX)
         }
     }
+
+    class StoriesViewHolder(
+            root: View,
+            onStoryClicked: (Story, Int) -> Unit
+    ) : RecyclerView.ViewHolder(root) {
+        private val storiesAdapter = StoriesAdapter(onStoryClicked)
+        private val recycler = root.storiesRecycler
+        private val loadingPlaceholder = root.storiesContainerLoadingPlaceholder
+
+        init {
+            recycler.adapter = storiesAdapter
+            recycler.layoutManager = LinearLayoutManager(root.context, LinearLayoutManager.HORIZONTAL, false)
+        }
+
+        fun bindState(state: StoriesView.State) = when(state) {
+            is StoriesView.State.Idle,
+            is StoriesView.State.Empty -> {
+                itemView.setHeight(0)
+                recycler.changeVisibility(false)
+                loadingPlaceholder.changeVisibility(false)
+            }
+
+            is StoriesView.State.Loading -> {
+                itemView.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT)
+                recycler.changeVisibility(false)
+                loadingPlaceholder.changeVisibility(true)
+            }
+
+            is StoriesView.State.Success -> {
+                itemView.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT)
+                storiesAdapter.setData(state.stories, state.viewedStoriesIds)
+                recycler.changeVisibility(true)
+                loadingPlaceholder.changeVisibility(false)
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt b/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt
index 5b7cd39258..9ae65f80d5 100644
--- a/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt
+++ b/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt
@@ -17,6 +17,8 @@ import org.stepic.droid.core.presenters.TagsPresenter
 import org.stepic.droid.core.presenters.contracts.CatalogView
 import org.stepic.droid.core.presenters.contracts.FiltersView
 import org.stepic.droid.core.presenters.contracts.TagsView
+import org.stepic.droid.features.stories.presentation.StoriesPresenter
+import org.stepic.droid.features.stories.presentation.StoriesView
 import org.stepic.droid.model.CoursesCarouselInfo
 import org.stepic.droid.model.StepikFilter
 import org.stepic.droid.ui.adapters.CatalogAdapter
@@ -27,7 +29,7 @@ import java.util.*
 import javax.inject.Inject
 
 class CatalogFragment : FragmentBase(),
-        CatalogView, FiltersView, FiltersListener, TagsView {
+        CatalogView, FiltersView, FiltersListener, TagsView, StoriesView {
 
     companion object {
         fun newInstance(): FragmentBase = CatalogFragment()
@@ -45,6 +47,9 @@ class CatalogFragment : FragmentBase(),
     @Inject
     lateinit var tagsPresenter: TagsPresenter
 
+    @Inject
+    lateinit var storiesPresenter: StoriesPresenter
+
     private val courseCarouselInfoList = mutableListOf<CoursesCarouselInfo>()
 
     private var searchMenuItem: MenuItem? = null
@@ -79,6 +84,7 @@ class CatalogFragment : FragmentBase(),
         filtersClient.subscribe(this)
         filtersPresenter.attachView(this)
         catalogPresenter.attachView(this)
+        storiesPresenter.attachView(this)
         filtersPresenter.onNeedFilters()
         tagsPresenter.onNeedShowTags()
     }
@@ -88,6 +94,7 @@ class CatalogFragment : FragmentBase(),
         tagsPresenter.detachView(this)
         filtersClient.unsubscribe(this)
         catalogPresenter.detachView(this)
+        storiesPresenter.detachView(this)
         filtersPresenter.detachView(this)
     }
 
@@ -105,7 +112,8 @@ class CatalogFragment : FragmentBase(),
                     filtersPresenter.onNeedFilters()
                     tagsPresenter.onNeedShowTags()
                 },
-                { tag -> onTagClicked(tag) }
+                { tag -> onTagClicked(tag) },
+                { _, _ -> }
         )
     }
 
@@ -195,5 +203,8 @@ class CatalogFragment : FragmentBase(),
         catalogAdapter.onTagNotLoaded()
     }
 
-
+    override fun setState(state: StoriesView.State) {
+        val catalogAdapter = catalogRecyclerView.adapter as CatalogAdapter
+        catalogAdapter.storiesState = state
+    }
 }
diff --git a/app/src/main/java/org/stepic/droid/web/StepicRestLoggedService.java b/app/src/main/java/org/stepic/droid/web/StepicRestLoggedService.java
index d09b70983a..a5e394ec30 100644
--- a/app/src/main/java/org/stepic/droid/web/StepicRestLoggedService.java
+++ b/app/src/main/java/org/stepic/droid/web/StepicRestLoggedService.java
@@ -247,6 +247,7 @@ Completable createRecommendationReaction(
             @Body final RecommendationReactionsRequest reactionsRequest
     );
 
+    @GET("api/story-templates")
     Observable<StoryTemplatesResponse> getStoryTemplate(
             @Query("page") final int page,
             @Query("is_published") final boolean isPublished,
diff --git a/app/src/main/res/drawable-v21/story_view_foreground.xml b/app/src/main/res/drawable-v21/story_view_foreground.xml
new file mode 100644
index 0000000000..ba3eca0d89
--- /dev/null
+++ b/app/src/main/res/drawable-v21/story_view_foreground.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+
+    <item
+        android:id="@android:id/mask"
+        android:top="4dp"
+        android:bottom="4dp"
+        android:left="4dp"
+        android:right="4dp">
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/stories_default_corner_radius" />
+            <solid android:color="#000000" />
+        </shape>
+    </item>
+
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/story_view_foreground.xml b/app/src/main/res/drawable/story_view_foreground.xml
new file mode 100644
index 0000000000..c84d371815
--- /dev/null
+++ b/app/src/main/res/drawable/story_view_foreground.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_pressed="true"
+        android:top="4dp"
+        android:bottom="4dp"
+        android:left="4dp"
+        android:right="4dp">
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/stories_default_corner_radius" />
+            <solid android:color="#33000000" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_stories_container.xml b/app/src/main/res/layout/view_stories_container.xml
index 6e22e173e2..0d3acceaac 100644
--- a/app/src/main/res/layout/view_stories_container.xml
+++ b/app/src/main/res/layout/view_stories_container.xml
@@ -1,8 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="96dp"
-    android:padding="8dp"
-    android:clipToPadding="false" />
+    android:layout_height="wrap_content">
 
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/storiesRecycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:clipToPadding="false" />
+
+    <LinearLayout
+        android:id="@+id/storiesContainerLoadingPlaceholder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:orientation="horizontal">
+
+        <include layout="@layout/view_story_placeholder" />
+        <include layout="@layout/view_story_placeholder" />
+        <include layout="@layout/view_story_placeholder" />
+        <include layout="@layout/view_story_placeholder" />
+
+    </LinearLayout>
+
+    <include
+        layout="@layout/view_horizontal_line"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_gravity="bottom" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/view_story.xml b/app/src/main/res/layout/view_story.xml
index c4f4744286..8c4d2b0dc0 100644
--- a/app/src/main/res/layout/view_story.xml
+++ b/app/src/main/res/layout/view_story.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="96dp"
-    android:layout_height="96dp"
+    android:layout_width="@dimen/stories_size"
+    android:layout_height="@dimen/stories_size"
     android:layout_margin="8dp"
-    android:foreground="?selectableItemBackground">
+    android:foreground="@drawable/story_view_foreground">
 
     <ImageView
         android:id="@+id/storyCover"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="8dp"
-        android:contentDescription="@null"/>
+        android:layout_margin="4dp"
+        android:contentDescription="@null" />
 
     <View
         android:id="@+id/activeStoryMarker"
@@ -25,7 +25,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|start"
+        android:textColor="@color/white"
         android:gravity="start"
-        android:layout_margin="16dp" />
+        android:layout_margin="12dp" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_story_placeholder.xml b/app/src/main/res/layout/view_story_placeholder.xml
new file mode 100644
index 0000000000..d796e4b0b3
--- /dev/null
+++ b/app/src/main/res/layout/view_story_placeholder.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.stepic.droid.ui.custom.LoadingView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="@dimen/stories_size"
+    android:layout_height="@dimen/stories_size"
+    android:layout_margin="8dp"
+    app:radius="@dimen/stories_default_corner_radius" />
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 0ab4122559..c850110e21 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -197,4 +197,5 @@
     <dimen name="achievement_details_dialog_width">@dimen/wrap_content</dimen>
 
     <dimen name="stories_default_corner_radius">16dp</dimen>
+    <dimen name="stories_size">96dp</dimen>
 </resources>

From 0080d3ae9b6972301140bead48f8648b0ce0b633 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Wed, 19 Sep 2018 14:46:06 +0300
Subject: [PATCH 13/30] set up shared transition delegate & fix duplicate names

---
 app/build.gradle                              |  4 +-
 .../stories/ui/activity/StoriesActivity.kt    |  1 -
 .../stories/ui/adapter/StoriesAdapter.kt      | 16 +++++-
 .../droid/ui/adapters/CatalogAdapter.kt       |  6 +-
 .../droid/ui/fragments/CatalogFragment.kt     | 57 ++++++++++++++++++-
 .../res/layout/view_stories_container.xml     |  8 +--
 .../{view_story.xml => view_story_item.xml}   |  0
 ...er.xml => view_story_item_placeholder.xml} |  0
 8 files changed, 80 insertions(+), 12 deletions(-)
 rename app/src/main/res/layout/{view_story.xml => view_story_item.xml} (100%)
 rename app/src/main/res/layout/{view_story_placeholder.xml => view_story_item_placeholder.xml} (100%)

diff --git a/app/build.gradle b/app/build.gradle
index a5cccd132e..4d5542065e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -172,7 +172,9 @@ dependencies {
     implementation libraries.MPAndroidChart
 
     implementation libraries.shortcutBadger
-    implementation libraries.StoriesKit
+    implementation (libraries.StoriesKit) {
+        exclude group: 'com.android.support'
+    }
 
     debugImplementation libraries.leakCanary
     releaseImplementation libraries.leakCanaryNoOp
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 f418eca24b..baed54d653 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
@@ -1,7 +1,6 @@
 package org.stepic.droid.features.stories.ui.activity
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import org.stepic.droid.R
 import org.stepic.droid.base.FragmentActivityBase
 import org.stepic.droid.features.stories.ui.delegate.StoriesActivityDelegate
diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
index a7f3ba0d01..f59112db1a 100644
--- a/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
@@ -7,11 +7,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.bumptech.glide.Glide
-import kotlinx.android.synthetic.main.view_story.view.*
+import kotlinx.android.synthetic.main.view_story_item.view.*
 import org.stepic.droid.R
 import org.stepic.droid.ui.util.RoundedBitmapImageViewTarget
 import org.stepic.droid.ui.util.changeVisibility
 import ru.nobird.android.stories.model.Story
+import kotlin.properties.Delegates
 
 class StoriesAdapter(private val onStoryClicked: (Story, Int) -> Unit) : RecyclerView.Adapter<StoriesAdapter.StoryViewHolder>() {
     var stories: List<Story> = emptyList()
@@ -20,6 +21,11 @@ class StoriesAdapter(private val onStoryClicked: (Story, Int) -> Unit) : Recycle
     var viewedStoryIds: Set<Long> = emptySet()
         private set
 
+    var selected: Int by Delegates.observable(-1) { _, old, new ->
+        notifyItemChanged(old)
+        notifyItemChanged(new)
+    }
+
     fun setData(stories: List<Story>, viewedStoryIds: Set<Long>) {
         var updateNeeded = false
         if (this.stories != stories) {
@@ -47,7 +53,7 @@ class StoriesAdapter(private val onStoryClicked: (Story, Int) -> Unit) : Recycle
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = StoryViewHolder(
-            LayoutInflater.from(parent.context).inflate(R.layout.view_story, parent, false)
+            LayoutInflater.from(parent.context).inflate(R.layout.view_story_item, parent, false)
     )
 
 
@@ -92,6 +98,12 @@ class StoriesAdapter(private val onStoryClicked: (Story, Int) -> Unit) : Recycle
                     .into(coverTarget)
 
             activeStoryMarker.changeVisibility(!viewedStoryIds.contains(story.id))
+
+            itemView.visibility = if (position == selected) {
+                View.INVISIBLE
+            } else {
+                View.VISIBLE
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt b/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt
index 39c32eba25..1cce6221e9 100644
--- a/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt
+++ b/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt
@@ -41,7 +41,7 @@ class CatalogAdapter(
         private const val PRE_CAROUSEL_COUNT = 3
         private const val POST_CAROUSEL_COUNT = 1
 
-        private const val STORIES_INDEX = 0
+        const val STORIES_INDEX = 0
         private const val LANGUAGE_INDEX = 1
         private const val TAGS_INDEX = 2
     }
@@ -306,9 +306,9 @@ class CatalogAdapter(
             root: View,
             onStoryClicked: (Story, Int) -> Unit
     ) : RecyclerView.ViewHolder(root) {
-        private val storiesAdapter = StoriesAdapter(onStoryClicked)
-        private val recycler = root.storiesRecycler
         private val loadingPlaceholder = root.storiesContainerLoadingPlaceholder
+        val storiesAdapter = StoriesAdapter(onStoryClicked)
+        val recycler = root.storiesRecycler
 
         init {
             recycler.adapter = storiesAdapter
diff --git a/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt b/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt
index 9ae65f80d5..dc3b8d39cd 100644
--- a/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt
+++ b/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt
@@ -19,12 +19,17 @@ import org.stepic.droid.core.presenters.contracts.FiltersView
 import org.stepic.droid.core.presenters.contracts.TagsView
 import org.stepic.droid.features.stories.presentation.StoriesPresenter
 import org.stepic.droid.features.stories.presentation.StoriesView
+import org.stepic.droid.features.stories.ui.activity.StoriesActivity
+import org.stepic.droid.features.stories.ui.adapter.StoriesAdapter
 import org.stepic.droid.model.CoursesCarouselInfo
 import org.stepic.droid.model.StepikFilter
 import org.stepic.droid.ui.adapters.CatalogAdapter
 import org.stepic.droid.ui.custom.AutoCompleteSearchView
 import org.stepic.droid.ui.util.initCenteredToolbar
 import org.stepik.android.model.Tag
+import ru.nobird.android.stories.transition.SharedTransitionIntentBuilder
+import ru.nobird.android.stories.transition.SharedTransitionsManager
+import ru.nobird.android.stories.ui.delegate.SharedTransitionContainerDelegate
 import java.util.*
 import javax.inject.Inject
 
@@ -33,6 +38,8 @@ class CatalogFragment : FragmentBase(),
 
     companion object {
         fun newInstance(): FragmentBase = CatalogFragment()
+
+        private const val CATALOG_STORIES_KEY = "catalog_stories"
     }
 
     @Inject
@@ -113,7 +120,7 @@ class CatalogFragment : FragmentBase(),
                     tagsPresenter.onNeedShowTags()
                 },
                 { tag -> onTagClicked(tag) },
-                { _, _ -> }
+                { _, position -> showStories(position) }
         )
     }
 
@@ -207,4 +214,52 @@ class CatalogFragment : FragmentBase(),
         val catalogAdapter = catalogRecyclerView.adapter as CatalogAdapter
         catalogAdapter.storiesState = state
     }
+
+    private fun showStories(position: Int) {
+        val storiesViewHolder = catalogRecyclerView.findViewHolderForAdapterPosition(CatalogAdapter.STORIES_INDEX)
+                as? CatalogAdapter.StoriesViewHolder
+                ?: return
+
+        val stories = storiesViewHolder.storiesAdapter.stories
+
+        context.startActivity(SharedTransitionIntentBuilder.createIntent(
+                context, StoriesActivity::class.java, CATALOG_STORIES_KEY, position, stories
+        ))
+    }
+
+    override fun onStart() {
+        super.onStart()
+        SharedTransitionsManager.registerTransitionDelegate(CATALOG_STORIES_KEY, object : SharedTransitionContainerDelegate {
+            override fun getSharedView(position: Int): View {
+                val storiesViewHolder = catalogRecyclerView.findViewHolderForAdapterPosition(CatalogAdapter.STORIES_INDEX)
+                        as? CatalogAdapter.StoriesViewHolder
+                        ?: return View(context) // todo return null
+
+                val storyViewHolder = storiesViewHolder.recycler.findViewHolderForAdapterPosition(position)
+                        as? StoriesAdapter.StoryViewHolder
+                        ?: return View(context) // todo return null
+
+                return storyViewHolder.itemView
+            }
+
+            override fun onPositionChanged(position: Int) {
+                val storiesViewHolder = catalogRecyclerView.findViewHolderForAdapterPosition(CatalogAdapter.STORIES_INDEX)
+                        as? CatalogAdapter.StoriesViewHolder
+                        ?: return
+
+                storiesViewHolder.recycler.layoutManager?.scrollToPosition(position)
+                storiesViewHolder.storiesAdapter.selected = position
+
+                if (position != -1) {
+                    val story = storiesViewHolder.storiesAdapter.stories[position]
+                    storiesPresenter.onStoryViewed(story.id)
+                }
+            }
+        })
+    }
+
+    override fun onStop() {
+        SharedTransitionsManager.unregisterTransitionDelegate(CATALOG_STORIES_KEY)
+        super.onStop()
+    }
 }
diff --git a/app/src/main/res/layout/view_stories_container.xml b/app/src/main/res/layout/view_stories_container.xml
index 0d3acceaac..0cd2d9749a 100644
--- a/app/src/main/res/layout/view_stories_container.xml
+++ b/app/src/main/res/layout/view_stories_container.xml
@@ -18,10 +18,10 @@
         android:padding="8dp"
         android:orientation="horizontal">
 
-        <include layout="@layout/view_story_placeholder" />
-        <include layout="@layout/view_story_placeholder" />
-        <include layout="@layout/view_story_placeholder" />
-        <include layout="@layout/view_story_placeholder" />
+        <include layout="@layout/view_story_item_placeholder" />
+        <include layout="@layout/view_story_item_placeholder" />
+        <include layout="@layout/view_story_item_placeholder" />
+        <include layout="@layout/view_story_item_placeholder" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/view_story.xml b/app/src/main/res/layout/view_story_item.xml
similarity index 100%
rename from app/src/main/res/layout/view_story.xml
rename to app/src/main/res/layout/view_story_item.xml
diff --git a/app/src/main/res/layout/view_story_placeholder.xml b/app/src/main/res/layout/view_story_item_placeholder.xml
similarity index 100%
rename from app/src/main/res/layout/view_story_placeholder.xml
rename to app/src/main/res/layout/view_story_item_placeholder.xml

From 01ae816470218cb7cbfafbcec1e70d747e16fe38 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Wed, 19 Sep 2018 15:57:01 +0300
Subject: [PATCH 14/30] fix animations

---
 .../droid/features/stories/ui/activity/StoriesActivity.kt | 4 ++++
 .../droid/features/stories/ui/adapter/StoriesAdapter.kt   | 4 +++-
 .../java/org/stepic/droid/ui/adapters/CatalogAdapter.kt   | 1 +
 .../java/org/stepic/droid/ui/fragments/CatalogFragment.kt | 8 ++++----
 app/src/main/res/layout/activity_stories.xml              | 6 +++---
 5 files changed, 15 insertions(+), 8 deletions(-)

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 baed54d653..c8869b9449 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
@@ -19,4 +19,8 @@ class StoriesActivity : FragmentActivityBase() {
         storiesDelegate.onPause()
         super.onPause()
     }
+
+    override fun onBackPressed() {
+        storiesDelegate.finish()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
index f59112db1a..b445d30068 100644
--- a/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
@@ -6,6 +6,7 @@ import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.view_story_item.view.*
 import org.stepic.droid.R
@@ -64,11 +65,12 @@ class StoriesAdapter(private val onStoryClicked: (Story, Int) -> Unit) : Recycle
     }
 
     inner class StoryViewHolder(root: View) : RecyclerView.ViewHolder(root) {
+        val cover: ImageView = root.storyCover
         private val title = root.storyTitle
         private val activeStoryMarker = root.activeStoryMarker
 
         private val coverTarget = RoundedBitmapImageViewTarget(
-                root.context.resources.getDimension(R.dimen.stories_default_corner_radius), root.storyCover)
+                root.context.resources.getDimension(R.dimen.stories_default_corner_radius), cover)
 
         private val coursePlaceholderDrawable by lazy {
             val resources = root.context.resources
diff --git a/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt b/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt
index 1cce6221e9..81bb43d357 100644
--- a/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt
+++ b/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt
@@ -311,6 +311,7 @@ class CatalogAdapter(
         val recycler = root.storiesRecycler
 
         init {
+            recycler.itemAnimator = null
             recycler.adapter = storiesAdapter
             recycler.layoutManager = LinearLayoutManager(root.context, LinearLayoutManager.HORIZONTAL, false)
         }
diff --git a/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt b/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt
index dc3b8d39cd..601ad53d3e 100644
--- a/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt
+++ b/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt
@@ -230,16 +230,16 @@ class CatalogFragment : FragmentBase(),
     override fun onStart() {
         super.onStart()
         SharedTransitionsManager.registerTransitionDelegate(CATALOG_STORIES_KEY, object : SharedTransitionContainerDelegate {
-            override fun getSharedView(position: Int): View {
+            override fun getSharedView(position: Int): View? {
                 val storiesViewHolder = catalogRecyclerView.findViewHolderForAdapterPosition(CatalogAdapter.STORIES_INDEX)
                         as? CatalogAdapter.StoriesViewHolder
-                        ?: return View(context) // todo return null
+                        ?: return null
 
                 val storyViewHolder = storiesViewHolder.recycler.findViewHolderForAdapterPosition(position)
                         as? StoriesAdapter.StoryViewHolder
-                        ?: return View(context) // todo return null
+                        ?: return null
 
-                return storyViewHolder.itemView
+                return storyViewHolder.cover
             }
 
             override fun onPositionChanged(position: Int) {
diff --git a/app/src/main/res/layout/activity_stories.xml b/app/src/main/res/layout/activity_stories.xml
index edc389843c..4f3ee488fa 100644
--- a/app/src/main/res/layout/activity_stories.xml
+++ b/app/src/main/res/layout/activity_stories.xml
@@ -4,10 +4,10 @@
     android:id="@+id/content"
     android:layout_alignParentTop="true"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/new_accent_color">
+    android:layout_height="match_parent">
     <android.support.v4.view.ViewPager
         android:id="@+id/storiesPager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:background="@color/new_accent_color" />
 </ru.nobird.android.stories.ui.custom.DismissableLayout>
\ No newline at end of file

From 26c8c3300224cabd2b352f3eab46a7d435cbb796 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Wed, 19 Sep 2018 16:13:01 +0300
Subject: [PATCH 15/30] add color mask + fix paddings

---
 .../PlainTextWithButtonStoryPartDelegate.kt        | 14 +++++++++++---
 .../layout/view_story_plain_text_with_button.xml   |  4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
index eebaf713dd..998bd9a544 100644
--- a/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
@@ -10,6 +10,7 @@ import android.support.annotation.DrawableRes
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.view_story_plain_text_with_button.view.*
 import org.stepic.droid.R
 import org.stepic.droid.features.stories.model.PlainTextWithButtonStoryPart
@@ -22,6 +23,8 @@ import ru.nobird.android.stories.ui.delegate.StoryPartViewDelegate
 class PlainTextWithButtonStoryPartDelegate(private val context: Context) : StoryPartViewDelegate() {
     companion object {
         private const val DARK_BACKGROUND_STYLE = "dark"
+
+        private const val COLOR_MASK = 0xFF000000.toInt()
     }
 
     override fun isForViewType(part: StoryPart): Boolean =
@@ -31,6 +34,11 @@ class PlainTextWithButtonStoryPartDelegate(private val context: Context) : Story
             LayoutInflater.from(container.context).inflate(R.layout.view_story_plain_text_with_button, container, false).apply {
                 part as PlainTextWithButtonStoryPart
 
+                Glide.with(context)
+                        .load(part.cover)
+                        .asBitmap()
+                        .into(this.storyCover)
+
                 setUpText(this, part.text)
                 setUpButton(this, part.button)
             }
@@ -48,7 +56,7 @@ class PlainTextWithButtonStoryPartDelegate(private val context: Context) : Story
             val storyTitle = view.storyTitle
             val storyText = view.storyText
 
-            @ColorInt val textColor = text.textColor.toInt(16)
+            @ColorInt val textColor = COLOR_MASK or text.textColor.toInt(16)
 
             storyTitle.setTextColor(textColor)
             storyText.setTextColor(textColor)
@@ -66,7 +74,7 @@ class PlainTextWithButtonStoryPartDelegate(private val context: Context) : Story
         val storyButton = view.storyButton
         if (button != null) {
             val backgroundDrawable = GradientDrawable()
-            backgroundDrawable.setColor(button.backgroundColor.toInt(16))
+            backgroundDrawable.setColor(COLOR_MASK or button.backgroundColor.toInt(16))
             backgroundDrawable.cornerRadius = view.context.resources.getDimension(R.dimen.stories_default_corner_radius)
 
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
@@ -76,7 +84,7 @@ class PlainTextWithButtonStoryPartDelegate(private val context: Context) : Story
                 storyButton.background = backgroundDrawable
             }
 
-            storyButton.setTextColor(button.textColor.toInt(16))
+            storyButton.setTextColor(COLOR_MASK or button.textColor.toInt(16))
 
             storyButton.text = button.title
             storyButton.setOnClickListener {
diff --git a/app/src/main/res/layout/view_story_plain_text_with_button.xml b/app/src/main/res/layout/view_story_plain_text_with_button.xml
index c33a9e0f0d..07ad77c2e6 100644
--- a/app/src/main/res/layout/view_story_plain_text_with_button.xml
+++ b/app/src/main/res/layout/view_story_plain_text_with_button.xml
@@ -24,7 +24,8 @@
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:gravity="start"
-            android:layout_margin="16dp">
+            android:layout_margin="16dp"
+            android:padding="16dp">
 
             <TextView
                 android:id="@+id/storyTitle"
@@ -49,6 +50,7 @@
             android:layout_marginBottom="16dp"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
+            android:textAllCaps="false"
             android:foreground="?selectableItemBackground" />
 
     </LinearLayout>

From b8c3451a5be9d847796e57c9751e0dcdbcb4c02b Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Wed, 19 Sep 2018 17:10:43 +0300
Subject: [PATCH 16/30] add progress to cover loading

---
 .../delegate/PlainTextWithButtonStoryPartDelegate.kt  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
index 998bd9a544..7d6367afbd 100644
--- a/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
@@ -7,6 +7,7 @@ import android.net.Uri
 import android.os.Build
 import android.support.annotation.ColorInt
 import android.support.annotation.DrawableRes
+import android.support.v4.widget.CircularProgressDrawable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -27,6 +28,14 @@ class PlainTextWithButtonStoryPartDelegate(private val context: Context) : Story
         private const val COLOR_MASK = 0xFF000000.toInt()
     }
 
+    private val progressDrawable = CircularProgressDrawable(context).apply {
+        alpha = 0x77
+        strokeWidth = 5f
+        centerRadius = 30f
+        setColorSchemeColors(0xFFFFFF)
+        start()
+    }
+
     override fun isForViewType(part: StoryPart): Boolean =
             part is PlainTextWithButtonStoryPart
 
@@ -36,7 +45,7 @@ class PlainTextWithButtonStoryPartDelegate(private val context: Context) : Story
 
                 Glide.with(context)
                         .load(part.cover)
-                        .asBitmap()
+                        .placeholder(progressDrawable)
                         .into(this.storyCover)
 
                 setUpText(this, part.text)

From fc52dce80ad0e03cf7afffc057255cdb966a03d7 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Wed, 19 Sep 2018 19:28:23 +0300
Subject: [PATCH 17/30] stories analytics interface

---
 .../droid/analytic/AmplitudeAnalytic.kt       | 19 +++++++++++++++++++
 .../stories/ui/activity/StoriesActivity.kt    |  3 ++-
 .../PlainTextWithButtonStoryPartDelegate.kt   |  6 +++++-
 .../ui/delegate/StoriesActivityDelegate.kt    |  6 ++++--
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/stepic/droid/analytic/AmplitudeAnalytic.kt b/app/src/main/java/org/stepic/droid/analytic/AmplitudeAnalytic.kt
index 17ed49d923..caf0f0e86d 100644
--- a/app/src/main/java/org/stepic/droid/analytic/AmplitudeAnalytic.kt
+++ b/app/src/main/java/org/stepic/droid/analytic/AmplitudeAnalytic.kt
@@ -81,4 +81,23 @@ interface AmplitudeAnalytic {
 
         const val PARAM_SUGGESTION = "suggestion"
     }
+
+    object Stories {
+        const val STORY_OPENED = "Story opened"
+        const val STORY_PART_OPENED = "Story part opened"
+        const val BUTTON_PRESSED = "Button pressed"
+        const val STORY_CLOSED = "Story closed"
+
+        object Values {
+            const val STORY_ID = "id"
+            const val POSITION = "position"
+            const val CLOSE_TYPE = "type"
+
+            object CloseTypes {
+                const val AUTO = "automatic"
+                const val SWIPE = "swipe"
+                const val CROSS = "cross"
+            }
+        }
+    }
 }
\ No newline at end of file
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 c8869b9449..0cdf758d21 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
@@ -2,6 +2,7 @@ package org.stepic.droid.features.stories.ui.activity
 
 import android.os.Bundle
 import org.stepic.droid.R
+import org.stepic.droid.analytic.Analytic
 import org.stepic.droid.base.FragmentActivityBase
 import org.stepic.droid.features.stories.ui.delegate.StoriesActivityDelegate
 
@@ -11,7 +12,7 @@ class StoriesActivity : FragmentActivityBase() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_stories)
-        storiesDelegate = StoriesActivityDelegate(this)
+        storiesDelegate = StoriesActivityDelegate(this, analytic)
         storiesDelegate.onCreate(savedInstanceState)
     }
 
diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
index 7d6367afbd..883d9f0abe 100644
--- a/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
@@ -14,6 +14,7 @@ import android.view.ViewGroup
 import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.view_story_plain_text_with_button.view.*
 import org.stepic.droid.R
+import org.stepic.droid.analytic.Analytic
 import org.stepic.droid.features.stories.model.PlainTextWithButtonStoryPart
 import org.stepic.droid.ui.util.changeVisibility
 import org.stepik.android.model.StoryTemplate
@@ -21,7 +22,10 @@ import ru.nobird.android.stories.model.StoryPart
 import ru.nobird.android.stories.ui.custom.StoryView
 import ru.nobird.android.stories.ui.delegate.StoryPartViewDelegate
 
-class PlainTextWithButtonStoryPartDelegate(private val context: Context) : StoryPartViewDelegate() {
+class PlainTextWithButtonStoryPartDelegate(
+        private val analytic: Analytic,
+        private val context: Context
+) : StoryPartViewDelegate() {
     companion object {
         private const val DARK_BACKGROUND_STYLE = "dark"
 
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 3a1dbc2f55..829be87c3b 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
@@ -4,12 +4,14 @@ import android.os.Bundle
 import android.support.v4.view.ViewPager
 import android.support.v7.app.AppCompatActivity
 import kotlinx.android.synthetic.main.activity_stories.*
+import org.stepic.droid.analytic.Analytic
 import ru.nobird.android.stories.ui.custom.DismissableLayout
 import ru.nobird.android.stories.ui.delegate.StoriesActivityDelegateBase
 import ru.nobird.android.stories.ui.delegate.StoryPartViewDelegate
 
 class StoriesActivityDelegate(
-        activity: AppCompatActivity
+        activity: AppCompatActivity,
+        analytic: Analytic
 ) : StoriesActivityDelegateBase(activity) {
     override val dismissableLayout: DismissableLayout =
             activity.content
@@ -21,5 +23,5 @@ class StoriesActivityDelegate(
             activity.intent.extras ?: Bundle.EMPTY
 
     override val storyPartDelegates: List<StoryPartViewDelegate> =
-            listOf(PlainTextWithButtonStoryPartDelegate(activity))
+            listOf(PlainTextWithButtonStoryPartDelegate(analytic, activity))
 }
\ No newline at end of file

From 52aa672685756650d4e495fff399419a3b79d33d Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Thu, 20 Sep 2018 13:54:54 +0300
Subject: [PATCH 18/30] add stories analytics

---
 .../stories/ui/activity/StoriesActivity.kt    | 22 +++++++++++++++-
 .../PlainTextWithButtonStoryPartDelegate.kt   | 21 ++++++++++++++--
 .../ui/delegate/StoriesActivityDelegate.kt    | 25 ++++++++++++++++---
 .../droid/ui/fragments/CatalogFragment.kt     |  4 +++
 4 files changed, 66 insertions(+), 6 deletions(-)

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 0cdf758d21..e9c77656f0 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
@@ -2,7 +2,7 @@ package org.stepic.droid.features.stories.ui.activity
 
 import android.os.Bundle
 import org.stepic.droid.R
-import org.stepic.droid.analytic.Analytic
+import org.stepic.droid.analytic.AmplitudeAnalytic
 import org.stepic.droid.base.FragmentActivityBase
 import org.stepic.droid.features.stories.ui.delegate.StoriesActivityDelegate
 
@@ -14,6 +14,19 @@ class StoriesActivity : FragmentActivityBase() {
         setContentView(R.layout.activity_stories)
         storiesDelegate = StoriesActivityDelegate(this, analytic)
         storiesDelegate.onCreate(savedInstanceState)
+
+        val onDismiss = storiesDelegate.dismissableLayout.onDismiss
+
+        storiesDelegate.dismissableLayout.onDismiss = {
+            val story = storiesDelegate.getCurrentStory()
+            if (story != null) {
+                analytic.reportAmplitudeEvent(AmplitudeAnalytic.Stories.STORY_CLOSED, mapOf(
+                        AmplitudeAnalytic.Stories.Values.STORY_ID to story.id,
+                        AmplitudeAnalytic.Stories.Values.CLOSE_TYPE to AmplitudeAnalytic.Stories.Values.CloseTypes.SWIPE
+                ))
+            }
+            onDismiss?.invoke()
+        }
     }
 
     override fun onPause() {
@@ -23,5 +36,12 @@ class StoriesActivity : FragmentActivityBase() {
 
     override fun onBackPressed() {
         storiesDelegate.finish()
+
+        val story = storiesDelegate.getCurrentStory() ?: return
+
+        analytic.reportAmplitudeEvent(AmplitudeAnalytic.Stories.STORY_CLOSED, mapOf(
+                AmplitudeAnalytic.Stories.Values.STORY_ID to story.id,
+                AmplitudeAnalytic.Stories.Values.CLOSE_TYPE to AmplitudeAnalytic.Stories.Values.CloseTypes.CROSS
+        ))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
index 883d9f0abe..ff2f06cd47 100644
--- a/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/delegate/PlainTextWithButtonStoryPartDelegate.kt
@@ -14,10 +14,12 @@ import android.view.ViewGroup
 import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.view_story_plain_text_with_button.view.*
 import org.stepic.droid.R
+import org.stepic.droid.analytic.AmplitudeAnalytic
 import org.stepic.droid.analytic.Analytic
 import org.stepic.droid.features.stories.model.PlainTextWithButtonStoryPart
 import org.stepic.droid.ui.util.changeVisibility
 import org.stepik.android.model.StoryTemplate
+import ru.nobird.android.stories.model.Story
 import ru.nobird.android.stories.model.StoryPart
 import ru.nobird.android.stories.ui.custom.StoryView
 import ru.nobird.android.stories.ui.delegate.StoryPartViewDelegate
@@ -52,8 +54,16 @@ class PlainTextWithButtonStoryPartDelegate(
                         .placeholder(progressDrawable)
                         .into(this.storyCover)
 
+                val story = storyView.adapter?.story
+                if (story != null) {
+                    analytic.reportAmplitudeEvent(AmplitudeAnalytic.Stories.STORY_PART_OPENED, mapOf(
+                            AmplitudeAnalytic.Stories.Values.STORY_ID to story.id,
+                            AmplitudeAnalytic.Stories.Values.POSITION to position
+                    ))
+                }
+
                 setUpText(this, part.text)
-                setUpButton(this, part.button)
+                setUpButton(story, this, part.button, position)
             }
 
     private fun setUpText(view: View, text: StoryTemplate.Text?) {
@@ -83,7 +93,7 @@ class PlainTextWithButtonStoryPartDelegate(
         }
     }
 
-    private fun setUpButton(view: View, button: StoryTemplate.Button?) {
+    private fun setUpButton(story: Story?, view: View, button: StoryTemplate.Button?, position: Int) {
         val storyButton = view.storyButton
         if (button != null) {
             val backgroundDrawable = GradientDrawable()
@@ -103,6 +113,13 @@ class PlainTextWithButtonStoryPartDelegate(
             storyButton.setOnClickListener {
                 val uri = Uri.parse(button.url)
                 context.startActivity(Intent(Intent.ACTION_VIEW, uri))
+
+                if (story != null) {
+                    analytic.reportAmplitudeEvent(AmplitudeAnalytic.Stories.BUTTON_PRESSED, mapOf(
+                            AmplitudeAnalytic.Stories.Values.STORY_ID to story.id,
+                            AmplitudeAnalytic.Stories.Values.POSITION to position
+                    ))
+                }
             }
 
             storyButton.changeVisibility(true)
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 829be87c3b..d9059d40bd 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
@@ -4,19 +4,22 @@ import android.os.Bundle
 import android.support.v4.view.ViewPager
 import android.support.v7.app.AppCompatActivity
 import kotlinx.android.synthetic.main.activity_stories.*
+import org.stepic.droid.analytic.AmplitudeAnalytic
 import org.stepic.droid.analytic.Analytic
+import ru.nobird.android.stories.model.Story
+import ru.nobird.android.stories.ui.adapter.StoriesPagerAdapter
 import ru.nobird.android.stories.ui.custom.DismissableLayout
 import ru.nobird.android.stories.ui.delegate.StoriesActivityDelegateBase
 import ru.nobird.android.stories.ui.delegate.StoryPartViewDelegate
 
 class StoriesActivityDelegate(
         activity: AppCompatActivity,
-        analytic: Analytic
+        private val analytic: Analytic
 ) : StoriesActivityDelegateBase(activity) {
-    override val dismissableLayout: DismissableLayout =
+    public override val dismissableLayout: DismissableLayout =
             activity.content
 
-    override val storiesViewPager: ViewPager =
+    public override val storiesViewPager: ViewPager =
             activity.storiesPager
 
     override val arguments: Bundle =
@@ -24,4 +27,20 @@ class StoriesActivityDelegate(
 
     override val storyPartDelegates: List<StoryPartViewDelegate> =
             listOf(PlainTextWithButtonStoryPartDelegate(analytic, activity))
+
+    override fun onComplete() {
+        super.onComplete()
+
+        val story = getCurrentStory() ?: return
+
+        analytic.reportAmplitudeEvent(AmplitudeAnalytic.Stories.STORY_CLOSED, mapOf(
+                AmplitudeAnalytic.Stories.Values.STORY_ID to story.id,
+                AmplitudeAnalytic.Stories.Values.CLOSE_TYPE to AmplitudeAnalytic.Stories.Values.CloseTypes.AUTO
+        ))
+    }
+
+    fun getCurrentStory(): Story? =
+            (storiesViewPager.adapter as? StoriesPagerAdapter)
+                    ?.stories
+                    ?.getOrNull(storiesViewPager.currentItem)
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt b/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt
index 601ad53d3e..5a9eb0e217 100644
--- a/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt
+++ b/app/src/main/java/org/stepic/droid/ui/fragments/CatalogFragment.kt
@@ -6,6 +6,7 @@ import android.support.v7.widget.SearchView
 import android.view.*
 import kotlinx.android.synthetic.main.fragment_catalog.*
 import org.stepic.droid.R
+import org.stepic.droid.analytic.AmplitudeAnalytic
 import org.stepic.droid.analytic.Analytic
 import org.stepic.droid.base.App
 import org.stepic.droid.base.Client
@@ -253,6 +254,9 @@ class CatalogFragment : FragmentBase(),
                 if (position != -1) {
                     val story = storiesViewHolder.storiesAdapter.stories[position]
                     storiesPresenter.onStoryViewed(story.id)
+                    analytic.reportAmplitudeEvent(AmplitudeAnalytic.Stories.STORY_OPENED, mapOf(
+                            AmplitudeAnalytic.Stories.Values.STORY_ID to story.id
+                    ))
                 }
             }
         })

From b233f345dbbafd3179cd866ee2c5afe3770297f9 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Thu, 20 Sep 2018 17:14:37 +0300
Subject: [PATCH 19/30] add tinted foreground to image

---
 .../stories/ui/adapter/StoriesAdapter.kt      | 35 +++++++++++++------
 .../droid/ui/adapters/CatalogAdapter.kt       |  3 +-
 .../drawable/ic_general_placeholder_dark.xml  |  9 +++++
 .../drawable/story_view_tint_foreground.xml   | 13 +++++++
 app/src/main/res/layout/view_story_item.xml   |  1 +
 5 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_general_placeholder_dark.xml
 create mode 100644 app/src/main/res/drawable/story_view_tint_foreground.xml

diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
index b445d30068..191c717853 100644
--- a/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
@@ -1,7 +1,10 @@
 package org.stepic.droid.features.stories.ui.adapter
 
-import android.graphics.BitmapFactory
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
 import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory
+import android.support.v7.content.res.AppCompatResources
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
@@ -15,7 +18,26 @@ import org.stepic.droid.ui.util.changeVisibility
 import ru.nobird.android.stories.model.Story
 import kotlin.properties.Delegates
 
-class StoriesAdapter(private val onStoryClicked: (Story, Int) -> Unit) : RecyclerView.Adapter<StoriesAdapter.StoryViewHolder>() {
+class StoriesAdapter(
+        private val context: Context,
+        private val onStoryClicked: (Story, Int) -> Unit
+) : RecyclerView.Adapter<StoriesAdapter.StoryViewHolder>() {
+    private val coursePlaceholderDrawable by lazy {
+        val resources = context.resources
+        val size = resources.getDimension(R.dimen.stories_size).toInt()
+
+        val drawable = AppCompatResources.getDrawable(context, R.drawable.ic_general_placeholder_dark)!!
+
+        val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+        drawable.setBounds(0, 0, canvas.width, canvas.height)
+        drawable.draw(canvas)
+
+        val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(resources, bitmap)
+        circularBitmapDrawable.cornerRadius = resources.getDimension(R.dimen.stories_default_corner_radius)
+        return@lazy circularBitmapDrawable
+    }
+
     var stories: List<Story> = emptyList()
         private set
 
@@ -57,7 +79,6 @@ class StoriesAdapter(private val onStoryClicked: (Story, Int) -> Unit) : Recycle
             LayoutInflater.from(parent.context).inflate(R.layout.view_story_item, parent, false)
     )
 
-
     override fun getItemCount() = stories.size
 
     override fun onBindViewHolder(holder: StoryViewHolder, position: Int) {
@@ -72,14 +93,6 @@ class StoriesAdapter(private val onStoryClicked: (Story, Int) -> Unit) : Recycle
         private val coverTarget = RoundedBitmapImageViewTarget(
                 root.context.resources.getDimension(R.dimen.stories_default_corner_radius), cover)
 
-        private val coursePlaceholderDrawable by lazy {
-            val resources = root.context.resources
-            val coursePlaceholderBitmap = BitmapFactory.decodeResource(resources, R.drawable.general_placeholder)
-            val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(resources, coursePlaceholderBitmap)
-            circularBitmapDrawable.cornerRadius = resources.getDimension(R.dimen.stories_default_corner_radius)
-            return@lazy circularBitmapDrawable
-        }
-
         init {
             root.setOnClickListener {
                 if (adapterPosition in stories.indices) {
diff --git a/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt b/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt
index 81bb43d357..553de5fc53 100644
--- a/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt
+++ b/app/src/main/java/org/stepic/droid/ui/adapters/CatalogAdapter.kt
@@ -16,7 +16,6 @@ import org.stepic.droid.features.stories.presentation.StoriesView
 import org.stepic.droid.features.stories.ui.adapter.StoriesAdapter
 import org.stepic.droid.model.*
 import org.stepic.droid.ui.util.changeVisibility
-import org.stepic.droid.ui.util.hideAllChildren
 import org.stepic.droid.ui.util.setHeight
 import org.stepik.android.model.Tag
 import ru.nobird.android.stories.model.Story
@@ -307,7 +306,7 @@ class CatalogAdapter(
             onStoryClicked: (Story, Int) -> Unit
     ) : RecyclerView.ViewHolder(root) {
         private val loadingPlaceholder = root.storiesContainerLoadingPlaceholder
-        val storiesAdapter = StoriesAdapter(onStoryClicked)
+        val storiesAdapter = StoriesAdapter(root.context, onStoryClicked)
         val recycler = root.storiesRecycler
 
         init {
diff --git a/app/src/main/res/drawable/ic_general_placeholder_dark.xml b/app/src/main/res/drawable/ic_general_placeholder_dark.xml
new file mode 100644
index 0000000000..6df309743b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_general_placeholder_dark.xml
@@ -0,0 +1,9 @@
+<vector android:height="24dp" android:viewportHeight="200"
+    android:viewportWidth="200" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#222222" android:fillType="evenOdd"
+        android:pathData="M0,0h200v200h-200z"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+    <path android:fillColor="#FFFFFF" android:fillType="nonZero"
+        android:pathData="M124,157.9C117.8,163.9 109.3,167.6 99.9,167.6C90.3,167.6 81.7,163.7 75.4,157.4L91.6,141.2C93.7,143.3 96.7,144.7 99.9,144.7C103.2,144.7 106.1,143.4 108.2,141.2L141.1,108.3C143.2,106.2 144.6,103.2 144.6,100C144.6,96.7 143.3,93.8 141.1,91.7C139,89.6 136,88.2 132.8,88.2C129.5,88.2 126.6,89.5 124.5,91.7L91.6,124.6C85.3,130.9 76.6,134.8 67.1,134.8C57.5,134.8 48.9,130.9 42.6,124.6C36.3,118.3 32.4,109.6 32.4,100.1C32.4,90.5 36.3,81.9 42.6,75.6L75.5,42.7C81.8,36.4 90.5,32.5 100,32.5C109.6,32.5 118.2,36.4 124.5,42.7L108.3,58.9C106.2,56.8 103.2,55.4 100,55.4C96.7,55.4 93.8,56.7 91.7,58.9L58.8,91.8C56.7,93.9 55.3,96.9 55.3,100.1C55.3,103.4 56.6,106.3 58.8,108.4C60.9,110.5 63.9,111.9 67.1,111.9C70.4,111.9 73.3,110.6 75.4,108.4L108.3,75.5C114.6,69.2 123.3,65.3 132.8,65.3C142.3,65.3 151,69.2 157.3,75.5C163.6,81.8 167.5,90.5 167.5,100C167.5,109.6 163.6,118.2 157.3,124.5L124,157.9Z"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/story_view_tint_foreground.xml b/app/src/main/res/drawable/story_view_tint_foreground.xml
new file mode 100644
index 0000000000..de7626dd74
--- /dev/null
+++ b/app/src/main/res/drawable/story_view_tint_foreground.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:radius="@dimen/stories_default_corner_radius" />
+
+    <gradient
+        android:angle="270"
+        android:type="linear"
+        android:startColor="#00000000"
+        android:endColor="@color/new_accent_color_opacity_50" />
+</shape>
diff --git a/app/src/main/res/layout/view_story_item.xml b/app/src/main/res/layout/view_story_item.xml
index 8c4d2b0dc0..086be07394 100644
--- a/app/src/main/res/layout/view_story_item.xml
+++ b/app/src/main/res/layout/view_story_item.xml
@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="4dp"
+        android:foreground="@drawable/story_view_tint_foreground"
         android:contentDescription="@null" />
 
     <View

From 3a397a74d2baf768fc675c549ef9a051f97bf3d8 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Thu, 20 Sep 2018 17:26:19 +0300
Subject: [PATCH 20/30] make smaller text size of story item

---
 app/src/main/res/layout/view_story_item.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/view_story_item.xml b/app/src/main/res/layout/view_story_item.xml
index 086be07394..b376e7a3f9 100644
--- a/app/src/main/res/layout/view_story_item.xml
+++ b/app/src/main/res/layout/view_story_item.xml
@@ -28,6 +28,7 @@
         android:layout_gravity="bottom|start"
         android:textColor="@color/white"
         android:gravity="start"
+        android:textSize="12sp"
         android:layout_margin="12dp" />
 
 </FrameLayout>
\ No newline at end of file

From 5c48e3dfcce322826a36b616db9811708e823ef0 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Thu, 20 Sep 2018 17:51:00 +0300
Subject: [PATCH 21/30] fix viewed stories adapter update

---
 .../stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
index 191c717853..f14710261a 100644
--- a/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
+++ b/app/src/main/java/org/stepic/droid/features/stories/ui/adapter/StoriesAdapter.kt
@@ -61,6 +61,7 @@ class StoriesAdapter(
                 this.viewedStoryIds = viewedStoryIds
             } else {
                 val diff = viewedStoryIds - this.viewedStoryIds
+                this.viewedStoryIds = viewedStoryIds
                 diff.forEach { storyId ->
                     val index = stories.indexOfFirst { it.id == storyId }
                     if (index != -1) {

From 00a123962780865fcbbfef67e3d37bcba55e4cca Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Thu, 20 Sep 2018 19:43:43 +0300
Subject: [PATCH 22/30] migrate to new dismisslistener

---
 .../stories/ui/activity/StoriesActivity.kt    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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 e9c77656f0..50a82da894 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
@@ -5,6 +5,7 @@ import org.stepic.droid.R
 import org.stepic.droid.analytic.AmplitudeAnalytic
 import org.stepic.droid.base.FragmentActivityBase
 import org.stepic.droid.features.stories.ui.delegate.StoriesActivityDelegate
+import ru.nobird.android.stories.ui.custom.DismissableLayout
 
 class StoriesActivity : FragmentActivityBase() {
     private lateinit var storiesDelegate: StoriesActivityDelegate
@@ -15,18 +16,17 @@ class StoriesActivity : FragmentActivityBase() {
         storiesDelegate = StoriesActivityDelegate(this, analytic)
         storiesDelegate.onCreate(savedInstanceState)
 
-        val onDismiss = storiesDelegate.dismissableLayout.onDismiss
-
-        storiesDelegate.dismissableLayout.onDismiss = {
-            val story = storiesDelegate.getCurrentStory()
-            if (story != null) {
-                analytic.reportAmplitudeEvent(AmplitudeAnalytic.Stories.STORY_CLOSED, mapOf(
-                        AmplitudeAnalytic.Stories.Values.STORY_ID to story.id,
-                        AmplitudeAnalytic.Stories.Values.CLOSE_TYPE to AmplitudeAnalytic.Stories.Values.CloseTypes.SWIPE
-                ))
+        storiesDelegate.dismissableLayout.addDismissListener(object : DismissableLayout.DismissListener {
+            override fun onDismiss() {
+                val story = storiesDelegate.getCurrentStory()
+                if (story != null) {
+                    analytic.reportAmplitudeEvent(AmplitudeAnalytic.Stories.STORY_CLOSED, mapOf(
+                            AmplitudeAnalytic.Stories.Values.STORY_ID to story.id,
+                            AmplitudeAnalytic.Stories.Values.CLOSE_TYPE to AmplitudeAnalytic.Stories.Values.CloseTypes.SWIPE
+                    ))
+                }
             }
-            onDismiss?.invoke()
-        }
+        })
     }
 
     override fun onPause() {

From 55af3aaeb4a6eebb3a8a1504de18a8fa553b970c Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Thu, 20 Sep 2018 20:53:50 +0300
Subject: [PATCH 23/30] handle empty stories

---
 .../droid/features/stories/presentation/StoriesPresenter.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/stepic/droid/features/stories/presentation/StoriesPresenter.kt b/app/src/main/java/org/stepic/droid/features/stories/presentation/StoriesPresenter.kt
index 4ef906ffca..b9d97094c9 100644
--- a/app/src/main/java/org/stepic/droid/features/stories/presentation/StoriesPresenter.kt
+++ b/app/src/main/java/org/stepic/droid/features/stories/presentation/StoriesPresenter.kt
@@ -46,7 +46,11 @@ constructor(
                         .subscribeBy({
                             state = StoriesView.State.Empty
                         }) { (stories, viewedIds) ->
-                            state = StoriesView.State.Success(stories, viewedIds)
+                            state = if (stories.isNotEmpty()) {
+                                StoriesView.State.Success(stories, viewedIds)
+                            } else {
+                                StoriesView.State.Empty
+                            }
                         }
     }
 

From 4aaf94ad10eab1e71503a179eb20f92957207792 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Thu, 20 Sep 2018 22:19:07 +0300
Subject: [PATCH 24/30] fix foreground for android 4

---
 app/src/main/res/layout/view_story_item.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/view_story_item.xml b/app/src/main/res/layout/view_story_item.xml
index b376e7a3f9..4b03c80bb5 100644
--- a/app/src/main/res/layout/view_story_item.xml
+++ b/app/src/main/res/layout/view_story_item.xml
@@ -11,9 +11,14 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="4dp"
-        android:foreground="@drawable/story_view_tint_foreground"
         android:contentDescription="@null" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/story_view_tint_foreground"
+        android:layout_margin="4dp" />
+
     <View
         android:id="@+id/activeStoryMarker"
         android:layout_width="match_parent"

From 8eef4f7f6064a8f78189bb1f5ae7de2a8fe56d97 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Thu, 20 Sep 2018 22:48:08 +0300
Subject: [PATCH 25/30] shrink methods

---
 .../stories/repository/StoryTemplatesRepositoryImpl.kt    | 2 +-
 .../main/java/org/stepik/android/model/StoryTemplate.kt   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepositoryImpl.kt b/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepositoryImpl.kt
index 1ef4729a27..d9f21d661b 100644
--- a/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepositoryImpl.kt
+++ b/app/src/main/java/org/stepic/droid/features/stories/repository/StoryTemplatesRepositoryImpl.kt
@@ -50,7 +50,7 @@ constructor(
                 viewedStoryTemplateDao
                         .getAll()
                         .asSequence()
-                        .map(ViewedStoryTemplate::storyTemplateId)
+                        .map { it.storyTemplateId }
                         .toSet()
         )
     }
diff --git a/model/src/main/java/org/stepik/android/model/StoryTemplate.kt b/model/src/main/java/org/stepik/android/model/StoryTemplate.kt
index 945cf87bd8..f4712beea6 100644
--- a/model/src/main/java/org/stepik/android/model/StoryTemplate.kt
+++ b/model/src/main/java/org/stepik/android/model/StoryTemplate.kt
@@ -4,7 +4,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
 
-data class StoryTemplate(
+class StoryTemplate(
         val id: Long,
         val cover: String,
         val title: String,
@@ -18,7 +18,7 @@ data class StoryTemplate(
         val position: Int,
         val version: Int
 ) {
-    data class Part(
+    class Part(
             val duration: Long,
             val image: String,
             val position: Int,
@@ -28,7 +28,7 @@ data class StoryTemplate(
             val text: Text?
     )
 
-    data class Text(
+    class Text(
             @SerializedName("background_style")
             val backgroundStyle: String,
 
@@ -63,7 +63,7 @@ data class StoryTemplate(
         }
     }
 
-    data class Button(
+    class Button(
             @SerializedName("background_color")
             val backgroundColor: String,
 

From 0c997cd78efb38a481ef98b7d1772182a8b518d5 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Thu, 20 Sep 2018 22:54:57 +0300
Subject: [PATCH 26/30] shrink more methods

---
 app/src/main/java/org/stepic/droid/model/Device.kt        | 2 +-
 .../main/java/org/stepic/droid/web/CertificateResponse.kt | 2 +-
 app/src/main/java/org/stepic/droid/web/CommentRequest.kt  | 4 +++-
 .../main/java/org/stepic/droid/web/CommentsResponse.kt    | 2 +-
 app/src/main/java/org/stepic/droid/web/DeviceResponse.kt  | 2 +-
 .../java/org/stepic/droid/web/DiscussionProxyResponse.kt  | 2 +-
 .../main/java/org/stepic/droid/web/LastStepResponse.kt    | 8 +++++---
 app/src/main/java/org/stepic/droid/web/QueriesResponse.kt | 2 +-
 app/src/main/java/org/stepic/droid/web/SocialAuthError.kt | 2 +-
 .../java/org/stepic/droid/web/StepicProfileResponse.kt    | 2 +-
 .../java/org/stepic/droid/web/UserActivityResponse.kt     | 5 +++--
 .../java/org/stepic/droid/web/UserRegistrationRequest.kt  | 2 +-
 12 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/stepic/droid/model/Device.kt b/app/src/main/java/org/stepic/droid/model/Device.kt
index b51cb9bb74..c098451146 100644
--- a/app/src/main/java/org/stepic/droid/model/Device.kt
+++ b/app/src/main/java/org/stepic/droid/model/Device.kt
@@ -2,7 +2,7 @@ package org.stepic.droid.model
 
 import com.google.gson.annotations.SerializedName
 
-data class Device(
+class Device(
         var id: Long = 0,
         var registration_id: String? = null,
         var user: Long = 0,
diff --git a/app/src/main/java/org/stepic/droid/web/CertificateResponse.kt b/app/src/main/java/org/stepic/droid/web/CertificateResponse.kt
index 65d0400e9c..f1dbe6e26f 100644
--- a/app/src/main/java/org/stepic/droid/web/CertificateResponse.kt
+++ b/app/src/main/java/org/stepic/droid/web/CertificateResponse.kt
@@ -3,7 +3,7 @@ package org.stepic.droid.web
 import org.stepik.android.model.Certificate
 import org.stepik.android.model.Meta
 
-data class CertificateResponse(
+class CertificateResponse(
         val meta: Meta?,
         val certificates: List<Certificate>
 )
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/web/CommentRequest.kt b/app/src/main/java/org/stepic/droid/web/CommentRequest.kt
index 9ee819f91a..d20acb9857 100644
--- a/app/src/main/java/org/stepic/droid/web/CommentRequest.kt
+++ b/app/src/main/java/org/stepic/droid/web/CommentRequest.kt
@@ -2,4 +2,6 @@ package org.stepic.droid.web
 
 import org.stepik.android.model.comments.Comment
 
-data class CommentRequest (val comment : Comment)
\ No newline at end of file
+class CommentRequest(
+        val comment: Comment
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/web/CommentsResponse.kt b/app/src/main/java/org/stepic/droid/web/CommentsResponse.kt
index 156dc8bc7d..3e9794ce9a 100644
--- a/app/src/main/java/org/stepic/droid/web/CommentsResponse.kt
+++ b/app/src/main/java/org/stepic/droid/web/CommentsResponse.kt
@@ -5,7 +5,7 @@ import org.stepik.android.model.comments.Comment
 import org.stepik.android.model.comments.Vote
 import org.stepik.android.model.Meta
 
-data class CommentsResponse(
+class CommentsResponse(
         val detail: String?, // "You do not have permission to perform this action.", null if OK
         val target: List<String>?, // ["Invalid pk '10205111' - object does not exist."], null if OK
         val meta: Meta?, // not null, if OK
diff --git a/app/src/main/java/org/stepic/droid/web/DeviceResponse.kt b/app/src/main/java/org/stepic/droid/web/DeviceResponse.kt
index c073eb3984..1c4e2a3072 100644
--- a/app/src/main/java/org/stepic/droid/web/DeviceResponse.kt
+++ b/app/src/main/java/org/stepic/droid/web/DeviceResponse.kt
@@ -3,7 +3,7 @@ package org.stepic.droid.web
 import org.stepic.droid.model.Device
 import org.stepik.android.model.Meta
 
-data class DeviceResponse(
+class DeviceResponse(
         var meta: Meta?,
         var devices: List<Device?>?
 )
diff --git a/app/src/main/java/org/stepic/droid/web/DiscussionProxyResponse.kt b/app/src/main/java/org/stepic/droid/web/DiscussionProxyResponse.kt
index 525235454b..f4a054fa39 100644
--- a/app/src/main/java/org/stepic/droid/web/DiscussionProxyResponse.kt
+++ b/app/src/main/java/org/stepic/droid/web/DiscussionProxyResponse.kt
@@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName
 import org.stepik.android.model.comments.DiscussionProxy
 import org.stepik.android.model.Meta
 
-data class DiscussionProxyResponse(
+ class DiscussionProxyResponse(
         val meta: Meta?,
         @SerializedName("discussion-proxies")
         val discussionProxies: List<DiscussionProxy>
diff --git a/app/src/main/java/org/stepic/droid/web/LastStepResponse.kt b/app/src/main/java/org/stepic/droid/web/LastStepResponse.kt
index 1627dcd305..60dbab4659 100644
--- a/app/src/main/java/org/stepic/droid/web/LastStepResponse.kt
+++ b/app/src/main/java/org/stepic/droid/web/LastStepResponse.kt
@@ -4,6 +4,8 @@ import com.google.gson.annotations.SerializedName
 import org.stepic.droid.model.LastStep
 import org.stepik.android.model.Meta
 
-data class LastStepResponse(val meta: Meta?,
-                            @SerializedName("last-steps")
-                            val lastSteps: List<LastStep>)
\ No newline at end of file
+class LastStepResponse(
+        val meta: Meta?,
+        @SerializedName("last-steps")
+        val lastSteps: List<LastStep>
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/web/QueriesResponse.kt b/app/src/main/java/org/stepic/droid/web/QueriesResponse.kt
index 02467e6cc1..fb4f6ba7d3 100644
--- a/app/src/main/java/org/stepic/droid/web/QueriesResponse.kt
+++ b/app/src/main/java/org/stepic/droid/web/QueriesResponse.kt
@@ -2,4 +2,4 @@ package org.stepic.droid.web
 
 import org.stepic.droid.model.SearchQuery
 
-data class QueriesResponse(val queries: List<SearchQuery>)
\ No newline at end of file
+class QueriesResponse(val queries: List<SearchQuery>)
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/web/SocialAuthError.kt b/app/src/main/java/org/stepic/droid/web/SocialAuthError.kt
index 2028c27f8c..8079d5ce63 100644
--- a/app/src/main/java/org/stepic/droid/web/SocialAuthError.kt
+++ b/app/src/main/java/org/stepic/droid/web/SocialAuthError.kt
@@ -1,6 +1,6 @@
 package org.stepic.droid.web
 
-data class SocialAuthError(
+class SocialAuthError(
         val error: String?,
         val email: String?,
         val provider: String?
diff --git a/app/src/main/java/org/stepic/droid/web/StepicProfileResponse.kt b/app/src/main/java/org/stepic/droid/web/StepicProfileResponse.kt
index 61bd7f9ae8..1826c3d8b1 100644
--- a/app/src/main/java/org/stepic/droid/web/StepicProfileResponse.kt
+++ b/app/src/main/java/org/stepic/droid/web/StepicProfileResponse.kt
@@ -3,7 +3,7 @@ package org.stepic.droid.web
 import org.stepik.android.model.user.Profile
 import  org.stepik.android.model.user.User
 
-data class StepicProfileResponse(
+class StepicProfileResponse(
         private val users: List<User>? = null,
         private val profiles: List<Profile>? = null
 ) {
diff --git a/app/src/main/java/org/stepic/droid/web/UserActivityResponse.kt b/app/src/main/java/org/stepic/droid/web/UserActivityResponse.kt
index 0fa1cf6da7..2d58b26241 100644
--- a/app/src/main/java/org/stepic/droid/web/UserActivityResponse.kt
+++ b/app/src/main/java/org/stepic/droid/web/UserActivityResponse.kt
@@ -4,7 +4,8 @@ import com.google.gson.annotations.SerializedName
 import org.stepik.android.model.user.UserActivity
 import org.stepik.android.model.Meta
 
-data class UserActivityResponse(
+class UserActivityResponse(
         val meta: Meta?,
         @SerializedName("user-activities")
-        val userActivities: List<UserActivity>)
\ No newline at end of file
+        val userActivities: List<UserActivity>
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/stepic/droid/web/UserRegistrationRequest.kt b/app/src/main/java/org/stepic/droid/web/UserRegistrationRequest.kt
index 154dea9f1b..f3448e9804 100644
--- a/app/src/main/java/org/stepic/droid/web/UserRegistrationRequest.kt
+++ b/app/src/main/java/org/stepic/droid/web/UserRegistrationRequest.kt
@@ -2,4 +2,4 @@ package org.stepic.droid.web
 
 import org.stepik.android.model.user.RegistrationCredentials
 
-data class UserRegistrationRequest(val user: RegistrationCredentials)
\ No newline at end of file
+class UserRegistrationRequest(val user: RegistrationCredentials)
\ No newline at end of file

From 152734b4df80e76f225edc8ff9ee01aa3387ce31 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Thu, 20 Sep 2018 23:12:55 +0300
Subject: [PATCH 27/30] force to refresh stories kit

---
 app/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/build.gradle b/app/build.gradle
index 4d5542065e..5b05281f98 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -174,6 +174,7 @@ dependencies {
     implementation libraries.shortcutBadger
     implementation (libraries.StoriesKit) {
         exclude group: 'com.android.support'
+        changing = true
     }
 
     debugImplementation libraries.leakCanary

From a8b43842dc1186306affb532958f746a03fe2f50 Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Thu, 20 Sep 2018 23:29:58 +0300
Subject: [PATCH 28/30] hide debug stories

---
 app/src/main/java/org/stepic/droid/web/ApiImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/stepic/droid/web/ApiImpl.java b/app/src/main/java/org/stepic/droid/web/ApiImpl.java
index c323de1af9..ab8fb426ca 100644
--- a/app/src/main/java/org/stepic/droid/web/ApiImpl.java
+++ b/app/src/main/java/org/stepic/droid/web/ApiImpl.java
@@ -934,7 +934,7 @@ public Single<RatingRestoreResponse> restoreRating(long courseId) {
     @Override
     public Observable<StoryTemplatesResponse> getStoryTemplates(int page) {
         final Locale locale = CompatibilityExtensionsKt.getDefaultLocale(Resources.getSystem().getConfiguration());
-        return loggedService.getStoryTemplate(page, false, locale.getLanguage());
+        return loggedService.getStoryTemplate(page, true, locale.getLanguage());
     }
 
     @Override

From f38c32ed6e91b17e27539e9e2c136823ba8e375d Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Fri, 21 Sep 2018 11:22:05 +0300
Subject: [PATCH 29/30] inc version to 2000

---
 dependencies.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 3eb9b1ff4c..4e062f6670 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,6 +1,6 @@
 ext.versions = [
-        code                 : 1999,
-        name                 : '1.66.1',
+        code                 : 2000,
+        name                 : '1.68',
 
         minSdk               : 15,
         targetSdk            : 26,

From 783b4e81b1aa58cffd7346aa6c08832fca25acea Mon Sep 17 00:00:00 2001
From: Ruslan Davletshin <smartmorefeed@gmail.com>
Date: Fri, 21 Sep 2018 20:12:05 +0300
Subject: [PATCH 30/30] force to update cached deps

---
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index a9961a9fa1..e7c3a093ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,6 +32,10 @@ allprojects {
     }
 }
 
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
\ No newline at end of file