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

47840de6

Commit 47840de6 authored 2 years ago by Taras

Downloads
- Plain Diff

Merge branch 'user' into develop

parents e36c523c b7bccfa7

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/futo/circles/di/DataSourceModule.kt 2 additions, 0 deletions

app/src/main/java/com/futo/circles/di/DataSourceModule.kt
app/src/main/java/com/futo/circles/di/UiModule.kt 4 additions, 0 deletions

app/src/main/java/com/futo/circles/di/UiModule.kt
app/src/main/java/com/futo/circles/feature/people/PeopleFragment.kt 2 additions, 1 deletion

...in/java/com/futo/circles/feature/people/PeopleFragment.kt
app/src/main/java/com/futo/circles/feature/people/user/UserDataSource.kt 46 additions, 0 deletions

...va/com/futo/circles/feature/people/user/UserDataSource.kt
app/src/main/java/com/futo/circles/feature/people/user/UserFragment.kt 69 additions, 0 deletions

...java/com/futo/circles/feature/people/user/UserFragment.kt
app/src/main/java/com/futo/circles/feature/people/user/UserViewModel.kt 11 additions, 0 deletions

...ava/com/futo/circles/feature/people/user/UserViewModel.kt
app/src/main/java/com/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt 25 additions, 0 deletions

...circles/feature/people/user/list/UsersCircleViewHolder.kt
app/src/main/java/com/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt 20 additions, 0 deletions

...o/circles/feature/people/user/list/UsersCirclesAdapter.kt
app/src/main/res/layout/user_fragment.xml 100 additions, 0 deletions

app/src/main/res/layout/user_fragment.xml
app/src/main/res/navigation/people_nav_graph.xml 25 additions, 1 deletion

app/src/main/res/navigation/people_nav_graph.xml
app/src/main/res/values/strings.xml 2 additions, 1 deletion

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

with 306 additions and 3 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