mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-02-02 11:12:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix colour dialog selected colour

Browse Source
This commit is contained in:
Sylvia van Os
2021-07-27 22:04:09 +02:00
parent 5ca4d29a36
commit 96bc10583f
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
View File

@@ -640,7 +640,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
// It can't be null because we set it in updateTempState but SpotBugs insists it can be
// NP_NULL_ON_SOME_PATH: Possible null pointer dereference
if(tempLoyaltyCard.headerColor != null) {
thumbnail.setOnClickListener(new ColorSelectListener(tempLoyaltyCard.headerColor));
thumbnail.setOnClickListener(new ColorSelectListener());
}
// Update from intent
@@ -896,17 +896,16 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
class ColorSelectListener implements View.OnClickListener
{
final int defaultColor;
ColorSelectListener(int defaultColor)
{
this.defaultColor = defaultColor;
}
@Override
public void onClick(View v)
{
ColorPickerDialog dialog = ColorPickerDialog.newBuilder().setColor(defaultColor).create();
ColorPickerDialog.Builder dialogBuilder = ColorPickerDialog.newBuilder();
if (tempLoyaltyCard.headerColor != null) {
dialogBuilder.setColor(tempLoyaltyCard.headerColor);
}
ColorPickerDialog dialog = dialogBuilder.create();
dialog.setColorPickerDialogListener(new ColorPickerDialogListener()
{
@Override