From 43aaea40c2ffbeb830041383f03bacc352bcceb4 Mon Sep 17 00:00:00 2001 From: Kevin Whitaker Date: Tue, 17 Nov 2015 21:37:49 -0500 Subject: [PATCH] Fix build issues and get basic drawer activity working. --- app/build.gradle | 6 +++++- .../eyecreate/companionformagnatune/BrowseActivity.java | 5 +++-- app/src/main/res/values/styles.xml | 6 +++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c8146af..6d2203a 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 cc5e3a1..913b549 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 766ab99..b5d4e6f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,8 +1,12 @@ - -- GitLab