mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-10-24 21:55:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

Show relative modified Date on NoteActivity, Fixed editing note.

Browse source
This commit is contained in:
Stefan Niedermann 2015-10-22 19:11:52 +02:00
parent 848ccfd316
commit 3f11bdd181
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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());

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

@ -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();