MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-27 12:26:48 +01:00
Code Releases Wiki Activity

Fossil Hybrid HR: Add timezone selector for 2nd TZ widget

Browse Source
This commit is contained in:
Arjan Schrijver 2021-08-08 22:47:25 +02:00 committed by Gitea
parent 9f2759a43c
commit 2e3c409e02
7 changed files with 94 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/assets/fossil_hr/openSourceWatchface.bin
View File

Binary file not shown.

BIN
app/src/main/assets/fossil_hr/widget2ndTZ.bin
View File

Binary file not shown.

55
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceDesignerActivity.java
View File

@ -41,6 +41,7 @@ import android.view.DragEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox;
@ -67,8 +68,10 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.TimeZone;
import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@ -328,6 +331,7 @@ public class HybridHRWatchfaceDesignerActivity extends AbstractGBActivity implem
JSONObject layoutItem = layout.getJSONObject(i);
if (layoutItem.getString("type").equals("comp")) {
String widgetName = layoutItem.getString("name");
String widgetTimezone = null;
switch (widgetName) {
case "dateSSE":
widgetName = "widgetDate";
@ -357,11 +361,20 @@ public class HybridHRWatchfaceDesignerActivity extends AbstractGBActivity implem
widgetName = "widget2ndTZ";
break;
}
if (widgetName.equals("widget2ndTZ")) {
try {
JSONObject widgetData = layoutItem.getJSONObject("data");
widgetTimezone = widgetData.getString("tzName");
} catch (JSONException e) {
LOG.error("Couldn't determine tzName!", e);
}
}
int widgetColor = layoutItem.getString("color").equals("white") ? HybridHRWatchfaceWidget.COLOR_WHITE : HybridHRWatchfaceWidget.COLOR_BLACK;
widgets.add(new HybridHRWatchfaceWidget(widgetName,
layoutItem.getJSONObject("pos").getInt("x"),
layoutItem.getJSONObject("pos").getInt("y"),
widgetColor));
widgetColor,
widgetTimezone));
}
}
} catch (JSONException e) {
@ -541,6 +554,33 @@ public class HybridHRWatchfaceDesignerActivity extends AbstractGBActivity implem
posY.setText("120");
}
});
// Populate timezone spinner
String[] timezonesList = TimeZone.getAvailableIDs();
final Spinner tzSpinner = layout.findViewById(R.id.watchface_widget_timezone_spinner);
final LinearLayout timezoneLayout = layout.findViewById(R.id.watchface_widget_timezone_layout);
timezoneLayout.setVisibility(View.GONE);
ArrayAdapter<String> widgetTZAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, timezonesList);
tzSpinner.setAdapter(widgetTZAdapter);
if ((widget != null) && (Arrays.asList(timezonesList).contains(widget.getTimezone()))) {
tzSpinner.setSelection(Arrays.asList(timezonesList).indexOf(widget.getTimezone()));
} else {
tzSpinner.setSelection(Arrays.asList(timezonesList).indexOf("Etc/UTC"));
}
// Show timezone spinner only when 2nd TZ widget is selected
typeSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
String selectedType = widgetTypesArray.get(typeSpinner.getSelectedItemPosition());
if (selectedType.equals("widget2ndTZ")) {
timezoneLayout.setVisibility(View.VISIBLE);
} else {
timezoneLayout.setVisibility(View.GONE);
}
}
@Override
public void onNothingSelected(AdapterView<?> parent) { }
});
// Show dialog
new AlertDialog.Builder(this)
.setView(layout)
.setNegativeButton(R.string.fossil_hr_edit_action_delete, new DialogInterface.OnClickListener() {
@ -570,10 +610,17 @@ public class HybridHRWatchfaceDesignerActivity extends AbstractGBActivity implem
if (selectedPosY < 1) selectedPosY = 1;
if (selectedPosY > 240) selectedPosY = 240;
String selectedType = widgetTypesArray.get(typeSpinner.getSelectedItemPosition());
if (index >= 0) {
widgets.set(index, new HybridHRWatchfaceWidget(selectedType, selectedPosX, selectedPosY, colorSpinner.getSelectedItemPosition()));
String selectedTZ = tzSpinner.getSelectedItem().toString();
HybridHRWatchfaceWidget widgetConfig;
if (selectedType.equals("widget2ndTZ")) {
widgetConfig = new HybridHRWatchfaceWidget(selectedType, selectedPosX, selectedPosY, colorSpinner.getSelectedItemPosition(), selectedTZ);
} else {
widgets.add(new HybridHRWatchfaceWidget(selectedType, selectedPosX, selectedPosY, colorSpinner.getSelectedItemPosition()));
widgetConfig = new HybridHRWatchfaceWidget(selectedType, selectedPosX, selectedPosY, colorSpinner.getSelectedItemPosition());
}
if (index >= 0) {
widgets.set(index, widgetConfig);
} else {
widgets.add(widgetConfig);
}
renderWatchfacePreview();
}

16
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java
View File

@ -30,6 +30,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.TimeZone;
import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.image.ImageConverter;
@ -70,11 +71,26 @@ public class HybridHRWatchfaceFactory {
case "widgetCalories":
case "widgetActiveMins":
case "widgetChanceOfRain":
widget.put("type", "comp");
widget.put("name", widgetDesc.getWidgetType());
widget.put("goal_ring", false);
widget.put("color", widgetDesc.getColor() == HybridHRWatchfaceWidget.COLOR_WHITE ? "white" : "black");
break;
case "widget2ndTZ":
widget.put("type", "comp");
widget.put("name", widgetDesc.getWidgetType());
widget.put("goal_ring", false);
widget.put("color", widgetDesc.getColor() == HybridHRWatchfaceWidget.COLOR_WHITE ? "white" : "black");
if (widgetDesc.getTimezone() != null) {
JSONObject data = new JSONObject();
TimeZone tz = TimeZone.getTimeZone(widgetDesc.getTimezone());
String tzShortName = widgetDesc.getTimezone().replaceAll(".*/", "");
int tzOffsetMins = tz.getRawOffset() / 1000 / 60;
data.put("tzName", widgetDesc.getTimezone());
data.put("loc", tzShortName);
data.put("utc", tzOffsetMins);
widget.put("data", data);
}
break;
default:
LOG.warn("Invalid widget name: " + widgetDesc.getWidgetType());

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidget.java
View File

@ -32,6 +32,7 @@ public class HybridHRWatchfaceWidget {
private int posX;
private int posY;
private int color = 0;
private String timezone;
public static int COLOR_WHITE = 0;
public static int COLOR_BLACK = 1;
@ -42,6 +43,11 @@ public class HybridHRWatchfaceWidget {
this.posY = posY;
this.color = color;
}
public HybridHRWatchfaceWidget(String widgetType, int posX, int posY, int color, String timezone) {
this(widgetType, posX, posY, color);
this.timezone = timezone;
}
public static LinkedHashMap<String, String> getAvailableWidgetTypes(Context context) {
LinkedHashMap<String, String> widgetTypes = new LinkedHashMap<>();
@ -73,7 +79,6 @@ public class HybridHRWatchfaceWidget {
public int getPosX() {
return posX;
}
public int getPosY() {
return posY;
}
@ -81,7 +86,6 @@ public class HybridHRWatchfaceWidget {
public void setPosX(int posX) {
this.posX = posX;
}
public void setPosY(int posY) {
this.posY = posY;
}
@ -89,4 +93,8 @@ public class HybridHRWatchfaceWidget {
public int getColor() {
return color;
}
public String getTimezone() {
return timezone;
}
}

17
app/src/main/res/layout/dialog_hybridhr_watchface_widget.xml
View File

@ -76,4 +76,19 @@
android:text="@string/watchface_dialog_widget_preset_right"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/watchface_widget_timezone_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Time zone:" />
<Spinner
android:id="@+id/watchface_widget_timezone_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>

2
external/fossil-hr-watchface vendored

@ -1 +1 @@
Subproject commit 01bd1424dc4c492ab25f3e2824be2aa8bf5b5256
Subproject commit 15aeb1e72595fb285702878632d8a9e42b0eb181