Music DAO MVP #123
Merged
Music DAO MVP #123
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
# Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/nl/tudelft/trustchain/app/TrustChainApplication.kt # app/src/main/java/nl/tudelft/trustchain/app/ui/dashboard/DashboardActivity.kt # build.gradle # common/build.gradle # common/libs/jlibtorrent-1.2.15.2.jar # currencyii/src/main/res/navigation/nav_graph.xml # gradle/wrapper/gradle-wrapper.properties # ig-ssi/src/main/res/navigation/nav_graph_ssi.xml # musicdao-datafeeder/build.gradle # musicdao-datafeeder/libs/jlibtorrent-1.2.15.2.jar # musicdao/build.gradle # peerchat/src/main/res/navigation/nav_graph_peerchat.xml # trustchain-explorer/src/main/res/navigation/nav_graph_explorer.xml # trustchain-payloadgenerator/src/main/res/navigation/nav_graph_payloadgenerator.xml # trustchain-trader/src/main/res/navigation/nav_graph_trader.xml
|
118 commits! |
InvictusRMC
reviewed
Feb 5, 2023
currencyii/src/main/java/nl/tudelft/trustchain/currencyii/util/DAOJoinHelper.kt
Outdated
Show resolved
Hide resolved
currencyii/src/main/java/nl/tudelft/trustchain/currencyii/util/DAOTransferFundsHelper.kt
Outdated
Show resolved
Hide resolved
musicdao/src/main/java/com/example/musicdao/core/repositories/SwarmHealthRepository.kt
Outdated
Show resolved
Hide resolved
musicdao/src/main/java/com/example/musicdao/core/repositories/album/CreateReleaseUseCase.kt
Outdated
Show resolved
Hide resolved
InvictusRMC
requested changes
Feb 7, 2023
There was a problem hiding this comment.
Your app does not build on Mac M1, this seems to have something to do with Room: https://issuetracker.google.com/issues/174695268
Caused by: java.lang.Exception: No native library is found for os.name=Mac and os.arch=aarch64. path=/org/sqlite/native/Mac/aarch64
at org.sqlite.SQLiteJDBCLoader.loadSQLiteNativeLibrary(SQLiteJDBCLoader.java:333)
at org.sqlite.SQLiteJDBCLoader.initialize(SQLiteJDBCLoader.java:64)
at androidx.room.verifier.DatabaseVerifier.<clinit>(DatabaseVerifier.kt:71)
... 53 more
currencyii/src/main/java/nl/tudelft/trustchain/currencyii/coin/WalletManager.kt
Outdated
Show resolved
Hide resolved
currencyii/src/main/java/nl/tudelft/trustchain/currencyii/util/DAOJoinHelper.kt
Outdated
Show resolved
Hide resolved
musicdao/src/main/java/nl/tudelft/trustchain/musicdao/ui/screens/dao/DaoViewModel.kt
Outdated
Show resolved
Hide resolved
musicdao/src/main/java/nl/tudelft/trustchain/musicdao/ui/screens/dao/DaoViewModel.kt
Outdated
Show resolved
Hide resolved
musicdao/src/main/java/nl/tudelft/trustchain/musicdao/ui/screens/dao/ProposalCreateScreen.kt
Outdated
Show resolved
Hide resolved
musicdao/src/main/java/nl/tudelft/trustchain/musicdao/ui/screens/home/HomeScreen.kt
Outdated
Show resolved
Hide resolved
musicdao/src/main/java/nl/tudelft/trustchain/musicdao/ui/screens/home/HomeScreen.kt
Outdated
Show resolved
Hide resolved
|
@brian2509 please focus and finish this PR. As was requested back in Jan, we need this code to work for all Blockchain Engineering master students. Next week this course already starts! |
|
I fixed the dependency issues and verified that the APK builds. If you fix my requested changes, this can be merged! |
InvictusRMC
requested changes
Feb 20, 2023
currencyii/src/main/java/nl/tudelft/trustchain/currencyii/util/DAOJoinHelper.kt
Outdated
Show resolved
Hide resolved
currencyii/src/main/java/nl/tudelft/trustchain/currencyii/util/DAOJoinHelper.kt
Outdated
Show resolved
Hide resolved
...tudelft/trustchain/musicdao/core/ipv8/blocks/release_publish/ReleasePublishBlockValidator.kt
Outdated
Show resolved
Hide resolved
...tudelft/trustchain/musicdao/core/ipv8/blocks/release_publish/ReleasePublishBlockValidator.kt
Outdated
Show resolved
Hide resolved
musicdao/src/main/java/nl/tudelft/trustchain/musicdao/ui/screens/release/ReleaseScreen.kt
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
(draft, should not be merged yet)
New version of MusicDAO including a number of version bumps for kotlin and dependencies.
Most important dependency updates:
Changes outside of musicdao module should be limited to:
@Suppress("DEPRECATION")in multiple modules@animatorfade animations (https://stackoverflow.com/questions/67305830/where-is-anim-fragment-fade-enter-included-in)