diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/copyright/Marc_Auberer.xml b/.idea/copyright/Marc_Auberer.xml index e9cf413..5a24187 100644 --- a/.idea/copyright/Marc_Auberer.xml +++ b/.idea/copyright/Marc_Auberer.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index ef61796..860da66 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/LICENSE b/LICENSE index 110b877..a5403ab 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2021 Marc Auberer +Copyright (c) 2020-2022 Marc Auberer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index bea46e8..eea0330 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.3' +implementation 'com.chillibits:adobecolortool:1.0.4' ``` Also you have to declare a file provider in your manifest, which should look similar to this one: ```xml @@ -149,4 +149,4 @@ If you want to contribute to this project, please feel free to send us a pull re ## Credits Thanks to all contributors and translators! -© Marc Auberer 2020-2021 +© Marc Auberer 2020-2022 diff --git a/adobecolor/build.gradle b/adobecolor/build.gradle index 9208910..f05493d 100644 --- a/adobecolor/build.gradle +++ b/adobecolor/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright © Marc Auberer 2021. All rights reserved + * Copyright © Marc Auberer 2020-2022. All rights reserved */ plugins { @@ -9,12 +9,12 @@ plugins { } android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion 32 + buildToolsVersion "32.0.0" defaultConfig { minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 32 versionCode libraryVersionCode versionName libraryVersion testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -43,9 +43,9 @@ android { dependencies { // Base dependencies implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" - 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.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'com.google.android.material:material:1.5.0' // External dependencies implementation 'com.github.florent37:inline-activity-result-kotlin:1.0.4' diff --git a/adobecolor/gradle.properties b/adobecolor/gradle.properties index bd29436..c4df41a 100644 --- a/adobecolor/gradle.properties +++ b/adobecolor/gradle.properties @@ -1,5 +1,5 @@ # -# Copyright © Marc Auberer 2021. All rights reserved +# Copyright © Marc Auberer 2020-2022. All rights reserved # POM_NAME=Adobe Color Tool diff --git a/adobecolor/src/androidTest/java/com/chillibits/adobecolor/ExampleInstrumentedTest.kt b/adobecolor/src/androidTest/java/com/chillibits/adobecolor/ExampleInstrumentedTest.kt index 6c45d1a..fac2010 100644 --- a/adobecolor/src/androidTest/java/com/chillibits/adobecolor/ExampleInstrumentedTest.kt +++ b/adobecolor/src/androidTest/java/com/chillibits/adobecolor/ExampleInstrumentedTest.kt @@ -1,5 +1,5 @@ /* - * Copyright © Marc Auberer 2021. All rights reserved + * Copyright © Marc Auberer 2020-2022. All rights reserved */ package com.chillibits.adobecolor diff --git a/adobecolor/src/main/AndroidManifest.xml b/adobecolor/src/main/AndroidManifest.xml index 7c84c2e..f1483d1 100644 --- a/adobecolor/src/main/AndroidManifest.xml +++ b/adobecolor/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/adobecolor/src/main/res/values-fr/strings.xml b/adobecolor/src/main/res/values-fr/strings.xml index 275ade8..0c89077 100644 --- a/adobecolor/src/main/res/values-fr/strings.xml +++ b/adobecolor/src/main/res/values-fr/strings.xml @@ -1,6 +1,6 @@ diff --git a/adobecolor/src/main/res/values/strings.xml b/adobecolor/src/main/res/values/strings.xml index 9694384..db32727 100644 --- a/adobecolor/src/main/res/values/strings.xml +++ b/adobecolor/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ diff --git a/adobecolor/src/test/java/com/chillibits/adobecolor/ExampleUnitTest.kt b/adobecolor/src/test/java/com/chillibits/adobecolor/ExampleUnitTest.kt index 319f9e7..33c7e49 100644 --- a/adobecolor/src/test/java/com/chillibits/adobecolor/ExampleUnitTest.kt +++ b/adobecolor/src/test/java/com/chillibits/adobecolor/ExampleUnitTest.kt @@ -1,5 +1,5 @@ /* - * Copyright © Marc Auberer 2021. All rights reserved + * Copyright © Marc Auberer 2020-2022. All rights reserved */ package com.chillibits.adobecolor diff --git a/app/build.gradle b/app/build.gradle index 0748ea9..1e25477 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright © Marc Auberer 2021. All rights reserved + * Copyright © Marc Auberer 2020-2022. All rights reserved */ plugins { @@ -8,13 +8,13 @@ plugins { } android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion 32 + buildToolsVersion "32.0.0" defaultConfig { applicationId "com.chillibits.adobecolorsample" minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 32 versionCode libraryVersionCode versionName libraryVersion testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -43,10 +43,10 @@ dependencies { // Base dependencies implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" - 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.1.0' + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'com.google.android.material:material:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' // Test dependencies testImplementation 'junit:junit:4.13.2' diff --git a/app/src/androidTest/java/com/chillibits/adobecolorsample/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/chillibits/adobecolorsample/ExampleInstrumentedTest.kt index 1c7a421..87f8636 100644 --- a/app/src/androidTest/java/com/chillibits/adobecolorsample/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/chillibits/adobecolorsample/ExampleInstrumentedTest.kt @@ -1,5 +1,5 @@ /* - * Copyright © Marc Auberer 2021. All rights reserved + * Copyright © Marc Auberer 2020-2022. All rights reserved */ package com.chillibits.adobecolorsample diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 15ce9ab..601da66 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + android:windowSoftInputMode="adjustPan" + android:exported="true"> diff --git a/app/src/main/java/com/chillibits/adobecolorsample/ColorAdapter.kt b/app/src/main/java/com/chillibits/adobecolorsample/ColorAdapter.kt index a7bb65f..7feea79 100644 --- a/app/src/main/java/com/chillibits/adobecolorsample/ColorAdapter.kt +++ b/app/src/main/java/com/chillibits/adobecolorsample/ColorAdapter.kt @@ -1,5 +1,5 @@ /* - * Copyright © Marc Auberer 2021. All rights reserved + * Copyright © Marc Auberer 2020-2022. All rights reserved */ package com.chillibits.adobecolorsample diff --git a/app/src/main/java/com/chillibits/adobecolorsample/Extensions.kt b/app/src/main/java/com/chillibits/adobecolorsample/Extensions.kt index 2eac9d3..0cfb730 100644 --- a/app/src/main/java/com/chillibits/adobecolorsample/Extensions.kt +++ b/app/src/main/java/com/chillibits/adobecolorsample/Extensions.kt @@ -1,5 +1,5 @@ /* - * Copyright © Marc Auberer 2021. All rights reserved + * Copyright © Marc Auberer 2020-2022. All rights reserved */ package com.chillibits.adobecolorsample diff --git a/app/src/main/java/com/chillibits/adobecolorsample/MainActivity.kt b/app/src/main/java/com/chillibits/adobecolorsample/MainActivity.kt index e58b21d..583b0f4 100644 --- a/app/src/main/java/com/chillibits/adobecolorsample/MainActivity.kt +++ b/app/src/main/java/com/chillibits/adobecolorsample/MainActivity.kt @@ -1,5 +1,5 @@ /* - * Copyright © Marc Auberer 2021. All rights reserved + * Copyright © Marc Auberer 2020-2022. All rights reserved */ package com.chillibits.adobecolorsample diff --git a/app/src/main/res/drawable/circle.xml b/app/src/main/res/drawable/circle.xml index dfa9c6c..bd2fb8e 100644 --- a/app/src/main/res/drawable/circle.xml +++ b/app/src/main/res/drawable/circle.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/drawable/github.xml b/app/src/main/res/drawable/github.xml index 3a35ede..f94312e 100644 --- a/app/src/main/res/drawable/github.xml +++ b/app/src/main/res/drawable/github.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index deb97d1..78d472a 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 298d523..c14ca14 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4040bee..325a1ba 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index b2af7b1..403c378 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 22f24c0..77cdbd8 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,5 +1,5 @@ diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml index 8c169e8..a58f9a6 100644 --- a/app/src/main/res/values-v21/themes.xml +++ b/app/src/main/res/values-v21/themes.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 770810f..ca605cb 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml index e6fea31..2af01d8 100644 --- a/app/src/main/res/values/ic_launcher_background.xml +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 33d892f..93b4d78 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ diff --git a/app/src/main/res/values/strings_untranslatable.xml b/app/src/main/res/values/strings_untranslatable.xml index e6e846a..a8a2232 100644 --- a/app/src/main/res/values/strings_untranslatable.xml +++ b/app/src/main/res/values/strings_untranslatable.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 51e2c7e..1ac245d 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,5 @@ diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml index ce2adbb..732312d 100644 --- a/app/src/main/res/xml/file_paths.xml +++ b/app/src/main/res/xml/file_paths.xml @@ -1,6 +1,6 @@ diff --git a/app/src/test/java/com/chillibits/adobecolorsample/ExampleUnitTest.kt b/app/src/test/java/com/chillibits/adobecolorsample/ExampleUnitTest.kt index fc347b8..e694b45 100644 --- a/app/src/test/java/com/chillibits/adobecolorsample/ExampleUnitTest.kt +++ b/app/src/test/java/com/chillibits/adobecolorsample/ExampleUnitTest.kt @@ -1,5 +1,5 @@ /* - * Copyright © Marc Auberer 2021. All rights reserved + * Copyright © Marc Auberer 2020-2022. All rights reserved */ package com.chillibits.adobecolorsample diff --git a/build.gradle b/build.gradle index fa63547..fb2b088 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,21 @@ /* - * Copyright © Marc Auberer 2021. All rights reserved + * Copyright © Marc Auberer 2020-2022. All rights reserved */ buildscript { ext { libraryVersion = "$VERSION" libraryVersionCode = Integer.parseInt(rootProject.properties["VERSION_CODE"]) - kotlinVersion = '1.5.31' + kotlinVersion = '1.6.10' } repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.30' + classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.6.10' } } diff --git a/gradle-release.gradle b/gradle-release.gradle index 1afd191..e54d3d0 100644 --- a/gradle-release.gradle +++ b/gradle-release.gradle @@ -1,5 +1,5 @@ /* - * Copyright © Marc Auberer 2021. All rights reserved + * Copyright © Marc Auberer 2020-2022. All rights reserved */ apply plugin: 'maven-publish' diff --git a/gradle.properties b/gradle.properties index 59e63f9..82d30c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # -# Copyright � Marc Auberer 2021. All rights reserved +# Copyright © Marc Auberer 2020-2022. All rights reserved # # Project-wide Gradle settings. @@ -23,11 +23,12 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official +android.disableAutomaticComponentCreation=true # Custom settings GROUP=com.chillibits -VERSION=1.0.3 -VERSION_CODE=1003 +VERSION=1.0.4 +VERSION_CODE=1004 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dd789ad..e612307 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,10 +1,10 @@ # -# Copyright © Marc Auberer 2021. All rights reserved +# Copyright © Marc Auberer 2020-2022. All rights reserved # -#Mon Dec 28 17:04:13 CET 2020 +#Wed Nov 10 10:19:24 CET 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index cccdd3d..edc7b3f 100644 --- a/gradlew +++ b/gradlew @@ -1,5 +1,9 @@ #!/usr/bin/env sh +# +# Copyright © Marc Auberer 2022. All rights reserved +# + ############################################################################## ## ## Gradle start up script for UN*X diff --git a/settings.gradle b/settings.gradle index 572215f..705101e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ /* - * Copyright © Marc Auberer 2021. All rights reserved + * Copyright © Marc Auberer 2020-2022. All rights reserved */ include ':adobecolor'