diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HRConfigActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HRConfigActivity.java index ba104f634..c506b65eb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HRConfigActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HRConfigActivity.java @@ -1,5 +1,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid; +import android.annotation.SuppressLint; import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; @@ -188,7 +189,6 @@ public class HRConfigActivity extends AbstractGBActivity implements View.OnClick JSONObject widgetObject = new JSONObject(); widgetObject .put("name", widget.getName()) - .put("drawCircle", widget.getDrawCircle()) .put("elements", elementArray); widgetArray.put(widgetObject); @@ -209,7 +209,7 @@ public class HRConfigActivity extends AbstractGBActivity implements View.OnClick for (int i = 0; i < customWidgets.length(); i++) { JSONObject customWidgetObject = customWidgets.getJSONObject(i); CustomWidget widget = new CustomWidget( - customWidgetObject.getString("name"), 0, 0, "default", false // FIXME: handle force white background + customWidgetObject.getString("name"), 0, 0, "default" // FIXME: handle force white background ); JSONArray elements = customWidgetObject.getJSONArray("elements"); @@ -475,6 +475,7 @@ public class HRConfigActivity extends AbstractGBActivity implements View.OnClick super(HRConfigActivity.this, 0, objects); } + @SuppressLint("ResourceType") @NonNull @Override public View getView(final int position, @Nullable View convertView, @NonNull ViewGroup parent) { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/WidgetSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/WidgetSettingsActivity.java index 06dc97b4c..b5d863345 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/WidgetSettingsActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/WidgetSettingsActivity.java @@ -50,10 +50,9 @@ public class WidgetSettingsActivity extends AbstractGBActivity { if(getIntent().hasExtra("EXTRA_WIDGET")){ subject = (CustomWidget) getIntent().getExtras().get("EXTRA_WIDGET"); ((EditText) findViewById(R.id.qhybrid_widget_name)).setText(subject.getName()); - ((CheckBox)findViewById(R.id.qhybrid_widget_circle)).setChecked(subject.getDrawCircle()); resultCode = RESULT_CODE_WIDGET_UPDATED; }else{ - subject = new CustomWidget("", 0, 63, "default", false); // FIXME: handle force white background + subject = new CustomWidget("", 0, 63, "default"); // FIXME: handle force white background resultCode = RESULT_CODE_WIDGET_CREATED; findViewById(R.id.qhybrid_widget_delete).setEnabled(false); } @@ -96,13 +95,6 @@ public class WidgetSettingsActivity extends AbstractGBActivity { showElementDialog(null); } }); - - ((CheckBox)findViewById(R.id.qhybrid_widget_circle)).setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton compoundButton, boolean b) { - subject.setDrawCircle(b); - } - }); } private void showElementDialog(@Nullable final CustomWidgetElement element){ diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java index 9d7721a20..4e947f786 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java @@ -199,8 +199,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter { customWidget.getString("name"), positionMap.get(position), 63, - fontColor, - drawCircle + fontColor ); JSONArray elements = customWidget.getJSONArray("elements"); @@ -266,7 +265,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter { boolean backgroundDrawn = false; - if(widget.getDrawCircle() && !backgroundDrawn){ + if(!backgroundDrawn){ Paint circlePaint = new Paint(); circlePaint.setColor(forceWhiteBackground ? Color.WHITE : Color.BLACK); circlePaint.setStyle(Paint.Style.FILL); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomWidget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomWidget.java index 1440d7aff..d6f1f0af3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomWidget.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomWidget.java @@ -9,22 +9,12 @@ public class CustomWidget extends Widget { private ArrayList elements = new ArrayList<>(); private int angle, distance; private String name; - private boolean drawCircle; - public CustomWidget(String name, int angle, int distance, String fontColor, boolean drawCircle) { + public CustomWidget(String name, int angle, int distance, String fontColor) { super(null, angle, distance, fontColor); this.angle = angle; this.distance = distance; this.name = name; - this.drawCircle = drawCircle; - } - - public boolean getDrawCircle(){ - return this.drawCircle; - } - - public void setDrawCircle(boolean drawCircle){ - this.drawCircle = drawCircle; } public int getAngle() { diff --git a/app/src/main/res/layout/qhybrid_activity_widget_settings.xml b/app/src/main/res/layout/qhybrid_activity_widget_settings.xml index d84138554..a5c25077b 100644 --- a/app/src/main/res/layout/qhybrid_activity_widget_settings.xml +++ b/app/src/main/res/layout/qhybrid_activity_widget_settings.xml @@ -43,12 +43,6 @@ android:layout_height="wrap_content" android:text="add element" /> - -