Add option to hide menu button

pull/996/head
Alex Baker 5 years ago
parent e8eea0d8bf
commit 4d320c84d1

@ -66,6 +66,8 @@ class ScrollableWidget : InjectingPreferenceFragment() {
val showHeader = setupCheckbox(R.string.p_widget_show_header)
val showSettings = setupCheckbox(R.string.p_widget_show_settings)
showSettings.dependency = showHeader.key
val showMenu = setupCheckbox(R.string.p_widget_show_menu)
showMenu.dependency = showHeader.key
findPreference(R.string.p_widget_filter)
.setOnPreferenceClickListener {

@ -78,6 +78,13 @@ public class TasksWidget extends InjectingAppWidgetProvider {
remoteViews.setInt(R.id.widget, "setLayoutDirection", locale.getDirectionality());
if (widgetPreferences.showHeader()) {
remoteViews.setViewVisibility(R.id.widget_header, View.VISIBLE);
remoteViews.setViewVisibility(
R.id.widget_change_list, widgetPreferences.showMenu() ? View.VISIBLE : View.GONE);
int widgetTitlePadding =
widgetPreferences.showMenu()
? 0
: (int) context.getResources().getDimension(R.dimen.widget_padding);
remoteViews.setViewPadding(R.id.widget_title, widgetTitlePadding, 0, 0, 0);
remoteViews.setViewVisibility(
R.id.widget_reconfigure, widgetPreferences.showSettings() ? View.VISIBLE : View.GONE);
remoteViews.setInt(R.id.widget_title, "setTextColor", color.getColorOnPrimary());
@ -131,7 +138,7 @@ public class TasksWidget extends InjectingAppWidgetProvider {
Intent intent = TaskIntents.getTaskListIntent(context, filter);
intent.setFlags(flags);
intent.setAction("open_list");
return PendingIntent.getActivity(context, widgetId, intent, PendingIntent.FLAG_CANCEL_CURRENT);
return PendingIntent.getActivity(context, widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
}
private PendingIntent getNewTaskIntent(Context context, Filter filter, int widgetId) {
@ -156,6 +163,6 @@ public class TasksWidget extends InjectingAppWidgetProvider {
intent.putExtra(FilterSelectionActivity.EXTRA_FILTER, filter);
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
intent.setAction("choose_list");
return PendingIntent.getActivity(context, widgetId, intent, PendingIntent.FLAG_CANCEL_CURRENT);
return PendingIntent.getActivity(context, widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
}
}

@ -34,6 +34,10 @@ public class WidgetPreferences {
return preferences.getBoolean(getKey(R.string.p_widget_show_settings), true);
}
boolean showMenu() {
return preferences.getBoolean(getKey(R.string.p_widget_show_menu), true);
}
int getFontSize() {
return preferences.getInt(getKey(R.string.p_widget_font_size), 16);
}

@ -60,7 +60,7 @@
<TextView
android:id="@+id/widget_title"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/widget_change_list"

@ -260,6 +260,7 @@
<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_settings">widget-show-settings-</string>
<string name="p_widget_show_menu">widget-show-menu-</string>
<string name="p_dashclock_filter">dashclock_filter</string>
<string name="p_default_remote_list">default_remote_list</string>

@ -306,6 +306,7 @@ File %1$s contained %2$s.\n\n
<string name="widget_show_checkboxes">Show checkboxes</string>
<string name="widget_show_header">Show header</string>
<string name="widget_show_settings">Show settings</string>
<string name="widget_show_menu">Show menu</string>
<string name="notifications">Notifications</string>
<string name="silent">Silent</string>
<string name="sound">Sound</string>

@ -29,6 +29,10 @@
android:key="@string/p_widget_color_v2"
android:title="@string/color" />
<SwitchPreferenceCompat
android:key="@string/p_widget_show_menu"
android:title="@string/widget_show_menu" />
<SwitchPreferenceCompat
android:key="@string/p_widget_show_settings"
android:title="@string/widget_show_settings" />

Loading…
Cancel
Save