diff --git a/app/app.iml b/app/app.iml index e153ea9..81a46eb 100644 --- a/app/app.iml +++ b/app/app.iml @@ -84,11 +84,11 @@ - + - - - + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 56aa0b8..4a611f9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,13 +3,13 @@ apply plugin: 'com.android.application' project.archivesBaseName = 'OpenLP' android { - compileSdkVersion 21 + compileSdkVersion 22 buildToolsVersion "21.1.2" defaultConfig { applicationId "org.openlp.android2" minSdkVersion 15 - targetSdkVersion 21 + targetSdkVersion 22 versionCode 2 versionName "2.0" } @@ -28,7 +28,7 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:21.0.3' - compile 'com.android.support:support-v4:21.0.3' + compile 'com.android.support:appcompat-v7:22.2.0' + compile 'com.android.support:support-v4:22.2.0' compile 'com.loopj.android:android-async-http:1.4.6' } diff --git a/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java b/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java index f4282cb..6024cf6 100644 --- a/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java @@ -20,6 +20,7 @@ package org.openlp.android2.fragments; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; +import android.os.Build; import android.support.v7.app.ActionBarActivity; import android.app.Activity; import android.support.v7.app.ActionBar; @@ -188,6 +189,11 @@ public class NavigationDrawerFragment extends Fragment { actionBar.setHomeButtonEnabled(true); // OpenLP Blue actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#4d7bd8"))); + getActionBar().setDisplayHomeAsUpEnabled(true); // also required + if (Build.VERSION.SDK_INT >= 18) { + getActionBar().setHomeAsUpIndicator( + getResources().getDrawable(R.drawable.ic_menu_white)); + } // ActionBarDrawerToggle ties together the the proper interactions // between the navigation drawer and the action bar app icon. diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_back.png b/app/src/main/res/drawable-hdpi/ic_arrow_back.png deleted file mode 100644 index 06104d8..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_arrow_back.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_back.png b/app/src/main/res/drawable-mdpi/ic_arrow_back.png deleted file mode 100644 index acb9af9..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_arrow_back.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_refresh.png b/app/src/main/res/drawable-mdpi/ic_refresh.png deleted file mode 100644 index 7891eff..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_refresh.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_back.png b/app/src/main/res/drawable-xhdpi/ic_arrow_back.png deleted file mode 100644 index 8bbc1d1..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_arrow_back.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_refresh.png b/app/src/main/res/drawable-xhdpi/ic_refresh.png deleted file mode 100644 index e44a6d2..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_refresh.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_back.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_back.png deleted file mode 100644 index 7772e50..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_arrow_back.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_refresh.png b/app/src/main/res/drawable-xxhdpi/ic_refresh.png deleted file mode 100644 index edca523..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_refresh.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_search.png b/app/src/main/res/drawable-xxhdpi/ic_search.png deleted file mode 100644 index d8ffedc..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_search.png and /dev/null differ