From f4b6fbdcfc76b11818271a673103953994c6df69 Mon Sep 17 00:00:00 2001
From: andy <andrumpel@gmail.com>
Date: Tue, 8 Dec 2020 02:31:44 +0300
Subject: [PATCH 1/5] WIP

---
 app/build.gradle                              |  9 ++
 app/src/main/AndroidManifest.xml              |  3 +-
 .../graphql/query/GetActivities.graphql       | 40 ++++++++
 .../main/java/com/flatstack/android/Router.kt |  9 ++
 .../android/activities/ActivitiesAdapter.kt   | 22 +++++
 .../activities/ActivitiesDiffUtilCallback.kt  | 15 +++
 .../activities/ActivitiesRepository.kt        | 93 +++++++++++++++++++
 .../activities/ActivitiesViewHolder.kt        | 18 ++++
 .../activities/ActivitiesViewHolderModel.kt   | 14 +++
 .../android/activities/ActivitiesViewModel.kt | 66 +++++++++++++
 .../activities/UserActivitiesActivity.kt      | 51 ++++++++++
 .../flatstack/android/di/modules/netModule.kt |  4 +-
 .../android/di/modules/repoModule.kt          |  2 +
 .../android/di/modules/viewModelModule.kt     |  2 +
 .../android/profile/ProfileActivity.kt        |  9 ++
 app/src/main/res/layout/activity_profile.xml  |  9 ++
 .../res/layout/activity_user_activities.xml   | 29 ++++++
 app/src/main/res/layout/item_activity.xml     | 56 +++++++++++
 app/src/main/res/values/strings.xml           |  2 +
 deps.gradle                                   |  9 +-
 20 files changed, 457 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/graphql/com/flatstack/android/graphql/query/GetActivities.graphql
 create mode 100644 app/src/main/java/com/flatstack/android/activities/ActivitiesAdapter.kt
 create mode 100644 app/src/main/java/com/flatstack/android/activities/ActivitiesDiffUtilCallback.kt
 create mode 100644 app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt
 create mode 100644 app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolder.kt
 create mode 100644 app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolderModel.kt
 create mode 100644 app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt
 create mode 100644 app/src/main/java/com/flatstack/android/activities/UserActivitiesActivity.kt
 create mode 100644 app/src/main/res/layout/activity_user_activities.xml
 create mode 100644 app/src/main/res/layout/item_activity.xml

diff --git a/app/build.gradle b/app/build.gradle
index b6a859d..348c0ed 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,6 +37,8 @@ android {
             branchNames = ["master"]  // branch names from which you can deploy, master by default
             remoteRepoName = "origin" // alias repository, origin by default
         }
+
+        multiDexEnabled true
     }
     signingConfigs {
         debug {
@@ -105,12 +107,19 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
     implementation 'com.google.code.gson:gson:2.8.6'
+    implementation "androidx.paging:paging-runtime-ktx:2.1.2"
+    implementation "com.google.android.material:material:1.2.1"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+    implementation 'com.android.support:multidex:1.0.3'
+    implementation "com.squareup.okhttp3:logging-interceptor:4.9.0"
 
     implementation androidLibs
     implementation apolloLibs
     implementation coroutinesLibs
     implementation kodeinLibs
     implementation roomLibs
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     kapt compilerLibs
 
     testImplementation unitTestLibs
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index aafc5de..678d0d2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning">
+        <activity android:name=".activities.UserActivitiesActivity" />
         <activity
             android:name=".profile.ProfileActivity"
             android:label="@string/app_name" />
@@ -31,4 +32,4 @@
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/graphql/com/flatstack/android/graphql/query/GetActivities.graphql b/app/src/main/graphql/com/flatstack/android/graphql/query/GetActivities.graphql
new file mode 100644
index 0000000..f76c6e5
--- /dev/null
+++ b/app/src/main/graphql/com/flatstack/android/graphql/query/GetActivities.graphql
@@ -0,0 +1,40 @@
+query GetActivities($after: String, $before: String, $events: [ActivityEvent!], $first: Int, $last: Int) {
+    activities(
+        after: $after,
+        before: $before,
+        events: $events,
+        first: $first,
+        last: $last
+    ) {
+        ...ActivityConnectionFragment
+    }
+}
+
+fragment ActivityConnectionFragment on ActivityConnection {
+    edges {
+        node {
+            ...ActivityFragment
+        }
+    }
+    pageInfo {
+        endCursor
+        hasNextPage
+        hasPreviousPage
+        startCursor
+    }
+}
+
+
+fragment ActivityFragment on Activity {
+    body,
+    createdAt,
+    event,
+    id,
+    title,
+    user {
+        firstName,
+        lastName,
+        email,
+        avatarUrl
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/flatstack/android/Router.kt b/app/src/main/java/com/flatstack/android/Router.kt
index ae126e4..fedf287 100644
--- a/app/src/main/java/com/flatstack/android/Router.kt
+++ b/app/src/main/java/com/flatstack/android/Router.kt
@@ -2,6 +2,7 @@ package com.flatstack.android
 
 import android.content.Context
 import android.content.Intent
+import com.flatstack.android.activities.UserActivitiesActivity
 import com.flatstack.android.login.LoginActivity
 import com.flatstack.android.profile.ProfileActivity
 
@@ -23,4 +24,12 @@ class Router(
             }
         })
     }
+
+    fun activities(context: Context, clearStack: Boolean = false) {
+        context.startActivity(Intent(context, UserActivitiesActivity::class.java).apply {
+            if (clearStack) {
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+            }
+        })
+    }
 }
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesAdapter.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesAdapter.kt
new file mode 100644
index 0000000..0f389eb
--- /dev/null
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesAdapter.kt
@@ -0,0 +1,22 @@
+package com.flatstack.android.activities
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.paging.PagedListAdapter
+import com.flatstack.android.R
+
+class ActivitiesAdapter :
+    PagedListAdapter<ActivitiesViewHolderModel, ActivitiesViewHolder>(ActivitiesDiffUtilCallback()) {
+
+    private val activities = mutableListOf<ActivitiesViewHolderModel>()
+
+    override fun getItemCount(): Int = activities.count()
+
+    override fun onBindViewHolder(holder: ActivitiesViewHolder, position: Int) {
+        holder.bind(activities[position])
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ActivitiesViewHolder(
+        LayoutInflater.from(parent.context).inflate(R.layout.item_activity, parent, false)
+    )
+}
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesDiffUtilCallback.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesDiffUtilCallback.kt
new file mode 100644
index 0000000..3a4f3bb
--- /dev/null
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesDiffUtilCallback.kt
@@ -0,0 +1,15 @@
+package com.flatstack.android.activities
+
+import androidx.recyclerview.widget.DiffUtil
+
+class ActivitiesDiffUtilCallback : DiffUtil.ItemCallback<ActivitiesViewHolderModel>() {
+    override fun areItemsTheSame(
+        oldItem: ActivitiesViewHolderModel,
+        newItem: ActivitiesViewHolderModel
+    ): Boolean = oldItem == newItem
+
+    override fun areContentsTheSame(
+        oldItem: ActivitiesViewHolderModel,
+        newItem: ActivitiesViewHolderModel
+    ): Boolean = oldItem == newItem
+}
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt
new file mode 100644
index 0000000..e7525cb
--- /dev/null
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt
@@ -0,0 +1,93 @@
+package com.flatstack.android.activities
+
+import androidx.paging.DataSource
+import androidx.paging.PageKeyedDataSource
+import com.apollographql.apollo.ApolloClient
+import com.apollographql.apollo.api.Input
+import com.apollographql.apollo.coroutines.toDeferred
+import com.flatstack.android.fragment.ActivityConnectionFragment.Edge
+import com.flatstack.android.fragment.ActivityConnectionFragment.PageInfo
+import com.flatstack.android.graphql.query.GetActivitiesQuery
+import com.flatstack.android.type.ActivityEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class ActivitiesRepository(
+    private val apolloClient: ApolloClient
+) {
+    fun getPagedUserActivities(coroutineScope: CoroutineScope, events: List<ActivityEvent>) =
+        object : DataSource.Factory<PageInfo, Edge>() {
+            override fun create(): DataSource<PageInfo, Edge> =
+                object : PageKeyedDataSource<PageInfo, Edge>() {
+                    override fun loadInitial(
+                        params: LoadInitialParams<PageInfo>,
+                        callback: LoadInitialCallback<PageInfo, Edge>
+                    ) {
+                        coroutineScope.launch(Dispatchers.IO) {
+                            apolloClient.query(
+                                GetActivitiesQuery(
+                                    events = Input.fromNullable(events),
+                                    first = Input.fromNullable(15)
+                                )
+                            ).toDeferred()
+                                .await().data?.activities?.fragments?.activityConnectionFragment?.let {
+                                it.edges?.let { edges ->
+                                    callback.onResult(
+                                        edges,
+                                        null,
+                                        it.pageInfo
+                                    )
+                                }
+                            }
+                        }
+                    }
+
+                    override fun loadAfter(
+                        params: LoadParams<PageInfo>,
+                        callback: LoadCallback<PageInfo, Edge>
+                    ) {
+                        coroutineScope.launch(Dispatchers.IO) {
+                            apolloClient.query(
+                                GetActivitiesQuery(
+                                    after = Input.fromNullable(params.key.endCursor),
+                                    events = Input.fromNullable(events),
+                                    first = Input.fromNullable(15)
+                                )
+                            ).toDeferred()
+                                .await().data?.activities?.fragments?.activityConnectionFragment?.let {
+                                it.edges?.let { edges ->
+                                    callback.onResult(
+                                        edges,
+                                        it.pageInfo
+                                    )
+                                }
+                            }
+                        }
+                    }
+
+                    override fun loadBefore(
+                        params: LoadParams<PageInfo>,
+                        callback: LoadCallback<PageInfo, Edge>
+                    ) {
+                        coroutineScope.launch(Dispatchers.IO) {
+                            apolloClient.query(
+                                GetActivitiesQuery(
+                                    before = Input.fromNullable(params.key.startCursor),
+                                    events = Input.fromNullable(events),
+                                    first = Input.fromNullable(15)
+                                )
+                            ).toDeferred()
+                                .await().data?.activities?.fragments?.activityConnectionFragment?.let {
+                                it.edges?.let { edges ->
+                                    callback.onResult(
+                                        edges,
+                                        it.pageInfo
+                                    )
+                                }
+                            }
+                        }
+                    }
+                }
+        }
+}
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolder.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolder.kt
new file mode 100644
index 0000000..b5d43d7
--- /dev/null
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolder.kt
@@ -0,0 +1,18 @@
+package com.flatstack.android.activities
+
+import android.view.View
+import com.flatstack.android.R
+import com.flatstack.android.util.recyclerview.BaseHolder
+import kotlinx.android.synthetic.main.item_activity.view.*
+
+class ActivitiesViewHolder(itemView: View) : BaseHolder<ActivitiesViewHolderModel>(itemView) {
+
+    override fun bind(item: ActivitiesViewHolderModel) {
+        with(containerView) {
+            tv_event.text = item.title
+            tv_body.text = item.body
+            tv_created_at.text = item.createdAt
+            tv_username.text = item.userName
+        }
+    }
+}
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolderModel.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolderModel.kt
new file mode 100644
index 0000000..1417e45
--- /dev/null
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolderModel.kt
@@ -0,0 +1,14 @@
+package com.flatstack.android.activities
+
+import com.flatstack.android.profile.entities.Profile
+import com.flatstack.android.type.ActivityEvent
+import java.util.*
+
+data class ActivitiesViewHolderModel(
+    val body: String,
+    val createdAt: String,
+    val event: ActivityEvent,
+    val id: String,
+    val title: String,
+    val userName: String
+)
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt
new file mode 100644
index 0000000..eae6ddb
--- /dev/null
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt
@@ -0,0 +1,66 @@
+package com.flatstack.android.activities
+
+import androidx.lifecycle.*
+import androidx.paging.LivePagedListBuilder
+import androidx.paging.PagedList
+import com.flatstack.android.model.entities.Resource
+import com.flatstack.android.type.ActivityEvent
+import com.flatstack.android.type.ActivityEvent.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+
+class ActivitiesViewModel(
+    private val activitiesRepository: ActivitiesRepository
+) : ViewModel() {
+
+    private val events = MutableLiveData<List<ActivityEvent>>()
+
+    init {
+        events.postValue(
+            listOf(
+                RESET_PASSWORD_REQUESTED,
+                USER_LOGGED_IN,
+                USER_REGISTERED,
+                USER_RESET_PASSWORD,
+                USER_UPDATED
+            )
+        )
+    }
+
+    val activities: LiveData<Resource<PagedList<ActivitiesViewHolderModel?>>> = events.switchMap { events ->
+        LivePagedListBuilder(
+            activitiesRepository.getPagedUserActivities(viewModelScope, events)
+                .mapByPage { edges ->
+                    edges.map { edge ->
+                        edge.node?.fragments?.activityFragment?.let { fragment ->
+                            ActivitiesViewHolderModel(
+                                body = fragment.body,
+                                createdAt = fragment.createdAt.toString(),
+                                event = fragment.event,
+                                id = fragment.id,
+                                title = fragment.title,
+                                userName = fragment.id
+                            )
+                        }
+                    }
+                },
+            PagedList.Config.Builder()
+                .setEnablePlaceholders(false)
+                .setPageSize(15)
+                .build()
+        ).build().asFlow()
+            .flowOn(Dispatchers.IO)
+            .map { Resource.success(it) }
+            .onStart { emit(Resource.loading()) }
+            .catch { error ->
+                error.message?.let {
+                    emit(Resource.error(it))
+                }
+            }
+            .asLiveData(viewModelScope.coroutineContext)
+    }
+}
+
diff --git a/app/src/main/java/com/flatstack/android/activities/UserActivitiesActivity.kt b/app/src/main/java/com/flatstack/android/activities/UserActivitiesActivity.kt
new file mode 100644
index 0000000..d1e3985
--- /dev/null
+++ b/app/src/main/java/com/flatstack/android/activities/UserActivitiesActivity.kt
@@ -0,0 +1,51 @@
+package com.flatstack.android.activities
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.widget.Toast
+import androidx.core.view.isVisible
+import androidx.paging.PagedList
+import com.flatstack.android.R
+import com.flatstack.android.util.observeBy
+import com.flatstack.android.util.provideViewModel
+import kotlinx.android.synthetic.main.activity_user_activities.*
+import org.kodein.di.Kodein
+import org.kodein.di.KodeinAware
+import org.kodein.di.android.kodein
+
+class UserActivitiesActivity : AppCompatActivity(), KodeinAware {
+
+    override val kodein: Kodein by kodein()
+
+    private val viewModel: ActivitiesViewModel by provideViewModel()
+    private val adapter = ActivitiesAdapter()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_user_activities)
+        initRecycler()
+
+        viewModel.activities.observeBy(
+            this,
+            onNext = ::fetchActivities,
+            onLoading = ::showProgress,
+            onError = ::showError
+        )
+    }
+
+    private fun fetchActivities(pagedList: PagedList<ActivitiesViewHolderModel?>) {
+        adapter.submitList(pagedList)
+    }
+
+    private fun showProgress(isLoading: Boolean) {
+        pb_progress.isVisible = isLoading
+    }
+
+    private fun showError(errorMessage: String) {
+        Toast.makeText(this, errorMessage, Toast.LENGTH_LONG).show()
+    }
+
+    private fun initRecycler() {
+        rv_activities.adapter = adapter
+    }
+}
diff --git a/app/src/main/java/com/flatstack/android/di/modules/netModule.kt b/app/src/main/java/com/flatstack/android/di/modules/netModule.kt
index d13c1d1..563b68c 100644
--- a/app/src/main/java/com/flatstack/android/di/modules/netModule.kt
+++ b/app/src/main/java/com/flatstack/android/di/modules/netModule.kt
@@ -4,6 +4,7 @@ import com.apollographql.apollo.ApolloClient
 import com.flatstack.android.BuildConfig
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
 import org.kodein.di.Kodein
 import org.kodein.di.generic.bind
 import org.kodein.di.generic.instance
@@ -13,7 +14,8 @@ val netModule = Kodein.Module(name = "netModule") {
     bind<Interceptor>() with singleton { AuthorizationInterceptor(instance()) }
 
     bind<OkHttpClient>() with singleton { OkHttpClient.Builder()
-        .addInterceptor(instance())
+        .addInterceptor(AuthorizationInterceptor(instance()))
+        .addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
         .build() }
 
     bind<ApolloClient>() with singleton {
diff --git a/app/src/main/java/com/flatstack/android/di/modules/repoModule.kt b/app/src/main/java/com/flatstack/android/di/modules/repoModule.kt
index d3f702f..1171606 100644
--- a/app/src/main/java/com/flatstack/android/di/modules/repoModule.kt
+++ b/app/src/main/java/com/flatstack/android/di/modules/repoModule.kt
@@ -1,5 +1,6 @@
 package com.flatstack.android.di.modules
 
+import com.flatstack.android.activities.ActivitiesRepository
 import com.flatstack.android.login.LoginRepository
 import com.flatstack.android.profile.ProfileRepository
 import org.kodein.di.Kodein
@@ -10,4 +11,5 @@ import org.kodein.di.generic.provider
 val repoModule = Kodein.Module(name = "repoModule") {
     bind<LoginRepository>() with provider { LoginRepository(instance(), instance(), instance(), instance()) }
     bind<ProfileRepository>() with provider { ProfileRepository(instance(), instance(), instance()) }
+    bind<ActivitiesRepository>() with provider { ActivitiesRepository(instance()) }
 }
diff --git a/app/src/main/java/com/flatstack/android/di/modules/viewModelModule.kt b/app/src/main/java/com/flatstack/android/di/modules/viewModelModule.kt
index c69b1d3..c567ab5 100644
--- a/app/src/main/java/com/flatstack/android/di/modules/viewModelModule.kt
+++ b/app/src/main/java/com/flatstack/android/di/modules/viewModelModule.kt
@@ -1,6 +1,7 @@
 package com.flatstack.android.di.modules
 
 import androidx.lifecycle.ViewModelProvider
+import com.flatstack.android.activities.ActivitiesViewModel
 import com.flatstack.android.login.LoginViewModel
 import com.flatstack.android.profile.ProfileViewModel
 import com.flatstack.android.util.ViewModelFactory
@@ -16,4 +17,5 @@ val viewModelModule = Kodein.Module(name = "viewModelModule") {
 
     bindViewModel<LoginViewModel>() with provider { LoginViewModel(instance(), instance()) }
     bindViewModel<ProfileViewModel>() with provider { ProfileViewModel(instance(), instance()) }
+    bindViewModel<ActivitiesViewModel>() with provider { ActivitiesViewModel(instance()) }
 }
diff --git a/app/src/main/java/com/flatstack/android/profile/ProfileActivity.kt b/app/src/main/java/com/flatstack/android/profile/ProfileActivity.kt
index 8fbdfaa..00af6ca 100644
--- a/app/src/main/java/com/flatstack/android/profile/ProfileActivity.kt
+++ b/app/src/main/java/com/flatstack/android/profile/ProfileActivity.kt
@@ -41,6 +41,15 @@ class ProfileActivity : AppCompatActivity(), KodeinAware, OnRefreshListener {
                 },
                 onError = ::showError,
                 onLoading = ::visibleProgress)
+
+        initListeners()
+    }
+
+    private fun initListeners() {
+        bt_go_to_activities.setOnClickListener {
+            val router by kodein.instance<Router>()
+            router.activities(context = this, clearStack = true)
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index a447517..e3f0bce 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -40,6 +40,15 @@
                 app:layout_constraintTop_toBottomOf="@id/tv_first_name"
                 tools:text="@string/last_name_hint" />
 
+            <Button
+                android:id="@+id/bt_go_to_activities"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@+id/tv_last_name"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:text="@string/go_to_activities"/>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/activity_user_activities.xml b/app/src/main/res/layout/activity_user_activities.xml
new file mode 100644
index 0000000..af5a3fc
--- /dev/null
+++ b/app/src/main/res/layout/activity_user_activities.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activities.UserActivitiesActivity">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_activities"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:itemCount="2"
+        tools:listitem="@layout/item_activity" />
+
+    <ProgressBar
+        android:id="@+id/pb_progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:indeterminate="true"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_activity.xml b/app/src/main/res/layout/item_activity.xml
new file mode 100644
index 0000000..a65afc2
--- /dev/null
+++ b/app/src/main/res/layout/item_activity.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:padding="16dp"
+    app:cardCornerRadius="4dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/tv_event"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="User Logged In" />
+
+        <TextView
+            android:id="@+id/tv_created_at"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="yesterday, 18:00" />
+
+        <TextView
+            android:id="@+id/tv_username"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="8dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_event"
+            tools:text="Andy Rumpel" />
+
+        <TextView
+            android:id="@+id/tv_body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_username"
+            tools:text="User logged in with the next attributes:\n First name - ,\n Last name - \n" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9ed56aa..9535e7c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,4 +18,6 @@
     <string name="method_not_allowed_error">405 Method Not Allowed</string>
     <string name="conflict_error">409 Conflict</string>
     <string name="server_error_error">500 Server Error</string>
+    <string name="username_mask">%1$s %2$s</string>
+    <string name="go_to_activities">Show activities</string>
 </resources>
diff --git a/deps.gradle b/deps.gradle
index 4291992..072985e 100644
--- a/deps.gradle
+++ b/deps.gradle
@@ -8,13 +8,13 @@ ext {
             detekt             : '1.10.0',
             android_junit5     : '1.2.0.0',
             kodein             : '6.2.0',
-            lifecycle          : '2.0.0',
+            lifecycle          : '2.2.0',
             spek               : '2.0.4',
             junit5_runner      : '0.2.2',
             mockk              : '1.9.3',
             mockwebserver      : '3.14.0',
             retrofit           : '2.5.0',
-            coroutines         : '1.1.1',
+            coroutines         : '1.4.2',
             room               : '2.1.0-beta01',
             espressoVersion    : '3.1.1'
     ]
@@ -24,7 +24,10 @@ ext {
             constraintlayout: 'androidx.constraintlayout:constraintlayout:1.1.3',
             recyclerview    : 'androidx.recyclerview:recyclerview:1.0.0',
             cardview        : 'androidx.cardview:cardview:1.0.0',
-            lifecycle       : "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle"
+            lifecycle       : "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle",
+            livedara        : "androidx.lifecycle:lifecycle-livedata-ktx:$versions.lifecycle",
+            common          : "androidx.lifecycle:lifecycle-common-java8:$versions.lifecycle",
+            viewmodel       : "androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.lifecycle"
     ]
     apollo = [
             apollo_runtime    : "com.apollographql.apollo:apollo-runtime:$versions.apollo",

From 192f80f405e4f313630afe1acb007bbe3d3f7c56 Mon Sep 17 00:00:00 2001
From: Ruslan Faizullin <ruslan.fayzullin@flatstack.com>
Date: Tue, 8 Dec 2020 14:09:00 +0300
Subject: [PATCH 2/5] wip

---
 .../android/activities/ActivitiesAdapter.kt   |  6 +-
 .../activities/ActivitiesViewHolder.kt        |  1 -
 .../android/activities/ActivitiesViewModel.kt | 59 ++++++++++---------
 .../activities/UserActivitiesActivity.kt      |  3 +
 app/src/main/res/layout/item_activity.xml     |  5 +-
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesAdapter.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesAdapter.kt
index 0f389eb..7fdfeeb 100644
--- a/app/src/main/java/com/flatstack/android/activities/ActivitiesAdapter.kt
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesAdapter.kt
@@ -8,12 +8,8 @@ import com.flatstack.android.R
 class ActivitiesAdapter :
     PagedListAdapter<ActivitiesViewHolderModel, ActivitiesViewHolder>(ActivitiesDiffUtilCallback()) {
 
-    private val activities = mutableListOf<ActivitiesViewHolderModel>()
-
-    override fun getItemCount(): Int = activities.count()
-
     override fun onBindViewHolder(holder: ActivitiesViewHolder, position: Int) {
-        holder.bind(activities[position])
+        getItem(position)?.let { holder.bind(it) }
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ActivitiesViewHolder(
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolder.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolder.kt
index b5d43d7..d0bf31c 100644
--- a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolder.kt
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolder.kt
@@ -1,7 +1,6 @@
 package com.flatstack.android.activities
 
 import android.view.View
-import com.flatstack.android.R
 import com.flatstack.android.util.recyclerview.BaseHolder
 import kotlinx.android.synthetic.main.item_activity.view.*
 
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt
index eae6ddb..75ae382 100644
--- a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt
@@ -30,37 +30,38 @@ class ActivitiesViewModel(
         )
     }
 
-    val activities: LiveData<Resource<PagedList<ActivitiesViewHolderModel?>>> = events.switchMap { events ->
-        LivePagedListBuilder(
-            activitiesRepository.getPagedUserActivities(viewModelScope, events)
-                .mapByPage { edges ->
-                    edges.map { edge ->
-                        edge.node?.fragments?.activityFragment?.let { fragment ->
-                            ActivitiesViewHolderModel(
-                                body = fragment.body,
-                                createdAt = fragment.createdAt.toString(),
-                                event = fragment.event,
-                                id = fragment.id,
-                                title = fragment.title,
-                                userName = fragment.id
-                            )
+    val activities: LiveData<Resource<PagedList<ActivitiesViewHolderModel?>>> =
+        events.switchMap { events ->
+            LivePagedListBuilder(
+                activitiesRepository.getPagedUserActivities(viewModelScope, events)
+                    .mapByPage { edges ->
+                        edges.map { edge ->
+                            edge.node?.fragments?.activityFragment?.let { fragment ->
+                                ActivitiesViewHolderModel(
+                                    body = fragment.body,
+                                    createdAt = fragment.createdAt.toString(),
+                                    event = fragment.event,
+                                    id = fragment.id,
+                                    title = fragment.title,
+                                    userName = fragment.id
+                                )
+                            }
                         }
+                    },
+                PagedList.Config.Builder()
+                    .setEnablePlaceholders(false)
+                    .setPageSize(15)
+                    .build()
+            ).build().asFlow()
+                .flowOn(Dispatchers.IO)
+                .map { Resource.success(it) }
+                .onStart { emit(Resource.loading()) }
+                .catch { error ->
+                    error.message?.let {
+                        emit(Resource.error(it))
                     }
-                },
-            PagedList.Config.Builder()
-                .setEnablePlaceholders(false)
-                .setPageSize(15)
-                .build()
-        ).build().asFlow()
-            .flowOn(Dispatchers.IO)
-            .map { Resource.success(it) }
-            .onStart { emit(Resource.loading()) }
-            .catch { error ->
-                error.message?.let {
-                    emit(Resource.error(it))
                 }
-            }
-            .asLiveData(viewModelScope.coroutineContext)
-    }
+                .asLiveData(viewModelScope.coroutineContext)
+        }
 }
 
diff --git a/app/src/main/java/com/flatstack/android/activities/UserActivitiesActivity.kt b/app/src/main/java/com/flatstack/android/activities/UserActivitiesActivity.kt
index d1e3985..1dd4ca5 100644
--- a/app/src/main/java/com/flatstack/android/activities/UserActivitiesActivity.kt
+++ b/app/src/main/java/com/flatstack/android/activities/UserActivitiesActivity.kt
@@ -6,6 +6,9 @@ import android.widget.Toast
 import androidx.core.view.isVisible
 import androidx.paging.PagedList
 import com.flatstack.android.R
+import com.flatstack.android.fragment.ActivityConnectionFragment
+import com.flatstack.android.fragment.ActivityConnectionFragment.Edge
+import com.flatstack.android.type.ActivityEvent
 import com.flatstack.android.util.observeBy
 import com.flatstack.android.util.provideViewModel
 import kotlinx.android.synthetic.main.activity_user_activities.*
diff --git a/app/src/main/res/layout/item_activity.xml b/app/src/main/res/layout/item_activity.xml
index a65afc2..97d5f50 100644
--- a/app/src/main/res/layout/item_activity.xml
+++ b/app/src/main/res/layout/item_activity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -52,5 +53,5 @@
             tools:text="User logged in with the next attributes:\n First name - ,\n Last name - \n" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
+</FrameLayout>
 

From 02c2379303e87d01161ea37fe95c1fa12bdff863 Mon Sep 17 00:00:00 2001
From: andy <andrumpel@gmail.com>
Date: Tue, 8 Dec 2020 21:49:23 +0300
Subject: [PATCH 3/5] user activities with paging

---
 .../activities/ActivitiesRepository.kt        | 38 +++++++++----------
 .../activities/ActivitiesViewHolder.kt        | 14 ++++++-
 .../activities/ActivitiesViewHolderModel.kt   |  3 +-
 .../android/activities/ActivitiesViewModel.kt |  7 +++-
 .../activities/UserActivitiesActivity.kt      |  5 +--
 .../res/layout/activity_user_activities.xml   |  1 +
 app/src/main/res/layout/item_activity.xml     | 24 ++++++++----
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 9 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt
index e7525cb..75fee78 100644
--- a/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt
@@ -32,14 +32,14 @@ class ActivitiesRepository(
                                 )
                             ).toDeferred()
                                 .await().data?.activities?.fragments?.activityConnectionFragment?.let {
-                                it.edges?.let { edges ->
-                                    callback.onResult(
-                                        edges,
-                                        null,
-                                        it.pageInfo
-                                    )
+                                    it.edges?.let { edges ->
+                                        callback.onResult(
+                                            edges,
+                                            null,
+                                            it.pageInfo
+                                        )
+                                    }
                                 }
-                            }
                         }
                     }
 
@@ -56,13 +56,13 @@ class ActivitiesRepository(
                                 )
                             ).toDeferred()
                                 .await().data?.activities?.fragments?.activityConnectionFragment?.let {
-                                it.edges?.let { edges ->
-                                    callback.onResult(
-                                        edges,
-                                        it.pageInfo
-                                    )
+                                    it.edges?.let { edges ->
+                                        callback.onResult(
+                                            edges,
+                                            it.pageInfo
+                                        )
+                                    }
                                 }
-                            }
                         }
                     }
 
@@ -79,13 +79,13 @@ class ActivitiesRepository(
                                 )
                             ).toDeferred()
                                 .await().data?.activities?.fragments?.activityConnectionFragment?.let {
-                                it.edges?.let { edges ->
-                                    callback.onResult(
-                                        edges,
-                                        it.pageInfo
-                                    )
+                                    it.edges?.let { edges ->
+                                        callback.onResult(
+                                            edges,
+                                            it.pageInfo
+                                        )
+                                    }
                                 }
-                            }
                         }
                     }
                 }
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolder.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolder.kt
index d0bf31c..635a9d2 100644
--- a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolder.kt
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolder.kt
@@ -1,8 +1,11 @@
 package com.flatstack.android.activities
 
 import android.view.View
+import com.flatstack.android.R
 import com.flatstack.android.util.recyclerview.BaseHolder
 import kotlinx.android.synthetic.main.item_activity.view.*
+import java.text.SimpleDateFormat
+import java.util.*
 
 class ActivitiesViewHolder(itemView: View) : BaseHolder<ActivitiesViewHolderModel>(itemView) {
 
@@ -10,8 +13,15 @@ class ActivitiesViewHolder(itemView: View) : BaseHolder<ActivitiesViewHolderMode
         with(containerView) {
             tv_event.text = item.title
             tv_body.text = item.body
-            tv_created_at.text = item.createdAt
-            tv_username.text = item.userName
+            tv_created_at.text = SimpleDateFormat("HH:mm, dd MMM yyyy", Locale.ENGLISH).format(
+                SimpleDateFormat("yyyy-mm-dd'T'HH:MM:ss'Z'", Locale.ENGLISH).parse(item.createdAt)
+            )
+            tv_username.text = itemView.context.getString(
+                R.string.username_mask,
+                item.user.firstName,
+                item.user.lastName
+            )
+            tv_id.text = itemView.context.getString(R.string.id_mask, item.id)
         }
     }
 }
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolderModel.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolderModel.kt
index 1417e45..ad04a26 100644
--- a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolderModel.kt
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolderModel.kt
@@ -2,7 +2,6 @@ package com.flatstack.android.activities
 
 import com.flatstack.android.profile.entities.Profile
 import com.flatstack.android.type.ActivityEvent
-import java.util.*
 
 data class ActivitiesViewHolderModel(
     val body: String,
@@ -10,5 +9,5 @@ data class ActivitiesViewHolderModel(
     val event: ActivityEvent,
     val id: String,
     val title: String,
-    val userName: String
+    val user: Profile
 )
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt
index 75ae382..aad66c5 100644
--- a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.*
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
 import com.flatstack.android.model.entities.Resource
+import com.flatstack.android.profile.entities.Profile
 import com.flatstack.android.type.ActivityEvent
 import com.flatstack.android.type.ActivityEvent.*
 import kotlinx.coroutines.Dispatchers
@@ -43,7 +44,10 @@ class ActivitiesViewModel(
                                     event = fragment.event,
                                     id = fragment.id,
                                     title = fragment.title,
-                                    userName = fragment.id
+                                    user = Profile(
+                                        firstName = fragment.user.firstName ?: "",
+                                        lastName = fragment.user.lastName ?: ""
+                                    )
                                 )
                             }
                         }
@@ -64,4 +68,3 @@ class ActivitiesViewModel(
                 .asLiveData(viewModelScope.coroutineContext)
         }
 }
-
diff --git a/app/src/main/java/com/flatstack/android/activities/UserActivitiesActivity.kt b/app/src/main/java/com/flatstack/android/activities/UserActivitiesActivity.kt
index 1dd4ca5..305fccd 100644
--- a/app/src/main/java/com/flatstack/android/activities/UserActivitiesActivity.kt
+++ b/app/src/main/java/com/flatstack/android/activities/UserActivitiesActivity.kt
@@ -1,14 +1,11 @@
 package com.flatstack.android.activities
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.paging.PagedList
 import com.flatstack.android.R
-import com.flatstack.android.fragment.ActivityConnectionFragment
-import com.flatstack.android.fragment.ActivityConnectionFragment.Edge
-import com.flatstack.android.type.ActivityEvent
 import com.flatstack.android.util.observeBy
 import com.flatstack.android.util.provideViewModel
 import kotlinx.android.synthetic.main.activity_user_activities.*
diff --git a/app/src/main/res/layout/activity_user_activities.xml b/app/src/main/res/layout/activity_user_activities.xml
index af5a3fc..2b5dea5 100644
--- a/app/src/main/res/layout/activity_user_activities.xml
+++ b/app/src/main/res/layout/activity_user_activities.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/colorWhitish"
     tools:context=".activities.UserActivitiesActivity">
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/item_activity.xml b/app/src/main/res/layout/item_activity.xml
index 97d5f50..138d6bc 100644
--- a/app/src/main/res/layout/item_activity.xml
+++ b/app/src/main/res/layout/item_activity.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
+    android:background="@android:color/white"
     android:foreground="?android:attr/selectableItemBackground"
-    android:padding="16dp"
     app:cardCornerRadius="4dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_margin="8dp">
 
         <TextView
             android:id="@+id/tv_event"
@@ -24,6 +24,16 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:text="User Logged In" />
 
+        <TextView
+            android:id="@+id/tv_id"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            app:layout_constraintBottom_toBottomOf="@id/tv_username"
+            app:layout_constraintStart_toEndOf="@+id/tv_username"
+            app:layout_constraintTop_toTopOf="@id/tv_username"
+            tools:text="id: 123" />
+
         <TextView
             android:id="@+id/tv_created_at"
             android:layout_width="wrap_content"
@@ -36,7 +46,7 @@
             android:id="@+id/tv_username"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingTop="8dp"
+            android:layout_marginTop="8dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_event"
             tools:text="Andy Rumpel" />
@@ -45,7 +55,7 @@
             android:id="@+id/tv_body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="8dp"
+            android:layout_marginTop="8dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -53,5 +63,5 @@
             tools:text="User logged in with the next attributes:\n First name - ,\n Last name - \n" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>
+</androidx.cardview.widget.CardView>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 69b2233..c38c5de 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,4 +3,5 @@
     <color name="colorPrimary">#008577</color>
     <color name="colorPrimaryDark">#00574B</color>
     <color name="colorAccent">#D81B60</color>
+    <color name="colorWhitish">#F5F5F5</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9535e7c..d587d2b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,4 +20,5 @@
     <string name="server_error_error">500 Server Error</string>
     <string name="username_mask">%1$s %2$s</string>
     <string name="go_to_activities">Show activities</string>
+    <string name="id_mask">id: %1$s</string>
 </resources>

From 3a5cd473dad2bc98a8f3d95878e6916694fd48b9 Mon Sep 17 00:00:00 2001
From: andy <andrumpel@gmail.com>
Date: Tue, 8 Dec 2020 23:08:05 +0300
Subject: [PATCH 4/5] resolve conversations

---
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |   4 +-
 .../activities/ActivitiesDiffUtilCallback.kt  |   2 +-
 .../activities/ActivitiesRepository.kt        | 155 ++++++++++--------
 .../activities/ActivitiesViewHolderModel.kt   |   2 +-
 .../android/activities/ActivitiesViewModel.kt |  27 +--
 .../android/profile/ProfileActivity.kt        |   3 +-
 app/src/main/res/layout/activity_profile.xml  |   6 +-
 .../res/layout/activity_user_activities.xml   |   1 -
 app/src/main/res/values/styles.xml            |   4 +
 10 files changed, 106 insertions(+), 100 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 348c0ed..b3ee4c9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -111,7 +111,7 @@ dependencies {
     implementation "com.google.android.material:material:1.2.1"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation 'com.android.support:multidex:1.0.3'
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.0"
+    implementation "com.squareup.okhttp3:logging-interceptor:3.12.8"
 
     implementation androidLibs
     implementation apolloLibs
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 678d0d2..bc92766 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,9 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning">
-        <activity android:name=".activities.UserActivitiesActivity" />
+        <activity 
+            android:name=".activities.UserActivitiesActivity"
+            android:theme="@style/AppTheme.WhitishBackground"/>
         <activity
             android:name=".profile.ProfileActivity"
             android:label="@string/app_name" />
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesDiffUtilCallback.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesDiffUtilCallback.kt
index 3a4f3bb..27f22b8 100644
--- a/app/src/main/java/com/flatstack/android/activities/ActivitiesDiffUtilCallback.kt
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesDiffUtilCallback.kt
@@ -6,7 +6,7 @@ class ActivitiesDiffUtilCallback : DiffUtil.ItemCallback<ActivitiesViewHolderMod
     override fun areItemsTheSame(
         oldItem: ActivitiesViewHolderModel,
         newItem: ActivitiesViewHolderModel
-    ): Boolean = oldItem == newItem
+    ): Boolean = oldItem.id == newItem.id
 
     override fun areContentsTheSame(
         oldItem: ActivitiesViewHolderModel,
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt
index 75fee78..7a2b8bf 100644
--- a/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt
@@ -1,13 +1,17 @@
 package com.flatstack.android.activities
 
+import androidx.lifecycle.asFlow
 import androidx.paging.DataSource
+import androidx.paging.LivePagedListBuilder
 import androidx.paging.PageKeyedDataSource
+import androidx.paging.PagedList
 import com.apollographql.apollo.ApolloClient
 import com.apollographql.apollo.api.Input
 import com.apollographql.apollo.coroutines.toDeferred
 import com.flatstack.android.fragment.ActivityConnectionFragment.Edge
 import com.flatstack.android.fragment.ActivityConnectionFragment.PageInfo
 import com.flatstack.android.graphql.query.GetActivitiesQuery
+import com.flatstack.android.profile.entities.Profile
 import com.flatstack.android.type.ActivityEvent
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -17,77 +21,100 @@ class ActivitiesRepository(
     private val apolloClient: ApolloClient
 ) {
     fun getPagedUserActivities(coroutineScope: CoroutineScope, events: List<ActivityEvent>) =
-        object : DataSource.Factory<PageInfo, Edge>() {
-            override fun create(): DataSource<PageInfo, Edge> =
-                object : PageKeyedDataSource<PageInfo, Edge>() {
-                    override fun loadInitial(
-                        params: LoadInitialParams<PageInfo>,
-                        callback: LoadInitialCallback<PageInfo, Edge>
-                    ) {
-                        coroutineScope.launch(Dispatchers.IO) {
-                            apolloClient.query(
-                                GetActivitiesQuery(
-                                    events = Input.fromNullable(events),
-                                    first = Input.fromNullable(15)
-                                )
-                            ).toDeferred()
-                                .await().data?.activities?.fragments?.activityConnectionFragment?.let {
-                                    it.edges?.let { edges ->
-                                        callback.onResult(
-                                            edges,
-                                            null,
-                                            it.pageInfo
-                                        )
+        LivePagedListBuilder(
+            object : DataSource.Factory<PageInfo, Edge>() {
+                override fun create(): DataSource<PageInfo, Edge> =
+                    object : PageKeyedDataSource<PageInfo, Edge>() {
+                        override fun loadInitial(
+                            params: LoadInitialParams<PageInfo>,
+                            callback: LoadInitialCallback<PageInfo, Edge>
+                        ) {
+                            coroutineScope.launch(Dispatchers.IO) {
+                                apolloClient.query(
+                                    GetActivitiesQuery(
+                                        events = Input.optional(events),
+                                        first = Input.optional(15)
+                                    )
+                                ).toDeferred()
+                                    .await().data?.activities?.fragments?.activityConnectionFragment?.let {
+                                        it.edges?.let { edges ->
+                                            callback.onResult(
+                                                edges,
+                                                null,
+                                                it.pageInfo
+                                            )
+                                        }
                                     }
-                                }
+                            }
                         }
-                    }
 
-                    override fun loadAfter(
-                        params: LoadParams<PageInfo>,
-                        callback: LoadCallback<PageInfo, Edge>
-                    ) {
-                        coroutineScope.launch(Dispatchers.IO) {
-                            apolloClient.query(
-                                GetActivitiesQuery(
-                                    after = Input.fromNullable(params.key.endCursor),
-                                    events = Input.fromNullable(events),
-                                    first = Input.fromNullable(15)
-                                )
-                            ).toDeferred()
-                                .await().data?.activities?.fragments?.activityConnectionFragment?.let {
-                                    it.edges?.let { edges ->
-                                        callback.onResult(
-                                            edges,
-                                            it.pageInfo
-                                        )
+                        override fun loadAfter(
+                            params: LoadParams<PageInfo>,
+                            callback: LoadCallback<PageInfo, Edge>
+                        ) {
+                            coroutineScope.launch(Dispatchers.IO) {
+                                apolloClient.query(
+                                    GetActivitiesQuery(
+                                        after = Input.optional(params.key.endCursor),
+                                        events = Input.optional(events),
+                                        first = Input.optional(15)
+                                    )
+                                ).toDeferred()
+                                    .await().data?.activities?.fragments?.activityConnectionFragment?.let {
+                                        it.edges?.let { edges ->
+                                            callback.onResult(
+                                                edges,
+                                                it.pageInfo
+                                            )
+                                        }
                                     }
-                                }
+                            }
                         }
-                    }
 
-                    override fun loadBefore(
-                        params: LoadParams<PageInfo>,
-                        callback: LoadCallback<PageInfo, Edge>
-                    ) {
-                        coroutineScope.launch(Dispatchers.IO) {
-                            apolloClient.query(
-                                GetActivitiesQuery(
-                                    before = Input.fromNullable(params.key.startCursor),
-                                    events = Input.fromNullable(events),
-                                    first = Input.fromNullable(15)
-                                )
-                            ).toDeferred()
-                                .await().data?.activities?.fragments?.activityConnectionFragment?.let {
-                                    it.edges?.let { edges ->
-                                        callback.onResult(
-                                            edges,
-                                            it.pageInfo
-                                        )
+                        override fun loadBefore(
+                            params: LoadParams<PageInfo>,
+                            callback: LoadCallback<PageInfo, Edge>
+                        ) {
+                            coroutineScope.launch(Dispatchers.IO) {
+                                apolloClient.query(
+                                    GetActivitiesQuery(
+                                        before = Input.optional(params.key.startCursor),
+                                        events = Input.optional(events),
+                                        first = Input.optional(15)
+                                    )
+                                ).toDeferred()
+                                    .await().data?.activities?.fragments?.activityConnectionFragment?.let {
+                                        it.edges?.let { edges ->
+                                            callback.onResult(
+                                                edges,
+                                                it.pageInfo
+                                            )
+                                        }
                                     }
-                                }
+                            }
+                        }
+                    }
+            }
+                .mapByPage { edges ->
+                    edges.map { edge ->
+                        edge.node?.fragments?.activityFragment?.let { fragment ->
+                            ActivitiesViewHolderModel(
+                                body = fragment.body,
+                                createdAt = fragment.createdAt.toString(),
+                                event = fragment.event,
+                                id = fragment.id,
+                                title = fragment.title,
+                                user = Profile(
+                                    firstName = fragment.user.firstName ?: "",
+                                    lastName = fragment.user.lastName ?: ""
+                                )
+                            )
                         }
                     }
-                }
-        }
+                },
+            PagedList.Config.Builder()
+                .setEnablePlaceholders(false)
+                .setPageSize(15)
+                .build()
+        ).build().asFlow()
 }
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolderModel.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolderModel.kt
index ad04a26..3bba719 100644
--- a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolderModel.kt
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewHolderModel.kt
@@ -4,10 +4,10 @@ import com.flatstack.android.profile.entities.Profile
 import com.flatstack.android.type.ActivityEvent
 
 data class ActivitiesViewHolderModel(
+    val id: String,
     val body: String,
     val createdAt: String,
     val event: ActivityEvent,
-    val id: String,
     val title: String,
     val user: Profile
 )
diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt
index aad66c5..96ed517 100644
--- a/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesViewModel.kt
@@ -1,10 +1,8 @@
 package com.flatstack.android.activities
 
 import androidx.lifecycle.*
-import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
 import com.flatstack.android.model.entities.Resource
-import com.flatstack.android.profile.entities.Profile
 import com.flatstack.android.type.ActivityEvent
 import com.flatstack.android.type.ActivityEvent.*
 import kotlinx.coroutines.Dispatchers
@@ -33,30 +31,7 @@ class ActivitiesViewModel(
 
     val activities: LiveData<Resource<PagedList<ActivitiesViewHolderModel?>>> =
         events.switchMap { events ->
-            LivePagedListBuilder(
-                activitiesRepository.getPagedUserActivities(viewModelScope, events)
-                    .mapByPage { edges ->
-                        edges.map { edge ->
-                            edge.node?.fragments?.activityFragment?.let { fragment ->
-                                ActivitiesViewHolderModel(
-                                    body = fragment.body,
-                                    createdAt = fragment.createdAt.toString(),
-                                    event = fragment.event,
-                                    id = fragment.id,
-                                    title = fragment.title,
-                                    user = Profile(
-                                        firstName = fragment.user.firstName ?: "",
-                                        lastName = fragment.user.lastName ?: ""
-                                    )
-                                )
-                            }
-                        }
-                    },
-                PagedList.Config.Builder()
-                    .setEnablePlaceholders(false)
-                    .setPageSize(15)
-                    .build()
-            ).build().asFlow()
+            activitiesRepository.getPagedUserActivities(viewModelScope, events)
                 .flowOn(Dispatchers.IO)
                 .map { Resource.success(it) }
                 .onStart { emit(Resource.loading()) }
diff --git a/app/src/main/java/com/flatstack/android/profile/ProfileActivity.kt b/app/src/main/java/com/flatstack/android/profile/ProfileActivity.kt
index 00af6ca..7c7ef0f 100644
--- a/app/src/main/java/com/flatstack/android/profile/ProfileActivity.kt
+++ b/app/src/main/java/com/flatstack/android/profile/ProfileActivity.kt
@@ -23,7 +23,7 @@ class ProfileActivity : AppCompatActivity(), KodeinAware, OnRefreshListener {
     override val kodein: Kodein by kodein()
 
     private val viewModel: ProfileViewModel by provideViewModel()
-
+    private val router by kodein.instance<Router>()
     private val refreshLayout: SwipeRefreshLayout by lazy { swipe_layout }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -47,7 +47,6 @@ class ProfileActivity : AppCompatActivity(), KodeinAware, OnRefreshListener {
 
     private fun initListeners() {
         bt_go_to_activities.setOnClickListener {
-            val router by kodein.instance<Router>()
             router.activities(context = this, clearStack = true)
         }
     }
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index e3f0bce..304a592 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -44,10 +44,10 @@
                 android:id="@+id/bt_go_to_activities"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@+id/tv_last_name"
-                app:layout_constraintStart_toStartOf="parent"
+                android:text="@string/go_to_activities"
                 app:layout_constraintEnd_toEndOf="parent"
-                android:text="@string/go_to_activities"/>
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_last_name" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/activity_user_activities.xml b/app/src/main/res/layout/activity_user_activities.xml
index 2b5dea5..af5a3fc 100644
--- a/app/src/main/res/layout/activity_user_activities.xml
+++ b/app/src/main/res/layout/activity_user_activities.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorWhitish"
     tools:context=".activities.UserActivitiesActivity">
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e5448bf..106747d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,4 +7,8 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
+
+    <style name="AppTheme.WhitishBackground" parent="AppTheme">
+        <item name="background">@color/colorWhitish</item>
+    </style>
 </resources>

From 9641a6e7a0cb36b06a3f8e6f801226157e17af43 Mon Sep 17 00:00:00 2001
From: andy <andrumpel@gmail.com>
Date: Tue, 8 Dec 2020 23:15:41 +0300
Subject: [PATCH 5/5] fix checkstyle

---
 .../android/activities/ActivitiesRepository.kt      | 13 +++++++++----
 app/src/main/res/layout/item_activity.xml           |  2 --
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt b/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt
index 7a2b8bf..e0e21cc 100644
--- a/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt
+++ b/app/src/main/java/com/flatstack/android/activities/ActivitiesRepository.kt
@@ -20,6 +20,7 @@ import kotlinx.coroutines.launch
 class ActivitiesRepository(
     private val apolloClient: ApolloClient
 ) {
+    @Suppress("LongMethod")
     fun getPagedUserActivities(coroutineScope: CoroutineScope, events: List<ActivityEvent>) =
         LivePagedListBuilder(
             object : DataSource.Factory<PageInfo, Edge>() {
@@ -33,7 +34,7 @@ class ActivitiesRepository(
                                 apolloClient.query(
                                     GetActivitiesQuery(
                                         events = Input.optional(events),
-                                        first = Input.optional(15)
+                                        first = Input.optional(PAGE_SIZE)
                                     )
                                 ).toDeferred()
                                     .await().data?.activities?.fragments?.activityConnectionFragment?.let {
@@ -57,7 +58,7 @@ class ActivitiesRepository(
                                     GetActivitiesQuery(
                                         after = Input.optional(params.key.endCursor),
                                         events = Input.optional(events),
-                                        first = Input.optional(15)
+                                        first = Input.optional(PAGE_SIZE)
                                     )
                                 ).toDeferred()
                                     .await().data?.activities?.fragments?.activityConnectionFragment?.let {
@@ -80,7 +81,7 @@ class ActivitiesRepository(
                                     GetActivitiesQuery(
                                         before = Input.optional(params.key.startCursor),
                                         events = Input.optional(events),
-                                        first = Input.optional(15)
+                                        first = Input.optional(PAGE_SIZE)
                                     )
                                 ).toDeferred()
                                     .await().data?.activities?.fragments?.activityConnectionFragment?.let {
@@ -114,7 +115,11 @@ class ActivitiesRepository(
                 },
             PagedList.Config.Builder()
                 .setEnablePlaceholders(false)
-                .setPageSize(15)
+                .setPageSize(PAGE_SIZE)
                 .build()
         ).build().asFlow()
+
+    companion object {
+        private const val PAGE_SIZE = 15
+    }
 }
diff --git a/app/src/main/res/layout/item_activity.xml b/app/src/main/res/layout/item_activity.xml
index 138d6bc..f9f3718 100644
--- a/app/src/main/res/layout/item_activity.xml
+++ b/app/src/main/res/layout/item_activity.xml
@@ -5,8 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
-    android:background="@android:color/white"
-    android:foreground="?android:attr/selectableItemBackground"
     app:cardCornerRadius="4dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout