From 8d27949ed92f84df87e1c3ef9c19b3c85bad6447 Mon Sep 17 00:00:00 2001
From: Naiki00 <nicrad@st.amu.edu.pl>
Date: Mon, 15 Feb 2021 23:50:32 +0100
Subject: [PATCH] ArrayList na List, poprawiono metode getItemViewType

---
 .../example/notatkon/adapter/NoteAdapter.java | 19 +++++--------
 app/src/main/res/layout/fragment_first.xml    | 28 -------------------
 app/src/main/res/layout/fragment_second.xml   | 27 ------------------
 3 files changed, 7 insertions(+), 67 deletions(-)
 delete mode 100644 app/src/main/res/layout/fragment_first.xml
 delete mode 100644 app/src/main/res/layout/fragment_second.xml

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 bddffb9..97cf730 100644
--- a/app/src/main/java/com/example/notatkon/adapter/NoteAdapter.java
+++ b/app/src/main/java/com/example/notatkon/adapter/NoteAdapter.java
@@ -1,4 +1,4 @@
-package com.example.notatkon.note;
+package com.example.notatkon.adapter;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -7,28 +7,23 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.Adapter;
 
 import com.example.notatkon.R;
-import com.example.notatkon.database.NoteEntity;
-
-import org.w3c.dom.Text;
+import com.example.notatkon.entities.NoteEntity;
 
 import java.util.ArrayList;
+import java.util.List;
 
 //https://developer.android.com/guide/topics/ui/layout/recyclerview
 
 /* Aby klasa była adapterem musi dziedziczyć po RecyclerView.Adapter oraz wskazywać na ViewHolder */
 public class NoteAdapter extends RecyclerView.Adapter<NoteAdapter.ViewHolder>{
 
-    private ArrayList<NoteEntity> arrNotes = new ArrayList<>();
-
-    //obiekt listy notatek
-    //private RecyclerView noteRecyclerView;
+    private List<NoteEntity> listNotes;
 
     //konstruktor
     public NoteAdapter(ArrayList<NoteEntity> arrNotes) {
-        this.arrNotes = arrNotes;
+        this.listNotes = arrNotes;
     }
 
     //implementacja ViewHoldera
@@ -70,12 +65,12 @@ public class NoteAdapter extends RecyclerView.Adapter<NoteAdapter.ViewHolder>{
     ///// Replace the contents of a view (invoked by the layout manager)
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        holder.setNote(arrNotes.get(position));
+        holder.setNote(listNotes.get(position));
     }
 
     @Override
     public int getItemCount() {
-        return arrNotes.size();
+        return listNotes.size();
     }
 
     @Override
diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml
deleted file mode 100644
index 5d1c943..0000000
--- a/app/src/main/res/layout/fragment_first.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".FirstFragment">
-
-    <TextView
-        android:id="@+id/textview_first"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/hello_first_fragment"
-        app:layout_constraintBottom_toTopOf="@id/button_first"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/button_first"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/next"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/textview_first" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_second.xml b/app/src/main/res/layout/fragment_second.xml
deleted file mode 100644
index cadf858..0000000
--- a/app/src/main/res/layout/fragment_second.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".SecondFragment">
-
-    <TextView
-        android:id="@+id/textview_second"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/button_second"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/button_second"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/previous"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/textview_second" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file