From 6ba51b80d112409ffe7e85f159e3cd2a2a60c35d Mon Sep 17 00:00:00 2001
From: Naiki00 <nicrad@st.amu.edu.pl>
Date: Tue, 16 Feb 2021 12:04:30 +0100
Subject: [PATCH] dodawanie i pobieranie notatki do bazy

---
 .../main/java/com/example/notatkon/adapter/NoteAdapter.java | 2 +-
 app/src/main/java/com/example/notatkon/dao/NoteDao.java     | 2 +-
 .../main/java/com/example/notatkon/entities/NoteEntity.java | 3 ++-
 app/src/main/java/com/example/notatkon/note/CreateNote.java | 6 +++---
 .../main/java/com/example/notatkon/note/MainActivity.java   | 6 ++++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/example/notatkon/adapter/NoteAdapter.java b/app/src/main/java/com/example/notatkon/adapter/NoteAdapter.java
index 97cf730..805f721 100644
--- a/app/src/main/java/com/example/notatkon/adapter/NoteAdapter.java
+++ b/app/src/main/java/com/example/notatkon/adapter/NoteAdapter.java
@@ -75,6 +75,6 @@ public class NoteAdapter extends RecyclerView.Adapter<NoteAdapter.ViewHolder>{
 
     @Override
     public int getItemViewType(int position) {
-        return super.getItemViewType(position);
+        return position;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/notatkon/dao/NoteDao.java b/app/src/main/java/com/example/notatkon/dao/NoteDao.java
index 2f1f1ee..ef6a7a5 100644
--- a/app/src/main/java/com/example/notatkon/dao/NoteDao.java
+++ b/app/src/main/java/com/example/notatkon/dao/NoteDao.java
@@ -15,7 +15,7 @@ import java.util.List;
 public interface NoteDao {
 
     @Query("SELECT * FROM note_table")
-    LiveData<List<NoteEntity>> getNotes();
+    List<NoteEntity> getNotes();
 
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     void insert(NoteEntity noteEntity);
diff --git a/app/src/main/java/com/example/notatkon/entities/NoteEntity.java b/app/src/main/java/com/example/notatkon/entities/NoteEntity.java
index 6d51903..a40d295 100644
--- a/app/src/main/java/com/example/notatkon/entities/NoteEntity.java
+++ b/app/src/main/java/com/example/notatkon/entities/NoteEntity.java
@@ -5,6 +5,7 @@ import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
 
+import java.io.Serializable;
 import java.util.Random;
 
 /*
@@ -14,7 +15,7 @@ https://developer.android.com/codelabs/android-room-with-a-view#4
 */
 
 @Entity(tableName = "note_table")
-public class NoteEntity {
+public class NoteEntity implements Serializable {
 
     @PrimaryKey
     @ColumnInfo(name = "id")
diff --git a/app/src/main/java/com/example/notatkon/note/CreateNote.java b/app/src/main/java/com/example/notatkon/note/CreateNote.java
index 990becd..a4cade3 100644
--- a/app/src/main/java/com/example/notatkon/note/CreateNote.java
+++ b/app/src/main/java/com/example/notatkon/note/CreateNote.java
@@ -1,4 +1,4 @@
-package com.example.notatkon;
+package com.example.notatkon.note;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -8,11 +8,11 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.example.notatkon.database.NoteEntity;
+import com.example.notatkon.R;
+import com.example.notatkon.entities.NoteEntity;
 import com.example.notatkon.database.NoteRoomDatabase;
 
 import java.text.SimpleDateFormat;
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 f1668c6..322a156 100644
--- a/app/src/main/java/com/example/notatkon/note/MainActivity.java
+++ b/app/src/main/java/com/example/notatkon/note/MainActivity.java
@@ -31,6 +31,8 @@ public class MainActivity extends AppCompatActivity {
                     REQUEST_CODE_NEW_NOTE
             );
         });
+
+        getAllNotes();
     }
 
         //Toolbar toolbar = findViewById(R.id.toolbar);
@@ -103,14 +105,14 @@ public class MainActivity extends AppCompatActivity {
      */
 
     //pobranie notatek z bazy i wyswietlanie na ekranie
-    private void getNotes() {
+    private void getAllNotes() {
 
         class GetNotesTask extends AsyncTask<Void, Void, List<NoteEntity>> {
 
             @Override
             protected List<NoteEntity> doInBackground(Void... voids) {
                 //return null;
-                return (List<NoteEntity>) NoteRoomDatabase
+                return NoteRoomDatabase
                         .getNoteRoomDatabase(getApplicationContext())
                         .noteDao().getNotes();
             }