Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Snoozing to dates in the future#97 #150

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Snoozing to dates in the future#97 #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a61bec2
added new values for spinner and button f snooze
Peim8 Aug 19, 2020
a75024d
added more snooze options
Peim8 Aug 20, 2020
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
144 changes: 110 additions & 34 deletions app/src/main/java/com/example/avjindersinghsekhon/minimaltodo/Reminder/ReminderFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.TextView;
Expand All @@ -35,6 +37,7 @@
import fr.ganfra.materialspinner.MaterialSpinner;

import static android.content.Context.MODE_PRIVATE;
import static java.lang.Math.abs;

public class ReminderFragment extends AppDefaultFragment {
private TextView mtoDoTextTextView;
Expand All @@ -46,6 +49,7 @@ public class ReminderFragment extends AppDefaultFragment {
private ToDoItem mItem;
public static final String EXIT = "com.avjindersekhon.exit";
private TextView mSnoozeTextView;
private boolean mSpinnerInitialized;
String theme;
AnalyticsApplication app;

Expand All @@ -66,7 +70,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {

((AppCompatActivity) getActivity()).setSupportActionBar((Toolbar) view.findViewById(R.id.toolbar));


mSpinnerInitialized = false;
Intent i = getActivity().getIntent();
UUID id = (UUID) i.getSerializableExtra(TodoNotificationService.TODOUUID);
mItem = null;
Expand All @@ -78,7 +82,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
}

snoozeOptionsArray = getResources().getStringArray(R.array.snooze_options);

mRemoveToDoButton = (Button) view.findViewById(R.id.toDoReminderRemoveButton);
mtoDoTextTextView = (TextView) view.findViewById(R.id.toDoReminderTextViewBody);
mSnoozeTextView = (TextView) view.findViewById(R.id.reminderViewSnoozeTextView);
Expand All @@ -103,8 +106,29 @@ public void onClick(View v) {
mToDoItems.remove(mItem);
changeOccurred();
saveData();
}
});

mSnoozeSpinner.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener() {

@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
if (!mSpinnerInitialized) {
mSpinnerInitialized = true;
return;
}
Date date = setNewTimeAndDate(i);
mItem.setToDoDate(date);
mItem.setHasReminder(true);
Log.d("OskarSchindler", "Date Changed to: " + date);
changeOccurred();
saveData();
closeApp();
// finish();
}

@Override
public void onNothingSelected(AdapterView<?> adapterView) {

}
});

Expand All @@ -115,7 +139,12 @@ public void onClick(View v) {
adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);

mSnoozeSpinner.setAdapter(adapter);
// mSnoozeSpinner.setSelection(0);
mSnoozeSpinner.setSelection(mSnoozeSpinner.getCount()-1);
}

@Override
public void onStart() {
super.onStart();
}

@Override
Expand Down Expand Up @@ -149,47 +178,94 @@ private void changeOccurred() {
editor.apply();
}

private Date addTimeToDate(int mins) {
app.send(this, "Action", "Snoozed", "For " + mins + " minutes");
private Date setNewTimeAndDate(int spinnerPosition) {
Date date = new Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.MINUTE, mins);
switch (spinnerPosition){
case 0: {
calendar.setTime(date);
calendar.add(Calendar.MINUTE, 10);
break;
}
case 1: {
calendar.setTime(date);
calendar.add(Calendar.MINUTE, 30);
break;
}
case 2: {
calendar.setTime(date);
calendar.add(Calendar.MINUTE, 60);
break;
}
case 3: {
calendar.setTime(date);
calendar.add(Calendar.HOUR, 24);
break;
}
case 4: {
calendar.setTime(date);
calendar.add(Calendar.HOUR, 24);
calendar.set(Calendar.HOUR_OF_DAY, 8);
calendar.set(Calendar.MINUTE, 0);
break;
}
case 5: {
calendar.setTime(date);
calendar.add(Calendar.HOUR, 24);
calendar.set(Calendar.HOUR_OF_DAY, 12);
calendar.set(Calendar.MINUTE, 0);
break;
}
case 6: {
calendar.setTime(date);
calendar.add(Calendar.HOUR, 24);
calendar.set(Calendar.HOUR_OF_DAY, 18);
calendar.set(Calendar.MINUTE, 0);
break;
}
case 7: {
calendar.setTime(date);
calendar.add(Calendar.HOUR, 48);
break;
}
case 8: {
calendar = giveNextWeekday(Calendar.FRIDAY);
break;
}
case 9: {
calendar = giveNextWeekday(Calendar.MONDAY);
break;
}

default:
throw new IllegalStateException("Unexpected value: " + spinnerPosition);
}

app.send(this, "Action", "Snoozed");


return calendar.getTime();
}

private int valueFromSpinner() {
switch (mSnoozeSpinner.getSelectedItemPosition()) {
case 0:
return 10;
case 1:
return 30;
case 2:
return 60;
default:
return 0;
}
return mSnoozeSpinner.getSelectedItemPosition();
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.toDoReminderDoneMenuItem:
Date date = addTimeToDate(valueFromSpinner());
mItem.setToDoDate(date);
mItem.setHasReminder(true);
Log.d("OskarSchindler", "Date Changed to: " + date);
changeOccurred();
saveData();
closeApp();
//foo
return true;
default:
return super.onOptionsItemSelected(item);
}
private Calendar giveNextWeekday (int weekday) {
Calendar today = Calendar.getInstance();
Date date = new Date();
today.setTime(date);
int dayOfCurrentWeek = today.get(Calendar.DAY_OF_WEEK);
int daysUntilWeekday = abs(weekday - dayOfCurrentWeek);
if (weekday < dayOfCurrentWeek ) daysUntilWeekday = 7 - daysUntilWeekday;
if (daysUntilWeekday == 0) daysUntilWeekday = 7;
Calendar nextWeekday = (Calendar)today.clone();
nextWeekday.add(Calendar.DAY_OF_WEEK, daysUntilWeekday);
return nextWeekday;
}



private void saveData() {
try {
storeRetrieveData.saveToFile(mToDoItems);
Expand Down
8 changes: 7 additions & 1 deletion app/src/main/res/layout/fragment_reminder.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,15 @@
android:id="@+id/toDoReminderRemoveButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="0dp"
android:layout_marginRight="0dp"
android:layout_marginBottom="0dp"
android:background="@drawable/button_pressed_background"
android:text="@string/remove"
android:textColor="@android:color/white"/>
android:textColor="@android:color/white" />

<LinearLayout
android:id="@+id/toDoReminderLinearLayout"
Expand Down Expand Up @@ -69,4 +74,5 @@
</LinearLayout>



</RelativeLayout>
8 changes: 8 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
<item>10 Minutes</item>
<item>30 Minutes</item>
<item>1 Hour</item>
<item>Tomorrow</item>
<item>Tomorrow Morning</item>
<item>Tomorrow Afternoon</item>
<item>Tomorrow Evening</item>
<item>Later this Week</item>
<item>This Weekend</item>
<item>Upcoming Week</item>
<item></item>
</string-array>

<string name="snooze">Snooze</string>
Expand Down