Commit 1211858e authored 3 years ago by Taras

Merge branch 'feature/groups' into develop

parents 49fa19bd 839bbbb6

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/build.gradle 5 additions, 2 deletions

app/build.gradle
app/src/main/java/com/futo/circles/base/BaseRecyclerView.kt 46 additions, 0 deletions

app/src/main/java/com/futo/circles/base/BaseRecyclerView.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/extensions/FragmentExtensions.kt 12 additions, 2 deletions

...in/java/com/futo/circles/extensions/FragmentExtensions.kt
app/src/main/java/com/futo/circles/extensions/ImageViewExtensions.kt 20 additions, 0 deletions

...n/java/com/futo/circles/extensions/ImageViewExtensions.kt
app/src/main/java/com/futo/circles/extensions/LiveDataExtensions.kt 8 additions, 0 deletions

...in/java/com/futo/circles/extensions/LiveDataExtensions.kt
app/src/main/java/com/futo/circles/extensions/MatrixRoomExtensions.kt 9 additions, 0 deletions

.../java/com/futo/circles/extensions/MatrixRoomExtensions.kt
app/src/main/java/com/futo/circles/extensions/RecyclerViewExtensions.kt 8 additions, 0 deletions

...ava/com/futo/circles/extensions/RecyclerViewExtensions.kt
app/src/main/java/com/futo/circles/ui/bottom_navigation/BottomNavigationFragment.kt 4 additions, 2 deletions

.../circles/ui/bottom_navigation/BottomNavigationFragment.kt
app/src/main/java/com/futo/circles/ui/groups/GroupsFragment.kt 47 additions, 1 deletion

...rc/main/java/com/futo/circles/ui/groups/GroupsFragment.kt
app/src/main/java/com/futo/circles/ui/groups/GroupsViewModel.kt 18 additions, 0 deletions

...c/main/java/com/futo/circles/ui/groups/GroupsViewModel.kt
app/src/main/java/com/futo/circles/ui/groups/list/GroupViewHolder.kt 58 additions, 0 deletions

...n/java/com/futo/circles/ui/groups/list/GroupViewHolder.kt
app/src/main/java/com/futo/circles/ui/groups/list/GroupsListAdapter.kt 26 additions, 0 deletions

...java/com/futo/circles/ui/groups/list/GroupsListAdapter.kt
app/src/main/java/com/futo/circles/ui/groups/timeline/GroupTimelineFragment.kt 26 additions, 0 deletions

.../futo/circles/ui/groups/timeline/GroupTimelineFragment.kt
app/src/main/java/com/futo/circles/ui/groups/timeline/GroupTimelineViewModel.kt 17 additions, 0 deletions

...futo/circles/ui/groups/timeline/GroupTimelineViewModel.kt
app/src/main/java/com/futo/circles/ui/log_in/LogInFragment.kt 1 addition, 1 deletion

...src/main/java/com/futo/circles/ui/log_in/LogInFragment.kt
app/src/main/java/com/futo/circles/utils/Constants.kt 3 additions, 0 deletions

app/src/main/java/com/futo/circles/utils/Constants.kt
app/src/main/res/drawable/ic_circles.xml 10 additions, 0 deletions

app/src/main/res/drawable/ic_circles.xml
app/src/main/res/drawable/ic_lock.xml 9 additions, 0 deletions

app/src/main/res/drawable/ic_lock.xml
app/src/main/res/drawable/ic_lock_open.xml 9 additions, 0 deletions

app/src/main/res/drawable/ic_lock_open.xml

with 340 additions and 8 deletions

Please register or to comment