-
- Downloads
Merge branch 'development' into 'FE-904_search_2_feature'
# Conflicts: # app/src/main/java/io/xxlabs/messenger/search/UserSearchFragment.kt
No related branches found
No related tags found
Showing
- app/src/main/AndroidManifest.xml 10 additions, 3 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/io/xxlabs/messenger/notifications/MessagingService.kt 2 additions, 3 deletions...ava/io/xxlabs/messenger/notifications/MessagingService.kt
- app/src/main/java/io/xxlabs/messenger/repository/client/ClientRepository.kt 15 additions, 2 deletions...io/xxlabs/messenger/repository/client/ClientRepository.kt
- app/src/main/java/io/xxlabs/messenger/search/FactSearchFragment.kt 14 additions, 8 deletions...ain/java/io/xxlabs/messenger/search/FactSearchFragment.kt
- app/src/main/java/io/xxlabs/messenger/search/UserSearchFragment.kt 10 additions, 0 deletions...ain/java/io/xxlabs/messenger/search/UserSearchFragment.kt
- app/src/main/java/io/xxlabs/messenger/search/UserSearchViewModel.kt 54 additions, 20 deletions...in/java/io/xxlabs/messenger/search/UserSearchViewModel.kt
- app/src/main/java/io/xxlabs/messenger/ui/intro/splash/SplashScreenPlaceholderActivity.kt 25 additions, 3 deletions...senger/ui/intro/splash/SplashScreenPlaceholderActivity.kt
- app/src/main/java/io/xxlabs/messenger/ui/main/MainActivity.kt 81 additions, 13 deletions...src/main/java/io/xxlabs/messenger/ui/main/MainActivity.kt
- app/src/main/java/io/xxlabs/messenger/ui/main/MainViewModel.kt 5 additions, 0 deletions...rc/main/java/io/xxlabs/messenger/ui/main/MainViewModel.kt
- app/src/main/res/drawable/ic_connections.xml 31 additions, 0 deletionsapp/src/main/res/drawable/ic_connections.xml
- app/src/main/res/drawable/ic_dashboard_24px.xml 10 additions, 0 deletionsapp/src/main/res/drawable/ic_dashboard_24px.xml
- app/src/main/res/drawable/ic_qr_squared.xml 2 additions, 2 deletionsapp/src/main/res/drawable/ic_qr_squared.xml
- app/src/main/res/drawable/ic_requests.xml 9 additions, 0 deletionsapp/src/main/res/drawable/ic_requests.xml
- app/src/main/res/drawable/ic_share.xml 12 additions, 0 deletionsapp/src/main/res/drawable/ic_share.xml
- app/src/main/res/layout/activity_main.xml 52 additions, 9 deletionsapp/src/main/res/layout/activity_main.xml
- app/src/main/res/layout/component_menu.xml 33 additions, 8 deletionsapp/src/main/res/layout/component_menu.xml
- app/src/main/res/navigation/nav_main.xml 14 additions, 0 deletionsapp/src/main/res/navigation/nav_main.xml
- app/src/main/res/values/colors.xml 1 addition, 1 deletionapp/src/main/res/values/colors.xml
- app/src/main/res/values/strings.xml 11 additions, 0 deletionsapp/src/main/res/values/strings.xml
Loading
Please register or sign in to comment