From d5ae9040fcc96960700fec38c186b2376ed6d8f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Aug 2021 07:19:40 +0200 Subject: [PATCH 1/8] Bump constraintlayout from 2.0.4 to 2.1.0 (#35) Bumps [constraintlayout](https://github.com/androidx/constraintlayout) from 2.0.4 to 2.1.0. - [Release notes](https://github.com/androidx/constraintlayout/releases) - [Commits](https://github.com/androidx/constraintlayout/compare/2.0.4...2.1.0) --- updated-dependencies: - dependency-name: androidx.constraintlayout:constraintlayout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0148a0d..d9b5afb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation 'androidx.core:core-ktx:1.6.0' implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'com.google.android.material:material:1.4.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' // Test dependencies testImplementation 'junit:junit:4.13.2' From d4d507866295abe045c6fc322d677acb651efa0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 08:49:11 +0200 Subject: [PATCH 2/8] Bump gradle from 7.0.0 to 7.0.1 (#36) Bumps gradle from 7.0.0 to 7.0.1. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 07bc330..705c442 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:7.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.0' } From 81a848f297cde36ec57d41a645e0653ff60662d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 08:47:23 +0200 Subject: [PATCH 3/8] Bump gradle from 7.0.1 to 7.0.2 (#38) Bumps gradle from 7.0.1 to 7.0.2. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 705c442..66203c5 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.1' + classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.0' } From 76a9d0145efca1d70c01c43ff3c31514b6f66ea9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 11:49:27 +0200 Subject: [PATCH 4/8] Bump kotlinVersion from 1.5.21 to 1.5.30 (#37) Bumps `kotlinVersion` from 1.5.21 to 1.5.30. Updates `kotlin-gradle-plugin` from 1.5.21 to 1.5.30 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30) Updates `kotlin-stdlib` from 1.5.21 to 1.5.30 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 66203c5..349aa7d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { ext { libraryVersion = "$VERSION" libraryVersionCode = Integer.parseInt(rootProject.properties["VERSION_CODE"]) - kotlinVersion = '1.5.21' + kotlinVersion = '1.5.30' } repositories { google() From de472fbbb43da99fdfa3f43d9667d898394007e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Sep 2021 07:18:56 +0200 Subject: [PATCH 5/8] Bump dokka-gradle-plugin from 1.5.0 to 1.5.30 (#39) Bumps [dokka-gradle-plugin](https://github.com/Kotlin/dokka) from 1.5.0 to 1.5.30. - [Release notes](https://github.com/Kotlin/dokka/releases) - [Commits](https://github.com/Kotlin/dokka/compare/v1.5.0...v1.5.30) --- updated-dependencies: - dependency-name: org.jetbrains.dokka:dokka-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 349aa7d..09f0f02 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.0' + classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.30' } } From 0e851d6ec098a9ba54eaaf274b220b9d805d0f5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Sep 2021 08:47:24 +0200 Subject: [PATCH 6/8] Bump kotlinVersion from 1.5.30 to 1.5.31 (#40) Bumps `kotlinVersion` from 1.5.30 to 1.5.31. Updates `kotlin-gradle-plugin` from 1.5.30 to 1.5.31 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-stdlib` from 1.5.30 to 1.5.31 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 09f0f02..fa63547 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { ext { libraryVersion = "$VERSION" libraryVersionCode = Integer.parseInt(rootProject.properties["VERSION_CODE"]) - kotlinVersion = '1.5.30' + kotlinVersion = '1.5.31' } repositories { google() From b5681d324fcc73aa5d6d4559519a0e94e0e6bbfe Mon Sep 17 00:00:00 2001 From: Marc Auberer Date: Tue, 21 Sep 2021 22:01:58 +0200 Subject: [PATCH 7/8] Bump version to 1.0.3 --- .idea/deploymentTargetDropDown.xml | 17 ----------------- .idea/misc.xml | 2 +- README.md | 2 +- gradle.properties | 6 +++--- 4 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 .idea/deploymentTargetDropDown.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index f64b5ac..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 860da66..ef61796 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/README.md b/README.md index e7011a3..bea46e8 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ The first step for using this library is, to add it to the dependency section in Add dependencies to build.gradle file on module level (e.g. app/build.gradle): ```gradle -implementation 'com.chillibits:adobecolortool:1.0.2' +implementation 'com.chillibits:adobecolortool:1.0.3' ``` Also you have to declare a file provider in your manifest, which should look similar to this one: ```xml diff --git a/gradle.properties b/gradle.properties index a5c00a4..59e63f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # -# Copyright © Marc Auberer 2021. All rights reserved +# Copyright � Marc Auberer 2021. All rights reserved # # Project-wide Gradle settings. @@ -26,8 +26,8 @@ kotlin.code.style=official # Custom settings GROUP=com.chillibits -VERSION=1.0.2 -VERSION_CODE=1002 +VERSION=1.0.3 +VERSION_CODE=1003 POM_URL=https://github.com/marcauberer/adobe-color-tool POM_SCM_URL=https://github.com/marcauberer/adobe-color-tool POM_SCM_CONNECTION=scm:git@github.com:marcauberer/adobe-color-tool.git From fb8da62fb9ca746cf550a22680704a1b7b5b9e7f Mon Sep 17 00:00:00 2001 From: Marc Auberer Date: Tue, 21 Sep 2021 22:11:45 +0200 Subject: [PATCH 8/8] Code optimizations for Kotlin 1.5.31 --- adobecolor/build.gradle | 4 ++-- .../com/chillibits/adobecolor/generator/ACOBinaryGenerator.kt | 2 +- .../com/chillibits/adobecolor/generator/ASEBinaryGenerator.kt | 4 ++-- .../java/com/chillibits/adobecolor/parser/ACOBinaryParser.kt | 2 -- .../java/com/chillibits/adobecolor/parser/ASEBinaryParser.kt | 1 - app/build.gradle | 4 ++-- .../main/java/com/chillibits/adobecolorsample/MainActivity.kt | 3 +-- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/adobecolor/build.gradle b/adobecolor/build.gradle index 74e84f0..9208910 100644 --- a/adobecolor/build.gradle +++ b/adobecolor/build.gradle @@ -28,8 +28,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } kotlinOptions { jvmTarget = '11' diff --git a/adobecolor/src/main/java/com/chillibits/adobecolor/generator/ACOBinaryGenerator.kt b/adobecolor/src/main/java/com/chillibits/adobecolor/generator/ACOBinaryGenerator.kt index 5eada69..7469b04 100644 --- a/adobecolor/src/main/java/com/chillibits/adobecolor/generator/ACOBinaryGenerator.kt +++ b/adobecolor/src/main/java/com/chillibits/adobecolor/generator/ACOBinaryGenerator.kt @@ -68,7 +68,7 @@ class ACOBinaryGenerator { result += 0.to2Bytes() // z = 0 (Has a value on other color spaces than RGB) result += 0.to2Bytes() // 0 (constant) result += (name.length +1).to2Bytes() // Name length - for (c in name) result += c.toInt().to2Bytes() // Name + for (c in name) result += c.code.to2Bytes() // Name result += 0.to2Bytes() // 0 (constant) return result } diff --git a/adobecolor/src/main/java/com/chillibits/adobecolor/generator/ASEBinaryGenerator.kt b/adobecolor/src/main/java/com/chillibits/adobecolor/generator/ASEBinaryGenerator.kt index 2d9f2cf..a12c553 100644 --- a/adobecolor/src/main/java/com/chillibits/adobecolor/generator/ASEBinaryGenerator.kt +++ b/adobecolor/src/main/java/com/chillibits/adobecolor/generator/ASEBinaryGenerator.kt @@ -64,7 +64,7 @@ class ASEBinaryGenerator { var result = BlockType.GROUP_START.value.to2Bytes() // Block type result += blockLength.to4Bytes() // Block length result += nameLength.to2Bytes() // Name length - for (c in name) result += c.toInt().to2Bytes() // Group name + for (c in name) result += c.code.to2Bytes() // Group name result += ByteArray(2) // Group name ending return result } @@ -97,7 +97,7 @@ class ASEBinaryGenerator { var result = BlockType.COLOR.value.to2Bytes() // Block type result += blockLength.to4Bytes() // Block length result += nameLength.to2Bytes() // Name length - for (c in name) result += c.toInt().to2Bytes() // Color name + for (c in name) result += c.code.to2Bytes() // Color name result += ByteArray(1) result += colorModel // Color model result += (color.red / 255f).to4Bytes() // Color value red diff --git a/adobecolor/src/main/java/com/chillibits/adobecolor/parser/ACOBinaryParser.kt b/adobecolor/src/main/java/com/chillibits/adobecolor/parser/ACOBinaryParser.kt index 895e22a..eaa8985 100644 --- a/adobecolor/src/main/java/com/chillibits/adobecolor/parser/ACOBinaryParser.kt +++ b/adobecolor/src/main/java/com/chillibits/adobecolor/parser/ACOBinaryParser.kt @@ -5,11 +5,9 @@ package com.chillibits.adobecolor.parser import android.graphics.Color -import android.util.Log import com.chillibits.adobecolor.generator.ACOBinaryGenerator import com.chillibits.adobecolor.model.AdobeColor import com.chillibits.adobecolor.tool.from2Bytes -import java.nio.charset.Charset /** * More information here: diff --git a/adobecolor/src/main/java/com/chillibits/adobecolor/parser/ASEBinaryParser.kt b/adobecolor/src/main/java/com/chillibits/adobecolor/parser/ASEBinaryParser.kt index 9b096ac..dd6f11a 100644 --- a/adobecolor/src/main/java/com/chillibits/adobecolor/parser/ASEBinaryParser.kt +++ b/adobecolor/src/main/java/com/chillibits/adobecolor/parser/ASEBinaryParser.kt @@ -5,7 +5,6 @@ package com.chillibits.adobecolor.parser import android.graphics.Color -import android.util.Log import com.chillibits.adobecolor.generator.ASEBinaryGenerator import com.chillibits.adobecolor.model.AdobeColor import com.chillibits.adobecolor.tool.from2Bytes diff --git a/app/build.gradle b/app/build.gradle index d9b5afb..0748ea9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } kotlinOptions { jvmTarget = '11' diff --git a/app/src/main/java/com/chillibits/adobecolorsample/MainActivity.kt b/app/src/main/java/com/chillibits/adobecolorsample/MainActivity.kt index 1afa874..e58b21d 100644 --- a/app/src/main/java/com/chillibits/adobecolorsample/MainActivity.kt +++ b/app/src/main/java/com/chillibits/adobecolorsample/MainActivity.kt @@ -11,7 +11,6 @@ import android.content.pm.PackageManager import android.graphics.Color import android.net.Uri import android.os.Bundle -import android.provider.SyncStateContract import android.util.Log import android.view.Menu import android.view.MenuItem @@ -147,7 +146,7 @@ class MainActivity : AppCompatActivity() { colors.clear() for (i in 0..(random.nextInt(8) +2)) { // Min 2, max 10 colors val randomColor = getRandomColor() - val name = "%06X".format(0xFFFFFF and randomColor).toUpperCase(Locale.getDefault()) + val name = "%06X".format(0xFFFFFF and randomColor).uppercase() colors.add(AdobeColor(randomColor, name)) } colorAdapter.updateData(colors)