Skip to content

Commit 5ee0c79

Browse files
surinder-tsyssurinder-tsys
committed
List divider added for tablet and landscape mode.
NMC-2142: Upload file button text size configured.
1 parent 985d4c2 commit 5ee0c79

File tree

12 files changed

+452
-2
lines changed

12 files changed

+452
-2
lines changed

‎app/src/main/java/com/nmc/android/utils/DisplayUtils.kt‎

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/ui/activity/UploadFilesActivity.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import android.content.pm.PackageManager;
2121
import android.os.Bundle;
2222
import android.os.Environment;
23+
import android.util.TypedValue;
2324
import android.view.Menu;
2425
import android.view.MenuItem;
2526
import android.view.View;
@@ -55,6 +56,7 @@
5556
import java.io.File;
5657
import java.util.ArrayList;
5758
import java.util.List;
59+
import java.util.Locale;
5860

5961
import javax.inject.Inject;
6062

@@ -194,6 +196,19 @@ public void onCreate(Bundle savedInstanceState) {
194196
binding.uploadFilesBtnUpload.setOnClickListener(this);
195197
binding.uploadFilesBtnUpload.setEnabled(mLocalFolderPickerMode);
196198

199+
//reduce the button text size so that the text doesn't go to next line
200+
//this should only happen for GERMAN language
201+
//and device should not be tablet and should be in portrait mode
202+
if (!com.nmc.android.utils.DisplayUtils.isTablet() && !com.nmc.android.utils.DisplayUtils.isLandscapeOrientation()) {
203+
if (Locale.getDefault().getLanguage().equals(Locale.GERMAN.getLanguage())
204+
|| Locale.getDefault().getLanguage().equals(Locale.GERMANY.getLanguage())) {
205+
binding.uploadFilesBtnUpload.setTextSize(TypedValue.COMPLEX_UNIT_PX,
206+
getResources().getDimensionPixelSize(R.dimen.txt_size_13sp));
207+
binding.uploadFilesBtnCancel.setTextSize(TypedValue.COMPLEX_UNIT_PX,
208+
getResources().getDimensionPixelSize(R.dimen.txt_size_13sp));
209+
}
210+
}
211+
197212
int localBehaviour = preferences.getUploaderBehaviour();
198213

199214
// file upload spinner

‎app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import android.content.Context;
1515
import android.content.Intent;
1616
import android.content.IntentFilter;
17+
import android.content.res.Configuration;
1718
import android.os.Bundle;
1819
import android.view.Menu;
1920
import android.view.MenuInflater;
@@ -44,11 +45,13 @@
4445
import com.owncloud.android.ui.adapter.UploadListAdapter;
4546
import com.owncloud.android.ui.decoration.MediaGridItemDecoration;
4647
import com.owncloud.android.utils.DisplayUtils;
48+
import com.owncloud.android.ui.decoration.SimpleListItemDividerDecoration;
4749
import com.owncloud.android.utils.FilesSyncHelper;
4850
import com.owncloud.android.utils.theme.ViewThemeUtils;
4951

5052
import javax.inject.Inject;
5153

54+
import androidx.annotation.NonNull;
5255
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
5356
import androidx.recyclerview.widget.GridLayoutManager;
5457
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -99,6 +102,8 @@ public class UploadListActivity extends FileActivity {
99102

100103
private UploadListLayoutBinding binding;
101104

105+
private SimpleListItemDividerDecoration simpleListItemDividerDecoration;
106+
102107
public static Intent createIntent(OCFile file, User user, Integer flag, Context context) {
103108
Intent intent = new Intent(context, UploadListActivity.class);
104109
if (flag != null) {
@@ -177,6 +182,8 @@ private void setupContent() {
177182
int spacing = getResources().getDimensionPixelSize(R.dimen.media_grid_spacing);
178183
binding.list.addItemDecoration(new MediaGridItemDecoration(spacing));
179184
binding.list.setLayoutManager(lm);
185+
simpleListItemDividerDecoration = new SimpleListItemDividerDecoration(this, R.drawable.item_divider, true);
186+
addListItemDecorator();
180187
binding.list.setAdapter(uploadListAdapter);
181188

182189
viewThemeUtils.androidx.themeSwipeRefreshLayout(swipeListRefreshLayout);
@@ -186,6 +193,23 @@ private void setupContent() {
186193
uploadListAdapter.loadUploadItemsFromDb();
187194
}
188195

196+
private void addListItemDecorator() {
197+
if (com.nmc.android.utils.DisplayUtils.isShowDividerForList()) {
198+
//check and remove divider item decorator if exist then add item decorator
199+
removeListDividerDecorator();
200+
binding.list.addItemDecoration(simpleListItemDividerDecoration);
201+
}
202+
}
203+
204+
/**
205+
* method to remove the divider item decorator
206+
*/
207+
private void removeListDividerDecorator() {
208+
if (binding.list.getItemDecorationCount() > 0) {
209+
binding.list.removeItemDecoration(simpleListItemDividerDecoration);
210+
}
211+
}
212+
189213
private void loadItems() {
190214
uploadListAdapter.loadUploadItemsFromDb();
191215

@@ -373,4 +397,20 @@ public void onReceive(Context context, Intent intent) {
373397
});
374398
}
375399
}
400+
401+
@Override
402+
public void onConfigurationChanged(@NonNull Configuration newConfig) {
403+
super.onConfigurationChanged(newConfig);
404+
//this should only run when device is not tablet because we are adding dividers in tablet for both the
405+
// orientations
406+
if (!com.nmc.android.utils.DisplayUtils.isTablet()) {
407+
if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
408+
//add the divider item decorator when orientation is landscape
409+
addListItemDecorator();
410+
} else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
411+
//remove the divider item decorator when orientation is portrait
412+
removeListDividerDecorator();
413+
}
414+
}
415+
}
376416
}

‎app/src/main/java/com/owncloud/android/ui/decoration/SimpleListItemDividerDecoration.java‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import android.util.DisplayMetrics;
1515
import android.view.View;
1616

17+
import androidx.core.content.ContextCompat;
1718
import androidx.recyclerview.widget.DividerItemDecoration;
1819
import androidx.recyclerview.widget.RecyclerView;
1920

@@ -25,7 +26,8 @@ public class SimpleListItemDividerDecoration extends DividerItemDecoration {
2526

2627
private final Rect bounds = new Rect();
2728
private Drawable divider;
28-
private int leftPadding;
29+
private int leftPadding = 0;
30+
private boolean hasFooter;
2931

3032
/**
3133
* Default divider will be used
@@ -38,6 +40,17 @@ public SimpleListItemDividerDecoration(Context context) {
3840
styledAttributes.recycle();
3941
}
4042

43+
/**
44+
* Custom divider will be used
45+
*
46+
* @param hasFooter if recyclerview has footer and no divider should be shown for footer then pass true else false
47+
*/
48+
public SimpleListItemDividerDecoration(Context context, int resId, boolean hasFooter) {
49+
super(context, DividerItemDecoration.VERTICAL);
50+
this.hasFooter = hasFooter;
51+
divider = ContextCompat.getDrawable(context, resId);
52+
}
53+
4154
@Override
4255
public void onDraw(Canvas canvas, RecyclerView parent, RecyclerView.State state) {
4356
canvas.save();
@@ -51,7 +64,12 @@ public void onDraw(Canvas canvas, RecyclerView parent, RecyclerView.State state)
5164
right = parent.getWidth();
5265
}
5366

54-
final int childCount = parent.getChildCount();
67+
int childCount = parent.getChildCount();
68+
69+
if (hasFooter) {
70+
childCount = childCount - 1;
71+
}
72+
5573
for (int i = 0; i < childCount; i++) {
5674
final View child = parent.getChildAt(i);
5775
parent.getDecoratedBoundsWithMargins(child, bounds);

‎app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import android.app.Activity;
1919
import android.content.Context;
2020
import android.content.Intent;
21+
import android.content.res.Configuration;
2122
import android.os.AsyncTask;
2223
import android.os.Bundle;
2324
import android.os.Handler;
@@ -32,6 +33,7 @@
3233
import android.view.MenuItem;
3334
import android.view.View;
3435
import android.view.ViewGroup;
36+
import android.view.ViewTreeObserver;
3537
import android.widget.AbsListView;
3638
import android.widget.Toast;
3739

@@ -52,6 +54,7 @@
5254
import com.nextcloud.client.jobs.BackgroundJobManager;
5355
import com.nextcloud.client.network.ClientFactory;
5456
import com.nextcloud.client.preferences.AppPreferences;
57+
import com.nextcloud.client.preferences.AppPreferencesImpl;
5558
import com.nextcloud.client.utils.Throttler;
5659
import com.nextcloud.common.NextcloudClient;
5760
import com.nextcloud.ui.fileactions.FileActionsBottomSheet;
@@ -87,6 +90,8 @@
8790
import com.owncloud.android.ui.activity.UploadFilesActivity;
8891
import com.owncloud.android.ui.adapter.CommonOCFileListAdapterInterface;
8992
import com.owncloud.android.ui.adapter.OCFileListAdapter;
93+
import com.owncloud.android.ui.decoration.MediaGridItemDecoration;
94+
import com.owncloud.android.ui.decoration.SimpleListItemDividerDecoration;
9095
import com.owncloud.android.ui.dialog.ChooseRichDocumentsTemplateDialogFragment;
9196
import com.owncloud.android.ui.dialog.ChooseTemplateDialogFragment;
9297
import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
@@ -231,6 +236,9 @@ public class OCFileListFragment extends ExtendedListFragment implements
231236
protected String mLimitToMimeType;
232237
private FloatingActionButton mFabMain;
233238

239+
private SimpleListItemDividerDecoration simpleListItemDividerDecoration;
240+
private MediaGridItemDecoration mediaGridItemDecoration;
241+
234242
@Inject DeviceInfo deviceInfo;
235243

236244
protected enum MenuItemAddRemove {
@@ -244,6 +252,13 @@ protected enum MenuItemAddRemove {
244252

245253
private List<MenuItem> mOriginalMenuItems = new ArrayList<>();
246254

255+
private int maxColumnSizeLandscape = 5;
256+
257+
//this variable will help us to provide number of span count for grid view
258+
//the width for single item is approx to 360
259+
private static final int GRID_ITEM_DEFAULT_WIDTH = 360;
260+
private static final int DEFAULT_FALLBACK_SPAN_COUNT = 1;
261+
247262
@Override
248263
public void onCreate(Bundle savedInstanceState) {
249264
super.onCreate(savedInstanceState);
@@ -442,6 +457,10 @@ protected void setAdapter(Bundle args) {
442457
viewThemeUtils
443458
);
444459

460+
simpleListItemDividerDecoration = new SimpleListItemDividerDecoration(getContext(), R.drawable.item_divider, true);
461+
int spacing = getResources().getDimensionPixelSize(R.dimen.media_grid_spacing);
462+
mediaGridItemDecoration = new MediaGridItemDecoration(spacing);
463+
445464
setRecyclerViewAdapter(mAdapter);
446465

447466
fastScrollUtils.applyFastScroll(getRecyclerView());
@@ -1514,6 +1533,7 @@ public void switchToListView() {
15141533
if (isGridEnabled()) {
15151534
switchLayoutManager(false);
15161535
}
1536+
addRemoveRecyclerViewItemDecorator();
15171537
}
15181538

15191539
public void setGridAsPreferred() {
@@ -1525,6 +1545,33 @@ public void switchToGridView() {
15251545
if (!isGridEnabled()) {
15261546
switchLayoutManager(true);
15271547
}
1548+
addRemoveRecyclerViewItemDecorator();
1549+
}
1550+
1551+
private void addRemoveRecyclerViewItemDecorator() {
1552+
if (getRecyclerView().getLayoutManager() instanceof GridLayoutManager) {
1553+
removeItemDecorator();
1554+
if (getRecyclerView().getItemDecorationCount() == 0) {
1555+
getRecyclerView().addItemDecoration(mediaGridItemDecoration);
1556+
int padding = getResources().getDimensionPixelSize(R.dimen.grid_recyclerview_padding);
1557+
getRecyclerView().setPadding(padding, padding, padding, padding);
1558+
}
1559+
} else {
1560+
removeItemDecorator();
1561+
if (getRecyclerView().getItemDecorationCount() == 0 && com.nmc.android.utils.DisplayUtils.isShowDividerForList()) {
1562+
getRecyclerView().addItemDecoration(simpleListItemDividerDecoration);
1563+
getRecyclerView().setPadding(0, 0, 0, 0);
1564+
}
1565+
}
1566+
}
1567+
1568+
/**
1569+
* method to remove the item decorator
1570+
*/
1571+
private void removeItemDecorator() {
1572+
while (getRecyclerView().getItemDecorationCount() > 0) {
1573+
getRecyclerView().removeItemDecorationAt(0);
1574+
}
15281575
}
15291576

15301577
public void switchLayoutManager(boolean grid) {
@@ -1555,12 +1602,40 @@ public int getSpanSize(int position) {
15551602
}
15561603

15571604
getRecyclerView().setLayoutManager(layoutManager);
1605+
updateSpanCount(getResources().getConfiguration());
15581606
getRecyclerView().scrollToPosition(position);
15591607
getAdapter().setGridView(grid);
15601608
getRecyclerView().setAdapter(getAdapter());
15611609
getAdapter().notifyDataSetChanged();
15621610
}
15631611

1612+
/**
1613+
* method will calculate the number of spans required for grid item and will update the span accordingly
1614+
*
1615+
* @param isGrid
1616+
*/
1617+
private void calculateAndUpdateSpanCount(boolean isGrid) {
1618+
getRecyclerView().getViewTreeObserver().addOnGlobalLayoutListener(
1619+
new ViewTreeObserver.OnGlobalLayoutListener() {
1620+
@Override
1621+
public void onGlobalLayout() {
1622+
getRecyclerView().getViewTreeObserver().removeOnGlobalLayoutListener(this);
1623+
if (isGrid) {
1624+
int viewWidth = getRecyclerView().getMeasuredWidth();
1625+
int newSpanCount = viewWidth / GRID_ITEM_DEFAULT_WIDTH;
1626+
RecyclerView.LayoutManager layoutManager = getRecyclerView().getLayoutManager();
1627+
if (layoutManager instanceof GridLayoutManager) {
1628+
if (newSpanCount < 1) {
1629+
newSpanCount = DEFAULT_FALLBACK_SPAN_COUNT;
1630+
}
1631+
((GridLayoutManager) layoutManager).setSpanCount(newSpanCount);
1632+
layoutManager.requestLayout();
1633+
}
1634+
}
1635+
}
1636+
});
1637+
}
1638+
15641639
public CommonOCFileListAdapterInterface getCommonAdapter() {
15651640
return mAdapter;
15661641
}
@@ -2130,4 +2205,52 @@ private boolean isAPKorAAB(Set<OCFile> files) {
21302205
}
21312206
return false;
21322207
}
2208+
2209+
@Override
2210+
public void onConfigurationChanged(@NonNull Configuration newConfig) {
2211+
super.onConfigurationChanged(newConfig);
2212+
if (getAdapter() != null) {
2213+
getAdapter().notifyDataSetChanged();
2214+
}
2215+
updateSpanCount(newConfig);
2216+
}
2217+
2218+
/**
2219+
* method will update the span count on basis of device orientation for the file listing
2220+
*
2221+
* @param newConfig current configuration
2222+
*/
2223+
private void updateSpanCount(Configuration newConfig) {
2224+
//this should only run when current view is not media gallery
2225+
if (getAdapter() != null) {
2226+
int maxColumnSize = (int) AppPreferencesImpl.DEFAULT_GRID_COLUMN;
2227+
if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
2228+
//add the divider item decorator when orientation is landscape and device is not tablet
2229+
//because we don't have to add divider again as it is already added
2230+
if (!com.nmc.android.utils.DisplayUtils.isTablet()) {
2231+
addRemoveRecyclerViewItemDecorator();
2232+
}
2233+
maxColumnSize = maxColumnSizeLandscape;
2234+
} else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
2235+
//remove the divider item decorator when orientation is portrait and when device is not tablet
2236+
//because we have to show divider in both landscape and portrait mode
2237+
if (!com.nmc.android.utils.DisplayUtils.isTablet()) {
2238+
removeItemDecorator();
2239+
}
2240+
maxColumnSize = (int) AppPreferencesImpl.DEFAULT_GRID_COLUMN;
2241+
}
2242+
2243+
if (isGridEnabled()) {
2244+
//for tablet calculate size on the basis of screen width
2245+
if (com.nmc.android.utils.DisplayUtils.isTablet()) {
2246+
calculateAndUpdateSpanCount(true);
2247+
} else {
2248+
//and for phones directly show the hardcoded column size
2249+
if (getRecyclerView().getLayoutManager() instanceof GridLayoutManager) {
2250+
((GridLayoutManager) getRecyclerView().getLayoutManager()).setSpanCount(maxColumnSize);
2251+
}
2252+
}
2253+
}
2254+
}
2255+
}
21332256
}

0 commit comments

Comments
 (0)