Refresh

api/anilist/src/main/kotlin/com/imashnake/animite/api/anilist/AnilistMediaRepository.kt

@@ -2,8 +2,6 @@ package com.imashnake.animite.api.anilist
 
 import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.api.Optional
-import com.apollographql.apollo3.cache.normalized.FetchPolicy
-import com.apollographql.apollo3.cache.normalized.fetchPolicy
 import com.imashnake.animite.api.anilist.sanitize.media.Media
 import com.imashnake.animite.api.anilist.type.MediaSeason
 import com.imashnake.animite.api.anilist.type.MediaSort
@@ -42,7 +40,6 @@ class AnilistMediaRepository @Inject constructor(
                     seasonYear = Optional.presentIfNotNull(seasonYear)
                 )
             )
-            .fetchPolicy(FetchPolicy.CacheAndNetwork)
             .toFlow()
             .asResult {
                 it.page!!.media.orEmpty().filterNotNull().map { query -> Media.Medium(query) }
@@ -57,7 +54,6 @@ class AnilistMediaRepository @Inject constructor(
                     type = Optional.presentIfNotNull(mediaType)
                 )
             )
-            .fetchPolicy(FetchPolicy.CacheAndNetwork)
             .toFlow()
             .asResult { Media(it.media!!) }
     }

api/anilist/src/main/kotlin/com/imashnake/animite/api/anilist/AnilistSearchRepository.kt

@@ -2,8 +2,6 @@ package com.imashnake.animite.api.anilist
 
 import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.api.Optional
-import com.apollographql.apollo3.cache.normalized.FetchPolicy
-import com.apollographql.apollo3.cache.normalized.fetchPolicy
 import com.imashnake.animite.api.anilist.sanitize.search.Search
 import com.imashnake.animite.api.anilist.type.MediaType
 import kotlinx.coroutines.flow.Flow
@@ -31,7 +29,6 @@ class AnilistSearchRepository @Inject constructor(
                     search = Optional.presentIfNotNull(search)
                 )
             )
-            .fetchPolicy(FetchPolicy.CacheAndNetwork)
             .toFlow()
             .asResult { it.page!!.media.orEmpty().filterNotNull().map { query -> Search(query) } }
     }

api/anilist/src/main/kotlin/com/imashnake/animite/api/anilist/AnilistUserRepository.kt

@@ -15,10 +15,10 @@ import javax.inject.Inject
 class AnilistUserRepository @Inject constructor(
     @AuthorizedClient private val apolloClient: ApolloClient
 ) {
-    fun fetchViewer(): Flow<Result<ViewerQuery.Viewer>> {
+    fun fetchViewer(refresh: Boolean): Flow<Result<ViewerQuery.Viewer>> {
         return apolloClient
             .query(ViewerQuery())
-            .fetchPolicy(FetchPolicy.CacheAndNetwork)
+            .fetchPolicy(if (refresh) FetchPolicy.NetworkFirst else FetchPolicy.CacheFirst)
             .toFlow()
             .asResult { it.viewer!! }
     }

profile/src/main/kotlin/com/imashnake/animite/profile/ProfileScreen.kt

@@ -5,9 +5,17 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material.pullrefresh.pullRefresh
+import androidx.compose.material.pullrefresh.rememberPullRefreshState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.PrimaryTabRow
@@ -33,6 +41,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import coil.compose.AsyncImage
 import com.boswelja.markdown.material3.MarkdownDocument
 import com.boswelja.markdown.material3.m3TextStyles
+import com.imashnake.animite.core.data.Resource
 import com.imashnake.animite.core.extensions.animiteBlockQuoteStyle
 import com.imashnake.animite.core.extensions.animiteCodeBlockStyle
 import com.imashnake.animite.core.extensions.crossfadeModel
@@ -47,6 +56,7 @@ import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootNavGraph
 import com.imashnake.animite.core.R as coreR
 
+@OptIn(ExperimentalMaterialApi::class)
 @Suppress("LongMethod", "UNUSED_PARAMETER")
 @Destination(
     route = "user",
@@ -66,17 +76,25 @@ fun ProfileScreen(
     expiresIn: Int? = null
 ) {
     accessToken?.let { viewModel.setAccessToken(it) }
+    viewModel.refreshViewer(false)
     val isLoggedIn by viewModel.isLoggedIn.collectAsState(initial = false)
     val viewer by viewModel.viewer.collectAsState()
 
+    val pullRefreshState = rememberPullRefreshState(
+        refreshing = viewer is Resource.Loading,
+        onRefresh = { viewModel.refreshViewer(true) }
+    )
+
     Box(
-        contentAlignment = Alignment.Center,
+        contentAlignment = Alignment.TopCenter,
         modifier = Modifier
             .fillMaxSize()
             .background(MaterialTheme.colorScheme.background)
+            .pullRefresh(pullRefreshState)
+            .verticalScroll(rememberScrollState())
     ) {
         when {
-            isLoggedIn -> viewer.data?.run {
+            isLoggedIn && viewer is Resource.Success -> viewer.data?.run {
                 BannerLayout(
                     banner = {
                         Box {
@@ -126,6 +144,15 @@ fun ProfileScreen(
             }
             else -> Login()
         }
+
+        // TODO: Replace with custom indicator.
+        PullRefreshIndicator(
+            refreshing = viewer is Resource.Loading,
+            state = pullRefreshState,
+            modifier = Modifier.align(Alignment.TopCenter),
+            backgroundColor = MaterialTheme.colorScheme.background,
+            contentColor = MaterialTheme.colorScheme.primary
+        )
     }
 }
 
@@ -190,7 +217,8 @@ fun UserTabs(modifier: Modifier = Modifier) {
         }
         Box(
             Modifier
-                .fillMaxSize()
+                .height(300.dp)
+                .fillMaxWidth()
                 .background(
                     Brush.verticalGradient(
                         listOf(

profile/src/main/kotlin/com/imashnake/animite/profile/ProfileViewModel.kt

@@ -1,5 +1,6 @@
 package com.imashnake.animite.profile
 
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.imashnake.animite.api.anilist.AnilistUserRepository
@@ -8,27 +9,40 @@ import com.imashnake.animite.core.data.Resource
 import com.imashnake.animite.core.data.Resource.Companion.asResource
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @HiltViewModel
 class ProfileViewModel @Inject constructor(
-    userRepository: AnilistUserRepository,
-    private val preferencesRepository: PreferencesRepository
+    private val userRepository: AnilistUserRepository,
+    private val preferencesRepository: PreferencesRepository,
+    private val savedStateHandle: SavedStateHandle
 ) : ViewModel() {
+    private val refresh = savedStateHandle.getStateFlow(REFRESH, false)
+
     val isLoggedIn = preferencesRepository
         .accessToken
         .map { !it.isNullOrEmpty() }
 
-    val viewer = userRepository
-        .fetchViewer()
-        .asResource()
+    val viewer = refresh
+        .flatMapLatest { userRepository.fetchViewer(it).asResource() }
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(1000), Resource.loading())
 
     fun setAccessToken(accessToken: String?) = viewModelScope.launch(Dispatchers.IO) {
         preferencesRepository.setAccessToken(accessToken)
     }
+
+    fun refreshViewer(refresh: Boolean) {
+        savedStateHandle[REFRESH] = refresh
+    }
+
+    companion object {
+        const val REFRESH = "refresh"
+    }
 }