filab/message_q
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messaging: Let there be lambdas

Browse Source 
Change-Id: Iee1fc46c92ea9159abb10d92d34baee937bdee0c
This commit is contained in:
Michael W
2024-12-26 14:55:12 +01:00
parent c1b4aa4dfe
commit d43b6ff1c4
84 changed files with 991 additions and 1697 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java
+42 -59
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +20,6 @@ import android.app.Activity;
import android.app.AlertDialog;
import android.app.Fragment;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Resources;
import android.net.Uri;
@@ -118,14 +118,11 @@ public abstract class AbstractConversationListActivity extends BugleActionBarAc
UiUtils.showSnackBarWithCustomAction(this,
getWindow().getDecorView().getRootView(),
getString(R.string.requires_default_sms_app),
SnackBar.Action.createCustomAction(new Runnable() {
@Override
public void run() {
final Intent intent =
UIIntents.get().getChangeDefaultSmsAppIntent(activity);
startActivityForResult(intent, REQUEST_SET_DEFAULT_SMS_APP);
}
},
SnackBar.Action.createCustomAction(() -> {
final Intent intent =
UIIntents.get().getChangeDefaultSmsAppIntent(activity);
startActivityForResult(intent, REQUEST_SET_DEFAULT_SMS_APP);
},
getString(R.string.requires_default_sms_change_button)),
null /* interactions */,
null /* placement */);
@@ -137,18 +134,14 @@ public abstract class AbstractConversationListActivity extends BugleActionBarAc
R.plurals.delete_conversations_confirmation_dialog_title,
conversations.size()))
.setPositiveButton(R.string.delete_conversation_confirmation_button,
new DialogInterface.OnClickListener() {
@Override
public void onClick(final DialogInterface dialog,
final int button) {
for (final SelectedConversation conversation : conversations) {
DeleteConversationAction.deleteConversation(
conversation.conversationId,
conversation.timestamp);
}
exitMultiSelectState();
(dialog, button) -> {
for (final SelectedConversation conversation : conversations) {
DeleteConversationAction.deleteConversation(
conversation.conversationId,
conversation.timestamp);
}
})
exitMultiSelectState();
})
.setNegativeButton(R.string.delete_conversation_decline_button, null)
.show();
}
@@ -167,15 +160,12 @@ public abstract class AbstractConversationListActivity extends BugleActionBarAc
}
}
final Runnable undoRunnable = new Runnable() {
@Override
public void run() {
for (final String conversationId : conversationIds) {
if (isToArchive) {
UpdateConversationArchiveStatusAction.unarchiveConversation(conversationId);
} else {
UpdateConversationArchiveStatusAction.archiveConversation(conversationId);
}
final Runnable undoRunnable = () -> {
for (final String conversationId : conversationIds) {
if (isToArchive) {
UpdateConversationArchiveStatusAction.unarchiveConversation(conversationId);
} else {
UpdateConversationArchiveStatusAction.archiveConversation(conversationId);
}
}
};
@@ -211,36 +201,29 @@ public abstract class AbstractConversationListActivity extends BugleActionBarAc
conversation.otherParticipantNormalizedDestination))
.setMessage(res.getString(R.string.block_confirmation_message))
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(final DialogInterface arg0, final int arg1) {
final Context context = AbstractConversationListActivity.this;
final View listView = findViewById(android.R.id.list);
final List<SnackBarInteraction> interactions =
mConversationListFragment.getSnackBarInteractions();
final UpdateDestinationBlockedAction.UpdateDestinationBlockedActionListener
undoListener =
new UpdateDestinationBlockedActionSnackBar(
context, listView, null /* undoRunnable */,
interactions);
final Runnable undoRunnable = new Runnable() {
@Override
public void run() {
UpdateDestinationBlockedAction.updateDestinationBlocked(
conversation.otherParticipantNormalizedDestination, false,
conversation.conversationId,
undoListener);
}
};
final UpdateDestinationBlockedAction.UpdateDestinationBlockedActionListener
listener = new UpdateDestinationBlockedActionSnackBar(
context, listView, undoRunnable, interactions);
UpdateDestinationBlockedAction.updateDestinationBlocked(
conversation.otherParticipantNormalizedDestination, true,
conversation.conversationId,
listener);
exitMultiSelectState();
}
.setPositiveButton(android.R.string.ok, (arg0, arg1) -> {
final Context context = AbstractConversationListActivity.this;
final View listView = findViewById(android.R.id.list);
final List<SnackBarInteraction> interactions =
mConversationListFragment.getSnackBarInteractions();
final UpdateDestinationBlockedAction.UpdateDestinationBlockedActionListener
undoListener =
new UpdateDestinationBlockedActionSnackBar(
context, listView, null /* undoRunnable */,
interactions);
final Runnable undoRunnable = () ->
UpdateDestinationBlockedAction.updateDestinationBlocked(
conversation.otherParticipantNormalizedDestination, false,
conversation.conversationId,
undoListener);
final UpdateDestinationBlockedAction.UpdateDestinationBlockedActionListener
listener = new UpdateDestinationBlockedActionSnackBar(
context, listView, undoRunnable, interactions);
UpdateDestinationBlockedAction.updateDestinationBlocked(
conversation.otherParticipantNormalizedDestination, true,
conversation.conversationId,
listener);
exitMultiSelectState();
})
.create()
.show();
src/com/android/messaging/ui/conversationlist/ConversationListFragment.java
+5 -13
View File
@@ -35,7 +35,6 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.ViewGroup.MarginLayoutParams;
import android.view.ViewPropertyAnimator;
@@ -229,12 +228,8 @@ public class ConversationListFragment extends Fragment implements ConversationLi
mStartNewConversationButton.setVisibility(View.GONE);
} else {
mStartNewConversationButton.setVisibility(View.VISIBLE);
mStartNewConversationButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(final View clickView) {
mHost.onCreateConversationClick();
}
});
mStartNewConversationButton.setOnClickListener(clickView ->
mHost.onCreateConversationClick());
}
ViewCompat.setTransitionName(mStartNewConversationButton, BugleAnimationTags.TAG_FABICON);
@@ -415,12 +410,9 @@ public class ConversationListFragment extends Fragment implements ConversationLi
}
public ViewPropertyAnimator showFab() {
return getNormalizedFabAnimator().translationX(0).withEndAction(new Runnable() {
@Override
public void run() {
// Re-enable clicks after the animation.
mStartNewConversationButton.setEnabled(true);
}
return getNormalizedFabAnimator().translationX(0).withEndAction(() -> {
// Re-enable clicks after the animation.
mStartNewConversationButton.setEnabled(true);
});
}
src/com/android/messaging/ui/conversationlist/ConversationListItemView.java
+2 -5
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -552,12 +553,8 @@ public class ConversationListItemView extends FrameLayout implements OnClickList
return;
}
UpdateConversationArchiveStatusAction.archiveConversation(conversationId);
final Runnable undoRunnable = new Runnable() {
@Override
public void run() {
final Runnable undoRunnable = () ->
UpdateConversationArchiveStatusAction.unarchiveConversation(conversationId);
}
};
final String message = getResources().getString(R.string.archived_toast_message, 1);
UiUtils.showSnackBar(getContext(), getRootView(), message, undoRunnable,
SnackBar.Action.SNACK_BAR_UNDO,
src/com/android/messaging/ui/conversationlist/ShareIntentFragment.java
+4 -8
View File
@@ -22,7 +22,6 @@ import android.app.AlertDialog.Builder;
import android.app.Dialog;
import android.app.DialogFragment;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.database.Cursor;
import android.os.Bundle;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -92,13 +91,10 @@ public class ShareIntentFragment extends DialogFragment implements ConversationL
final Bundle arguments = getArguments();
if (arguments == null || !arguments.getBoolean(HIDE_NEW_CONVERSATION_BUTTON_KEY)) {
dialogBuilder.setPositiveButton(R.string.share_new_message, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
mDismissed = true;
mHost.onCreateConversationClick();
}
});
dialogBuilder.setPositiveButton(R.string.share_new_message, (dialog, which) -> {
mDismissed = true;
mHost.onCreateConversationClick();
});
}
return dialogBuilder.setNegativeButton(R.string.share_cancel, null)
.create();