Skip to content

Commit af6b172

Browse files
committed
Display Utils customization extracted out.
1 parent b606d09 commit af6b172

5 files changed

Lines changed: 23 additions & 15 deletions

File tree

app/src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected void onCreate(Bundle savedInstanceState) {
8585

8686
//if device is not tablet then we have to lock it to Portrait mode
8787
//as we don't have images for that
88-
if (!DisplayUtils.isTablet()) {
88+
if (!com.nmc.android.utils.DisplayUtils.isTablet()) {
8989
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
9090
}
9191

@@ -123,7 +123,7 @@ private void updateOnBoardingPager(int selectedPosition) {
123123
}
124124

125125
private void updateLoginButtonMargin() {
126-
if (DisplayUtils.isLandscapeOrientation()) {
126+
if (com.nmc.android.utils.DisplayUtils.isLandscapeOrientation()) {
127127
if (binding.login.getLayoutParams() instanceof ViewGroup.MarginLayoutParams) {
128128
((ViewGroup.MarginLayoutParams) binding.login.getLayoutParams()).setMargins(
129129
0, 0, 0, getResources().getDimensionPixelOffset(

app/src/main/java/com/nmc/android/helper/OnBoardingPagerAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class OnBoardingPagerAdapter(val context: Context, val items: List<FeatureItem>)
3535

3636
//due to cropping of image in landscape mode we are using fix xy for landscape and
3737
//center crop for other
38-
if (DisplayUtils.isLandscapeOrientation()) {
38+
if (com.nmc.android.utils.DisplayUtils.isLandscapeOrientation()) {
3939
binding.ivOnboarding.scaleType = ImageView.ScaleType.FIT_XY
4040
} else {
4141
binding.ivOnboarding.scaleType = ImageView.ScaleType.CENTER_CROP

app/src/main/java/com/nmc/android/helper/OnBoardingUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ class OnBoardingUtils {
3434
}
3535

3636
private fun getOnBoardingImages(): Array<Int> {
37-
return if (DisplayUtils.isTablet()) {
38-
if (DisplayUtils.isLandscapeOrientation()) {
37+
return if (com.nmc.android.utils.DisplayUtils.isTablet()) {
38+
if (com.nmc.android.utils.DisplayUtils.isLandscapeOrientation()) {
3939
TAB_LAND_IMAGES
4040
} else {
4141
TAB_PORT_IMAGES
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.nmc.android.utils
2+
3+
import android.content.res.Configuration
4+
import com.owncloud.android.MainApp
5+
import com.owncloud.android.R
6+
7+
object DisplayUtils {
8+
9+
@JvmStatic
10+
fun isShowDividerForList(): Boolean = isTablet() || isLandscapeOrientation()
11+
12+
@JvmStatic
13+
fun isTablet(): Boolean = MainApp.getAppContext().resources.getBoolean(R.bool.isTablet)
14+
15+
@JvmStatic
16+
fun isLandscapeOrientation(): Boolean =
17+
MainApp.getAppContext().resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
18+
}

app/src/main/java/com/owncloud/android/utils/DisplayUtils.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import android.app.Activity;
3333
import android.content.Context;
3434
import android.content.Intent;
35-
import android.content.res.Configuration;
3635
import android.content.res.Resources;
3736
import android.graphics.Bitmap;
3837
import android.graphics.Color;
@@ -1005,13 +1004,4 @@ private static Point getScreenSize(Context context) throws Exception {
10051004
throw new Exception("WindowManager not found");
10061005
}
10071006
}
1008-
1009-
public static boolean isTablet() {
1010-
return MainApp.getAppContext().getResources().getBoolean(R.bool.isTablet);
1011-
}
1012-
1013-
public static boolean isLandscapeOrientation() {
1014-
return MainApp.getAppContext().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
1015-
}
1016-
10171007
}

0 commit comments

Comments
 (0)