diff --git a/app/build.gradle b/app/build.gradle index c8146af9fee5d31a1971f21060be3abef0b9aa06..6d2203ace5cd29c6bf490eb2eed59664fdfcd437 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,5 +27,9 @@ dependencies { compile 'io.realm:realm-android:0.84.1' //Apache 2.0 + RCBL compile 'com.squareup.picasso:picasso:2.5.2' //Apache 2.0 compile 'com.squareup.retrofit:retrofit:2.0.0-beta2' - compile 'com.squareup.retrofit:converter-simplexml:2.0.0-beta2' + compile ('com.squareup.retrofit:converter-simplexml:2.0.0-beta2') { + exclude group: 'xpp3', module: 'xpp3' + exclude group: 'stax', module: 'stax-api' + exclude group: 'stax', module: 'stax' + } } diff --git a/app/src/main/java/com/magnatune/eyecreate/companionformagnatune/BrowseActivity.java b/app/src/main/java/com/magnatune/eyecreate/companionformagnatune/BrowseActivity.java index cc5e3a114462b247bc2d699b9b2519069fb43ff0..913b54984a0ae3c8dba525b004c9283ee2ad7ced 100644 --- a/app/src/main/java/com/magnatune/eyecreate/companionformagnatune/BrowseActivity.java +++ b/app/src/main/java/com/magnatune/eyecreate/companionformagnatune/BrowseActivity.java @@ -1,9 +1,10 @@ package com.magnatune.eyecreate.companionformagnatune; -import android.support.v7.app.ActionBarActivity; import android.os.Bundle; -public class BrowseActivity extends ActionBarActivity { +import com.heinrichreimersoftware.materialdrawer.DrawerActivity; + +public class BrowseActivity extends DrawerActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 766ab9930487aebdf634594950b22d39b44d8125..b5d4e6f4b6983dd23ccefbaae7d7cf9d27512ef0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,8 +1,12 @@ -