TouchInstinct
/
android-templates
301
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/general_improvements' into master-rx-java-2 

# Conflicts:
#	build.gradle
#	src/main/java/ru/touchin/templates/TouchinApp.java
This commit is contained in:
Gavriil Sitnikov 2017-05-12 19:33:14 +03:00
parent 317bcce28e 6203b9a7cf
commit 7b12898a76
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -25,6 +25,7 @@ dependencies {
compile 'net.danlew:android.joda:2.9.9'
compile 'com.android.support:multidex:1.0.1'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
compile 'io.reactivex.rxjava2:rxjava:2.1.0'

2
src/main/java/ru/touchin/templates/TouchinApp.java
View File

@ -43,6 +43,7 @@ import io.reactivex.android.plugins.RxAndroidPlugins;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.disposables.Disposables;
import ru.touchin.roboswag.components.adapters.ObservableCollectionAdapter;
import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment;
import ru.touchin.roboswag.components.utils.UiUtils;
import ru.touchin.roboswag.components.views.TypefacedEditText;
@ -83,6 +84,7 @@ public abstract class TouchinApp extends Application {
JodaTimeAndroid.init(this);
if (isDebug()) {
enableStrictMode();
ObservableCollectionAdapter.setInDebugMode();
ViewControllerFragment.setInDebugMode();
TypefacedEditText.setInDebugMode();
TypefacedTextView.setInDebugMode();