Commit 10b064c5 authored 1 year ago by Taras

Merge branch 'feature/share_room' into develop

parents d4f1d65c 2742ec34

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/build.gradle 1 addition, 1 deletion

app/build.gradle
app/src/main/AndroidManifest.xml 26 additions, 0 deletions

app/src/main/AndroidManifest.xml
app/src/main/java/org/futo/circles/MainActivity.kt 12 additions, 0 deletions

app/src/main/java/org/futo/circles/MainActivity.kt
app/src/main/java/org/futo/circles/base/Constants.kt 3 additions, 0 deletions

app/src/main/java/org/futo/circles/base/Constants.kt
app/src/main/java/org/futo/circles/feature/circles/CirclesDataSource.kt 22 additions, 18 deletions

...ava/org/futo/circles/feature/circles/CirclesDataSource.kt
app/src/main/java/org/futo/circles/feature/circles/CirclesFragment.kt 5 additions, 10 deletions

.../java/org/futo/circles/feature/circles/CirclesFragment.kt
app/src/main/java/org/futo/circles/feature/circles/CirclesViewModel.kt 1 addition, 1 deletion

...java/org/futo/circles/feature/circles/CirclesViewModel.kt
app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt 2 additions, 1 deletion

...circles/accept_invite/AcceptCircleInviteDialogFragment.kt
app/src/main/java/org/futo/circles/feature/circles/setup/SetupCirclesFragment.kt 3 additions, 2 deletions

...uto/circles/feature/circles/setup/SetupCirclesFragment.kt
app/src/main/java/org/futo/circles/feature/groups/GroupsDataSource.kt 60 additions, 13 deletions

.../java/org/futo/circles/feature/groups/GroupsDataSource.kt
app/src/main/java/org/futo/circles/feature/groups/GroupsFragment.kt 13 additions, 9 deletions

...in/java/org/futo/circles/feature/groups/GroupsFragment.kt
app/src/main/java/org/futo/circles/feature/groups/GroupsViewModel.kt 23 additions, 1 deletion

...n/java/org/futo/circles/feature/groups/GroupsViewModel.kt
app/src/main/java/org/futo/circles/feature/groups/list/GroupViewHolder.kt 28 additions, 0 deletions

...a/org/futo/circles/feature/groups/list/GroupViewHolder.kt
app/src/main/java/org/futo/circles/feature/groups/list/GroupsListAdapter.kt 16 additions, 2 deletions

...org/futo/circles/feature/groups/list/GroupsListAdapter.kt
app/src/main/java/org/futo/circles/feature/home/HomeFragment.kt 54 additions, 3 deletions

...c/main/java/org/futo/circles/feature/home/HomeFragment.kt
app/src/main/java/org/futo/circles/feature/home/HomeViewModel.kt 7 additions, 12 deletions

.../main/java/org/futo/circles/feature/home/HomeViewModel.kt
app/src/main/java/org/futo/circles/feature/notifications/settings/PushNotificationsSettingsDialogFragment.kt 2 additions, 1 deletion

...tions/settings/PushNotificationsSettingsDialogFragment.kt
app/src/main/java/org/futo/circles/feature/people/PeopleDataSource.kt 8 additions, 4 deletions

.../java/org/futo/circles/feature/people/PeopleDataSource.kt
app/src/main/java/org/futo/circles/feature/people/PeopleFragment.kt 2 additions, 1 deletion

...in/java/org/futo/circles/feature/people/PeopleFragment.kt
app/src/main/java/org/futo/circles/feature/people/user/UserDialogFragment.kt 1 addition, 1 deletion

...rg/futo/circles/feature/people/user/UserDialogFragment.kt

with 289 additions and 80 deletions

Please register or to comment