[stable-3.36] List divider added for tab and land mode & Upload Files button text size configured by github-actions[bot] · Pull Request #467 · nextmcloud/android
Expand Up
@@ -14,6 +14,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.Configuration;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
Expand All
@@ -39,10 +40,13 @@
import com.owncloud.android.operations.CheckCurrentCredentialsOperation;
import com.owncloud.android.ui.adapter.UploadListAdapter;
import com.owncloud.android.ui.decoration.MediaGridItemDecoration;
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.ui.decoration.SimpleListItemDividerDecoration;
import com.owncloud.android.utils.FilesSyncHelper;
import javax.inject.Inject;
import androidx.annotation.NonNull; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.recyclerview.widget.GridLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; Expand Down Expand Up @@ -87,6 +91,8 @@ public class UploadListActivity extends FileActivity {
private UploadListLayoutBinding binding;
private SimpleListItemDividerDecoration simpleListItemDividerDecoration;
public static Intent createIntent(OCFile file, User user, Integer flag, Context context) { Intent intent = new Intent(context, UploadListActivity.class); if (flag != null) { Expand Down Expand Up @@ -156,6 +162,8 @@ private void setupContent() { int spacing = getResources().getDimensionPixelSize(R.dimen.media_grid_spacing); binding.list.addItemDecoration(new MediaGridItemDecoration(spacing)); binding.list.setLayoutManager(lm); simpleListItemDividerDecoration = new SimpleListItemDividerDecoration(this, R.drawable.item_divider, true); addListItemDecorator(); binding.list.setAdapter(uploadListAdapter);
viewThemeUtils.androidx.themeSwipeRefreshLayout(swipeListRefreshLayout); Expand All @@ -164,6 +172,23 @@ private void setupContent() { loadItems(); }
private void addListItemDecorator() { if (com.nmc.android.utils.DisplayUtils.isShowDividerForList()) { //check and remove divider item decorator if exist then add item decorator removeListDividerDecorator(); binding.list.addItemDecoration(simpleListItemDividerDecoration); } }
/** * method to remove the divider item decorator */ private void removeListDividerDecorator() { if (binding.list.getItemDecorationCount() > 0) { binding.list.removeItemDecoration(simpleListItemDividerDecoration); } }
private void loadItems() { swipeListRefreshLayout.setRefreshing(true); uploadListAdapter.loadUploadItemsFromDb(() -> swipeListRefreshLayout.setRefreshing(false)); Expand Down Expand Up @@ -320,4 +345,20 @@ public void onReceive(Context context, Intent intent) { throttler.run("update_upload_list", () -> uploadListAdapter.loadUploadItemsFromDb()); } }
@Override public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); //this should only run when device is not tablet because we are adding dividers in tablet for both the // orientations if (!com.nmc.android.utils.DisplayUtils.isTablet()) { if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) { //add the divider item decorator when orientation is landscape addListItemDecorator(); } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) { //remove the divider item decorator when orientation is portrait removeListDividerDecorator(); } } } }
import javax.inject.Inject;
import androidx.annotation.NonNull; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.recyclerview.widget.GridLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; Expand Down Expand Up @@ -87,6 +91,8 @@ public class UploadListActivity extends FileActivity {
private UploadListLayoutBinding binding;
private SimpleListItemDividerDecoration simpleListItemDividerDecoration;
public static Intent createIntent(OCFile file, User user, Integer flag, Context context) { Intent intent = new Intent(context, UploadListActivity.class); if (flag != null) { Expand Down Expand Up @@ -156,6 +162,8 @@ private void setupContent() { int spacing = getResources().getDimensionPixelSize(R.dimen.media_grid_spacing); binding.list.addItemDecoration(new MediaGridItemDecoration(spacing)); binding.list.setLayoutManager(lm); simpleListItemDividerDecoration = new SimpleListItemDividerDecoration(this, R.drawable.item_divider, true); addListItemDecorator(); binding.list.setAdapter(uploadListAdapter);
viewThemeUtils.androidx.themeSwipeRefreshLayout(swipeListRefreshLayout); Expand All @@ -164,6 +172,23 @@ private void setupContent() { loadItems(); }
private void addListItemDecorator() { if (com.nmc.android.utils.DisplayUtils.isShowDividerForList()) { //check and remove divider item decorator if exist then add item decorator removeListDividerDecorator(); binding.list.addItemDecoration(simpleListItemDividerDecoration); } }
/** * method to remove the divider item decorator */ private void removeListDividerDecorator() { if (binding.list.getItemDecorationCount() > 0) { binding.list.removeItemDecoration(simpleListItemDividerDecoration); } }
private void loadItems() { swipeListRefreshLayout.setRefreshing(true); uploadListAdapter.loadUploadItemsFromDb(() -> swipeListRefreshLayout.setRefreshing(false)); Expand Down Expand Up @@ -320,4 +345,20 @@ public void onReceive(Context context, Intent intent) { throttler.run("update_upload_list", () -> uploadListAdapter.loadUploadItemsFromDb()); } }
@Override public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); //this should only run when device is not tablet because we are adding dividers in tablet for both the // orientations if (!com.nmc.android.utils.DisplayUtils.isTablet()) { if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) { //add the divider item decorator when orientation is landscape addListItemDecorator(); } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) { //remove the divider item decorator when orientation is portrait removeListDividerDecorator(); } } } }