Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f11bdd1 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Show relative modified Date on NoteActivity, Fixed editing note.

parent 848ccfd3

app/src/main/java/it/niedermann/owncloud/notes/android/activity/NoteActivity.java

+3 −9
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ import android.content.Intent; 
import android.os.Bundle;

import android.os.Bundle;

import android.support.v7.app.ActionBar;

import android.support.v7.app.ActionBar;

import android.support.v7.app.AppCompatActivity;

import android.support.v7.app.AppCompatActivity;

import android.text.format.DateUtils;

import android.view.Menu;

import android.view.Menu;

import android.view.MenuItem;

import android.view.MenuItem;

import android.view.View;

import android.view.View;
@@ -14,7 +15,6 @@ import it.niedermann.owncloud.notes.model.Note; 
import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;

import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;





public class NoteActivity extends AppCompatActivity implements View.OnClickListener {

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 String EDIT_NOTE = "it.niedermann.owncloud.notes.edit_note_id";

    public final static int EDIT_NOTE_CMD = 1;

    public final static int EDIT_NOTE_CMD = 1;

    private Note note = null;

    private Note note = null;
@@ -34,16 +34,11 @@ public class NoteActivity extends AppCompatActivity implements View.OnClickListe 
        actionBar = getSupportActionBar();

        actionBar = getSupportActionBar();

        if (actionBar != null) {

        if (actionBar != null) {

            actionBar.setTitle(note.getTitle());

            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 = (TextView) findViewById(R.id.single_note_content);

        noteContent.setText(note.getSpannableContent());

        noteContent.setText(note.getSpannableContent());

        findViewById(R.id.fab_edit).setOnClickListener(new View.OnClickListener() {

        findViewById(R.id.fab_edit).setOnClickListener(this);

            @Override

            public void onClick(View v) {

                startActivity(new Intent(NoteActivity.this, EditNoteActivity.class));

            }

        });

    }

    }





    @Override

    @Override
@@ -72,7 +67,6 @@ public class NoteActivity extends AppCompatActivity implements View.OnClickListe 
        NoteSQLiteOpenHelper db;

        NoteSQLiteOpenHelper db;

        switch (id) {

        switch (id) {

            case R.id.menu_delete:

            case R.id.menu_delete:

                //setContentView(R.layout.activity_notes_list_view);

                db = new NoteSQLiteOpenHelper(this);

                db = new NoteSQLiteOpenHelper(this);

                db.deleteNoteAndSync(note.getId());

                db.deleteNoteAndSync(note.getId());

                finish();

                finish();

app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java

+2 −2

File changed.

Contains only whitespace changes.