Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix support appcompat-v7:23.1.1 #133

Open
wants to merge 1 commit into
base: holo
Choose a base branch
from
Open

fix support appcompat-v7:23.1.1 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions demo/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
}
Expand Down
8 changes: 4 additions & 4 deletions library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/eu/inmite/android/lib/dialogs/BaseDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/res/values/sdl__attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<declare-styleable name="DialogStyle">
<attr name="dialogBackground" format="reference" />
<attr name="titleTextColor" format="color|reference" />
<attr name="titleDialogTextColor" format="color|reference" />
<attr name="titleSeparatorColor" format="color|reference" />
<attr name="messageTextColor" format="color|reference" />
<attr name="buttonTextColor" format="color|reference" />
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/res/values/sdl__theme.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<style name="DialogStyleLight">
<item name="dialogBackground">@drawable/sdl_background_light</item>
<item name="titleTextColor">@color/sdl_title_text_light</item>
<item name="titleDialogTextColor">@color/sdl_title_text_light</item>
<item name="titleSeparatorColor">@color/sdl_title_separator_light</item>
<item name="messageTextColor">@color/sdl_message_text_light</item>
<item name="buttonTextColor">@color/sdl_button_text_light</item>
Expand Down