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.

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 : Show conversation history - part 2 - display user avatar #235

Merged
merged 25 commits into from
Jul 14, 2021

Conversation

ohassine
Copy link
Member

What's new in this PR?

This PR is a follow up of #233.

  • Support dark mode
  • Display user avatar
Portrait Portrait RTL
Screenshot_20210713-092636_Wire Android Reloaded Screenshot_٢٠٢١٠٧١٣-٠٩٢٧٥٠_Wire Android Reloaded
Landscape
Screenshot_20210713-092655_Wire Android Reloaded
Landscape RTL
Screenshot_٢٠٢١٠٧١٣-٠٩٢٨٠٤_Wire Android Reloaded

ohassine and others added 24 commits July 6, 2021 09:21
…tion_history_part0

# Conflicts:
#	app/src/main/kotlin/com/wire/android/feature/conversation/di/ConversationsModule.kt
#	app/src/main/kotlin/com/wire/android/feature/conversation/list/ui/ConversationListFragment.kt
…tion_history_part1

# Conflicts:
#	app/src/main/kotlin/com/wire/android/feature/conversation/content/ui/ConversationActivity.kt
#	app/src/main/kotlin/com/wire/android/feature/conversation/content/ui/ConversationFragment.kt
#	app/src/main/kotlin/com/wire/android/feature/conversation/di/ConversationsModule.kt
#	app/src/main/kotlin/com/wire/android/feature/conversation/list/ui/ConversationListFragment.kt
#	app/src/main/res/layout/fragment_conversation.xml
#	app/src/main/res/values/styles_textview.xml
…y_part1' into show_conversation_history_part2
…tion_history_part2

# Conflicts:
#	app/src/main/kotlin/com/wire/android/feature/conversation/content/ui/ConversationAdapter.kt
#	app/src/main/kotlin/com/wire/android/feature/conversation/content/ui/ConversationTextMessageViewHolder.kt
#	app/src/main/kotlin/com/wire/android/feature/conversation/di/ConversationsModule.kt
#	app/src/main/res/layout/fragment_conversation.xml
#	app/src/test/kotlin/com/wire/android/feature/conversation/content/datasources/MessageDataSourceTest.kt
#	app/src/test/kotlin/com/wire/android/feature/conversation/content/datasources/local/MessageLocalDataSourceTest.kt
#	app/src/test/kotlin/com/wire/android/feature/conversation/content/ui/ConversationAdapterTest.kt
@ohassine ohassine requested a review from mejdoo July 13, 2021 14:02
@ohassine ohassine merged commit 07b5aaf into main Jul 14, 2021
@ohassine ohassine deleted the show_conversation_history_part2 branch July 14, 2021 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
4 participants