-replace the name

dimagi · Jan 17, 2025 · c322bb1 · c322bb1
1 parent 83934e4
commit c322bb1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/app/res/menu/action_bar_search_view.xml b/app/res/menu/action_bar_search_view.xml
@@ -7,7 +7,7 @@
         app:showAsAction="collapseActionView|ifRoom"
         app:actionViewClass="androidx.appcompat.widget.SearchView"/>
     <item
-        android:id="@+id/barcode_scan_action_bar"
+        android:id="@+id/highlight_action_bar"
         android:title="Scan Barcode"
         android:icon="@drawable/startup_barcode"
         app:showAsAction="ifRoom"/>

diff --git a/app/src/org/commcare/activities/CommCareActivity.java b/app/src/org/commcare/activities/CommCareActivity.java
@@ -757,7 +757,7 @@ protected void tryToAddSearchActionToAppBar(AppCompatActivity activity, Menu men
 
         MenuItem searchMenuItem = menu.findItem(org.commcare.dalvik.R.id.search_action_bar);
         SearchView searchView = (SearchView)searchMenuItem.getActionView();
-        MenuItem barcodeItem = menu.findItem(org.commcare.dalvik.R.id.barcode_scan_action_bar);
+        MenuItem barcodeItem = menu.findItem(org.commcare.dalvik.R.id.highlight_action_bar);
         if (searchView != null) {
             if (instantiator != null) {
                 instantiator.onActionBarFound(searchMenuItem, searchView, barcodeItem);

diff --git a/app/src/org/commcare/activities/EntitySelectActivity.java b/app/src/org/commcare/activities/EntitySelectActivity.java
@@ -743,7 +743,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {
         // hide sorting menu when using async loading strategy
         menu.findItem(MENU_SORT).setVisible((shortSelect == null || shortSelect.hasSortField()));
         if(isMappingEnabled) {
-            menu.findItem(R.id.barcode_scan_action_bar).setIcon(R.drawable.ic_marker);
+            menu.findItem(R.id.highlight_action_bar).setIcon(R.drawable.ic_marker);
         }
 
         if (menu.findItem(R.id.menu_settings) != null) {
@@ -769,7 +769,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 return true;
             // handling click on the barcode scanner's actionbar
             // trying to set the onclicklistener in its view in the onCreateOptionsMenu method does not work because it returns null
-            case R.id.barcode_scan_action_bar:
+            case R.id.highlight_action_bar:
                 if(isMappingEnabled){
                     Intent intent = new Intent(this,
                             HiddenPreferences.shouldUseMapboxMap() ? EntityMapboxActivity.class : EntityMapActivity.class);

diff --git a/app/src/org/commcare/activities/FormRecordListActivity.java b/app/src/org/commcare/activities/FormRecordListActivity.java
@@ -2,7 +2,6 @@
 
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.text.Editable;
@@ -580,7 +579,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case MENU_SUBMIT_QUARANTINE_REPORT:
                 generateQuarantineReport();
                 return true;
-            case R.id.barcode_scan_action_bar:
+            case R.id.highlight_action_bar:
                 barcodeScanOnClickListener.onClick(null);
                 return true;
             case R.id.menu_settings: