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

🤖 Bring the user straight to the comments reader view #20186

Merged
merged 12 commits into from
Feb 16, 2024
Merged

🤖 Bring the user straight to the comments reader view #20186

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8c83377
Open comments that cannot be moderated in the reader
Feb 14, 2024
2532ec2
Moves logic in the viewModel
Feb 15, 2024
4b0d3a6
Optimise function parameter list
Feb 15, 2024
b75ec32
Replaces static function calls with wrapped objects for testability
Feb 15, 2024
d29cf50
Adds test cases
Feb 15, 2024
47720af
Changed mocked action handler to interface to avoid unneeded code
Feb 15, 2024
7ef7435
Merge branch 'feature/notifications_refresh_p1' into issue/20096-open…
Feb 15, 2024
0c3601e
Fixes broken tests after merge from trunk and feature branch
Feb 15, 2024
b2d02dd
Adds log in the case of post retrieval failure
Feb 16, 2024
d089b05
Opens push notification comment that cannot be moderated directly in …
Feb 16, 2024
339f887
Merge branch 'feature/notifications_refresh_p1' into issue/20096-open…
Feb 16, 2024
ea7ee3b
Updates broken tests after merge
Feb 16, 2024
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
40 changes: 35 additions & 5 deletions WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
import org.wordpress.android.ui.mysite.cards.quickstart.QuickStartRepository;
import org.wordpress.android.ui.notifications.NotificationEvents;
import org.wordpress.android.ui.notifications.NotificationsListFragment;
import org.wordpress.android.ui.notifications.NotificationsListViewModel;
import org.wordpress.android.ui.notifications.SystemNotificationsTracker;
import org.wordpress.android.ui.notifications.adapters.NotesAdapter;
import org.wordpress.android.ui.notifications.receivers.NotificationsPendingDraftsReceiver;
Expand All @@ -127,7 +128,9 @@
import org.wordpress.android.ui.prefs.privacy.banner.PrivacyBannerFragment;
import org.wordpress.android.ui.quickstart.QuickStartMySitePrompts;
import org.wordpress.android.ui.quickstart.QuickStartTracker;
import org.wordpress.android.ui.reader.ReaderActivityLauncher;
import org.wordpress.android.ui.reader.ReaderFragment;
import org.wordpress.android.ui.reader.comments.ThreadedCommentsActionSource;
import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic.UpdateTask;
import org.wordpress.android.ui.reader.services.update.ReaderUpdateServiceStarter;
import org.wordpress.android.ui.reader.tracker.ReaderTracker;
Expand Down Expand Up @@ -190,6 +193,9 @@
import static org.wordpress.android.util.extensions.InAppReviewExtensionsKt.logException;

import dagger.hilt.android.AndroidEntryPoint;
import kotlin.Unit;
import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function3;

/**
* Main activity which hosts sites, reader, me and notifications pages
Expand Down Expand Up @@ -251,6 +257,7 @@ public class WPMainActivity extends LocaleAwareActivity implements
private ModalLayoutPickerViewModel mMLPViewModel;
@NonNull private ReviewViewModel mReviewViewModel;
private BloggingRemindersViewModel mBloggingRemindersViewModel;
private NotificationsListViewModel mNotificationsViewModel;
private FloatingActionButton mFloatingActionButton;
private static final String MAIN_BOTTOM_SHEET_TAG = "MAIN_BOTTOM_SHEET_TAG";
private static final String BLOGGING_REMINDERS_BOTTOM_SHEET_TAG = "BLOGGING_REMINDERS_BOTTOM_SHEET_TAG";
Expand Down Expand Up @@ -1057,11 +1064,34 @@ public void onTokenInvalid() {
// we processed the voice reply, so we exit this function immediately
return;
} else {
boolean shouldShowKeyboard =
getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_REPLY_EXTRA, false);
NotificationsListFragment
.openNoteForReply(this, noteId, shouldShowKeyboard, null,
NotesAdapter.FILTERS.FILTER_ALL, true);
if (mNotificationsViewModel == null) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added the initialisation here since the initViewModel() has not been called in this flow

mNotificationsViewModel = new ViewModelProvider(this).get(NotificationsListViewModel.class);
}
mNotificationsViewModel.openNote(noteId, new Function3<Long, Long, Long, Unit>() {
@Nullable @Override
public Unit invoke(@NonNull Long siteId, @NonNull Long postId,
@NonNull Long commentId) {
ReaderActivityLauncher.showReaderComments(
WPMainActivity.this,
siteId,
postId,
commentId,
ThreadedCommentsActionSource.COMMENT_NOTIFICATION.getSourceDescription()
);
return null;
}
}, new Function0<Unit>() {
@Nullable @Override
public Unit invoke() {
boolean shouldShowKeyboard = getIntent().getBooleanExtra(
NotificationsListFragment.NOTE_INSTANT_REPLY_EXTRA,
false);
NotificationsListFragment.openNoteForReply(WPMainActivity.this, noteId,
shouldShowKeyboard, null, NotesAdapter.FILTERS.FILTER_ALL, true);
return null;
}
}
);
}
} else {
AppLog.e(T.NOTIFS, "app launched from a PN that doesn't have a note_id in it!!");
Expand Down
31 changes: 24 additions & 7 deletions ...ess/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ import org.wordpress.android.ui.notifications.adapters.NotesAdapter.DataLoadedLi
import org.wordpress.android.ui.notifications.adapters.NotesAdapter.FILTERS
import org.wordpress.android.ui.notifications.services.NotificationsUpdateServiceStarter
import org.wordpress.android.ui.notifications.utils.NotificationsActions
import org.wordpress.android.ui.reader.ReaderActivityLauncher
import org.wordpress.android.ui.reader.comments.ThreadedCommentsActionSource
import org.wordpress.android.util.AniUtils
import org.wordpress.android.util.AppLog
import org.wordpress.android.util.AppLog.T
Expand Down Expand Up @@ -232,9 +234,24 @@ class NotificationsListFragmentPage : ViewPagerFragment(R.layout.notifications_l
}
incrementInteractions(APP_REVIEWS_EVENT_INCREMENTED_BY_CHECKING_NOTIFICATION)

// Open the latest version of this note in case it has changed, which can happen if the note was tapped
// from the list after it was updated by another fragment (such as NotificationsDetailListFragment).
openNoteForReply(activity, noteId, false, null, notesAdapter.currentFilter, false)
viewModel.openNote(
noteId,
{ siteId, postId, commentId ->
ReaderActivityLauncher.showReaderComments(
activity,
siteId,
postId,
commentId,
ThreadedCommentsActionSource.COMMENT_NOTIFICATION.sourceDescription
)
},
{
// Open the latest version of this note in case it has changed, which can happen if the note was
// tapped from the list after it was updated by another fragment (such as the
// NotificationsDetailListFragment).
openNoteForReply(activity, noteId, filter = notesAdapter.currentFilter)
}
)
}
}
private val mOnScrollListener: OnScrollListener = object : OnScrollListener() {
Expand Down Expand Up @@ -515,10 +532,10 @@ class NotificationsListFragmentPage : ViewPagerFragment(R.layout.notifications_l
fun openNoteForReply(
activity: Activity?,
noteId: String?,
shouldShowKeyboard: Boolean,
replyText: String?,
filter: FILTERS?,
isTappedFromPushNotification: Boolean
shouldShowKeyboard: Boolean = false,
replyText: String? = null,
filter: FILTERS? = null,
isTappedFromPushNotification: Boolean = false,
) {
if (noteId == null || activity == null || activity.isFinishing) {
return
Expand Down
40 changes: 40 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.flow.MutableSharedFlow
import org.greenrobot.eventbus.EventBus
import org.wordpress.android.datasets.NotificationsTable
import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
import org.wordpress.android.fluxc.model.SiteModel
import org.wordpress.android.fluxc.store.CommentsStore
import org.wordpress.android.fluxc.store.SiteStore
import org.wordpress.android.fluxc.utils.AppLogWrapper
import org.wordpress.android.models.Note
import org.wordpress.android.models.Notification.PostNotification
import org.wordpress.android.modules.BG_THREAD
Expand All @@ -19,7 +21,11 @@ import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalOverlayUtil
import org.wordpress.android.ui.jetpackoverlay.JetpackOverlayConnectedFeature.NOTIFICATIONS
import org.wordpress.android.ui.notifications.NotificationEvents.NotificationsChanged
import org.wordpress.android.ui.notifications.utils.NotificationsActions
import org.wordpress.android.ui.notifications.utils.NotificationsUtilsWrapper
import org.wordpress.android.ui.prefs.AppPrefsWrapper
import org.wordpress.android.ui.reader.actions.ReaderActions
import org.wordpress.android.ui.reader.actions.ReaderPostActionsWrapper
import org.wordpress.android.util.AppLog
import org.wordpress.android.viewmodel.Event
import org.wordpress.android.viewmodel.ScopedViewModel
import javax.inject.Inject
Expand All @@ -31,6 +37,10 @@ class NotificationsListViewModel @Inject constructor(
private val appPrefsWrapper: AppPrefsWrapper,
private val jetpackFeatureRemovalOverlayUtil: JetpackFeatureRemovalOverlayUtil,
private val gcmMessageHandler: GCMMessageHandler,
private val notificationsUtilsWrapper: NotificationsUtilsWrapper,
private val readerPostTableWrapper: ReaderPostTableWrapper,
private val readerPostActionsWrapper: ReaderPostActionsWrapper,
private val appLogWrapper: AppLogWrapper,
private val siteStore: SiteStore,
private val commentStore: CommentsStore
) : ScopedViewModel(bgDispatcher) {
Expand Down Expand Up @@ -91,6 +101,36 @@ class NotificationsListViewModel @Inject constructor(
}
}

fun openNote(
noteId: String?,
openInTheReader: (siteId: Long, postId: Long, commentId: Long) -> Unit,
openDetailView: () -> Unit
) {
val note = noteId?.let { notificationsUtilsWrapper.getNoteById(noteId) }
if (note != null && note.isCommentType && !note.canModerate()) {
val readerPost = readerPostTableWrapper.getBlogPost(note.siteId.toLong(), note.postId.toLong(), false)
if (readerPost != null) {
openInTheReader(note.siteId.toLong(), note.postId.toLong(), note.commentId)
} else {
readerPostActionsWrapper.requestBlogPost(
note.siteId.toLong(),
note.postId.toLong(),
object : ReaderActions.OnRequestListener<String> {
override fun onSuccess(result: String?) {
openInTheReader(note.siteId.toLong(), note.postId.toLong(), note.commentId)
}

override fun onFailure(statusCode: Int) {
appLogWrapper.w(AppLog.T.NOTIFS, "Failed to fetch post for comment: $statusCode")
openDetailView()
mkevins marked this conversation as resolved.
Show resolved Hide resolved
}
})
}
} else {
openDetailView()
}
}

sealed class InlineActionEvent {
data class SharePostButtonTapped(val notification: PostNotification) : InlineActionEvent()
class LikeCommentButtonTapped(val note: Note, val liked: Boolean) : InlineActionEvent()
Expand Down
Loading
Loading