Re-add progress gradient, implements #1009 (#1012) (1e95aa1c) · Commits · e / os / Tasks

opentasks-theme/src/main/res/values/attrs.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,4 +17,6 @@
		<attr name="closedCardBackground"
		format="color\|reference" />

		<attr name="opentasks_progress_gradient_end_color"
		format="color" />
		</resources>
		No newline at end of file

opentasks-theme/src/main/res/values/colors.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,4 +28,6 @@
		<color name="material_deep_orange_500">#ff5722</color>
		<color name="material_deep_orange_900">#bf360c</color>

		<color name="black_3_percent">#08000000</color>
		<color name="white_6_percent">#10ffffff</color>
		</resources>
		No newline at end of file

opentasks-theme/src/main/res/values/theme_dark.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@
		<item name="tabIconTint">?attr/colorPrimary</item>
		<item name="tabIndicatorColor">?attr/colorPrimary</item>

		<item name="opentasks_progress_gradient_end_color">@color/white_6_percent</item>

		<item name="android:scrollbarTrackVertical">@null</item>
		<item name="android:scrollbarSize">12dp</item>

		@@ -65,6 +67,8 @@
		<item name="tabIconTint">?attr/colorPrimary</item>
		<item name="tabIndicatorColor">?attr/colorPrimary</item>

		<item name="opentasks_progress_gradient_end_color">@color/white_6_percent</item>

		<item name="android:scrollbarTrackVertical">@null</item>
		<item name="android:scrollbarSize">12dp</item>
		</style>

opentasks-theme/src/main/res/values/theme_light.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,8 @@
		<item name="tabIconTint">?attr/colorPrimary</item>
		<item name="tabIndicatorColor">?attr/colorPrimary</item>

		<item name="opentasks_progress_gradient_end_color">@color/black_3_percent</item>

		<item name="android:scrollbarTrackVertical">@null</item>
		<item name="android:scrollbarSize">12dp</item>

		@@ -71,6 +73,8 @@
		<item name="tabIconTint">?attr/colorPrimary</item>
		<item name="tabIndicatorColor">?attr/colorPrimary</item>

		<item name="opentasks_progress_gradient_end_color">@color/black_3_percent</item>

		<item name="android:scrollbarTrackVertical">@null</item>
		<item name="android:scrollbarSize">12dp</item>
		</style>

opentasks/src/main/java/org/dmfs/tasks/groupings/BaseTaskViewDescriptor.java

+22 −4

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package org.dmfs.tasks.groupings;
		import android.annotation.SuppressLint;
		import android.content.Context;
		import android.content.SharedPreferences;
		import android.content.res.Resources;
		import android.database.Cursor;
		import android.graphics.drawable.Drawable;
		import android.text.Spannable;
		@@ -56,7 +57,7 @@ import androidx.preference.PreferenceManager;

		import static android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE;
		import static org.dmfs.tasks.model.TaskFieldAdapters.IS_CLOSED;
		import static org.dmfs.tasks.model.TaskFieldAdapters.LIST_COLOR;
		import static org.dmfs.tasks.model.TaskFieldAdapters.LIST_COLOR_RAW;


		/**
		@@ -138,6 +139,7 @@ public abstract class BaseTaskViewDescriptor implements ViewDescriptor
		protected void setDescription(View view, Cursor cursor)
		{
		Context context = view.getContext();
		Resources res = context.getResources();
		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
		boolean isClosed = TaskAdapter.IS_CLOSED.getFrom(cursor);
		TextView descriptionView = getView(view, android.R.id.text1);
		@@ -156,11 +158,13 @@ public abstract class BaseTaskViewDescriptor implements ViewDescriptor
		descriptionView.setVisibility(View.GONE);
		}

		String progress = prefs.getString(context.getString(R.string.opentasks_pref_appearance_list_progress), "checked");
		boolean showCheckListSummary = prefs.getBoolean(
		context.getString(R.string.opentasks_pref_appearance_check_list_summary),
		res.getBoolean(R.bool.opentasks_list_check_list_summary_default));
		TextView checkboxItemCountView = getView(view, R.id.checkbox_item_count);
		Iterable<DescriptionItem> checkedItems = new Sieved<>(item -> item.checkbox, checkList);
		int checkboxItemCount = new Reduced<DescriptionItem, Integer>(() -> 0, (count, ignored) -> count + 1, checkedItems).value();
		if (checkboxItemCount == 0 \|\| isClosed \|\| "none".equals(progress))
		if (checkboxItemCount == 0 \|\| isClosed \|\| !showCheckListSummary)
		{
		checkboxItemCountView.setVisibility(View.GONE);
		}
		@@ -187,6 +191,20 @@ public abstract class BaseTaskViewDescriptor implements ViewDescriptor
		context.getString(R.string.opentasks_checkbox_item_count_partially_checked, checkboxItemCount - checked, checked)));
		}
		}

		View progressGradient = view.findViewById(R.id.task_progress_background);
		if (!isClosed && TaskFieldAdapters.PERCENT_COMPLETE.get(cursor) > 0
		&& prefs.getBoolean(context.getString(R.string.opentasks_pref_appearance_progress_gradient),
		res.getBoolean(R.bool.opentasks_list_progress_gradient_default)))
		{
		progressGradient.setVisibility(View.VISIBLE);
		progressGradient.setPivotX(0);
		progressGradient.setScaleX(TaskFieldAdapters.PERCENT_COMPLETE.get(cursor) / 100f);
		}
		else
		{
		progressGradient.setVisibility(View.GONE);
		}
		}


		@@ -261,7 +279,7 @@ public abstract class BaseTaskViewDescriptor implements ViewDescriptor
		if (cardView != null)
		{
		boolean isClosed = IS_CLOSED.get(cursor);
		cardView.findViewById(R.id.color_label).setBackgroundColor(LIST_COLOR.get(cursor));
		cardView.findViewById(R.id.color_label).setBackgroundColor(LIST_COLOR_RAW.get(cursor));
		cardView.findViewById(R.id.card_background).setVisibility(isClosed ? View.VISIBLE : View.GONE);
		cardView.findViewById(R.id.color_label).setAlpha(isClosed ? 0.4f : 1f);
		cardView.setCardElevation(view.getResources().getDimensionPixelSize(