Skip to content

Commit 7c78de7

Browse files
author
Gazala Muhamed
committed
Switch colour picker library
1 parent 53a78c6 commit 7c78de7

11 files changed

Lines changed: 79 additions & 51 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ captures/
4444

4545
# IntelliJ
4646
*.iml
47+
.idea/*
4748
.idea/workspace.xml
4849
.idea/tasks.xml
4950
.idea/gradle.xml

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
defaultConfig {
99
applicationId "com.gazlaws.codeboard"
1010
minSdkVersion 23
11-
targetSdkVersion 34
11+
targetSdk 34
1212
versionCode 21
1313
versionName "6.0.1"
1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -19,11 +19,6 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}
22-
lintOptions {
23-
24-
checkReleaseBuilds false
25-
26-
}
2722
testOptions {
2823
unitTests.includeAndroidResources = true
2924
}
@@ -32,6 +27,9 @@ android {
3227

3328
useLibrary 'android.test.base'
3429
useLibrary 'android.test.mock'
30+
lint {
31+
checkReleaseBuilds false
32+
}
3533
}
3634

3735
repositories {
@@ -42,32 +40,34 @@ repositories {
4240

4341
dependencies {
4442

45-
api 'androidx.appcompat:appcompat:1.6.1'
43+
api 'androidx.appcompat:appcompat:1.7.0'
4644
api 'androidx.legacy:legacy-support-v13:1.0.0'
4745
api 'androidx.preference:preference:1.2.1'
46+
api 'androidx.preference:preference:1.2.1'
4847

49-
implementation 'com.google.android.material:material:1.11.0'
48+
implementation 'com.google.android.material:material:1.12.0'
5049

5150
//https://github.com/AppIntro/AppIntro
5251
implementation 'com.github.AppIntro:AppIntro:6.3.1'
5352

5453
//Colour picker
55-
implementation 'com.pes.materialcolorpicker:library:1.2.5'
54+
//implementation 'com.pes.materialcolorpicker:library:1.2.5'
55+
implementation 'com.github.evilbunny2008:android-material-color-picker-dialog:1.3.7'
5656

5757
// Required for local unit tests (JUnit 4 framework)
5858
testImplementation 'junit:junit:4.13.2'
5959

6060
// Required for instrumented tests
61-
implementation 'androidx.annotation:annotation:1.7.1'
62-
androidTestImplementation 'androidx.annotation:annotation:1.7.1'
61+
implementation 'androidx.annotation:annotation:1.9.1'
62+
androidTestImplementation 'androidx.annotation:annotation:1.9.1'
6363

6464

6565
// Core library
66-
androidTestImplementation 'androidx.test:core:1.5.0'
66+
androidTestImplementation 'androidx.test:core:1.6.1'
6767

6868
// AndroidJUnitRunner and JUnit Rules
69-
androidTestImplementation 'androidx.test:runner:1.5.2'
69+
androidTestImplementation 'androidx.test:runner:1.6.2'
7070

71-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
71+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
7272

7373
}

app/src/main/java/com/gazlaws/codeboard/SettingsFragment.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@
2525
import com.gazlaws.codeboard.theme.IOnFocusListenable;
2626
import com.gazlaws.codeboard.theme.ThemeDefinitions;
2727
import com.gazlaws.codeboard.theme.ThemeInfo;
28-
import com.pes.androidmaterialcolorpickerdialog.ColorPicker;
29-
import com.pes.androidmaterialcolorpickerdialog.ColorPickerCallback;
28+
//import com.pes.androidmaterialcolorpickerdialog.ColorPicker;
29+
//import com.pes.androidmaterialcolorpickerdialog.ColorPickerCallback;
30+
import com.github.evilbunny2008.androidmaterialcolorpickerdialog.ColorPicker;
31+
import com.github.evilbunny2008.androidmaterialcolorpickerdialog.ColorPickerCallback;
3032

3133
import static android.provider.Settings.Secure.DEFAULT_INPUT_METHOD;
3234

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
google()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:8.3.2'
11+
classpath 'com.android.tools.build:gradle:8.8.0'
1212

1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
1919
android.enableJetifier=true
20-
android.useAndroidX=true
20+
android.useAndroidX=true
21+
org.gradle.configuration-cache=true

gradle/wrapper/gradle-wrapper.jar

-15.7 KB
Binary file not shown.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Thu Apr 11 22:56:38 GST 2024
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 31 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)