This repository has been archived by the owner on May 19, 2023. It is now read-only.
Simba/feature/note folder screen UI #49
Merged
Conversation
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
|
@hadiyarajesh here also this same issue I'm able to see. As you can also understand that there should be no commits counted in this PR other than his branch. But it is coming. Chances are that we are not able to handle correctly updating the master and other branches. We can further discuss this here. |
Simba-97
force-pushed
the
Simba/feature/NoteFolderScreenUI
branch
from
cd3a78c to
0c1962b
Compare
| val context = LocalContext.current | ||
| val folders = remember { folderViewModel.getFolders(NoteFolder) }.collectAsLazyPagingItems() | ||
|
|
||
| val data = listOf( |
There was a problem hiding this comment.
Fetch data from actual db, not static ones.
If you need to test the UI, create your local branch an test but the code you push here should contains only relavant code.
app/src/main/java/com/hadiyarajesh/notex/ui/folders/NoteFolderScreen.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/hadiyarajesh/notex/ui/folders/NoteFolderScreen.kt
Outdated
Show resolved
Hide resolved
|
@Simba-97 can you resolve the conflict, rebase branch and create a PR? |
|
@hadiyarajesh Yeah sure. I'll take a look into it |
Simba-97
force-pushed
the
Simba/feature/NoteFolderScreenUI
branch
from
28820c6 to
b21c960
Compare
|
@hadiyarajesh Please review the changes. |
hadiyarajesh
added a commit
that referenced
this pull request
Oct 17, 2022
* Added new line in Constants.kt * Note card ui component added which will be inflated in lazy column to show all notes (#35) * Added CODEOWNERS files (#33) * Adding CONTRIBUTING.md * Added CONTRIBUTING.md and squashed commits * Updated branch naming convention Updated branch naming convention with github-username * 1. Added database schema (entity) 2. Added database functions (dao) 3. Added how to fetch paging data 4. Added LazyColumn UI with paging data with different states like loading, success, error Signed-off-by: Rajesh Hadiya <[email protected]> * Added CODEOWNERS files. (#19) * Adding CODEOWNERS files. Still needed to add the Default reviewer for the two teams. * Update CODEOWNERS * fix the validation issues on GitHub. * updated owners for all the branches. * updated the Wrong branch combinations. Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> * NoteCardView for all notes ui made * Create main.yml * Update main.yml * Update main.yml * Some improvements done generalised the code * Some ui improvements and code to inflate all card views added Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> * Narendra ju/feature/folders setup (#45) * Added CODEOWNERS files (#33) * Adding CONTRIBUTING.md * Added CONTRIBUTING.md and squashed commits * Updated branch naming convention Updated branch naming convention with github-username * 1. Added database schema (entity) 2. Added database functions (dao) 3. Added how to fetch paging data 4. Added LazyColumn UI with paging data with different states like loading, success, error Signed-off-by: Rajesh Hadiya <[email protected]> * Added CODEOWNERS files. (#19) * Adding CODEOWNERS files. Still needed to add the Default reviewer for the two teams. * Update CODEOWNERS * fix the validation issues on GitHub. * updated owners for all the branches. * updated the Wrong branch combinations. Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> * Create main.yml * Update main.yml * Update main.yml * Added PR template + Updated .gitignore files (#42) Added the PR Templates + .gitignore * added the groundwork for the folders section in NoteX App Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> * Repository and ViewModel implementation for all notes screen. Issue #16 (#61) * Branch sajalsj (#62) * 1. view model added for Add note screen 2. UI WIP for add note screen * 1. view model added for Add note screen 2. Add and edit screen UI complete * Made changes written in PR * Narendra ju/feature/folders setup (#45) * Added CODEOWNERS files (#33) * Adding CONTRIBUTING.md * Added CONTRIBUTING.md and squashed commits * Updated branch naming convention Updated branch naming convention with github-username * 1. Added database schema (entity) 2. Added database functions (dao) 3. Added how to fetch paging data 4. Added LazyColumn UI with paging data with different states like loading, success, error Signed-off-by: Rajesh Hadiya <[email protected]> * Added CODEOWNERS files. (#19) * Adding CODEOWNERS files. Still needed to add the Default reviewer for the two teams. * Update CODEOWNERS * fix the validation issues on GitHub. * updated owners for all the branches. * updated the Wrong branch combinations. Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> * Create main.yml * Update main.yml * Update main.yml * Added PR template + Updated .gitignore files (#42) Added the PR Templates + .gitignore * added the groundwork for the folders section in NoteX App Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> * Repository and ViewModel implementation for all notes screen. Issue #16 (#61) * 1. view model added for Add note screen 2. UI WIP for add note screen * 1. view model added for Add note screen 2. Add and edit screen UI complete * Made changes written in PR Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: sajal jain <[email protected]> Co-authored-by: Narendra Nath Chatterjee <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Co-authored-by: virunarala <[email protected]> * Simba/feature/note folder screen UI (#49) * Adding more UI changes * Working on NoteFolder UI section * Update NoteFolderScreen.kt * Undid changes * Fixed spacing between two row elems * Added viewModel & minor changes to FolderRepository * Added routes and deleted redundant data classes * Added folder icon and minor changes * Added spacing and string resources * Resolved merge conflicts Co-authored-by: Rajesh Hadiya <[email protected]> * Note card ui component added which will be inflated in lazy column to show all notes (#35) * Added CODEOWNERS files (#33) * Adding CONTRIBUTING.md * Added CONTRIBUTING.md and squashed commits * Updated branch naming convention Updated branch naming convention with github-username * 1. Added database schema (entity) 2. Added database functions (dao) 3. Added how to fetch paging data 4. Added LazyColumn UI with paging data with different states like loading, success, error Signed-off-by: Rajesh Hadiya <[email protected]> * Added CODEOWNERS files. (#19) * Adding CODEOWNERS files. Still needed to add the Default reviewer for the two teams. * Update CODEOWNERS * fix the validation issues on GitHub. * updated owners for all the branches. * updated the Wrong branch combinations. Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> * NoteCardView for all notes ui made * Create main.yml * Update main.yml * Update main.yml * Some improvements done generalised the code * Some ui improvements and code to inflate all card views added Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> * Updated FoldersScreen with NoteFolderScreen in NoteXNavigation.kt Signed-off-by: Rajesh Hadiya <[email protected]> * Update Type.kt * Update AllNotesComponents.kt Signed-off-by: Rajesh Hadiya <[email protected]> Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Swapnil bhojwani <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Narendra Nath Chatterjee <[email protected]> Co-authored-by: virunarala <[email protected]> Co-authored-by: Sajal Jain <[email protected]> Co-authored-by: sajal jain <[email protected]>
hadiyarajesh
added a commit
that referenced
this pull request
Oct 29, 2022
* Test PR (#51) * Added database schema, functions and paging data UI handling (#15) * Adding CONTRIBUTING.md * Added CONTRIBUTING.md and squashed commits * Updated branch naming convention Updated branch naming convention with github-username * 1. Added database schema (entity) 2. Added database functions (dao) 3. Added how to fetch paging data 4. Added LazyColumn UI with paging data with different states like loading, success, error Signed-off-by: Rajesh Hadiya <[email protected]> Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> * Added CODEOWNERS files (#33) * Adding CONTRIBUTING.md * Added CONTRIBUTING.md and squashed commits * Updated branch naming convention Updated branch naming convention with github-username * 1. Added database schema (entity) 2. Added database functions (dao) 3. Added how to fetch paging data 4. Added LazyColumn UI with paging data with different states like loading, success, error Signed-off-by: Rajesh Hadiya <[email protected]> * Added CODEOWNERS files. (#19) * Adding CODEOWNERS files. Still needed to add the Default reviewer for the two teams. * Update CODEOWNERS * fix the validation issues on GitHub. * updated owners for all the branches. * updated the Wrong branch combinations. Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> * Create main.yml * Update main.yml * Update main.yml * Added PR template + Updated .gitignore files (#42) Added the PR Templates + .gitignore Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> * Revert "Test PR (#51)" (#53) This reverts commit 6f05260. * Revert "Test PR (#51)" (#53) (#54) This reverts commit 6f05260. Co-authored-by: Rajesh Hadiya <[email protected]> * Branch hadiyarajesh (#55) * Added new line in Constants.kt * Note card ui component added which will be inflated in lazy column to show all notes (#35) * Added CODEOWNERS files (#33) * Adding CONTRIBUTING.md * Added CONTRIBUTING.md and squashed commits * Updated branch naming convention Updated branch naming convention with github-username * 1. Added database schema (entity) 2. Added database functions (dao) 3. Added how to fetch paging data 4. Added LazyColumn UI with paging data with different states like loading, success, error Signed-off-by: Rajesh Hadiya <[email protected]> * Added CODEOWNERS files. (#19) * Adding CODEOWNERS files. Still needed to add the Default reviewer for the two teams. * Update CODEOWNERS * fix the validation issues on GitHub. * updated owners for all the branches. * updated the Wrong branch combinations. Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> * NoteCardView for all notes ui made * Create main.yml * Update main.yml * Update main.yml * Some improvements done generalised the code * Some ui improvements and code to inflate all card views added Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Swapnil bhojwani <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> * WorkerManager and Notification support for reminders added AND detekt and Ktlint support Added (#66) * Base Integration of Detekt Analytics tool done. * added the detekt as pre-push git-hooks. * Enabled the ktlint and also added it into the pre-push git-hooks. * change order and define the taks to generate output in some dir * change some files and tasks and testing that pre-push is working or not * manually it is running but while push it is not working * code cleanup. * tried once more that scripts is working or not * fixed detekt and lint errors. * fixed detekt errors. * Working on Notification and WorkManager * Working on Notification and WorkManager * Working on Notification and WorkManager * n * modified * changed gitignore * refactoring * refactoring * Update misc.xml * Update gradle.xml * Update gradle.xml * Update gradle.xml * Update misc.xml * Delete misc.xml * Delete gradle.xml * Update gradle.xml * Update gradle.xml * Update misc.xml * changed NoteXApp to myContent * added NotificationDTO.kt * Update misc.xml * Update gradle.xml * Update gradle.xml * Update gradle.xml * Update misc.xml * Update gradle.xml * Update gradle.xml * Update misc.xml * detekt requested changes applied * ktlint changes applied * ktlint changes applied Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: MosesATJTC <[email protected]> Co-authored-by: Arunshaik2001 <[email protected]> Co-authored-by: Shaik Ahron <[email protected]> * Branch hadiyarajesh (#68) * Added new line in Constants.kt * Note card ui component added which will be inflated in lazy column to show all notes (#35) * Added CODEOWNERS files (#33) * Adding CONTRIBUTING.md * Added CONTRIBUTING.md and squashed commits * Updated branch naming convention Updated branch naming convention with github-username * 1. Added database schema (entity) 2. Added database functions (dao) 3. Added how to fetch paging data 4. Added LazyColumn UI with paging data with different states like loading, success, error Signed-off-by: Rajesh Hadiya <[email protected]> * Added CODEOWNERS files. (#19) * Adding CODEOWNERS files. Still needed to add the Default reviewer for the two teams. * Update CODEOWNERS * fix the validation issues on GitHub. * updated owners for all the branches. * updated the Wrong branch combinations. Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> * NoteCardView for all notes ui made * Create main.yml * Update main.yml * Update main.yml * Some improvements done generalised the code * Some ui improvements and code to inflate all card views added Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> * Narendra ju/feature/folders setup (#45) * Added CODEOWNERS files (#33) * Adding CONTRIBUTING.md * Added CONTRIBUTING.md and squashed commits * Updated branch naming convention Updated branch naming convention with github-username * 1. Added database schema (entity) 2. Added database functions (dao) 3. Added how to fetch paging data 4. Added LazyColumn UI with paging data with different states like loading, success, error Signed-off-by: Rajesh Hadiya <[email protected]> * Added CODEOWNERS files. (#19) * Adding CODEOWNERS files. Still needed to add the Default reviewer for the two teams. * Update CODEOWNERS * fix the validation issues on GitHub. * updated owners for all the branches. * updated the Wrong branch combinations. Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> * Create main.yml * Update main.yml * Update main.yml * Added PR template + Updated .gitignore files (#42) Added the PR Templates + .gitignore * added the groundwork for the folders section in NoteX App Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> * Repository and ViewModel implementation for all notes screen. Issue #16 (#61) * Branch sajalsj (#62) * 1. view model added for Add note screen 2. UI WIP for add note screen * 1. view model added for Add note screen 2. Add and edit screen UI complete * Made changes written in PR * Narendra ju/feature/folders setup (#45) * Added CODEOWNERS files (#33) * Adding CONTRIBUTING.md * Added CONTRIBUTING.md and squashed commits * Updated branch naming convention Updated branch naming convention with github-username * 1. Added database schema (entity) 2. Added database functions (dao) 3. Added how to fetch paging data 4. Added LazyColumn UI with paging data with different states like loading, success, error Signed-off-by: Rajesh Hadiya <[email protected]> * Added CODEOWNERS files. (#19) * Adding CODEOWNERS files. Still needed to add the Default reviewer for the two teams. * Update CODEOWNERS * fix the validation issues on GitHub. * updated owners for all the branches. * updated the Wrong branch combinations. Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> * Create main.yml * Update main.yml * Update main.yml * Added PR template + Updated .gitignore files (#42) Added the PR Templates + .gitignore * added the groundwork for the folders section in NoteX App Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> * Repository and ViewModel implementation for all notes screen. Issue #16 (#61) * 1. view model added for Add note screen 2. UI WIP for add note screen * 1. view model added for Add note screen 2. Add and edit screen UI complete * Made changes written in PR Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: sajal jain <[email protected]> Co-authored-by: Narendra Nath Chatterjee <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Co-authored-by: virunarala <[email protected]> * Simba/feature/note folder screen UI (#49) * Adding more UI changes * Working on NoteFolder UI section * Update NoteFolderScreen.kt * Undid changes * Fixed spacing between two row elems * Added viewModel & minor changes to FolderRepository * Added routes and deleted redundant data classes * Added folder icon and minor changes * Added spacing and string resources * Resolved merge conflicts Co-authored-by: Rajesh Hadiya <[email protected]> * Note card ui component added which will be inflated in lazy column to show all notes (#35) * Added CODEOWNERS files (#33) * Adding CONTRIBUTING.md * Added CONTRIBUTING.md and squashed commits * Updated branch naming convention Updated branch naming convention with github-username * 1. Added database schema (entity) 2. Added database functions (dao) 3. Added how to fetch paging data 4. Added LazyColumn UI with paging data with different states like loading, success, error Signed-off-by: Rajesh Hadiya <[email protected]> * Added CODEOWNERS files. (#19) * Adding CODEOWNERS files. Still needed to add the Default reviewer for the two teams. * Update CODEOWNERS * fix the validation issues on GitHub. * updated owners for all the branches. * updated the Wrong branch combinations. Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> * NoteCardView for all notes ui made * Create main.yml * Update main.yml * Update main.yml * Some improvements done generalised the code * Some ui improvements and code to inflate all card views added Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Rajesh Hadiya <[email protected]> * Updated FoldersScreen with NoteFolderScreen in NoteXNavigation.kt Signed-off-by: Rajesh Hadiya <[email protected]> * Update Type.kt * Update AllNotesComponents.kt Signed-off-by: Rajesh Hadiya <[email protected]> Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Swapnil bhojwani <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Narendra Nath Chatterjee <[email protected]> Co-authored-by: virunarala <[email protected]> Co-authored-by: Sajal Jain <[email protected]> Co-authored-by: sajal jain <[email protected]> * 1. Updated app for first production release 2. Code cleanup and UI changes 3. Updated app to use compose BOM instead of separate libraries Signed-off-by: Rajesh Hadiya <[email protected]> Signed-off-by: Rajesh Hadiya <[email protected]> Signed-off-by: Rajesh Hadiya <[email protected]> Co-authored-by: Hritik Kumar Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: Swapnil bhojwani <[email protected]> Co-authored-by: Geet Gobind Singh <[email protected]> Co-authored-by: Abhinav Suman <[email protected]> Co-authored-by: MosesATJTC <[email protected]> Co-authored-by: Arunshaik2001 <[email protected]> Co-authored-by: Shaik Ahron <[email protected]> Co-authored-by: Narendra Nath Chatterjee <[email protected]> Co-authored-by: virunarala <[email protected]> Co-authored-by: Sajal Jain <[email protected]> Co-authored-by: sajal jain <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains changes for the following:
Changes for the UI have been done and the screenshot is attached below.
@hadiyarajesh Please review and request changes if any.