From 39f009e31a3cb0a8cc8c2ecb8a4e30a70f5b9ad5 Mon Sep 17 00:00:00 2001 From: Naiki00 Date: Wed, 17 Feb 2021 21:52:47 +0100 Subject: [PATCH] =?UTF-8?q?dodano=20kolejny=20request=20do=20pokazania=20n?= =?UTF-8?q?otatki=20-=20notatka=20po=20edycji=20pokazuje=20si=C4=99=20jako?= =?UTF-8?q?=20kolejna=20(nie=20edytuje=20z=20bazy)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/notatkon/note/MainActivity.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/example/notatkon/note/MainActivity.java b/app/src/main/java/com/example/notatkon/note/MainActivity.java index 3cd3bc2..c53d5e8 100644 --- a/app/src/main/java/com/example/notatkon/note/MainActivity.java +++ b/app/src/main/java/com/example/notatkon/note/MainActivity.java @@ -31,7 +31,7 @@ public class MainActivity extends AppCompatActivity implements NoteListener { public static final int REQUEST_CODE_NEW_NOTE = 1; public static final int REQUEST_EDIT_NOTE = 2; - //public static final int REQUEST_SHOW_NOTE = 3; + public static final int REQUEST_SHOW_NOTE = 3; private int notePosition = -1; @@ -68,7 +68,8 @@ public class MainActivity extends AppCompatActivity implements NoteListener { noteAdapter = new NoteAdapter(noteEntityList, this); noteRecycler.setAdapter(noteAdapter); - getAllNotes(); + // wyświetl na początku wszystkie notatki z bazy + getAllNotes(REQUEST_SHOW_NOTE); } @@ -81,8 +82,10 @@ public class MainActivity extends AppCompatActivity implements NoteListener { startActivityForResult(intent, REQUEST_EDIT_NOTE); } - //pobranie notatek z bazy i wyswietlanie na ekranie - private void getAllNotes() { + // pobranie notatek z bazy i wyswietlanie na ekranie + // przekazujemy request jako parametr by przekazać potem kod + // wyświetlajacy wszystkie notatki lub aktywność edycji notatki + private void getAllNotes(int requestCode) { @SuppressLint("StaticFieldLeak") class GetNotesTask extends AsyncTask> { @@ -115,8 +118,13 @@ public class MainActivity extends AppCompatActivity implements NoteListener { @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); + // sprawdzamy request i przechodzimy do odpowiedniego widoku if (requestCode == REQUEST_CODE_NEW_NOTE && resultCode == RESULT_OK) { - getAllNotes(); + getAllNotes(REQUEST_CODE_NEW_NOTE); + } else if (requestCode == REQUEST_EDIT_NOTE && resultCode == RESULT_OK) { + if(data != null) { + getAllNotes(REQUEST_EDIT_NOTE); + } } } } \ No newline at end of file