Skip to content

Commit c9f966f

Browse files
committed
multimeter action bar fixed
1 parent a91c544 commit c9f966f

File tree

2 files changed

+2
-20
lines changed

2 files changed

+2
-20
lines changed

app/src/main/java/io/pslab/activity/MultimeterActivity.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,6 @@ public boolean onPrepareOptionsMenu(Menu menu) {
470470
stopMenu = menu.findItem(R.id.stop_data);
471471
playMenu.setVisible(isPlayingBack);
472472
menu.findItem(R.id.record_pause_data).setVisible(!isPlayingBack);
473-
menu.findItem(R.id.delete_csv_data).setVisible(!isPlayingBack);
474473
return super.onPrepareOptionsMenu(menu);
475474
}
476475

@@ -526,18 +525,6 @@ public void onClick(View view) {
526525
CustomSnackBar.showSnackBar(coordinatorLayout, getString(R.string.device_not_found), null, null, Snackbar.LENGTH_SHORT);
527526
}
528527
break;
529-
case R.id.delete_csv_data:
530-
if (isDataRecorded) {
531-
MenuItem item1 = menu.findItem(R.id.record_pause_data);
532-
item1.setIcon(R.drawable.ic_record_white);
533-
recordData = false;
534-
isRecordingStarted = false;
535-
isDataRecorded = false;
536-
multimeterLogger.deleteFile();
537-
CustomSnackBar.showSnackBar(coordinatorLayout, getString(R.string.data_deleted), null, null, Snackbar.LENGTH_SHORT);
538-
} else
539-
CustomSnackBar.showSnackBar(coordinatorLayout, getString(R.string.nothing_to_delete), null, null, Snackbar.LENGTH_SHORT);
540-
break;
541528
case R.id.settings:
542529
Intent settingIntent = new Intent(this, SettingsActivity.class);
543530
settingIntent.putExtra("title", getResources().getString(R.string.multimeter_configurations));

app/src/main/res/menu/multimeter_log_menu.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,11 @@
66
android:icon="@drawable/ic_record_white"
77
android:title="@string/record_csv_data"
88
app:showAsAction="always" />
9-
<item
10-
android:id="@+id/delete_csv_data"
11-
android:icon="@drawable/delete_icon"
12-
android:title="@string/delete_csv_data"
13-
app:showAsAction="ifRoom" />
149
<item
1510
android:id="@+id/show_guide"
16-
android:icon="@drawable/menu_icon_save"
11+
android:icon="@drawable/menu_icon_guide"
1712
android:title="@string/show_guide"
18-
app:showAsAction="never" />
13+
app:showAsAction="always" />
1914
<item
2015
android:id="@+id/multimeter_show_data"
2116
android:icon="@drawable/menu_icon_save"

0 commit comments

Comments
 (0)