Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Follow up fixes for 'Archive Conversations #4624

Merged
merged 4 commits into from
Jan 23, 2025
Merged

Follow up fixes for 'Archive Conversations #4624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6055e5
Archived conversation improvements
rapterjet2004 Jan 16, 2025
71af112
change "No conversations archived" screen design
mahibi Jan 23, 2025
3427f4c
change "Archive conversation" design in conversation-info screen
mahibi Jan 23, 2025
7ac8c24
Show snackbar on archive/unarchive from bottomDialog
mahibi Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,7 @@ class ConversationInfoActivity :
binding.archiveConversationTextHint.text = resources.getString(R.string.unarchive_hint)
}
}
viewModel.getRoom(conversationUser, conversationToken)
}

if (conversation!!.hasArchived) {
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,20 @@ class ConversationsListActivity :
newItems.add(i)
}
}

val archiveFilterOn = filterState[FilterConversationFragment.ARCHIVE] ?: false
if (archiveFilterOn && newItems.isEmpty()) {
binding.noArchivedConversationLayout.visibility = View.VISIBLE
} else {
binding.noArchivedConversationLayout.visibility = View.GONE
}

adapter!!.updateDataSet(newItems, true)
setFilterableItems(newItems)
if (archiveFilterOn) {
// Never a notification from archived conversations
binding.newMentionPopupBubble.visibility = View.GONE
}

updateFilterConversationButtonColor()
}
Expand Down
41 changes: 41 additions & 0 deletions app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import com.nextcloud.talk.api.NcApi
import com.nextcloud.talk.api.NcApiCoroutines
import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.conversation.RenameConversationDialogFragment
import com.nextcloud.talk.conversationinfo.viewmodel.ConversationInfoViewModel
import com.nextcloud.talk.conversationlist.ConversationsListActivity
import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.databinding.DialogConversationOperationsBinding
Expand Down Expand Up @@ -68,6 +69,9 @@ class ConversationsListBottomDialog(
@Inject
lateinit var viewThemeUtils: ViewThemeUtils

@Inject
lateinit var conversationInfoViewModel: ConversationInfoViewModel

@Inject
lateinit var userManager: UserManager

Expand Down Expand Up @@ -189,6 +193,16 @@ class ConversationsListBottomDialog(
dismiss()
}

binding.conversationArchiveText.text = if (conversation.hasArchived) {
this.activity.resources.getString(R.string.unarchive_conversation)
} else {
this.activity.resources.getString(R.string.archive_conversation)
}

binding.conversationArchive.setOnClickListener {
handleArchiving()
}

binding.conversationOperationRename.setOnClickListener {
renameConversation()
}
Expand All @@ -202,6 +216,33 @@ class ConversationsListBottomDialog(
}
}

private fun handleArchiving() {
val currentUser = userManager.currentUser.blockingGet()
val token = conversation.token
lifecycleScope.launch {
if (conversation.hasArchived) {
conversationInfoViewModel.unarchiveConversation(currentUser, token)
activity.showSnackbar(
String.format(
context.resources.getString(R.string.unarchived_conversation),
conversation.displayName
)
)
dismiss()
} else {
conversationInfoViewModel.archiveConversation(currentUser, token)
activity.showSnackbar(
String.format(
context.resources.getString(R.string.archived_conversation),
conversation.displayName
)
)
dismiss()
}
}
activity.fetchRooms()
}

@Suppress("Detekt.TooGenericExceptionCaught")
@SuppressLint("StringFormatInvalid", "TooGenericExceptionCaught")
private fun addConversationToFavorites() {
Expand Down
75 changes: 35 additions & 40 deletions app/src/main/res/layout/activity_conversation_info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,6 @@
android:orientation="horizontal"
android:background="?android:attr/selectableItemBackground">


<ImageView
android:layout_width="24dp"
android:layout_height="40dp"
Expand All @@ -425,47 +424,8 @@
android:gravity="center_vertical"
android:text="@string/show_banned_participants"
android:textSize="@dimen/headline_text_size" />

</LinearLayout>

<LinearLayout
android:id="@+id/archive_conversation_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/standard_margin"
android:paddingTop="@dimen/standard_half_margin"
android:paddingEnd="@dimen/standard_margin"
android:paddingBottom="@dimen/standard_half_margin"
android:orientation="horizontal"
android:background="?android:attr/selectableItemBackground">


<ImageView
android:id="@+id/archive_conversation_icon"
android:layout_width="24dp"
android:layout_height="40dp"
android:layout_marginEnd="@dimen/standard_margin"
android:contentDescription="@null"
tools:src="@drawable/outline_archive_24"
app:tint="@color/grey_600" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/archive_conversation_text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
tools:text="@string/unarchive_conversation"
android:textSize="@dimen/headline_text_size" />

</LinearLayout>

<com.google.android.material.textview.MaterialTextView
android:id="@+id/archive_conversation_text_hint"
android:layout_marginHorizontal="@dimen/standard_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/archive_hint" />

<LinearLayout
android:id="@+id/danger_zone_options"
android:layout_width="match_parent"
Expand All @@ -482,6 +442,41 @@
android:textSize="@dimen/headline_text_size"
android:textStyle="bold" />

<LinearLayout
android:id="@+id/archive_conversation_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingStart="@dimen/standard_margin"
android:paddingEnd="@dimen/standard_margin">

<ImageView
android:id="@+id/archive_conversation_icon"
android:layout_width="24dp"
android:layout_height="40dp"
android:layout_marginEnd="@dimen/standard_margin"
android:contentDescription="@null"
app:tint="@color/grey_600"
tools:src="@drawable/outline_archive_24" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/archive_conversation_text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:textSize="@dimen/headline_text_size"
tools:text="@string/unarchive_conversation" />
</LinearLayout>

<com.google.android.material.textview.MaterialTextView
android:id="@+id/archive_conversation_text_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/standard_margin"
android:text="@string/archive_hint"
android:textColor="@color/disabled_text" />

<LinearLayout
android:id="@+id/leaveConversationAction"
android:layout_width="match_parent"
Expand Down
34 changes: 33 additions & 1 deletion app/src/main/res/layout/activity_conversations.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"
tools:visibility="visible">
tools:visibility="gone">

<ImageView
android:id="@+id/empty_list_icon"
Expand Down Expand Up @@ -210,6 +210,38 @@
android:textSize="16sp" />
</RelativeLayout>

<RelativeLayout
android:id="@+id/no_archived_conversation_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"
tools:visibility="visible">

<ImageView
android:id="@+id/no_archived_conversation_icon"
android:layout_width="match_parent"
android:layout_height="72dp"
android:contentDescription="@string/nc_app_product_name"
android:src="@drawable/outline_archive_24"
app:tint="@color/grey_600" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/no_archived_conversation_icon"
android:layout_gravity="center_horizontal"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:paddingTop="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_half_padding"
android:text="@string/no_conversations_archived"
android:textAlignment="center"
android:textColor="@color/high_emphasis_text"
android:textSize="22sp" />
</RelativeLayout>

<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefreshLayoutView"
android:layout_width="match_parent"
Expand Down
31 changes: 31 additions & 0 deletions app/src/main/res/layout/dialog_conversation_operations.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,37 @@
android:textSize="@dimen/bottom_sheet_text_size" />
</LinearLayout>

<LinearLayout
android:id="@+id/conversation_archive"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_item_height"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"
tools:ignore="UseCompoundDrawables">

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/outline_archive_24"
app:tint="@color/high_emphasis_menu_icon" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/conversation_archive_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:paddingStart="40dp"
android:paddingEnd="@dimen/zero"
android:text="@string/archive_conversation"
android:textAlignment="viewStart"
android:textColor="@color/high_emphasis_text"
android:textSize="@dimen/bottom_sheet_text_size" />
</LinearLayout>

<LinearLayout
android:id="@+id/conversation_operation_rename"
android:layout_width="match_parent"
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,4 +847,7 @@ How to translate with transifex:
<string name="user_absence_for_one_day">%1$s is out of office today</string>
<string name="user_absence_replacement">Replacement: </string>
<string name="resend_message">Resend</string>
<string name="no_conversations_archived">No conversations archived</string>
<string name="archived_conversation">Archived %1$s</string>
<string name="unarchived_conversation">Unarchived %1$s</string>
</resources>
Loading