Skip to content

Commit 443375d

Browse files
committed
Reworked dashboard./switch adapter logic
1 parent d4a4254 commit 443375d

File tree

8 files changed

+467
-782
lines changed

8 files changed

+467
-782
lines changed

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

Lines changed: 84 additions & 206 deletions
Large diffs are not rendered by default.

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

Lines changed: 98 additions & 228 deletions
Large diffs are not rendered by default.

app/src/main/java/nl/hnogames/domoticz/fragments/Dashboard.java

Lines changed: 77 additions & 104 deletions
Large diffs are not rendered by default.

app/src/main/java/nl/hnogames/domoticz/fragments/Plan.java

Lines changed: 85 additions & 150 deletions
Large diffs are not rendered by default.

app/src/main/java/nl/hnogames/domoticz/fragments/Switches.java

Lines changed: 101 additions & 74 deletions
Large diffs are not rendered by default.

app/src/main/java/nl/hnogames/domoticz/interfaces/switchesClickListener.java

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,41 +23,43 @@
2323

2424
import android.view.View;
2525

26+
import nl.hnogames.domoticzapi.Containers.DevicesInfo;
27+
2628
public interface switchesClickListener {
2729

28-
void onSwitchClick(int idx, boolean action);
30+
void onSwitchClick(DevicesInfo device, boolean action);
2931

30-
void onBlindClick(int idx, int action);
32+
void onBlindClick(DevicesInfo device, int action);
3133

32-
void onDimmerChange(int idx, int value, boolean selector);
34+
void onDimmerChange(DevicesInfo device, int value, boolean selector);
3335

34-
void onButtonClick(int idx, boolean action);
36+
void onButtonClick(DevicesInfo device, boolean action);
3537

36-
void onLogButtonClick(int idx);
38+
void onLogButtonClick(DevicesInfo device);
3739

38-
void onLikeButtonClick(int idx, boolean checked);
40+
void onLikeButtonClick(DevicesInfo device, boolean checked);
3941

40-
void onColorButtonClick(int idx);
42+
void onColorButtonClick(DevicesInfo device);
4143

42-
void onTimerButtonClick(int idx);
44+
void onTimerButtonClick(DevicesInfo device);
4345

44-
void onNotificationButtonClick(int idx);
46+
void onNotificationButtonClick(DevicesInfo device);
4547

46-
void onThermostatClick(int idx);
48+
void onThermostatClick(DevicesInfo device);
4749

48-
void onSetTemperatureClick(int idx);
50+
void onSetTemperatureClick(DevicesInfo device);
4951

50-
void onSecurityPanelButtonClick(int idx);
52+
void onSecurityPanelButtonClick(DevicesInfo device);
5153

52-
void onStateButtonClick(int idx, int itemsRes, int[] itemIds);
54+
void onStateButtonClick(DevicesInfo device, int itemsRes, int[] itemIds);
5355

54-
void onSelectorDimmerClick(int idx, String[] levelNames);
56+
void onSelectorDimmerClick(DevicesInfo device, String[] levelNames);
5557

56-
void onSelectorChange(int idx, int l);
58+
void onSelectorChange(DevicesInfo device, int l);
5759

5860
void onItemClicked(View v, int position);
5961

60-
boolean onItemLongClicked(int idx);
62+
boolean onItemLongClicked(DevicesInfo device);
6163

62-
void onCameraFullScreenClick(int idx, String name);
64+
void onCameraFullScreenClick(DevicesInfo device, String name);
6365
}

app/version.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Mon Mar 06 08:13:11 CET 2023
2-
VERSION_BUILD=9301
1+
#Sat Apr 15 14:20:26 CEST 2023
2+
VERSION_BUILD=9307
33
VERSION_CODE=666
44
VERSION_PATCH=355

domoticzapi/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Mon Mar 06 08:13:13 CET 2023
1+
#Sat Apr 15 14:20:27 CEST 2023
22
VERSION_BUILD=3675
33
VERSION_CODE=254
44
VERSION_PATCH=254

0 commit comments

Comments
 (0)