diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 7ca80f9..ff00e28 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index 823380a..73496c4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
applicationId "com.pkmnapps.activitydo"
minSdkVersion 19
targetSdkVersion 27
- versionCode 1
- versionName "1.0"
+ versionCode 2
+ versionName "2.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index 7017a4e..1937f43 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 9f0c959..6d4de0c 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4eae59e..4952a93 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,7 +61,7 @@
+ android:theme="@style/AppTheme.NoActionBar"/>
\ No newline at end of file
diff --git a/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java b/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java
index b971a8c..7b6f4b8 100644
--- a/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java
+++ b/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java
@@ -142,7 +142,7 @@ public void onMoved(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolde
@Override
public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
- return makeFlag(ItemTouchHelper.ACTION_STATE_SWIPE,ItemTouchHelper.RIGHT);
+ return makeFlag(ItemTouchHelper.ACTION_STATE_SWIPE,ItemTouchHelper.LEFT);
}
@@ -296,7 +296,7 @@ public void onClick(DialogInterface dialog, int which) {
//add to database
dbHelper.updateActivity(activityData);
//update UI
- activityAdapter.notifyDataSetChanged();
+ activityAdapter.notifyItemChanged(activityDataList.indexOf(activityData));
}
}
});
@@ -321,8 +321,9 @@ public void onClick(DialogInterface dialog, int which) {
//delete from database
new DBHelper(getContext()).deleteActivity(activityData.getId());
//delete from list
+ int x = activityDataList.indexOf(activityData);
activityDataList.remove(activityData);
- activityAdapter.notifyDataSetChanged();
+ activityAdapter.notifyItemRemoved(x);
//also remove from pinned menu if it exists
updatePinnedMenu();
}
@@ -330,7 +331,7 @@ public void onClick(DialogInterface dialog, int which) {
builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
- activityAdapter.notifyDataSetChanged();
+ activityAdapter.notifyItemChanged(activityDataList.indexOf(activityData));
}
});
builder.show();
diff --git a/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java b/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java
index a0a3ee1..db57f0b 100644
--- a/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java
+++ b/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java
@@ -133,7 +133,21 @@ public boolean onNavigationItemSelected(MenuItem item) {
fragmentTransaction.replace(R.id.fragment_parent_main,new TabFragment()).commit();
}
else if(id == R.id.nav_share){
-
+ try {
+ Intent i = new Intent(Intent.ACTION_SEND);
+ i.setType("text/plain");
+ i.putExtra(Intent.EXTRA_SUBJECT, "Activity Do");
+ String sAux = "\nTry this app 'Activity Do' to note down stuff, organise, plan stuff in your life as Activities\n\n";
+ sAux = sAux + "https://play.google.com/store/apps/details?id=com.pkmnapps.activitydo\n\n";
+ i.putExtra(Intent.EXTRA_TEXT, sAux);
+ startActivity(Intent.createChooser(i, "choose one"));
+ } catch(Exception ignored) {
+ }
+ }
+ else if(id==R.id.nav_rate){
+ Intent intent = new Intent(Intent.ACTION_VIEW);
+ intent.setData(Uri.parse("market://details?id=com.pkmnapps.activitydo"));
+ startActivity(intent);
}
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
diff --git a/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java b/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java
index 4213e5b..4a2d9e9 100644
--- a/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java
+++ b/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java
@@ -600,8 +600,9 @@ public void deleteWidget(final Widget widget){
@Override
public void onClick(DialogInterface dialog, int which) {
//delete from list
+ int x = widgets.indexOf(widget);
widgets.remove(widget);
- activityContentAdapter.notifyDataSetChanged();
+ activityContentAdapter.notifyItemRemoved(x);
dbHelperWidgets.updateAllWidgetSortOrders(widgets);
//delete rom database
switch (widget.getType()){
@@ -622,7 +623,7 @@ public void onClick(DialogInterface dialog, int which) {
builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
- activityContentAdapter.notifyDataSetChanged();
+ activityContentAdapter.notifyItemChanged(widgets.indexOf(widget));
}
});
builder.show();
diff --git a/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java b/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java
index 8cbc804..ba1c28c 100644
--- a/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java
+++ b/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java
@@ -199,7 +199,7 @@ private void setUpJumpControls(){
takeNote.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- createList();
+ createNote();
}
});
ImageButton more = (ImageButton)findViewById(R.id.more_button);
@@ -581,8 +581,9 @@ public void deleteWidget(final Widget widget){
@Override
public void onClick(DialogInterface dialog, int which) {
//delete from list
+ int x = widgets.indexOf(widget);
widgets.remove(widget);
- activityContentAdapter.notifyDataSetChanged();
+ activityContentAdapter.notifyItemRemoved(x);
dbHelperWidgets.updateAllWidgetSortOrders(widgets);
//delete rom database
switch (widget.getType()){
@@ -603,7 +604,7 @@ public void onClick(DialogInterface dialog, int which) {
builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
- activityContentAdapter.notifyDataSetChanged();
+ activityContentAdapter.notifyItemChanged(widgets.indexOf(widget));
}
});
builder.show();
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 d0f3382..35c17ed 100644
--- a/app/src/main/res/layout/activity_image_view_fullscreen.xml
+++ b/app/src/main/res/layout/activity_image_view_fullscreen.xml
@@ -29,7 +29,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
- android:background="@color/black_overlay"
android:orientation="horizontal"
tools:ignore="UselessParent">
diff --git a/app/src/main/res/layout/activity_task.xml b/app/src/main/res/layout/activity_task.xml
index 8ac2a8f..1640009 100644
--- a/app/src/main/res/layout/activity_task.xml
+++ b/app/src/main/res/layout/activity_task.xml
@@ -16,8 +16,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
- app:popupTheme="@style/AppTheme.PopupOverlay"
- app:layout_scrollFlags="scroll|enterAlwaysCollapsed" />
+ app:popupTheme="@style/AppTheme.PopupOverlay" />
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 4cb1cf2..ad0c3bc 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -1,17 +1,12 @@
-
-
+ tools:showIn="@layout/app_bar_main"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4f3882c..2b47d6a 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -18,8 +18,8 @@
android:id="@+id/addNewButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="#d7d7d7"
android:text="@string/add_new_activity"
+ android:textStyle="bold"
android:textColor="@color/colorAccent" />
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 6fd5b25..1c33517 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -21,12 +21,12 @@