From 5b05beead4564135015bf236212cd67b535f7e0c Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 27 Jan 2016 16:33:27 +0800 Subject: [PATCH] fix support appcompat-v7:23.1.1 --- demo/build.gradle | 6 +++--- library/build.gradle | 8 ++++---- .../eu/inmite/android/lib/dialogs/BaseDialogFragment.java | 2 +- library/src/main/res/values/sdl__attrs.xml | 2 +- library/src/main/res/values/sdl__theme.xml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/demo/build.gradle b/demo/build.gradle index dc643c6..712978d 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 21 - buildToolsVersion "20" + compileSdkVersion 23 + buildToolsVersion "23.0.2" defaultConfig { minSdkVersion 7 - targetSdkVersion 21 + targetSdkVersion 23 versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) } diff --git a/library/build.gradle b/library/build.gradle index 621c18f..14f65cb 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -5,19 +5,19 @@ repositories { } android { - compileSdkVersion 21 - buildToolsVersion "20" + compileSdkVersion 23 + buildToolsVersion "23.0.2" defaultConfig { minSdkVersion 7 - targetSdkVersion 21 + targetSdkVersion 23 versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) } } dependencies { - compile 'com.android.support:support-v4:21.0.3' + compile 'com.android.support:appcompat-v7:23.1.1' } // Used to push in maven diff --git a/library/src/main/java/eu/inmite/android/lib/dialogs/BaseDialogFragment.java b/library/src/main/java/eu/inmite/android/lib/dialogs/BaseDialogFragment.java index 06012dc..13c76a3 100644 --- a/library/src/main/java/eu/inmite/android/lib/dialogs/BaseDialogFragment.java +++ b/library/src/main/java/eu/inmite/android/lib/dialogs/BaseDialogFragment.java @@ -330,7 +330,7 @@ public View create() { .obtainStyledAttributes(null, R.styleable.DialogStyle, R.attr.sdlDialogStyle, 0); mTitleTextColor = a - .getColor(R.styleable.DialogStyle_titleTextColor, defaultTitleTextColor); + .getColor(R.styleable.DialogStyle_titleDialogTextColor, defaultTitleTextColor); mTitleSeparatorColor = a.getColor(R.styleable.DialogStyle_titleSeparatorColor, defaultTitleSeparatorColor); mMessageTextColor = a diff --git a/library/src/main/res/values/sdl__attrs.xml b/library/src/main/res/values/sdl__attrs.xml index 8d6b2ae..27dd1d1 100644 --- a/library/src/main/res/values/sdl__attrs.xml +++ b/library/src/main/res/values/sdl__attrs.xml @@ -9,7 +9,7 @@ - + diff --git a/library/src/main/res/values/sdl__theme.xml b/library/src/main/res/values/sdl__theme.xml index bb5400c..aecbde2 100644 --- a/library/src/main/res/values/sdl__theme.xml +++ b/library/src/main/res/values/sdl__theme.xml @@ -39,7 +39,7 @@