From 99c01bfd992e9d612a52e9ec48869aca6cc101aa Mon Sep 17 00:00:00 2001 From: mueller-ma Date: Mon, 30 Dec 2024 10:01:53 +0100 Subject: [PATCH] Use forked color picker (#3841) Closes #3840 See https://github.com/QuadFlask/colorpicker/issues/136 Signed-off-by: mueller-ma --- mobile/build.gradle | 2 +- .../main/java/org/openhab/habdroid/ui/ColorItemActivity.kt | 2 +- .../org/openhab/habdroid/ui/WidgetDetailBottomSheets.kt | 2 +- .../java/org/openhab/habdroid/util/ColorPickerHelper.kt | 6 +++--- mobile/src/main/res/layout/activity_color_picker.xml | 2 +- mobile/src/main/res/layout/bottom_sheet_color_picker.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mobile/build.gradle b/mobile/build.gradle index 050c93c1a4..9403d2a614 100644 --- 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 index 4696e4cd10..8ad1ebccef 100644 --- 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 index 8983d34a3f..701d893625 100644 --- 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 index b839f57a56..d6a621de01 100644 --- 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 index 6c48ec0844..e1e8d68627 100644 --- 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"> - -