Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: enhance isTablet() on Android #313

Merged
merged 4 commits into from
Feb 27, 2018
Merged

fix: enhance isTablet() on Android #313

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da7a602
Changed the nature of IsTablet for Android, since newer devices with …
mikpalm Feb 6, 2018
e875832
minor alterations
mikpalm Feb 26, 2018
5bdccb3
minor alterations to isTablet
mikpalm Feb 26, 2018
0a6c379
added display metrics
mikpalm Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 15 additions & 2 deletions android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,21 @@ private Boolean isEmulator() {
}

private Boolean isTablet() {
int layout = getReactApplicationContext().getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
return layout == Configuration.SCREENLAYOUT_SIZE_LARGE || layout == Configuration.SCREENLAYOUT_SIZE_XLARGE;
boolean layout = (getReactApplicationContext().getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even if Configuration.SCREENLAYOUT_SIZE_LARGE is 3 and SCREENLAYOUT_SIZE_XLARGE; is 4, I wouldn't rely on that as we never know what may be added in the future..

Can you switch back to testing both values? 🙏

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the unnecessary else. What do you meen by switching back to test both. Im doing bigger than or equal?

 >= Configuration.SCREENLAYOUT_SIZE_LARGE;

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

int layout = getReactApplicationContext().getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;

if (layout != Configuration.SCREENLAYOUT_SIZE_LARGE && layout != Configuration.SCREENLAYOUT_SIZE_XLARGE) {
  return false;
}

// rest of your code, without the if (layout)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

if (layout) {
DisplayMetrics metrics = new DisplayMetrics();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got a build error on this line: error: cannot find symbol DisplayMetrics. Did you forget to import android.util.DisplayMetrics?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes fixing.

getCurrentActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
if (metrics.densityDpi == DisplayMetrics.DENSITY_DEFAULT
|| metrics.densityDpi == DisplayMetrics.DENSITY_HIGH
|| metrics.densityDpi == DisplayMetrics.DENSITY_MEDIUM
|| metrics.densityDpi == DisplayMetrics.DENSITY_TV
|| metrics.densityDpi == DisplayMetrics.DENSITY_XHIGH) {
return true;
} else {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The else can be dropped, false is returned at the end of the function

return false;
}
}
return false;
}

private Boolean is24Hour() {
Expand Down