hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Created instance variable for snackbar anchor in edit alarm screen

Browse Source
This commit is contained in:
Phillip Hsu 2016-07-12 01:28:34 -07:00
parent c5558c211a
commit 799271fbec
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/philliphsu/clock2/editalarm/EditAlarmActivity.java
View File

@ -5,6 +5,7 @@ import android.media.RingtoneManager;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.StringRes; import android.support.annotation.StringRes;
import android.support.design.widget.CoordinatorLayout;
import android.support.v4.app.LoaderManager; import android.support.v4.app.LoaderManager;
import android.support.v4.content.Loader; import android.support.v4.content.Loader;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
@ -31,7 +32,6 @@ import com.philliphsu.clock2.DaysOfWeek;
import com.philliphsu.clock2.R; import com.philliphsu.clock2.R;
import com.philliphsu.clock2.SharedPreferencesHelper; import com.philliphsu.clock2.SharedPreferencesHelper;
import com.philliphsu.clock2.model.AlarmLoader; import com.philliphsu.clock2.model.AlarmLoader;
import com.philliphsu.clock2.model.DatabaseManager;
import com.philliphsu.clock2.ringtone.RingtoneActivity; import com.philliphsu.clock2.ringtone.RingtoneActivity;
import com.philliphsu.clock2.util.AlarmController; import com.philliphsu.clock2.util.AlarmController;
import com.philliphsu.clock2.util.AlarmUtils; import com.philliphsu.clock2.util.AlarmUtils;
@ -52,6 +52,12 @@ import static com.philliphsu.clock2.DaysOfWeek.SUNDAY;
import static com.philliphsu.clock2.util.KeyboardUtils.hideKeyboard; import static com.philliphsu.clock2.util.KeyboardUtils.hideKeyboard;
import static com.philliphsu.clock2.util.Preconditions.checkNotNull; import static com.philliphsu.clock2.util.Preconditions.checkNotNull;
/**
* TODO: Consider writing an EditAlarmController that would have an
* AlarmController member variable to manage the states of the alarm.
* The class would have the API for editing the alarm, so move all
* the relevant helper methods from here to there.
*/
public class EditAlarmActivity extends BaseActivity implements AlarmNumpad.KeyListener, public class EditAlarmActivity extends BaseActivity implements AlarmNumpad.KeyListener,
EditAlarmContract.View, // TODO: Remove @Override from the methods EditAlarmContract.View, // TODO: Remove @Override from the methods
AlarmUtilsHelper, AlarmUtilsHelper,
@ -69,8 +75,8 @@ public class EditAlarmActivity extends BaseActivity implements AlarmNumpad.KeyLi
private long mOldAlarmId; private long mOldAlarmId;
private Uri mSelectedRingtoneUri; private Uri mSelectedRingtoneUri;
private Alarm mOldAlarm; private Alarm mOldAlarm;
private DatabaseManager mDatabaseManager; // TODO: Delete this
@Bind(R.id.main_content) CoordinatorLayout mMainContent;
@Bind(R.id.save) Button mSave; @Bind(R.id.save) Button mSave;
@Bind(R.id.delete) Button mDelete; @Bind(R.id.delete) Button mDelete;
@Bind(R.id.on_off) SwitchCompat mSwitch; @Bind(R.id.on_off) SwitchCompat mSwitch;
@ -87,7 +93,6 @@ public class EditAlarmActivity extends BaseActivity implements AlarmNumpad.KeyLi
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setWeekDaysText(); setWeekDaysText();
mNumpad.setKeyListener(this); mNumpad.setKeyListener(this);
mDatabaseManager = DatabaseManager.getInstance(this); // MUST be before loading alarm
mOldAlarmId = getIntent().getLongExtra(EXTRA_ALARM_ID, -1); mOldAlarmId = getIntent().getLongExtra(EXTRA_ALARM_ID, -1);
if (mOldAlarmId != -1) { if (mOldAlarmId != -1) {
// getLoaderManager() for support fragments by default returns the // getLoaderManager() for support fragments by default returns the
@ -107,8 +112,9 @@ public class EditAlarmActivity extends BaseActivity implements AlarmNumpad.KeyLi
// TODO: Snooze menu item when alarm is ringing. // TODO: Snooze menu item when alarm is ringing.
if (mOldAlarm != null && mOldAlarm.isEnabled()) { if (mOldAlarm != null && mOldAlarm.isEnabled()) {
int hoursBeforeUpcoming = getInt(R.string.key_notify_me_of_upcoming_alarms, 2); int hoursBeforeUpcoming = getInt(R.string.key_notify_me_of_upcoming_alarms, 2);
// TODO: Schedule task with handler to show the menu item when it is time. Handler is fine because // TODO: Schedule task with handler to show the menu item when it is time.
// the task only needs to be done if the activity is being viewed. (I think) if the process of this // Handler is fine because the task only needs to be done if the activity
// is being viewed. (I think) if the process of this
// app is killed, then the handler is also killed. // app is killed, then the handler is also killed.
if ((mOldAlarm.ringsWithinHours(hoursBeforeUpcoming))) { if ((mOldAlarm.ringsWithinHours(hoursBeforeUpcoming))) {
showCanDismissNow(); showCanDismissNow();
@ -523,7 +529,7 @@ public class EditAlarmActivity extends BaseActivity implements AlarmNumpad.KeyLi
public void cancelAlarm(Alarm alarm, boolean showToast) { public void cancelAlarm(Alarm alarm, boolean showToast) {
// TODO: Rewrite XML layout to use CoordinatorLayout and // TODO: Rewrite XML layout to use CoordinatorLayout and
// pass in the snackbar anchor. // pass in the snackbar anchor.
new AlarmController(this, findViewById(R.id.main_content)).cancelAlarm(alarm, true); new AlarmController(this, mMainContent).cancelAlarm(alarm, true);
if (RingtoneActivity.isAlive()) { if (RingtoneActivity.isAlive()) {
LocalBroadcastHelper.sendBroadcast(this, RingtoneActivity.ACTION_FINISH); LocalBroadcastHelper.sendBroadcast(this, RingtoneActivity.ACTION_FINISH);
} }