Skip to content

Commit ba93485

Browse files
committed
Merge branch 'master' of github.com:skydoves/ColorPickerView
2 parents f21d5c9 + 8e4bb50 commit ba93485

File tree

6 files changed

+28
-35
lines changed

6 files changed

+28
-35
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Supports alpha & brightness slider bar, dialog, and saving & restoring selected
77
<br>
88

99
<p align="center">
10+
<a href="https://devlibrary.withgoogle.com/products/android/repos/skydoves-colorpickerview"><img alt="Google" src="https://skydoves.github.io/badges/google-devlib.svg"/></a><br>
1011
<a href="https://opensource.org/licenses/Apache-2.0"><img alt="License" src="https://img.shields.io/badge/License-Apache%202.0-blue.svg"/></a>
1112
<a href="https://android-arsenal.com/api?level=15"><img alt="API" src="https://img.shields.io/badge/API-15%2B-brightgreen.svg?style=flat"/></a>
1213
<a href="https://github.com/skydoves/ColorPickerView/actions"><img alt="Build Status" src="https://github.com/skydoves/ColorPickerView/workflows/Android%20CI/badge.svg"/></a>
13-
<a href="https://www.codacy.com/app/skydoves/ColorPickerView?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=skydoves/ColorPickerView&amp;utm_campaign=Badge_Grade"><img alt="Codacy" src="https://api.codacy.com/project/badge/Grade/e5d06ece54644717845a059f90632660"/></a>
1414
<a href="https://androidweekly.net/issues/issue-316"><img alt="Android Weekly" src="https://skydoves.github.io/badges/android-weekly.svg"/></a>
1515
<a href="https://skydoves.github.io/libraries/colorpickerview/javadoc/"><img alt="Javadoc" src="https://skydoves.github.io/badges/javadoc-colorpicker.svg"/></a>
1616
</p> <br>

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ android {
2626
versionName versions.versionName
2727
}
2828
compileOptions {
29-
sourceCompatibility JavaVersion.VERSION_1_8
30-
targetCompatibility JavaVersion.VERSION_1_8
29+
sourceCompatibility JavaVersion.VERSION_11
30+
targetCompatibility JavaVersion.VERSION_11
3131
}
3232
}
3333

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
android:supportsRtl="true"
1414
android:theme="@style/AppTheme"
1515
tools:ignore="AllowBackup,GoogleAppIndexingWarning">
16-
<activity android:name=".MainActivity">
16+
<activity
17+
android:name=".MainActivity"
18+
android:exported="true">
1719
<intent-filter>
1820
<action android:name="android.intent.action.MAIN" />
1921
<category android:name="android.intent.category.LAUNCHER" />

colorpickerview/src/main/java/com/skydoves/colorpickerview/ColorPickerView.java

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,11 @@ private void onFinishInflated() {
236236
final int persisted = preferenceManager.getColor(getPreferenceName(), -1);
237237
if (palette.getDrawable() instanceof ColorHsvPalette && persisted != -1) {
238238
post(
239-
new Runnable() {
240-
@Override
241-
public void run() {
242-
try {
243-
selectByHsvColor(persisted);
244-
} catch (IllegalAccessException e) {
245-
e.printStackTrace();
246-
}
239+
() -> {
240+
try {
241+
selectByHsvColor(persisted);
242+
} catch (IllegalAccessException e) {
243+
e.printStackTrace();
247244
}
248245
});
249246
}
@@ -339,12 +336,9 @@ public boolean isHuePalette() {
339336
private void notifyColorChanged() {
340337
this.debounceHandler.removeCallbacksAndMessages(null);
341338
Runnable debounceRunnable =
342-
new Runnable() {
343-
@Override
344-
public void run() {
345-
fireColorListener(getColor(), true);
346-
notifyToFlagView(selectedPoint);
347-
}
339+
() -> {
340+
fireColorListener(getColor(), true);
341+
notifyToFlagView(selectedPoint);
348342
};
349343
this.debounceHandler.postDelayed(debounceRunnable, this.debounceDuration);
350344
}
@@ -471,19 +465,17 @@ private void notifyToFlagView(Point point) {
471465
flagView.setRotation(0);
472466
flagView.setX(posX);
473467
flagView.setY(centerPoint.y - flagView.getHeight());
474-
flagView.onRefresh(getColorEnvelope());
475468
} else {
476469
flagView.setRotation(180);
477470
flagView.setX(posX);
478471
flagView.setY(centerPoint.y + flagView.getHeight() - selector.getHeight() * 0.5f);
479-
flagView.onRefresh(getColorEnvelope());
480472
}
481473
} else {
482474
flagView.setRotation(0);
483475
flagView.setX(posX);
484476
flagView.setY(centerPoint.y - flagView.getHeight());
485-
flagView.onRefresh(getColorEnvelope());
486477
}
478+
flagView.onRefresh(getColorEnvelope());
487479
if (posX < 0) flagView.setX(0);
488480
if (posX + flagView.getMeasuredWidth() > getMeasuredWidth()) {
489481
flagView.setX(getMeasuredWidth() - flagView.getMeasuredWidth());
@@ -592,6 +584,7 @@ public void setDebounceDuration(long debounceDuration) {
592584
private Point getCenterPoint(int x, int y) {
593585
return new Point(x - (selector.getMeasuredWidth() / 2), y - (selector.getMeasuredHeight() / 2));
594586
}
587+
595588
/**
596589
* gets a selector.
597590
*
@@ -600,6 +593,7 @@ private Point getCenterPoint(int x, int y) {
600593
public ImageView getSelector() {
601594
return this.selector;
602595
}
596+
603597
/**
604598
* gets a selector's selected coordinate x.
605599
*
@@ -681,14 +675,11 @@ public void setInitialColor(@ColorInt final int color) {
681675
|| (getPreferenceName() != null
682676
&& preferenceManager.getColor(getPreferenceName(), -1) == -1)) {
683677
post(
684-
new Runnable() {
685-
@Override
686-
public void run() {
687-
try {
688-
selectByHsvColor(color);
689-
} catch (IllegalAccessException e) {
690-
e.printStackTrace();
691-
}
678+
() -> {
679+
try {
680+
selectByHsvColor(color);
681+
} catch (IllegalAccessException e) {
682+
e.printStackTrace();
692683
}
693684
});
694685
}
@@ -961,7 +952,7 @@ public void onDestroy() {
961952

962953
/** Builder class for create {@link ColorPickerView}. */
963954
public static class Builder {
964-
private Context context;
955+
private final Context context;
965956
private ColorPickerViewListener colorPickerViewListener;
966957
private int debounceDuration = 0;
967958
private FlagView flagView;

dependencies.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
ext.versions = [
1616
minSdk : 15,
17-
compileSdk : 30,
17+
compileSdk : 31,
1818
versionoCode : 28,
1919
versionName : '2.2.4',
2020

21-
gradleBuildTool : '4.1.3',
22-
spotlessGradle : '5.12.4',
23-
ktlintGradle : '0.40.0',
21+
gradleBuildTool : '7.0.2',
22+
spotlessGradle : '5.15.0',
23+
ktlintGradle : '0.41.0',
2424
dokkaGradle : '1.4.32',
2525
mavenPublish : '0.15.1',
2626

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ distributionBase=GRADLE_USER_HOME
1717
distributionPath=wrapper/dists
1818
zipStoreBase=GRADLE_USER_HOME
1919
zipStorePath=wrapper/dists
20-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
20+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

0 commit comments

Comments
 (0)