Skip to content

Commit ae7f9e7

Browse files
galadrilgaladril
committed
Small layout rework
1 parent 0221348 commit ae7f9e7

File tree

5 files changed

+28
-31
lines changed

5 files changed

+28
-31
lines changed

‎app/src/main/java/nl/hnogames/domoticz/app/DomoticzRecyclerFragment.java

+12-13
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,9 @@ public void initViews(View root) {
142142
setGridViewLayout();
143143
mSwipeRefreshLayout = root.findViewById(R.id.swipe_refresh_layout);
144144

145-
View.OnClickListener onSortClick = new View.OnClickListener() {
146-
@Override
147-
public void onClick(View v) {
148-
sortFragment(String.valueOf(((MaterialButton) v).getText()));
149-
toggleBackDrop();
150-
}
145+
View.OnClickListener onSortClick = v -> {
146+
sortFragment(String.valueOf(((MaterialButton) v).getText()));
147+
toggleBackDrop();
151148
};
152149
if (getActivity() instanceof MainActivity)
153150
frameLayout = ((MainActivity) getActivity()).frameLayout;
@@ -158,12 +155,9 @@ public void onClick(View v) {
158155

159156
btnCheckSettings = root.findViewById(R.id.btnCheckSettings);
160157
if (btnCheckSettings != null) {
161-
btnCheckSettings.setOnClickListener(new View.OnClickListener() {
162-
@Override
163-
public void onClick(View v) {
164-
if (getActivity() instanceof MainActivity) {
165-
((MainActivity) getActivity()).OpenSettings();
166-
}
158+
btnCheckSettings.setOnClickListener(v -> {
159+
if (getActivity() instanceof MainActivity) {
160+
((MainActivity) getActivity()).OpenSettings();
167161
}
168162
});
169163
}
@@ -229,7 +223,12 @@ public void setGridViewLayout() {
229223
gridView.setLayoutManager(mLayoutManager);
230224
}
231225
} else {
232-
StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(1, StaggeredGridLayoutManager.VERTICAL);
226+
StaggeredGridLayoutManager mLayoutManager;
227+
if (isPortrait) {
228+
mLayoutManager = new StaggeredGridLayoutManager(1, StaggeredGridLayoutManager.VERTICAL);
229+
} else {
230+
mLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
231+
}
233232
gridView.setLayoutManager(mLayoutManager);
234233
}
235234
gridView.setItemAnimator(new SlideInUpAnimator(new OvershootInterpolator(1f)));

‎app/src/main/res/layout/dashboard_row.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,9 @@
300300
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
301301
android:layout_width="60dp"
302302
android:layout_height="wrap_content"
303+
android:layout_marginLeft="8dp"
304+
android:layout_weight="1"
303305
android:layout_gravity="right"
304-
android:gravity="right"
305306
android:foregroundGravity="right"
306307
android:text="@string/button_state_on"
307308
android:textColor="?attr/buttonTextColor"
@@ -313,7 +314,6 @@
313314
android:layout_width="60dp"
314315
android:layout_height="wrap_content"
315316
android:layout_gravity="right"
316-
android:gravity="right"
317317
android:foregroundGravity="right"
318318
android:layout_marginLeft="7dp"
319319
android:layout_weight="1"
@@ -327,7 +327,6 @@
327327
android:layout_width="56dp"
328328
android:layout_height="wrap_content"
329329
android:layout_gravity="right"
330-
android:gravity="right"
331330
android:foregroundGravity="right"
332331
android:text="@string/set_temperature"
333332
android:textColor="?attr/buttonTextColor"

‎app/src/main/res/layout/dashboard_row_noads.xml

+11-12
Original file line numberDiff line numberDiff line change
@@ -261,18 +261,18 @@
261261
android:layout_height="wrap_content"
262262
android:layout_below="@+id/textwrapper"
263263
android:layout_gravity="right"
264-
android:gravity="right"
265264
android:foregroundGravity="right"
265+
android:gravity="right"
266266
android:orientation="horizontal">
267267

268268
<az.plainpie.PieView
269269
android:id="@+id/pieView"
270270
android:layout_width="60dp"
271271
android:layout_height="60dp"
272-
android:layout_marginTop="7dp"
273272
android:layout_gravity="right"
274-
android:gravity="right"
273+
android:layout_marginTop="7dp"
275274
android:foregroundGravity="right"
275+
android:gravity="right"
276276
plainpie:inner_pie_padding="5"
277277
plainpie:inner_text_visibility="true"
278278
plainpie:percentage="50"
@@ -283,17 +283,18 @@
283283
android:layout_width="wrap_content"
284284
android:layout_height="wrap_content"
285285
android:layout_gravity="right"
286-
android:gravity="right"
287286
android:foregroundGravity="right"
287+
android:gravity="right"
288288
app:useMaterialThemeColors="false" />
289289

290290
<com.google.android.material.button.MaterialButton
291291
android:id="@+id/on_button"
292292
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
293293
android:layout_width="60dp"
294294
android:layout_height="wrap_content"
295+
android:layout_marginLeft="8dp"
296+
android:layout_weight="1"
295297
android:layout_gravity="right"
296-
android:gravity="right"
297298
android:foregroundGravity="right"
298299
android:text="@string/button_state_on"
299300
android:textColor="?attr/buttonTextColor"
@@ -305,10 +306,9 @@
305306
android:layout_width="60dp"
306307
android:layout_height="wrap_content"
307308
android:layout_gravity="right"
308-
android:gravity="right"
309-
android:foregroundGravity="right"
310309
android:layout_marginLeft="7dp"
311310
android:layout_weight="1"
311+
android:foregroundGravity="right"
312312
android:text="@string/button_state_off"
313313
android:textColor="?attr/buttonTextColor"
314314
android:textSize="10dp" />
@@ -319,7 +319,6 @@
319319
android:layout_width="56dp"
320320
android:layout_height="wrap_content"
321321
android:layout_gravity="right"
322-
android:gravity="right"
323322
android:foregroundGravity="right"
324323
android:text="@string/set_temperature"
325324
android:textColor="?attr/buttonTextColor"
@@ -330,10 +329,10 @@
330329
android:layout_width="25dp"
331330
android:layout_height="25dp"
332331
android:layout_gravity="right"
333-
android:gravity="right"
334-
android:foregroundGravity="right"
335332
android:layout_margin="7dp"
336333
android:layout_marginTop="10dp"
334+
android:foregroundGravity="right"
335+
android:gravity="right"
337336
android:src="@drawable/baseline_keyboard_arrow_up_black_24"
338337
app:tint="@color/primary" />
339338

@@ -342,10 +341,10 @@
342341
android:layout_width="25dp"
343342
android:layout_height="25dp"
344343
android:layout_gravity="right"
345-
android:gravity="right"
346-
android:foregroundGravity="right"
347344
android:layout_margin="7dp"
348345
android:layout_marginTop="10dp"
346+
android:foregroundGravity="right"
347+
android:gravity="right"
349348
android:src="@drawable/baseline_stop_black_24"
350349
app:tint="@color/primary" />
351350

‎app/version.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Mon May 30 20:07:15 CEST 2022
2-
VERSION_BUILD=8833
1+
#Tue May 31 13:19:17 CEST 2022
2+
VERSION_BUILD=8842
33
VERSION_CODE=627
44
VERSION_PATCH=322

‎domoticzapi/version.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Mon May 30 20:07:15 CEST 2022
1+
#Tue May 31 13:19:17 CEST 2022
22
VERSION_BUILD=3675
33
VERSION_CODE=254
44
VERSION_PATCH=254

0 commit comments

Comments
 (0)