Filtering only folders and showing them as per NMC-2893 Task

surinder-tsys · surinder-tsys · commit 399a3f9b1e17 · 2024-10-09T14:17:26.000+05:30
Update UnifiedSearchFragment.kt. Commit id: 4fb3fb3 from branch bug/NMC-1652. NMC-2140: Tinting removed for folder and file icons and not overlaying icon for folders.
diff --git a/app/src/main/java/com/nextcloud/client/media/NextcloudExoPlayer.kt b/app/src/main/java/com/nextcloud/client/media/NextcloudExoPlayer.kt
@@ -42,7 +42,9 @@ object NextcloudExoPlayer {
             .setMediaSourceFactory(mediaSourceFactory)
             .setAudioAttributes(AudioAttributes.DEFAULT, true)
             .setHandleAudioBecomingNoisy(true)
-            .setSeekForwardIncrementMs(FIVE_SECONDS_IN_MILLIS)
+            // NMC-3192 Fix
+            .setSeekBackIncrementMs(2 * FIVE_SECONDS_IN_MILLIS)
+            .setSeekForwardIncrementMs(2 * FIVE_SECONDS_IN_MILLIS)
             .build()
     }
 }
diff --git a/app/src/main/java/com/nextcloud/utils/ShortcutUtil.kt b/app/src/main/java/com/nextcloud/utils/ShortcutUtil.kt
@@ -16,6 +16,7 @@ import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import androidx.core.content.ContextCompat
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
@@ -59,10 +60,13 @@ class ShortcutUtil @Inject constructor(private val mContext: Context) {
                 icon = IconCompat.createWithAdaptiveBitmap(thumbnail)
             } else if (file.isFolder) {
                 val isAutoUploadFolder = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, user)
-                val isDarkModeActive = syncedFolderProvider.preferences.isDarkModeEnabled
 
                 val overlayIconId = file.getFileOverlayIconId(isAutoUploadFolder)
-                val drawable = MimeTypeUtil.getFileIcon(isDarkModeActive, overlayIconId, mContext, viewThemeUtils)
+                // NMC Customization: No overlay icon will be used. Directly using folder icons
+                val drawable = ContextCompat.getDrawable(mContext, overlayIconId) ?: MimeTypeUtil.getDefaultFolderIcon(
+                    mContext,
+                    viewThemeUtils
+                )
                 val bitmapIcon = drawable.toBitmap()
                 icon = IconCompat.createWithBitmap(bitmapIcon)
             } else {
diff --git a/app/src/main/java/com/nmc/android/utils/KeyboardUtils.java b/app/src/main/java/com/nmc/android/utils/KeyboardUtils.java
@@ -0,0 +1,21 @@
+package com.nmc.android.utils;
+
+import android.app.Activity;
+import android.content.Context;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+
+public class KeyboardUtils {
+
+    public static void showSoftKeyboard(Context context, View view) {
+        view.requestFocus();
+        InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
+    }
+
+    public static void hideKeyboardFrom(Context context, View view) {
+        view.clearFocus();
+        InputMethodManager imm = (InputMethodManager) context.getSystemService(Activity.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+    }
+}
diff --git a/app/src/main/java/com/owncloud/android/media/MediaControlView.kt b/app/src/main/java/com/owncloud/android/media/MediaControlView.kt
@@ -279,7 +279,7 @@ class MediaControlView(context: Context, attrs: AttributeSet?) :
                 }
                 R.id.rewindBtn -> {
                     pos = playerControl.currentPosition
-                    pos -= 5000
+                    pos -= 2 * FIVE_SECONDS_IN_MILLIS
                     playerControl.seekTo(pos)
                     if (!playing) {
                         playerControl.pause() // necessary in some 2.3.x devices
@@ -288,7 +288,7 @@ class MediaControlView(context: Context, attrs: AttributeSet?) :
                 }
                 R.id.forwardBtn -> {
                     pos = playerControl.currentPosition
-                    pos += 15000
+                    pos += 2 * FIVE_SECONDS_IN_MILLIS
                     playerControl.seekTo(pos)
 
                     if (!playing) {
@@ -353,5 +353,7 @@ class MediaControlView(context: Context, attrs: AttributeSet?) :
     companion object {
         private val TAG = MediaControlView::class.java.getSimpleName()
         private const val SHOW_PROGRESS = 1
+        // NMC-3192 Fix
+        private const val FIVE_SECONDS_IN_MILLIS = 5000
     }
 }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java b/app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java
@@ -42,6 +42,8 @@
 
 import javax.inject.Inject;
 
+import androidx.core.content.ContextCompat;
+
 public abstract class EditorWebView extends ExternalSiteWebView {
     public static final int REQUEST_LOCAL_FILE = 101;
     public ValueCallback<Uri[]> uploadMessage;
@@ -250,8 +252,8 @@ protected void setThumbnailView(final User user) {
             boolean isAutoUploadFolder = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, user);
 
             Integer overlayIconId = file.getFileOverlayIconId(isAutoUploadFolder);
-            LayerDrawable drawable = MimeTypeUtil.getFileIcon(preferences.isDarkModeEnabled(), overlayIconId, this, viewThemeUtils);
-            binding.thumbnail.setImageDrawable(drawable);
+            // NMC Customization: No overlay icon will be used. Directly using folder icons
+            binding.thumbnail.setImageDrawable(ContextCompat.getDrawable(this, overlayIconId));
         } else {
             if ((MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file)) && file.getRemoteId() != null) {
                 // Thumbnail in cache?
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -130,6 +130,7 @@
 import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.PermissionUtil;
 import com.owncloud.android.utils.PushUtils;
+import com.nmc.android.utils.KeyboardUtils;
 import com.owncloud.android.utils.StringUtils;
 import com.owncloud.android.utils.theme.CapabilityUtils;
 
@@ -1064,6 +1065,8 @@ private void resetSearchAction() {
     private void popBack() {
         binding.fabMain.setImageResource(R.drawable.ic_plus);
         resetScrolling(true);
+        // hide the keyboard on back press if showing
+        KeyboardUtils.hideKeyboardFrom(this, binding.getRoot());
         showSortListGroup(false);
         super.onBackPressed();
     }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -98,6 +98,7 @@
 import java.util.Calendar;
 import java.util.List;
 import java.util.Stack;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -758,6 +759,10 @@ private void populateDirectoryList() {
         if (mFile != null) {
             List<OCFile> files = getStorageManager().getFolderContent(mFile, false);
 
+            // NMC-2893 Task
+            // Filtering and showing only files which are folder
+            files = files.stream().filter(OCFile::isFolder).collect(Collectors.toList());
+
             if (files.isEmpty()) {
                 setMessageForEmptyList(R.string.file_list_empty_headline, R.string.empty,
                                        R.drawable.uploads);
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java
@@ -39,6 +39,7 @@
 
 import javax.inject.Inject;
 
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 
@@ -73,8 +74,8 @@ protected void onCreate(Bundle savedInstanceState) {
             boolean isAutoUploadFolder = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, optionalUser.get());
 
             Integer overlayIconId = file.getFileOverlayIconId(isAutoUploadFolder);
-            LayerDrawable drawable = MimeTypeUtil.getFileIcon(preferences.isDarkModeEnabled(), overlayIconId, this, viewThemeUtils);
-            binding.shareFileIcon.setImageDrawable(drawable);
+            // NMC Customization: No overlay icon will be used. Directly using folder icons
+            binding.shareFileIcon.setImageDrawable(ContextCompat.getDrawable(this, overlayIconId));
         } else {
             binding.shareFileIcon.setImageDrawable(MimeTypeUtil.getFileTypeIcon(file.getMimeType(),
                                                                                 file.getFileName(),
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.kt
@@ -13,6 +13,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.nextcloud.client.account.User
 import com.owncloud.android.databinding.UploaderListItemLayoutBinding
@@ -113,10 +114,9 @@ class ReceiveExternalFilesAdapter(
 
     private fun setupThumbnailForFolder(thumbnailImageView: ImageView, file: OCFile) {
         val isAutoUploadFolder = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, user)
-        val isDarkModeActive = syncedFolderProvider.preferences.isDarkModeEnabled
         val overlayIconId = file.getFileOverlayIconId(isAutoUploadFolder)
-        val icon = MimeTypeUtil.getFileIcon(isDarkModeActive, overlayIconId, context, viewThemeUtils)
-        thumbnailImageView.setImageDrawable(icon)
+        // NMC Customization: No overlay icon will be used. Directly using folder icons
+        thumbnailImageView.setImageDrawable(ContextCompat.getDrawable(context, overlayIconId))
     }
 
     @Suppress("NestedBlockDepth")
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt
@@ -29,6 +29,7 @@ import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.core.AsyncRunner
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.di.ViewModelFactory
+import com.nmc.android.utils.KeyboardUtils
 import com.nextcloud.client.network.ClientFactory
 import com.owncloud.android.R
 import com.owncloud.android.databinding.ListFragmentBinding
@@ -238,6 +239,8 @@ class UnifiedSearchFragment :
     private fun showFile(file: OCFile, showFileActions: Boolean) {
         activity.let {
             if (activity is FileDisplayActivity) {
+                // NMC: hide keyboard when user taps on any file to view
+                KeyboardUtils.hideKeyboardFrom(requireContext(), binding.root)
                 val fda = activity as FileDisplayActivity
                 fda.file = file
 
@@ -298,6 +301,7 @@ class UnifiedSearchFragment :
     }
 
     override fun onQueryTextSubmit(query: String): Boolean {
+        KeyboardUtils.hideKeyboardFrom(requireContext(), binding.root)
         vm.setQuery(query)
         vm.initialQuery()
         return true
diff --git a/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java b/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java
@@ -32,7 +32,6 @@
 import android.graphics.Point;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.text.Spannable;
@@ -105,6 +104,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.widget.AppCompatDrawableManager;
+import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
@@ -865,11 +865,9 @@ public static void setThumbnail(OCFile file,
             stopShimmer(shimmerThumbnail, thumbnailView);
 
             boolean isAutoUploadFolder = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, user);
-            boolean isDarkModeActive = preferences.isDarkModeEnabled();
-
             Integer overlayIconId = file.getFileOverlayIconId(isAutoUploadFolder);
-            LayerDrawable fileIcon = MimeTypeUtil.getFileIcon(isDarkModeActive, overlayIconId, context, viewThemeUtils);
-            thumbnailView.setImageDrawable(fileIcon);
+            // NMC Customization: No overlay icon will be used. Directly using folder icons
+            thumbnailView.setImageDrawable(ContextCompat.getDrawable(context, overlayIconId));
         } else {
             if (file.getRemoteId() != null && file.isPreviewAvailable()) {
                 // Thumbnail in cache?
diff --git a/app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java b/app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java
@@ -16,7 +16,6 @@
 import android.net.Uri;
 import android.webkit.MimeTypeMap;
 
-import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.resources.files.model.ServerFileInterface;
@@ -94,13 +93,8 @@ public static Drawable getFileTypeIcon(String mimetype,
                                            ViewThemeUtils viewThemeUtils) {
         if (context != null) {
             int iconId = MimeTypeUtil.getFileTypeIconId(mimetype, filename);
-            Drawable icon = ContextCompat.getDrawable(context, iconId);
-
-            if (R.drawable.file_zip == iconId) {
-                viewThemeUtils.platform.tintPrimaryDrawable(context, icon);
-            }
-
-            return icon;
+            //NMC Customization
+            return ContextCompat.getDrawable(context, iconId);
         } else {
             return null;
         }
@@ -128,11 +122,13 @@ public static Drawable getDefaultFolderIcon(Context context, ViewThemeUtils view
         Drawable drawable = ContextCompat.getDrawable(context, R.drawable.folder);
         assert(drawable != null);
 
-        viewThemeUtils.platform.tintDrawable(context, drawable, ColorRole.PRIMARY);
         return drawable;
     }
 
-    public static LayerDrawable getFileIcon(Boolean isDarkModeActive, Integer overlayIconId, Context context, ViewThemeUtils viewThemeUtils) {
+    // NMC Note: This funtion won't be used in NMC as we are using different folder icons with inbuilt overlay. So this function is of no use for us.
+    // changed access to PRIVATE, in case if NC will use this function in more areas then we will get compile error which can be fixed by us
+    // so that UI won't be impacted.
+    private static LayerDrawable getFileIcon(Boolean isDarkModeActive, Integer overlayIconId, Context context, ViewThemeUtils viewThemeUtils) {
         Drawable folderDrawable = getDefaultFolderIcon(context, viewThemeUtils);
         assert(folderDrawable != null);
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,9 @@ object NextcloudExoPlayer {`
`42`	`42`	`.setMediaSourceFactory(mediaSourceFactory)`
`43`	`43`	`.setAudioAttributes(AudioAttributes.DEFAULT, true)`
`44`	`44`	`.setHandleAudioBecomingNoisy(true)`
`45`		`- .setSeekForwardIncrementMs(FIVE_SECONDS_IN_MILLIS)`
	`45`	`+ // NMC-3192 Fix`
	`46`	`+ .setSeekBackIncrementMs(2 * FIVE_SECONDS_IN_MILLIS)`
	`47`	`+ .setSeekForwardIncrementMs(2 * FIVE_SECONDS_IN_MILLIS)`
`46`	`48`	`.build()`
`47`	`49`	`}`
`48`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ class MediaControlView(context: Context, attrs: AttributeSet?) :`
`279`	`279`	`}`
`280`	`280`	`R.id.rewindBtn -> {`
`281`	`281`	`pos = playerControl.currentPosition`
`282`		`- pos -= 5000`
	`282`	`+ pos -= 2 * FIVE_SECONDS_IN_MILLIS`
`283`	`283`	`playerControl.seekTo(pos)`
`284`	`284`	`if (!playing) {`
`285`	`285`	`playerControl.pause() // necessary in some 2.3.x devices`
`@@ -288,7 +288,7 @@ class MediaControlView(context: Context, attrs: AttributeSet?) :`
`288`	`288`	`}`
`289`	`289`	`R.id.forwardBtn -> {`
`290`	`290`	`pos = playerControl.currentPosition`
`291`		`- pos += 15000`
	`291`	`+ pos += 2 * FIVE_SECONDS_IN_MILLIS`
`292`	`292`	`playerControl.seekTo(pos)`
`293`	`293`
`294`	`294`	`if (!playing) {`
`@@ -353,5 +353,7 @@ class MediaControlView(context: Context, attrs: AttributeSet?) :`
`353`	`353`	`companion object {`
`354`	`354`	`private val TAG = MediaControlView::class.java.getSimpleName()`
`355`	`355`	`private const val SHOW_PROGRESS = 1`
	`356`	`+ // NMC-3192 Fix`
	`357`	`+ private const val FIVE_SECONDS_IN_MILLIS = 5000`
`356`	`358`	`}`
`357`	`359`	`}`