Skip to content

Commit cab7602

Browse files
galadrilgaladril
committed
Working on the new style rows/layouts
1 parent af679d5 commit cab7602

24 files changed

+294
-292
lines changed

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

+6-38
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Data
9898
DomoticzValues.Device.ModalSwitch.Action.CUSTOM,
9999
DomoticzValues.Device.ModalSwitch.Action.HEATING_OFF
100100
};
101-
private final boolean showAsList;
102101
private final Context context;
103102
private final switchesClickListener listener;
104103
private final SharedPrefUtil mSharedPrefs;
@@ -118,12 +117,10 @@ public DashboardAdapter(Context context,
118117
ServerUtil serverUtil,
119118
ArrayList<DevicesInfo> data,
120119
switchesClickListener listener,
121-
boolean showAsList,
122120
SunRiseInfo sunriseInfo) {
123121
super();
124122

125123
this.domoticz = StaticHelper.getDomoticz(context);
126-
this.showAsList = showAsList;
127124
this.sunriseInfo = sunriseInfo;
128125
mSharedPrefs = new SharedPrefUtil(context);
129126

@@ -218,17 +215,9 @@ public DataObjectHolder onCreateViewHolder(ViewGroup parent, int viewType) {
218215

219216
// Check if we're running on Android 5.0 or higher
220217
if (Build.VERSION.SDK_INT >= 21) {
221-
if (showAsList)
222-
row = LayoutInflater.from(parent.getContext())
223-
.inflate(R.layout.dashboard_row_list, parent, false);
224-
else
225218
row = LayoutInflater.from(parent.getContext())
226219
.inflate(R.layout.dashboard_row, parent, false);
227220
} else {
228-
if (showAsList)
229-
row = LayoutInflater.from(parent.getContext())
230-
.inflate(R.layout.dashboard_row_list_noads, parent, false);
231-
else
232221
row = LayoutInflater.from(parent.getContext())
233222
.inflate(R.layout.dashboard_row_noads, parent, false);
234223
}
@@ -330,13 +319,8 @@ private void setSwitchRowData(DevicesInfo mDeviceInfo,
330319
}
331320
break;
332321
default:
333-
if (mSharedPrefs.showSwitchesAsButtons()) {
334-
setButtons(holder, Buttons.BUTTONS);
335-
setOnOffButtonRowData(mDeviceInfo, holder);
336-
} else {
337322
setButtons(holder, Buttons.SWITCH);
338323
setOnOffSwitchRowData(mDeviceInfo, holder);
339-
}
340324
break;
341325
}
342326
break;
@@ -368,21 +352,11 @@ private void setSwitchRowData(DevicesInfo mDeviceInfo,
368352
case DomoticzValues.Device.Type.Value.DIMMER:
369353
if (mDeviceInfo.getSubType().startsWith(DomoticzValues.Device.SubType.Name.RGB) ||
370354
mDeviceInfo.getSubType().startsWith(DomoticzValues.Device.SubType.Name.WW)) {
371-
if (mSharedPrefs.showSwitchesAsButtons()) {
372-
setButtons(holder, Buttons.DIMMER_BUTTONS);
373-
setDimmerOnOffButtonRowData(mDeviceInfo, holder, true);
374-
} else {
375355
setButtons(holder, Buttons.DIMMER_RGB);
376356
setDimmerRowData(mDeviceInfo, holder, true);
377-
}
378357
} else {
379-
if (mSharedPrefs.showSwitchesAsButtons()) {
380-
setButtons(holder, Buttons.DIMMER_BUTTONS);
381-
setDimmerOnOffButtonRowData(mDeviceInfo, holder, false);
382-
} else {
383358
setButtons(holder, Buttons.DIMMER);
384359
setDimmerRowData(mDeviceInfo, holder, false);
385-
}
386360
}
387361
break;
388362

@@ -401,13 +375,8 @@ private void setSwitchRowData(DevicesInfo mDeviceInfo,
401375
break;
402376

403377
case DomoticzValues.Device.Type.Value.SELECTOR:
404-
if (mSharedPrefs.showSwitchesAsButtons()) {
405-
setButtons(holder, Buttons.SELECTOR_BUTTONS);
406-
setSelectorRowData(mDeviceInfo, holder);
407-
} else {
408378
setButtons(holder, Buttons.SELECTOR);
409379
setSelectorRowData(mDeviceInfo, holder);
410-
}
411380
break;
412381

413382
case DomoticzValues.Device.Type.Value.BLINDS:
@@ -477,15 +446,14 @@ private void setDefaultRowData(DevicesInfo mDeviceInfo,
477446
if (mDeviceInfo.getUsage() != null && mDeviceInfo.getUsage().length() > 0) {
478447
try {
479448
setAlphaIcon = false;
480-
int usage = Integer.parseInt(mDeviceInfo.getUsage().replace("Watt", "").trim());
449+
int usage = Integer.parseInt(mDeviceInfo.getUsage().replace("W", "").trim());
481450
if (mDeviceInfo.getUsageDeliv() != null && mDeviceInfo.getUsageDeliv().length() > 0) {
482-
int usagedel = Integer.parseInt(mDeviceInfo.getUsageDeliv().replace("Watt", "").trim());
483-
text = context.getString(R.string.usage) + ": " + (usage - usagedel) + " Watt";
484-
holder.switch_battery_level.setText(text);
451+
int usagedel = Integer.parseInt(mDeviceInfo.getUsageDeliv().replace("W", "").trim());
452+
text = context.getString(R.string.usage) + ": " + (usage - usagedel) + " W";
485453
} else {
486454
text = context.getString(R.string.usage) + ": " + mDeviceInfo.getUsage();
487-
holder.switch_battery_level.setText(text);
488455
}
456+
holder.switch_battery_level.setText(text);
489457
} catch (Exception ex) {
490458
text = context.getString(R.string.usage) + ": " + mDeviceInfo.getUsage();
491459
holder.switch_battery_level.setText(text);
@@ -1866,10 +1834,10 @@ public void setButtons(DataObjectHolder holder, int button) {
18661834
holder.switch_name.setVisibility(View.VISIBLE);
18671835

18681836
holder.infoIcon.setVisibility(View.GONE);
1869-
if (!showAsList) {
18701837
ViewGroup.MarginLayoutParams p = (ViewGroup.MarginLayoutParams) holder.iconRow.getLayoutParams();
18711838
p.topMargin = 20;
1872-
}
1839+
1840+
holder.switch_battery_level.setVisibility(View.VISIBLE);
18731841
switch (button) {
18741842
case Buttons.CLOCK:
18751843
if (holder.contentWrapper != null)

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

-20
Original file line numberDiff line numberDiff line change
@@ -325,13 +325,8 @@ private void setSwitchRowData(DevicesInfo mDeviceInfo,
325325
}
326326
break;
327327
default:
328-
if (mSharedPrefs.showSwitchesAsButtons()) {
329-
setButtons(holder, Buttons.BUTTONS);
330-
setOnOffButtonRowData(mDeviceInfo, holder);
331-
} else {
332328
setButtons(holder, Buttons.SWITCH);
333329
setOnOffSwitchRowData(mDeviceInfo, holder);
334-
}
335330
break;
336331
}
337332
break;
@@ -363,21 +358,11 @@ private void setSwitchRowData(DevicesInfo mDeviceInfo,
363358
case DomoticzValues.Device.Type.Value.DIMMER:
364359
if (mDeviceInfo.getSubType().startsWith(DomoticzValues.Device.SubType.Name.RGB) ||
365360
mDeviceInfo.getSubType().startsWith(DomoticzValues.Device.SubType.Name.WW)) {
366-
if (mSharedPrefs.showSwitchesAsButtons()) {
367-
setButtons(holder, Buttons.DIMMER_BUTTONS);
368-
setDimmerOnOffButtonRowData(mDeviceInfo, holder, true);
369-
} else {
370361
setButtons(holder, Buttons.DIMMER_RGB);
371362
setDimmerRowData(mDeviceInfo, holder, true);
372-
}
373363
} else {
374-
if (mSharedPrefs.showSwitchesAsButtons()) {
375-
setButtons(holder, Buttons.DIMMER_BUTTONS);
376-
setDimmerOnOffButtonRowData(mDeviceInfo, holder, false);
377-
} else {
378364
setButtons(holder, Buttons.DIMMER);
379365
setDimmerRowData(mDeviceInfo, holder, false);
380-
}
381366
}
382367
break;
383368

@@ -396,13 +381,8 @@ private void setSwitchRowData(DevicesInfo mDeviceInfo,
396381
break;
397382

398383
case DomoticzValues.Device.Type.Value.SELECTOR:
399-
if (mSharedPrefs.showSwitchesAsButtons()) {
400-
setButtons(holder, Buttons.SELECTOR_BUTTONS);
401-
setSelectorRowData(mDeviceInfo, holder);
402-
} else {
403384
setButtons(holder, Buttons.SELECTOR);
404385
setSelectorRowData(mDeviceInfo, holder);
405-
}
406386
break;
407387

408388
case DomoticzValues.Device.Type.Value.BLINDS:

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -330,14 +330,14 @@ private void createListView(ArrayList<DevicesInfo> switches, SunRiseInfo sunrise
330330
try {
331331
final switchesClickListener listener = this;
332332
if (adapter == null) {
333-
if (this.planID <= 0) {
334-
adapter = new DashboardAdapter(mContext, getServerUtil(), switches, listener, false, sunrise);
335-
} else {
333+
//if (this.planID <= 0) {
334+
adapter = new DashboardAdapter(mContext, getServerUtil(), switches, listener, sunrise);
335+
/*} else {
336336
gridView.setHasFixedSize(true);
337337
GridLayoutManager mLayoutManager = new GridLayoutManager(getActivity(), 1);
338338
gridView.setLayoutManager(mLayoutManager);
339-
adapter = new DashboardAdapter(mContext, getServerUtil(), switches, listener, true, sunrise);
340-
}
339+
adapter = new DashboardAdapter(mContext, getServerUtil(), switches, listener, sunrise);
340+
}*/
341341
alphaSlideIn = new SlideInBottomAnimationAdapter(adapter);
342342
gridView.setAdapter(adapter);
343343

‎app/src/main/java/nl/hnogames/domoticz/preference/PreferenceFragment.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ private void setPreferences() {
224224
// Generic settings
225225
ListPreference startup_screen = findPreference("startup_nav");
226226
MultiSelectListPreference drawerItems = findPreference("show_nav_items");
227-
SwitchPreference switchButtonsPreference = findPreference("switchButtons");
228227
SwitchPreference CameraPreference = findPreference("dashboardShowCamera");
229228
SwitchPreference AlwaysOnPreference = findPreference("alwayson");
230229
SwitchPreference RefreshScreenPreference = findPreference("autorefresh");
@@ -325,12 +324,11 @@ private void setPreferences() {
325324

326325
startup_screen.setVisible(UsefulBits.isEmpty(filter) || startup_screen.getTitle().toString().toLowerCase().contains(filter) || (CameraPreference.getSummary() != null && startup_screen.getSummary().toString().toLowerCase().contains(filter)));
327326
drawerItems.setVisible(UsefulBits.isEmpty(filter) || drawerItems.getTitle().toString().toLowerCase().contains(filter) || (drawerItems.getSummary() != null && drawerItems.getSummary().toString().toLowerCase().contains(filter)));
328-
switchButtonsPreference.setVisible(UsefulBits.isEmpty(filter) || switchButtonsPreference.getTitle().toString().toLowerCase().contains(filter) || (switchButtonsPreference.getSummary() != null && switchButtonsPreference.getSummary().toString().toLowerCase().contains(filter)));
329327
CameraPreference.setVisible(UsefulBits.isEmpty(filter) || CameraPreference.getTitle().toString().toLowerCase().contains(filter) || (CameraPreference.getSummary() != null && CameraPreference.getSummary().toString().toLowerCase().contains(filter)));
330328
AlwaysOnPreference.setVisible(UsefulBits.isEmpty(filter) || AlwaysOnPreference.getTitle().toString().toLowerCase().contains(filter) || (AlwaysOnPreference.getSummary() != null && AlwaysOnPreference.getSummary().toString().toLowerCase().contains(filter)));
331329
RefreshScreenPreference.setVisible(UsefulBits.isEmpty(filter) || RefreshScreenPreference.getTitle().toString().toLowerCase().contains(filter) || (RefreshScreenPreference.getSummary() != null && RefreshScreenPreference.getSummary().toString().toLowerCase().contains(filter)));
332330
RefreshScreenTimerPreference.setVisible(UsefulBits.isEmpty(filter) || RefreshScreenTimerPreference.getTitle().toString().toLowerCase().contains(filter) || (RefreshScreenTimerPreference.getSummary() != null && RefreshScreenTimerPreference.getSummary().toString().toLowerCase().contains(filter)));
333-
generic_category.setVisible(startup_screen.isVisible() || drawerItems.isVisible() || switchButtonsPreference.isVisible() || CameraPreference.isVisible() || AlwaysOnPreference.isVisible() || RefreshScreenPreference.isVisible() || RefreshScreenTimerPreference.isVisible());
331+
generic_category.setVisible(startup_screen.isVisible() || drawerItems.isVisible() || CameraPreference.isVisible() || AlwaysOnPreference.isVisible() || RefreshScreenPreference.isVisible() || RefreshScreenTimerPreference.isVisible());
334332

335333
// Default values settings
336334
oTemperatureMin.setVisible(UsefulBits.isEmpty(filter) || oTemperatureMin.getTitle().toString().toLowerCase().contains(filter) || (oTemperatureMin.getSummary() != null && oTemperatureMin.getSummary().toString().toLowerCase().contains(filter)));

‎app/src/main/java/nl/hnogames/domoticz/utils/SharedPrefUtil.java

-6
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ public class SharedPrefUtil {
134134
@SuppressWarnings("FieldCanBeLocal")
135135
private final String PREF_LOCK_SORT_CUSTOM = "lockSortCustom";
136136
@SuppressWarnings("FieldCanBeLocal")
137-
private final String PREF_SWITCH_BUTTONS = "switchButtons";
138-
@SuppressWarnings("FieldCanBeLocal")
139137
private final Context mContext;
140138
private final SharedPreferences prefs;
141139
private final SharedPreferences.Editor editor;
@@ -157,10 +155,6 @@ public boolean addCameraToDashboard() {
157155
return prefs.getBoolean(PREF_DASHBOARD_CAMERA, false);
158156
}
159157

160-
public boolean showSwitchesAsButtons() {
161-
return prefs.getBoolean(PREF_SWITCH_BUTTONS, false);
162-
}
163-
164158
public int getAdsCounter() {
165159
return prefs.getInt(PREF_ADS_COUNTER, 0);
166160
}

‎app/src/main/java/nl/hnogames/domoticz/widgets/WidgetProviderSmall.java

-3
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,6 @@ private int withButtons(DevicesInfo s) {
301301
case DomoticzValues.Device.Type.Value.ON_OFF:
302302
case DomoticzValues.Device.Type.Value.MEDIAPLAYER:
303303
case DomoticzValues.Device.Type.Value.DOORCONTACT:
304-
if (mSharedPrefs.showSwitchesAsButtons())
305-
withButton = WITHBUTTON;
306-
else
307304
withButton = WITHBUTTON;
308305
break;
309306

0 commit comments

Comments
 (0)