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
Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
96b3688
add get album from collection
hqutrung Apr 24, 2023
9e3e63b
update code
hqutrung Apr 25, 2023
814d41a
Merge branch 'develop' into collection_for_pro
ppupha Jul 3, 2023
a309978
Merge branch 'develop' into collection_for_pro
ppupha Aug 3, 2023
c06ee1e
Merge branch 'develop' into collection_for_pro
ppupha Aug 4, 2023
807146b
Add Simple UI
ppupha Aug 8, 2023
a01e0e4
Merge branch 'develop' into collection_for_pro
ppupha Aug 8, 2023
8f897c1
Thumbnail for collection by artist
ppupha Aug 9, 2023
9c40a7b
UI for Collection Pro, goto Playlist View, NoEditable Playlist
ppupha Aug 10, 2023
5746b74
Playlist sort
ppupha Aug 11, 2023
b5f927d
Add Identity and Editable Collection
ppupha Aug 11, 2023
c9ac6df
Add Search
ppupha Aug 11, 2023
331e5a6
Add Filter
ppupha Aug 18, 2023
555afd4
Update Remove Collection UI
ppupha Aug 18, 2023
49d20ad
UI for add to collection button
ppupha Aug 18, 2023
c5743ce
Update Search and Add Playlist
ppupha Aug 25, 2023
4efac59
Add Nft to collection
ppupha Aug 25, 2023
9ed3a79
Update Playlist
ppupha Aug 27, 2023
e569b98
Update Remove Nft from Collection
ppupha Aug 27, 2023
547c563
Add GetName collection + Pull to refresh
ppupha Aug 28, 2023
5e619a7
Merge branch 'develop' into collection_for_pro
ppupha Sep 27, 2023
f2a2472
Update
ppupha Sep 28, 2023
0240e96
Update
ppupha Sep 29, 2023
20673f9
Fix: all Nfts playlist, Hidden/sent artwork
ppupha Sep 29, 2023
62cb48c
Update Icon
ppupha Sep 29, 2023
027fe84
Update Title
ppupha Sep 29, 2023
294eb21
User Sliver Listview
ppupha Oct 2, 2023
e408eb1
Merge branch 'develop' into collection_for_pro
ppupha Oct 2, 2023
cac854c
Edit Name
ppupha Oct 2, 2023
66190d5
Add Searchbar
ppupha Oct 2, 2023
77c6909
Merge branch 'develop' into collection_for_pro
ppupha Oct 2, 2023
bb7faeb
Update Sort
ppupha Oct 2, 2023
8ffb88c
Fix Collection
ppupha Oct 3, 2023
4aa3169
Seach for works
ppupha Oct 3, 2023
ca5841a
Add Asset
ppupha Oct 3, 2023
03ab2d5
Update Playlist
ppupha Oct 4, 2023
02cfd49
Fix playlist header
ppupha Oct 4, 2023
c0efe39
Selected artwork at the beginning, fix add nfts to collection
ppupha Oct 4, 2023
4fe4757
Add Artist Title
ppupha Oct 4, 2023
9983b34
Update Collection search
ppupha Oct 4, 2023
9ffe8d3
Fix style
ppupha Oct 4, 2023
75bc0ee
Fix: setPlaylist, appBar
ppupha Oct 4, 2023
1495632
Update Search bar
ppupha Oct 4, 2023
93137d6
Search by artist
ppupha Oct 4, 2023
380307a
Update
ppupha Oct 4, 2023
726f17f
Update Load Collection
ppupha Oct 4, 2023
a19a8f3
Add Filter by Medium
ppupha Oct 5, 2023
9d4f6e2
Merge branch 'develop' into collection_for_pro
ppupha Oct 5, 2023
f79875b
Update Scroll
ppupha Oct 5, 2023
5c30e89
Update
ppupha Oct 5, 2023
f777012
Merge branch 'develop' into collection_for_pro
ppupha Oct 6, 2023
9c33dea
Merge branch 'develop' into collection_for_pro
ppupha Oct 9, 2023
1f85785
Fix lint
ppupha Oct 9, 2023
82e5e25
Less reload collection
ppupha Oct 9, 2023
b6dde46
Remove CacheNetworkImage
ppupha Oct 10, 2023
8e742d7
Update Default Collection
ppupha Oct 10, 2023
a926947
Artist Thumbnail
ppupha Oct 10, 2023
65c31b6
Remove Playlist Section
ppupha Oct 11, 2023
9e0f1fb
Remove Control Bar
ppupha Oct 11, 2023
3622096
Merge branch 'Sang/collection/pro/remove_playlist' into collection_fo…
ppupha Oct 11, 2023
b68ae87
Rename
ppupha Oct 11, 2023
0c4e209
Rename
ppupha Oct 11, 2023
54a4fd7
Scroll to top
ppupha Oct 11, 2023
d673d68
Update Load Home
ppupha Oct 11, 2023
b883320
for all users
ppupha Oct 11, 2023
75cc9c1
Fix lint
ppupha Oct 11, 2023
a2ec7c5
Merge branch 'develop' into collection_for_pro
ppupha Nov 27, 2023
8816733
Merge branch 'develop' into collection_for_pro
ppupha Dec 21, 2023
28fdd9a
Dup HomePage
ppupha Dec 21, 2023
38dd9bb
Merge branch 'collection_for_pro' into Sang/collection/organize
ppupha Dec 21, 2023
e779b67
Update Navigation Bar
ppupha Dec 21, 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
Prev Previous commit
Next Next commit
Update Search bar
ppupha committed Oct 4, 2023
commit 149563213eb0b549d2c2c6c723a1fefb81f05830
3 changes: 2 additions & 1 deletion lib/screen/collection_pro/collection_pro_screen.dart
Original file line number Diff line number Diff line change
@@ -341,7 +341,8 @@ class _AlbumSectionState extends State<AlbumSection> {
Widget _header(BuildContext context, int total) {
final title =
widget.albumType == AlbumType.medium ? 'medium'.tr() : 'artists'.tr();
return SectionHeader(title: title, subTitle: "$total");
final subTitle = widget.albumType == AlbumType.medium ? "" : "$total";
return SectionHeader(title: title, subTitle: subTitle);
}

Widget _icon(AlbumModel album) {
9 changes: 6 additions & 3 deletions lib/view/searchBar.dart
Original file line number Diff line number Diff line change
@@ -39,8 +39,8 @@ class _SearchBarState extends State<AuSearchBar> {
children: [
SvgPicture.asset(
"assets/images/search.svg",
width: 20,
height: 20,
width: 14,
height: 14,
colorFilter: const ColorFilter.mode(
AppColor.secondarySpanishGrey, BlendMode.srcIn),
),
@@ -51,6 +51,9 @@ class _SearchBarState extends State<AuSearchBar> {
controller: _controller,
focusNode: _focusNode,
style: theme.textTheme.ppMori400Black14,
cursorColor: AppColor.primaryBlack,
cursorWidth: 0.5,
cursorHeight: 17,
decoration: InputDecoration(
contentPadding: const EdgeInsets.only(bottom: 10),
hintText: "search".tr(),
@@ -86,7 +89,7 @@ class _SearchBarState extends State<AuSearchBar> {
},
child: const Icon(
AuIcon.close,
size: 20,
size: 12,
color: AppColor.primaryBlack,
),
),