Commit c25bb19fce157dfe6c4b61fc93afd614a1ec8c84
1 parent
7f095a9298
Exists in
master
and in
1 other branch
SonLT fix bug multiDexEnabled
Showing 4 changed files with 8 additions and 4 deletions Side-by-side Diff
.idea/.name
1 | -lifelogpedometer |
.idea/modules.xml
... | ... | @@ -3,6 +3,7 @@ |
3 | 3 | <component name="ProjectModuleManager"> |
4 | 4 | <modules> |
5 | 5 | <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> |
6 | + <module fileurl="file://$PROJECT_DIR$/lifelog_android.iml" filepath="$PROJECT_DIR$/lifelog_android.iml" /> | |
6 | 7 | <module fileurl="file://$PROJECT_DIR$/lifelogpedometer.iml" filepath="$PROJECT_DIR$/lifelogpedometer.iml" /> |
7 | 8 | </modules> |
8 | 9 | </component> |
app/build.gradle
... | ... | @@ -61,9 +61,6 @@ |
61 | 61 | |
62 | 62 | // Retrofit |
63 | 63 | // JSON Parsing |
64 | - compile 'com.android.support.constraint:constraint-layout:1.0.2' | |
65 | - compile 'com.squareup.retrofit2:converter-gson:2.1.0' | |
66 | - compile 'com.android.support.constraint:constraint-layout:1.0.2' | |
67 | 64 | compile 'com.squareup.retrofit2:converter-gson:2.1.0' |
68 | 65 | compile 'com.android.support:appcompat-v7:25.3.1' |
69 | 66 | compile 'com.github.j4velin.colorpicker:colorpicker:1.2.3' |
app/src/main/java/com/dinhcv/lifelogpedometer/LifeLogApplication.java
... | ... | @@ -2,6 +2,7 @@ |
2 | 2 | |
3 | 3 | import android.app.Application; |
4 | 4 | import android.content.Context; |
5 | +import android.support.multidex.MultiDex; | |
5 | 6 | import android.webkit.WebView; |
6 | 7 | |
7 | 8 | import com.dinhcv.lifelogpedometer.model.DummyData; |
... | ... | @@ -18,6 +19,12 @@ |
18 | 19 | public List<SelectItemInfo> mSexList; |
19 | 20 | public List<SelectItemInfo> mProvinceList; |
20 | 21 | public static Context context; |
22 | + | |
23 | + @Override | |
24 | + protected void attachBaseContext(Context base) { | |
25 | + super.attachBaseContext(base); | |
26 | + MultiDex.install(this); | |
27 | + } | |
21 | 28 | |
22 | 29 | @Override |
23 | 30 | public void onCreate() { |