Commit Graph

29 Commits

Author SHA1 Message Date
Arseniy Borisov 426a213a44 Updating by payload fixed (#105) 2017-11-13 11:58:17 +03:00
Arseniy Borisov 70e6b99e79 idea formatting 2017-07-24 12:33:29 +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 88113ef0ee add supress 2017-05-17 19:06:19 +03:00
Alexander Bubnov c57f30aca1 fix wrong import 2017-05-17 19:00:46 +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
Elena Bobkova bf089b8fad added comment to empty method body 2017-05-05 16:54:10 +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
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
Arhipov 4f1fa1c164 made onBindItemToViewHolder not abstract 2017-04-26 15:41:45 +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
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 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
Arseniy Borisov 79e391aeee fix static 2017-02-21 15:03:11 +03:00
Gavriil Sitnikov 959c055655 static fixes 2017-02-21 12:51:54 +03:00
Gavriil Sitnikov 0974d1de28 a bit fix of 'adapter' field accessing 2017-01-09 16:33:07 +03:00
Gavriil Sitnikov d440c09a4b bindable view holder bug fixed 2016-12-22 17:09:21 +03:00
Ilia Kurtov f43bd0c6e3 get String with arguments 2016-11-09 14:46:41 +03:00
Ilia Kurtov db07f8766b add get string to adapter's view holder 2016-11-09 14:42:49 +03:00
Gavriil Sitnikov 8a094680fb release merged into master 2016-10-10 17:23:15 +03:00