Commits · v0.0.0.156_19 · Confidential and Proprietary / NYNJA / Android

11 Apr, 2018 18 commits
- Merge branch 'alpha' into dev · f3dc7693
  Max Chervaiuk authored Apr 11, 2018
```
# Conflicts:
#	app/build.gradle
```
  f3dc7693
- Merge remote-tracking branch 'origin/AN-229' into dev · 0113db62
  Max Chervaiuk authored Apr 11, 2018
  
  0113db62
- AN-229 changed circle avatar placeholders · eff0cfcb
  Max Chervaiuk authored Apr 11, 2018
  
  eff0cfcb
- AN-228 changed avatar image · 1188890b
  Max Chervaiuk authored Apr 11, 2018
  
  1188890b
- Merge remote-tracking branch 'origin/AN-199' into dev · 57400ce3
  Max Chervaiuk authored Apr 11, 2018
  
  57400ce3
- Merge remote-tracking branch 'origin/AN-215' into dev · 8da9b0b2
  Max Chervaiuk authored Apr 11, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/ui/activities/HomeActivity.java
```
  8da9b0b2
- refactoring · dd24e665
  Max Chervaiuk authored Apr 11, 2018
  
  dd24e665
- Merge remote-tracking branch 'origin/#1856' into dev · 74522ad8
  Max Chervaiuk authored Apr 11, 2018
  
  74522ad8
- #1856 fix for third wheel crop, minor refactoring of wheel cells · 12fa18ee
  Roman Voronoy authored Apr 11, 2018
  
  12fa18ee
- #1856 fix for third wheel crop, minor refactoring of wheel cells · ffe3b088
  Roman Voronoy authored Apr 11, 2018
  
  ffe3b088
- AN-215 Fixed navigation to chat from push notification · fe443ac0
  Alexey Shishov authored Apr 11, 2018
  
  fe443ac0
- #1856 · bf7c3c88
  Rusakov.Sergii.Dev authored Apr 11, 2018
  
  bf7c3c88
- Merge remote-tracking branch 'origin/AN-214' into dev · 3372851e
  Max Chervaiuk authored Apr 11, 2018
  
  3372851e
- AN-214 Fixed crash after open chat with push notifications · b4e5b227
  Alexey Shishov authored Apr 11, 2018
  
  b4e5b227
- #1856 · 7aaf8e7b
  Rusakov.Sergii.Dev authored Apr 11, 2018
  
  7aaf8e7b
- AN-209 Fixed crash after navigate to the screen of starred messages · 3c97639c
  Alexey Shishov authored Apr 11, 2018
  
  3c97639c
- #1856 · 9c7a840b
  Rusakov.Sergii.Dev authored Apr 11, 2018
```
 - merge with dev and add BG branch code
```
  9c7a840b
- Merge branch 'dev' into #1856 · 70689fdc
  Rusakov.Sergii.Dev authored Apr 11, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/data/DataManager.java
#	app/src/main/java/com/nynja/mobile/communicator/ui/views/CascadeWheel.java
#	app/src/main/java/com/nynja/mobile/communicator/ui/wheel/Wheel.java
```
  70689fdc
10 Apr, 2018 16 commits
- Merge remote-tracking branch 'origin/AN-193' into dev · 42d69ff6
  Max Chervaiuk authored Apr 10, 2018
  
  42d69ff6
- updated place holder, · a39556db
  Max Chervaiuk authored Apr 10, 2018
```
refactoring
```
  a39556db
- AN-193 Fixed bug with padding on theme and wheel position screens · af3c08fc
  Alexey Shishov authored Apr 10, 2018
  
  af3c08fc
- Merge remote-tracking branch 'origin/AN-208' into dev · 3bbba5c9
  Max Chervaiuk authored Apr 10, 2018
  
  3bbba5c9
- Merge remote-tracking branch 'origin/AN-117' into dev · f7f6e31d
  Max Chervaiuk authored Apr 10, 2018
  
  f7f6e31d
- #AN-117 · 01dbdb36
  Roman Voronoy authored Apr 10, 2018
```
fix for bottom icon BG size, fix for keyboard dismiss
```
  01dbdb36
- #1856 · 6c968779
  Rusakov.Sergii.Dev authored Apr 10, 2018
```
 - pr review
```
  6c968779
- change app version. · 9be8df3c
  Dmitro Boiko authored Apr 10, 2018
  
  9be8df3c
- AN-208 Fixed bug with alert dialog · 2f7a1a2e
  Alexey Shishov authored Apr 10, 2018
  
  2f7a1a2e
- AN-207 · 07dfb0d2
  Rusakov.Sergii.Dev authored Apr 10, 2018
```
 - fix string resource
```
  07dfb0d2
- fixed save member from extended star · 59ff7881
  Stas Safyanov authored Apr 10, 2018
  
  59ff7881
- AN-199 fixed transcribed UI · cc295295
  Stas Safyanov authored Apr 10, 2018
  
  cc295295
- #AN-119 added paddings · a3b7b949
  Roman Voronoy authored Apr 10, 2018
  
  a3b7b949
- UI during record changed · 8d213c58
  Roman Voronoy authored Apr 10, 2018
  
  8d213c58
- Merge branches 'AN-117' and 'dev' of https://github.com/NYNJA-MC/Android into AN-117 · 6388cf77
  Roman Voronoy authored Apr 10, 2018
  
  6388cf77
- Merge branch 'dev' into AN-199 · 68cf14bf
  Stas Safyanov authored Apr 10, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/ui/activities/ReplyActivity.java
#	app/src/main/java/com/nynja/mobile/communicator/ui/adapters/ChatAdapter.java
#	app/src/main/java/com/nynja/mobile/communicator/ui/adapters/ReplyAdapter.java
#	app/src/main/java/com/nynja/mobile/communicator/ui/adapters/viewholders/chat/ChatAudioMessageVh.kt
#	app/src/main/java/com/nynja/mobile/communicator/ui/adapters/viewholders/chat/ChatMyAudioMessageVh.kt
#	app/src/main/java/com/nynja/mobile/communicator/ui/adapters/viewholders/chat/ChatOtherLocationMessageVh.kt
```
  68cf14bf
06 Apr, 2018 6 commits
- AN-199 added transcribe UI · a778124b
  Stas Safyanov authored Apr 06, 2018
  
  a778124b
- add new Auth · f6ccd090
  Dmitro Boiko authored Apr 06, 2018
  
  f6ccd090
- changed app version 0.0.0.156_18 · 1172b2f2
  Max Chervaiuk authored Apr 06, 2018
  
  1172b2f2
- AN-199 refactoring chat bubbles · f6ba6e08
  Stas Safyanov authored Apr 06, 2018
  
  f6ba6e08
- Merge remote-tracking branch 'origin/#AudioManagerRefactor' into dev · b35495bc
  Max Chervaiuk authored Apr 06, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/data/DataManager.java
#	app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ChatPresenter.java
#	app/src/main/java/com/nynja/mobile/communicator/ui/fragments/chats/ChatFragment.java
```
  b35495bc
- Merge remote-tracking branch 'origin/AN-84' into dev · f4869667
  Max Chervaiuk authored Apr 06, 2018
  
  f4869667