Skip to content

M
My notepad
Commit c59240c2 authored by 9731301's avatar 9731301
Browse files
Options

add a entity for calender to save data

parent fc7aee34
Hide whitespace changes
Inline Side-by-side
Showing with 289 additions and 83 deletions
app/src/main/java/com/example/mynotepad/MainActivity.java
View file @ c59240c2
package com.example.mynotepad;
import androidx.appcompat.app.AppCompatActivity;
import androidx.room.Room;
import android.os.Bundle;
import android.view.Gravity;
......@@ -9,15 +10,17 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.example.mynotepad.Menu.CustomMenu;
import com.example.mynotepad.MenuFeatures.AllNotes.NotesDataBase.NoteDataBase;
import com.example.mynotepad.MenuFeatures.Information.InfoClickListener;
import com.example.mynotepad.MenuFeatures.Information.Information;
public class MainActivity extends AppCompatActivity implements View.OnClickListener {
ImageView toolbarListImg;
CustomMenu customMenu;
TextView wlcTxt;
Information informationView;
private ImageView toolbarListImg;
private CustomMenu customMenu;
private TextView wlcTxt;
private Information informationView;
public static NoteDataBase noteDataBase;
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -37,6 +40,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
}
private void init() {
noteDataBase = Room.databaseBuilder(this, NoteDataBase.class, "RoomDb").allowMainThreadQueries().build();
customMenu = findViewById(R.id.mainListItem);
customMenu.setVisibility(customMenu.GONE);
wlcTxt = findViewById(R.id.wlcTxt);
......
app/src/main/java/com/example/mynotepad/MenuFeatures/AllNotes/AllNotesActivity.java
View file @ c59240c2
......@@ -15,6 +15,7 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import com.example.mynotepad.MainActivity;
import com.example.mynotepad.MenuFeatures.AllNotes.MyNoteRecyclerView.MyAllNotesAdaptor;
import com.example.mynotepad.MenuFeatures.AllNotes.MyNoteRecyclerView.MyNote;
import com.example.mynotepad.MenuFeatures.AllNotes.MyNoteRecyclerView.OnAllNotesItemClickListener;
......@@ -29,6 +30,8 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
import java.util.ArrayList;
import java.util.List;
import static com.example.mynotepad.MainActivity.noteDataBase;
public class AllNotesActivity extends AppCompatActivity {
private FrameLayout fragPlace;
......@@ -39,10 +42,9 @@ public class AllNotesActivity extends AppCompatActivity {
private FrameLayout allNoteToolBar;
private RecyclerView recyclerView;
private MyAllNotesAdaptor myAdaptor;
private List<Note> notes;
private List<Note> entityNotes;
private List<MyNote> myNotes;
public static MyNote myChosenNote;
public static NoteDataBase noteDataBase;
@Override
......@@ -53,8 +55,7 @@ public class AllNotesActivity extends AppCompatActivity {
}
private void init() {
// get data from database
noteDataBase = Room.databaseBuilder(this, NoteDataBase.class, "RoomDb").allowMainThreadQueries().build();
// get data from databas
setAllNoteListAndTitles();
customToolbarOption = findViewById(R.id.customToolbarOption);
......@@ -79,7 +80,6 @@ public class AllNotesActivity extends AppCompatActivity {
}
public void addListeners() {
addNoteButton.setOnClickListener(new View.OnClickListener() {
@Override
......@@ -88,7 +88,7 @@ public class AllNotesActivity extends AppCompatActivity {
}
});
// add listener to recyclerView
// add listener to recyclerView
myAdaptor.setOnItemClickListener(new OnAllNotesItemClickListener() {
@Override
public void onItemClicked(MyNote myNote) {
......@@ -119,46 +119,59 @@ public class AllNotesActivity extends AppCompatActivity {
customToolbarOption.setCustomToolbarOptionListener(new CustomToolbarOptionListener() {
@Override
public void onStarClicked(ImageView yellowS, ImageView blackS) {
if (yellowS.getVisibility() == View.VISIBLE){
yellowS.setVisibility(View.GONE);
blackS.setVisibility(View.VISIBLE);
myChosenNote.setAchieved(false);
}
else {
yellowS.setVisibility(View.VISIBLE);
blackS.setVisibility(View.GONE);
myChosenNote.setAchieved(true);
}
starClicked(yellowS, blackS);
}
@Override
public void onDeleteClicked(final ImageView imageView) {
AlertDialog.Builder alert = new AlertDialog.Builder(AllNotesActivity.this);
alert.setMessage("are you sure you wanna delete it ??? ");
alert.setPositiveButton("yes", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
noteDataBase.noteDao().deleteNote(notes.get(myNotes.indexOf(myChosenNote)));
init();
}
});
alert.setNegativeButton("no", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
dialogInterface.cancel();
}
});
alert.show();
deleteClicked(imageView);
}
@Override
public void onCloseClicked(ImageView imageView ) {
customToolbarOption.setVisibility(View.GONE);
allNoteToolBar.setVisibility(View.VISIBLE);
public void onCloseClicked() {
closeClicked();
}
});
}
private void closeClicked() {
customToolbarOption.setVisibility(View.GONE);
allNoteToolBar.setVisibility(View.VISIBLE);
}
private void deleteClicked(ImageView imageView) {
AlertDialog.Builder alert = new AlertDialog.Builder(AllNotesActivity.this);
alert.setMessage("are you sure you wanna delete it ??? ");
alert.setPositiveButton("yes", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
noteDataBase.noteDao().deleteNote(entityNotes.get(myNotes.indexOf(myChosenNote)));
init();
}
});
alert.setNegativeButton("no", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
dialogInterface.cancel();
}
});
alert.show();
allNoteToolBar.setVisibility(View.VISIBLE);
}
private void starClicked(ImageView yellowS, ImageView blackS) {
if (yellowS.getVisibility() == View.VISIBLE) {
yellowS.setVisibility(View.GONE);
blackS.setVisibility(View.VISIBLE);
myChosenNote.setAchieved(false);
} else {
yellowS.setVisibility(View.VISIBLE);
blackS.setVisibility(View.GONE);
myChosenNote.setAchieved(true);
}
}
private void showAddAlert() {
final AlertDialog.Builder alert = new AlertDialog.Builder(this);
......@@ -197,9 +210,9 @@ public class AllNotesActivity extends AppCompatActivity {
private void setAllNoteListAndTitles() {
notes = noteDataBase.noteDao().getAll();
entityNotes = noteDataBase.noteDao().getAll();
myNotes = new ArrayList<>();
for (Note note : notes) {
for (Note note : entityNotes) {
MyNote myNote = new MyNote(note.getTitle(), note.getDescription(), note.isAchieved());
myNotes.add(myNote);
}
......
app/src/main/java/com/example/mynotepad/MenuFeatures/AllNotes/Note/NoteFragment.java
View file @ c59240c2
......@@ -19,6 +19,8 @@ import com.example.mynotepad.MenuFeatures.AllNotes.NotesDataBase.Note;
import com.example.mynotepad.R;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import static com.example.mynotepad.MainActivity.noteDataBase;
/**
* A simple {@link Fragment} subclass.
* create an instance of this fragment.
......@@ -85,7 +87,7 @@ public class NoteFragment extends Fragment {
private void saveNote() {
note = new Note(titleTxt.getText().toString(), bodyTxt.getText().toString(), false);
AllNotesActivity.noteDataBase.noteDao().insertNote(note);
noteDataBase.noteDao().insertNote(note);
}
......
app/src/main/java/com/example/mynotepad/MenuFeatures/AllNotes/NotesDataBase/DateEntity.java 0 → 100644
View file @ c59240c2
package com.example.mynotepad.MenuFeatures.AllNotes.NotesDataBase;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.PrimaryKey;
@Entity
public class DateEntity {
@PrimaryKey(autoGenerate = true)
int ID;
@ColumnInfo(name = "date")
String date ;
@ColumnInfo(name = "description")
String description;
@ColumnInfo(name = "achieved")
boolean isAchieved;
public DateEntity(String date , String description , boolean isAchieved){
this.date = date;
this.description = description;
this.isAchieved = isAchieved;
}
public int getID() {
return ID;
}
public String getDate() {
return date;
}
public String getDescription() {
return description;
}
public boolean isAchieved(){
return isAchieved;
}
}
\ No newline at end of file
app/src/main/java/com/example/mynotepad/MenuFeatures/AllNotes/NotesDataBase/DateNoreDAO.java 0 → 100644
View file @ c59240c2
package com.example.mynotepad.MenuFeatures.AllNotes.NotesDataBase;
import androidx.room.Dao;
import androidx.room.Delete;
import androidx.room.Insert;
import androidx.room.Query;
import androidx.room.Update;
import java.util.List;
@Dao
public interface DateNoreDAO {
// a method list type
@Query("SELECT * FROM DateEntity")
List<DateEntity> getAllDateNotes();
//insert data in database
@Insert
void insertDateNote(DateEntity dateEntity);
@Delete
void deleteDateNote(DateEntity dateEntity);
@Update
void updateDateNote(DateEntity dateEntity);
}
app/src/main/java/com/example/mynotepad/MenuFeatures/AllNotes/NotesDataBase/NoteDAO.java
View file @ c59240c2
......@@ -25,4 +25,5 @@ public interface NoteDAO {
@Update
void updateNote(Note note);
}
\ No newline at end of file
app/src/main/java/com/example/mynotepad/MenuFeatures/AllNotes/NotesDataBase/NoteDataBase.java
View file @ c59240c2
......@@ -3,8 +3,9 @@ package com.example.mynotepad.MenuFeatures.AllNotes.NotesDataBase;
import androidx.room.Database;
import androidx.room.RoomDatabase;
@Database(entities = Note.class, version = 1)
@Database(entities = {Note.class, DateEntity.class},version = 1)
public abstract class NoteDataBase extends RoomDatabase {
public abstract NoteDAO noteDao();
public abstract DateNoreDAO dateNoreDAO();
}
app/src/main/java/com/example/mynotepad/MenuFeatures/Calender/MyCalenderActivity.java
View file @ c59240c2
......@@ -4,23 +4,33 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import com.example.mynotepad.MenuFeatures.AllNotes.Note.NoteFragment;
import com.example.mynotepad.MenuFeatures.AllNotes.NotesDataBase.DateEntity;
import com.example.mynotepad.MenuFeatures.Calender.MyCalenderRecyclerView.MyCalenderAdaptor;
import com.example.mynotepad.MenuFeatures.Calender.MyCalenderRecyclerView.OnCalenderItemClickListener;
import com.example.mynotepad.MenuFeatures.Calender.MyCalenderRecyclerView.TimePicker.DatePickerActivity;
import com.example.mynotepad.MenuFeatures.Calender.MyCalenderRecyclerView.TimePicker.MyDate;
import com.example.mynotepad.MenuFeatures.CustomToolbarOption;
import com.example.mynotepad.MenuFeatures.CustomToolbarOptionListener;
import com.example.mynotepad.R;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import java.util.ArrayList;
import java.util.List;
public class MyCalenderActivity extends AppCompatActivity implements View.OnClickListener {
import static com.example.mynotepad.MainActivity.noteDataBase;
public class MyCalenderActivity extends AppCompatActivity {
private FloatingActionButton addDateBtn;
private CustomToolbarOption customToolbarOption;
......@@ -30,6 +40,8 @@ public class MyCalenderActivity extends AppCompatActivity implements View.OnClic
private RecyclerView recyclerView;
private MyCalenderAdaptor myAdaptor;
private List<MyDate> myDates;
private List<DateEntity> entityDates;
private MyDate myChosenDateNote;
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -38,6 +50,12 @@ public class MyCalenderActivity extends AppCompatActivity implements View.OnClic
init();
}
@Override
protected void onResume() {
super.onResume();
init();
}
private void init() {
setAllNoteListAndTitles();
......@@ -64,18 +82,101 @@ public class MyCalenderActivity extends AppCompatActivity implements View.OnClic
}
private void addListeners() {
addDateBtn.setOnClickListener(this);
addDateBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
addNewDateAndDescription();
}
});
// add listener to recyclerView
myAdaptor.setOnCalenderItemClickListener(new OnCalenderItemClickListener() {
@Override
public void onItemClicked(MyDate myDate) {
myChosenDateNote = myDate;
//set noteFragment data
final Bundle bundle = new Bundle();
bundle.putString("title", myChosenDateNote.getDate());
bundle.putString("bodyTxt", myChosenDateNote.getDescription());
final NoteFragment newNoteFrag = new NoteFragment();
newNoteFrag.setArguments(bundle);
//change the fragment
/* fragPlace.setVisibility(View.VISIBLE);
allNoteListAndTitle.setVisibility(View.GONE);
addNoteButton.hide();
replaceFragment(newNoteFrag);*/
//toDo go to activity/fragment
}
@Override
public void onItemLongClicked(MyDate myDate) {
customToolbarOption.setVisibility(View.VISIBLE);
calenderToolbar.setVisibility(View.GONE);
myChosenDateNote = myDate;
}
});
//add listener to custom toolbar option and set being achieved or not to be saved in database
customToolbarOption.setCustomToolbarOptionListener(new CustomToolbarOptionListener() {
@Override
public void onStarClicked(ImageView yellowS, ImageView blackS) {
starClicked(yellowS, blackS);
}
@Override
public void onDeleteClicked(final ImageView imageView) {
deleteClicked(imageView);
}
@Override
public void onCloseClicked() {
closeClicked();
}
});
}
@Override
public void onClick(View view) {
if (view.getId() == addDateBtn.getId()) {
addNewDateAndDescription();
}
private void closeClicked() {
customToolbarOption.setVisibility(View.GONE);
calenderToolbar.setVisibility(View.VISIBLE);
}
private void deleteClicked(ImageView imageView) {
AlertDialog.Builder alert = new AlertDialog.Builder(MyCalenderActivity.this);
alert.setMessage("are you sure you wanna delete it ??? ");
alert.setPositiveButton("yes", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
noteDataBase.dateNoreDAO().deleteDateNote(entityDates.get(myDates.indexOf(myChosenDateNote)));
init();
}
});
alert.setNegativeButton("no", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
dialogInterface.cancel();
}
});
alert.show();
calenderToolbar.setVisibility(View.VISIBLE);
}
private void starClicked(ImageView yellowS, ImageView blackS) {
if (yellowS.getVisibility() == View.VISIBLE) {
yellowS.setVisibility(View.GONE);
blackS.setVisibility(View.VISIBLE);
myChosenDateNote.setAchieved(false);
} else {
yellowS.setVisibility(View.VISIBLE);
blackS.setVisibility(View.GONE);
myChosenDateNote.setAchieved(true);
}
}
private void addNewDateAndDescription() {
Intent intent = new Intent(MyCalenderActivity.this, DatePickerActivity.class);
startActivity(intent);
......@@ -83,7 +184,13 @@ public class MyCalenderActivity extends AppCompatActivity implements View.OnClic
private void setAllNoteListAndTitles() {
myDates = new ArrayList<>();
//todo get data from database
//get data from database to set in recyclerView
entityDates = noteDataBase.dateNoreDAO().getAllDateNotes();
myDates = new ArrayList<>();
for (DateEntity dateEntity : entityDates) {
MyDate myDate = new MyDate(dateEntity.getDate(), dateEntity.getDescription(), dateEntity.isAchieved());
myDates.add(myDate);
}
}
}
\ No newline at end of file
app/src/main/java/com/example/mynotepad/MenuFeatures/Calender/MyCalenderDataBase/DateEntity.java deleted 100644 → 0
View file @ fc7aee34
package com.example.mynotepad.MenuFeatures.Calender.MyCalenderDataBase;
public class DateEntity {
}
app/src/main/java/com/example/mynotepad/MenuFeatures/Calender/MyCalenderRecyclerView/MyCalenderAdaptor.java
View file @ c59240c2
......@@ -50,7 +50,7 @@ public class MyCalenderAdaptor extends RecyclerView.Adapter<MyCalenderAdaptor.Ca
public CalenderViewHolder(@NonNull View itemView) {
super(itemView);
dates = itemView.findViewById(R.id.titleTv);
dateTV = itemView.findViewById(R.id.titleTv);
descriptionTV = itemView.findViewById(R.id.descriptionTv);
isAchieved = false;
itemView.setOnClickListener(this);
......
app/src/main/java/com/example/mynotepad/MenuFeatures/Calender/MyCalenderRecyclerView/TimePicker/DatePickerActivity.java
View file @ c59240c2
......@@ -12,17 +12,22 @@ import android.widget.Toast;
import com.alirezaafkar.sundatepicker.DatePicker;
import com.alirezaafkar.sundatepicker.interfaces.DateSetListener;
import com.example.mynotepad.MenuFeatures.AllNotes.AllNotesActivity;
import com.example.mynotepad.MenuFeatures.Calender.Date;
import com.example.mynotepad.MenuFeatures.AllNotes.NotesDataBase.DateEntity;
import com.example.mynotepad.R;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;
import java.util.Calendar;
import static com.example.mynotepad.MainActivity.noteDataBase;
public class DatePickerActivity extends AppCompatActivity {
TextView chosenDate, description;
Date mDate;
private DateEntity dateEntity;
private TextView chosenDate, description;
private Date mDate;
private FloatingActionButton back;
@Override
......@@ -71,7 +76,7 @@ public class DatePickerActivity extends AppCompatActivity {
alert.setPositiveButton("yes", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
saveNote();
saveDateNote();
Toast.makeText(DatePickerActivity.this, "saved", Toast.LENGTH_SHORT).show();
finish();
}
......@@ -95,7 +100,9 @@ public class DatePickerActivity extends AppCompatActivity {
}
}
private void saveNote() {
private void saveDateNote() {
//todo save in data base
dateEntity = new DateEntity(chosenDate.getText().toString() , description.getText().toString() ,false);
noteDataBase.dateNoreDAO().insertDateNote(dateEntity);
}
}
\ No newline at end of file
app/src/main/java/com/example/mynotepad/MenuFeatures/CustomToolbarOption.java
View file @ c59240c2
......@@ -54,7 +54,7 @@ public class CustomToolbarOption extends LinearLayout implements View.OnClickLis
public void onClick(View view) {
if (customToolbarOptionListener != null){
if (view.getId() == closeImg.getId())
customToolbarOptionListener.onCloseClicked(closeImg);
customToolbarOptionListener.onCloseClicked();
if (view.getId() == deleteImg.getId())
customToolbarOptionListener.onDeleteClicked(deleteImg);
if (view.getId() == yellowStarImg.getId() || view.getId() == blackStarImg.getId())
......
app/src/main/java/com/example/mynotepad/MenuFeatures/CustomToolbarOptionListener.java
View file @ c59240c2
......@@ -6,5 +6,5 @@ import android.widget.ImageView;
public interface CustomToolbarOptionListener {
void onStarClicked(ImageView yellowS , ImageView blackS);
void onDeleteClicked(ImageView imageView);
void onCloseClicked(ImageView imageView);
void onCloseClicked();
}
app/src/main/res/layout/activity_date_picker.xml
View file @ c59240c2
......@@ -16,18 +16,18 @@
app:srcCompat="@drawable/index" />
<TextView
android:id="@+id/date1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/img"
android:layout_marginStart="50dp"
android:layout_marginLeft="50dp"
android:layout_marginTop="60dp"
android:enabled="false"
android:text="@string/date"
android:textSize="30dp"
android:id="@+id/date1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/img"
android:layout_marginStart="50dp"
android:layout_marginLeft="50dp"
android:layout_marginTop="60dp"
android:background="@drawable/background"
android:enabled="false"
android:text="@string/date"
android:textColor="#000000"
android:background="@drawable/background"/>
android:textSize="30dp" />
<TextView
android:id="@+id/chosenDate"
......@@ -39,9 +39,9 @@
android:layout_toRightOf="@+id/date1"
android:background="@drawable/title_background"
android:enabled="false"
android:textColor="#000000"
android:lines="1"
android:gravity="center"
android:lines="1"
android:textColor="#000000"
android:textSize="30dp" />
<TextView
......@@ -52,14 +52,13 @@
android:layout_marginStart="50dp"
android:layout_marginLeft="50dp"
android:layout_marginTop="60dp"
android:background="@drawable/background"
android:enabled="false"
android:text="@string/description"
android:textSize="30dp"
android:textColor="#000000"
android:background="@drawable/background"/>
android:textSize="30dp" />
<TextView
android:id="@+id/description"
<LinearLayout
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_below="@+id/date2"
......@@ -67,10 +66,17 @@
android:layout_marginLeft="50dp"
android:layout_marginTop="21dp"
android:background="@drawable/title_background"
android:lines="9"
android:enabled="true"
android:textColor="#000000"
android:textSize="20dp" />
>
<EditText
android:id="@+id/description"
android:layout_width="260dp"
android:layout_height="match_parent"
android:layout_marginLeft="20dp"
android:lines="9"
android:textColor="#000000" />
</LinearLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/calenderBackBtn"
android:layout_width="wrap_content"
......
app/src/main/res/layout/custom_allnotes_item.xml
View file @ c59240c2
......@@ -23,6 +23,7 @@
android:layout_height="0dp"
android:layout_weight="3"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:lines="3"
android:text="body text"
android:textSize="12dp" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment