Corrects Map Icon Changes and minor cleanup

[shubham1g5]

Product Description

• A smallish name change revert for connect and master synergy
• Fix for app verification after download - Corrects the constant to set for the verification.
• Corrects the implementation of map icon from the PR - Pm core pr #2943 where the only change we need to show the map icon on the bar is set the setShowAsAction flag.

Safety Assurance

Safety story

• Tested that the map icon shows as before on the action bar after the change.
• Impact should be limited to the apps with map icon enabled i.e quite a limited # of apps

Labels and Review

• Do we need to enhance the manual QA test coverage ? If yes, the "QA Note" label is set correctly
• Does the PR introduce any major changes worth communicating ? If yes, the "Release Note" label is set and a "Release Note" is specified in PR description.
• Risk label is set correctly
• The set of people pinged as reviewers is appropriate for the level of risk of the change

[coderabbitai]

📝 Walkthrough

Walkthrough

The changes include several updates across multiple files. The string resource for the barcode scan menu item was removed from the Android translatable strings. In the menu resource XML, the menu item ID was renamed from highlight_action_bar to barcode_scan_action_bar. Corresponding updates were made in Java source files to reference the new menu item ID. In EntitySelectActivity, the scan menu item was replaced with a map menu item, including updates to constants, menu creation, and item selection logic to launch map activities instead of barcode scanning. The BlankLoginActivityUIController class and its constructor were renamed for consistent capitalization, and the instantiation in LoginActivity was updated accordingly. Additionally, the intent extra key used for launching CommCareVerificationActivity from ConnectActivity was changed from KEY_LAUNCH_FROM_SETTINGS to KEY_LAUNCH_FROM_CONNECT. No changes were made to the signatures of exported or public entities.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant AppBar
    participant EntitySelectActivity
    participant MapActivity
    participant BarcodeScanner

    User->>AppBar: Selects menu item
    AppBar->>EntitySelectActivity: onOptionsItemSelected()
    alt Map menu item selected
        EntitySelectActivity->>MapActivity: Launch EntityMapboxActivity or EntityMapActivity
    else Barcode scan menu item selected
        EntitySelectActivity->>BarcodeScanner: Trigger barcodeScanOnClickListener
    end

Loading

Suggested labels

skip-integration-tests

Suggested reviewers

• OrangeAndGreen
• pm-dimagi

---

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 4a1516f and 5efd1b7.

📒 Files selected for processing (8)

• app/assets/locales/android_translatable_strings.txt (0 hunks)
• app/res/menu/action_bar_search_view.xml (1 hunks)
• app/src/org/commcare/activities/BlankLoginActivityUIController.java (1 hunks)
• app/src/org/commcare/activities/CommCareActivity.java (1 hunks)
• app/src/org/commcare/activities/EntitySelectActivity.java (3 hunks)
• app/src/org/commcare/activities/FormRecordListActivity.java (1 hunks)
• app/src/org/commcare/activities/LoginActivity.java (1 hunks)
• app/src/org/commcare/activities/connect/ConnectActivity.java (1 hunks)

💤 Files with no reviewable changes (1)

• app/assets/locales/android_translatable_strings.txt

🧰 Additional context used

🧬 Code Graph Analysis (1)

app/src/org/commcare/activities/EntitySelectActivity.java (1)

app/src/org/commcare/preferences/HiddenPreferences.java (1)

• HiddenPreferences (33-678)

🔇 Additional comments (11)

app/src/org/commcare/activities/BlankLoginActivityUIController.java (2)

15-15: Consistent UIController naming applied.

The class name has been updated to BlankLoginActivityUIController to match the UI capitalization convention, and the file name aligns with the class. This improves consistency across UI controller classes.

---

20-20: Constructor updated to match renamed class.

The constructor signature has been updated to reflect the renamed BlankLoginActivityUIController class. No other references require updates since the class resides in the same package.

app/src/org/commcare/activities/LoginActivity.java (1)

781-781: Instantiate correctly renamed UIController.

The initUIController() method now creates an instance of BlankLoginActivityUIController (with the corrected capitalization), replacing the old class name. This matches the class rename in BlankLoginActivityUIController.java.

app/src/org/commcare/activities/CommCareActivity.java (1)

752-752: Use updated barcode scan action bar ID.

The lookup for the barcode menu item has been changed to R.id.barcode_scan_action_bar to match the renamed resource. This aligns the code with the updated XML and ensures the menu item is correctly found.

app/src/org/commcare/activities/FormRecordListActivity.java (1)

582-582: Handle renamed barcode scan menu item.

The onOptionsItemSelected switch case now listens for R.id.barcode_scan_action_bar instead of the old highlight_action_bar ID. This keeps the menu handling consistent with the renamed resource and retains the existing scan functionality.

app/res/menu/action_bar_search_view.xml (1)

10-10: Rename menu item ID for barcode scan.

The XML item ID has been updated to @+id/barcode_scan_action_bar, matching the Java references and standardizing the menu identifiers. The rest of the attributes remain unchanged.

app/src/org/commcare/activities/connect/ConnectActivity.java (1)

271-271: Renamed intent key for better context clarity.

The change from KEY_LAUNCH_FROM_SETTINGS to KEY_LAUNCH_FROM_CONNECT more accurately reflects that the CommCareVerificationActivity is being launched from the ConnectActivity rather than from Settings. This improves code readability and maintains consistency with the actual launching context.

app/src/org/commcare/activities/EntitySelectActivity.java (4)

111-111: Renamed constant to accurately reflect functionality.

The constant was renamed from MENU_SCAN to MENU_MAP to properly reflect its functionality, while maintaining the same menu ID value. This improves code readability and consistency.

---

722-723: Fixed map icon display in action bar.

The key fix here is the addition of setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) which ensures the map icon will be displayed in the action bar when there's space available. This directly addresses the issue mentioned in the PR objectives where the map icon wasn't appearing on the action bar as intended.

---

778-782: Updated menu item handler to launch appropriate map activity.

The handler now properly launches either EntityMapboxActivity or EntityMapActivity based on the user's preferences. This implementation correctly utilizes HiddenPreferences.shouldUseMapboxMap() to determine which map implementation to use.

---

785-786: Renamed barcode scan action bar menu item ID.

The menu item ID was changed from highlight_action_bar to barcode_scan_action_bar, which more accurately describes its functionality. The behavior remains the same - triggering the barcode scan action when selected.

✨ Finishing Touches

• 📝 Generate Docstrings

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate docstrings to generate docstrings for this PR.
• @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.