Skip to content

Commit

Permalink
Update support lib version to 27.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
kizitonwose committed Dec 4, 2017
1 parent 2fa73ed commit 9ad674c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 15 deletions.
14 changes: 6 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'

// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -22,16 +22,14 @@ allprojects {


ext {
compileSdkVersion = 26
compileSdkVersion = 27
buildToolsVersion = '26.0.2'

minSdkVersion = 14
targetSdkVersion = 26
versionCode = 5
versionName = '1.0.4'


supportLibraryVersion = '26.1.0'
targetSdkVersion = 27
versionCode = 6
versionName = '1.0.5'
supportLibraryVersion = '27.0.2'
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ private void showColorDialog(final Preference preference) {
View colorView = inflater.inflate(R.layout.dialog_color, null);

int color = PreferenceManager.getDefaultSharedPreferences(getActivity()).getInt(CUSTOM_PICKER_PREF_KEY, Color.YELLOW);
final LobsterPicker lobsterPicker = (LobsterPicker) colorView.findViewById(R.id.lobsterPicker);
LobsterShadeSlider shadeSlider = (LobsterShadeSlider) colorView.findViewById(R.id.shadeSlider);
final LobsterPicker lobsterPicker = colorView.findViewById(R.id.lobsterPicker);
LobsterShadeSlider shadeSlider = colorView.findViewById(R.id.shadeSlider);

lobsterPicker.addDecorator(shadeSlider);
lobsterPicker.setColorHistoryEnabled(true);
Expand Down
1 change: 0 additions & 1 deletion sample/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<item name="colorPrimary">@color/colorPrimaryAlternate</item>
<item name="colorPrimaryDark">@color/colorPrimaryDarkAlternate</item>
<item name="colorAccent">@color/colorAccentAlternate</item>

</style>

<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
Expand Down
8 changes: 4 additions & 4 deletions sample/src/main/res/xml/pref_compat.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">

<android.support.v7.preference.PreferenceCategory android:title="COLORS">
<PreferenceCategory android:title="COLORS">

<com.kizitonwose.colorpreferencecompat.ColorPreferenceCompat
android:defaultValue="@color/colorPrimaryAlternate"
Expand Down Expand Up @@ -45,6 +45,6 @@
app:colorShape="square"
app:viewSize="large" />

</android.support.v7.preference.PreferenceCategory>
</PreferenceCategory>

</android.support.v7.preference.PreferenceScreen>
</PreferenceScreen>

0 comments on commit 9ad674c

Please sign in to comment.