Commit Graph

484 Commits

Author SHA1 Message Date
gorodeckii ffe587a8f5 Merge branch 'master' into master-rx-java-2 2017-07-05 14:34:05 +03:00
Gavriil 2d8a203bd2 Merge pull request #73 from TouchInstinct/feature/colored_url_span
added ColoredUrlSpan
2017-07-05 14:33: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
Gavriil aee975833a Merge pull request #72 from TouchInstinct/feature/diff_utils_to_master
Optional diff utils use
2017-06-30 18:03:08 +03:00
Denis Karmyshakov 2324121e59 Optional diff utils use 2017-06-30 17:48:57 +03:00
Gavriil dfc7615187 Merge pull request #71 from TouchInstinct/master-rx-java-2-maybe
add maybe support to bindable lifecycle
2017-06-29 16:15:48 +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
Gavriil f2dea8e377 Merge pull request #67 from TouchInstinct/bugs/save-insance-state
fixed saved instance state requesting
2017-06-26 19:22:33 +03:00
Ilia Kurtov 5be4a5cc3f fixed saved instance state requesting 2017-06-26 19:20:12 +03:00
Anton Domnikov 6faf786ba4 Merge branch 'master-rx-java-2' into kotlin_migration 2017-06-23 13:33:04 +03:00
Alexander Bubnov d3bcd89743 update rxJava2 to 2.1.1 2017-06-21 17:05:02 +03:00
Anton Domnikov 540e573888 revert retrolambda 2017-06-19 18:23:27 +03:00
Anton Domnikov 06f9b1d2cc remove retrolambda 2017-06-14 17:51:06 +03:00
gorodeckii 9da0e059b5 Merge branch 'master' into master-rx-java-2 2017-06-09 15:53:48 +03:00
Gavriil 221920bca0 Merge pull request #66 from TouchInstinct/noinspection_OldTargetApi
noinspection OldTargetApi
2017-06-09 15:43:14 +03:00
Anton Domnikov 28eb9c92a1 remove targetSdkVersion 2017-06-09 15:41:21 +03:00
Anton Domnikov 9180021ad6 noinspection OldTargetApi 2017-06-09 15:36:50 +03:00
Gavriil 2bf275cd13 Merge pull request #65 from TouchInstinct/feature/default_transition
added ability to override default transition
2017-06-06 19:34:01 +03:00
Anton Domnikov 7e17e331de added ability to override default transition 2017-06-06 18:48:21 +03:00
Gavriil 904a12268b Merge pull request #64 from TouchInstinct/feature/general_improvements
Feature/general improvements
2017-06-06 16:00:55 +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
Gavriil 5de5ef3754 Merge pull request #63 from TouchInstinct/bugs/typefaced-text-new-check
add check for app:textAllCaps
2017-06-05 12:26:21 +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
Alexander Bubnov c57f30aca1 fix wrong import 2017-05-17 19:00:46 +03:00
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