msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Android 12 widget compatibility

Browse Source 
https://developer.android.com/about/versions/12/features/widgets#enable-smoother-transitions
pull/205/head
M66B 3 years ago
parent 80abcde95c
commit 05a90177d9
7 changed files with 186 additions and 162 deletions
Show Stats Download Patch File Download Diff File

10
app/src/main/java/eu/faircode/email/Widget.java
Unescape View File

@ -111,7 +111,7 @@ public class Widget extends AppWidgetProvider {
RemoteViews views = new RemoteViews(context.getPackageName(), RemoteViews views = new RemoteViews(context.getPackageName(),
layout == 0 ? R.layout.widget : R.layout.widget_new); layout == 0 ? R.layout.widget : R.layout.widget_new);
views.setOnClickPendingIntent(R.id.widget, pi); views.setOnClickPendingIntent(android.R.id.background, pi);
if (layout == 1) if (layout == 1)
views.setImageViewResource(R.id.ivMessage, unseen == 0 views.setImageViewResource(R.id.ivMessage, unseen == 0
@ -131,9 +131,9 @@ public class Widget extends AppWidgetProvider {
if (background == Color.TRANSPARENT) { if (background == Color.TRANSPARENT) {
if (semi) if (semi)
views.setInt(R.id.widget, "setBackgroundResource", R.drawable.widget_background); views.setInt(android.R.id.background, "setBackgroundResource", R.drawable.widget_background);
else else
views.setInt(R.id.widget, "setBackgroundColor", background); views.setInt(android.R.id.background, "setBackgroundColor", background);
int colorWidgetForeground = context.getResources().getColor(R.color.colorWidgetForeground); int colorWidgetForeground = context.getResources().getColor(R.color.colorWidgetForeground);
views.setInt(R.id.ivMessage, "setColorFilter", colorWidgetForeground); views.setInt(R.id.ivMessage, "setColorFilter", colorWidgetForeground);
@ -145,7 +145,7 @@ public class Widget extends AppWidgetProvider {
if (semi) if (semi)
background = ColorUtils.setAlphaComponent(background, 127); background = ColorUtils.setAlphaComponent(background, 127);
views.setInt(R.id.widget, "setBackgroundColor", background); views.setInt(android.R.id.background, "setBackgroundColor", background);
if (lum > 0.7f) { if (lum > 0.7f) {
views.setInt(R.id.ivMessage, "setColorFilter", Color.BLACK); views.setInt(R.id.ivMessage, "setColorFilter", Color.BLACK);
@ -155,7 +155,7 @@ public class Widget extends AppWidgetProvider {
} }
int pad = Helper.dp2pixels(context, layout == 0 ? 3 : 6); int pad = Helper.dp2pixels(context, layout == 0 ? 3 : 6);
views.setViewPadding(R.id.widget, pad, pad, pad, pad); views.setViewPadding(R.id.content, pad, pad, pad, pad);
appWidgetManager.updateAppWidget(appWidgetId, views); appWidgetManager.updateAppWidget(appWidgetId, views);
} }

8
app/src/main/java/eu/faircode/email/WidgetSync.java
Unescape View File

@ -59,9 +59,9 @@ public class WidgetSync extends AppWidgetProvider {
if (background == Color.TRANSPARENT) { if (background == Color.TRANSPARENT) {
if (semi) if (semi)
views.setInt(R.id.widget, "setBackgroundResource", R.drawable.widget_background); views.setInt(android.R.id.background, "setBackgroundResource", R.drawable.widget_background);
else else
views.setInt(R.id.widget, "setBackgroundColor", background); views.setInt(android.R.id.background, "setBackgroundColor", background);
views.setInt(R.id.ivSync, "setColorFilter", views.setInt(R.id.ivSync, "setColorFilter",
context.getResources().getColor(R.color.colorWidgetForeground)); context.getResources().getColor(R.color.colorWidgetForeground));
} else { } else {
@ -70,14 +70,14 @@ public class WidgetSync extends AppWidgetProvider {
if (semi) if (semi)
background = ColorUtils.setAlphaComponent(background, 127); background = ColorUtils.setAlphaComponent(background, 127);
views.setInt(R.id.widget, "setBackgroundColor", background); views.setInt(android.R.id.background, "setBackgroundColor", background);
if (lum > 0.7f) if (lum > 0.7f)
views.setInt(R.id.ivSync, "setColorFilter", Color.BLACK); views.setInt(R.id.ivSync, "setColorFilter", Color.BLACK);
} }
int dp6 = Helper.dp2pixels(context, 6); int dp6 = Helper.dp2pixels(context, 6);
views.setViewPadding(R.id.widget, dp6, dp6, dp6, dp6); views.setViewPadding(R.id.content, dp6, dp6, dp6, dp6);
appWidgetManager.updateAppWidget(appWidgetId, views); appWidgetManager.updateAppWidget(appWidgetId, views);
} }

8
app/src/main/java/eu/faircode/email/WidgetUnified.java
Unescape View File

@ -133,9 +133,9 @@ public class WidgetUnified extends AppWidgetProvider {
if (background == Color.TRANSPARENT) { if (background == Color.TRANSPARENT) {
if (semi) if (semi)
views.setInt(R.id.widget, "setBackgroundResource", R.drawable.widget_background); views.setInt(android.R.id.background, "setBackgroundResource", R.drawable.widget_background);
else else
views.setInt(R.id.widget, "setBackgroundColor", background); views.setInt(android.R.id.background, "setBackgroundColor", background);
int colorWidgetForeground = context.getResources().getColor(R.color.colorWidgetForeground); int colorWidgetForeground = context.getResources().getColor(R.color.colorWidgetForeground);
views.setTextColor(R.id.title, colorWidgetForeground); views.setTextColor(R.id.title, colorWidgetForeground);
@ -145,14 +145,14 @@ public class WidgetUnified extends AppWidgetProvider {
if (semi) if (semi)
background = ColorUtils.setAlphaComponent(background, 127); background = ColorUtils.setAlphaComponent(background, 127);
views.setInt(R.id.widget, "setBackgroundColor", background); views.setInt(android.R.id.background, "setBackgroundColor", background);
if (lum > 0.7f) if (lum > 0.7f)
views.setTextColor(R.id.title, Color.BLACK); views.setTextColor(R.id.title, Color.BLACK);
} }
int dp6 = Helper.dp2pixels(context, 6); int dp6 = Helper.dp2pixels(context, 6);
views.setViewPadding(R.id.widget, dp6, 0, dp6, 0); views.setViewPadding(R.id.content, dp6, 0, dp6, 0);
appWidgetManager.updateAppWidget(appWidgetId, views); appWidgetManager.updateAppWidget(appWidgetId, views);
appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.lv); appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.lv);

90
app/src/main/res/layout/widget.xml
Unescape View File

@ -1,49 +1,55 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/widget" android:id="@android:id/background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/widget_background" android:background="@drawable/widget_background">
android:orientation="vertical"
android:padding="3dp">
<ImageView <LinearLayout
android:id="@+id/ivMessage" android:id="@+id/content"
android:layout_width="24dp" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="match_parent"
android:layout_gravity="center_horizontal" android:orientation="vertical"
android:layout_weight="2" android:padding="3dp">
android:contentDescription="@string/title_legend_count"
android:src="@drawable/baseline_mail_24"
app:tint="@color/colorWidgetForeground" />
<TextView <ImageView
android:id="@+id/tvCount" android:id="@+id/ivMessage"
android:layout_width="wrap_content" android:layout_width="24dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_weight="2" android:layout_weight="2"
android:includeFontPadding="false" android:contentDescription="@string/title_legend_count"
android:lines="1" android:src="@drawable/baseline_mail_24"
android:text="\?" app:tint="@color/colorWidgetForeground" />
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/colorWidgetForeground"
android:textSize="18dp"
android:textStyle="bold" />
<TextView <TextView
android:id="@+id/tvAccount" android:id="@+id/tvCount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_weight="1" android:layout_weight="2"
android:ellipsize="end" android:includeFontPadding="false"
android:includeFontPadding="false" android:lines="1"
android:lines="1" android:text="\?"
android:text="account" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textColor="@color/colorWidgetForeground"
android:textColor="@color/colorWidgetForeground" android:textSize="18dp"
android:textSize="12dp" android:textStyle="bold" />
android:visibility="gone" />
</LinearLayout> <TextView
android:id="@+id/tvAccount"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
android:ellipsize="end"
android:includeFontPadding="false"
android:lines="1"
android:text="account"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorWidgetForeground"
android:textSize="12dp"
android:visibility="gone" />
</LinearLayout>
</FrameLayout>

92
app/src/main/res/layout/widget_new.xml
Unescape View File

@ -1,52 +1,58 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/widget" android:id="@android:id/background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/widget_background" android:background="@drawable/widget_background">
android:padding="6dp">
<ImageView <RelativeLayout
android:id="@+id/ivMessage" android:id="@+id/content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:adjustViewBounds="true" android:padding="6dp">
android:contentDescription="@string/title_legend_count"
android:padding="3dp"
android:scaleType="fitXY"
android:src="@drawable/baseline_mail_widget_24"
app:tint="@color/colorWidgetForeground" />
<TextView <ImageView
android:id="@+id/tvCount" android:id="@+id/ivMessage"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignEnd="@id/ivMessage" android:adjustViewBounds="true"
android:layout_alignBottom="@id/ivMessage" android:contentDescription="@string/title_legend_count"
android:background="@drawable/widget_background_unread" android:padding="3dp"
android:includeFontPadding="false" android:scaleType="fitXY"
android:lines="1" android:src="@drawable/baseline_mail_widget_24"
android:paddingStart="3dp" app:tint="@color/colorWidgetForeground" />
android:paddingEnd="3dp"
android:text="\?"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorWidgetForeground"
android:textSize="12dp"
android:textStyle="bold" />
<TextView <TextView
android:id="@+id/tvAccount" android:id="@+id/tvCount"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/ivMessage" android:layout_alignEnd="@id/ivMessage"
android:ellipsize="end" android:layout_alignBottom="@id/ivMessage"
android:gravity="center_horizontal" android:background="@drawable/widget_background_unread"
android:includeFontPadding="false" android:includeFontPadding="false"
android:lines="1" android:lines="1"
android:text="account" android:paddingStart="3dp"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:paddingEnd="3dp"
android:textColor="@color/colorWidgetForeground" android:text="\?"
android:textSize="12dp" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:visibility="gone" /> android:textColor="@color/colorWidgetForeground"
</RelativeLayout> android:textSize="12dp"
android:textStyle="bold" />
<TextView
android:id="@+id/tvAccount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/ivMessage"
android:ellipsize="end"
android:gravity="center_horizontal"
android:includeFontPadding="false"
android:lines="1"
android:text="account"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorWidgetForeground"
android:textSize="12dp"
android:visibility="gone" />
</RelativeLayout>
</FrameLayout>

30
app/src/main/res/layout/widget_sync.xml
Unescape View File

@ -1,19 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/widget" android:id="@android:id/background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/widget_background" android:background="@drawable/widget_background">
android:padding="6dp">
<ImageView <RelativeLayout
android:id="@+id/ivSync" android:id="@+id/content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:adjustViewBounds="true" android:padding="6dp">
android:contentDescription="@string/title_widget_title_sync"
android:scaleType="fitXY" <ImageView
android:src="@drawable/twotone_sync_disabled_24" android:id="@+id/ivSync"
app:tint="@color/colorWidgetForeground" /> android:layout_width="match_parent"
</RelativeLayout> android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:contentDescription="@string/title_widget_title_sync"
android:scaleType="fitXY"
android:src="@drawable/twotone_sync_disabled_24"
app:tint="@color/colorWidgetForeground" />
</RelativeLayout>
</FrameLayout>

110
app/src/main/res/layout/widget_unified.xml
Unescape View File

@ -1,65 +1,71 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/widget" android:id="@android:id/background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/widget_background" android:background="@drawable/widget_background">
android:orientation="vertical"
android:paddingStart="6dp"
android:paddingEnd="6dp">
<LinearLayout <LinearLayout
android:id="@+id/content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="horizontal"> android:orientation="vertical"
android:paddingStart="6dp"
android:paddingEnd="6dp">
<TextView <LinearLayout
android:id="@+id/title" android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:orientation="horizontal">
android:gravity="center"
android:padding="6dp"
android:text="@string/title_widget_title_list"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/colorWidgetForeground"
android:textStyle="bold" />
<ImageView <TextView
android:id="@+id/refresh" android:id="@+id/title"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="1"
android:contentDescription="@string/tile_synchronize" android:gravity="center"
android:padding="6dp" android:padding="6dp"
android:src="@drawable/twotone_sync_24" android:text="@string/title_widget_title_list"
android:visibility="gone" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:tint="@color/colorWidgetForeground" /> android:textColor="@color/colorWidgetForeground"
android:textStyle="bold" />
<ImageView <ImageView
android:id="@+id/compose" android:id="@+id/refresh"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:contentDescription="@string/title_compose" android:contentDescription="@string/tile_synchronize"
android:padding="6dp" android:padding="6dp"
android:src="@drawable/twotone_edit_24" android:src="@drawable/twotone_sync_24"
android:visibility="gone" android:visibility="gone"
app:tint="@color/colorWidgetForeground" /> app:tint="@color/colorWidgetForeground" />
</LinearLayout>
<FrameLayout <ImageView
android:id="@+id/separator" android:id="@+id/compose"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="1dp" android:layout_height="wrap_content"
android:background="@color/colorWidgetRead" /> android:layout_weight="0"
android:contentDescription="@string/title_compose"
android:padding="6dp"
android:src="@drawable/twotone_edit_24"
android:visibility="gone"
app:tint="@color/colorWidgetForeground" />
</LinearLayout>
<ListView <FrameLayout
android:id="@+id/lv" android:id="@+id/separator"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="1dp"
android:layout_marginBottom="6dp" android:background="@color/colorWidgetRead" />
android:divider="@color/colorWidgetRead"
android:dividerHeight="1dp" /> <ListView
</LinearLayout> android:id="@+id/lv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp"
android:divider="@color/colorWidgetRead"
android:dividerHeight="1dp" />
</LinearLayout>
</FrameLayout>
Write Preview
Loading…
Cancel
Save