Commit graph

3415 commits

Author SHA1 Message Date
ashilkn 714643c02a Merge branch 'collaboration_view' into font_size_bug 2022-12-16 18:16:15 +05:30
ashilkn e9e62e379c Fixed UI bug on expanded menu of bottomAcitonBar on higher system font sizes 2022-12-16 18:15:36 +05:30
Neeraj Gupta 858c390860
Merge pull request #714 from ente-io/bottom_bar_blur
Fix another divider
2022-12-16 17:23:09 +05:30
vishnukvmd 31673c6a1d Fix another divider 2022-12-16 17:21:35 +05:30
Neeraj Gupta b0a2a6c8b4
Merge pull request #713 from ente-io/bottom_bar_blur
Fix the color of divider
2022-12-16 17:18:49 +05:30
vishnukvmd dfad4d62bb Fix divider color 2022-12-16 17:18:06 +05:30
Neeraj Gupta 08277a3de3
Merge branch 'collaboration_view' of github.com:ente-io/photos-app into collaboration_view 2022-12-16 17:17:28 +05:30
Neeraj Gupta 5be159ef1a
Fix alignment for empty hidden state 2022-12-16 17:17:02 +05:30
Ashil 14feb64609
Merge pull request #712 from ente-io/action-sheet-add-on
Return ButtonAction from ActionSheet
2022-12-16 16:59:19 +05:30
Neeraj Gupta 4b93930399
Copy change 2022-12-16 16:50:32 +05:30
ashilkn a6fc65a6eb Use only List<ButtonWidget> for button property in ActionSheetWidget 2022-12-16 16:43:34 +05:30
ashilkn 6c2b6f8eed bug fix 2022-12-16 16:34:51 +05:30
ashilkn 2ee6e26e48 Merge branch 'collaboration_view' into action-sheet-add-on 2022-12-16 16:17:52 +05:30
ashilkn 60b69beed9 Minor changes 2022-12-16 16:08:49 +05:30
Neeraj Gupta e19cbeb129
Merge pull request #711 from ente-io/bottom_bar_blur
Bottom bar blur
2022-12-16 15:58:21 +05:30
vishnukvmd f82ead149f Fix icon color for the bottom bar 2022-12-16 15:57:09 +05:30
vishnukvmd f6740cd840 Reduce blur of the bottom bar 2022-12-16 15:56:01 +05:30
Neeraj Gupta 0e4e9bfc4c
Use different avatar color based on uploader name 2022-12-16 15:48:48 +05:30
Neeraj Gupta 5184191f09
copy change 2022-12-16 15:38:35 +05:30
Neeraj Gupta 66c5e0f24f
Use new bottom bar for gallery folder page 2022-12-16 15:29:48 +05:30
Neeraj Gupta b06fc72614
Copy fix 2022-12-16 15:22:42 +05:30
Neeraj Gupta 62ab344aea
Fix remove from album option visibility 2022-12-16 14:50:12 +05:30
Neeraj Gupta c1cb505747
Fix: Show delete option in favorites view 2022-12-16 14:43:19 +05:30
vishnukvmd ff635f1a95 Merge remote-tracking branch 'origin/collaboration_view' into collect_changes 2022-12-16 14:02:55 +05:30
vishnukvmd 3506b2962d Fix dividers 2022-12-16 13:58:54 +05:30
vishnukvmd 1e4d7d60e7 Fix corner 2022-12-16 13:49:32 +05:30
Neeraj Gupta 6fec4a8ee6
Fix spacing issues between top icons 2022-12-16 13:42:37 +05:30
vishnukvmd 09a1106f2b Show avatars only when files aren't selected 2022-12-16 13:41:26 +05:30
vishnukvmd 044878e336 Render action bar conditionally for collaborators 2022-12-16 13:37:23 +05:30
Neeraj Gupta 1bf30dad48
Fix state for disabled options 2022-12-16 13:25:07 +05:30
ashilkn 73415ff9a0 Dismiss ActionSheet properly after action is complete 2022-12-16 13:18:57 +05:30
Neeraj Gupta 33e6236ed7
Switch to new bottom selectionBar for search result 2022-12-16 13:17:52 +05:30
Neeraj Gupta c41f4fd06a
Switch to new bottom menu for hidden page 2022-12-16 13:12:13 +05:30
Neeraj Gupta c93999f75b
Show unhide icon on top actions 2022-12-16 13:09:58 +05:30
Neeraj Gupta 847e527940
Add unarchive icon on top 2022-12-16 13:06:43 +05:30
Neeraj Gupta 96da6420fc
Fix unarchive icon 2022-12-16 12:57:53 +05:30
Neeraj Gupta 66ec24839e
Use new bottom bar for archive page 2022-12-16 12:57:29 +05:30
ashilkn 78e1c05d93 Handled error states in button when used in action sheet 2022-12-16 12:56:24 +05:30
ashilkn a370781c94 Minor changes 2022-12-16 12:13:25 +05:30
vishnukvmd e0f6db707c Show uploader avatar for collected files 2022-12-16 12:10:55 +05:30
vishnukvmd 94251a12fa Fix bottom radius behavior 2022-12-16 12:08:42 +05:30
ashilkn 6c16c9dbbc Check if mounted before calling setState 2022-12-16 12:06:37 +05:30
ashilkn de50b052a8 Return info about button tapped in action sheet 2022-12-16 12:00:01 +05:30
Neeraj Gupta fcb0a72235
Merge branch 'collaboration_view' of github.com:ente-io/photos-app into collaboration_view 2022-12-16 11:09:40 +05:30
Neeraj Gupta fe3d40c2e2
Show warning while removing items only in single album 2022-12-16 11:09:11 +05:30
vishnukvmd abfc286885 Use a solid divider 2022-12-16 10:27:31 +05:30
vishnukvmd c5455f0d17 Remove bottom border for item 2022-12-16 10:21:39 +05:30
vishnukvmd 9581f29c4e Fix border for last items 2022-12-16 10:21:39 +05:30
Neeraj Gupta 90ec30a308
Merge branch 'collaboration_view' of github.com:ente-io/photos-app into collaboration_view 2022-12-16 10:19:00 +05:30
Neeraj Gupta e953968a82
Fix: show correct file owner 2022-12-16 10:18:15 +05:30
ashilkn c74b2f96df Fix dividers on Manage Link screen 2022-12-16 10:16:20 +05:30
Neeraj Gupta 40d8d215cc
move redundant container 2022-12-16 10:04:18 +05:30
vishnukvmd 4d52b1ecaa Fix warning 2022-12-16 09:50:08 +05:30
vishnukvmd 5a446857d4 Update copy 2022-12-16 09:44:44 +05:30
vishnukvmd d50f2aee62 Remove extra space 2022-12-16 09:43:29 +05:30
vishnukvmd 2b3073a236 Remove extra space 2022-12-16 09:43:16 +05:30
vishnukvmd 2e4dba3fe1 Fix top radius for Add email button 2022-12-16 09:42:18 +05:30
vishnukvmd 35a6afb0da Fix typo 2022-12-16 09:40:33 +05:30
Neeraj Gupta 3a81ef51d9
Enable collaboration in debug mode only 2022-12-15 22:25:50 +05:30
Neeraj Gupta 29d39488eb
UI Fixes 2022-12-15 22:23:06 +05:30
Neeraj Gupta a7ca764805
Handle remove files from shared album 2022-12-15 21:55:29 +05:30
Neeraj Gupta dbe5747104
Add support for disabled state 2022-12-15 21:54:39 +05:30
Neeraj Gupta 683a1c66aa
Merge branch 'redesign-with-components' into collaboration_view 2022-12-15 20:16:00 +05:30
Neeraj Gupta 90a3c34e36
Show new bottom selection for home menu 2022-12-15 20:03:40 +05:30
Neeraj Gupta 074c94f5ac
Refactor bottom overlay in separate widget 2022-12-15 19:44:26 +05:30
Manav f4aae4947a Change frame => photos-app in README etc 2022-12-15 19:25:36 +05:30
Neeraj Gupta ff4611b192
hook more options on file selections 2022-12-15 16:54:51 +05:30
ashilkn 692fa4e33c Added a comment 2022-12-15 16:40:34 +05:30
Neeraj Gupta 439c7241d4
Add hooks for more file actions 2022-12-15 15:32:46 +05:30
Neeraj Gupta e67252aadf
Fix lint suggestion 2022-12-15 15:12:05 +05:30
ashilkn d59863670c Give Color/Style to Small ButtonSize 2022-12-15 14:52:39 +05:30
ashilkn a930c887a7 Give all buttons execution states 2022-12-15 11:26:32 +05:30
ashilkn 5b356d12aa Apply new changes for LargeButton 2022-12-15 10:59:19 +05:30
Neeraj Gupta 0d09c4ec22
FileSection: Show actionable fileCount as suffix 2022-12-15 09:36:51 +05:30
Neeraj Gupta 8ec8944fbd
FileSelection: Show various actions based on gallery type 2022-12-14 23:05:08 +05:30
Neeraj Gupta 69a9a0f996
ActionBar: Show split between selected and yours 2022-12-14 22:18:24 +05:30
Neeraj Gupta df1e0c3d10
GalleryType: add action method for addToAlbum option 2022-12-14 22:17:33 +05:30
ashilkn eac6c952b5 Merge branch 'master' into 2fa-toggle-bug-fix 2022-12-14 17:31:59 +05:30
ashilkn 7ca534978e Check if completer is already completed 2022-12-14 17:28:57 +05:30
Neeraj Gupta 1aadc08fdf
Merge branch 'redesign-with-components' into collaboration_view 2022-12-14 15:13:54 +05:30
ashilkn 63d7c10f76 Fixed Toggle Switch bug when exiting the 2fa set up page without setting up 2fa 2022-12-14 15:06:56 +05:30
ashilkn 6281247764 Changes to maintain same button width during execution state in small button 2022-12-14 13:25:28 +05:30
ashilkn c9b8392663 Changed width of button to take size of it's child for SmallButton 2022-12-14 11:31:54 +05:30
ashilkn f0854683f8 Renamed names with 'LargeButton' to 'Button' or 'CustomButton
'
2022-12-14 11:05:18 +05:30
ashilkn 3b079d1ae1 Constant border color when pressed for Critical buttonType 2022-12-14 10:29:45 +05:30
ashilkn 3a49a433ee Fixed recurring loading state of storage card and uploaded file count 2022-12-13 20:30:35 +05:30
ashilkn b4aab74254 Fixed app fetching userDetails multiple times when opening settings by swiping 2022-12-13 17:58:44 +05:30
Neeraj Gupta 516410dcc4
change copy for iOS 2022-12-13 15:06:08 +05:30
Neeraj Gupta 80f103bedc
Add cache info in debug section 2022-12-13 15:04:37 +05:30
ashilkn 84630b3c7c Restricted width of AcitonSheet 2022-12-12 17:59:02 +05:30
ashilkn fa4c08c699 Made 'Icon Only'(name from Figma) type of ActionSheet 2022-12-12 16:42:17 +05:30
ashilkn ee58f97c90 Merge branch 'redesign-with-components' into delete-bottom-sheet 2022-12-12 15:38:29 +05:30
ashilkn 19bb45cf3c Merge branch 'master' into redesign-with-components 2022-12-12 15:37:40 +05:30
ashilkn 81ef4eab20 Misc. changes 2022-12-12 15:18:07 +05:30
ashilkn d847430b12 Added animation between execution states of LargeButton 2022-12-12 14:53:45 +05:30
ashilkn 14ab128ace Minor fix 2022-12-12 14:36:28 +05:30
ashilkn c32d661c1c Enable execution states for only Primary, Secondary & Neutral LargeButtons 2022-12-12 14:33:35 +05:30
Neeraj Gupta 90c688e21c
Fix build 2022-12-12 13:02:00 +05:30
Neeraj Gupta 9cf457a903
remove feature flag 2022-12-12 12:55:46 +05:30
Neeraj Gupta 6b7806c0d3
remove debugprint 2022-12-12 12:45:35 +05:30
ashilkn ce9c8f72ee Added colors for loading icon and check icon 2022-12-12 11:32:06 +05:30
ashilkn 5c9bf7dc4b Used 20pts version of EnteLoadingIcon in loading state of button 2022-12-12 10:45:19 +05:30
Neeraj Gupta 8891b0ce58
Merge branch 'master' into collaboration_view 2022-12-11 19:18:23 +05:30
Neeraj Gupta 705b4bb39f
Add enable collect flag behind feature flag 2022-12-11 18:36:57 +05:30
ashilkn ffe90d24ec bug fix 2022-12-10 13:13:55 +05:30
ashilkn 287bc8813e Added 'Loading' and 'Successful' states for LargeButton 2022-12-10 12:30:42 +05:30
ashilkn 1de746f44c Disabled state for LargeButton 2022-12-10 10:25:17 +05:30
ashilkn 1f85f745b6 Add onPressed UI state for LargeButton 2022-12-09 21:16:05 +05:30
ashilkn ebb855f484 code refactoring 2022-12-09 19:30:58 +05:30
ashilkn eb5b1f69a0 Merge branch 'redesign-with-components' into delete-bottom-sheet 2022-12-09 13:34:42 +05:30
ashilkn e244bc1e76 Merge branch 'master' into redesign-with-components 2022-12-09 13:27:18 +05:30
ashilkn a481d77d71 Refactored code by using enhanced enums 2022-12-09 12:25:32 +05:30
ashilkn e4ccba0467 declare ButtonType enum outside LargeButton's file 2022-12-09 09:23:23 +05:30
ashilkn e4e4eeb194 rename file 2022-12-09 09:15:06 +05:30
Neeraj Gupta 6eee6130a0
Fix album participants for viewers/collaborators 2022-12-08 20:23:09 +05:30
Neeraj Gupta 247be939b9
Allow album participants to view other participants 2022-12-08 19:10:27 +05:30
ashilkn 03748a212a Handled case where labelText or icon is missing from LargeButton 2022-12-08 19:00:43 +05:30
ashilkn 25f62e08e6 Handled text overflow in LargeButton 2022-12-08 18:36:48 +05:30
ashilkn 415fabeeb6 Added some comments 2022-12-08 17:03:46 +05:30
Neeraj Gupta de78e2223a
Remove reundant blocking progress bar 2022-12-08 16:42:51 +05:30
ashilkn 9e37436df4 Added flag 'isInActionBar' to LargeButton for setting the theme of button to always dark theme 2022-12-08 16:25:46 +05:30
ashilkn 51ad609a7b misc. changes in ActionSheet 2022-12-08 15:06:02 +05:30
Neeraj Gupta b71c214c58
Merge branch 'master' into collaboration_view 2022-12-08 14:06:00 +05:30
ashilkn 8112d4eef7 Added title & body properties to ActionSheet & ContentContainer 2022-12-08 13:34:53 +05:30
ashilkn 9460390f30 Renamed DeleteItemsWidget to ActionSheetWidget 2022-12-08 12:41:36 +05:30
ashilkn 4218fbeccc Made addSeparators method to add separators to a list of widgets 2022-12-08 11:39:14 +05:30
Neeraj Gupta b392b90b8f
minor refactor 2022-12-08 11:05:53 +05:30
ashilkn 8f36cf0a29 Added icon and labelText properties to LargeButtonWidget 2022-12-07 20:49:54 +05:30
ashilkn d3730aafc6 Wrote logic to find different colors and styles of each type of button in LargeButton 2022-12-07 20:38:54 +05:30
ashilkn a56e36a263 Made a basic version of LargeButton component 2022-12-07 15:33:53 +05:30
Neeraj Gupta 18e1b2266f
use https 2022-12-07 15:02:59 +05:30
Neeraj Gupta ce033cef78
Fix matrix url 2022-12-07 15:01:06 +05:30
Neeraj Gupta a8a009318d
Fix: RateUs -> use alternativeTo for f-droid and github apk 2022-12-07 14:11:52 +05:30
Neeraj Gupta 4e4807ac5a
Show rate us on AlternativeTo 2022-12-07 14:08:57 +05:30
Neeraj Gupta 50e23815a5
Add link to Mastodon, Blog, & Matrix 2022-12-07 12:50:25 +05:30
Neeraj Gupta 817dfc3afa
Change gridTitle padding based on gridSize 2022-12-07 11:55:18 +05:30
Neeraj Gupta 379db6701a
Use small font when photoGridSize > 5 2022-12-07 11:52:48 +05:30
Neeraj Gupta a0b22cd3a1
Refactor: Pass photoGridSize from gallery to inner widgets 2022-12-07 11:49:41 +05:30
Neeraj Gupta 0ac8408b03
Merge remote-tracking branch 'origin/master' into settings_tweak 2022-12-07 11:22:50 +05:30
Neeraj Gupta 1df3d5080e
Copy changes for settings 2022-12-07 11:14:15 +05:30
Neeraj Gupta cee6e12877
Copy changes 2022-12-07 11:08:02 +05:30
Neeraj Gupta 661e347a99
Move general section below security 2022-12-07 10:51:47 +05:30
vishnukvmd fcb9924bfe Expand the range of photo grid size 2022-12-07 10:50:41 +05:30
vishnukvmd 81df5d07a7 Use injected columns instead of reading from LocalSettings 2022-12-07 09:40:53 +05:30
vishnukvmd 4822392511 Fix placeholder grid cache 2022-12-07 09:38:42 +05:30
vishnukvmd 75408ad02b Fix stutter while scrolling 2022-12-07 09:27:54 +05:30
vishnukvmd 3a3b247270 Remove unnecessary widget 2022-12-07 09:08:32 +05:30
vishnukvmd 6b3dac1b69 Update CaptionedTextWidget 2022-12-07 09:06:41 +05:30
vishnukvmd fc40814504 Move Logout and Delete under Account settings 2022-12-07 08:52:18 +05:30
vishnukvmd 8066b2aa2c Album Grid -> Photo Grid 2022-12-07 08:48:41 +05:30
vishnukvmd 5ece34bab1 Use backgroundElevated2 instead of cupertinoPickerTopColor 2022-12-07 07:28:57 +05:30
vishnukvmd 44a49a9958 Reuse configured TextTheme 2022-12-07 07:24:49 +05:30
vishnukvmd 34c9d64d2f Update color 2022-12-07 07:19:21 +05:30
vishnukvmd d9daaeef9f Replace Configuration with LocalSettings 2022-12-07 07:04:50 +05:30
vishnukvmd 334e27da56 Rename variable 2022-12-06 23:33:39 +05:30
vishnukvmd 6bad1f079b Center align the trailing widgets 2022-12-06 23:32:51 +05:30
vishnukvmd 7133930af4 Merge branch 'master' into grid 2022-12-06 23:29:03 +05:30
vishnukvmd 78fa988b9e Load large thumbnails in case there are lesser grids 2022-12-06 23:27:54 +05:30
vishnukvmd 14afc4259c Revert changes added for the pinch-to-zoom gesture 2022-12-06 23:22:01 +05:30
vishnukvmd e0792f24cc Add advanced settings 2022-12-06 23:17:37 +05:30
vishnukvmd b29401720d Remove local hero 2022-12-06 23:16:03 +05:30
vishnukvmd 6ee2e59b69 Set cross axis count depending on the configured album grid size 2022-12-06 23:15:44 +05:30
vishnukvmd 3b28725458 Remove duplicate code 2022-12-06 22:28:17 +05:30
ashilkn 7a39b8ba56 Created a basic version of DeleteItemsWidget 2022-12-06 20:38:04 +05:30
ashilkn 39b759c441 dispose ValueNotifiers 2022-12-06 17:54:45 +05:30
ashilkn 6b5ef752b5 Merge branch 'master' into redesign-with-components 2022-12-06 15:27:27 +05:30
Neeraj Gupta 65b9ed09cc
remove commented out code 2022-12-06 14:23:13 +05:30
Neeraj Gupta 3f4a233a7f
tweak copy 2022-12-06 14:21:32 +05:30
Neeraj Gupta 67ef2bfad4
Merge branch 'master' into password_prompt 2022-12-06 14:14:21 +05:30
ashilkn 86a61e935a use constant for max width 2022-12-06 13:41:37 +05:30
ashilkn 8085c9d571 add crossFade for expandedMenu 2022-12-06 13:30:01 +05:30
ashilkn 00fdde0bf3 add option to sepecify smaller or larger bottom padding for BottomActionBar 2022-12-06 11:50:23 +05:30
ashilkn 428eb78f0d restrict width of content inside BottomActionBar 2022-12-06 11:45:23 +05:30
ashilkn 580a6e42a9 minor changes 2022-12-05 20:50:21 +05:30
ashilkn 48a5bfae23 change bottom padding of BottomActionWidget with context 2022-12-05 20:49:18 +05:30
ashilkn 171ecb8805 Used a nested List of BlurMenuItemWidget as items instead of passing groupingOrder to ExpandedMenuWidget 2022-12-05 18:18:56 +05:30
ashilkn d2daa0bf21 refactored code 2022-12-05 16:38:21 +05:30
ashilkn 6202e5a5e9 add text overflow BlurMenuItem's label 2022-12-05 15:50:33 +05:30
ashilkn 06718f766c add functionality to share icon in BottomActionBar 2022-12-05 13:46:26 +05:30
ashilkn 0c592fa509 add functionality for delete on BottomActionBar 2022-12-05 13:36:47 +05:30
ashilkn 472c618ed0 created ExpandedMenuWidget to be used in BottomActionBar's expansion 2022-12-05 11:27:37 +05:30
vishnukvmd 3c61bd9d84 Reduce reloads 2022-12-04 12:36:39 +05:30
ashilkn 716d6c395a use different expandableTheme for bottomActionBar's expansionPanel 2022-12-01 11:40:20 +05:30
ashilkn d68a789f8a remove passing of context as argument unwantedly 2022-12-01 11:39:06 +05:30
ashilkn 4dac9271cc Merge branch 'master' into redesign-with-components 2022-12-01 09:01:49 +05:30
ashilkn a4446f6fa4 Merge branch 'master' into bottom-action-bar 2022-12-01 08:55:24 +05:30
ashilkn d83cbebadd sync selected file count on bottom action bar 2022-12-01 08:27:14 +05:30
ashilkn 0a0d39d4a0 remove unwanted code 2022-11-30 12:43:00 +05:30
ashilkn 5dcc92fadb BottomActionBar : unselect all & close BottomActionBar on cancel 2022-11-30 12:29:26 +05:30
ashilkn 392b548622 added color and blur to BottomActionBarWidget 2022-11-29 20:21:38 +05:30
ashilkn 9b0693de44 animate opening and closing of BottomActionBarWidgat 2022-11-29 20:03:40 +05:30
ashilkn f69975d2a6 show bottom action bar on selecting files 2022-11-29 16:11:26 +05:30
ashilkn 701ebe5e3f pass text instead of textWidget + dynamic font change for action bar text 2022-11-28 19:30:16 +05:30
ashilkn b120e06791 collapse expansion on 'cancel' 2022-11-28 19:06:56 +05:30
ashilkn 2d63a4e48e made BlurMenuItemWidget component 2022-11-28 18:29:33 +05:30
ashilkn 30ec182f0e switch icon on bottomActionBar on expansion & collapse 2022-11-28 15:57:22 +05:30
vishnukvmd 07b250752a Merge branch 'master' into grid 2022-11-28 15:41:31 +05:30
vishnukvmd 4d09bff81e WiP 2022-11-28 13:30:37 +05:30
ashilkn a6f588c790 made a basic version of BottomActionBarWidget 2022-11-28 13:28:38 +05:30
Neeraj Gupta 606bd81555
minor fix 2022-11-27 10:02:00 +05:30