From bdb853c25ed8d5019e63da93ad5155cc390d3055 Mon Sep 17 00:00:00 2001 From: Prerak Mann Date: Mon, 4 Jun 2018 01:05:35 +0530 Subject: [PATCH] Added Move note to another activity feature --- .idea/caches/build_file_checksums.ser | Bin 533 -> 533 bytes app/src/main/AndroidManifest.xml | 6 +- .../pkmnapps/activitydo/ActivityChoser.java | 113 ++++++++++++++++++ .../com/pkmnapps/activitydo/HomeFragment.java | 4 +- .../com/pkmnapps/activitydo/MConstants.java | 3 + .../activitydo/QuickNotesFragment.java | 30 +++++ .../com/pkmnapps/activitydo/TaskActivity.java | 17 +++ .../adapters/ActivityContentAdapter.java | 16 ++- .../adapters/SimpleActivityAdapter.java | 86 +++++++++++++ .../ChangeActivityInterface.java | 5 + .../TaskActivityInterface.java | 2 + .../activitydo/databasehelpers/DBHelper.java | 2 + .../databasehelpers/DBHelperImage.java | 7 +- .../databasehelpers/DBHelperList.java | 7 +- .../databasehelpers/DBHelperText.java | 6 + app/src/main/res/layout/activity_choser.xml | 25 ++++ .../res/layout/content_activity_choser.xml | 19 +++ .../res/layout/recycler_activity_layout.xml | 2 +- .../res/layout/recycler_list_in_task_view.xml | 59 +++++---- app/src/main/res/layout/simple_note_view.xml | 62 ++++++---- app/src/main/res/menu/recycler_task_menu.xml | 6 +- app/src/main/res/values/strings.xml | 2 + 22 files changed, 428 insertions(+), 51 deletions(-) create mode 100644 app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java create mode 100644 app/src/main/java/com/pkmnapps/activitydo/adapters/SimpleActivityAdapter.java create mode 100644 app/src/main/java/com/pkmnapps/activitydo/custominterfaces/ChangeActivityInterface.java create mode 100644 app/src/main/res/layout/activity_choser.xml create mode 100644 app/src/main/res/layout/content_activity_choser.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 381c24d73c8af7e580986cbfaebfe439db8880fb..7ca80f9802583aa490b90787ab566e5557ad34e8 100644 GIT binary patch delta 15 XcmbQrGL>b*43=ZNH@a+`Q^^PbGg$_l delta 15 XcmbQrGL>b*43_;DRYW$ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6a694dc..4eae59e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,7 +57,11 @@ + android:theme="@style/AppTheme.NoActionBar.white" /> + \ No newline at end of file diff --git a/app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java b/app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java new file mode 100644 index 0000000..4c216ae --- /dev/null +++ b/app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java @@ -0,0 +1,113 @@ +package com.pkmnapps.activitydo; + +import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.DefaultItemAnimator; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.Toolbar; +import android.util.Log; +import android.view.MenuItem; +import android.view.MotionEvent; +import android.view.View; +import android.widget.Toast; + +import com.pkmnapps.activitydo.adapters.SimpleActivityAdapter; +import com.pkmnapps.activitydo.custominterfaces.ChangeActivityInterface; +import com.pkmnapps.activitydo.databasehelpers.DBHelper; +import com.pkmnapps.activitydo.databasehelpers.DBHelperImage; +import com.pkmnapps.activitydo.databasehelpers.DBHelperList; +import com.pkmnapps.activitydo.databasehelpers.DBHelperText; +import com.pkmnapps.activitydo.dataclasses.ActivityData; + +import java.util.ArrayList; +import java.util.List; + +public class ActivityChoser extends AppCompatActivity implements ChangeActivityInterface{ + RecyclerView recyclerView; + SimpleActivityAdapter simpleActivityAdapter; + List activityDataList; + int type; + String uid,aid; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_choser); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + + int action = getIntent().getIntExtra("action",-1); + + if(action==MConstants.ACTION_MOVE_WIDGET){ + uid = getIntent().getStringExtra("uid"); + aid = getIntent().getStringExtra("aid"); + type = getIntent().getIntExtra("type",-1); + if(uid==null|| uid.equals("")) + errorQuit(); + else { + initialiseRecyclerview(); + } + } + else { + errorQuit(); + } + + + } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + // app icon in action bar clicked; goto parent activity. + this.finish(); + return true; + default: + return super.onOptionsItemSelected(item); + } + } + private void initialiseRecyclerview(){ + recyclerView = (RecyclerView)findViewById(R.id.recycler_view); + RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(this,LinearLayoutManager.VERTICAL,false); + recyclerView.setLayoutManager(mLayoutManager); + recyclerView.setItemAnimator(new DefaultItemAnimator()); + recyclerView.setNestedScrollingEnabled(false); + activityDataList = new ArrayList<>(); + DBHelper dbHelper = new DBHelper(this); + activityDataList = dbHelper.getAllActivitiesAsList(); + activityDataList.add(0,new ActivityData("0","Quick Notes","#38444b")); + simpleActivityAdapter = new SimpleActivityAdapter(activityDataList,this); + recyclerView.setAdapter(simpleActivityAdapter); + } + + private void errorQuit() { + setResult(RESULT_CANCELED); + Toast.makeText(this,"Action not supported",Toast.LENGTH_SHORT).show(); + finish(); + } + + @Override + public void changeActivity(String aid) { + if(!this.aid.equals(aid)) { + setResult(RESULT_OK, getIntent()); + switch (type) { + case MConstants.textW: + new DBHelperText(this).updateAid(uid, aid); + break; + case MConstants.imageW: + new DBHelperImage(this).updateAid(uid, aid); + break; + case MConstants.listW: + new DBHelperList(this).updateAid(uid, aid); + break; + } + if(aid.equals("0")){//used to update quicknotesfragment only if it was transferred there + QuickNotesFragment.activityMovedHere = true; + } + } + finish(); + } +} diff --git a/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java b/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java index 9d89f05..b971a8c 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java +++ b/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java @@ -139,6 +139,7 @@ public void onMoved(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolde } }; ItemTouchHelper.Callback itcallbackswipe = new ItemTouchHelper.Callback() { + @Override public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) { return makeFlag(ItemTouchHelper.ACTION_STATE_SWIPE,ItemTouchHelper.RIGHT); @@ -160,8 +161,7 @@ public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) { ItemTouchHelper itemTouchHelper = new ItemTouchHelper(itcallback); itemTouchHelper.attachToRecyclerView(recyclerView); - itemTouchHelperSwipe.attachToRecyclerView(recyclerView) - ; + itemTouchHelperSwipe.attachToRecyclerView(recyclerView); Button addNewButton = (Button)view.findViewById(R.id.addNewButton); addNewButton.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/pkmnapps/activitydo/MConstants.java b/app/src/main/java/com/pkmnapps/activitydo/MConstants.java index 27d3203..1303d94 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/MConstants.java +++ b/app/src/main/java/com/pkmnapps/activitydo/MConstants.java @@ -19,6 +19,9 @@ public class MConstants { public static final int REQUEST_NEW_LIST = 4; + public static final int REQUEST_WIDGET_ACTIVITY_CHANGE = 11; + + public static final int ACTION_MOVE_WIDGET = 10; } diff --git a/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java b/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java index add1ffe..4213e5b 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java +++ b/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java @@ -64,6 +64,7 @@ * create an instance of this fragment. */ public class QuickNotesFragment extends Fragment implements TaskActivityInterface{ + static boolean activityMovedHere = false; public ActivityData activityData; BottomSheetLayout bottomSheetLayout; View currentSheetView; @@ -138,6 +139,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, return view; } + @Override + public void onStart() { + if(activityMovedHere){//used when item is moved to quicknotes from any activity + widgets.clear(); + initialiseRecyclerViewData(); + activityMovedHere = false; + } + super.onStart(); + } + // TODO: Rename method, update argument and hook method into UI event public void onButtonPressed(Uri uri) { if (mListener != null) { @@ -240,6 +251,13 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d dbHelperWidgets.updateAllWidgetSortOrders(widgets); activityContentAdapter.notifyDataSetChanged(); } + else if(requestCode == MConstants.REQUEST_WIDGET_ACTIVITY_CHANGE && data != null){ + int pos = data.getIntExtra("pos",-1); + if(pos!=-1) { + widgets.remove(pos); + activityContentAdapter.notifyItemRemoved(pos); + } + } } } @@ -416,6 +434,7 @@ public boolean onMenuItemClick(MenuItem item) { } }); menuSheetView.inflateMenu(R.menu.widget_menu); + bottomSheetLayout.setShouldDimContentView(false); bottomSheetLayout.showWithSheetView(menuSheetView); } public void createNote() { @@ -608,4 +627,15 @@ public void onCancel(DialogInterface dialog) { }); builder.show(); } + + @Override + public void changeActivtyOfWidget(int type, String uid, int pos) { + Intent intent = new Intent(getContext(),ActivityChoser.class); + intent.putExtra("action",MConstants.ACTION_MOVE_WIDGET); + intent.putExtra("type",type); + intent.putExtra("uid",uid); + intent.putExtra("pos",pos); + intent.putExtra("aid",activityData.getId()); + startActivityForResult(intent,MConstants.REQUEST_WIDGET_ACTIVITY_CHANGE); + } } diff --git a/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java b/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java index aec17ed..8cbc804 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java +++ b/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java @@ -184,6 +184,12 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d //update ui dbHelperWidgets.updateAllWidgetSortOrders(widgets); activityContentAdapter.notifyDataSetChanged(); + }else if(requestCode == MConstants.REQUEST_WIDGET_ACTIVITY_CHANGE && data != null){ + int pos = data.getIntExtra("pos",-1); + if(pos!=-1) { + widgets.remove(pos); + activityContentAdapter.notifyItemRemoved(pos); + } } } } @@ -253,6 +259,7 @@ public boolean onMenuItemClick(MenuItem item) { } }); menuSheetView.inflateMenu(R.menu.widget_menu); + bottomSheetLayout.setShouldDimContentView(false); bottomSheetLayout.showWithSheetView(menuSheetView); } @@ -601,5 +608,15 @@ public void onCancel(DialogInterface dialog) { }); builder.show(); } + @Override + public void changeActivtyOfWidget(int type, String uid, int pos) { + Intent intent = new Intent(this,ActivityChoser.class); + intent.putExtra("action",MConstants.ACTION_MOVE_WIDGET); + intent.putExtra("type",type); + intent.putExtra("uid",uid); + intent.putExtra("pos",pos); + intent.putExtra("aid",activityData.getId()); + startActivityForResult(intent,MConstants.REQUEST_WIDGET_ACTIVITY_CHANGE); + } } \ No newline at end of file diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityContentAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityContentAdapter.java index 8d45dcb..4ecff92 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityContentAdapter.java +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityContentAdapter.java @@ -16,6 +16,7 @@ import android.widget.TextView; import com.bumptech.glide.Glide; +import com.pkmnapps.activitydo.ActivityChoser; import com.pkmnapps.activitydo.ImageViewFullscreen; import com.pkmnapps.activitydo.MConstants; import com.pkmnapps.activitydo.R; @@ -127,7 +128,10 @@ public void onClick(View v) { @Override public boolean onMenuItemClick(MenuItem item) { if(item.getItemId()==R.id.action_delete) - taskActivityInterface.deleteWidget(widgets.get(position)); + taskActivityInterface.deleteWidget(widgets.get(holder.getAdapterPosition())); + else if(item.getItemId()==R.id.action_change_activity){ + taskActivityInterface.changeActivtyOfWidget(MConstants.textW,t.getUid(),holder.getAdapterPosition()); + } return true; } }); @@ -163,7 +167,10 @@ public void onClick(View v) { @Override public boolean onMenuItemClick(MenuItem item) { if(item.getItemId()==R.id.action_delete) - taskActivityInterface.deleteWidget(widgets.get(position)); + taskActivityInterface.deleteWidget(widgets.get(holder.getAdapterPosition())); + else if(item.getItemId()==R.id.action_change_activity){ + taskActivityInterface.changeActivtyOfWidget(MConstants.listW,l.getUid(),holder.getAdapterPosition()); + } return true; } }); @@ -196,7 +203,10 @@ public void onClick(View v) { @Override public boolean onMenuItemClick(MenuItem item) { if(item.getItemId()==R.id.action_delete) - taskActivityInterface.deleteWidget(widgets.get(position)); + taskActivityInterface.deleteWidget(widgets.get(holder.getAdapterPosition())); + else if(item.getItemId()==R.id.action_change_activity){ + taskActivityInterface.changeActivtyOfWidget(MConstants.imageW,i.getUid(),holder.getAdapterPosition()); + } return true; } }); diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/SimpleActivityAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/SimpleActivityAdapter.java new file mode 100644 index 0000000..3e32a66 --- /dev/null +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/SimpleActivityAdapter.java @@ -0,0 +1,86 @@ +package com.pkmnapps.activitydo.adapters; + +import android.content.Intent; +import android.graphics.Color; +import android.graphics.PorterDuff; +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.CheckBox; +import android.widget.ImageButton; +import android.widget.ImageView; +import android.widget.PopupMenu; +import android.widget.TextView; + +import com.pkmnapps.activitydo.R; +import com.pkmnapps.activitydo.TaskActivity; +import com.pkmnapps.activitydo.custominterfaces.ChangeActivityInterface; +import com.pkmnapps.activitydo.custominterfaces.HomeFragInterace; +import com.pkmnapps.activitydo.databasehelpers.DBHelper; +import com.pkmnapps.activitydo.dataclasses.ActivityData; + +import java.util.List; + +public class SimpleActivityAdapter extends RecyclerView.Adapter { + + private List activityDataList; + private ChangeActivityInterface changeActivityInterface; + public class MyViewHolder extends RecyclerView.ViewHolder { + public TextView name; + public CheckBox pinned; + public ImageButton more; + public ImageView label; + + public MyViewHolder(View view) { + super(view); + name = (TextView)view.findViewById(R.id.nameTextView); + pinned = (CheckBox)view.findViewById(R.id.pinCheckBox); + label = (ImageView) view.findViewById(R.id.colorView); + more = (ImageButton)view.findViewById(R.id.more_button); + } + } + + public SimpleActivityAdapter(List activityDataList, ChangeActivityInterface changeActivityInterface) { + this.activityDataList = activityDataList; + this.changeActivityInterface = changeActivityInterface; + } + + @NonNull + @Override + public SimpleActivityAdapter.MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.recycler_activity_layout, parent, false); + + return new SimpleActivityAdapter.MyViewHolder(itemView); + } + + @Override + public void onBindViewHolder(@NonNull final SimpleActivityAdapter.MyViewHolder holder, int position) { + final ActivityData activityData = activityDataList.get(position); + holder.pinned.setChecked(activityData.getPinned()); + holder.name.setText(activityData.getName()); + holder.label.setColorFilter(Color.parseColor(activityData.getColor()), PorterDuff.Mode.SRC_ATOP); + + holder.pinned.setEnabled(false); + holder.more.setVisibility(View.GONE); + + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if(changeActivityInterface!=null) + changeActivityInterface.changeActivity(activityData.getId()); + } + }); + } + + @Override + public int getItemCount() { + return activityDataList.size(); + } + + +} diff --git a/app/src/main/java/com/pkmnapps/activitydo/custominterfaces/ChangeActivityInterface.java b/app/src/main/java/com/pkmnapps/activitydo/custominterfaces/ChangeActivityInterface.java new file mode 100644 index 0000000..181001e --- /dev/null +++ b/app/src/main/java/com/pkmnapps/activitydo/custominterfaces/ChangeActivityInterface.java @@ -0,0 +1,5 @@ +package com.pkmnapps.activitydo.custominterfaces; + +public interface ChangeActivityInterface { + void changeActivity(String uid); +} diff --git a/app/src/main/java/com/pkmnapps/activitydo/custominterfaces/TaskActivityInterface.java b/app/src/main/java/com/pkmnapps/activitydo/custominterfaces/TaskActivityInterface.java index c73be00..19523f8 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/custominterfaces/TaskActivityInterface.java +++ b/app/src/main/java/com/pkmnapps/activitydo/custominterfaces/TaskActivityInterface.java @@ -6,4 +6,6 @@ public interface TaskActivityInterface { void editWidget(Widget widget); void deleteWidget(Widget widget); + + void changeActivtyOfWidget(int type,String uid, int pos); } diff --git a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelper.java b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelper.java index 4557e12..cc5e502 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelper.java +++ b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelper.java @@ -78,6 +78,7 @@ public int deleteActivity(String id){ "id = ? ", new String[] { id }); } + public List getAllActivitiesAsList(){ List activityDataList = new ArrayList<>(); @@ -149,4 +150,5 @@ public void updateAllSortOrders(List activityDataList){ } } + } diff --git a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperImage.java b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperImage.java index 6129fec..511cb87 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperImage.java +++ b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperImage.java @@ -68,7 +68,12 @@ public boolean insertImage (ImageWidget imageWidget) { db.insert(HOME_TABLE_NAME, null, contentValues); return true; } - + public void updateAid(String uid,String aid){ + SQLiteDatabase db = this.getWritableDatabase(); + ContentValues contentValues = new ContentValues(); + contentValues.put(HOME_COLUMN_AID, aid); + db.update(HOME_TABLE_NAME,contentValues,"uid = ?", new String[]{uid}); + } public int deleteImage(String uid){ deleteWidgetinSort(uid); File file = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES),(uid+".jpg")); diff --git a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperList.java b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperList.java index 6a3515d..39e96d0 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperList.java +++ b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperList.java @@ -123,7 +123,12 @@ public void updateHead(String lid, String head){ contentValues.put(HOME_COLUMN_HEAD, head); db.update(HOME_TABLE_NAME,contentValues,"uid = ?", new String[]{lid}); } - + public void updateAid(String uid,String aid){ + SQLiteDatabase db = this.getWritableDatabase(); + ContentValues contentValues = new ContentValues(); + contentValues.put(HOME_COLUMN_AID, aid); + db.update(HOME_TABLE_NAME,contentValues,"uid = ?", new String[]{uid}); + } private void insertWidgetForSort(String uid){//call this in every insert method new DBHelperWidgets(context).insertWidget(uid,0); } diff --git a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperText.java b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperText.java index 2810f56..ae30f98 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperText.java +++ b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperText.java @@ -126,6 +126,12 @@ public void updateHeadBody(String uid, String head, String body){ contentValues.put(HOME_COLUMN_BODY, body); db.update(HOME_TABLE_NAME,contentValues,"uid = ?", new String[]{uid}); } + public void updateAid(String uid,String aid){ + SQLiteDatabase db = this.getWritableDatabase(); + ContentValues contentValues = new ContentValues(); + contentValues.put(HOME_COLUMN_AID, aid); + db.update(HOME_TABLE_NAME,contentValues,"uid = ?", new String[]{uid}); + } private void insertWidgetForSort(String uid){//call this in every insert method new DBHelperWidgets(context).insertWidget(uid,0); diff --git a/app/src/main/res/layout/activity_choser.xml b/app/src/main/res/layout/activity_choser.xml new file mode 100644 index 0000000..c06557f --- /dev/null +++ b/app/src/main/res/layout/activity_choser.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_activity_choser.xml b/app/src/main/res/layout/content_activity_choser.xml new file mode 100644 index 0000000..874887b --- /dev/null +++ b/app/src/main/res/layout/content_activity_choser.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/recycler_activity_layout.xml b/app/src/main/res/layout/recycler_activity_layout.xml index 2aac366..37e3b12 100644 --- a/app/src/main/res/layout/recycler_activity_layout.xml +++ b/app/src/main/res/layout/recycler_activity_layout.xml @@ -7,7 +7,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_margin="10dp" + android:layout_margin="5dp" android:foreground="?android:attr/selectableItemBackground" card_view:cardCornerRadius="4dp"> diff --git a/app/src/main/res/layout/recycler_list_in_task_view.xml b/app/src/main/res/layout/recycler_list_in_task_view.xml index 4e0fcb6..0f347fb 100644 --- a/app/src/main/res/layout/recycler_list_in_task_view.xml +++ b/app/src/main/res/layout/recycler_list_in_task_view.xml @@ -3,41 +3,60 @@ - - + android:layout_height="wrap_content"> + + card_view:layout_constraintBottom_toTopOf="@+id/recycler_view" + card_view:layout_constraintEnd_toStartOf="@+id/more_button" + card_view:layout_constraintStart_toStartOf="parent" + card_view:layout_constraintTop_toTopOf="parent" /> + + + + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginBottom="1dp" + android:padding="10dp" + card_view:layout_constraintBottom_toBottomOf="parent" + card_view:layout_constraintEnd_toEndOf="parent" + card_view:layout_constraintStart_toStartOf="@+id/head_textView" + card_view:layout_constraintTop_toBottomOf="@+id/head_textView" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/simple_note_view.xml b/app/src/main/res/layout/simple_note_view.xml index ca8491f..3bc7838 100644 --- a/app/src/main/res/layout/simple_note_view.xml +++ b/app/src/main/res/layout/simple_note_view.xml @@ -3,40 +3,60 @@ - - + android:layout_height="wrap_content"> + + card_view:layout_constraintBottom_toTopOf="@+id/body_textView" + card_view:layout_constraintEnd_toStartOf="@+id/more_button" + card_view:layout_constraintStart_toStartOf="parent" + card_view:layout_constraintTop_toTopOf="parent" /> + + + + - + card_view:layout_constraintBottom_toBottomOf="parent" + card_view:layout_constraintEnd_toEndOf="parent" + card_view:layout_constraintStart_toStartOf="@+id/head_textView" + card_view:layout_constraintTop_toBottomOf="@+id/head_textView" /> + \ No newline at end of file diff --git a/app/src/main/res/menu/recycler_task_menu.xml b/app/src/main/res/menu/recycler_task_menu.xml index 21a4e47..9c36cd9 100644 --- a/app/src/main/res/menu/recycler_task_menu.xml +++ b/app/src/main/res/menu/recycler_task_menu.xml @@ -1,7 +1,11 @@ - + Take Quick Note List Image + ActivityChoser + Move