Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

QR Scanner and Manual Key Entry screens #7

Merged
merged 15 commits into from
Apr 2, 2024
Merged

Conversation

SaintPatrck
Copy link
Contributor

@SaintPatrck SaintPatrck commented Mar 28, 2024

🎟️ Tracking

N/A

📔 Objective

Display the QR code scanner and manual item entry screens when their corresponding navigation buttons are clicked.

📸 Screenshots

Screen Name Dark Mode Light Mode
QR Code Scanner image image
Manual Entry image image

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

@SaintPatrck SaintPatrck requested a review from a team as a code owner March 28, 2024 03:58
@SaintPatrck SaintPatrck requested review from KatherineInCode and removed request for a team March 28, 2024 03:58
SaintPatrck and others added 5 commits March 28, 2024 00:05
…lert-state

# Conflicts:
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/data/platform/datasource/disk/SettingsDiskSource.kt
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/data/platform/datasource/disk/SettingsDiskSourceImpl.kt
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/data/platform/repository/SettingsRepository.kt
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/data/platform/repository/SettingsRepositoryImpl.kt
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/ui/authenticator/feature/item/ItemScreen.kt
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/ui/authenticator/feature/item/ItemViewModel.kt
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/ui/authenticator/feature/item/model/ItemData.kt
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModel.kt
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/ui/authenticator/feature/itemlisting/VaultVerificationCodeItem.kt
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/ui/platform/components/indicator/BitwardenCircularCountdownIndicator.kt
#	app/src/main/res/values/strings.xml
# Conflicts:
#	app/src/main/res/values/strings.xml
# Conflicts:
#	app/src/main/res/values/strings.xml
# Conflicts:
#	app/src/main/res/values/strings.xml
@SaintPatrck SaintPatrck requested a review from a team as a code owner March 29, 2024 04:34
Copy link
Contributor

github-actions bot commented Mar 29, 2024

Logo
Checkmarx One – Scan Summary & Details3236a2db-77e7-4498-af1e-16dce3e4bce7

No New Or Fixed Issues Found

Base automatically changed from expandable-fab to main April 2, 2024 14:34
@SaintPatrck SaintPatrck dismissed KatherineInCode’s stale review April 2, 2024 14:34

The base branch was changed.

# Conflicts:
#	app/src/main/kotlin/com/x8bit/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingGraphNavigation.kt
#	app/src/main/res/values/strings.xml
@SaintPatrck SaintPatrck merged commit a92ed17 into main Apr 2, 2024
5 checks passed
@SaintPatrck SaintPatrck deleted the qr-scanner-manual-entry branch April 2, 2024 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants