From 288de8d2893782074530a395572335f70943e3e8 Mon Sep 17 00:00:00 2001 From: lado Date: Tue, 12 Feb 2013 22:19:32 +0100 Subject: Ussue 913 --- .../vdrmanager/gui/TimerDetailsActivity.java | 6 +- .../vdrmanager/gui/TimerListActivity.java | 74 ++++++++++++++-------- 2 files changed, 50 insertions(+), 30 deletions(-) (limited to 'vdrmanager/src/de/bjusystems') diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/TimerDetailsActivity.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/TimerDetailsActivity.java index 14ca7a1..75ac581 100644 --- a/vdrmanager/src/de/bjusystems/vdrmanager/gui/TimerDetailsActivity.java +++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/TimerDetailsActivity.java @@ -229,7 +229,7 @@ public class TimerDetailsActivity extends Activity implements OnClickListener, weekdays[Calendar.THURSDAY], weekdays[Calendar.FRIDAY], weekdays[Calendar.SATURDAY], weekdays[Calendar.SUNDAY], }; - final DaysOfWeek mNewDaysOfWeek = new DaysOfWeek(0); + final DaysOfWeek mNewDaysOfWeek = new DaysOfWeek(getSelectedItems().mDays); final AlertDialog b = new AlertDialog.Builder(this) .setMultiChoiceItems(values, getSelectedItems().getBooleanArray(), @@ -270,8 +270,8 @@ public class TimerDetailsActivity extends Activity implements OnClickListener, return dow; } - - dow.set(0, str.charAt(0) == 'M'); + + dow.set(0, str.charAt(0) == 'M'); dow.set(1, str.charAt(1) == 'T'); dow.set(2, str.charAt(2) == 'W'); dow.set(3, str.charAt(3) == 'T'); diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/TimerListActivity.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/TimerListActivity.java index abb4d7f..c117623 100644 --- a/vdrmanager/src/de/bjusystems/vdrmanager/gui/TimerListActivity.java +++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/TimerListActivity.java @@ -1,8 +1,8 @@ package de.bjusystems.vdrmanager.gui; import java.util.Calendar; +import java.util.Comparator; -import android.content.Intent; import android.os.Bundle; import android.view.Menu; import android.view.MenuInflater; @@ -11,7 +11,6 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.ListView; import de.bjusystems.vdrmanager.R; import de.bjusystems.vdrmanager.app.VdrManagerApp; -import de.bjusystems.vdrmanager.data.Event; import de.bjusystems.vdrmanager.data.EventListItem; import de.bjusystems.vdrmanager.data.Timer; import de.bjusystems.vdrmanager.utils.date.DateFormatter; @@ -22,28 +21,28 @@ import de.bjusystems.vdrmanager.utils.svdrp.TimerClient; /** * This class is used for showing all the existing timers - * + * * @author bju */ public class TimerListActivity extends BaseTimerEditActivity implements OnItemClickListener, SvdrpAsyncListener { private static final int MENU_NEW_TIMER = 2; - + private static final int MENU_GROUP_NEW_TIMER = 2; /** - * + * */ TimerClient timerClient; - @Override protected SvdrpClient getClient() { return this.timerClient; } + /* * (non-Javadoc) - * + * * @see * de.bjusystems.vdrmanager.gui.BaseEventListActivity#onCreate(android.os * .Bundle) @@ -92,10 +91,10 @@ public class TimerListActivity extends BaseTimerEditActivity implements timerClient); // create progress dialog - //progress = new SvdrpProgressDialog(this, timerClient); + // progress = new SvdrpProgressDialog(this, timerClient); // attach listener - //task.addListener(progress); + // task.addListener(progress); task.addListener(this); // start task @@ -104,7 +103,7 @@ public class TimerListActivity extends BaseTimerEditActivity implements /* * (non-Javadoc) - * + * * @see * de.bjusystems.vdrmanager.gui.BaseTimerEditActivity#getTimer(de.bjusystems * .vdrmanager.data.EventListItem) @@ -116,7 +115,7 @@ public class TimerListActivity extends BaseTimerEditActivity implements /* * (non-Javadoc) - * + * * @see * de.bjusystems.vdrmanager.gui.BaseEventListActivity#prepareTimer(de.bjusystems * .vdrmanager.data.EventListItem) @@ -128,18 +127,38 @@ public class TimerListActivity extends BaseTimerEditActivity implements app.setCurrentEpgList(results); } + protected Comparator getTimeComparator(boolean reverse) { + return new BaseEventComparator(reverse) { + @Override + public int compare(Timer item1, Timer item2) { + if (item1.isRecurring()) { + return 1; + } + if (item2.isRecurring()) { + return -1; + } + return super.compare(item1, item2); + } + + }; + } + protected boolean finishedSuccessImpl() { adapter.clear(); sortItemsByTime(results); int day = -1; Calendar cal = Calendar.getInstance(); - for (Event e : results) { - cal.setTime(e.getStart()); - int eday = cal.get(Calendar.DAY_OF_YEAR); - if (eday != day) { - day = eday; - adapter.add(new EventListItem(new DateFormatter(cal) - .getDailyHeader())); + for (Timer e : results) { + if (e.isRecurring()) { + adapter.add(new EventListItem(e.getWeekdays())); + } else { + cal.setTime(e.getStart()); + int eday = cal.get(Calendar.DAY_OF_YEAR); + if (eday != day) { + day = eday; + adapter.add(new EventListItem(new DateFormatter(cal) + .getDailyHeader())); + } } adapter.add(new EventListItem(e)); } @@ -151,6 +170,7 @@ public class TimerListActivity extends BaseTimerEditActivity implements protected boolean notifyDataSetChangedOnResume() { return true; } + @Override protected String getWindowTitle() { return getString(R.string.action_menu_timers); @@ -170,22 +190,22 @@ public class TimerListActivity extends BaseTimerEditActivity implements protected void retry() { refresh(); } - + /* * (non-Javadoc) - * + * * @see * de.bjusystems.vdrmanager.gui.BaseActivity#onOptionsItemSelected(android * .view.MenuItem) */ public boolean onOptionsItemSelected(final MenuItem item) { - switch(item.getItemId()){ + switch (item.getItemId()) { case R.id.timer_menu_add: say("Comming soon..."); return true; } - + // switch (item.getItemId()) { // case R.id.epg_menu_search: // startSearchManager(); @@ -201,15 +221,15 @@ public class TimerListActivity extends BaseTimerEditActivity implements } public boolean onCreateOptionsMenu(final Menu menu) { - // MenuItem item; - //item = menu.add(MENU_GROUP_NEW_TIMER, MENU_NEW_TIMER, 0, R.string.new_timer); - //item.setIcon(android.R.drawable.ic_menu_add);; -// /item.setAlphabeticShortcut('r'); + // MenuItem item; + // item = menu.add(MENU_GROUP_NEW_TIMER, MENU_NEW_TIMER, 0, + // R.string.new_timer); + // item.setIcon(android.R.drawable.ic_menu_add);; + // /item.setAlphabeticShortcut('r'); final MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.timer_list_menu, menu); return super.onCreateOptionsMenu(menu); } - } -- cgit v1.2.3