From 7743c4e2fdd5ab1bcb6176cdbd208fdf03725a9b Mon Sep 17 00:00:00 2001 From: A117870935 Date: Mon, 15 May 2023 22:07:21 +0530 Subject: [PATCH] Code revert as will be handled in theming and localization cluster. --- .../ui/activity/FolderPickerActivity.kt | 4 +- .../ui/fragment/OCFileListFragment.java | 50 ------------------- .../ui/fragment/UnifiedSearchFragment.kt | 2 +- .../main/res/menu/partial_drawer_entries.xml | 2 +- app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 6 files changed, 3 insertions(+), 57 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt index 294d7fb50587..d8bd66e9a03c 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt @@ -348,9 +348,7 @@ open class FolderPickerActivity : } private fun toggleChooseEnabled() { - val isFolderSelectable = checkFolderSelectable() - mChooseBtn?.isEnabled = isFolderSelectable - mChooseBtn?.alpha = if (isFolderSelectable) 1f else 0.5f + mChooseBtn?.isEnabled = checkFolderSelectable() } // for copy and move, disable selecting parent folder of target files diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java index 8c736d7f9029..60351562644f 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -40,7 +40,6 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.view.ViewTreeObserver; import android.widget.AbsListView; import android.widget.Toast; @@ -225,11 +224,6 @@ public class OCFileListFragment extends ExtendedListFragment implements @Inject DeviceInfo deviceInfo; - //this variable will help us to provide number of span count for grid view - //the width for single item is approx to 360 - private static final int GRID_ITEM_DEFAULT_WIDTH = 360; - private static final int DEFAULT_FALLBACK_SPAN_COUNT = 1; - protected enum MenuItemAddRemove { DO_NOTHING, REMOVE_SORT, @@ -1320,22 +1314,6 @@ public void listDirectory(OCFile directory, OCFile file, boolean onlyOnDevice, b } } - if (searchView != null && !searchView.isIconified() && !fromSearch) { - searchView.post(() -> { - searchView.setQuery("", false); - searchView.onActionViewCollapsed(); - Activity activity; - if ((activity = getActivity()) != null && activity instanceof FileDisplayActivity) { - FileDisplayActivity fileDisplayActivity = (FileDisplayActivity) activity; - fileDisplayActivity.hideSearchView(fileDisplayActivity.getCurrentDir()); - if (getCurrentFile() != null) { - fileDisplayActivity - .setDrawerIndicatorEnabled(fileDisplayActivity.isRoot(getCurrentFile())); - } - } - }); - } - mAdapter.swapDirectory( accountManager.getUser(), directory, @@ -1472,40 +1450,12 @@ public int getSpanSize(int position) { } getRecyclerView().setLayoutManager(layoutManager); - calculateAndUpdateSpanCount(grid); getRecyclerView().scrollToPosition(position); getAdapter().setGridView(grid); getRecyclerView().setAdapter(getAdapter()); getAdapter().notifyDataSetChanged(); } - /** - * method will calculate the number of spans required for grid item and will update the span accordingly - * - * @param isGrid - */ - private void calculateAndUpdateSpanCount(boolean isGrid) { - getRecyclerView().getViewTreeObserver().addOnGlobalLayoutListener( - new ViewTreeObserver.OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - getRecyclerView().getViewTreeObserver().removeOnGlobalLayoutListener(this); - if (isGrid) { - int viewWidth = getRecyclerView().getMeasuredWidth(); - int newSpanCount = viewWidth / GRID_ITEM_DEFAULT_WIDTH; - RecyclerView.LayoutManager layoutManager = getRecyclerView().getLayoutManager(); - if (layoutManager instanceof GridLayoutManager) { - if (newSpanCount < 1) { - newSpanCount = DEFAULT_FALLBACK_SPAN_COUNT; - } - ((GridLayoutManager) layoutManager).setSpanCount(newSpanCount); - layoutManager.requestLayout(); - } - } - } - }); - } - public CommonOCFileListAdapterInterface getCommonAdapter() { return mAdapter; } 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 index 82cbe016b60e..f7b81490273f 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt @@ -38,8 +38,8 @@ import com.nextcloud.client.account.CurrentAccountProvider import com.nextcloud.client.core.AsyncRunner import com.nextcloud.client.di.Injectable import com.nextcloud.client.di.ViewModelFactory -import com.nextcloud.client.network.ClientFactory import com.nmc.android.utils.KeyboardUtils +import com.nextcloud.client.network.ClientFactory import com.owncloud.android.R import com.owncloud.android.databinding.ListFragmentBinding import com.owncloud.android.datamodel.FileDataStorageManager diff --git a/app/src/main/res/menu/partial_drawer_entries.xml b/app/src/main/res/menu/partial_drawer_entries.xml index 9e02e6fa5cfe..7a7f88671f2a 100644 --- a/app/src/main/res/menu/partial_drawer_entries.xml +++ b/app/src/main/res/menu/partial_drawer_entries.xml @@ -58,7 +58,7 @@ android:icon="@drawable/nav_recently" android:orderInCategory="0" android:title="@string/drawer_item_recently_modified" - android:visible="false"/> + android:visible="true"/> %d ausgewählt %d ausgewählt - Bitte geben Sie unter Apps & Benachrichtigungen in den Einstellungen manuell die Erlaubnis. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 41430e09b302..f98d81cb2135 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1077,5 +1077,4 @@ Multiple images Cannot create local file Invalid filename for local file - Please navigate to App info in settings and give permission manually.