mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11819 from nextcloud/nmc/persistMediaViewFolderSelection

Browse source 
Persist last selected media folder for media view
This commit is contained in:
Andy Scherzinger 2023-07-24 17:54:25 +02:00 committed by GitHub
commit 37e151718f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java
View file

@ -2,7 +2,9 @@
* Nextcloud Android client application
*
* @author Chris Narkiewicz
* @author TSI-mc
* Copyright (C) 2019 Chris Narkiewicz, EZ Aquarii
* Copyright (C) 2023 TSI-mc
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -384,4 +386,9 @@ public interface AppPreferences {
@Nullable
AppReviewShownModel getInAppReviewData();
void setLastSelectedMediaFolder(@NonNull String path);
@NonNull
String getLastSelectedMediaFolder();
}

14
app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
View file

@ -3,8 +3,10 @@
*
* @author David A. Velasco
* @author Chris Narkiewicz Chris Narkiewicz
* @author TSI-mc
* Copyright (C) 2016 ownCloud Inc.
* Copyright (C) 2019 Chris Narkiewicz <hello@ezaquarii.com>
* Copyright (C) 2023 TSI-mc
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
@ -99,6 +101,7 @@ public final class AppPreferencesImpl implements AppPreferences {
private static final String PREF__CALENDAR_LAST_BACKUP = "calendar_last_backup";
private static final String PREF__PDF_ZOOM_TIP_SHOWN = "pdf_zoom_tip_shown";
private static final String PREF__MEDIA_FOLDER_LAST_PATH = "media_folder_last_path";
private static final String PREF__STORAGE_PERMISSION_REQUESTED = "storage_permission_requested";
private static final String PREF__IN_APP_REVIEW_DATA = "in_app_review_data";
@ -729,4 +732,15 @@ public final class AppPreferencesImpl implements AppPreferences {
String json = preferences.getString(PREF__IN_APP_REVIEW_DATA, "");
return gson.fromJson(json, AppReviewShownModel.class);
}
@Override
public void setLastSelectedMediaFolder(@NonNull String path) {
preferences.edit().putString(PREF__MEDIA_FOLDER_LAST_PATH, path).apply();
}
@NonNull
@Override
public String getLastSelectedMediaFolder() {
return preferences.getString(PREF__MEDIA_FOLDER_LAST_PATH, OCFile.ROOT_PATH);
}
}

9
app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java
View file

@ -5,7 +5,7 @@
* @author TSI-mc
* Copyright (C) 2019 Tobias Kaminsky
* Copyright (C) 2019 Nextcloud GmbH
* Copyright (C) 2022 TSI-mc
* Copyright (C) 2023 TSI-mc
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -70,7 +70,6 @@ public class GalleryFragment extends OCFileListFragment implements GalleryFragme
private GalleryAdapter mAdapter;
private static final int SELECT_LOCATION_REQUEST_CODE = 212;
private OCFile remoteFile;
private GalleryFragmentBottomSheetDialog galleryFragmentBottomSheetDialog;
@Inject FileDataStorageManager fileDataStorageManager;
@ -121,8 +120,6 @@ public class GalleryFragment extends OCFileListFragment implements GalleryFragme
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View v = super.onCreateView(inflater, container, savedInstanceState);
remoteFile = fileDataStorageManager.getDefaultRootPath();
getRecyclerView().addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
@ -289,7 +286,7 @@ public class GalleryFragment extends OCFileListFragment implements GalleryFragme
if (requestCode == SELECT_LOCATION_REQUEST_CODE && data != null) {
OCFile chosenFolder = data.getParcelableExtra(FolderPickerActivity.EXTRA_FOLDER);
if (chosenFolder != null) {
remoteFile = chosenFolder;
preferences.setLastSelectedMediaFolder(chosenFolder.getRemotePath());
searchAndDisplayAfterChangingFolder();
}
}
@ -372,7 +369,7 @@ public class GalleryFragment extends OCFileListFragment implements GalleryFragme
}
public void showAllGalleryItems() {
mAdapter.showAllGalleryItems(remoteFile.getRemotePath(),
mAdapter.showAllGalleryItems(preferences.getLastSelectedMediaFolder(),
galleryFragmentBottomSheetDialog.getCurrMediaState(),
this);