Skip to content

Commit

Permalink
Merge pull request #211 from chillibits/dev
Browse files Browse the repository at this point in the history
Release of version 2.7.2
  • Loading branch information
marcauberer committed Oct 22, 2021
2 parents 0342fc5 + 76ccc83 commit 532efc4
Show file tree
Hide file tree
Showing 14 changed files with 30 additions and 31 deletions.
4 changes: 0 additions & 4 deletions .github/FUNDING.yml

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ More information on the projects website: [https://chillibits.com/colorconverter
- Dark mode

## Screenshots (Android 11)
<img src="media/1.png" width="275" title="Screenshot 1"> <img src="media/2.png" width="275" title="Screenshot 2"> <img src="media/3.png" width="275" title="Screenshot 3">
<img src="media/4.png" width="275" title="Screenshot 4"> <img src="media/5.png" width="275" title="Screenshot 5"> <img src="media/6.png" width="275" title="Screenshot 6">
<img src="media/1.png" width="265" title="Screenshot 1"> <img src="media/2.png" width="265" title="Screenshot 2"> <img src="media/3.png" width="265" title="Screenshot 3">
<img src="media/4.png" width="265" title="Screenshot 4"> <img src="media/5.png" width="265" title="Screenshot 5"> <img src="media/6.png" width="265" title="Screenshot 6">

## Contribute to this project
You can contribute to this project by doing following things:
Expand Down
20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ plugins {
}

android {
compileSdkVersion 30
buildToolsVersion "30.0.3"
compileSdkVersion 31
buildToolsVersion "31.0.0"
defaultConfig {
applicationId "com.mrgames13.jimdo.colorconverter"
minSdkVersion 21
targetSdkVersion 30
versionCode 2701
versionName "2.7.1"
targetSdkVersion 31
versionCode 2702
versionName "2.7.2"
vectorDrawables.useSupportLibrary = true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down Expand Up @@ -47,9 +47,9 @@ dependencies {
// base dependencies
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
implementation 'com.google.android.instantapps:instantapps:1.1.0'
implementation 'com.google.android.play:core:1.10.0'
implementation 'com.google.android.play:core:1.10.2'
implementation 'androidx.palette:palette-ktx:1.0.0'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.fragment:fragment-ktx:1.3.6'
Expand All @@ -60,14 +60,14 @@ dependencies {
implementation 'net.margaritov.preference.colorpicker.ColorPickerPreference:ColorPickerPreference:1.0.0'
implementation 'com.fxn769:pix:1.5.6'
implementation 'com.github.skydoves:colorpickerview:2.2.3'
implementation 'com.mikepenz:iconics-core:5.3.0'
implementation 'com.mikepenz:iconics-core:5.3.2'
implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.8-kotlin@aar'
implementation 'com.github.javiersantos:MaterialStyledDialogs:3.0.2'
implementation 'com.github.numerative:Five-Star-Me:2.1.1'

// ChilliBits dependencies
implementation 'com.chillibits:simplesettings:1.3.1'
implementation 'com.chillibits:adobecolortool:1.0.1'
implementation 'com.chillibits:simplesettings:1.3.2'
implementation 'com.chillibits:adobecolortool:1.0.3'

// Room dependencies
implementation "androidx.room:room-runtime:$room_version"
Expand Down
9 changes: 6 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
android:name="com.chillibits.colorconverter.ui.activity.MainActivity"
android:screenOrientation="portrait"
android:theme="@style/SplashTheme"
android:windowSoftInputMode="adjustPan">
android:windowSoftInputMode="adjustPan"
android:exported="true">

<!-- Intent filters -->
<intent-filter>
Expand Down Expand Up @@ -86,14 +87,16 @@
android:name="com.chillibits.colorconverter.ui.activity.ColorSelectionActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan" />
android:windowSoftInputMode="adjustPan"
android:exported="true"/>

<activity
android:name="com.chillibits.colorconverter.ui.activity.ImageActivity"
android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait"
android:hardwareAccelerated="false"
android:windowSoftInputMode="adjustPan">
android:windowSoftInputMode="adjustPan"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
</intent-filter>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Release: Working copy
Locale: de, German
Exported by: ChilliBits
Exported at: Sat, 31 Jul 2021 13:44:20 +0100
Exported at: Fri, 22 Oct 2021 23:31:44 +0100
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="ok">OK</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings_colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Release: Working copy
Locale: de, German
Exported by: ChilliBits
Exported at: Fri, 30 Jul 2021 16:50:13 +0100
Exported at: Fri, 22 Oct 2021 23:31:44 +0100
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="color_alice_blue">Aliceblau</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Release: Working copy
Locale: es, Spanish
Exported by: ChilliBits
Exported at: Sat, 31 Jul 2021 13:44:20 +0100
Exported at: Fri, 22 Oct 2021 23:31:44 +0100
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="ok">Aceptar</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-es/strings_colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Release: Working copy
Locale: es, Spanish
Exported by: ChilliBits
Exported at: Fri, 30 Jul 2021 16:50:13 +0100
Exported at: Fri, 22 Oct 2021 23:31:44 +0100
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="color_alice_blue">Azul Alicia</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Release: Working copy
Locale: fr, French
Exported by: ChilliBits
Exported at: Sat, 31 Jul 2021 13:44:20 +0100
Exported at: Fri, 22 Oct 2021 23:31:43 +0100
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="ok">OK</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings_colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Release: Working copy
Locale: fr, French
Exported by: ChilliBits
Exported at: Fri, 30 Jul 2021 16:50:13 +0100
Exported at: Fri, 22 Oct 2021 23:31:44 +0100
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="color_alice_blue">Bleu alice</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Release: Working copy
Locale: ru, Russian
Exported by: ChilliBits
Exported at: Sat, 31 Jul 2021 13:44:20 +0100
Exported at: Fri, 22 Oct 2021 23:31:44 +0100
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="ok">ОК</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Release: Working copy
Locale: en, English
Exported by: ChilliBits
Exported at: Sat, 31 Jul 2021 13:44:19 +0100
Exported at: Fri, 22 Oct 2021 23:31:43 +0100
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="ok">OK</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings_colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Release: Working copy
Locale: en, English
Exported by: ChilliBits
Exported at: Fri, 30 Jul 2021 16:50:13 +0100
Exported at: Fri, 22 Oct 2021 23:31:43 +0100
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="color_alice_blue">Alice Blue</string>
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
*/

buildscript {
ext.kotlin_version = '1.5.30-M1'
ext.kotlin_version = '1.5.31'
ext.room_version = '2.3.0'
ext.hilt_version = '2.38.1'
ext.hilt_version = '2.39.1'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'com.android.tools.build:gradle:7.0.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
classpath 'com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.3.1'
Expand Down

0 comments on commit 532efc4

Please sign in to comment.