cleanups
@ -84,11 +84,11 @@
|
|||||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
|
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
|
|
||||||
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
|
|
||||||
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
|
|
||||||
<orderEntry type="library" exported="" name="android-async-http-1.4.6" level="project" />
|
<orderEntry type="library" exported="" name="android-async-http-1.4.6" level="project" />
|
||||||
|
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
|
||||||
|
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
|
||||||
|
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
@ -3,13 +3,13 @@ apply plugin: 'com.android.application'
|
|||||||
project.archivesBaseName = 'OpenLP'
|
project.archivesBaseName = 'OpenLP'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 21
|
compileSdkVersion 22
|
||||||
buildToolsVersion "21.1.2"
|
buildToolsVersion "21.1.2"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "org.openlp.android2"
|
applicationId "org.openlp.android2"
|
||||||
minSdkVersion 15
|
minSdkVersion 15
|
||||||
targetSdkVersion 21
|
targetSdkVersion 22
|
||||||
versionCode 2
|
versionCode 2
|
||||||
versionName "2.0"
|
versionName "2.0"
|
||||||
}
|
}
|
||||||
@ -28,7 +28,7 @@ android {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(include: ['*.jar'], dir: 'libs')
|
compile fileTree(include: ['*.jar'], dir: 'libs')
|
||||||
compile 'com.android.support:appcompat-v7:21.0.3'
|
compile 'com.android.support:appcompat-v7:22.2.0'
|
||||||
compile 'com.android.support:support-v4:21.0.3'
|
compile 'com.android.support:support-v4:22.2.0'
|
||||||
compile 'com.loopj.android:android-async-http:1.4.6'
|
compile 'com.loopj.android:android-async-http:1.4.6'
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,7 @@ package org.openlp.android2.fragments;
|
|||||||
|
|
||||||
import android.graphics.Color;
|
import android.graphics.Color;
|
||||||
import android.graphics.drawable.ColorDrawable;
|
import android.graphics.drawable.ColorDrawable;
|
||||||
|
import android.os.Build;
|
||||||
import android.support.v7.app.ActionBarActivity;
|
import android.support.v7.app.ActionBarActivity;
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.support.v7.app.ActionBar;
|
import android.support.v7.app.ActionBar;
|
||||||
@ -188,6 +189,11 @@ public class NavigationDrawerFragment extends Fragment {
|
|||||||
actionBar.setHomeButtonEnabled(true);
|
actionBar.setHomeButtonEnabled(true);
|
||||||
// OpenLP Blue
|
// OpenLP Blue
|
||||||
actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#4d7bd8")));
|
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
|
// ActionBarDrawerToggle ties together the the proper interactions
|
||||||
// between the navigation drawer and the action bar app icon.
|
// between the navigation drawer and the action bar app icon.
|
||||||
|
Before Width: | Height: | Size: 425 B |
Before Width: | Height: | Size: 336 B |
Before Width: | Height: | Size: 644 B |
Before Width: | Height: | Size: 532 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 721 B |
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 1.7 KiB |