Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

circles-android
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Contributor analytics
- Model experiments

Snippets Groups Projects

17205366

Commit 17205366 authored 2 years ago by Taras

Downloads
- Plain Diff

Merge branch 'feature/image_reply' into develop

parents 3bd2c62a 25c7be4e

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/build.gradle 1 addition, 1 deletion

app/build.gradle
app/src/main/java/org/futo/circles/core/matrix/room/CreateRoomDataSource.kt 26 additions, 0 deletions

...org/futo/circles/core/matrix/room/CreateRoomDataSource.kt
app/src/main/java/org/futo/circles/extensions/MatrixSessionExtensions.kt 3 additions, 1 deletion

...va/org/futo/circles/extensions/MatrixSessionExtensions.kt
app/src/main/java/org/futo/circles/feature/people/PeopleDataSource.kt 8 additions, 0 deletions

.../java/org/futo/circles/feature/people/PeopleDataSource.kt
app/src/main/java/org/futo/circles/feature/people/PeopleViewModel.kt 4 additions, 0 deletions

...n/java/org/futo/circles/feature/people/PeopleViewModel.kt
app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersDataSource.kt 35 additions, 26 deletions

...ircles/feature/room/select_users/SelectUsersDataSource.kt
app/src/main/java/org/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt 30 additions, 9 deletions

...les/feature/timeline/data_source/SendMessageDataSource.kt
app/src/main/java/org/futo/circles/feature/timeline/data_source/TimelineDataSource.kt 5 additions, 3 deletions

...ircles/feature/timeline/data_source/TimelineDataSource.kt
app/src/main/java/org/futo/circles/mapping/TextPostContentMapping.kt 2 additions, 1 deletion

...n/java/org/futo/circles/mapping/TextPostContentMapping.kt

with 114 additions and 41 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment