diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 7811e7b..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -lifelogpedometer \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index a326949..a6e86a8 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index a32268a..2f03cb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -61,9 +61,6 @@ dependencies { // Retrofit // JSON Parsing - compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'com.squareup.retrofit2:converter-gson:2.1.0' - compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'com.squareup.retrofit2:converter-gson:2.1.0' compile 'com.android.support:appcompat-v7:25.3.1' compile 'com.github.j4velin.colorpicker:colorpicker:1.2.3' diff --git a/app/src/main/java/com/dinhcv/lifelogpedometer/LifeLogApplication.java b/app/src/main/java/com/dinhcv/lifelogpedometer/LifeLogApplication.java index 7d65a95..6bf3ee4 100644 --- a/app/src/main/java/com/dinhcv/lifelogpedometer/LifeLogApplication.java +++ b/app/src/main/java/com/dinhcv/lifelogpedometer/LifeLogApplication.java @@ -2,6 +2,7 @@ package com.dinhcv.lifelogpedometer; import android.app.Application; import android.content.Context; +import android.support.multidex.MultiDex; import android.webkit.WebView; import com.dinhcv.lifelogpedometer.model.DummyData; @@ -20,6 +21,12 @@ public class LifeLogApplication extends Application { public static Context context; @Override + protected void attachBaseContext(Context base) { + super.attachBaseContext(base); + MultiDex.install(this); + } + + @Override public void onCreate() { super.onCreate();