From 49a787161493274928bac0ce944124da21412293 Mon Sep 17 00:00:00 2001 From: vanous Date: Sun, 15 May 2022 13:03:16 +0200 Subject: [PATCH] Sony WF 800n: new icons --- app/src/main/assets/ic_device_sony_800n.svg | 215 ++++++++++++++ .../assets/ic_device_sony_800n_disabled.svg | 268 ++++++++++++++++++ app/src/main/assets/ic_sony_wf_800n_left.svg | 95 +++++++ app/src/main/assets/ic_sony_wf_800n_right.svg | 95 +++++++ app/src/main/assets/sony_800n.svg | 76 +++++ app/src/main/assets/sony_800n_case.svg | 72 +++++ .../coordinators/SonyWFSP800NCoordinator.java | 6 +- .../gadgetbridge/model/DeviceType.java | 2 +- .../res/drawable/ic_device_sony_wf_800n.xml | 14 + .../ic_device_sony_wf_800n_disabled.xml | 15 + .../res/drawable/ic_sony_wf_800n_case.xml | 17 ++ .../res/drawable/ic_sony_wf_800n_left.xml | 39 +++ .../res/drawable/ic_sony_wf_800n_right.xml | 39 +++ 13 files changed, 949 insertions(+), 4 deletions(-) create mode 100644 app/src/main/assets/ic_device_sony_800n.svg create mode 100644 app/src/main/assets/ic_device_sony_800n_disabled.svg create mode 100644 app/src/main/assets/ic_sony_wf_800n_left.svg create mode 100644 app/src/main/assets/ic_sony_wf_800n_right.svg create mode 100644 app/src/main/assets/sony_800n.svg create mode 100644 app/src/main/assets/sony_800n_case.svg create mode 100644 app/src/main/res/drawable/ic_device_sony_wf_800n.xml create mode 100644 app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml create mode 100644 app/src/main/res/drawable/ic_sony_wf_800n_case.xml create mode 100644 app/src/main/res/drawable/ic_sony_wf_800n_left.xml create mode 100644 app/src/main/res/drawable/ic_sony_wf_800n_right.xml diff --git a/app/src/main/assets/ic_device_sony_800n.svg b/app/src/main/assets/ic_device_sony_800n.svg new file mode 100644 index 0000000000..1c8095454d --- /dev/null +++ b/app/src/main/assets/ic_device_sony_800n.svg @@ -0,0 +1,215 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/assets/ic_device_sony_800n_disabled.svg b/app/src/main/assets/ic_device_sony_800n_disabled.svg new file mode 100644 index 0000000000..e43bffb5da --- /dev/null +++ b/app/src/main/assets/ic_device_sony_800n_disabled.svg @@ -0,0 +1,268 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/assets/ic_sony_wf_800n_left.svg b/app/src/main/assets/ic_sony_wf_800n_left.svg new file mode 100644 index 0000000000..d31ea351f4 --- /dev/null +++ b/app/src/main/assets/ic_sony_wf_800n_left.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/assets/ic_sony_wf_800n_right.svg b/app/src/main/assets/ic_sony_wf_800n_right.svg new file mode 100644 index 0000000000..c987dbe934 --- /dev/null +++ b/app/src/main/assets/ic_sony_wf_800n_right.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/assets/sony_800n.svg b/app/src/main/assets/sony_800n.svg new file mode 100644 index 0000000000..9811d475e4 --- /dev/null +++ b/app/src/main/assets/sony_800n.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/assets/sony_800n_case.svg b/app/src/main/assets/sony_800n_case.svg new file mode 100644 index 0000000000..3fd7343f1d --- /dev/null +++ b/app/src/main/assets/sony_800n_case.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java index 806f39e31e..d021ab7c43 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java @@ -53,9 +53,9 @@ public class SonyWFSP800NCoordinator extends SonyHeadphonesCoordinator { @Override public BatteryConfig[] getBatteryConfig() { - final BatteryConfig battery1 = new BatteryConfig(0, R.drawable.ic_tws_case, R.string.battery_case); - final BatteryConfig battery2 = new BatteryConfig(1, R.drawable.ic_galaxy_buds_l, R.string.left_earbud); - final BatteryConfig battery3 = new BatteryConfig(2, R.drawable.ic_galaxy_buds_r, R.string.right_earbud); + final BatteryConfig battery1 = new BatteryConfig(0, R.drawable.ic_sony_wf_800n_case, R.string.battery_case); + final BatteryConfig battery2 = new BatteryConfig(1, R.drawable.ic_sony_wf_800n_left, R.string.left_earbud); + final BatteryConfig battery3 = new BatteryConfig(2, R.drawable.ic_sony_wf_800n_right, R.string.right_earbud); return new BatteryConfig[]{battery1, battery2, battery3}; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java index 841a9161bc..0008e557c4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java @@ -106,7 +106,7 @@ public enum DeviceType { GALAXY_BUDS_LIVE(419, R.drawable.ic_device_galaxy_buds_live, R.drawable.ic_device_galaxy_buds_live_disabled, R.string.devicetype_galaxybuds_live), GALAXY_BUDS(420, R.drawable.ic_device_galaxy_buds, R.drawable.ic_device_galaxy_buds_disabled, R.string.devicetype_galaxybuds), SONY_WH_1000XM3(430, R.drawable.ic_device_headphones, R.drawable.ic_device_headphones_disabled, R.string.devicetype_sony_wh_1000xm3), - SONY_WF_SP800N(431, R.drawable.ic_device_galaxy_buds, R.drawable.ic_device_galaxy_buds_disabled, R.string.devicetype_sony_wf_sp800n), + SONY_WF_SP800N(431, R.drawable.ic_device_sony_wf_800n, R.drawable.ic_device_sony_wf_800n_disabled, R.string.devicetype_sony_wf_sp800n), SONY_WH_1000XM4(432, R.drawable.ic_device_headphones, R.drawable.ic_device_headphones_disabled, R.string.devicetype_sony_wh_1000xm4), BOSE_QC35(440, R.drawable.ic_device_headphones, R.drawable.ic_device_headphones_disabled, R.string.devicetype_bose_qc35), VESC_NRF(500, R.drawable.ic_device_vesc, R.drawable.ic_device_vesc_disabled, R.string.devicetype_vesc), diff --git a/app/src/main/res/drawable/ic_device_sony_wf_800n.xml b/app/src/main/res/drawable/ic_device_sony_wf_800n.xml new file mode 100644 index 0000000000..3eb7be41e2 --- /dev/null +++ b/app/src/main/res/drawable/ic_device_sony_wf_800n.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml b/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml new file mode 100644 index 0000000000..05d51ea7fc --- /dev/null +++ b/app/src/main/res/drawable/ic_device_sony_wf_800n_disabled.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sony_wf_800n_case.xml b/app/src/main/res/drawable/ic_sony_wf_800n_case.xml new file mode 100644 index 0000000000..d03918e1da --- /dev/null +++ b/app/src/main/res/drawable/ic_sony_wf_800n_case.xml @@ -0,0 +1,17 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sony_wf_800n_left.xml b/app/src/main/res/drawable/ic_sony_wf_800n_left.xml new file mode 100644 index 0000000000..c654008046 --- /dev/null +++ b/app/src/main/res/drawable/ic_sony_wf_800n_left.xml @@ -0,0 +1,39 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sony_wf_800n_right.xml b/app/src/main/res/drawable/ic_sony_wf_800n_right.xml new file mode 100644 index 0000000000..e2a1d41458 --- /dev/null +++ b/app/src/main/res/drawable/ic_sony_wf_800n_right.xml @@ -0,0 +1,39 @@ + + + + + + + +