add sensitive media overlay

app/src/main/kotlin/at/connyduck/pixelcat/components/timeline/TimelineFragment.kt

@@ -46,7 +46,7 @@ class TimelineFragment : DaggerFragment(R.layout.fragment_timeline), TimeLineAct
         binding.timelineRecyclerView.addItemDecoration(DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL))
 
         lifecycleScope.launch {
-            viewModel.flow.collectLatest { pagingData ->
+            viewModel.statusFlow.collectLatest { pagingData ->
                 adapter.submitData(pagingData)
             }
         }
@@ -77,4 +77,8 @@ class TimelineFragment : DaggerFragment(R.layout.fragment_timeline), TimeLineAct
     override fun onReply(status: StatusEntity) {
         TODO("Not yet implemented")
     }
+
+    override fun onMediaVisibilityChanged(status: StatusEntity) {
+        viewModel.onMediaVisibilityChanged(status)
+    }
 }

app/src/main/kotlin/at/connyduck/pixelcat/components/timeline/TimelineListAdapter.kt

@@ -18,6 +18,7 @@ interface TimeLineActionListener {
     fun onFavorite(post: StatusEntity)
     fun onBoost(post: StatusEntity)
     fun onReply(status: StatusEntity)
+    fun onMediaVisibilityChanged(status: StatusEntity)
 }
 
 object TimelineDiffUtil : DiffUtil.ItemCallback<StatusEntity>() {
@@ -82,6 +83,12 @@ class TimelineListAdapter(
             holder.binding.postDescription.text = status.content.parseAsHtml().trim()
 
             holder.binding.postDate.text = dateTimeFormatter.format(status.createdAt)
+
+            holder.binding.postSensitiveMediaOverlay.visible = status.attachments.isNotEmpty() && !status.mediaVisible
+
+            holder.binding.postSensitiveMediaOverlay.setOnClickListener {
+                listener.onMediaVisibilityChanged(status)
+            }
         }
     }
 }

app/src/main/kotlin/at/connyduck/pixelcat/components/timeline/TimelineViewModel.kt

@@ -1,6 +1,5 @@
 package at.connyduck.pixelcat.components.timeline
 
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.ExperimentalPagingApi
@@ -11,37 +10,39 @@ import at.connyduck.pixelcat.db.AccountManager
 import at.connyduck.pixelcat.db.AppDatabase
 import at.connyduck.pixelcat.db.entitity.StatusEntity
 import at.connyduck.pixelcat.network.FediverseApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.asFlow
+import kotlinx.coroutines.flow.flatMapConcat
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class TimelineViewModel @Inject constructor(
-    // private val repository: TimelineRepo,
     private val accountManager: AccountManager,
     private val db: AppDatabase,
     fediverseApi: FediverseApi
 ) : ViewModel() {
 
-    private val accountId = MutableLiveData<Long>()
+    @OptIn(FlowPreview::class)
-
-    init {
-        viewModelScope.launch {
-            val currentAccountId = accountManager.activeAccount()?.id!!
-            accountId.postValue(currentAccountId)
-        }
-    }
-
     @ExperimentalPagingApi
-    val flow = Pager(
+    val statusFlow = accountManager::activeAccount.asFlow()
-        // Configure how data is loaded by passing additional properties to
+        .flatMapConcat { activeAccount ->
-        // PagingConfig, such as prefetchDistance.
+            Pager(
                 config = PagingConfig(pageSize = 10, enablePlaceholders = false),
-        remoteMediator = TimelineRemoteMediator(0, fediverseApi, db),
+                remoteMediator = TimelineRemoteMediator(activeAccount?.id!!, fediverseApi, db),
-        pagingSourceFactory = { db.statusDao().statuses(0) }
+                pagingSourceFactory = { db.statusDao().statuses(activeAccount.id) }
-    ).flow.cachedIn(viewModelScope)
+            ).flow
+        }
+        .cachedIn(viewModelScope)
 
     fun onFavorite(status: StatusEntity) {
         viewModelScope.launch {
             //  repository.onFavorite(status, accountManager.activeAccount()?.id!!)
         }
     }
+
+    fun onMediaVisibilityChanged(status: StatusEntity) {
+        viewModelScope.launch {
+            db.statusDao().changeMediaVisibility(!status.mediaVisible, status.id, accountManager.activeAccount()?.id!!)
+        }
+    }
 }

app/src/main/kotlin/at/connyduck/pixelcat/db/TimelineDao.kt

@@ -25,4 +25,7 @@ interface TimelineDao {
 
     @Query("DELETE FROM StatusEntity WHERE accountId = :accountId")
     suspend fun clearAll(accountId: Long)
+
+    @Query("UPDATE StatusEntity SET mediaVisible = :visible WHERE id = :statusId AND accountId = :accountId")
+    suspend fun changeMediaVisibility(visible: Boolean, statusId: String, accountId: Long)
 }

app/src/main/kotlin/at/connyduck/pixelcat/db/entitity/TimelineStatusEntity.kt

@@ -32,7 +32,7 @@ data class StatusEntity(
     val mediaVisible: Boolean
 )
 
-fun Status.toEntity(accountId: Long, mediaPosition: Int = 0, mediaVisible: Boolean = this.sensitive) = StatusEntity(
+fun Status.toEntity(accountId: Long, mediaPosition: Int = 0, mediaVisible: Boolean = !this.sensitive) = StatusEntity(
     accountId = accountId,
     id = id,
     url = actionableStatus.url,

app/src/main/res/layout/item_status.xml

@@ -52,9 +52,19 @@
         android:layout_marginTop="8dp"
         android:background="#000"
         android:orientation="horizontal"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:layout_constraintTop_toBottomOf="@id/postAvatar" />
 
+    <TextView
+        android:id="@+id/postSensitiveMediaOverlay"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="#ccc"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:text="@string/sensitive_media"
+        app:layout_constraintBottom_toBottomOf="@id/postImages"
+        app:layout_constraintTop_toTopOf="@id/postImages" />
+
     <at.connyduck.sparkbutton.SparkButton
         android:id="@+id/postLikeButton"
         android:layout_width="24dp"

app/src/main/res/values/strings.xml

@@ -74,5 +74,6 @@
     <string name="navigation_menu">Menu</string>
     <string name="navigation_accounts">Accounts</string>
     <string name="action_add_new_account">Add Account</string>
+    <string name="sensitive_media">Sensitive media</string>
 
 </resources>