Merge pull request #308 from chillibits/dev

Release of version 2.8.1
chillibits · Mar 24, 2023 · 361d325 · 361d325
2 parents 5a3eb6a + ecfc671
commit 361d325
Show file tree

Hide file tree

Showing 117 changed files with 670 additions and 367 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,14 +1,14 @@
 version: 2
 updates:
-- package-ecosystem: gradle
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "04:00"
-    timezone: Europe/Berlin
-  open-pull-requests-limit: 15
-  target-branch: dev
-  reviewers:
-  - marcauberer
-  assignees:
-  - marcauberer
+  - package-ecosystem: gradle
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "04:00"
+      timezone: Europe/Berlin
+    open-pull-requests-limit: 15
+    target-branch: dev
+    reviewers:
+      - chillibits/android-core-development
+    assignees:
+      - marcauberer
diff --git a/README.md b/README.md
@@ -44,4 +44,4 @@ Thanks to following people:
 
 Thanks to all contributors and translators!
 
-© ChilliBits 2017-2022 (Designed and developed by Marc Auberer)
+© ChilliBits 2017-2023 (Designed and developed by Marc Auberer)
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 plugins {
@@ -17,8 +17,8 @@ android {
         applicationId "com.mrgames13.jimdo.colorconverter"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 2800
-        versionName "2.8.0"
+        versionCode 2801
+        versionName "2.8.1"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -49,16 +49,17 @@ android {
 
 dependencies {
     // base dependencies
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.android.instantapps:instantapps:1.1.0'
     implementation 'com.google.android.play:core:1.10.3'
     implementation 'androidx.palette:palette-ktx:1.0.0'
-    implementation 'androidx.exifinterface:exifinterface:1.3.5'
-    implementation 'com.google.android.material:material:1.7.0'
-    implementation 'androidx.fragment:fragment-ktx:1.5.5'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.exifinterface:exifinterface:1.3.6'
+    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'androidx.fragment:fragment-ktx:1.5.6'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1"
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
     // External dependencies
@@ -85,17 +86,17 @@ dependencies {
 
     // dependencies for testing
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
 
 // Task for downloading all translation files
 task downloadTranslations {
     group 'pre-build tasks'
     description 'Downloads all translation files when building the app.'
 
-    ext.apiKey = 'IEKWn_DI-otivDlUWAN-NvNIT3bBWO_h'
-    ext.apiKeyColors = 'ReBhdq025DTUFKoKIvmvLLyY6hznXyCg'
+    ext.apiKey = 'cUnfQzJMGOihCQd0fvd4-c4FgYefuTB4'
+    ext.apiKeyColors = 'yHOCAB47RYyEPn9Ac_HbFp0aYMHszSwZ'
 
     // English
     doLast {

diff --git a/app/src/androidTest/java/com/chillibits/colorconverter/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/chillibits/colorconverter/ExampleInstrumentedTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright © Marc Auberer 2017-2022. All rights reserved
+  ~ Copyright © Marc Auberer 2017-2023. All rights reserved
   -->
 
 <manifest

diff --git a/app/src/main/java/com/chillibits/colorconverter/ColorConverterApplication.kt b/app/src/main/java/com/chillibits/colorconverter/ColorConverterApplication.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter
@@ -8,4 +8,4 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class ColorConverterApplication: Application()
+class ColorConverterApplication : Application()
diff --git a/app/src/main/java/com/chillibits/colorconverter/model/Color.kt b/app/src/main/java/com/chillibits/colorconverter/model/Color.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter.model
@@ -8,22 +8,29 @@ import androidx.core.graphics.alpha
 import androidx.core.graphics.blue
 import androidx.core.graphics.green
 import androidx.core.graphics.red
-import org.jetbrains.annotations.NotNull
 
 class Color(
     var id: Int,
     var name: String,
     var color: Int,
     var creationTimestamp: Long = System.currentTimeMillis()
-): Comparable<Color> {
+) : Comparable<Color> {
 
     var alpha = color.alpha
     var red = color.red
     var green = color.green
     var blue = color.blue
 
-    constructor(id: Int, name: String, alpha: Int, red: Int, green: Int, blue: Int, creationTimestamp: Long):
+    constructor(
+        id: Int,
+        name: String,
+        alpha: Int,
+        red: Int,
+        green: Int,
+        blue: Int,
+        creationTimestamp: Long
+    ) :
             this(id, name, android.graphics.Color.argb(alpha, red, green, blue), creationTimestamp)
 
-    override fun compareTo(@NotNull other: Color) = other.creationTimestamp.compareTo(creationTimestamp)
+    override fun compareTo(other: Color) = other.creationTimestamp.compareTo(creationTimestamp)
 }
diff --git a/app/src/main/java/com/chillibits/colorconverter/model/ColorName.kt b/app/src/main/java/com/chillibits/colorconverter/model/ColorName.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter.model

diff --git a/app/src/main/java/com/chillibits/colorconverter/repository/ColorRepository.kt b/app/src/main/java/com/chillibits/colorconverter/repository/ColorRepository.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter.repository

diff --git a/app/src/main/java/com/chillibits/colorconverter/shared/Constants.kt b/app/src/main/java/com/chillibits/colorconverter/shared/Constants.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter.shared
@@ -17,7 +17,6 @@ object Constants {
     const val EXTRA_CHOOSE_COLOR = "ChooseColor"
     const val EXTRA_IMAGE_URI = "ImageUri"
     const val EXTRA_COLOR = "Color"
-    const val EXTRA_SELECTED_COLOR = "SelectedColor"
 
     // Shared Preferences keys
     const val ARGB_REMEMBER = "ArgbRemember"
@@ -32,5 +31,4 @@ object Constants {
     const val COLOR_ANIMATION_DURATION = 500L
     const val NAME_SELECTED_COLOR = "Selection"
     const val HSV_FORMAT_STRING = "%.02f"
-    const val SHARED_PREFERENCES_NAME = "com.mrgames13.jimdo.colorconverter_preferences"
 }
diff --git a/app/src/main/java/com/chillibits/colorconverter/shared/Extensions.kt b/app/src/main/java/com/chillibits/colorconverter/shared/Extensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter.shared

diff --git a/app/src/main/java/com/chillibits/colorconverter/shared/HiltInstanceProviders.kt b/app/src/main/java/com/chillibits/colorconverter/shared/HiltInstanceProviders.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter.shared

diff --git a/app/src/main/java/com/chillibits/colorconverter/shared/SimpleOnSeekBarChangeListener.kt b/app/src/main/java/com/chillibits/colorconverter/shared/SimpleOnSeekBarChangeListener.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter.shared

diff --git a/app/src/main/java/com/chillibits/colorconverter/storage/AppDatabase.kt b/app/src/main/java/com/chillibits/colorconverter/storage/AppDatabase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter.storage
@@ -11,6 +11,6 @@ import com.chillibits.colorconverter.storage.dbo.ColorDbo
 
 // Increase version whenever the structure of the local db changes
 @Database(entities = [ColorDbo::class], exportSchema = false, version = 3)
-abstract class AppDatabase: RoomDatabase() {
+abstract class AppDatabase : RoomDatabase() {
     abstract fun colorDao(): ColorDao
 }
diff --git a/app/src/main/java/com/chillibits/colorconverter/storage/DatabaseMigrations.kt b/app/src/main/java/com/chillibits/colorconverter/storage/DatabaseMigrations.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter.storage
@@ -8,7 +8,7 @@ import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 
 // Migration from SQLite API to Room
-val MIGRATION_2_3 = object: Migration(2, 3) {
+val MIGRATION_2_3 = object : Migration(2, 3) {
     override fun migrate(database: SupportSQLiteDatabase) {
         database.execSQL("ALTER TABLE Colors RENAME TO tmp;")
         database.execSQL("CREATE TABLE colors (id INTEGER PRIMARY KEY NOT NULL, name TEXT NOT NULL, red INTEGER NOT NULL, green INTEGER NOT NULL, blue INTEGER NOT NULL, creation_timestamp INTEGER NOT NULL, alpha INTEGER NOT NULL);")

diff --git a/app/src/main/java/com/chillibits/colorconverter/storage/dao/ColorDao.kt b/app/src/main/java/com/chillibits/colorconverter/storage/dao/ColorDao.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter.storage.dao

diff --git a/app/src/main/java/com/chillibits/colorconverter/storage/dbo/ColorDbo.kt b/app/src/main/java/com/chillibits/colorconverter/storage/dbo/ColorDbo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter.storage.dbo
@@ -10,12 +10,12 @@ import androidx.room.PrimaryKey
 
 @Entity(tableName = "colors")
 data class ColorDbo(
-        @PrimaryKey(autoGenerate = true)
-        @ColumnInfo(name = "id") val id: Int,
-        @ColumnInfo(name = "name") var name: String,
-        @ColumnInfo(name = "alpha") val alpha: Int,
-        @ColumnInfo(name = "red") val red: Int,
-        @ColumnInfo(name = "green") val green: Int,
-        @ColumnInfo(name = "blue") val blue: Int,
-        @ColumnInfo(name = "creation_timestamp") val creationTimestamp: Long
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "id") val id: Int,
+    @ColumnInfo(name = "name") var name: String,
+    @ColumnInfo(name = "alpha") val alpha: Int,
+    @ColumnInfo(name = "red") val red: Int,
+    @ColumnInfo(name = "green") val green: Int,
+    @ColumnInfo(name = "blue") val blue: Int,
+    @ColumnInfo(name = "creation_timestamp") val creationTimestamp: Long
 )
diff --git a/app/src/main/java/com/chillibits/colorconverter/tools/ClipboardTools.kt b/app/src/main/java/com/chillibits/colorconverter/tools/ClipboardTools.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter.tools
@@ -21,7 +21,8 @@ class ClipboardTools(
     private val ct: ColorTools
 ) {
 
-    fun copyNameToClipboard(name: String) = context.copyTextToClipboard(context.getString(R.string.name), name)
+    fun copyNameToClipboard(name: String) =
+        context.copyTextToClipboard(context.getString(R.string.name), name)
 
     fun copyArgbToClipboard(color: Color) = context.run {
         if (getPrefBooleanValue(Constants.ENABLE_ALPHA, true)) {
@@ -30,22 +31,25 @@ class ClipboardTools(
                 showArgbExportDialog(st, color.alpha, color.red, color.green, color.blue)
             } else if (getPrefBooleanValue(Constants.ARGB_REMEMBER_SELECTION, false)) {
                 copyTextToClipboard(
-                        getString(R.string.argb_code), String.format(
+                    getString(R.string.argb_code), String.format(
                         getString(R.string.argb_clipboard),
-                        color.alpha, color.red, color.green, color.blue)
+                        color.alpha, color.red, color.green, color.blue
+                    )
                 )
             } else {
                 copyTextToClipboard(
-                        getString(R.string.argb_code), String.format(
+                    getString(R.string.argb_code), String.format(
                         getString(R.string.rgba_clipboard_css),
-                        color.red, color.green, color.blue, (color.alpha / 255.0).round(3))
+                        color.red, color.green, color.blue, (color.alpha / 255.0).round(3)
+                    )
                 )
             }
         } else {
             copyTextToClipboard(
-                    getString(R.string.rgb_code), String.format(
+                getString(R.string.rgb_code), String.format(
                     getString(R.string.rgb_clipboard),
-                    color.red, color.green, color.blue)
+                    color.red, color.green, color.blue
+                )
             )
         }
     }
@@ -63,10 +67,12 @@ class ClipboardTools(
     fun copyHsvToClipboard(color: Color) = context.run {
         val hsv = FloatArray(3)
         android.graphics.Color.RGBToHSV(color.red, color.green, color.blue, hsv)
-        val hsvString = String.format(getString(R.string.hsv_),
+        val hsvString = String.format(
+            getString(R.string.hsv_),
             String.format(Constants.HSV_FORMAT_STRING, hsv[0]),
             String.format(Constants.HSV_FORMAT_STRING, hsv[1]),
-            String.format(Constants.HSV_FORMAT_STRING, hsv[2]))
+            String.format(Constants.HSV_FORMAT_STRING, hsv[2])
+        )
         copyTextToClipboard(getString(R.string.hsv_clipboard), hsvString)
     }
 

diff --git a/app/src/main/java/com/chillibits/colorconverter/tools/ColorNameTools.kt b/app/src/main/java/com/chillibits/colorconverter/tools/ColorNameTools.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2017-2022. All rights reserved
+ * Copyright © Marc Auberer 2017-2023. All rights reserved
  */
 
 package com.chillibits.colorconverter.tools
@@ -169,5 +169,6 @@ class ColorNameTools(private val c: Context) {
         return closestMatch?.name ?: "No color"
     }
 
-    fun getColorNameFromColor(color: Color) = getColorNameFromRgb(color.red, color.green, color.blue)
+    fun getColorNameFromColor(color: Color) =
+        getColorNameFromRgb(color.red, color.green, color.blue)
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,4 +44,4 @@ Thanks to following people:

		Thanks to all contributors and translators!

		© ChilliBits 2017-2022 (Designed and developed by Marc Auberer)
		© ChilliBits 2017-2023 (Designed and developed by Marc Auberer)