github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-18 11:44:32 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PR #1738] [MERGED] Run dotnet format #3085

New Issue
Closed
opened 2025-11-26 23:28:06 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-26 23:28:06 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/1738
Author: @Hinton
Created: 1/31/2022
Status: ✅ Merged
Merged: 4/26/2022
Merged by: @Hinton

Base: master ← Head: feature/apply-format

📝 Commits (1)

📊 Changes

222 files changed (+719 additions, -702 deletions)

View changed files

📝 src/App/Abstractions/IDeviceActionService.cs (+2 -2)
📝 src/App/Abstractions/IPasswordRepromptService.cs (+1 -1)
📝 src/App/Abstractions/IPushNotificationListenerService.cs (+2 -2)
📝 src/App/App.xaml.cs (+5 -5)
📝 src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml.cs (+1 -1)
📝 src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayViewModel.cs (+2 -2)
📝 src/App/Controls/AccountViewCell/AccountViewCell.xaml.cs (+1 -1)
📝 src/App/Controls/AvatarImageSource.cs (+2 -2)
📝 src/App/Controls/ExtendedStepper.cs (+2 -2)
📝 src/App/Controls/SendViewCell/SendViewCell.xaml.cs (+2 -2)
📝 src/App/Effects/FabShadowEffect.cs (+2 -2)
📝 src/App/Pages/Accounts/BaseChangePasswordViewModel.cs (+7 -7)
📝 src/App/Pages/Accounts/EnvironmentPage.xaml.cs (+3 -3)
📝 src/App/Pages/Accounts/EnvironmentPageViewModel.cs (+3 -3)
📝 src/App/Pages/Accounts/HintPageViewModel.cs (+2 -2)
📝 src/App/Pages/Accounts/HomePage.xaml.cs (+3 -3)
📝 src/App/Pages/Accounts/LockPageViewModel.cs (+1 -1)
📝 src/App/Pages/Accounts/LoginPage.xaml.cs (+1 -1)
📝 src/App/Pages/Accounts/LoginPageViewModel.cs (+1 -1)
📝 src/App/Pages/Accounts/LoginSsoPage.xaml.cs (+5 -5)

...and 80 more files

📄 Description

Type of change

  • Bug fix
  • New feature development
  • Tech debt (refactoring, code cleanup, dependency upgrades, etc)
  • Build/deploy pipeline (DevOps)
  • Other

Objective

This PR applies the dotnet format tool on the codebase. It's a follow up to https://github.com/bitwarden/server/pull/1756.

Any existing branch will have a fair bit of merge conflicts after this change. So I've prepared some documentation on how to easily get in-sync again.

  1. Check out your local Branch
  2. Run git merge <hash config>
  3. Resolve any merge conflicts, commit.
  4. Run dotnet tool run dotnet-format
  5. Commit
  6. Run git merge -Xours <hash this PR>
  7. Push

Before you submit

  • I have added unit tests where it makes sense to do so (encouraged but not required)
  • This change requires a documentation update (notify the documentation team)
  • This change has particular deployment requirements (notify the DevOps team)

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/1738 **Author:** [@Hinton](https://github.com/Hinton) **Created:** 1/31/2022 **Status:** ✅ Merged **Merged:** 4/26/2022 **Merged by:** [@Hinton](https://github.com/Hinton) **Base:** `master` ← **Head:** `feature/apply-format` --- ### 📝 Commits (1) - [`7041b61`](https://github.com/bitwarden/android/commit/7041b61af0e7bb486b3ce5e54e13b97ea242df0c) Apply format ### 📊 Changes **222 files changed** (+719 additions, -702 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Abstractions/IDeviceActionService.cs` (+2 -2) 📝 `src/App/Abstractions/IPasswordRepromptService.cs` (+1 -1) 📝 `src/App/Abstractions/IPushNotificationListenerService.cs` (+2 -2) 📝 `src/App/App.xaml.cs` (+5 -5) 📝 `src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml.cs` (+1 -1) 📝 `src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayViewModel.cs` (+2 -2) 📝 `src/App/Controls/AccountViewCell/AccountViewCell.xaml.cs` (+1 -1) 📝 `src/App/Controls/AvatarImageSource.cs` (+2 -2) 📝 `src/App/Controls/ExtendedStepper.cs` (+2 -2) 📝 `src/App/Controls/SendViewCell/SendViewCell.xaml.cs` (+2 -2) 📝 `src/App/Effects/FabShadowEffect.cs` (+2 -2) 📝 `src/App/Pages/Accounts/BaseChangePasswordViewModel.cs` (+7 -7) 📝 `src/App/Pages/Accounts/EnvironmentPage.xaml.cs` (+3 -3) 📝 `src/App/Pages/Accounts/EnvironmentPageViewModel.cs` (+3 -3) 📝 `src/App/Pages/Accounts/HintPageViewModel.cs` (+2 -2) 📝 `src/App/Pages/Accounts/HomePage.xaml.cs` (+3 -3) 📝 `src/App/Pages/Accounts/LockPageViewModel.cs` (+1 -1) 📝 `src/App/Pages/Accounts/LoginPage.xaml.cs` (+1 -1) 📝 `src/App/Pages/Accounts/LoginPageViewModel.cs` (+1 -1) 📝 `src/App/Pages/Accounts/LoginSsoPage.xaml.cs` (+5 -5) _...and 80 more files_ </details> ### 📄 Description ## Type of change - [ ] Bug fix - [ ] New feature development - [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc) - [ ] Build/deploy pipeline (DevOps) - [ ] Other ## Objective <!--Describe what the purpose of this PR is. For example: what bug you're fixing or what new feature you're adding--> This PR applies the dotnet format tool on the codebase. It's a follow up to https://github.com/bitwarden/server/pull/1756. Any existing branch will have a fair bit of merge conflicts after this change. So I've prepared some documentation on how to easily get in-sync again. 1. Check out your local Branch 2. Run `git merge <hash config>` 3. Resolve any merge conflicts, commit. 4. Run `dotnet tool run dotnet-format` 5. Commit 6. Run `git merge -Xours <hash this PR>` 7. Push ## Before you submit - [ ] I have added **unit tests** where it makes sense to do so (encouraged but not required) - [ ] This change requires a **documentation update** (notify the documentation team) - [ ] This change has particular **deployment requirements** (notify the DevOps team) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-26 23:28:06 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#3085
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?