From 171ffc5a7a141a9dc139672b077c4009ab68a622 Mon Sep 17 00:00:00 2001 From: Naiki00 Date: Tue, 16 Feb 2021 15:30:03 +0100 Subject: [PATCH] =?UTF-8?q?naprawiono=20wy=C5=9Bwietlanie=20notatki=20wg?= =?UTF-8?q?=20kolejno=C5=9Bci=20dodawania=20na=20g=C5=82=C3=B3wnym=20ekran?= =?UTF-8?q?ie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/notatkon/dao/NoteDao.java | 7 +- .../com/example/notatkon/note/CreateNote.java | 2 +- .../example/notatkon/note/MainActivity.java | 73 +++---------------- app/src/main/res/drawable/background_note.xml | 2 +- app/src/main/res/layout/activity_main.xml | 4 +- app/src/main/res/layout/create_note.xml | 8 +- app/src/main/res/layout/view_note.xml | 30 +++----- 7 files changed, 37 insertions(+), 89 deletions(-) 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 ef6a7a5..f72626a 100644 --- a/app/src/main/java/com/example/notatkon/dao/NoteDao.java +++ b/app/src/main/java/com/example/notatkon/dao/NoteDao.java @@ -14,12 +14,15 @@ import java.util.List; @Dao public interface NoteDao { - @Query("SELECT * FROM note_table") + @Query("SELECT * FROM note_table ORDER BY id DESC") List getNotes(); - @Insert(onConflict = OnConflictStrategy.IGNORE) + @Insert(onConflict = OnConflictStrategy.REPLACE) void insert(NoteEntity noteEntity); @Delete() void delete(NoteEntity noteEntity); + + @Query("DELETE FROM note_Table") + void deleteAll(); } 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 a4cade3..7d259b8 100644 --- a/app/src/main/java/com/example/notatkon/note/CreateNote.java +++ b/app/src/main/java/com/example/notatkon/note/CreateNote.java @@ -38,6 +38,7 @@ public class CreateNote extends AppCompatActivity { imageBack.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + onBackPressed(); } }); @@ -88,7 +89,6 @@ public class CreateNote extends AppCompatActivity { finish(); } } - new SaveNoteTask().execute(); } 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 e15b230..d338596 100644 --- a/app/src/main/java/com/example/notatkon/note/MainActivity.java +++ b/app/src/main/java/com/example/notatkon/note/MainActivity.java @@ -1,5 +1,6 @@ package com.example.notatkon.note; +import android.annotation.SuppressLint; import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; @@ -20,6 +21,11 @@ import com.example.notatkon.note.CreateNote; import java.util.ArrayList; import java.util.List; +/* +https://developer.android.com/guide/components/activities/activity-lifecycle +https://developer.android.com/training/basics/intents/result +*/ + public class MainActivity extends AppCompatActivity { private static final int REQUEST_CODE_NEW_NOTE = 1; @@ -41,47 +47,18 @@ public class MainActivity extends AppCompatActivity { ); }); - - //Toolbar toolbar = findViewById(R.id.toolbar); - //setSupportActionBar(toolbar); - - /* - https://developer.android.com/guide/components/activities/activity-lifecycle - https://developer.android.com/training/basics/intents/result - */ - - - /* wersja z fab - FloatingActionButton fab = findViewById(R.id.fab); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - startActivityForResult(intent, REQUEST_CODE_NEW_NOTE); - - //Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) - // .setAction("Action", null).show(); - } - }); - - */ - //-- Pierwsza wersja apki -- //metody //https://developer.android.com/reference/androidx/recyclerview/widget/RecyclerView#next-steps - noteRecycler = (RecyclerView) findViewById(R.id.notes); + noteRecycler = findViewById(R.id.notes); //ustaw LayoutManagera wertykalnie //recyclerView.setLayoutManager(new LinearLayoutManager(this)); - //ustaw LayoutManagera horyzontalnie noteRecycler.setLayoutManager( new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL) ); - - //wczytaj listę z klasy Note oraz dodaj obiekt jej klasy - noteEntityList = new ArrayList<>(); - //połącz Adapter z RecycleView noteAdapter = new NoteAdapter(noteEntityList); noteRecycler.setAdapter(noteAdapter); @@ -89,40 +66,10 @@ public class MainActivity extends AppCompatActivity { getAllNotes(); } - - - - - - - /* - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.menu_main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } - - */ - //pobranie notatek z bazy i wyswietlanie na ekranie private void getAllNotes() { + @SuppressLint("StaticFieldLeak") class GetNotesTask extends AsyncTask> { @Override @@ -136,7 +83,7 @@ public class MainActivity extends AppCompatActivity { @Override protected void onPostExecute(List noteEntities) { super.onPostExecute(noteEntities); - Log.d("NOTES", noteEntities.toString()); + //Log.d("NOTES", noteEntities.toString()); if (noteEntityList.size() == 0) { noteEntityList.addAll(noteEntities); noteAdapter.notifyDataSetChanged(); @@ -153,7 +100,7 @@ public class MainActivity extends AppCompatActivity { @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == REQUEST_CODE_NEW_NOTE && requestCode == RESULT_OK) { + if (requestCode == REQUEST_CODE_NEW_NOTE && resultCode == RESULT_OK) { getAllNotes(); } } diff --git a/app/src/main/res/drawable/background_note.xml b/app/src/main/res/drawable/background_note.xml index e25b2f0..847b2da 100644 --- a/app/src/main/res/drawable/background_note.xml +++ b/app/src/main/res/drawable/background_note.xml @@ -3,6 +3,6 @@ android:shape="rectangle"> - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index acfb2f1..3a69670 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="#f7f7f7" - tools:context=".MainActivity"> + tools:context=".note.MainActivity">