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

Feature/edit messages #3608

Merged
merged 28 commits into from
Feb 19, 2024
Merged

Feature/edit messages #3608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d8d1de2
Checking Edit Capability
sowjanyakch Jan 19, 2024
337f07a
Basic Edit feature
sowjanyakch Jan 24, 2024
33de105
Edit inputText view refactoring
sowjanyakch Jan 25, 2024
2b24c69
System Messages and Error handling
sowjanyakch Jan 30, 2024
cc87196
layout - edit message view
sowjanyakch Jan 31, 2024
253c3fe
Update Edit Message
sowjanyakch Feb 1, 2024
6db4211
add (edited) tag in incoming and outgoing messages layout
sowjanyakch Feb 1, 2024
0e13c1f
Merge branch 'master' into feature/edit_messages
sowjanyakch Feb 2, 2024
96a2444
Checking Edit Capability
sowjanyakch Jan 19, 2024
5ecfd3c
Basic Edit feature
sowjanyakch Jan 24, 2024
718369d
Edit inputText view refactoring
sowjanyakch Jan 25, 2024
80c8432
System Messages and Error handling
sowjanyakch Jan 30, 2024
7d4abf1
layout - edit message view
sowjanyakch Jan 31, 2024
eb27b70
Update Edit Message
sowjanyakch Feb 1, 2024
426c882
add (edited) tag in incoming and outgoing messages layout
sowjanyakch Feb 1, 2024
d27c7a6
UI improvements
sowjanyakch Feb 5, 2024
6a0f23c
Merge remote-tracking branch 'origin/feature/edit_messages' into feat…
sowjanyakch Feb 5, 2024
716a1f9
Merge branch 'master' into feature/edit_messages
sowjanyakch Feb 6, 2024
683f924
Add editor name and message timestamp to MessageActionsDialog
sowjanyakch Feb 9, 2024
a67be70
Add editor name and message timestamp to MessageActionsDialog
sowjanyakch Feb 9, 2024
4e4cb26
fix to update adapter for "edited messages" by system message
mahibi Feb 9, 2024
6708aee
fix to show message as edited after editing on own device
mahibi Feb 9, 2024
8789edb
Merge remote-tracking branch 'origin/feature/edit_messages' into feat…
sowjanyakch Feb 10, 2024
8d4c0fb
Minor UI improvements
sowjanyakch Feb 13, 2024
861b565
Added date to editor details and changes related to design.
sowjanyakch Feb 14, 2024
4e9f62e
Added content description for ImageView.
sowjanyakch Feb 14, 2024
9a4bf14
Merge remote-tracking branch 'origin/master' into feature/edit_messages
mahibi Feb 16, 2024
f64bd87
Merge remote-tracking branch 'origin/master' into feature/edit_messages
mahibi Feb 19, 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
9 changes: 7 additions & 2 deletions app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
sharedApplication!!.componentApplication.inject(this)

setAvatarAndAuthorOnMessageItem(message)

colorizeMessageBubble(message)

itemView.isSelected = false
Expand Down Expand Up @@ -114,7 +113,13 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
binding.messageText.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
binding.messageText.text = processedMessageText

binding.messageTime.text = dateUtils.getLocalTimeStringFromTimestamp(message.timestamp)
if (message.lastEditTimestamp != 0L && !message.isDeleted) {
binding.messageEditIndicator.visibility = View.VISIBLE
binding.messageTime.text = dateUtils.getLocalTimeStringFromTimestamp(message.lastEditTimestamp)
} else {
binding.messageEditIndicator.visibility = View.GONE
binding.messageTime.text = dateUtils.getLocalTimeStringFromTimestamp(message.timestamp)
}

// parent message handling
if (!message.isDeleted && message.parentMessage != null) {
Expand Down
8 changes: 7 additions & 1 deletion app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,13 @@ class OutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessageViewH
viewThemeUtils.platform.colorTextView(binding.messageText, ColorRole.ON_SURFACE_VARIANT)
binding.messageText.text = processedMessageText

binding.messageTime.text = dateUtils.getLocalTimeStringFromTimestamp(message.timestamp)
if (message.lastEditTimestamp != 0L && !message.isDeleted) {
binding.messageEditIndicator.visibility = View.VISIBLE
binding.messageTime.text = dateUtils.getLocalTimeStringFromTimestamp(message.lastEditTimestamp)
} else {
binding.messageEditIndicator.visibility = View.GONE
binding.messageTime.text = dateUtils.getLocalTimeStringFromTimestamp(message.timestamp)
}

// parent message handling
if (!message.isDeleted && message.parentMessage != null) {
Expand Down
24 changes: 15 additions & 9 deletions app/src/main/java/com/nextcloud/talk/api/NcApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,8 @@ Observable<GenericOverall> setPassword(@Header("Authorization") String authoriza
@FormUrlEncoded
@PUT
Observable<Response<GenericOverall>> setPassword2(@Header("Authorization") String authorization,
@Url String url,
@Field("password") String password);
@Url String url,
@Field("password") String password);

@GET
Observable<CapabilitiesOverall> getCapabilities(@Header("Authorization") String authorization, @Url String url);
Expand Down Expand Up @@ -393,6 +393,12 @@ Observable<GenericOverall> sendChatMessage(@Header("Authorization") String autho
@Field("replyTo") Integer replyTo,
@Field("silent") Boolean sendWithoutNotification);

@FormUrlEncoded
@PUT
Observable<ChatOverallSingleMessage> editChatMessage(@Header("Authorization") String authorization,
@Url String url,
@Field("message") String message);

@GET
Observable<Response<ChatShareOverall>> getSharedItems(
@Header("Authorization") String authorization,
Expand Down Expand Up @@ -463,8 +469,8 @@ Observable<GenericOverall> setReadStatusPrivacy(@Header("Authorization") String

@POST
Observable<GenericOverall> setTypingStatusPrivacy(@Header("Authorization") String authorization,
@Url String url,
@Body RequestBody body);
@Url String url,
@Body RequestBody body);

@POST
Observable<ContactsByNumberOverall> searchContactsByPhoneNumber(@Header("Authorization") String authorization,
Expand Down Expand Up @@ -504,8 +510,8 @@ Observable<GenericOverall> uploadAvatar(@Header("Authorization") String authoriz
@Multipart
@POST
Observable<RoomOverall> uploadConversationAvatar(@Header("Authorization") String authorization,
@Url String url,
@Part MultipartBody.Part attachment);
@Url String url,
@Part MultipartBody.Part attachment);

@GET
Observable<UserProfileFieldsOverall> getEditableUserProfileFields(@Header("Authorization") String authorization,
Expand Down Expand Up @@ -698,6 +704,6 @@ Observable<ReminderOverall> setReminder(@Header("Authorization") String authoriz
@FormUrlEncoded
@PUT
Observable<GenericOverall> setRecordingConsent(@Header("Authorization") String authorization,
@Url String url,
@Field("recordingConsent") int recordingConsent);
}
@Url String url,
@Field("recordingConsent") int recordingConsent);
}
Loading
Loading