implement Event editing

app/src/main/AndroidManifest.xml

@@ -34,7 +34,7 @@
             android:screenOrientation="portrait"/>
 
         <activity
-            android:name=".activities.DetailsActivity"
+            android:name=".activities.DayActivity"
             android:label="@string/details"
             android:screenOrientation="portrait"/>
 

app/src/main/java/com/simplemobiletools/calendar/CalendarImpl.java

@@ -22,7 +22,7 @@ public class CalendarImpl implements DBHelper.DBOperationsListener {
     private List<Event> mEvents;
 
     public CalendarImpl(Calendar callback, Context context) {
-        this.mCallback = callback;
+        mCallback = callback;
         mContext = context;
         mToday = new DateTime().toString(Formatter.DAYCODE_PATTERN);
     }
@@ -80,8 +80,8 @@ public class CalendarImpl implements DBHelper.DBOperationsListener {
     }
 
     private boolean hasEvent(String dayCode) {
-        for (Event e : mEvents) {
+        for (Event event : mEvents) {
-            if (Formatter.getDayCodeFromTS(e.getStartTS()).equals(dayCode)) {
+            if (Formatter.getDayCodeFromTS(event.getStartTS()).equals(dayCode)) {
                 return true;
             }
         }
@@ -111,6 +111,11 @@ public class CalendarImpl implements DBHelper.DBOperationsListener {
 
     }
 
+    @Override
+    public void eventUpdated() {
+
+    }
+
     @Override
     public void gotEvents(List<Event> events) {
         mEvents = events;

app/src/main/java/com/simplemobiletools/calendar/Constants.java

@@ -10,4 +10,5 @@ public class Constants {
     public static final String WIDGET_TEXT_COLOR = "widget_text_color";
 
     public static final String DAY_CODE = "day_code";
+    public static final String EVENT = "event";
 }

app/src/main/java/com/simplemobiletools/calendar/DBHelper.java

@@ -52,13 +52,26 @@ public class DBHelper extends SQLiteOpenHelper {
     }
 
     public void insert(Event event) {
+        final ContentValues values = fillContentValues(event);
+        mDb.insert(TABLE_NAME, null, values);
+        mCallback.eventInserted();
+    }
+
+    public void update(Event event) {
+        final ContentValues values = fillContentValues(event);
+        final String selection = COL_ID + " = ?";
+        final String[] selectionArgs = {String.valueOf(event.getId())};
+        mDb.update(TABLE_NAME, values, selection, selectionArgs);
+        mCallback.eventUpdated();
+    }
+
+    private ContentValues fillContentValues(Event event) {
         final ContentValues values = new ContentValues();
         values.put(COL_START_TS, event.getStartTS());
         values.put(COL_END_TS, event.getEndTS());
         values.put(COL_TITLE, event.getTitle());
         values.put(COL_DESCRIPTION, event.getDescription());
-        mDb.insert(TABLE_NAME, null, values);
+        return values;
-        mCallback.eventInserted();
     }
 
     public void getEvents(int fromTS, int toTS) {
@@ -86,6 +99,8 @@ public class DBHelper extends SQLiteOpenHelper {
     public interface DBOperationsListener {
         void eventInserted();
 
+        void eventUpdated();
+
         void gotEvents(List<Event> events);
     }
 }

app/src/main/java/com/simplemobiletools/calendar/Formatter.java

@@ -27,13 +27,18 @@ public class Formatter {
         return dateTimeFormatter.parseDateTime(dayCode);
     }
 
+    public static DateTime getLocalDateTimeFromCode(String dayCode) {
+        final DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(DAYCODE_PATTERN).withZone(DateTimeZone.getDefault());
+        return dateTimeFormatter.parseDateTime(dayCode);
+    }
+
     public static String getTime(int ts) {
-        final DateTime dateTime = new DateTime(ts * 1000L, DateTimeZone.UTC);
+        final DateTime dateTime = new DateTime(ts * 1000L, DateTimeZone.getDefault());
         return getEventTime(dateTime);
     }
 
     public static int getDayStartTS(String dayCode) {
-        final DateTime dateTime = getDateTimeFromCode(dayCode);
+        final DateTime dateTime = getLocalDateTimeFromCode(dayCode);
         return (int) (dateTime.getMillis() / 1000);
     }
 

app/src/main/java/com/simplemobiletools/calendar/activities/DayActivity.java

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -20,27 +21,28 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-public class DetailsActivity extends AppCompatActivity implements DBHelper.DBOperationsListener {
+public class DayActivity extends AppCompatActivity implements DBHelper.DBOperationsListener, AdapterView.OnItemClickListener {
-    @BindView(R.id.details_date) TextView mDateTV;
+    @BindView(R.id.day_date) TextView mDateTV;
-    @BindView(R.id.details_events) ListView mEventsList;
+    @BindView(R.id.day_events) ListView mEventsList;
 
-    private String dayCode;
+    private static String mDayCode;
+    private static List<Event> mEvents;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_details);
+        setContentView(R.layout.activity_day);
         ButterKnife.bind(this);
 
         final Intent intent = getIntent();
         if (intent == null)
             return;
 
-        dayCode = intent.getStringExtra(Constants.DAY_CODE);
+        mDayCode = intent.getStringExtra(Constants.DAY_CODE);
-        if (dayCode == null || dayCode.isEmpty())
+        if (mDayCode == null || mDayCode.isEmpty())
             return;
 
-        final String date = Formatter.getEventDate(dayCode);
+        final String date = Formatter.getEventDate(mDayCode);
         mDateTV.setText(date);
     }
 
@@ -50,22 +52,30 @@ public class DetailsActivity extends AppCompatActivity implements DBHelper.DBOpe
         checkEvents();
     }
 
-    @OnClick(R.id.details_fab)
+    @OnClick(R.id.day_fab)
     public void fabClicked(View view) {
         final Intent intent = new Intent(getApplicationContext(), EventActivity.class);
-        intent.putExtra(Constants.DAY_CODE, dayCode);
+        intent.putExtra(Constants.DAY_CODE, mDayCode);
+        startActivity(intent);
+    }
+
+    private void editEvent(Event event) {
+        final Intent intent = new Intent(getApplicationContext(), EventActivity.class);
+        intent.putExtra(Constants.EVENT, event);
         startActivity(intent);
     }
 
     private void checkEvents() {
-        final int startTS = Formatter.getDayStartTS(dayCode);
+        final int startTS = Formatter.getDayStartTS(mDayCode);
-        final int endTS = Formatter.getDayEndTS(dayCode);
+        final int endTS = Formatter.getDayEndTS(mDayCode);
         DBHelper.newInstance(getApplicationContext(), this).getEvents(startTS, endTS);
     }
 
     private void updateEvents(List<Event> events) {
         final EventsAdapter adapter = new EventsAdapter(this, events);
         mEventsList.setAdapter(adapter);
+        mEventsList.setOnItemClickListener(this);
+        mEvents = events;
     }
 
     @Override
@@ -73,8 +83,18 @@ public class DetailsActivity extends AppCompatActivity implements DBHelper.DBOpe
 
     }
 
+    @Override
+    public void eventUpdated() {
+
+    }
+
     @Override
     public void gotEvents(List<Event> events) {
         updateEvents(events);
     }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        editEvent(mEvents.get(position));
+    }
 }

app/src/main/java/com/simplemobiletools/calendar/activities/EventActivity.java

@@ -21,6 +21,7 @@ import com.simplemobiletools.calendar.Utils;
 import com.simplemobiletools.calendar.models.Event;
 
 import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
 
 import java.util.List;
 
@@ -38,6 +39,7 @@ public class EventActivity extends AppCompatActivity implements DBHelper.DBOpera
 
     private DateTime mEventStartDateTime;
     private DateTime mEventEndDateTime;
+    private Event mEvent;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -49,19 +51,37 @@ public class EventActivity extends AppCompatActivity implements DBHelper.DBOpera
         if (intent == null)
             return;
 
-        final String dayCode = intent.getStringExtra(Constants.DAY_CODE);
+        final Event event = (Event) intent.getSerializableExtra(Constants.EVENT);
-        if (dayCode == null || dayCode.isEmpty())
+        if (event != null) {
-            return;
+            mEvent = event;
+            setupEditEvent();
+        } else {
+            mEvent = new Event();
+            final String dayCode = intent.getStringExtra(Constants.DAY_CODE);
+            if (dayCode == null || dayCode.isEmpty())
+                return;
+
+            setupNewEvent(dayCode);
+        }
 
-        mEventStartDateTime = Formatter.getDateTimeFromCode(dayCode).withHourOfDay(13);
         updateStartDate();
         updateStartTime();
-
-        mEventEndDateTime = Formatter.getDateTimeFromCode(dayCode).withHourOfDay(14);
         updateEndDate();
         updateEndTime();
     }
 
+    private void setupEditEvent() {
+        mEventStartDateTime = new DateTime(mEvent.getStartTS() * 1000L, DateTimeZone.getDefault());
+        mEventEndDateTime = new DateTime(mEvent.getEndTS() * 1000L, DateTimeZone.getDefault());
+        mTitleET.setText(mEvent.getTitle());
+        mDescriptionET.setText(mEvent.getDescription());
+    }
+
+    private void setupNewEvent(String dayCode) {
+        mEventStartDateTime = Formatter.getDateTimeFromCode(dayCode).withZone(DateTimeZone.getDefault()).withHourOfDay(13);
+        mEventEndDateTime = Formatter.getDateTimeFromCode(dayCode).withZone(DateTimeZone.getDefault()).withHourOfDay(14);
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_event, menu);
@@ -95,9 +115,17 @@ public class EventActivity extends AppCompatActivity implements DBHelper.DBOpera
             return;
         }
 
+        final DBHelper dbHelper = DBHelper.newInstance(getApplicationContext(), this);
         final String description = mDescriptionET.getText().toString().trim();
-        final Event event = new Event(0, startTS, endTS, title, description);
+        mEvent.setStartTS(startTS);
-        DBHelper.newInstance(getApplicationContext(), this).insert(event);
+        mEvent.setEndTS(endTS);
+        mEvent.setTitle(title);
+        mEvent.setDescription(description);
+        if (mEvent.getId() == 0) {
+            dbHelper.insert(mEvent);
+        } else {
+            dbHelper.update(mEvent);
+        }
     }
 
     private void updateStartDate() {
@@ -193,6 +221,12 @@ public class EventActivity extends AppCompatActivity implements DBHelper.DBOpera
         finish();
     }
 
+    @Override
+    public void eventUpdated() {
+        Utils.showToast(getApplicationContext(), R.string.event_updated);
+        finish();
+    }
+
     @Override
     public void gotEvents(List<Event> events) {
 

app/src/main/java/com/simplemobiletools/calendar/activities/MainActivity.java

@@ -137,17 +137,17 @@ public class MainActivity extends AppCompatActivity implements Calendar {
             dayTV.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    openDetails(day.getCode());
+                    openDay(day.getCode());
                 }
             });
         }
     }
 
-    private void openDetails(String code) {
+    private void openDay(String code) {
         if (code.isEmpty())
             return;
 
-        final Intent intent = new Intent(getApplicationContext(), DetailsActivity.class);
+        final Intent intent = new Intent(getApplicationContext(), DayActivity.class);
         intent.putExtra(Constants.DAY_CODE, code);
         startActivity(intent);
     }

app/src/main/java/com/simplemobiletools/calendar/models/Event.java

@@ -1,11 +1,22 @@
 package com.simplemobiletools.calendar.models;
 
-public class Event {
+import java.io.Serializable;
+
+public class Event implements Serializable {
+    private static final long serialVersionUID = -32456795132354616L;
     private final int mId;
-    private final int mStartTS;
+    private int mStartTS;
-    private final int mEndTS;
+    private int mEndTS;
-    private final String mTitle;
+    private String mTitle;
-    private final String mDescription;
+    private String mDescription;
+
+    public Event() {
+        mId = 0;
+        mStartTS = 0;
+        mEndTS = 0;
+        mTitle = "";
+        mDescription = "";
+    }
 
     public Event(int id, int startTS, int endTS, String title, String description) {
         mId = id;
@@ -23,18 +34,34 @@ public class Event {
         return mStartTS;
     }
 
+    public void setStartTS(int startTS) {
+        mStartTS = startTS;
+    }
+
     public int getEndTS() {
         return mEndTS;
     }
 
+    public void setEndTS(int endTS) {
+        mEndTS = endTS;
+    }
+
     public String getTitle() {
         return mTitle;
     }
 
+    public void setTitle(String title) {
+        mTitle = title;
+    }
+
     public String getDescription() {
         return mDescription;
     }
 
+    public void setDescription(String description) {
+        mDescription = description;
+    }
+
     @Override
     public String toString() {
         return "Event {" +

app/src/main/res/layout/activity_day.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout
-    android:id="@+id/details_coordinator"
+    android:id="@+id/day_coordinator"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/activity_margin">
 
     <RelativeLayout
-        android:id="@+id/details_holder"
+        android:id="@+id/day_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <TextView
-            android:id="@+id/details_date"
+            android:id="@+id/day_date"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/activity_margin"
@@ -21,14 +21,14 @@
             android:textSize="@dimen/month_text_size"/>
 
         <ListView
-            android:id="@+id/details_events"
+            android:id="@+id/day_events"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/details_date"/>
+            android:layout_below="@+id/day_date"/>
     </RelativeLayout>
 
     <android.support.design.widget.FloatingActionButton
-        android:id="@+id/details_fab"
+        android:id="@+id/day_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"

app/src/main/res/values/strings.xml

@@ -7,8 +7,9 @@
     <string name="title_empty">Title cannot be empty</string>
     <string name="end_before_start">The event cannot end earlier than it starts</string>
     <string name="event_added">Event added successfully</string>
+    <string name="event_updated">Event updated successfully</string>
 
-    <!-- Details -->
+    <!-- Day details -->
     <string name="details">Details</string>
     <string name="title">Title</string>
     <string name="start">Start</string>