Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use M3 for SyncedFolderPreferencesDialogFragment #12049

Merged
merged 18 commits into from
Oct 30, 2023
Merged

Use M3 for SyncedFolderPreferencesDialogFragment #12049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4f40ecd
Use M3 for SyncedFolderPreferencesDialogFragment
alperozturk96 Oct 16, 2023
b25a82a
Update button order
alperozturk96 Oct 16, 2023
58e985a
Add setText for buttons
alperozturk96 Oct 16, 2023
bc1e8ed
Use M3 for SyncedFolderPreferencesDialogFragment
alperozturk96 Oct 16, 2023
7df2685
Update button order
alperozturk96 Oct 16, 2023
fedfb23
Add setText for buttons
alperozturk96 Oct 16, 2023
e2ed8a7
new size for screenshot
tobiasKaminsky Oct 18, 2023
de4ee9b
Merge master
alperozturk96 Oct 19, 2023
1ddf3de
Merge remote-tracking branch 'origin/feature/use-m3-SyncedFolderPrefe…
alperozturk96 Oct 19, 2023
10e22d6
Merge master
alperozturk96 Oct 20, 2023
c4e386f
Update screenshots
alperozturk96 Oct 20, 2023
026c7aa
Merge master
alperozturk96 Oct 24, 2023
b18799a
Rename .java to .kt
alperozturk96 Oct 24, 2023
485d68c
Convert to kt
alperozturk96 Oct 24, 2023
1a77dc9
Refactor
alperozturk96 Oct 24, 2023
ea099b5
Suppress magic number
alperozturk96 Oct 24, 2023
c9421c0
Merge master
alperozturk96 Oct 26, 2023
f016d0b
Revert ss
alperozturk96 Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ...y/debug/com.nextcloud.client.SyncedFoldersActivityIT_testSyncedFolderDialog.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,11 @@ class SyncedFoldersActivity :
}
}

override fun onSaveSyncedFolderPreference(syncedFolder: SyncedFolderParcelable) {
override fun onSaveSyncedFolderPreference(syncedFolder: SyncedFolderParcelable?) {
if (syncedFolder == null) {
return
}

// custom folders newly created aren't in the list already,
// so triggering a refresh
if (MediaFolderType.CUSTOM == syncedFolder.type && syncedFolder.id == SyncedFolder.UNPERSISTED_ID) {
Expand Down Expand Up @@ -730,7 +734,11 @@ class SyncedFoldersActivity :
syncedFolderPreferencesDialogFragment = null
}

override fun onDeleteSyncedFolderPreference(syncedFolder: SyncedFolderParcelable) {
override fun onDeleteSyncedFolderPreference(syncedFolder: SyncedFolderParcelable?) {
if (syncedFolder == null) {
return
}

syncedFolderProvider.deleteSyncedFolder(syncedFolder.id)
adapter.removeItem(syncedFolder.section)
}
Expand Down
Loading
Loading