loading stings with stringResource.

Author: syslogic

library/src/main/java/io/syslogic/colorpicker/AlphaPatternDrawable.java

@@ -14,7 +14,6 @@
 
 /**
  * This drawable that draws a simple white and gray chessboard pattern.
- *
  * @author Martin Zeitler
  */
 public class AlphaPatternDrawable extends Drawable {

library/src/main/java/io/syslogic/colorpicker/ColorPickerDialogFragment.java

@@ -25,7 +25,6 @@
 
 /**
  * The Color-Picker {@link DialogFragment} accepts NavArgs and returns a FragmentResult.
- *
  * @author Martin Zeitler
  */
 public class ColorPickerDialogFragment extends DialogFragment implements

library/src/main/java/io/syslogic/colorpicker/ColorPickerDialogFragmentImpl.java

@@ -1,7 +1,7 @@
 package io.syslogic.colorpicker;
 
 /**
- * ColorPickerDialogFragment Impl
+ * ColorPickerDialogFragment Impl.
  * Used to instance ColorPickerDialogFragmentImpl from ColorPickerPreference.
  * @author Martin Zeitler
  */

library/src/main/java/io/syslogic/colorpicker/ColorPickerPanelView.java

@@ -11,8 +11,7 @@
 import androidx.annotation.NonNull;
 
 /**
- * The Color-Picker Panel {@link View}
- *
+ * The Color-Picker Panel {@link View}.
  * This class draws a panel which which will be filled with a color which can be set.
  * It can be used to show the currently selected color which you will get from the {@link ColorPickerView}.
  * @author Martin Zeitler

library/src/main/java/io/syslogic/colorpicker/ColorPickerPreference.java

@@ -25,8 +25,7 @@
 import java.util.Locale;
 
 /**
- * The Color-Picker {@link Preference}
- *
+ * The Color-Picker {@link Preference}.
  * @author Martin Zeitler
  */
 public class ColorPickerPreference extends Preference implements

library/src/main/java/io/syslogic/colorpicker/ColorPickerView.java

@@ -29,7 +29,6 @@
  * The Color-Picker {@link View} (refactored version).
  * It displays a color picker to the user and allow them to select a color.
  * the slider for the alpha-channel can be enabled setAlphaSliderVisible(true).
- *
  * @author Martin Zeitler
  */
 public class ColorPickerView extends View {
@@ -362,42 +361,52 @@ public boolean onTrackballEvent(@NonNull MotionEvent event) {
         boolean update = false;
         if (event.getAction() == MotionEvent.ACTION_MOVE) {
             switch (mLastTouchedPanel) {
-
-                case PANEL_SAT:
+                case PANEL_SAT -> {
                     float sat, val;
                     sat = mSaturation + x / 50f;
                     val = mContrast - y / 50f;
-                    if (sat < 0f) {sat = 0f;}
-                    else if (sat > 1f) {sat = 1f;}
-                    if (val < 0f) {val = 0f;}
-                    else if (val > 1f) {val = 1f;}
+                    if (sat < 0f) {
+                        sat = 0f;
+                    } else if (sat > 1f) {
+                        sat = 1f;
+                    }
+                    if (val < 0f) {
+                        val = 0f;
+                    } else if (val > 1f) {
+                        val = 1f;
+                    }
                     mSaturation = sat;
                     mContrast = val;
                     update = true;
-                    break;
-
-                case PANEL_HUE:
+                }
+                case PANEL_HUE -> {
                     float hue = mHue - y * 10f;
-                    if (hue < 0f) {hue = 0f;}
-                    else if (hue > 360f) {hue = 360f;}
+                    if (hue < 0f) {
+                        hue = 0f;
+                    } else if (hue > 360f) {
+                        hue = 360f;
+                    }
                     mHue = hue;
                     update = true;
-                    break;
-
-                case PANEL_ALPHA:
+                }
+                case PANEL_ALPHA -> {
                     if (mShowAlphaPanel || mAlphaRect != null) {
                         int alpha = (int) (mAlpha - x * 10);
-                        if (alpha < 0) {alpha = 0;}
-                        else if (alpha > 0xff) {alpha = 0xff;}
+                        if (alpha < 0) {
+                            alpha = 0;
+                        } else if (alpha > 0xff) {
+                            alpha = 0xff;
+                        }
                         mAlpha = alpha;
                         update = true;
                     }
-                    break;
+                }
             }
         }
         if (update) {
             if (mListener != null) {
-                mListener.onColorChanged(Color.HSVToColor(mAlpha, new float[]{mHue, mSaturation, mContrast}));
+                int intValue = Color.HSVToColor(mAlpha, new float[]{mHue, mSaturation, mContrast});
+                mListener.onColorChanged(intValue);
             }
             invalidate();
             return true;
@@ -649,8 +658,8 @@ public float getDrawingOffset() {
      *
      * @param visible whether to show the alpha-slider panel.
      */
+    @SuppressWarnings("unused")
     public void setAlphaSliderVisible(boolean visible) {
-
         if (mShowAlphaPanel != visible) {
             mShowAlphaPanel = visible;
 
@@ -663,6 +672,7 @@ public void setAlphaSliderVisible(boolean visible) {
         }
     }
 
+    @SuppressWarnings("unused")
     public boolean getAlphaSliderVisible() {
         return mShowAlphaPanel;
     }

library/src/main/java/io/syslogic/colorpicker/OnColorChangedListener.java

@@ -2,7 +2,6 @@
 
 /**
  * Color-Picker OnColorChangedListener.
- *
  * @author Martin Zeitler
  */
 public interface OnColorChangedListener {

library/src/main/java/io/syslogic/colorpicker/compose/ColorPickerComponent.kt

@@ -58,11 +58,11 @@ fun ColorPickerComponent(
     val colPadding = dimensionResource(R.dimen.compose_col_padding)
 
     /* All the values are being initialized by the `initialColor`. */
-    var currentColor: Int by remember { mutableStateOf(initialColor.hashCode()) }
-    var currentAlpha: Float by remember { mutableStateOf(initialColor.alpha) }
-    var currentHue: Float by remember { mutableStateOf(getHSV(initialColor)[0]) }
-    var currentSat: Float by remember { mutableStateOf(getHSV(initialColor)[1]) }
-    var currentVal: Float by remember { mutableStateOf(getHSV(initialColor)[2]) }
+    var currentColor: Int by remember { mutableIntStateOf(initialColor.hashCode()) }
+    var currentAlpha: Float by remember { mutableFloatStateOf(initialColor.alpha) }
+    var currentHue: Float by remember { mutableFloatStateOf(getHSV(initialColor)[0]) }
+    var currentSat: Float by remember { mutableFloatStateOf(getHSV(initialColor)[1]) }
+    var currentVal: Float by remember { mutableFloatStateOf(getHSV(initialColor)[2]) }
 
     /* The measured position of the SatValPainter. */
     var offsetSatVal by remember { mutableStateOf(Offset.Zero) }
@@ -241,7 +241,7 @@ fun ColorPickerComponent(
 
             /* Sat/Val Panel */
             Image(
-                contentDescription = "Sat/Val by Hue",
+                contentDescription = stringResource(R.string.text_label_panel_sat_val),
                 contentScale = ContentScale.FillBounds,
                 painter = SatValPainter(Size(900F, 900F)).also {
                     it.setAlpha(currentAlpha)
@@ -285,7 +285,7 @@ fun ColorPickerComponent(
 
             /* Hue Panel */
             Image(
-                contentDescription = "Hue",
+                contentDescription = stringResource(R.string.text_label_panel_hue),
                 contentScale = ContentScale.FillBounds,
                 painter = HuePainter(Size(100F, 900F)).also {
                     it.setValue(currentHue)
@@ -330,7 +330,7 @@ fun ColorPickerComponent(
                     contentAlignment = Alignment.Center
                 ) {
                     Image(
-                        contentDescription = "Alpha Slider",
+                        contentDescription = stringResource(R.string.text_label_panel_alpha),
                         contentScale = ContentScale.FillBounds,
                         painter = AlphaPainter(Size(1014F, 80F)).also {
                             it.setAlphaByColor(currentColor)
@@ -377,7 +377,7 @@ fun ColorPickerComponent(
                     contentAlignment = Alignment.Center
                 ) {
                     Text(
-                        text = "Hex Value: ${toARGB(currentColor)}",
+                        text = stringResource(R.string.text_label_panel_hex_value, toARGB(currentColor)),
                         modifier = Modifier.testTag("hex")
                     )
                 }
@@ -394,7 +394,7 @@ fun ColorPickerComponent(
                 contentAlignment = Alignment.Center
             ) {
                 Image(
-                    contentDescription = "Old Color",
+                    contentDescription = stringResource(R.string.text_label_panel_old_color),
                     contentScale = ContentScale.FillBounds,
                     painter = ColorPainter(Size(422F, 120F)).also {
                         it.setValue(initialColor)
@@ -432,7 +432,7 @@ fun ColorPickerComponent(
             ) {
 
                 Image(
-                    contentDescription = "New Color",
+                    contentDescription = stringResource(R.string.text_label_panel_new_color),
                     contentScale = ContentScale.FillBounds,
                     painter = ColorPainter(Size(422F, 120F)).also {
                         it.setValue(currentColor)

library/src/main/java/io/syslogic/colorpicker/compose/ColorPickerDialog.kt

@@ -45,7 +45,7 @@ fun ColorPickerDialog(
 ) {
 
     /* The value is being initialized by the `initialColor`. */
-    val currentColor: Int by remember { mutableStateOf(initialColor.hashCode()) }
+    val currentColor: Int by remember { mutableIntStateOf(initialColor.hashCode()) }
 
     Dialog(
         onDismissRequest = {

library/src/main/res/layout-land/dialog_fragment_color_picker.xml

@@ -40,7 +40,7 @@
 
                 <io.syslogic.colorpicker.ColorPickerPanelView
                     android:id="@+id/old_color_panel"
-                    android:contentDescription="@string/text_label_old_color_panel"
+                    android:contentDescription="@string/text_label_panel_old_color"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="0.50"/>
@@ -55,7 +55,7 @@
 
                 <io.syslogic.colorpicker.ColorPickerPanelView
                     android:id="@+id/new_color_panel"
-                    android:contentDescription="@string/text_label_new_color_panel"
+                    android:contentDescription="@string/text_label_panel_new_color"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="0.50"/>
@@ -67,7 +67,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical|end"
-                android:hint="@string/text_hexadecimal_value"
+                android:hint="@string/hint_hexadecimal_value"
                 android:imeOptions="actionDone"
                 android:maxLength="7"
                 android:maxLines="1"