-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added Move note to another activity feature
- Loading branch information
1 parent
8300819
commit bdb853c
Showing
22 changed files
with
428 additions
and
51 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletions
113
app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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<ActivityData> 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(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
app/src/main/java/com/pkmnapps/activitydo/adapters/SimpleActivityAdapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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<SimpleActivityAdapter.MyViewHolder> { | ||
|
|
||
| private List<ActivityData> 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<ActivityData> 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(); | ||
| } | ||
|
|
||
|
|
||
| } |
5 changes: 5 additions & 0 deletions
5
app/src/main/java/com/pkmnapps/activitydo/custominterfaces/ChangeActivityInterface.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package com.pkmnapps.activitydo.custominterfaces; | ||
|
|
||
| public interface ChangeActivityInterface { | ||
| void changeActivity(String uid); | ||
| } |
Oops, something went wrong.