Skip to content

Commit 4be20dc

Browse files
galadrilgaladril
committed
Some fixes for tablets
1 parent 578857c commit 4be20dc

13 files changed

+76
-22
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
4444
setContentView(R.layout.activity_graph);
4545
Toolbar toolbar = findViewById(R.id.toolbar);
4646
setSupportActionBar(toolbar);
47-
this.setTitle(getString(R.string.notification_show_title));
47+
this.setTitle(getString(R.string.title_events));
4848

4949
if (!UsefulBits.isEmpty(mSharedPrefs.getDisplayLanguage()))
5050
UsefulBits.setDisplayLanguage(this, mSharedPrefs.getDisplayLanguage());

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
4444
setContentView(R.layout.activity_graph);
4545
Toolbar toolbar = findViewById(R.id.toolbar);
4646
setSupportActionBar(toolbar);
47-
this.setTitle(getString(R.string.notification_show_title));
47+
this.setTitle(getString(R.string.title_logs));
4848

4949
if (!UsefulBits.isEmpty(mSharedPrefs.getDisplayLanguage()))
5050
UsefulBits.setDisplayLanguage(this, mSharedPrefs.getDisplayLanguage());

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
import nl.hnogames.domoticz.utils.SharedPrefUtil;
109109
import nl.hnogames.domoticz.utils.TalkBackUtil;
110110
import nl.hnogames.domoticz.utils.UsefulBits;
111+
import nl.hnogames.domoticz.utils.ViewUtils;
111112
import nl.hnogames.domoticz.utils.WidgetUtils;
112113
import nl.hnogames.domoticz.welcome.WelcomeViewActivity;
113114
import nl.hnogames.domoticzapi.Containers.ConfigInfo;
@@ -130,7 +131,6 @@ public class MainActivity extends AppCompatPermissionsActivity {
130131
private final int iWelcomeResultCode = 885;
131132
private final int iSettingsResultCode = 995;
132133
private final String TAG = MainActivity.class.getSimpleName();
133-
public boolean onPhone;
134134
public Exception configException;
135135
public FrameLayout frameLayout;
136136
public FloatingActionButton fabSort;
@@ -350,10 +350,6 @@ public void initScreen() {
350350
initTalkBack();
351351
applyLanguage();
352352

353-
TextView usingTabletLayout = findViewById(R.id.tabletLayout);
354-
if (usingTabletLayout == null)
355-
onPhone = true;
356-
357353
if (!fromVoiceWidget && !fromQRCodeWidget) {
358354
GetDomoticzAuthAndConfig();
359355
if (mSharedPrefs.isStartupSecurityEnabled()) {
@@ -922,8 +918,6 @@ public void onCancel() {
922918
changeFragment(String.valueOf(drawerItem.getTag()), true);
923919
stopCameraTimer();
924920
invalidateOptionsMenu();
925-
if (onPhone)
926-
drawer.closeDrawer();
927921
}
928922
}
929923
return false;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
4444
setContentView(R.layout.activity_graph);
4545
Toolbar toolbar = findViewById(R.id.toolbar);
4646
setSupportActionBar(toolbar);
47-
this.setTitle(getString(R.string.notification_show_title));
47+
this.setTitle(getString(R.string.title_vars));
4848

4949
if (!UsefulBits.isEmpty(mSharedPrefs.getDisplayLanguage()))
5050
UsefulBits.setDisplayLanguage(this, mSharedPrefs.getDisplayLanguage());

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import nl.hnogames.domoticz.ui.Backdrop.BackdropContainer;
5858
import nl.hnogames.domoticz.utils.SharedPrefUtil;
5959
import nl.hnogames.domoticz.utils.UsefulBits;
60+
import nl.hnogames.domoticz.utils.ViewUtils;
6061
import nl.hnogames.domoticzapi.Containers.ConfigInfo;
6162
import nl.hnogames.domoticzapi.Containers.UserInfo;
6263
import nl.hnogames.domoticzapi.Domoticz;
@@ -213,11 +214,10 @@ public void setGridViewLayout() {
213214
isPortrait = true;
214215

215216
if (getActivity() instanceof MainActivity) {
216-
isTablet = !((MainActivity) getActivity()).onPhone;
217+
isTablet = ViewUtils.isTablet(getContext());
217218
}
218219

219220
gridView.setHasFixedSize(true);
220-
221221
if (isTablet) {
222222
StaggeredGridLayoutManager mLayoutManager;
223223
if (isPortrait) {

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import nl.hnogames.domoticz.ui.Backdrop.BackdropContainer;
5858
import nl.hnogames.domoticz.utils.SharedPrefUtil;
5959
import nl.hnogames.domoticz.utils.UsefulBits;
60+
import nl.hnogames.domoticz.utils.ViewUtils;
6061
import nl.hnogames.domoticzapi.Containers.ConfigInfo;
6162
import nl.hnogames.domoticzapi.Containers.UserInfo;
6263
import nl.hnogames.domoticzapi.Domoticz;
@@ -216,15 +217,15 @@ public void setGridViewLayout() {
216217
if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT)
217218
isPortrait = true;
218219
if (getActivity() instanceof MainActivity) {
219-
isTablet = !
220-
((MainActivity) getActivity()).onPhone;
220+
isTablet = ViewUtils.isTablet(getContext());
221221
}
222+
222223
if (isTablet) {
223224
if (isPortrait) {
224-
StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(1, StaggeredGridLayoutManager.VERTICAL);
225+
StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
225226
gridView.setLayoutManager(mLayoutManager);
226227
} else {
227-
StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
228+
StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL);
228229
gridView.setLayoutManager(mLayoutManager);
229230
}
230231
} else {

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

+22-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import android.content.Context;
2525
import android.content.Intent;
26+
import android.content.res.Configuration;
2627
import android.os.AsyncTask;
2728
import android.os.Bundle;
2829
import android.util.Log;
@@ -57,6 +58,8 @@
5758
import nl.hnogames.domoticz.utils.PermissionsUtil;
5859
import nl.hnogames.domoticz.utils.SerializableManager;
5960
import nl.hnogames.domoticz.utils.SharedPrefUtil;
61+
import nl.hnogames.domoticz.utils.UsefulBits;
62+
import nl.hnogames.domoticz.utils.ViewUtils;
6063
import nl.hnogames.domoticzapi.Containers.CameraInfo;
6164
import nl.hnogames.domoticzapi.Containers.LoginInfo;
6265
import nl.hnogames.domoticzapi.Interfaces.CameraReceiver;
@@ -181,7 +184,25 @@ private void createListView() {
181184
if (mRecyclerView == null) {
182185
mRecyclerView = getView().findViewById(R.id.my_recycler_view);
183186
mSwipeRefreshLayout = getView().findViewById(R.id.swipe_refresh_layout);
184-
StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
187+
188+
StaggeredGridLayoutManager mLayoutManager;
189+
boolean isPortrait = false;
190+
if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT)
191+
isPortrait = true;
192+
if (ViewUtils.isTablet(context)) {
193+
if (isPortrait) {
194+
mLayoutManager = new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL);
195+
} else {
196+
mLayoutManager = new StaggeredGridLayoutManager(4, StaggeredGridLayoutManager.VERTICAL);
197+
}
198+
} else {
199+
if (isPortrait) {
200+
mLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
201+
} else {
202+
mLayoutManager = new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL);
203+
}
204+
}
205+
185206
mRecyclerView.setLayoutManager(mLayoutManager);
186207
mRecyclerView.setHasFixedSize(false);
187208
}

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

+22-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import android.content.Context;
2525
import android.content.Intent;
26+
import android.content.res.Configuration;
2627
import android.os.AsyncTask;
2728
import android.os.Bundle;
2829
import android.view.LayoutInflater;
@@ -51,6 +52,7 @@
5152
import nl.hnogames.domoticz.utils.SerializableManager;
5253
import nl.hnogames.domoticz.utils.SharedPrefUtil;
5354
import nl.hnogames.domoticz.utils.UsefulBits;
55+
import nl.hnogames.domoticz.utils.ViewUtils;
5456
import nl.hnogames.domoticzapi.Containers.PlanInfo;
5557
import nl.hnogames.domoticzapi.Interfaces.PlansReceiver;
5658
import nl.hnogames.domoticzapi.Utils.PhoneConnectionUtil;
@@ -142,9 +144,27 @@ private void createListView() {
142144
if (mRecyclerView == null) {
143145
mRecyclerView = getView().findViewById(R.id.my_recycler_view);
144146
mSwipeRefreshLayout = getView().findViewById(R.id.swipe_refresh_layout);
145-
mRecyclerView.setHasFixedSize(true);
146-
StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
147+
148+
StaggeredGridLayoutManager mLayoutManager;
149+
boolean isPortrait = false;
150+
if (getActivity().getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT)
151+
isPortrait = true;
152+
if (ViewUtils.isTablet(getContext())) {
153+
if (isPortrait) {
154+
mLayoutManager = new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL);
155+
} else {
156+
mLayoutManager = new StaggeredGridLayoutManager(4, StaggeredGridLayoutManager.VERTICAL);
157+
}
158+
} else {
159+
if (isPortrait) {
160+
mLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
161+
} else {
162+
mLayoutManager = new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL);
163+
}
164+
}
165+
147166
mRecyclerView.setLayoutManager(mLayoutManager);
167+
mRecyclerView.setHasFixedSize(false);
148168
}
149169

150170
if (mAdapter == null) {

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

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package nl.hnogames.domoticz.utils;
2+
3+
import android.content.Context;
4+
import nl.hnogames.domoticz.R;
5+
6+
public class ViewUtils {
7+
public static boolean isTablet(Context context) {
8+
return context.getResources().getBoolean(R.bool.isTablet);
9+
}
10+
}

‎app/src/main/res/values-sw600dp/bools.xml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<bool name="isTablet">true</bool>
4+
</resources>

‎app/src/main/res/values/bools.xml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<bool name="isTablet">false</bool>
4+
</resources>

‎app/version.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Fri May 20 13:25:22 CEST 2022
2-
VERSION_BUILD=8730
1+
#Fri May 20 17:24:25 CEST 2022
2+
VERSION_BUILD=8738
33
VERSION_CODE=620
44
VERSION_PATCH=320

‎domoticzapi/version.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Fri May 20 13:25:22 CEST 2022
1+
#Fri May 20 17:24:25 CEST 2022
22
VERSION_BUILD=3675
33
VERSION_CODE=254
44
VERSION_PATCH=254

0 commit comments

Comments
 (0)