fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

pass EventActivity only the event ID

Browse Source
This commit is contained in:
tibbi
2016-10-23 19:03:59 +02:00
parent 53550a6471
commit e043e1b814
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/simplemobiletools/calendar/Constants.java
View File

@@ -7,7 +7,7 @@ public class Constants {
public static final String DAY_CODE = "day_code"; public static final String DAY_CODE = "day_code";
public static final String YEAR_LABEL = "year"; public static final String YEAR_LABEL = "year";
public static final String EVENT = "event"; public static final String EVENT_ID = "event_id";
public static final int MONTHLY_VIEW = 1; public static final int MONTHLY_VIEW = 1;
public static final int YEARLY_VIEW = 2; public static final int YEARLY_VIEW = 2;

2
app/src/main/java/com/simplemobiletools/calendar/receivers/NotificationReceiver.java
View File

@@ -47,7 +47,7 @@ public class NotificationReceiver extends BroadcastReceiver {
private PendingIntent getPendingIntent(Context context, Event event) { private PendingIntent getPendingIntent(Context context, Event event) {
final Intent intent = new Intent(context, EventActivity.class); final Intent intent = new Intent(context, EventActivity.class);
intent.putExtra(Constants.EVENT, event); intent.putExtra(Constants.EVENT_ID, event);
return PendingIntent.getActivity(context, event.getId(), intent, PendingIntent.FLAG_UPDATE_CURRENT); return PendingIntent.getActivity(context, event.getId(), intent, PendingIntent.FLAG_UPDATE_CURRENT);
} }

3
app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
View File

@@ -37,7 +37,8 @@ class EventActivity : SimpleActivity(), DBHelper.EventsListener {
val intent = intent ?: return val intent = intent ?: return
mWasReminderInit = false mWasReminderInit = false
val event = intent.getSerializableExtra(Constants.EVENT) as Event? val eventId = intent.getIntExtra(Constants.EVENT_ID, 0)
val event = DBHelper(applicationContext).getEvent(eventId)
if (event != null) { if (event != null) {
mEvent = event mEvent = event
setupEditEvent() setupEditEvent()

6
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
View File

@@ -136,9 +136,9 @@ class DayFragment : Fragment(), DBHelper.EventsListener, AdapterView.OnItemClick
} }
} }
private fun editEvent(event: Event) { private fun editEvent(eventId: Int) {
val intent = Intent(activity.applicationContext, EventActivity::class.java) val intent = Intent(activity.applicationContext, EventActivity::class.java)
intent.putExtra(Constants.EVENT, event) intent.putExtra(Constants.EVENT_ID, eventId)
startActivityForResult(intent, EDIT_EVENT) startActivityForResult(intent, EDIT_EVENT)
} }
@@ -221,7 +221,7 @@ class DayFragment : Fragment(), DBHelper.EventsListener, AdapterView.OnItemClick
} }
override fun onItemClick(parent: AdapterView<*>, view: View, position: Int, id: Long) { override fun onItemClick(parent: AdapterView<*>, view: View, position: Int, id: Long) {
editEvent(getEventsToShow(mEvents!!)[position]) editEvent(getEventsToShow(mEvents!!)[position].id)
} }
override fun eventInserted(event: Event) { override fun eventInserted(event: Event) {