Merge branch 'feature_recent_emojis' into develop
Showing
- app/src/main/java/org/futo/circles/App.kt 2 additions, 0 deletionsapp/src/main/java/org/futo/circles/App.kt
- app/src/main/java/org/futo/circles/feature/circles/CirclesFragment.kt 0 additions, 1 deletion.../java/org/futo/circles/feature/circles/CirclesFragment.kt
- app/src/main/java/org/futo/circles/feature/groups/GroupsFragment.kt 0 additions, 1 deletion...in/java/org/futo/circles/feature/groups/GroupsFragment.kt
- app/src/main/java/org/futo/circles/feature/timeline/TimelineDialogFragment.kt 2 additions, 2 deletions...g/futo/circles/feature/timeline/TimelineDialogFragment.kt
- app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt 7 additions, 8 deletions...o/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
- app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojisTimelineAdapter.kt 25 additions, 0 deletions...cles/feature/timeline/post/emoji/EmojisTimelineAdapter.kt
- app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojisTimelineViewHolder.kt 30 additions, 0 deletions...s/feature/timeline/post/emoji/EmojisTimelineViewHolder.kt
- app/src/main/java/org/futo/circles/feature/timeline/post/emoji/RecentEmojisProvider.kt 35 additions, 0 deletions...rcles/feature/timeline/post/emoji/RecentEmojisProvider.kt
- app/src/main/java/org/futo/circles/view/PostFooterView.kt 15 additions, 37 deletionsapp/src/main/java/org/futo/circles/view/PostFooterView.kt
- app/src/main/res/layout/dialog_fragment_timeline.xml 1 addition, 1 deletionapp/src/main/res/layout/dialog_fragment_timeline.xml
- app/src/main/res/layout/fragment_people.xml 1 addition, 1 deletionapp/src/main/res/layout/fragment_people.xml
- app/src/main/res/layout/list_item_timeline_reaction.xml 17 additions, 0 deletionsapp/src/main/res/layout/list_item_timeline_reaction.xml
- app/src/main/res/layout/view_post_footer.xml 7 additions, 13 deletionsapp/src/main/res/layout/view_post_footer.xml
- core/src/main/java/org/futo/circles/core/model/ReactionsData.kt 5 additions, 1 deletion...rc/main/java/org/futo/circles/core/model/ReactionsData.kt
- core/src/main/java/org/futo/circles/core/view/LoadingRecyclerView.kt 60 additions, 0 deletions...in/java/org/futo/circles/core/view/LoadingRecyclerView.kt
- core/src/main/res/layout/fragment_rooms.xml 3 additions, 3 deletionscore/src/main/res/layout/fragment_rooms.xml
- core/src/main/res/layout/fragment_select_users.xml 1 addition, 1 deletioncore/src/main/res/layout/fragment_select_users.xml
- core/src/main/res/layout/view_loading_recycler.xml 27 additions, 0 deletionscore/src/main/res/layout/view_loading_recycler.xml
Loading
Please register or sign in to comment