gorodeckii
|
e847fcedc5
|
unused import
|
2017-05-12 20:30:35 +03:00 |
Gavriil Sitnikov
|
a2b69d64a1
|
Merge branch 'feature/general_improvements' into master-rx-java-2
# Conflicts:
# build.gradle
# src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
# src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
|
2017-05-12 19:45:37 +03:00 |
|
Gavriil Sitnikov
|
14ec33956f
|
delegates refactored a bit
|
2017-05-12 19:30:19 +03:00 |
|
Gavriil
|
45c5898f56
|
Merge pull request #60 from TouchInstinct/feature/invalidate_options_menu
added ability to turn off menu invalidation
|
2017-05-12 17:07:11 +03:00 |
Oleg
|
2d79078d8b
|
rxjava version
|
2017-05-10 21:18:51 +03:00 |
|
Gavriil
|
fb0df85d3c
|
Merge pull request #62 from TouchInstinct/fix/static_fix
static fix
|
2017-05-05 17:03:08 +03:00 |
Elena Bobkova
|
bf089b8fad
|
added comment to empty method body
|
2017-05-05 16:54:10 +03:00 |
|
Arhipov
|
38f8a8018e
|
Merge branch 'master' into master-rx-java-2
|
2017-05-04 14:05:06 +03:00 |
Anton Domnikov
|
9ee8aaddca
|
update build tools version
|
2017-05-04 13:15:12 +03:00 |
|
Gavriil
|
2964bb5453
|
Merge pull request #61 from TouchInstinct/fix/buildToolsUpdate
build Tools Update
|
2017-05-03 22:34:32 +03:00 |
|
Elena Bobkova
|
d60d596902
|
build Tools Update
|
2017-05-03 22:28:50 +03:00 |
|
Anton Domnikov
|
30001c0f78
|
Merge branch 'feature/invalidate_options_menu' into feature/general_improvements
# Conflicts:
# src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
|
2017-05-03 17:27:10 +03:00 |
|
Anton Domnikov
|
fe22c49ed0
|
added comment
|
2017-05-03 17:21:22 +03:00 |
|
Anton Domnikov
|
3f2cf0d70b
|
added ability to turn off menu invalidation
|
2017-05-03 17:13:10 +03:00 |
|
gorodeckii
|
5d0847370d
|
rxjava version
|
2017-05-03 09:26:52 +03:00 |
|
Arhipov
|
d8ca0e610b
|
merge continued
|
2017-04-26 16:27:30 +03:00 |
|
Arhipov
|
e2d584b5f7
|
Merge branch 'master' into master-rx-java-2
# Conflicts:
# src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
|
2017-04-26 16:26:41 +03:00 |
|
Oleg
|
d456ce34b1
|
small fix
|
2017-04-26 15:49:27 +03:00 |
|
Oleg
|
e242ca909a
|
rxjava 1.2.10
|
2017-04-26 15:49:05 +03:00 |
|
Gavriil
|
a4d0bdf6b0
|
Merge pull request #59 from TouchInstinct/observable_collection_adapter_fix
made onBindItemToViewHolder not abstract
|
2017-04-26 15:43:13 +03:00 |
|
Arhipov
|
4f1fa1c164
|
made onBindItemToViewHolder not abstract
|
2017-04-26 15:41:45 +03:00 |
|
Gavriil Sitnikov
|
5f13aefa84
|
viewcontroller null fixed
|
2017-04-21 00:31:26 +03:00 |
|
Gavriil Sitnikov
|
949025a106
|
static fixes
|
2017-04-21 00:10:41 +03:00 |
|
Gavriil Sitnikov
|
a4a0e0d4b8
|
Merge branch 'feature/general_improvements' into master-rx-java-2
# Conflicts:
# src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
# src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
# src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
# src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
# src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
|
2017-04-20 19:54:12 +03:00 |
|
Gavriil Sitnikov
|
008b9f0b6b
|
adapter delegate logic finished
|
2017-04-20 18:26:49 +03:00 |
|
Gavriil Sitnikov
|
68f7c73ff9
|
started empty value crash fix
|
2017-04-19 19:09:34 +03:00 |
Alexander Bubnov
|
8925e5083e
|
small updates
|
2017-04-18 21:54:57 +03:00 |
|
Gavriil Sitnikov
|
415f5c7d76
|
adapter delegate logic added
|
2017-04-18 17:14:58 +03:00 |
|
Gavriil Sitnikov
|
d20dd6daa4
|
crash nullable getValue fix
|
2017-04-17 21:05:20 +03:00 |
|
Gavriil Sitnikov
|
fd68f1ffd4
|
RxJava2 migration
|
2017-04-17 03:11:46 +03:00 |
|
Gavriil Sitnikov
|
0e06e1a9ac
|
untilStop now subscribing also until onSaveInstanceState to prevent navigation crashes after onSaveInstanceState but before onStop
|
2017-04-17 00:24:46 +03:00 |
|
Gavriil Sitnikov
|
2c4121bf14
|
rxjava 1.2.9 fixes
|
2017-04-17 00:12:18 +03:00 |
|
Gavriil
|
710bb184b9
|
Merge pull request #58 from TouchInstinct/phone_span_gfix
warning of PhoneSpan fixed
|
2017-04-08 22:47:13 +03:00 |
|
Gavriil Sitnikov
|
6840b3df74
|
warning of PhoneSpan fixed
|
2017-04-08 22:43:26 +03:00 |
|
Gavriil
|
93bb01e179
|
Merge pull request #57 from TouchInstinct/feature/blur
Feature/blur
|
2017-04-06 18:09:14 +03:00 |
Ilia Kurtov
|
8c82b9768b
|
cr fix
|
2017-04-06 18:00:31 +03:00 |
|
Ilia Kurtov
|
e2021c35ab
|
static
|
2017-04-06 17:20:24 +03:00 |
|
Ilia Kurtov
|
5da88cc7da
|
no message
|
2017-04-06 16:35:42 +03:00 |
|
Gavriil
|
127476c2b0
|
Merge pull request #56 from TouchInstinct/small_fix
small fix
|
2017-03-28 14:23:51 +03:00 |
|
Alexander Bubnov
|
ffcc6bb244
|
important fix
|
2017-03-28 14:21:58 +03:00 |
|
Alexander Bubnov
|
800a15fba6
|
call onErrorAction
|
2017-03-28 14:07:53 +03:00 |
|
Alexander Bubnov
|
44a6e79c09
|
small fix
|
2017-03-28 13:58:08 +03:00 |
|
Gavriil
|
52a9b563c0
|
Merge pull request #55 from TouchInstinct/small_updates
update support libs and small refactoring "until" method
|
2017-03-28 12:02:41 +03:00 |
|
Alexander Bubnov
|
3ee58a52b9
|
update support libs and small refactoring "until" method
|
2017-03-28 10:40:20 +03:00 |
|
Gavriil
|
6883a7bf4d
|
Merge pull request #54 from TouchInstinct/feature/singles-and-completables
Feature/singles and completables
|
2017-03-23 18:53:48 +03:00 |
Ilia Kurtov
|
6d561612a2
|
code review fixes
|
2017-03-23 18:28:22 +03:00 |
|
Ilia Kurtov
|
882adb87a0
|
Merge branch 'master' into feature/singles-and-completables
|
2017-03-22 21:21:48 +03:00 |
|
Ilia Kurtov
|
031648451f
|
static
|
2017-03-22 21:21:31 +03:00 |
|
Ilia Kurtov
|
a135d5ac16
|
new methods for BaseLifecycleBindable
|
2017-03-22 20:36:08 +03:00 |
|
Ilia Kurtov
|
7cda509e82
|
added singles and completables to LifecycleBindab
|
2017-03-22 20:03:19 +03:00 |