From 3ab4fb39a50ef6324067e4b489c6281f7166fb08 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Thu, 21 Nov 2024 17:36:28 +0100 Subject: [PATCH 1/6] replace popup button with material button Signed-off-by: sowjanyakch --- app/src/main/res/layout/activity_conversations.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/activity_conversations.xml b/app/src/main/res/layout/activity_conversations.xml index 7cf3800b6..4e7f1f077 100644 --- a/app/src/main/res/layout/activity_conversations.xml +++ b/app/src/main/res/layout/activity_conversations.xml @@ -251,7 +251,7 @@ app:tint="@color/white" app:backgroundTint="@color/colorPrimary"/> - + app:icon="@drawable/ic_baseline_arrow_downward_24px" + style="@style/Widget.AppTheme.Button.ElevatedButton"/> From c287f1f2fdee2bad29168e1fc90479f1c0eca006 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Thu, 21 Nov 2024 17:49:13 +0100 Subject: [PATCH 2/6] Changes to ConversationsListActivity Signed-off-by: sowjanyakch --- .../conversationlist/ConversationsListActivity.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 6712bbb54..61b3f1c07 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -148,6 +148,7 @@ import java.util.Objects import java.util.concurrent.TimeUnit import javax.inject.Inject +@SuppressLint("StringFormatInvalid") @AutoInjector(NextcloudTalkApplication::class) class ConversationsListActivity : BaseActivity(), @@ -1035,8 +1036,8 @@ class ConversationsListActivity : newFragment.show(supportFragmentManager, FilterConversationFragment.TAG) } - binding.newMentionPopupBubble.hide() - binding.newMentionPopupBubble.setPopupBubbleListener { + binding.newMentionPopupBubble.visibility = View.GONE + binding.newMentionPopupBubble.setOnClickListener { val layoutManager = binding.recyclerView.layoutManager as SmoothScrollLinearLayoutManager? layoutManager?.scrollToPositionWithOffset( nextUnreadConversationScrollPosition, @@ -1058,7 +1059,7 @@ class ConversationsListActivity : searchBehaviorSubject.subscribe { value -> if (value) { nextUnreadConversationScrollPosition = 0 - binding.newMentionPopupBubble.hide() + binding.newMentionPopupBubble.visibility = View.GONE } else { try { val lastVisibleItem = layoutManager!!.findLastCompletelyVisibleItemPosition() @@ -1068,13 +1069,13 @@ class ConversationsListActivity : if (hasUnreadItems(conversation) && position > lastVisibleItem) { nextUnreadConversationScrollPosition = position if (!binding.newMentionPopupBubble.isShown) { - binding.newMentionPopupBubble.show() + binding.newMentionPopupBubble.visibility = View.VISIBLE } return@subscribe } } nextUnreadConversationScrollPosition = 0 - binding.newMentionPopupBubble.hide() + binding.newMentionPopupBubble.visibility = View.GONE } catch (e: NullPointerException) { Log.d( TAG, From 1dd56c0a5be22fca9941b7f3a92f23074c1844b3 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Mon, 23 Dec 2024 17:39:52 +0100 Subject: [PATCH 3/6] hide button when scrolling to unread mention Signed-off-by: sowjanyakch --- .../nextcloud/talk/conversationlist/ConversationsListActivity.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 61b3f1c07..373dc5afe 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -1043,6 +1043,7 @@ class ConversationsListActivity : nextUnreadConversationScrollPosition, binding.recyclerView.height / OFFSET_HEIGHT_DIVIDER ) + binding.newMentionPopupBubble.visibility = View.GONE } binding.newMentionPopupBubble.let { viewThemeUtils.material.colorMaterialButtonPrimaryFilled(it) } } From 9b19423adaed23ec2a08f39bcaa97a2706ebd109 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Mon, 23 Dec 2024 17:47:57 +0100 Subject: [PATCH 4/6] remove popup bubble dependency Signed-off-by: sowjanyakch --- app/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 19f78d23b..d7b3c2b6d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -274,8 +274,6 @@ dependencies { implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido:${fidoVersion}" implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido2:${fidoVersion}" - implementation 'com.github.nextcloud:PopupBubble:2.0.0' - implementation "com.afollestad.material-dialogs:core:${materialDialogsVersion}" implementation "com.afollestad.material-dialogs:datetime:${materialDialogsVersion}" implementation "com.afollestad.material-dialogs:bottomsheets:${materialDialogsVersion}" From 8f64664b74f9396c75cbbebd474ae0bc6e7e0a58 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 23 Dec 2024 16:59:41 +0000 Subject: [PATCH 5/6] Analysis: update lint results to reflect reduced error/warning count Signed-off-by: github-actions --- scripts/analysis/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 048cacf2e..d3922e03f 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 71 errors and 158 warnings + Lint Report: 36 errors and 103 warnings From 27d2cbd2f305c1567fe29bfdaeeff0553f9db25e Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Wed, 8 Jan 2025 17:20:40 +0100 Subject: [PATCH 6/6] add animation to "unread mentions" button + change design Signed-off-by: Marcel Hibbe --- .../ConversationsListActivity.kt | 3 +++ app/src/main/res/anim/popup_animation.xml | 21 +++++++++++++++++++ .../res/layout/activity_conversations.xml | 4 ++-- 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/anim/popup_animation.xml diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 373dc5afe..8bebb0719 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -33,6 +33,7 @@ import android.view.Menu import android.view.MenuItem import android.view.MotionEvent import android.view.View +import android.view.animation.AnimationUtils import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager import android.widget.Toast @@ -1071,6 +1072,8 @@ class ConversationsListActivity : nextUnreadConversationScrollPosition = position if (!binding.newMentionPopupBubble.isShown) { binding.newMentionPopupBubble.visibility = View.VISIBLE + val popupAnimation = AnimationUtils.loadAnimation(this, R.anim.popup_animation) + binding.newMentionPopupBubble.startAnimation(popupAnimation) } return@subscribe } diff --git a/app/src/main/res/anim/popup_animation.xml b/app/src/main/res/anim/popup_animation.xml new file mode 100644 index 000000000..246ce1b11 --- /dev/null +++ b/app/src/main/res/anim/popup_animation.xml @@ -0,0 +1,21 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_conversations.xml b/app/src/main/res/layout/activity_conversations.xml index 4e7f1f077..42206fbc3 100644 --- a/app/src/main/res/layout/activity_conversations.xml +++ b/app/src/main/res/layout/activity_conversations.xml @@ -253,9 +253,8 @@