Skip to content

Commit 03bffaa

Browse files
galadrilgaladril
committed
quick fix some dimmer issues
1 parent 3fd7ff2 commit 03bffaa

File tree

5 files changed

+31
-22
lines changed

5 files changed

+31
-22
lines changed

‎app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ dependencies {
183183
implementation "androidx.car.app:app:1.3.0-rc01"
184184
implementation 'org.reactivestreams:reactive-streams:1.0.3'
185185
implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
186-
implementation 'com.revenuecat.purchases:purchases:6.0.0'
186+
implementation 'com.revenuecat.purchases:purchases:5.6.3'
187187

188188
implementation 'com.google.firebase:firebase-core:21.1.1'
189189
implementation 'com.google.firebase:firebase-iid:21.1.0'

‎app/src/main/java/nl/hnogames/domoticz/adapters/DashboardAdapter.java

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,22 +1193,26 @@ private void setSelectorRowData(final DevicesInfo mDeviceInfo,
11931193
if (mDeviceInfo.isLevelOffHidden())
11941194
levelNames.remove(0);
11951195

1196-
holder.spSelector.setTag(mDeviceInfo);
11971196
if (levelNames != null && levelNames.size() > loadLevel) {
1198-
ArrayAdapter<String> dataAdapter = new ArrayAdapter<String>(context,
1199-
android.R.layout.simple_spinner_item, levelNames);
1197+
ArrayAdapter<String> dataAdapter = new ArrayAdapter<String>(context, android.R.layout.simple_spinner_item, levelNames);
12001198
dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
12011199
holder.spSelector.setAdapter(dataAdapter);
12021200
holder.spSelector.setSelection(loadLevel);
12031201
}
12041202

1203+
holder.spSelector.setTag(mDeviceInfo);
1204+
holder.spSelector.setId(mDeviceInfo.getIdx());
12051205
holder.spSelector.setVisibility(View.VISIBLE);
12061206
holder.spSelector.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
12071207
@Override
12081208
public void onItemSelected(AdapterView<?> arg0, View arg1,
12091209
int arg2, long arg3) {
1210-
String selValue = holder.spSelector.getItemAtPosition(arg2).toString();
1211-
handleSelectorChange((DevicesInfo) arg1.getTag(), selValue, levelNames);
1210+
if ((holder.spSelector.getId()) == mDeviceInfo.getIdx()) {
1211+
holder.spSelector.setId(mDeviceInfo.getIdx() * 3);
1212+
} else {
1213+
String selValue = holder.spSelector.getItemAtPosition(arg2).toString();
1214+
handleSelectorChange(mDeviceInfo, selValue, levelNames);
1215+
}
12121216
}
12131217

12141218
@Override
@@ -1547,9 +1551,11 @@ private void handleStateButtonClick(DevicesInfo device, int itemsRes, int[] item
15471551
}
15481552

15491553
private void handleSelectorChange(DevicesInfo device, String levelName, ArrayList<String> levelNames) {
1550-
for (int i = 0; i < levelNames.size(); i++) {
1551-
if (levelNames.get(i).equals(levelName)) {
1552-
listener.onSelectorChange(device, device.isLevelOffHidden() ? (i * 10) : (i * 10) - 10);
1554+
if(device != null) {
1555+
for (int i = 0; i < levelNames.size(); i++) {
1556+
if (levelNames.get(i).equals(levelName)) {
1557+
listener.onSelectorChange(device, device.isLevelOffHidden() ? (i * 10) : (i * 10) - 10);
1558+
}
15531559
}
15541560
}
15551561
}

‎app/src/main/java/nl/hnogames/domoticz/adapters/SwitchesAdapter.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ private void setBlindsRowData(final DevicesInfo mDeviceInfo,
10381038
});
10391039

10401040
if (holder.dimmer.getVisibility() == View.VISIBLE) {
1041-
holder.dimmer.setTag(mDeviceInfo.getIdx());
1041+
holder.dimmer.setTag(mDeviceInfo);
10421042
holder.dimmer.setValueTo(mDeviceInfo.getMaxDimLevel() <= 0 ? 100 : mDeviceInfo.getMaxDimLevel());
10431043
holder.dimmer.setValue(mDeviceInfo.getLevel() > holder.dimmer.getValueTo() ? holder.dimmer.getValueTo() : mDeviceInfo.getLevel());
10441044
holder.dimmer.setLabelFormatter(value -> (Math.round(value)) + "%");
@@ -1102,22 +1102,23 @@ private void setSelectorRowData(final DevicesInfo mDeviceInfo,
11021102
if (mDeviceInfo.isLevelOffHidden())
11031103
levelNames.remove(0);
11041104

1105-
holder.spSelector.setTag(mDeviceInfo.getIdx());
11061105
if (levelNames != null && levelNames.size() > loadLevel) {
11071106
ArrayAdapter<String> dataAdapter = new ArrayAdapter<>(context,
11081107
android.R.layout.simple_spinner_item, levelNames);
11091108
dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
11101109
holder.spSelector.setAdapter(dataAdapter);
11111110
holder.spSelector.setSelection(loadLevel);
11121111
}
1113-
holder.spSelector.setVisibility(View.VISIBLE);
11141112

1113+
holder.spSelector.setTag(mDeviceInfo);
1114+
holder.spSelector.setId(mDeviceInfo.getIdx());
1115+
holder.spSelector.setVisibility(View.VISIBLE);
11151116
holder.spSelector.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
11161117
@Override
11171118
public void onItemSelected(AdapterView<?> arg0, View arg1,
11181119
int arg2, long arg3) {
1119-
if (((int) holder.spSelector.getTag()) == mDeviceInfo.getIdx()) {
1120-
holder.spSelector.setTag(mDeviceInfo.getIdx() * 3);
1120+
if ((holder.spSelector.getId()) == mDeviceInfo.getIdx()) {
1121+
holder.spSelector.setId(mDeviceInfo.getIdx() * 3);
11211122
} else {
11221123
String selValue = holder.spSelector.getItemAtPosition(arg2).toString();
11231124
handleSelectorChange(mDeviceInfo, selValue, levelNames);
@@ -1453,9 +1454,11 @@ private void handleStateButtonClick(DevicesInfo device, int itemsRes, int[] item
14531454
}
14541455

14551456
private void handleSelectorChange(DevicesInfo device, String levelName, ArrayList<String> levelNames) {
1456-
for (int i = 0; i < levelNames.size(); i++) {
1457-
if (levelNames.get(i).equals(levelName)) {
1458-
listener.onSelectorChange(device, device.isLevelOffHidden() ? (i * 10) : (i * 10) - 10);
1457+
if(device != null) {
1458+
for (int i = 0; i < levelNames.size(); i++) {
1459+
if (levelNames.get(i).equals(levelName)) {
1460+
listener.onSelectorChange(device, device.isLevelOffHidden() ? (i * 10) : (i * 10) - 10);
1461+
}
14591462
}
14601463
}
14611464
}

‎app/version.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Sun Apr 16 13:25:04 CEST 2023
2-
VERSION_BUILD=9312
3-
VERSION_CODE=667
4-
VERSION_PATCH=356
1+
#Mon Apr 17 19:04:13 CEST 2023
2+
VERSION_BUILD=9320
3+
VERSION_CODE=668
4+
VERSION_PATCH=357

‎domoticzapi/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Sun Apr 16 13:25:04 CEST 2023
1+
#Mon Apr 17 19:04:13 CEST 2023
22
VERSION_BUILD=3675
33
VERSION_CODE=254
44
VERSION_PATCH=254

0 commit comments

Comments
 (0)