Add widget option to show full task title

pull/996/head
Alex Baker 6 years ago
parent dbfd1eeae1
commit 5c0ec4a5a3

@ -65,6 +65,7 @@ class ScrollableWidget : InjectingPreferenceFragment() {
setupCheckbox(R.string.p_widget_show_due_date) setupCheckbox(R.string.p_widget_show_due_date)
setupCheckbox(R.string.p_widget_show_checkboxes) setupCheckbox(R.string.p_widget_show_checkboxes)
setupCheckbox(R.string.p_widget_due_date_underneath) setupCheckbox(R.string.p_widget_due_date_underneath)
setupCheckbox(R.string.p_widget_show_full_task_title)
setupList(R.string.p_widget_spacing) setupList(R.string.p_widget_spacing)
val showHeader = setupCheckbox(R.string.p_widget_show_header) val showHeader = setupCheckbox(R.string.p_widget_show_header)
val showSettings = setupCheckbox(R.string.p_widget_show_settings) val showSettings = setupCheckbox(R.string.p_widget_show_settings)

@ -160,6 +160,11 @@ class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory {
} }
} }
row.setInt(
R.id.widget_text,
"setMaxLines",
widgetPreferences.showFullTaskTitle() ? Integer.MAX_VALUE : 1);
row.setTextViewText(R.id.widget_text, textContent); row.setTextViewText(R.id.widget_text, textContent);
row.setTextColor(R.id.widget_text, textColorTitle); row.setTextColor(R.id.widget_text, textColorTitle);
row.setImageViewBitmap(R.id.widget_complete_box, getCheckbox(task)); row.setImageViewBitmap(R.id.widget_complete_box, getCheckbox(task));
@ -171,7 +176,10 @@ class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory {
int horizontalPadding = (int) context.getResources().getDimension(R.dimen.widget_padding); int horizontalPadding = (int) context.getResources().getDimension(R.dimen.widget_padding);
int verticalPadding = widgetPreferences.getWidgetSpacing(); int verticalPadding = widgetPreferences.getWidgetSpacing();
int textBottomPadding = showDueDates && task.hasDueDate() ? 0 : verticalPadding; int textBottomPadding =
showDueDates && task.hasDueDate() && widgetPreferences.dueDateBelowTitle()
? 0
: verticalPadding;
row.setViewPadding(R.id.widget_complete_box, horizontalPadding, verticalPadding, horizontalPadding, verticalPadding); row.setViewPadding(R.id.widget_complete_box, horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);
if (showCheckboxes) { if (showCheckboxes) {
row.setViewVisibility(R.id.widget_complete_box, View.VISIBLE); row.setViewVisibility(R.id.widget_complete_box, View.VISIBLE);

@ -38,6 +38,10 @@ public class WidgetPreferences {
return preferences.getBoolean(getKey(R.string.p_widget_show_menu), true); return preferences.getBoolean(getKey(R.string.p_widget_show_menu), true);
} }
boolean showFullTaskTitle() {
return preferences.getBoolean(getKey(R.string.p_widget_show_full_task_title), false);
}
boolean dueDateBelowTitle() { boolean dueDateBelowTitle() {
return preferences.getBoolean(getKey(R.string.p_widget_due_date_underneath), false); return preferences.getBoolean(getKey(R.string.p_widget_due_date_underneath), false);
} }

@ -44,7 +44,7 @@
android:paddingEnd="@dimen/widget_padding" android:paddingEnd="@dimen/widget_padding"
android:paddingStart="0dp" android:paddingStart="0dp"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:singleLine="true" android:maxLines="1"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textSize="16sp" android:textSize="16sp"
tools:text="Task title"/> tools:text="Task title"/>

@ -269,6 +269,7 @@
<string name="p_widget_opacity">widget-opacity-v3-</string> <string name="p_widget_opacity">widget-opacity-v3-</string>
<string name="p_widget_font_size">widget-font-size-</string> <string name="p_widget_font_size">widget-font-size-</string>
<string name="p_widget_show_due_date">widget-show-due-date-</string> <string name="p_widget_show_due_date">widget-show-due-date-</string>
<string name="p_widget_show_full_task_title">widget-show-full-task-title-</string>
<string name="p_widget_show_checkboxes">widget-show-checkboxes-</string> <string name="p_widget_show_checkboxes">widget-show-checkboxes-</string>
<string name="p_widget_show_header">widget-show-header-</string> <string name="p_widget_show_header">widget-show-header-</string>
<string name="p_widget_show_settings">widget-show-settings-</string> <string name="p_widget_show_settings">widget-show-settings-</string>

@ -49,6 +49,11 @@
app:min="10" app:min="10"
app:showSeekBarValue="true" /> app:showSeekBarValue="true" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_widget_show_full_task_title"
android:title="@string/EPr_fullTask_title" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="@string/p_widget_show_due_date" android:key="@string/p_widget_show_due_date"
android:title="@string/widget_show_due_date" /> android:title="@string/widget_show_due_date" />

Loading…
Cancel
Save