From 3f11bdd181fc7ef914e6329ca7082cb56e49a69d Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <stefan.niedermann@googlemail.com>
Date: Thu, 22 Oct 2015 19:11:52 +0200
Subject: [PATCH] Show relative modified Date on NoteActivity, Fixed editing
 note.

---
 .../notes/android/activity/EditNoteActivity.java     |  4 ++--
 .../notes/android/activity/NoteActivity.java         | 12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java
index d94cb06c..091fae73 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java
@@ -20,8 +20,8 @@ public class EditNoteActivity extends AppCompatActivity {
 		super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_edit);
         note = (Note) getIntent().getSerializableExtra(
-                NoteActivity.EDIT_NOTE);
-        content = (EditText) findViewById(R.id.editContent);
+				NoteActivity.EDIT_NOTE);
+		content = (EditText) findViewById(R.id.editContent);
         content.setEnabled(false);
         content.setText(note.getContent());
         content.setSelection(note.getContent().length());
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NoteActivity.java
index 6e4406f5..4a6aface 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NoteActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NoteActivity.java
@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.text.format.DateUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -14,7 +15,6 @@ import it.niedermann.owncloud.notes.model.Note;
 import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
 
 public class NoteActivity extends AppCompatActivity implements View.OnClickListener {
-    // Intent backToListViewIntent = null;
     public final static String EDIT_NOTE = "it.niedermann.owncloud.notes.edit_note_id";
     public final static int EDIT_NOTE_CMD = 1;
     private Note note = null;
@@ -34,16 +34,11 @@ public class NoteActivity extends AppCompatActivity implements View.OnClickListe
         actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setTitle(note.getTitle());
-            actionBar.setSubtitle(note.getModified("dd.MM.yyyy HH:mm"));
+            actionBar.setSubtitle(DateUtils.getRelativeDateTimeString(getApplicationContext(), note.getModified().getTimeInMillis(), DateUtils.MINUTE_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0));
         }
         noteContent = (TextView) findViewById(R.id.single_note_content);
         noteContent.setText(note.getSpannableContent());
-        findViewById(R.id.fab_edit).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(NoteActivity.this, EditNoteActivity.class));
-            }
-        });
+        findViewById(R.id.fab_edit).setOnClickListener(this);
     }
 
     @Override
@@ -72,7 +67,6 @@ public class NoteActivity extends AppCompatActivity implements View.OnClickListe
         NoteSQLiteOpenHelper db;
         switch (id) {
             case R.id.menu_delete:
-                //setContentView(R.layout.activity_notes_list_view);
                 db = new NoteSQLiteOpenHelper(this);
                 db.deleteNoteAndSync(note.getId());
                 finish();