diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index b3900d1..d11d79d 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -67,7 +67,7 @@
@@ -77,9 +77,12 @@
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c0f68ed..99202cc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java b/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java
index 60bab78..383a173 100644
--- a/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java
+++ b/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java
@@ -50,6 +50,7 @@ public class HomeFragment extends Fragment implements HomeFragInterace{
DBHelper dbHelper;
View dialogView;
String colorTheme = MConstants.colors[0];
+
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
diff --git a/app/src/main/java/com/pkmnapps/activitydo/ImageViewFullscreen.java b/app/src/main/java/com/pkmnapps/activitydo/ImageViewFullscreen.java
index 5dbb503..b915fd1 100644
--- a/app/src/main/java/com/pkmnapps/activitydo/ImageViewFullscreen.java
+++ b/app/src/main/java/com/pkmnapps/activitydo/ImageViewFullscreen.java
@@ -1,15 +1,19 @@
package com.pkmnapps.activitydo;
import android.annotation.SuppressLint;
+import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
+import android.support.v4.content.FileProvider;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
+import android.widget.ImageButton;
import com.bumptech.glide.Glide;
import com.github.chrisbanes.photoview.PhotoView;
+import com.pkmnapps.activitydo.contentproviders.ImageProvider;
import java.io.File;
diff --git a/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java b/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java
index fda5ca9..23d3b8b 100644
--- a/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java
+++ b/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java
@@ -10,6 +10,7 @@
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.KeyEvent;
+import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.WindowManager;
@@ -92,12 +93,35 @@ public void onBackPressed() {
super.onBackPressed();
}
@Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.menu_note, menu);
+ return super.onCreateOptionsMenu(menu);
+ }
+ @Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
// app icon in action bar clicked; goto parent activity.
onBackPressed();
return true;
+ case R.id.action_share:
+ clearFocus();
+ Intent sendIntent = new Intent();
+ sendIntent.setAction(Intent.ACTION_SEND);
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append(headE.getText().toString());
+ stringBuilder.append("\n\n");
+ for(ListItem l: listItems){
+ stringBuilder.append(" - ");
+
+ stringBuilder.append(l.getContent());
+
+ stringBuilder.append("\n");
+ }
+ sendIntent.putExtra(Intent.EXTRA_TEXT, stringBuilder.toString());
+ sendIntent.setType("text/plain");
+ startActivity(Intent.createChooser(sendIntent, "Share via"));
+ return true;
default:
return super.onOptionsItemSelected(item);
}
diff --git a/app/src/main/java/com/pkmnapps/activitydo/MConstants.java b/app/src/main/java/com/pkmnapps/activitydo/MConstants.java
index 8157c3a..27d3203 100644
--- a/app/src/main/java/com/pkmnapps/activitydo/MConstants.java
+++ b/app/src/main/java/com/pkmnapps/activitydo/MConstants.java
@@ -2,6 +2,9 @@
public class MConstants {
public static String[] colors = {"#3f79b4","#50933c","#afaf41","#af4541","#673a9e"};
+
+ public static String selectColor = "#32000000";
+
public static final int textW = 1;
public static final int listW = 2;
public static final int imageW = 3;
diff --git a/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java b/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java
index 36873d5..c3bdb73 100644
--- a/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java
+++ b/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java
@@ -103,7 +103,7 @@ public void onBackPressed() {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.main, menu);
+ getMenuInflater().inflate(R.menu.main, menu);
return true;
}
diff --git a/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java b/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java
index 4746cfa..4bbf744 100644
--- a/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java
+++ b/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java
@@ -46,7 +46,7 @@ protected void onCreate(Bundle savedInstanceState) {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.menu_task_activity, menu);
+ getMenuInflater().inflate(R.menu.menu_note, menu);
return super.onCreateOptionsMenu(menu);
}
@@ -57,6 +57,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
// app icon in action bar clicked; goto parent activity.
this.finish();
return true;
+ case R.id.action_share:
+ Intent sendIntent = new Intent();
+ sendIntent.setAction(Intent.ACTION_SEND);
+ head = headE.getText().toString();
+ body = bodyE.getText().toString();
+ sendIntent.putExtra(Intent.EXTRA_TEXT, head + "\n" + body);
+ sendIntent.setType("text/plain");
+ startActivity(Intent.createChooser(sendIntent, "Share via"));
+ return true;
default:
return super.onOptionsItemSelected(item);
}
diff --git a/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java b/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java
index e48f14c..855911c 100644
--- a/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java
+++ b/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java
@@ -182,7 +182,7 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
if(index==-1000) {//new list
widgets.add(0,new Widget(MConstants.listW, listWidget,lid,0));
}
- else {//edit list
+ else {//more list
widgets.set(index, new Widget(MConstants.listW, listWidget,lid,index));
}
//update ui
@@ -525,7 +525,7 @@ public void editWidget(final Widget widget) {
intent2.putExtra("lid",listWidget.getUid());
intent2.putExtra("head",listWidget.getHead());
intent2.putExtra("index",widgets.indexOf(widget));
- intent2.putExtra("edit","1");
+ intent2.putExtra("more","1");
startActivityForResult(intent2,MConstants.REQUEST_NEW_LIST);
break;
diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityAdapter.java
index 2b3b829..00af30c 100644
--- a/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityAdapter.java
+++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityAdapter.java
@@ -7,10 +7,13 @@
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
import android.widget.ImageButton;
+import android.widget.PopupMenu;
import android.widget.TextView;
import com.pkmnapps.activitydo.databasehelpers.DBHelper;
@@ -28,7 +31,7 @@ public class ActivityAdapter extends RecyclerView.Adapter
+
+
diff --git a/app/src/main/res/drawable/ic_more_vert_grey_24dp.xml b/app/src/main/res/drawable/ic_more_vert_grey_24dp.xml
new file mode 100644
index 0000000..a537da2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_vert_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_share_black_24dp.xml b/app/src/main/res/drawable/ic_share_black_24dp.xml
new file mode 100644
index 0000000..e3fe874
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share_black_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_image_view_fullscreen.xml b/app/src/main/res/layout/activity_image_view_fullscreen.xml
index acab303..d0f3382 100644
--- a/app/src/main/res/layout/activity_image_view_fullscreen.xml
+++ b/app/src/main/res/layout/activity_image_view_fullscreen.xml
@@ -16,7 +16,6 @@
android:scaleType="centerInside"
android:layout_width="match_parent"
android:layout_height="match_parent" />
-
-
-
+ android:layout_height="wrap_content">
+
+
+
+
\ 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 09a57b5..f53102e 100644
--- a/app/src/main/res/layout/recycler_activity_layout.xml
+++ b/app/src/main/res/layout/recycler_activity_layout.xml
@@ -25,18 +25,19 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" />
-
+
+
-
+
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 60382d7..fe20e5c 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -2,9 +2,4 @@
diff --git a/app/src/main/res/menu/menu_note.xml b/app/src/main/res/menu/menu_note.xml
index fe187c0..cb38396 100644
--- a/app/src/main/res/menu/menu_note.xml
+++ b/app/src/main/res/menu/menu_note.xml
@@ -1,4 +1,10 @@
-