Loowiz/PhotoSwooper
3
35
Fork
You've already forked PhotoSwooper
3

WIP: Immich support #82

Draft
Loowiz wants to merge 20 commits from immichMode into main
pull from: immichMode
merge into: Loowiz:main
Loowiz:main
Loowiz:daddyparodz-main
Loowiz:moveToAlbum
Loowiz:fix-2-3-database-migration
Loowiz:testAlbumFilterIssue
Loowiz:testSwipePersistence
Loowiz:editInfo
Loowiz:detached
Loowiz:stats-screen
Loowiz:persistence

See #40:

Instead of only being able to swipe on local files, add a feature to be able to get random photos from your Immich server and swipe on them instead.

Milestones

  • Finish configuration UI (WIP - 80% complete)
  • Update tutorial to expose option
  • Figure out database backend situation (WIP - 95% Complete)
  • Calculate hashes/checksums of local media without memory issues
  • Refactor stuff so we can play local Immich files if accessible
  • Fix playback issues when displaying videos from Immich
  • Unified album browser
  • General automatic synchronisation
  • Sync queue for offline usage
  • Duplicate/stack handling? (May come in a later update)
See #40: > Instead of only being able to swipe on local files, add a feature to be able to get random photos from your Immich server and swipe on them instead. ## Milestones - [ ] Finish configuration UI (WIP - 80% complete) - [ ] Update tutorial to expose option - [ ] Figure out database backend situation (WIP - 95% Complete) - [ ] Calculate hashes/checksums of local media without memory issues - [ ] Refactor stuff so we can play local Immich files if accessible - [ ] Fix playback issues when displaying videos from Immich - [ ] Unified album browser - [ ] General automatic synchronisation - [ ] Sync queue for offline usage - [ ] Duplicate/stack handling? (May come in a later update)
This commit also adds Composables which allow the user to modify these in PreferencesScreen.kt.
These currently have no functionality.
Signed-off-by: loowiz <loowiz@envs.net>
Signed-off-by: loowiz <loowiz@envs.net>
This is because this interface will now also interact with an Immich server, not just the local ContentResolver/MediaStore
Signed-off-by: loowiz <loowiz@envs.net>
Signed-off-by: loowiz <loowiz@envs.net>
Signed-off-by: loowiz <loowiz@envs.net>
(cherry picked from commit 4a02398acf)
Signed-off-by: loowiz <loowiz@envs.net>
Signed-off-by: loowiz <loowiz@envs.net>
(cherry picked from commit 4fda04e950)
Signed-off-by: loowiz <loowiz@envs.net>
(cherry picked from commit ab5c256c84)
This temporarily breaks the functionality of videos while refactoring of the database continues
- Add more parameters to the MediaSource enum
- Separate MediaConfigScreen into view model, UI state and UI
This would reduce confusion with Immich entities
This pull request has changes conflicting with the target branch.
  • app/src/main/java/com/example/photoswooper/ui/view/PreferencesScreen.kt
  • app/src/main/java/com/example/photoswooper/ui/view/ReviewScreen.kt
  • app/src/main/java/com/example/photoswooper/utils/MediaSourceInterface.kt
  • app/src/main/res/values/strings.xml
  • gradle/libs.versions.toml
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin immichMode:immichMode
git switch immichMode

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff immichMode
git switch immichMode
git rebase main
git switch main
git merge --ff-only immichMode
git switch immichMode
git rebase main
git switch main
git merge --no-ff immichMode
git switch main
git merge --squash immichMode
git switch main
git merge --ff-only immichMode
git switch main
git merge immichMode
git push origin main
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
Loowiz/PhotoSwooper!82
Reference in a new issue
Loowiz/PhotoSwooper
No description provided.
Delete branch "immichMode"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?