Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/main/java/se/poochoo/DialogActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public class DialogActivity extends Activity implements NetworkInterface.Respons
public int dialogDepartureColor;
private long dataLoadedAt;
private MenuItem starDepartureItem;
private MenuItem notifyDepartureItem;

@Override
public void onCreate(Bundle savedInstanceState) {
Expand All @@ -68,20 +69,19 @@ public void onCreate(Bundle savedInstanceState) {

@Override
public boolean onCreateOptionsMenu(Menu menu) {

MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.departure, menu);

starDepartureItem = menu.findItem(R.id.action_star);

if (selectedData.isPromoted(listDataItem.getSelector())){
starDepartureItem.setChecked(true);
starDepartureItem.setIcon(R.drawable.icon_star_white_on);
} else {
starDepartureItem.setChecked(false);
starDepartureItem.setIcon(R.drawable.icon_star_white_off);
}

notifyDepartureItem = menu.findItem(R.id.action_notification);
notifyDepartureItem.setChecked(true);
notifyDepartureItem.setIcon(R.drawable.action_remind);
return super.onCreateOptionsMenu(menu);
}

Expand All @@ -99,6 +99,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
selectedData.storeAction(listDataItem.getSelector(), SelectionUserDataSource.SelectionType.PROMOTE);
}
break;
case R.id.action_notification:
showTrackingNotification(0);
break;
}
return super.onOptionsItemSelected(item);
}
Expand Down
14 changes: 8 additions & 6 deletions src/main/res/menu/departure.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>

<menu xmlns:android="http://schemas.android.com/apk/res/android">

<item
android:id="@+id/action_star"
android:orderInCategory="300"
android:showAsAction="always"
android:checkable="true"
android:title="Star departure"
/>

</menu>
android:title="Star departure" />
<item
android:id="@+id/action_notification"
android:orderInCategory="200"
android:showAsAction="always"
android:checkable="true"
android:title="Notify departure" />
</menu>