Use forked color picker (#3841)

Closes #3840 See QuadFlask/colorpicker#136 Signed-off-by: mueller-ma <[email protected]>
openhab · Dec 30, 2024 · 99c01bf · 99c01bf
1 parent d743b07
commit 99c01bf
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -170,7 +170,7 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp:$ok_http_version"
     implementation "com.squareup.okhttp3:logging-interceptor:$ok_http_version"
     implementation "com.squareup.okhttp3:okhttp-sse:$ok_http_version"
-    implementation "com.github.QuadFlask:colorpicker:0.0.15"
+    implementation "com.github.chimbori:colorpicker:0.1.1"
     implementation "com.caverock:androidsvg-aar:1.4"
     implementation "com.github.AppIntro:AppIntro:6.3.1"
     implementation "com.github.chrisbanes:PhotoView:2.3.0"

diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/ColorItemActivity.kt b/mobile/src/main/java/org/openhab/habdroid/ui/ColorItemActivity.kt
@@ -15,7 +15,7 @@ package org.openhab.habdroid.ui
 
 import android.os.Bundle
 import android.view.MenuItem
-import com.flask.colorpicker.ColorPickerView
+import com.chimbori.colorpicker.ColorPickerView
 import com.google.android.material.slider.Slider
 import org.openhab.habdroid.R
 import org.openhab.habdroid.core.connection.ConnectionFactory

diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/WidgetDetailBottomSheets.kt b/mobile/src/main/java/org/openhab/habdroid/ui/WidgetDetailBottomSheets.kt
@@ -26,7 +26,7 @@ import android.widget.RadioButton
 import android.widget.RadioGroup
 import android.widget.TextView
 import androidx.core.os.bundleOf
-import com.flask.colorpicker.ColorPickerView
+import com.chimbori.colorpicker.ColorPickerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment

diff --git a/mobile/src/main/java/org/openhab/habdroid/util/ColorPickerHelper.kt b/mobile/src/main/java/org/openhab/habdroid/util/ColorPickerHelper.kt
@@ -15,9 +15,9 @@ package org.openhab.habdroid.util
 
 import android.graphics.Color
 import android.util.Log
-import com.flask.colorpicker.ColorPickerView
-import com.flask.colorpicker.OnColorChangedListener
-import com.flask.colorpicker.OnColorSelectedListener
+import com.chimbori.colorpicker.ColorPickerView
+import com.chimbori.colorpicker.OnColorChangedListener
+import com.chimbori.colorpicker.OnColorSelectedListener
 import com.google.android.material.slider.LabelFormatter
 import com.google.android.material.slider.Slider
 import java.util.Locale

diff --git a/mobile/src/main/res/layout/activity_color_picker.xml b/mobile/src/main/res/layout/activity_color_picker.xml
@@ -15,7 +15,7 @@
         android:orientation="vertical"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <com.flask.colorpicker.ColorPickerView
+        <com.chimbori.colorpicker.ColorPickerView
             android:id="@+id/picker"
             android:layout_width="match_parent"
             android:layout_height="0dp"

diff --git a/mobile/src/main/res/layout/bottom_sheet_color_picker.xml b/mobile/src/main/res/layout/bottom_sheet_color_picker.xml
@@ -12,7 +12,7 @@
         style="@style/BottomSheetHeaderTitle"
         android:id="@+id/title" />
 
-    <com.flask.colorpicker.ColorPickerView
+    <com.chimbori.colorpicker.ColorPickerView
         android:id="@+id/picker"
         android:layout_width="match_parent"
         android:layout_height="0dp"