Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit 6f9ce7f

Browse files
Sam1301timabbott
authored andcommitted
Add (EDITED) tag in message tile.
1 parent 1880726 commit 6f9ce7f

File tree

6 files changed

+25
-2
lines changed

6 files changed

+25
-2
lines changed

app/src/main/java/com/zulip/android/activities/RecyclerMessageAdapter.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import android.graphics.drawable.GradientDrawable;
1010
import android.net.Uri;
1111
import android.support.annotation.ColorInt;
12-
import android.support.annotation.Keep;
1312
import android.support.v4.content.ContextCompat;
1413
import android.support.v4.view.ViewCompat;
1514
import android.support.v7.app.AppCompatDelegate;
@@ -413,6 +412,14 @@ public void onClick(View view) {
413412
messageHolder.messageTile.setBackgroundColor(privateMessageBackground);
414413
}
415414

415+
// set visibility of edited tag
416+
Boolean isEdited = message.isHasBeenEdited();
417+
if (isEdited != null && isEdited) {
418+
messageHolder.edited.setVisibility(View.VISIBLE);
419+
} else {
420+
messageHolder.edited.setVisibility(View.GONE);
421+
}
422+
416423
setUpGravatar(message, messageHolder);
417424
setUpTime(message, messageHolder);
418425
break;

app/src/main/java/com/zulip/android/models/Message.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,10 +689,13 @@ public void updateFromHistory(@NonNull MessageHistory history) {
689689
editDate = history.date;
690690
}
691691

692-
public boolean isHasBeenEdited() {
692+
public Boolean isHasBeenEdited() {
693693
return hasBeenEdited;
694694
}
695695

696+
public void setHasBeenEdited(boolean isEdited) {
697+
this.hasBeenEdited = isEdited;
698+
}
696699

697700
//endregion
698701

app/src/main/java/com/zulip/android/networking/AsyncGetEvents.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,7 @@ private void processUpdateMessages(List<EventsBranch> updateEvents) {
490490
Message message = updateEvent.getMessage();
491491
if (message != null) {
492492
message.setFormattedContent(updateEvent.getFormattedContent());
493+
message.setHasBeenEdited(true);
493494

494495
// update the message in database
495496
Dao<Message, Integer> messageDao = app.getDao(Message.class);

app/src/main/java/com/zulip/android/viewholders/MessageHolder.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public class MessageHolder extends RecyclerView.ViewHolder implements View.OnCli
2121
public ImageView gravatar;
2222
public TextView senderName;
2323
public TextView timestamp;
24+
public TextView edited;
2425
public TextView contentView;
2526
public View leftBar;
2627
public RelativeLayout messageTile;
@@ -33,6 +34,7 @@ public MessageHolder(final View itemView) {
3334
gravatar = (ImageView) itemView.findViewById(R.id.gravatar);
3435
senderName = (TextView) itemView.findViewById(R.id.senderName);
3536
timestamp = (TextView) itemView.findViewById(R.id.timestamp);
37+
edited = (TextView) itemView.findViewById(R.id.message_edit_tag);
3638
contentView = (TextView) itemView.findViewById(R.id.contentView);
3739
contentView.setMovementMethod(LinkMovementMethod.getInstance());
3840
leftBar = itemView.findViewById(R.id.leftBar);

app/src/main/res/layout/message_tile.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@
3838
android:textStyle="bold"
3939
tools:text="Sender &lt;[email protected]&gt;" />
4040

41+
<TextView
42+
android:id="@+id/message_edit_tag"
43+
android:layout_width="wrap_content"
44+
android:layout_height="wrap_content"
45+
android:paddingRight="4dp"
46+
android:text="@string/message_edited_tag"
47+
android:textColor="@color/colorTextTertiary"
48+
android:textSize="12sp"
49+
android:visibility="gone"/>
4150
<TextView
4251
android:id="@+id/timestamp"
4352
android:layout_width="wrap_content"

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,5 @@
138138
<string name="maximum_time_limit_error">Time limit exceeded</string>
139139
<string name="editing_message_disabled">Editing message is disabled</string>
140140
<string name="default_delete_text">(deleted)</string>
141+
<string name="message_edited_tag">(EDITED)</string>
141142
</resources>

0 commit comments

Comments
 (0)