Denis Karmyshakov
|
12eb037139
|
Merge remote-tracking branch 'origin/master-kotlin-rxjava2' into update/rxjava2
# Conflicts:
# build.gradle
|
2018-02-20 13:35:42 +03:00 |
maxbach
|
44af99f9cf
|
Fix import (#112)
|
2017-12-28 16:32:09 +03:00 |
|
maxbach
|
8eaa50d891
|
Add to MaterialLoadingBar method setColor (#109)
|
2017-12-28 15:17:42 +03:00 |
Arseniy Borisov
|
426a213a44
|
Updating by payload fixed (#105)
|
2017-11-13 11:58:17 +03:00 |
Anton Domnikov
|
9b58bd49e8
|
rename function
|
2017-10-24 12:18:21 +03:00 |
|
Anton Domnikov
|
35c41d0838
|
deeplinks were added
|
2017-10-23 20:53:42 +03:00 |
|
Anton Domnikov
|
0980101009
|
added function to push view controller with target state not being targetted
|
2017-09-22 20:07:44 +03:00 |
|
Denis Karmyshakov
|
6a6ea0ec08
|
onActivityResult in viewControllers (#95)
|
2017-09-07 13:07:05 +03:00 |
|
Denis Karmyshakov
|
43ad3d62d9
|
Added generic in findViewById (#93)
|
2017-08-28 13:20:55 +03:00 |
|
Denis Karmyshakov
|
3a3f416b8c
|
Fonts in xml (#92)
|
2017-08-23 17:05:46 +03:00 |
Elena Bobkova
|
6d0f74a972
|
fixed on activity result bindings for large files (#89)
|
2017-08-14 15:34:00 +03:00 |
Ilia Kurtov
|
37f5664187
|
static
|
2017-08-09 18:13:53 +03:00 |
|
Ilia Kurtov
|
46d00ffc5f
|
restored setOnRippleClickListener for Action and delete for Consumer
|
2017-08-09 18:13:39 +03:00 |
|
Ilia Kurtov
|
dc94030420
|
Merge branch 'master-rx-java-2' into kotlin/rx-java2-merge
|
2017-08-09 18:00:48 +03:00 |
|
Denis Karmyshakov
|
dd2732c129
|
Function setContentView made final (#82)
setContentView теперь final, чтобы студия не ругалась при вызове этих методов в конструкторе
|
2017-08-01 13:04:10 +03:00 |
Gavriil Sitnikov
|
6faabed582
|
Merge branch 'master' into master-rx-java-2
# Conflicts:
# src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
|
2017-07-31 16:53:18 +03:00 |
|
Gavriil Sitnikov
|
05ce43c6a0
|
untilStop now working fine on samsung showing some activity above
|
2017-07-31 16:37:37 +03:00 |
|
Denis Karmyshakov
|
fda49db855
|
Removed unnecessary setOnRippleClickListener overloads
|
2017-07-31 16:17:33 +03:00 |
|
Gavriil Sitnikov
|
99e1046907
|
Merge branch 'bugs/on_resume_lifecycle_fix' into master-rx-java-2
|
2017-07-31 16:07:16 +03:00 |
|
Gavriil Sitnikov
|
9988d4bc7b
|
Missed onResume call for BaseLifecycleBindable fix
|
2017-07-31 16:06:31 +03:00 |
|
Gavriil Sitnikov
|
de52c32e98
|
Merge branch 'blur_upd' into master-rx-java-2
|
2017-07-28 11:25:27 +03:00 |
|
Gavriil Sitnikov
|
cff3ab4b39
|
Blur recycle fix
|
2017-07-28 11:23:55 +03:00 |
Alexander Bubnov
|
8405c76bf0
|
удалил ненужный this
|
2017-07-25 19:08:59 +03:00 |
|
Alexander Bubnov
|
97c9a7571b
|
Добавил support design библиотеку, добавил в typefactedEditText переопределения метода, для работы с TextInputLayout
|
2017-07-25 18:56:13 +03:00 |
|
Arseniy Borisov
|
70e6b99e79
|
idea formatting
|
2017-07-24 12:33:29 +03:00 |
|
Anton Domnikov
|
00d3433b87
|
Merge branch 'master-rx-java-2' into kotlin_migration
# Conflicts:
# build.gradle
|
2017-07-11 14:30:55 +03:00 |
gorodeckii
|
ffe587a8f5
|
Merge branch 'master' into master-rx-java-2
|
2017-07-05 14:34:05 +03:00 |
|
gorodeckii
|
3cc9baa7ba
|
header comments
|
2017-07-05 14:30:52 +03:00 |
|
gorodeckii
|
838faf8e8c
|
added ColoredUrlSpan
|
2017-07-04 12:35:17 +03:00 |
|
Anton Domnikov
|
a517b16334
|
added ability to push viewcontrollers without adding to back stack
|
2017-06-30 20:39:49 +03:00 |
|
Denis Karmyshakov
|
c32eb4b835
|
Merge fix
|
2017-06-30 19:32:45 +03:00 |
|
Denis Karmyshakov
|
155ad932f6
|
Merge remote-tracking branch 'origin/master' into master-rx-java-2
# Conflicts:
# src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
|
2017-06-30 19:24:57 +03:00 |
|
Denis Karmyshakov
|
2324121e59
|
Optional diff utils use
|
2017-06-30 17:48:57 +03:00 |
|
Alexander Bubnov
|
bb7473e839
|
fix sA
|
2017-06-29 13:22:29 +03:00 |
|
Alexander Bubnov
|
2398b4fc10
|
add maybe support to bindable lifecycle
|
2017-06-29 13:17:58 +03:00 |
|
Ilia Kurtov
|
5be4a5cc3f
|
fixed saved instance state requesting
|
2017-06-26 19:20:12 +03:00 |
gorodeckii
|
9da0e059b5
|
Merge branch 'master' into master-rx-java-2
|
2017-06-09 15:53:48 +03:00 |
|
Anton Domnikov
|
7e17e331de
|
added ability to override default transition
|
2017-06-06 18:48:21 +03:00 |
|
Gavriil Sitnikov
|
8953170dca
|
Merge branch 'feature/general_improvements' into master-rx-java-2
|
2017-06-06 15:08:48 +03:00 |
|
Gavriil Sitnikov
|
e200da88d7
|
Merge branch 'master' into feature/general_improvements
|
2017-06-06 15:08:27 +03:00 |
|
Ilia Kurtov
|
8f55741b50
|
add check for app:textAllCaps
|
2017-06-05 11:24:28 +03:00 |
|
gorodeckii
|
e9f7815ca3
|
fixed imports to rxjava-2 style
|
2017-05-29 12:34:02 +03:00 |
|
gorodeckii
|
e23d9d55b0
|
Merge branch 'feature/general_improvements' into master-rx-java-2
|
2017-05-29 12:21:07 +03:00 |
|
gorodeckii
|
14e70c5ccf
|
pixels to dp util method
|
2017-05-29 12:20:10 +03:00 |
|
Gavriil Sitnikov
|
16624b3657
|
Merge branch 'feature/general_improvements' into master-rx-java-2
|
2017-05-18 16:31:02 +03:00 |
|
Gavriil Sitnikov
|
fb063afb95
|
static fixes
|
2017-05-18 16:30:51 +03:00 |
|
Gavriil Sitnikov
|
660065490d
|
Merge branch 'feature/general_improvements' into master-rx-java-2
|
2017-05-18 15:49:15 +03:00 |
|
Gavriil Sitnikov
|
4c959ee33d
|
lifecycle view callback methods added
|
2017-05-18 15:48:43 +03:00 |
|
Gavriil Sitnikov
|
844cf23f3c
|
lifecycle view added
|
2017-05-18 15:01:00 +03:00 |
|
Alexander Bubnov
|
88113ef0ee
|
add supress
|
2017-05-17 19:06:19 +03:00 |