Commit 28a604d5 authored 1 year ago by Taras

Merge branch 'feature/unknow_user_invite' into develop

parents e23fb73c 27ab573a

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/org/futo/circles/MainActivity.kt 0 additions, 5 deletions

app/src/main/java/org/futo/circles/MainActivity.kt
app/src/main/java/org/futo/circles/feature/circles/CirclesDataSource.kt 17 additions, 19 deletions

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

.../java/org/futo/circles/feature/circles/CirclesFragment.kt
app/src/main/java/org/futo/circles/feature/circles/CirclesViewModel.kt 7 additions, 2 deletions

...java/org/futo/circles/feature/circles/CirclesViewModel.kt
app/src/main/java/org/futo/circles/feature/circles/list/CirclesListAdapter.kt 5 additions, 1 deletion

...g/futo/circles/feature/circles/list/CirclesListAdapter.kt
app/src/main/java/org/futo/circles/feature/circles/list/CirclesViewHolder.kt 10 additions, 8 deletions

...rg/futo/circles/feature/circles/list/CirclesViewHolder.kt
app/src/main/java/org/futo/circles/feature/groups/GroupsDataSource.kt 17 additions, 19 deletions

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

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

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

...a/org/futo/circles/feature/groups/list/GroupViewHolder.kt
app/src/main/java/org/futo/circles/feature/groups/list/GroupsListAdapter.kt 5 additions, 1 deletion

...org/futo/circles/feature/groups/list/GroupsListAdapter.kt
app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt 0 additions, 4 deletions

...ava/org/futo/circles/feature/settings/SettingsFragment.kt
app/src/main/java/org/futo/circles/feature/settings/SettingsViewModel.kt 0 additions, 8 deletions

...va/org/futo/circles/feature/settings/SettingsViewModel.kt
app/src/main/java/org/futo/circles/mapping/RoomSummaryMapping.kt 6 additions, 4 deletions

.../main/java/org/futo/circles/mapping/RoomSummaryMapping.kt
app/src/main/java/org/futo/circles/model/CircleListItem.kt 1 addition, 0 deletions

app/src/main/java/org/futo/circles/model/CircleListItem.kt
app/src/main/java/org/futo/circles/model/GroupListItem.kt 2 additions, 1 deletion

app/src/main/java/org/futo/circles/model/GroupListItem.kt
app/src/main/java/org/futo/circles/view/PostLayout.kt 1 addition, 1 deletion

app/src/main/java/org/futo/circles/view/PostLayout.kt
app/src/main/res/layout/fragment_settings.xml 2 additions, 8 deletions

app/src/main/res/layout/fragment_settings.xml
app/src/main/res/layout/list_item_invited_circle.xml 17 additions, 0 deletions

app/src/main/res/layout/list_item_invited_circle.xml
app/src/main/res/layout/list_item_invited_group.xml 17 additions, 3 deletions

app/src/main/res/layout/list_item_invited_group.xml

with 138 additions and 97 deletions

Please register or to comment