From 2bda15fd43f5da66e70d4aafefe76fe02fcc56c4 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Fri, 22 Sep 2023 15:06:28 +0300
Subject: [PATCH] Use room name as title
---
app/src/main/res/values/strings.xml | 3 ---
.../circles/core/extensions/LiveDataExtensions.kt | 3 ++-
.../org/futo/circles/core/model/WorkspaceTask.kt | 12 +++++-------
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 151d8b784..774423240 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,9 +30,6 @@
<string name="circle_name">Circle name</string>
<string name="group_topic_optional">Group topic (optional)</string>
<string name="group_topic">Group topic</string>
- <string name="friends">Friends</string>
- <string name="family">Family</string>
- <string name="community">Community</string>
<string name="circles_created">Circles created</string>
<string name="private_circles">Private Circles</string>
<string name="log_out">Log out</string>
diff --git a/core/src/main/java/org/futo/circles/core/extensions/LiveDataExtensions.kt b/core/src/main/java/org/futo/circles/core/extensions/LiveDataExtensions.kt
index a3cf39855..6ff976ec2 100644
--- a/core/src/main/java/org/futo/circles/core/extensions/LiveDataExtensions.kt
+++ b/core/src/main/java/org/futo/circles/core/extensions/LiveDataExtensions.kt
@@ -3,6 +3,7 @@ package org.futo.circles.core.extensions
import androidx.fragment.app.Fragment
import androidx.lifecycle.LiveData
import org.futo.circles.core.ErrorParser
+import org.futo.circles.core.fragment.HasLoadingState
fun <T> LiveData<Response<T>>.observeResponse(
fragment: Fragment,
@@ -13,7 +14,7 @@ fun <T> LiveData<Response<T>>.observeResponse(
observe(fragment.viewLifecycleOwner) {
it ?: return@observe
onRequestInvoked?.invoke()
- ?: run { (fragment as? org.futo.circles.core.fragment.HasLoadingState)?.stopLoading() }
+ ?: run { (fragment as? HasLoadingState)?.stopLoading() }
when (it) {
is Response.Success -> success(it.data)
is Response.Error -> error?.invoke(it.message)
diff --git a/core/src/main/java/org/futo/circles/core/model/WorkspaceTask.kt b/core/src/main/java/org/futo/circles/core/model/WorkspaceTask.kt
index 949d9dab2..d527148e1 100644
--- a/core/src/main/java/org/futo/circles/core/model/WorkspaceTask.kt
+++ b/core/src/main/java/org/futo/circles/core/model/WorkspaceTask.kt
@@ -4,26 +4,24 @@ import org.futo.circles.core.list.IdEntity
sealed class WorkspaceTask(
open val room: CirclesRoom,
- open val titleResId: Int,
open val descriptionResId: Int,
open val status: TaskStatus
) : IdEntity<Int>
+
data class MandatoryWorkspaceTask(
override val room: CirclesRoom,
- override val titleResId: Int,
override val descriptionResId: Int,
override val status: TaskStatus = TaskStatus.IDLE
-) : WorkspaceTask(room, titleResId, descriptionResId, status) {
- override val id: Int = titleResId
+) : WorkspaceTask(room, descriptionResId, status) {
+ override val id: Int = descriptionResId
}
data class OptionalWorkspaceTask(
override val room: CirclesRoom,
- override val titleResId: Int,
override val descriptionResId: Int,
override val status: TaskStatus = TaskStatus.IDLE,
val isSelected: Boolean = true
-) : WorkspaceTask(room, titleResId, descriptionResId, status) {
- override val id: Int = titleResId
+) : WorkspaceTask(room, descriptionResId, status) {
+ override val id: Int = descriptionResId
}
\ No newline at end of file
--
GitLab