-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for images & galleries (#173)
This is a work in progress Adds support for showing images & galleries Minimum features: - [x] Display an image - [x] Display list of images (w/ filter) - [x] Support images on main page - [x] Add gallery count & icon to card - [x] Add overlay with details Extra features - [ ] Move between images w/ left & right - [ ] Add controls to zoom and move image
- Loading branch information
1 parent
57c530e
commit d35d85c
Showing
36 changed files
with
1,046 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| query FindGalleries($filter: FindFilterType, $gallery_filter: GalleryFilterType) { | ||
| findGalleries(filter: $filter, gallery_filter: $gallery_filter) { | ||
| count | ||
| galleries { | ||
| ...GalleryData | ||
| } | ||
| } | ||
| } | ||
|
|
||
| query FindGallery($id: ID!) { | ||
| findGallery(id: $id) { | ||
| ...GalleryData | ||
| } | ||
| } | ||
|
|
||
| fragment GalleryData on Gallery { | ||
| id | ||
| title | ||
| image_count | ||
| date | ||
| details | ||
| rating100 | ||
| files { | ||
| path | ||
| } | ||
| folder { | ||
| path | ||
| } | ||
| performers { | ||
| id | ||
| name | ||
| } | ||
| tags { | ||
| id | ||
| name | ||
| } | ||
| studio { | ||
| id | ||
| name | ||
| } | ||
| scenes { | ||
| id | ||
| } | ||
| cover { | ||
| id | ||
| paths { | ||
| thumbnail | ||
| image | ||
| preview | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| query FindImages($filter: FindFilterType, $image_filter: ImageFilterType) { | ||
| findImages(filter: $filter, image_filter: $image_filter) { | ||
| count | ||
| images { | ||
| ...ImageData | ||
| } | ||
| } | ||
| } | ||
|
|
||
| query FindImage($id: ID) { | ||
| findImage(id: $id) { | ||
| ...ImageData | ||
| } | ||
| } | ||
|
|
||
| fragment ImageData on Image { | ||
| id | ||
| title | ||
| code | ||
| rating100 | ||
| date | ||
| details | ||
| photographer | ||
| o_counter | ||
| paths { | ||
| thumbnail | ||
| preview | ||
| image | ||
| } | ||
| performers{ | ||
| ...PerformerData | ||
| } | ||
| studio { | ||
| ...StudioData | ||
| } | ||
| tags { | ||
| ...TagData | ||
| } | ||
| galleries { | ||
| id | ||
| } | ||
| visual_files { | ||
| ... on BaseFile{ | ||
| id | ||
| path | ||
| size | ||
| __typename | ||
| } | ||
| ... on ImageFile { | ||
| width | ||
| height | ||
|
|
||
| } | ||
| ... on VideoFile{ | ||
| width | ||
| height | ||
| format | ||
| video_codec | ||
| audio_codec | ||
| duration | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,4 +7,6 @@ fragment TagData on Tag { | |
| performer_count | ||
| scene_marker_count | ||
| image_path | ||
| image_count | ||
| gallery_count | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
app/src/main/java/com/github/damontecres/stashapp/GalleryActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| package com.github.damontecres.stashapp | ||
|
|
||
| import android.os.Bundle | ||
| import android.widget.TextView | ||
| import androidx.fragment.app.FragmentActivity | ||
| import com.apollographql.apollo3.api.Optional | ||
| import com.github.damontecres.stashapp.api.type.CriterionModifier | ||
| import com.github.damontecres.stashapp.api.type.FindFilterType | ||
| import com.github.damontecres.stashapp.api.type.ImageFilterType | ||
| import com.github.damontecres.stashapp.api.type.MultiCriterionInput | ||
| import com.github.damontecres.stashapp.api.type.SortDirectionEnum | ||
| import com.github.damontecres.stashapp.suppliers.ImageDataSupplier | ||
| import com.github.damontecres.stashapp.util.ImageComparator | ||
|
|
||
| class GalleryActivity : FragmentActivity() { | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| setContentView(R.layout.grid_view) | ||
| if (savedInstanceState == null) { | ||
| val galleryId = intent.getStringExtra(INTENT_GALLERY_ID)!! | ||
| val galleryName = intent.getStringExtra(INTENT_GALLERY_NAME) | ||
| findViewById<TextView>(R.id.grid_title).text = galleryName | ||
| supportFragmentManager.beginTransaction() | ||
| .replace( | ||
| R.id.grid_fragment, | ||
| StashGridFragment( | ||
| ImageComparator, | ||
| ImageDataSupplier( | ||
| FindFilterType( | ||
| sort = Optional.present("path"), | ||
| direction = Optional.present(SortDirectionEnum.ASC), | ||
| ), | ||
| ImageFilterType( | ||
| galleries = | ||
| Optional.present( | ||
| MultiCriterionInput( | ||
| value = Optional.present(listOf(galleryId)), | ||
| modifier = CriterionModifier.INCLUDES, | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ).commitNow() | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| const val INTENT_GALLERY_ID = "gallery.id" | ||
| const val INTENT_GALLERY_NAME = "gallery.name" | ||
| } | ||
| } |
Oops, something went wrong.