From 85c73eacb9a581123220e5495d85bcb4a9b16900 Mon Sep 17 00:00:00 2001 From: geoffroy Date: Thu, 7 Jan 2016 17:20:56 -0500 Subject: [PATCH] Implements the Percent support library in Fragment Tasks to handle RecyclerView size Version increase --- DoNExt/app/build.gradle | 6 ++++-- .../donext/adapters/TaskListRecyclerViewAdapter.java | 2 +- .../geoffroy/donext/fragments/TaskListsFragment.java | 2 +- .../wismna/geoffroy/donext/fragments/TasksFragment.java | 6 +++--- .../{ItemTouchHelpers => helpers}/TaskListTouchHelper.java | 2 +- .../{ItemTouchHelpers => helpers}/TaskTouchHelper.java | 2 +- DoNExt/app/src/main/res/layout/fragment_tasks.xml | 7 ++++--- 7 files changed, 15 insertions(+), 12 deletions(-) rename DoNExt/app/src/main/java/com/wismna/geoffroy/donext/{ItemTouchHelpers => helpers}/TaskListTouchHelper.java (96%) rename DoNExt/app/src/main/java/com/wismna/geoffroy/donext/{ItemTouchHelpers => helpers}/TaskTouchHelper.java (98%) diff --git a/DoNExt/app/build.gradle b/DoNExt/app/build.gradle index 6d87ad6..689fb77 100644 --- a/DoNExt/app/build.gradle +++ b/DoNExt/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.wismna.geoffroy.donext" minSdkVersion 15 targetSdkVersion 23 - versionCode 1 - versionName "1.0" + versionCode 3 + versionName "0.3" } buildTypes { release { @@ -25,5 +25,7 @@ dependencies { compile 'com.android.support:appcompat-v7:23.1.1' compile 'com.android.support:design:23.1.1' compile 'com.android.support:support-v4:23.1.1' + compile 'com.android.support:percent:23.1.1' compile 'com.android.support:recyclerview-v7:23.1.1' + compile 'com.google.android.gms:play-services-ads:8.4.0' } diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java index 2c5de73..16888ea 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java @@ -9,10 +9,10 @@ import android.widget.Button; import android.widget.EditText; import android.widget.TextView; -import com.wismna.geoffroy.donext.ItemTouchHelpers.TaskListTouchHelper; import com.wismna.geoffroy.donext.R; import com.wismna.geoffroy.donext.dao.TaskList; import com.wismna.geoffroy.donext.database.TaskListDataAccess; +import com.wismna.geoffroy.donext.helpers.TaskListTouchHelper; import java.util.Collections; import java.util.List; diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsFragment.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsFragment.java index 55992f2..74e9777 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsFragment.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsFragment.java @@ -16,11 +16,11 @@ import android.widget.Button; import android.widget.EditText; import android.widget.LinearLayout; -import com.wismna.geoffroy.donext.ItemTouchHelpers.TaskListTouchHelper; import com.wismna.geoffroy.donext.R; import com.wismna.geoffroy.donext.adapters.TaskListRecyclerViewAdapter; import com.wismna.geoffroy.donext.dao.TaskList; import com.wismna.geoffroy.donext.database.TaskListDataAccess; +import com.wismna.geoffroy.donext.helpers.TaskListTouchHelper; import java.util.List; diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java index c1de97f..7a4d1be 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java @@ -22,13 +22,13 @@ import android.widget.RadioGroup; import android.widget.Spinner; import android.widget.TextView; -import com.wismna.geoffroy.donext.ItemTouchHelpers.TaskTouchHelper; import com.wismna.geoffroy.donext.R; import com.wismna.geoffroy.donext.activities.MainActivity; import com.wismna.geoffroy.donext.adapters.TaskRecyclerViewAdapter; import com.wismna.geoffroy.donext.dao.Task; import com.wismna.geoffroy.donext.dao.TaskList; import com.wismna.geoffroy.donext.database.TaskDataAccess; +import com.wismna.geoffroy.donext.helpers.TaskTouchHelper; import com.wismna.geoffroy.donext.listeners.RecyclerItemClickListener; import com.wismna.geoffroy.donext.widgets.NoScrollingLayoutManager; @@ -155,12 +155,12 @@ public class TasksFragment extends Fragment implements private void UpdateRemainingTaskCount() { TextView remainingTasksView = (TextView) view.findViewById(R.id.remaining_task_count); NoScrollingLayoutManager layoutManager = (NoScrollingLayoutManager) recyclerView.getLayoutManager(); - int remainingTaskCount = taskRecyclerViewAdapter.getItemCount() - layoutManager.getChildCount(); + int remainingTaskCount = taskRecyclerViewAdapter.getItemCount() - layoutManager.findLastCompletelyVisibleItemPosition() - 1; if (remainingTaskCount == 0) remainingTasksView.setText(""); else remainingTasksView.setText(String.valueOf( - remainingTaskCount + " task" + (remainingTaskCount > 1 ? "s" : "") +" remaining")); + remainingTaskCount + " more task" + (remainingTaskCount > 1 ? "s" : ""))); } /** Performs an action on a task: done, next or delete */ diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/ItemTouchHelpers/TaskListTouchHelper.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskListTouchHelper.java similarity index 96% rename from DoNExt/app/src/main/java/com/wismna/geoffroy/donext/ItemTouchHelpers/TaskListTouchHelper.java rename to DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskListTouchHelper.java index a2f7182..f0ba787 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/ItemTouchHelpers/TaskListTouchHelper.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskListTouchHelper.java @@ -1,4 +1,4 @@ -package com.wismna.geoffroy.donext.ItemTouchHelpers; +package com.wismna.geoffroy.donext.helpers; import android.graphics.Color; import android.support.v7.widget.RecyclerView; diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/ItemTouchHelpers/TaskTouchHelper.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java similarity index 98% rename from DoNExt/app/src/main/java/com/wismna/geoffroy/donext/ItemTouchHelpers/TaskTouchHelper.java rename to DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java index e7e4513..e72f875 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/ItemTouchHelpers/TaskTouchHelper.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java @@ -1,4 +1,4 @@ -package com.wismna.geoffroy.donext.ItemTouchHelpers; +package com.wismna.geoffroy.donext.helpers; import android.graphics.Canvas; import android.graphics.Color; diff --git a/DoNExt/app/src/main/res/layout/fragment_tasks.xml b/DoNExt/app/src/main/res/layout/fragment_tasks.xml index b0b4f45..3de2986 100644 --- a/DoNExt/app/src/main/res/layout/fragment_tasks.xml +++ b/DoNExt/app/src/main/res/layout/fragment_tasks.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file