-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3037 from axpoems/add-profileCard-offers-page
Add user offers to profile card
- Loading branch information
Showing
18 changed files
with
407 additions
and
64 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
71 changes: 71 additions & 0 deletions
71
.../java/bisq/desktop/main/content/user/profile_card/offers/ProfileCardOffersController.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * This file is part of Bisq. | ||
| * | ||
| * Bisq is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| * License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package bisq.desktop.main.content.user.profile_card.offers; | ||
|
|
||
| import bisq.bonded_roles.market_price.MarketPriceService; | ||
| import bisq.chat.bisqeasy.offerbook.BisqEasyOfferbookChannel; | ||
| import bisq.chat.bisqeasy.offerbook.BisqEasyOfferbookChannelService; | ||
| import bisq.desktop.ServiceProvider; | ||
| import bisq.desktop.common.view.Controller; | ||
| import bisq.desktop.main.content.bisq_easy.offerbook.offerbook_list.OfferbookListItem; | ||
| import bisq.user.profile.UserProfile; | ||
| import bisq.user.reputation.ReputationService; | ||
| import lombok.Getter; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class ProfileCardOffersController implements Controller { | ||
| @Getter | ||
| private final ProfileCardOffersView view; | ||
| private final ProfileCardOffersModel model; | ||
| private final BisqEasyOfferbookChannelService bisqEasyOfferbookChannelService; | ||
| private final ReputationService reputationService; | ||
| private final MarketPriceService marketPriceService; | ||
|
|
||
| public ProfileCardOffersController(ServiceProvider serviceProvider) { | ||
| model = new ProfileCardOffersModel(); | ||
| view = new ProfileCardOffersView(model, this); | ||
| bisqEasyOfferbookChannelService = serviceProvider.getChatService().getBisqEasyOfferbookChannelService(); | ||
| reputationService = serviceProvider.getUserService().getReputationService(); | ||
| marketPriceService = serviceProvider.getBondedRolesService().getMarketPriceService(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onActivate() { | ||
| } | ||
|
|
||
| @Override | ||
| public void onDeactivate() { | ||
| } | ||
|
|
||
| public void updateUserProfileData(UserProfile userProfile) { | ||
| model.getListItems().clear(); | ||
|
|
||
| List<OfferbookListItem> userOffers = new ArrayList<>(); | ||
| for (BisqEasyOfferbookChannel market : bisqEasyOfferbookChannelService.getChannels()) { | ||
| userOffers.addAll(market.getChatMessages().stream() | ||
| .filter(chatMessage -> chatMessage.hasBisqEasyOffer() | ||
| && chatMessage.getAuthorUserProfileId().equals(userProfile.getId())) | ||
| .map(userChatMessageWithOffer -> new OfferbookListItem( | ||
| userChatMessageWithOffer, userProfile, reputationService, marketPriceService)) | ||
| .toList()); | ||
| } | ||
| model.getListItems().addAll(userOffers); | ||
| } | ||
| } |
31 changes: 31 additions & 0 deletions
31
.../main/java/bisq/desktop/main/content/user/profile_card/offers/ProfileCardOffersModel.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * This file is part of Bisq. | ||
| * | ||
| * Bisq is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| * License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package bisq.desktop.main.content.user.profile_card.offers; | ||
|
|
||
| import bisq.desktop.common.view.Model; | ||
| import bisq.desktop.main.content.bisq_easy.offerbook.offerbook_list.OfferbookListItem; | ||
| import javafx.collections.FXCollections; | ||
| import javafx.collections.ObservableList; | ||
| import lombok.Getter; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| @Slf4j | ||
| @Getter | ||
| public class ProfileCardOffersModel implements Model { | ||
| private final ObservableList<OfferbookListItem> listItems = FXCollections.observableArrayList(); | ||
| } |
Oops, something went wrong.