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.

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

Sang/collection/organize #1432

Merged
merged 71 commits into from
Dec 21, 2023
Merged

Conversation

ppupha
Copy link
Collaborator

@ppupha ppupha commented Dec 21, 2023

Description

Describe your changes

  • Merge collection for pro
  • Update Navigation Bar

Copy link
Contributor

Dependency Review

✅ No vulnerabilities or license issues found.

Scanned Manifest Files

@ppupha ppupha merged commit 6a7c979 into rebrand_to_feral_file Dec 21, 2023
1 check passed
@ppupha ppupha deleted the Sang/collection/organize branch December 21, 2023 10:02
hvthhien pushed a commit that referenced this pull request Jan 11, 2024
* rebrand to feralfile, add colors

Signed-off-by: phuoc <[email protected]>

* Sang/collection/organize (#1432)

* add get album from collection

* update code

* Add Simple UI

* Thumbnail for collection by artist

* UI for Collection Pro, goto Playlist View, NoEditable Playlist

* Playlist sort

* Add Identity and Editable Collection

* Add Search

* Add Filter

* Update Remove Collection UI

* UI for add to collection button

* Update Search and Add Playlist

* Add Nft to collection

* Update Playlist

* Update Remove Nft from Collection

* Add GetName collection + Pull to refresh

* Update

* Update

* Fix: all Nfts playlist, Hidden/sent artwork

* Update Icon

* Update Title

* User Sliver Listview

* Edit Name

* Add Searchbar

* Update Sort

* Fix Collection

* Seach for works

* Add Asset

* Update Playlist

* Fix playlist header

* Selected artwork at the beginning, fix add nfts to collection

* Add Artist Title

* Update Collection search

* Fix style

* Fix: setPlaylist, appBar

* Update Search bar

* Search by artist

* Update

* Update Load Collection

* Add Filter by Medium

* Update Scroll

* Update

* Fix lint

* Less reload collection

* Remove CacheNetworkImage

* Update Default Collection

* Artist Thumbnail

* Remove Playlist Section

* Remove Control Bar

* Rename

* Rename

* Scroll to top

* Update Load Home

* for all users

* Fix lint

* Dup HomePage

* Update Navigation Bar

---------

Co-authored-by: Trung <[email protected]>

* Update Collection + Organize

* FF Exhibitions (#1435)

* Add Menu

* Update Scan QR Code

* Update Navigation

* Refactor + FF Exhibition

* Update Navigation Bar

* Fix lint

* Update Asset

* exhibition detail page (#1436)

* exhibition detail page

Signed-off-by: phuoc <[email protected]>

* get artworks by exhibition

Signed-off-by: phuoc <[email protected]>

* call artwork api

Signed-off-by: phuoc <[email protected]>

---------

Signed-off-by: phuoc <[email protected]>

* exhibition preview

Signed-off-by: phuoc <[email protected]>

* Sang/rebrand to ff/number exhibition artwork (#1440)

* Add Exhibition work

* Update Asset

* Update

* update exhibition detail

Signed-off-by: phuoc <[email protected]>

* Update UI when permission denied (#1441)

* Revert Playlist + Update UI (#1437)

* Add Menu

* Update Scan QR Code

* Update Navigation

* Refactor + FF Exhibition

* Update Navigation Bar

* Fix lint

* Update Asset

* Revert "Remove Playlist Section"

This reverts commit 65c31b6.

* Organize Update

* Update Icon

* Update Asset

* Update Exhibitions

* Show Playlist and Hide + when search

* extension, model

Signed-off-by: phuoc <[email protected]>

* api

Signed-off-by: phuoc <[email protected]>

* exhibition detail page, view artwork

Signed-off-by: phuoc <[email protected]>

* padding

Signed-off-by: phuoc <[email protected]>

* Sort Collection by artists

* Update Menu

* Update Playlist Name

* Add Search Timer

* Update nft_collection to latest

* make field final

Signed-off-by: phuoc <[email protected]>

* Resume/pause camera when pop/push

* Update AuToggle

* Update Primary Button

* exhibition detail last page

Signed-off-by: phuoc <[email protected]>

* lint

Signed-off-by: phuoc <[email protected]>

* stream to device

Signed-off-by: phuoc <[email protected]>

* ff series page

Signed-off-by: phuoc <[email protected]>

* remove comment, dummie test

Signed-off-by: phuoc <[email protected]>

* Transparent Appbar (#1447)

* Transparent Appbar

* Update For iOS

* Update

* Remove tipcard (#1449)

* Update View Existing Address

* Remove Tipcard in Home

* Support Svg

* Update Asset

* AutoFocus Search

* Moma postcard page (#1448)

* Update View Existing Address

* Add MoMA Postcard

* Update Scan QR Code

* Update

* AutoFocus Search

* Sang/rebrand to ff/onboarding (#1450)

* Update Onboarding Page

* Update

* Update Asset

* Update UI

* Fix lint

* nullable field

Signed-off-by: phuoc <[email protected]>

* Update Scan QR Code

* Scroll to top

* Pause/Resume Camera

* fix exhibition index

Signed-off-by: phuoc <[email protected]>

* note view, event view

Signed-off-by: phuoc <[email protected]>

* resouces null case

Signed-off-by: phuoc <[email protected]>

* naming

Signed-off-by: phuoc <[email protected]>

* increase canvas playing time

Signed-off-by: phuoc <[email protected]>

* fix token null

Signed-off-by: phuoc <[email protected]>

* ff artwork preview page

Signed-off-by: phuoc <[email protected]>

* exhibition note page

Signed-off-by: phuoc <[email protected]>

* Update DarkAppBar

* Update To Latest Asset

* action padding

Signed-off-by: phuoc <[email protected]>

* lint

Signed-off-by: phuoc <[email protected]>

* lint

Signed-off-by: phuoc <[email protected]>

* Update Asset: Replace Autonomy with Feral File

* Sang/rebrand to ff/update home page (#1456)

* Update HomeNavigatorTab

* Place icon with svg

* Update Appbar

* Add Bottom Padding

* Update Onboarding Page

* Update Text Style

* Fix lint

* Fix lint

* change superteal to ff yellow

Signed-off-by: phuoc <[email protected]>

* init new collection: focus on name field

Signed-off-by: phuoc <[email protected]>

* lint

Signed-off-by: phuoc <[email protected]>

* lint

Signed-off-by: phuoc <[email protected]>

* feralfile deeplink

Signed-off-by: phuoc <[email protected]>

* android

Signed-off-by: phuoc <[email protected]>

* plist.info

Signed-off-by: phuoc <[email protected]>

* watch more: using inapp webview

Signed-off-by: phuoc <[email protected]>

* lint

Signed-off-by: phuoc <[email protected]>

* feralfile.io to app.feralfile.com

Signed-off-by: phuoc <[email protected]>

* Update Gif (#1459)

* Update Feral File Name + Logo (#1453)

* Update Name And Icons

* Remove Penrose

* Update Icon

* Update iOS Name

* Update Android Logo

* Update Background Color

* Remove Penrose

* Update Foreground

* Update iOS Icon

* Update Splash Screen

* icon launcher background = white

Signed-off-by: phuoc <[email protected]>

* assets

Signed-off-by: phuoc <[email protected]>

* add padding bottom

Signed-off-by: phuoc <[email protected]>

* cast button

Signed-off-by: phuoc <[email protected]>

* sort artwork

Signed-off-by: phuoc <[email protected]>

* ios asset ds store

Signed-off-by: phuoc <[email protected]>

* rm unused

Signed-off-by: phuoc <[email protected]>

* Feral File Artists/Curators (#1461)

* Open Artist/Curator

* Update Asset

* Update Camera Scan

* Update FF Loading

* Collection Pro: Update Scroll View (#1462)

* remove unused

Signed-off-by: phuoc <[email protected]>

* remove unused

Signed-off-by: phuoc <[email protected]>

* separate cast button

Signed-off-by: phuoc <[email protected]>

* lint

Signed-off-by: phuoc <[email protected]>

* home page background

Signed-off-by: phuoc <[email protected]>

* cache exhibition cover image

Signed-off-by: phuoc <[email protected]>

* fix qr code header

Signed-off-by: phuoc <[email protected]>

* append playlist button size

Signed-off-by: phuoc <[email protected]>

* Update Onboarding Store

* icon size

Signed-off-by: phuoc <[email protected]>

* Update Splash Inhouse

* Update Asset

* Fix build

* hide tabbar when showing keyboard

Signed-off-by: phuoc <[email protected]>

* Sang/rebrand to ff/scan qr (#1464)

* Fix loading

* After Finish

* Remove ldpi splash

* add place holder for exhibtion cover image

Signed-off-by: phuoc <[email protected]>

* fix resolve conflict

Signed-off-by: phuoc <[email protected]>

* Update Logo in activation

* Update Hashtag

* Fix lint

* Empty Search + Init Tab (#1469)

* Empty Search View

* Exhibition init tab

* Load 1 exhibition

* Fix lint

---------

Signed-off-by: phuoc <[email protected]>
Co-authored-by: phuoc <[email protected]>
Co-authored-by: Trung <[email protected]>
Co-authored-by: phuocbitmark <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants