[stable-3.34] List divider added for tab and land mode & Upload Files button text size configured

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

@@ -0,0 +1,18 @@
+package com.nmc.android.utils
+
+import android.content.res.Configuration
+import com.owncloud.android.MainApp
+import com.owncloud.android.R
+
+object DisplayUtils {
+
+    @JvmStatic
+    fun isShowDividerForList(): Boolean = isTablet() || isLandscapeOrientation()
+
+    @JvmStatic
+    fun isTablet(): Boolean = MainApp.getAppContext().resources.getBoolean(R.bool.isTablet)
+
+    @JvmStatic
+    fun isLandscapeOrientation(): Boolean =
+        MainApp.getAppContext().resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+}

app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt

@@ -16,6 +16,7 @@ import android.content.IntentFilter
 import android.content.res.Resources
 import android.os.Bundle
 import android.os.Parcelable
+import android.util.TypedValue
 import android.view.ActionMode
 import android.view.Menu
 import android.view.MenuItem
@@ -49,6 +50,7 @@ import com.owncloud.android.utils.ErrorMessageAdapter
 import com.owncloud.android.utils.FileSortOrder
 import com.owncloud.android.utils.PathUtils
 import java.io.File
+import java.util.Locale
 import javax.inject.Inject
 
 @Suppress("Detekt.TooManyFunctions")
@@ -462,6 +464,30 @@ open class FolderPickerActivity :
                     OperationsService.ACTION_MOVE_FILE
                 )
             }
+            adjustButtonTexts()
+        }
+    }
+
+    // NMC-4239 fix
+    // adjust button german texts in portrait mode
+    private fun adjustButtonTexts(){
+        if (!com.nmc.android.utils.DisplayUtils.isTablet() && !com.nmc.android.utils.DisplayUtils.isLandscapeOrientation()) {
+            if (Locale.getDefault().language.equals(Locale.GERMAN.language)
+                || Locale.getDefault().language.equals(Locale.GERMANY.language)
+            ) {
+                folderPickerBinding.folderPickerBtnCopy.setTextSize(
+                    TypedValue.COMPLEX_UNIT_PX,
+                    getResources().getDimension(R.dimen.txt_size_11sp)
+                )
+                folderPickerBinding.folderPickerBtnMove.setTextSize(
+                    TypedValue.COMPLEX_UNIT_PX,
+                    getResources().getDimension(R.dimen.txt_size_11sp)
+                )
+                folderPickerBinding.folderPickerBtnCancel.setTextSize(
+                    TypedValue.COMPLEX_UNIT_PX,
+                    getResources().getDimension(R.dimen.txt_size_11sp)
+                );
+            }
         }
     }
 

app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -20,6 +20,7 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Environment;
+import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -58,6 +59,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import javax.inject.Inject;
 
@@ -200,6 +202,19 @@ public void onCreate(Bundle savedInstanceState) {
         binding.uploadFilesBtnUpload.setOnClickListener(this);
         binding.uploadFilesBtnUpload.setEnabled(mLocalFolderPickerMode);
 
+        //reduce the button text size so that the text doesn't go to next line
+        //this should only happen for GERMAN language
+        //and device should not be tablet and should be in portrait mode
+        if (!com.nmc.android.utils.DisplayUtils.isTablet() && !com.nmc.android.utils.DisplayUtils.isLandscapeOrientation()) {
+            if (Locale.getDefault().getLanguage().equals(Locale.GERMAN.getLanguage())
+                || Locale.getDefault().getLanguage().equals(Locale.GERMANY.getLanguage())) {
+                binding.uploadFilesBtnUpload.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                                         getResources().getDimensionPixelSize(R.dimen.txt_size_13sp));
+                binding.uploadFilesBtnCancel.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                                         getResources().getDimensionPixelSize(R.dimen.txt_size_13sp));
+            }
+        }
+
         int localBehaviour = preferences.getUploaderBehaviour();
 
         // file upload spinner

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

@@ -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;
@@ -42,10 +43,12 @@
 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;
@@ -90,6 +93,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) {
@@ -168,6 +173,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);
@@ -176,6 +183,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));
@@ -346,4 +370,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();
+            }
+        }
+    }
 }

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

@@ -0,0 +1,86 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+package com.owncloud.android.ui.decoration;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.util.DisplayMetrics;
+import android.view.View;
+
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * DividerItemDecoration based on {@link DividerItemDecoration} adding a 72dp left padding.
+ */
+public class SimpleListItemDividerDecoration extends DividerItemDecoration {
+    private static final int[] ATTRS = new int[]{android.R.attr.listDivider};
+
+    private final Rect bounds = new Rect();
+    private Drawable divider;
+    private int leftPadding = 0;
+    private boolean hasFooter;
+
+    /**
+     * Default divider will be used
+     */
+    public SimpleListItemDividerDecoration(Context context) {
+        super(context, DividerItemDecoration.VERTICAL);
+        final TypedArray styledAttributes = context.obtainStyledAttributes(ATTRS);
+        divider = styledAttributes.getDrawable(0);
+        leftPadding = Math.round(72 * (context.getResources().getDisplayMetrics().xdpi / DisplayMetrics.DENSITY_DEFAULT));
+        styledAttributes.recycle();
+    }
+
+    /**
+     * Custom divider will be used
+     *
+     * @param hasFooter if recyclerview has footer and no divider should be shown for footer then pass true else false
+     */
+    public SimpleListItemDividerDecoration(Context context, int resId, boolean hasFooter) {
+        super(context, DividerItemDecoration.VERTICAL);
+        this.hasFooter = hasFooter;
+        divider = ContextCompat.getDrawable(context, resId);
+    }
+
+    @Override
+    public void onDraw(Canvas canvas, RecyclerView parent, RecyclerView.State state) {
+        canvas.save();
+        final int right;
+        //noinspection AndroidLintNewApi - NewApi lint fails to handle overrides.
+        if (parent.getClipToPadding()) {
+            right = parent.getWidth() - parent.getPaddingRight();
+            canvas.clipRect(leftPadding, parent.getPaddingTop(), right,
+                    parent.getHeight() - parent.getPaddingBottom());
+        } else {
+            right = parent.getWidth();
+        }
+
+        int childCount = parent.getChildCount();
+
+        if (hasFooter) {
+            childCount = childCount - 1;
+        }
+
+        for (int i = 0; i < childCount; i++) {
+            final View child = parent.getChildAt(i);
+            parent.getDecoratedBoundsWithMargins(child, bounds);
+            final int bottom = bounds.bottom + Math.round(child.getTranslationY());
+            final int top = bottom - 1;
+
+            if (divider != null) {
+                divider.setBounds(leftPadding, top, right, bottom);
+                divider.draw(canvas);
+            }
+        }
+        canvas.restore();
+    }
+}