Skip to content

Commit

Permalink
Merge pull request #59 from marcauberer/dev
Browse files Browse the repository at this point in the history
Release of version 1.0.4
  • Loading branch information
marcauberer authored Mar 5, 2022
2 parents 656a221 + 7deb42b commit 26aa276
Show file tree
Hide file tree
Showing 56 changed files with 210 additions and 76 deletions.
123 changes: 123 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/copyright/Marc_Auberer.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
14 changes: 7 additions & 7 deletions adobecolor/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

plugins {
Expand All @@ -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"
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion adobecolor/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright © Marc Auberer 2021. All rights reserved
# Copyright © Marc Auberer 2020-2022. All rights reserved
#

POM_NAME=Adobe Color Tool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

package com.chillibits.adobecolor
Expand Down
2 changes: 1 addition & 1 deletion adobecolor/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright © Marc Auberer 2021. All rights reserved
~ Copyright © Marc Auberer 2020-2022. All rights reserved
-->

<manifest
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

package com.chillibits.adobecolor.core
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

package com.chillibits.adobecolor.core
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

package com.chillibits.adobecolor.generator
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

package com.chillibits.adobecolor.generator
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

package com.chillibits.adobecolor.model
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

package com.chillibits.adobecolor.parser
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

package com.chillibits.adobecolor.parser
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

package com.chillibits.adobecolor.tool
Expand Down
2 changes: 1 addition & 1 deletion adobecolor/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright © Marc Auberer 2021. All rights reserved
~ Copyright © Marc Auberer 2020-2022. All rights reserved
-->

<resources>
Expand Down
2 changes: 1 addition & 1 deletion adobecolor/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright © Marc Auberer 2021. All rights reserved
~ Copyright © Marc Auberer 2020-2022. All rights reserved
-->

<resources>
Expand Down
2 changes: 1 addition & 1 deletion adobecolor/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright © Marc Auberer 2021. All rights reserved
~ Copyright © Marc Auberer 2020-2022. All rights reserved
-->

<resources>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

package com.chillibits.adobecolor
Expand Down
16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

plugins {
Expand All @@ -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"
Expand Down Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

package com.chillibits.adobecolorsample
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright © Marc Auberer 2021. All rights reserved
~ Copyright © Marc Auberer 2020-2022. All rights reserved
-->

<manifest
Expand All @@ -20,7 +20,8 @@
<activity
android:name=".MainActivity"
android:theme="@style/Theme.AdobeColor"
android:windowSoftInputMode="adjustPan">
android:windowSoftInputMode="adjustPan"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

package com.chillibits.adobecolorsample
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Marc Auberer 2021. All rights reserved
* Copyright © Marc Auberer 2020-2022. All rights reserved
*/

package com.chillibits.adobecolorsample
Expand Down
Loading

0 comments on commit 26aa276

Please sign in to comment.