mirror of
https://github.com/wismna/DoNext.git
synced 2025-10-03 07:30:13 -04:00
Implements the Percent support library in Fragment Tasks to handle RecyclerView size
Version increase
This commit is contained in:
@@ -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'
|
||||
}
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
||||
|
@@ -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 */
|
||||
|
@@ -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;
|
@@ -1,4 +1,4 @@
|
||||
package com.wismna.geoffroy.donext.ItemTouchHelpers;
|
||||
package com.wismna.geoffroy.donext.helpers;
|
||||
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Color;
|
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<android.support.percent.PercentRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
@@ -20,11 +20,12 @@
|
||||
android:id="@+id/task_list_view"
|
||||
android:name="com.wismna.geoffroy.donext.activities.TaskFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="410dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_below="@id/total_task_cycles"
|
||||
app:layoutManager="LinearLayoutManager"
|
||||
app:layout_heightPercent="90%"
|
||||
tools:context=".fragments.TasksFragment"
|
||||
tools:listitem="@layout/fragment_task" />
|
||||
<TextView
|
||||
@@ -33,4 +34,4 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_below="@id/task_list_view" />
|
||||
</RelativeLayout>
|
||||
</android.support.percent.PercentRelativeLayout>
|
Reference in New Issue
Block a user