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

[PR #2157] [MERGED] [SG-166] Two Step Login - Feature Branch #3394

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2157
Author: @andrebispo5
Created: 10/28/2022
Status: ✅ Merged
Merged: 10/28/2022
Merged by: @andrebispo5

Base: master ← Head: feature/two-step-login

📝 Commits (5)

  • 472b541 [SG-166] Update fonts to have necessary icons
  • 433ca8b [SG-166] Add new custom view to hold a button with a font icon and a label.
  • b7ca0ba Merge branch 'master' into feature/two-step-login
  • d647335 [SG-166] Two Step login flow - Mobile (#2153)
  • 1fc0b04 [SG-166] Fixed appOptions and close button on iOS Extensions

📊 Changes

32 files changed (+611 additions, -122 deletions)

View changed files

📝 src/Android/Android.csproj (+1 -0)
📝 src/Android/Assets/bwi-font.ttf (+0 -0)
➕ src/Android/Effects/RemoveFontPaddingEffect.cs (+23 -0)
📝 src/App/App.csproj (+2 -0)
📝 src/App/Controls/IconButton.cs (+4 -1)
📝 src/App/Controls/IconLabel.cs (+4 -1)
➕ src/App/Controls/IconLabelButton/IconLabelButton.xaml (+40 -0)
➕ src/App/Controls/IconLabelButton/IconLabelButton.xaml.cs (+75 -0)
➕ src/App/Effects/RemoveFontPaddingEffect.cs (+13 -0)
📝 src/App/Pages/Accounts/HintPage.xaml.cs (+2 -1)
📝 src/App/Pages/Accounts/HintPageViewModel.cs (+7 -1)
📝 src/App/Pages/Accounts/HomePage.xaml (+59 -22)
📝 src/App/Pages/Accounts/HomePage.xaml.cs (+15 -22)
📝 src/App/Pages/Accounts/HomePageViewModel.cs (+103 -2)
📝 src/App/Pages/Accounts/LoginPage.xaml (+50 -29)
📝 src/App/Pages/Accounts/LoginPage.xaml.cs (+18 -5)
📝 src/App/Pages/Accounts/LoginPageViewModel.cs (+35 -9)
📝 src/App/Resources/AppResources.Designer.cs (+58 -3)
📝 src/App/Resources/AppResources.resx (+18 -0)
📝 src/App/Styles/Android.xaml (+1 -0)

...and 12 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

Feature branch of two step login feature.
#2153

Before you submit

  • Please check for formatting errors (dotnet format --verify-no-changes) (required)
  • Please add unit tests where it makes sense to do so (encouraged but not required)
  • If this change requires a documentation update - notify the documentation team
  • If 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/2157 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 10/28/2022 **Status:** ✅ Merged **Merged:** 10/28/2022 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `master` ← **Head:** `feature/two-step-login` --- ### 📝 Commits (5) - [`472b541`](https://github.com/bitwarden/android/commit/472b541cef2efa874e65035fed4952a817bdebb1) [SG-166] Update fonts to have necessary icons - [`433ca8b`](https://github.com/bitwarden/android/commit/433ca8b2fbc226b00c10f5745c450decc3745e26) [SG-166] Add new custom view to hold a button with a font icon and a label. - [`b7ca0ba`](https://github.com/bitwarden/android/commit/b7ca0ba64531863eed71f183eef3712a0799ac4e) Merge branch 'master' into feature/two-step-login - [`d647335`](https://github.com/bitwarden/android/commit/d647335f7788e426ac7bffd989f1bfc4fa20636e) [SG-166] Two Step login flow - Mobile (#2153) - [`1fc0b04`](https://github.com/bitwarden/android/commit/1fc0b040b909a7c251bb5c5e72cbe9276aade7a5) [SG-166] Fixed appOptions and close button on iOS Extensions ### 📊 Changes **32 files changed** (+611 additions, -122 deletions) <details> <summary>View changed files</summary> 📝 `src/Android/Android.csproj` (+1 -0) 📝 `src/Android/Assets/bwi-font.ttf` (+0 -0) ➕ `src/Android/Effects/RemoveFontPaddingEffect.cs` (+23 -0) 📝 `src/App/App.csproj` (+2 -0) 📝 `src/App/Controls/IconButton.cs` (+4 -1) 📝 `src/App/Controls/IconLabel.cs` (+4 -1) ➕ `src/App/Controls/IconLabelButton/IconLabelButton.xaml` (+40 -0) ➕ `src/App/Controls/IconLabelButton/IconLabelButton.xaml.cs` (+75 -0) ➕ `src/App/Effects/RemoveFontPaddingEffect.cs` (+13 -0) 📝 `src/App/Pages/Accounts/HintPage.xaml.cs` (+2 -1) 📝 `src/App/Pages/Accounts/HintPageViewModel.cs` (+7 -1) 📝 `src/App/Pages/Accounts/HomePage.xaml` (+59 -22) 📝 `src/App/Pages/Accounts/HomePage.xaml.cs` (+15 -22) 📝 `src/App/Pages/Accounts/HomePageViewModel.cs` (+103 -2) 📝 `src/App/Pages/Accounts/LoginPage.xaml` (+50 -29) 📝 `src/App/Pages/Accounts/LoginPage.xaml.cs` (+18 -5) 📝 `src/App/Pages/Accounts/LoginPageViewModel.cs` (+35 -9) 📝 `src/App/Resources/AppResources.Designer.cs` (+58 -3) 📝 `src/App/Resources/AppResources.resx` (+18 -0) 📝 `src/App/Styles/Android.xaml` (+1 -0) _...and 12 more files_ </details> ### 📄 Description ## Type of change - [ ] Bug fix - [X] 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--> Feature branch of two step login feature. #2153 ## Before you submit - Please check for formatting errors (`dotnet format --verify-no-changes`) (required) - Please add **unit tests** where it makes sense to do so (encouraged but not required) - If this change requires a **documentation update** - notify the documentation team - If 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:32:09 -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#3394
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?