Skip to content

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

change main activity design

parent a04cc19a
Hide whitespace changes
Inline Side-by-side
Showing with 191 additions and 159 deletions
app/src/main/AndroidManifest.xml
View file @ 3180d840
......@@ -15,7 +15,6 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MenuFeatures.Pics.PicsActivity"></activity>
<activity android:name=".MenuFeatures.Calender.MyCalenderRecyclerView.TimePicker.DatePickerActivity" />
<activity android:name=".MenuFeatures.Calender.MyCalenderActivity" />
<activity android:name=".MenuFeatures.VoiceMassages.VoiceMassagesActivity" />
<activity android:name=".MenuFeatures.AllNotes.AllNotesActivity" />
......
app/src/main/java/com/example/mynotepad/MainActivity.java
View file @ 3180d840
......@@ -10,7 +10,6 @@ import android.view.Gravity;
import android.view.MenuItem;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.example.mynotepad.MenuFeatures.AllArchivedNotes.ArchivedNotesActivity;
import com.example.mynotepad.MenuFeatures.AllNotes.AllNotesActivity;
import com.example.mynotepad.MenuFeatures.AllNotes.DataBase.NoteDataBase;
......@@ -22,7 +21,6 @@ import com.google.android.material.navigation.NavigationView;
public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
private TextView wlcTxt;
public static NoteDataBase noteDataBase;
@Override
......@@ -31,12 +29,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
setContentView(R.layout.activity_main);
init();
setWlcTxt();
}
private void init() {
noteDataBase = Room.databaseBuilder(this, NoteDataBase.class, "RoomDb").fallbackToDestructiveMigration().allowMainThreadQueries().build();
wlcTxt = findViewById(R.id.wlcTxt);
final DrawerLayout drawerLayout = findViewById(R.id.drawerLayout);
NavigationView navigationView = findViewById(R.id.main_menu);//menu drawer in ui
......@@ -54,10 +50,24 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
});
}
private void setWlcTxt() {
//ToDo with shared Prefrences in setting
//if () else()
wlcTxt.setText("welcome :)");
public void allNoteClicked(View view){
startActivity(new Intent(getApplicationContext(), AllNotesActivity.class));
}
public void onCalendarClicked(View view){
startActivity(new Intent(getApplicationContext(), MyCalenderActivity.class));
}
public void onVoiceMassagesClicked(View view){
startActivity(new Intent(getApplicationContext(), VoiceMassagesActivity.class));
}
public void noNotedPicsClicked(View view){
startActivity(new Intent(getApplicationContext(), PicsActivity.class));
}
public void onProgramsClicked(View view){
}
@SuppressLint("NonConstantResourceId")
......@@ -67,10 +77,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
int id = item.getItemId();
switch (id) {
case R.id.allNotes:{
startActivity(new Intent(getApplicationContext(), AllNotesActivity.class));
break;
}
case R.id.favorites:{
startActivity(new Intent(getApplicationContext(), ArchivedNotesActivity.class));
break;
......@@ -78,20 +84,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
case R.id.folders:{
break;
}
case R.id.calender:{
startActivity(new Intent(getApplicationContext(), MyCalenderActivity.class));
break;
}
case R.id.voiceMassages:{
startActivity(new Intent(getApplicationContext(), VoiceMassagesActivity.class));
break;
}
case R.id.notedPics:{
startActivity(new Intent(getApplicationContext(), PicsActivity.class));
break;
}
case R.id.programs:{
}
case R.id.setting:{
startActivity(new Intent(getApplicationContext(), SettingActivity.class));
}
......
app/src/main/java/com/example/mynotepad/MenuFeatures/AllNotes/AllNotesListFragment.java
View file @ 3180d840
......@@ -148,11 +148,7 @@ public class AllNotesListFragment extends Fragment {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
noteDataBase.noteDao().deleteNote(note);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false);
myAdaptor = new MyAllNotesAdaptor(myNotes);
recyclerView.setLayoutManager(linearLayoutManager);
recyclerView.setAdapter(myAdaptor);
myAdaptor.notifyDataSetChanged();
}
});
alert.setNegativeButton("no", new DialogInterface.OnClickListener() {
......
app/src/main/java/com/example/mynotepad/MenuFeatures/Calender/CalenderNotesListFragment.java
View file @ 3180d840
......@@ -20,7 +20,6 @@ import android.widget.Toast;
import com.example.mynotepad.MenuFeatures.AllNotes.DataBase.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;
......@@ -94,7 +93,7 @@ public class CalenderNotesListFragment extends Fragment {
addDateBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
addNewDateAndDescription();
navController.navigate(R.id.action_calenderNotesListFragment_to_timePickerFragment );
}
});
......@@ -158,10 +157,7 @@ public class CalenderNotesListFragment extends Fragment {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
noteDataBase.dateNoreDAO().deleteDateNote(entityDates.get(myDates.indexOf(myChosenDateNote)));
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false);
myAdaptor = new MyCalenderAdaptor(myDates);
recyclerView.setAdapter(myAdaptor);
recyclerView.setLayoutManager(linearLayoutManager);
myAdaptor.notifyDataSetChanged();
}
});
alert.setNegativeButton("no", new DialogInterface.OnClickListener() {
......@@ -193,11 +189,6 @@ public class CalenderNotesListFragment extends Fragment {
}
private void addNewDateAndDescription() {
Intent intent = new Intent(getContext(), DatePickerActivity.class);
startActivity(intent);
}
private void setAllDateNoteListAndTitles() {
//get data from database to set in recyclerView
entityDates = noteDataBase.dateNoreDAO().getAllDateNotes();
......
app/src/main/java/com/example/mynotepad/MenuFeatures/Calender/MyCalenderActivity.java
View file @ 3180d840
package com.example.mynotepad.MenuFeatures.Calender;
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 android.widget.Toast;
import com.example.mynotepad.MenuFeatures.AllNotes.DataBase.DateEntity;
import com.example.mynotepad.MenuFeatures.AllNotes.DataBase.Note;
import com.example.mynotepad.MenuFeatures.AllNotes.Note.NoteFragment;
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;
import static com.example.mynotepad.MainActivity.noteDataBase;
import com.example.mynotepad.R;
public class MyCalenderActivity extends AppCompatActivity {
......
app/src/main/java/com/example/mynotepad/MenuFeatures/Calender/MyCalenderRecyclerView/TimePicker/DatePickerActivity.java → app/src/main/java/com/example/mynotepad/MenuFeatures/Calender/MyCalenderRecyclerView/TimePicker/TimePickerFragment.java
View file @ 3180d840
package com.example.mynotepad.MenuFeatures.Calender.MyCalenderRecyclerView.TimePicker;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import com.alirezaafkar.sundatepicker.DatePicker;
import com.alirezaafkar.sundatepicker.interfaces.DateSetListener;
import com.example.mynotepad.MenuFeatures.Calender.Date;
import com.example.mynotepad.MenuFeatures.AllNotes.DataBase.DateEntity;
import com.example.mynotepad.MenuFeatures.Calender.Date;
import com.example.mynotepad.R;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;
......@@ -23,26 +28,33 @@ import java.util.Calendar;
import static com.example.mynotepad.MainActivity.noteDataBase;
public class DatePickerActivity extends AppCompatActivity {
public class TimePickerFragment extends Fragment {
private DateEntity dateEntity;
private EditText chosenDate;
private TextView description;
private TextView description;
private Date mDate;
private FloatingActionButton back;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.fragment_note);
init();
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_note, container, false);
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
init(view);
showTimePicker();
}
private void init() {
chosenDate = findViewById(R.id.myTitle);
description = findViewById(R.id.textBody);
back = findViewById(R.id.backBtn);
private void init(View view) {
chosenDate = view.findViewById(R.id.myTitle);
description = view.findViewById(R.id.textBody);
back = view.findViewById(R.id.backBtn);
back.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
......@@ -65,12 +77,12 @@ public class DatePickerActivity extends AppCompatActivity {
mDate.setDate(day, month, year);
chosenDate.setText(mDate.getDate());
}
}).show(getSupportFragmentManager(), "");
}).show(getFragmentManager(), "");
}
private void showAlert(View view) {
if (chosenDate.getText().length() != 0) {
final AlertDialog.Builder alert = new AlertDialog.Builder(this);
final AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
alert.setTitle("new note :");
alert.setMessage("Do you want to save the note ?");
alert.setCancelable(true);
......@@ -78,8 +90,7 @@ public class DatePickerActivity extends AppCompatActivity {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
saveDateNote();
Toast.makeText(DatePickerActivity.this, "saved", Toast.LENGTH_SHORT).show();
finish();
Toast.makeText(getContext(), "saved", Toast.LENGTH_SHORT).show();
}
});
......@@ -88,22 +99,21 @@ public class DatePickerActivity extends AppCompatActivity {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
dialogInterface.cancel();
finish();
getActivity().finish();
}
});
alert.show();
} else if(description.getText().length() != 0){
} else if (description.getText().length() != 0) {
Snackbar.make(view, "note did not save ! you should pick a date ! ", Snackbar.LENGTH_LONG).setAction("Action", null).show();
finish();
}
else{
finish();
getActivity().finish();
} else {
getActivity().finish();
}
}
private void saveDateNote() {
//todo save in data base
dateEntity = new DateEntity(chosenDate.getText().toString() , description.getText().toString() ,false);
dateEntity = new DateEntity(chosenDate.getText().toString(), description.getText().toString(), false);
noteDataBase.dateNoreDAO().insertDateNote(dateEntity);
}
}
\ No newline at end of file
app/src/main/res/drawable-v24/bin.xml
View file @ 3180d840
......@@ -3,7 +3,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
android:tint="@color/black">
<path
android:fillColor="@android:color/white"
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
......
app/src/main/res/drawable-v24/black_star.xml deleted 100644 → 0
View file @ a04cc19a
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
</vector>
app/src/main/res/drawable-v24/yellow_star.xml deleted 100644 → 0
View file @ a04cc19a
<vector android:height="24dp" android:tint="#D6D03E"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
</vector>
app/src/main/res/drawable/bg_button.xml 0 → 100644
View file @ 3180d840
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:radius="27dp"
/>
<gradient
android:angle="45"
android:centerX="35%"
android:startColor="#2980b9"
android:endColor="#D0E4F1"
android:type="linear"
/>
<size
android:width="180dp"
android:height="54dp"
/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/bg_row.xml
View file @ 3180d840
......@@ -2,7 +2,11 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#A0B9Fc"/>
<gradient
android:startColor="@color/white"
android:endColor="#e3f2fb"
android:type="radial"
android:gradientRadius="500dp"/>
<stroke
android:width="20dp"
android:color="#16A0B9FC"/>
......
app/src/main/res/drawable/bg_toolbar.xml
View file @ 3180d840
......@@ -3,7 +3,7 @@
android:shape="rectangle">
<solid android:color="#76A0C3"/>
<solid android:color="#70a1ff"/>
<stroke
android:width="13dp"
android:color="#4883B5DD"/>
......
app/src/main/res/drawable/close.xml
View file @ 3180d840
......@@ -3,7 +3,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
android:tint="@color/black">
<path
android:fillColor="@android:color/white"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
......
app/src/main/res/drawable/ic_black_star.xml 0 → 100644
View file @ 3180d840
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="511.99142"
android:viewportHeight="511">
<path
android:fillColor="#FF000000"
android:pathData="m510.652,195.883c-3.371,-10.367 -12.566,-17.707 -23.402,-18.688l-147.797,-13.418 -58.41,-136.75c-4.313,-10.047 -14.125,-16.531 -25.047,-16.531s-20.738,6.484 -25.023,16.531l-58.41,136.75 -147.82,13.418c-10.836,1 -20.012,8.34 -23.402,18.688 -3.371,10.367 -0.258,21.738 7.938,28.926l111.723,97.965 -32.941,145.086c-2.41,10.668 1.73,21.699 10.582,28.098 4.758,3.457 10.348,5.184 15.957,5.184 4.82,0 9.645,-1.281 13.953,-3.859l127.445,-76.203 127.422,76.203c9.348,5.586 21.102,5.074 29.934,-1.324 8.852,-6.398 12.992,-17.43 10.582,-28.098l-32.941,-145.086 111.723,-97.965c8.191,-7.188 11.309,-18.535 7.938,-28.926zM258.449,419.605"/>
</vector>
app/src/main/res/drawable/ic_yellow_star.xml 0 → 100644
View file @ 3180d840
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="m23.363,8.584 l-7.378,-1.127 -3.307,-7.044c-0.247,-0.526 -1.11,-0.526 -1.357,0l-3.306,7.044 -7.378,1.127c-0.606,0.093 -0.848,0.83 -0.423,1.265l5.36,5.494 -1.267,7.767c-0.101,0.617 0.558,1.08 1.103,0.777l6.59,-3.642 6.59,3.643c0.54,0.3 1.205,-0.154 1.103,-0.777l-1.267,-7.767 5.36,-5.494c0.425,-0.436 0.182,-1.173 -0.423,-1.266z"
android:fillColor="#ffc107"/>
</vector>
app/src/main/res/layout/activity_main.xml
View file @ 3180d840
......@@ -12,19 +12,71 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/wlcTxt"
android:layout_width="0dp"
android:layout_height="80dp"
android:layout_centerHorizontal="true"
android:textSize="30dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/toolBarId"
<Button
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="120dp"
android:background="@drawable/bg_button"
android:onClick="allNoteClicked"
android:padding="4dp"
android:text="@string/all_notes"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.502"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolBarId"
android:gravity="center"
android:textColor="#0652DD"
android:textStyle="bold"/>
app:rippleColor="#F6F6F6" />
<Button
android:id="@+id/button4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:background="@drawable/bg_button"
android:onClick="onCalendarClicked"
android:text="@string/calendar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.502"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button2" />
<Button
android:id="@+id/button6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/bg_button"
android:onClick="onVoiceMassagesClicked"
android:text="@string/voice_massages"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button4" />
<Button
android:id="@+id/button8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/bg_button"
android:onClick="noNotedPicsClicked"
android:text="@string/noted_pics"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.502"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button6" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/bg_button"
android:onClick="onProgramsClicked"
android:text="@string/programs"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button8" />
<Toolbar
android:id="@+id/toolBarId"
......@@ -32,6 +84,7 @@
android:layout_height="?attr/actionBarSize"
android:background="@drawable/bg_toolbar"
app:layout_constraintTop_toTopOf="parent"
tools:layout_editor_absoluteX="-68dp"
tools:targetApi="lollipop">
<ImageView
......@@ -48,7 +101,7 @@
android:layout_height="match_parent"
android:layout_gravity="start"
android:fitsSystemWindows="true"
android:background="#F083B5DD"
android:background="#e3f2fb"
app:headerLayout="@layout/menu_header"
app:menu="@menu/drawer_menu" />
</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
app/src/main/res/layout/custom_toolbar_options.xml
View file @ 3180d840
......@@ -26,13 +26,13 @@
android:id="@+id/black_star"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/black_star" />
android:src="@drawable/ic_black_star" />
<ImageView
android:id="@+id/yellow_star"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/yellow_star" />
android:src="@drawable/ic_yellow_star" />
</FrameLayout>
......
app/src/main/res/menu/drawer_menu.xml
View file @ 3180d840
......@@ -5,42 +5,22 @@
<group>
<item
android:id="@+id/allNotes"
android:icon="@drawable/notes"
android:title="@string/all_notes" />
<item
android:id="@+id/favorites"
android:icon="@drawable/black_star"
android:icon="@drawable/ic_black_star"
android:title="@string/favourites" />
<item
android:id="@+id/folders"
android:title="@string/folders"
android:icon="@drawable/folder"/>
<item android:title="@string/calender"
android:id="@+id/calender"
android:icon="@drawable/calender"/>
<item android:title="@string/voice_massages"
android:id="@+id/voiceMassages"
android:icon="@drawable/voice"/>
android:icon="@drawable/folder"
android:title="@string/folders" />
<item
android:id="@+id/notedPics"
android:icon="@drawable/noted_pics"
android:title="@string/noted_pics" />
<item android:title="@string/programs"
android:id="@+id/programs"
android:icon="@drawable/program"/>
<item android:title="@string/setting"
android:id="@+id/setting"
android:icon="@drawable/setting"/>
<item android:title="@string/information"
android:icon="@drawable/setting"
android:title="@string/setting" />
<item
android:id="@+id/information"
android:icon="@drawable/information"/>
android:icon="@drawable/information"
android:title="@string/information" />
</group>
</menu>
\ No newline at end of file
app/src/main/res/navigation/nav_archived.xml
View file @ 3180d840
......@@ -9,7 +9,7 @@
android:id="@+id/archivedNoesListFragment"
android:name="com.example.mynotepad.MenuFeatures.AllArchivedNotes.ArchivedNoesListFragment"
android:label="fragment_archived_noes_list"
tools:layout="@layout/fragment_archived_noes_list" >
tools:layout="@layout/fragment_all_notes_list" >
<action
android:id="@+id/action_archivedNoesListFragment_to_noteFragment3"
app:destination="@id/noteFragment3"
......
app/src/main/res/navigation/nav_calender.xml
View file @ 3180d840
......@@ -9,15 +9,26 @@
android:id="@+id/calenderNotesListFragment"
android:name="com.example.mynotepad.MenuFeatures.Calender.CalenderNotesListFragment"
android:label="fragment_calender_notes_list"
tools:layout="@layout/fragment_calender_notes_list" >
tools:layout="@layout/fragment_all_notes_list" >
<action
android:id="@+id/action_calenderNotesListFragment_to_timePickerFragment"
app:destination="@id/timePickerFragment"
app:enterAnim="@anim/slide_in"
app:exitAnim="@anim/fade_out"
app:popEnterAnim="@anim/fade_in"
app:popExitAnim="@anim/slide_out"/>
<action
android:id="@+id/action_calenderNotesListFragment_to_noteFragment2"
app:destination="@id/noteFragment2"
app:exitAnim="@anim/fade_out"
app:enterAnim="@anim/slide_in"
app:exitAnim="@anim/fade_out"
app:popEnterAnim="@anim/fade_in"
app:popExitAnim="@anim/slide_out"/>
</fragment>
<fragment
android:id="@+id/timePickerFragment"
android:name="com.example.mynotepad.MenuFeatures.Calender.MyCalenderRecyclerView.TimePicker.TimePickerFragment"
android:label="TimePickerFragment" />
<fragment
android:id="@+id/noteFragment2"
android:name="com.example.mynotepad.MenuFeatures.AllNotes.Note.NoteFragment"
......
app/src/main/res/values/colors.xml
View file @ 3180d840
......@@ -2,5 +2,5 @@
<resources>
<color name="colorPrimary">#457FAE</color>
<color name="colorPrimaryDark">#3A478C</color>
<color name="colorAccent">#41A69D</color>
<color name="colorAccent">#2980b9</color>
</resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 3180d840
......@@ -21,4 +21,5 @@
<string name="noted_pics">noted pics</string>
<string name="programs">programs</string>
<string name="folders">folders</string>
<string name="calendar">calendar</string>
</resources>
\ No newline at end of file
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