From 4981b569b565e017335c578fcca8a5ec835949ae Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 15 Nov 2019 14:02:50 +0100 Subject: [PATCH] Small improvements --- .../main/java/eu/faircode/email/ActivityWidgetUnified.java | 4 +++- app/src/main/java/eu/faircode/email/WidgetUnified.java | 4 +++- app/src/main/res/layout/widget_unified.xml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java index df59703102..fe5a198f03 100644 --- a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java +++ b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java @@ -65,7 +65,7 @@ public class ActivityWidgetUnified extends ActivityBase { appWidgetId = extras.getInt( AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); - getSupportActionBar().setSubtitle(R.string.title_folder_unified); + getSupportActionBar().setSubtitle(R.string.title_widget_title_list); setContentView(R.layout.activity_widget_unified); spAccount = findViewById(R.id.spAccount); @@ -153,6 +153,8 @@ public class ActivityWidgetUnified extends ActivityBase { adapterFolder.clear(); adapterFolder.addAll(folders); + + spFolder.setSelection(0); } @Override diff --git a/app/src/main/java/eu/faircode/email/WidgetUnified.java b/app/src/main/java/eu/faircode/email/WidgetUnified.java index 65d4dd0460..ae3a155788 100644 --- a/app/src/main/java/eu/faircode/email/WidgetUnified.java +++ b/app/src/main/java/eu/faircode/email/WidgetUnified.java @@ -80,7 +80,9 @@ public class WidgetUnified extends AppWidgetProvider { views.setViewVisibility(R.id.pro, pro ? View.GONE : View.VISIBLE); if (pro) { String name = prefs.getString("widget." + appWidgetId + ".name", null); - if (name != null) + if (name == null) + views.setTextViewText(R.id.title, context.getString(R.string.title_folder_unified)); + else views.setTextViewText(R.id.title, name); views.setOnClickPendingIntent(R.id.title, pi); diff --git a/app/src/main/res/layout/widget_unified.xml b/app/src/main/res/layout/widget_unified.xml index 337e717d99..4febf66d1d 100644 --- a/app/src/main/res/layout/widget_unified.xml +++ b/app/src/main/res/layout/widget_unified.xml @@ -14,7 +14,7 @@ android:gravity="center" android:paddingTop="6dp" android:paddingBottom="6dp" - android:text="@string/title_folder_unified" + android:text="@string/title_widget_title_list" android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textColor="@color/colorWidgetForeground" android:textStyle="bold" />