Merge pull request #41 from marcauberer/dev

Release of version 1.0.3

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

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'

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
     }

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

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:

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

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'
@@ -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'

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)

build.gradle

@@ -6,16 +6,16 @@ buildscript {
     ext {
         libraryVersion = "$VERSION"
         libraryVersionCode = Integer.parseInt(rootProject.properties["VERSION_CODE"])
-        kotlinVersion = '1.5.21'
+        kotlinVersion = '1.5.31'
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        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'
     }
 }
 

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:[email protected]:marcauberer/adobe-color-tool.git