Merge pull request #98 from kosenda/hot-fix/rgb-to-cmyk-mistate-value

kosenda · web-flow · commit 3d61a65726a7 · 2023-04-30T22:16:08.000+09:00
バグ：　rgbToCmykの計算が間違っていてCMYKの計算結果がおかしくなる
diff --git a/app/src/main/java/kosenda/makecolor/navigation/Navigation.kt b/app/src/main/java/kosenda/makecolor/navigation/Navigation.kt
@@ -36,12 +36,12 @@ import kosenda.makecolor.feature.display.screen.SplitColorScreen
 import kosenda.makecolor.feature.display.screen.SplitScreen
 import kosenda.makecolor.feature.edit.RegisterScreen
 import kosenda.makecolor.feature.info.InfoDialog
-import kosenda.makecolor.feature.makecolor.screen.InputTextScreen
-import kosenda.makecolor.feature.makecolor.screen.MergeScreen
-import kosenda.makecolor.feature.makecolor.screen.PickerScreen
-import kosenda.makecolor.feature.makecolor.screen.PictureScreen
-import kosenda.makecolor.feature.makecolor.screen.RandomScreen
-import kosenda.makecolor.feature.makecolor.screen.SeekbarScreen
+import kosenda.makecolor.feature.screen.InputTextScreen
+import kosenda.makecolor.feature.screen.MergeScreen
+import kosenda.makecolor.feature.screen.PickerScreen
+import kosenda.makecolor.feature.screen.PictureScreen
+import kosenda.makecolor.feature.screen.RandomScreen
+import kosenda.makecolor.feature.screen.SeekbarScreen
 import kosenda.makecolor.feature.settings.SettingScreen
 import kosenda.makecolor.ui.GoogleAd
 import kotlinx.serialization.decodeFromString
diff --git a/build-logic/convention/src/main/kotlin/kosenda/makecolor/AndroidApplicationPlugin.kt b/build-logic/convention/src/main/kotlin/kosenda/makecolor/AndroidApplicationPlugin.kt
@@ -24,8 +24,8 @@ class AndroidApplicationPlugin: Plugin<Project> {
                     applicationId = "kosenda.makecolor"
                     minSdk = 24
                     targetSdk = 33
-                    versionCode = 37
-                    versionName = "4.2"
+                    versionCode = 38
+                    versionName = "4.3"
                     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 }
                 compileOptions {
diff --git a/core/domain/src/main/java/kosenda/makecolor/core/domain/UpdateOtherColorUseCase.kt b/core/domain/src/main/java/kosenda/makecolor/core/domain/UpdateOtherColorUseCase.kt
@@ -20,17 +20,19 @@ class UpdateOtherColorUseCase @Inject constructor() {
                 )
             }
             ColorType.CMYK -> {
+                val rgb = cmykToRgb(colorData.cmyk)
                 colorData.copy(
-                    rgb = cmykToRgb(colorData.cmyk),
-                    hsv = rgbToHsv(colorData.rgb),
-                    hex = rgbToHex(colorData.rgb),
+                    rgb = rgb,
+                    hsv = rgbToHsv(rgb),
+                    hex = rgbToHex(rgb),
                 )
             }
             ColorType.HSV -> {
+                val rgb = hsvToRGB(colorData.hsv)
                 colorData.copy(
-                    rgb = hsvToRGB(colorData.hsv),
-                    cmyk = rgbToCmyk(colorData.rgb),
-                    hex = rgbToHex(colorData.rgb),
+                    rgb = rgb,
+                    cmyk = rgbToCmyk(rgb),
+                    hex = rgbToHex(rgb),
                 )
             }
         }
diff --git a/core/util/src/main/java/kosenda/makecolor/core/util/ColorUtility.kt b/core/util/src/main/java/kosenda/makecolor/core/util/ColorUtility.kt
@@ -35,7 +35,7 @@ fun rgbToCmyk(rgb: RGB): CMYK {
     val blue: Float = (rgb.blue / 255f).coerceAtMost(1f)
     val black: Float = when {
         red == 1f || green == 1f || blue == 1f -> 0f
-        else -> ((1f - (max(red, max(green, blue)))) * 100f).coerceAtMost(100f)
+        else -> (1f - (max(red, max(green, blue)))).coerceAtMost(1f)
     }
     val cyan: Float = when {
         black != 1f -> ((1f - red - black) / (1f - black) * 100f).coerceAtMost(100f)
diff --git a/feature/makecolor/src/main/java/kosenda/makecolor/feature/screen/InputTextScreen.kt b/feature/makecolor/src/main/java/kosenda/makecolor/feature/screen/InputTextScreen.kt
@@ -1,4 +1,4 @@
-package kosenda.makecolor.feature.makecolor.screen
+package kosenda.makecolor.feature.screen
 
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Column
@@ -33,9 +33,9 @@ import kosenda.makecolor.core.ui.feature.common.card.SpinnerCard
 import kosenda.makecolor.core.ui.feature.common.topbar.TopBar
 import kosenda.makecolor.core.ui.feature.theme.MakeColorTheme
 import kosenda.makecolor.core.resource.R
-import kosenda.makecolor.feature.makecolor.viewmodel.InputTextViewModel
-import kosenda.makecolor.feature.makecolor.viewmodel.InputTextViewModelImpl
-import kosenda.makecolor.feature.makecolor.viewmodel.PreviewInputTextViewModel
+import kosenda.makecolor.feature.viewmodel.InputTextViewModel
+import kosenda.makecolor.feature.viewmodel.InputTextViewModelImpl
+import kosenda.makecolor.feature.viewmodel.PreviewInputTextViewModel
 import kosenda.makecolor.feature.preview.PreviewSurface
 
 @Composable
diff --git a/feature/makecolor/src/main/java/kosenda/makecolor/feature/screen/MergeScreen.kt b/feature/makecolor/src/main/java/kosenda/makecolor/feature/screen/MergeScreen.kt
@@ -1,4 +1,4 @@
-package kosenda.makecolor.feature.makecolor.screen
+package kosenda.makecolor.feature.screen
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -41,9 +41,9 @@ import kosenda.makecolor.core.ui.feature.common.topbar.TopBar
 import kosenda.makecolor.core.ui.feature.theme.MakeColorTheme
 import kosenda.makecolor.core.util.getNameIfNoAlias
 import kosenda.makecolor.core.resource.R
-import kosenda.makecolor.feature.makecolor.viewmodel.MergeViewModel
-import kosenda.makecolor.feature.makecolor.viewmodel.MergeViewModelImpl
-import kosenda.makecolor.feature.makecolor.viewmodel.PreviewMergeViewModel
+import kosenda.makecolor.feature.viewmodel.MergeViewModel
+import kosenda.makecolor.feature.viewmodel.MergeViewModelImpl
+import kosenda.makecolor.feature.viewmodel.PreviewMergeViewModel
 import kosenda.makecolor.feature.preview.PreviewSurface
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
diff --git a/feature/makecolor/src/main/java/kosenda/makecolor/feature/screen/PickerScreen.kt b/feature/makecolor/src/main/java/kosenda/makecolor/feature/screen/PickerScreen.kt
@@ -1,4 +1,4 @@
-package kosenda.makecolor.feature.makecolor.screen
+package kosenda.makecolor.feature.screen
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -35,9 +35,9 @@ import kosenda.makecolor.core.ui.feature.common.card.HarmonyColorPickerCard
 import kosenda.makecolor.core.ui.feature.common.card.SpinnerCard
 import kosenda.makecolor.core.ui.feature.common.topbar.TopBar
 import kosenda.makecolor.core.ui.feature.theme.MakeColorTheme
-import kosenda.makecolor.feature.makecolor.viewmodel.PickerViewModel
-import kosenda.makecolor.feature.makecolor.viewmodel.PickerViewModelImpl
-import kosenda.makecolor.feature.makecolor.viewmodel.PreviewPickerViewModel
+import kosenda.makecolor.feature.viewmodel.PickerViewModel
+import kosenda.makecolor.feature.viewmodel.PickerViewModelImpl
+import kosenda.makecolor.feature.viewmodel.PreviewPickerViewModel
 import kosenda.makecolor.feature.preview.PreviewSurface
 
 @Composable
diff --git a/feature/makecolor/src/main/java/kosenda/makecolor/feature/screen/PictureScreen.kt b/feature/makecolor/src/main/java/kosenda/makecolor/feature/screen/PictureScreen.kt
@@ -1,4 +1,4 @@
-package kosenda.makecolor.feature.makecolor.screen
+package kosenda.makecolor.feature.screen
 
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
@@ -36,9 +36,9 @@ import kosenda.makecolor.core.ui.feature.common.card.SelectImageCard
 import kosenda.makecolor.core.ui.feature.common.topbar.TopBar
 import kosenda.makecolor.core.ui.feature.theme.MakeColorTheme
 import kosenda.makecolor.core.resource.R
-import kosenda.makecolor.feature.makecolor.viewmodel.PictureViewModel
-import kosenda.makecolor.feature.makecolor.viewmodel.PictureViewModelImpl
-import kosenda.makecolor.feature.makecolor.viewmodel.PreviewPictureViewModel
+import kosenda.makecolor.feature.viewmodel.PictureViewModel
+import kosenda.makecolor.feature.viewmodel.PictureViewModelImpl
+import kosenda.makecolor.feature.viewmodel.PreviewPictureViewModel
 import kosenda.makecolor.feature.preview.PreviewSurface
 
 @Composable
diff --git a/feature/makecolor/src/main/java/kosenda/makecolor/feature/screen/RandomScreen.kt b/feature/makecolor/src/main/java/kosenda/makecolor/feature/screen/RandomScreen.kt
@@ -1,4 +1,4 @@
-package kosenda.makecolor.feature.makecolor.screen
+package kosenda.makecolor.feature.screen
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -31,9 +31,9 @@ import kosenda.makecolor.core.ui.feature.common.card.RandomColorsCard
 import kosenda.makecolor.core.ui.feature.common.card.SpinnerCard
 import kosenda.makecolor.core.ui.feature.common.topbar.TopBar
 import kosenda.makecolor.core.ui.feature.theme.MakeColorTheme
-import kosenda.makecolor.feature.makecolor.viewmodel.PreviewRandomViewModel
-import kosenda.makecolor.feature.makecolor.viewmodel.RandomViewModel
-import kosenda.makecolor.feature.makecolor.viewmodel.RandomViewModelImpl
+import kosenda.makecolor.feature.viewmodel.PreviewRandomViewModel
+import kosenda.makecolor.feature.viewmodel.RandomViewModel
+import kosenda.makecolor.feature.viewmodel.RandomViewModelImpl
 import kosenda.makecolor.feature.preview.PreviewSurface
 
 @Composable
diff --git a/feature/makecolor/src/main/java/kosenda/makecolor/feature/screen/SeekbarScreen.kt b/feature/makecolor/src/main/java/kosenda/makecolor/feature/screen/SeekbarScreen.kt
@@ -1,4 +1,4 @@
-package kosenda.makecolor.feature.makecolor.screen
+package kosenda.makecolor.feature.screen
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -31,9 +31,9 @@ import kosenda.makecolor.core.ui.feature.common.card.SpinnerCard
 import kosenda.makecolor.core.ui.feature.common.topbar.TopBar
 import kosenda.makecolor.core.ui.feature.theme.MakeColorTheme
 import kosenda.makecolor.core.resource.R
-import kosenda.makecolor.feature.makecolor.viewmodel.PreviewSeekbarViewModel
-import kosenda.makecolor.feature.makecolor.viewmodel.SeekbarViewModel
-import kosenda.makecolor.feature.makecolor.viewmodel.SeekbarViewModelImpl
+import kosenda.makecolor.feature.viewmodel.PreviewSeekbarViewModel
+import kosenda.makecolor.feature.viewmodel.SeekbarViewModel
+import kosenda.makecolor.feature.viewmodel.SeekbarViewModelImpl
 import kosenda.makecolor.feature.preview.PreviewSurface
 
 @Composable
diff --git a/feature/makecolor/src/main/java/kosenda/makecolor/feature/viewmodel/InputTextViewModel.kt b/feature/makecolor/src/main/java/kosenda/makecolor/feature/viewmodel/InputTextViewModel.kt
@@ -1,4 +1,4 @@
-package kosenda.makecolor.feature.makecolor.viewmodel
+package kosenda.makecolor.feature.viewmodel
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/feature/makecolor/src/main/java/kosenda/makecolor/feature/viewmodel/MergeViewModel.kt b/feature/makecolor/src/main/java/kosenda/makecolor/feature/viewmodel/MergeViewModel.kt
@@ -1,4 +1,4 @@
-package kosenda.makecolor.feature.makecolor.viewmodel
+package kosenda.makecolor.feature.viewmodel
 
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Brush
diff --git a/feature/makecolor/src/main/java/kosenda/makecolor/feature/viewmodel/PickerViewModel.kt b/feature/makecolor/src/main/java/kosenda/makecolor/feature/viewmodel/PickerViewModel.kt
@@ -1,4 +1,4 @@
-package kosenda.makecolor.feature.makecolor.viewmodel
+package kosenda.makecolor.feature.viewmodel
 
 import androidx.lifecycle.ViewModel
 import com.godaddy.android.colorpicker.HsvColor
diff --git a/feature/makecolor/src/main/java/kosenda/makecolor/feature/viewmodel/PictureViewModel.kt b/feature/makecolor/src/main/java/kosenda/makecolor/feature/viewmodel/PictureViewModel.kt
@@ -1,4 +1,4 @@
-package kosenda.makecolor.feature.makecolor.viewmodel
+package kosenda.makecolor.feature.viewmodel
 
 import android.content.Context
 import android.graphics.Bitmap
diff --git a/feature/makecolor/src/main/java/kosenda/makecolor/feature/viewmodel/RandomViewModel.kt b/feature/makecolor/src/main/java/kosenda/makecolor/feature/viewmodel/RandomViewModel.kt
@@ -1,4 +1,4 @@
-package kosenda.makecolor.feature.makecolor.viewmodel
+package kosenda.makecolor.feature.viewmodel
 
 import androidx.compose.ui.graphics.Color
 import androidx.lifecycle.ViewModel
diff --git a/feature/makecolor/src/main/java/kosenda/makecolor/feature/viewmodel/SeekbarViewModel.kt b/feature/makecolor/src/main/java/kosenda/makecolor/feature/viewmodel/SeekbarViewModel.kt
@@ -1,4 +1,4 @@
-package kosenda.makecolor.feature.makecolor.viewmodel
+package kosenda.makecolor.feature.viewmodel
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel

Original file line number	Diff line number	Diff line change
`@@ -20,17 +20,19 @@ class UpdateOtherColorUseCase @Inject constructor() {`
`20`	`20`	`)`
`21`	`21`	`}`
`22`	`22`	`ColorType.CMYK -> {`
	`23`	`+ val rgb = cmykToRgb(colorData.cmyk)`
`23`	`24`	`colorData.copy(`
`24`		`- rgb = cmykToRgb(colorData.cmyk),`
`25`		`- hsv = rgbToHsv(colorData.rgb),`
`26`		`- hex = rgbToHex(colorData.rgb),`
	`25`	`+ rgb = rgb,`
	`26`	`+ hsv = rgbToHsv(rgb),`
	`27`	`+ hex = rgbToHex(rgb),`
`27`	`28`	`)`
`28`	`29`	`}`
`29`	`30`	`ColorType.HSV -> {`
	`31`	`+ val rgb = hsvToRGB(colorData.hsv)`
`30`	`32`	`colorData.copy(`
`31`		`- rgb = hsvToRGB(colorData.hsv),`
`32`		`- cmyk = rgbToCmyk(colorData.rgb),`
`33`		`- hex = rgbToHex(colorData.rgb),`
	`33`	`+ rgb = rgb,`
	`34`	`+ cmyk = rgbToCmyk(rgb),`
	`35`	`+ hex = rgbToHex(rgb),`
`34`	`36`	`)`
`35`	`37`	`}`
`36`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ fun rgbToCmyk(rgb: RGB): CMYK {`
`35`	`35`	`val blue: Float = (rgb.blue / 255f).coerceAtMost(1f)`
`36`	`36`	`val black: Float = when {`
`37`	`37`	`red == 1f \|\| green == 1f \|\| blue == 1f -> 0f`
`38`		`- else -> ((1f - (max(red, max(green, blue)))) * 100f).coerceAtMost(100f)`
	`38`	`+ else -> (1f - (max(red, max(green, blue)))).coerceAtMost(1f)`
`39`	`39`	`}`
`40`	`40`	`val cyan: Float = when {`
`41`	`41`	`black != 1f -> ((1f - red - black) / (1f - black) * 100f).coerceAtMost(100f)`