mirror of https://github.com/M66B/FairEmail.git
Added new widget layout
This commit is contained in:
parent
96e99e4a13
commit
c25edaa3b2
|
@ -23,12 +23,16 @@ import android.appwidget.AppWidgetManager;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
|
import android.graphics.Color;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.ArrayAdapter;
|
import android.widget.ArrayAdapter;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.widget.CheckBox;
|
import android.widget.CheckBox;
|
||||||
|
import android.widget.CompoundButton;
|
||||||
|
import android.widget.RadioButton;
|
||||||
import android.widget.Spinner;
|
import android.widget.Spinner;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
import androidx.constraintlayout.widget.Group;
|
import androidx.constraintlayout.widget.Group;
|
||||||
import androidx.preference.PreferenceManager;
|
import androidx.preference.PreferenceManager;
|
||||||
|
@ -41,6 +45,10 @@ public class ActivityWidget extends ActivityBase {
|
||||||
|
|
||||||
private Spinner spAccount;
|
private Spinner spAccount;
|
||||||
private CheckBox cbSemiTransparent;
|
private CheckBox cbSemiTransparent;
|
||||||
|
private View inOld;
|
||||||
|
private View inNew;
|
||||||
|
private RadioButton rbOld;
|
||||||
|
private RadioButton rbNew;
|
||||||
private Button btnSave;
|
private Button btnSave;
|
||||||
private ContentLoadingProgressBar pbWait;
|
private ContentLoadingProgressBar pbWait;
|
||||||
private Group grpReady;
|
private Group grpReady;
|
||||||
|
@ -65,6 +73,10 @@ public class ActivityWidget extends ActivityBase {
|
||||||
|
|
||||||
spAccount = findViewById(R.id.spAccount);
|
spAccount = findViewById(R.id.spAccount);
|
||||||
cbSemiTransparent = findViewById(R.id.cbSemiTransparent);
|
cbSemiTransparent = findViewById(R.id.cbSemiTransparent);
|
||||||
|
inOld = findViewById(R.id.inOld);
|
||||||
|
inNew = findViewById(R.id.inNew);
|
||||||
|
rbOld = findViewById(R.id.rbOld);
|
||||||
|
rbNew = findViewById(R.id.rbNew);
|
||||||
btnSave = findViewById(R.id.btnSave);
|
btnSave = findViewById(R.id.btnSave);
|
||||||
pbWait = findViewById(R.id.pbWait);
|
pbWait = findViewById(R.id.pbWait);
|
||||||
grpReady = findViewById(R.id.grpReady);
|
grpReady = findViewById(R.id.grpReady);
|
||||||
|
@ -72,6 +84,35 @@ public class ActivityWidget extends ActivityBase {
|
||||||
final Intent resultValue = new Intent();
|
final Intent resultValue = new Intent();
|
||||||
resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
|
resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
|
||||||
|
|
||||||
|
cbSemiTransparent.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
|
@Override
|
||||||
|
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
||||||
|
if (isChecked) {
|
||||||
|
inOld.setBackgroundResource(R.drawable.widget_background);
|
||||||
|
inNew.setBackgroundResource(R.drawable.widget_background);
|
||||||
|
} else {
|
||||||
|
inOld.setBackgroundColor(Color.TRANSPARENT);
|
||||||
|
inNew.setBackgroundColor(Color.TRANSPARENT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
rbOld.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
|
@Override
|
||||||
|
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
||||||
|
if (isChecked)
|
||||||
|
rbNew.setChecked(false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
rbNew.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
|
@Override
|
||||||
|
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
||||||
|
if (isChecked)
|
||||||
|
rbOld.setChecked(false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
btnSave.setOnClickListener(new View.OnClickListener() {
|
btnSave.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View view) {
|
public void onClick(View view) {
|
||||||
|
@ -85,6 +126,7 @@ public class ActivityWidget extends ActivityBase {
|
||||||
editor.remove("widget." + appWidgetId + ".name");
|
editor.remove("widget." + appWidgetId + ".name");
|
||||||
editor.putLong("widget." + appWidgetId + ".account", account == null ? -1L : account.id);
|
editor.putLong("widget." + appWidgetId + ".account", account == null ? -1L : account.id);
|
||||||
editor.putBoolean("widget." + appWidgetId + ".semi", cbSemiTransparent.isChecked());
|
editor.putBoolean("widget." + appWidgetId + ".semi", cbSemiTransparent.isChecked());
|
||||||
|
editor.putInt("widget." + appWidgetId + ".layout", rbNew.isChecked() ? 1 : 0);
|
||||||
editor.apply();
|
editor.apply();
|
||||||
|
|
||||||
Widget.init(ActivityWidget.this, appWidgetId);
|
Widget.init(ActivityWidget.this, appWidgetId);
|
||||||
|
@ -98,6 +140,9 @@ public class ActivityWidget extends ActivityBase {
|
||||||
adapterAccount.setDropDownViewResource(R.layout.spinner_item1_dropdown);
|
adapterAccount.setDropDownViewResource(R.layout.spinner_item1_dropdown);
|
||||||
spAccount.setAdapter(adapterAccount);
|
spAccount.setAdapter(adapterAccount);
|
||||||
|
|
||||||
|
((TextView) inOld.findViewById(R.id.tvCount)).setText("12");
|
||||||
|
((TextView) inNew.findViewById(R.id.tvCount)).setText("12");
|
||||||
|
|
||||||
grpReady.setVisibility(View.GONE);
|
grpReady.setVisibility(View.GONE);
|
||||||
pbWait.setVisibility(View.VISIBLE);
|
pbWait.setVisibility(View.VISIBLE);
|
||||||
|
|
||||||
|
|
|
@ -56,6 +56,7 @@ public class Widget extends AppWidgetProvider {
|
||||||
String name = prefs.getString("widget." + appWidgetId + ".name", null);
|
String name = prefs.getString("widget." + appWidgetId + ".name", null);
|
||||||
long account = prefs.getLong("widget." + appWidgetId + ".account", -1L);
|
long account = prefs.getLong("widget." + appWidgetId + ".account", -1L);
|
||||||
boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", true);
|
boolean semi = prefs.getBoolean("widget." + appWidgetId + ".semi", true);
|
||||||
|
int layout = prefs.getInt("widget." + appWidgetId + ".layout", 0);
|
||||||
|
|
||||||
List<EntityFolder> folders = db.folder().getNotifyingFolders(account);
|
List<EntityFolder> folders = db.folder().getNotifyingFolders(account);
|
||||||
if (folders == null)
|
if (folders == null)
|
||||||
|
@ -91,7 +92,8 @@ public class Widget extends AppWidgetProvider {
|
||||||
if (unseen == null)
|
if (unseen == null)
|
||||||
unseen = 0;
|
unseen = 0;
|
||||||
|
|
||||||
RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget);
|
RemoteViews views = new RemoteViews(context.getPackageName(),
|
||||||
|
layout == 0 ? R.layout.widget : R.layout.widget_new);
|
||||||
|
|
||||||
views.setOnClickPendingIntent(R.id.widget, pi);
|
views.setOnClickPendingIntent(R.id.widget, pi);
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<solid android:color="#FF0000" />
|
||||||
|
<corners android:radius="3dp" />
|
||||||
|
</shape>
|
|
@ -1,10 +1,14 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<ScrollView 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:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:padding="12dp">
|
android:padding="12dp">
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
<eu.faircode.email.FixedTextView
|
||||||
android:id="@+id/tvAccount"
|
android:id="@+id/tvAccount"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -33,14 +37,61 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/spAccount" />
|
app:layout_constraintTop_toBottomOf="@id/spAccount" />
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:id="@+id/clLayout"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:background="@color/lightBluePrimary"
|
||||||
|
android:padding="24dp"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/cbSemiTransparent">
|
||||||
|
|
||||||
|
<include
|
||||||
|
android:id="@+id/inOld"
|
||||||
|
layout="@layout/widget"
|
||||||
|
android:layout_width="50dp"
|
||||||
|
android:layout_height="50dp"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<include
|
||||||
|
android:id="@+id/inNew"
|
||||||
|
layout="@layout/widget_new"
|
||||||
|
android:layout_width="50dp"
|
||||||
|
android:layout_height="50dp"
|
||||||
|
android:layout_marginStart="24dp"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/inOld"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<RadioButton
|
||||||
|
android:id="@+id/rbOld"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/inOld"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/inOld"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/inOld" />
|
||||||
|
|
||||||
|
<RadioButton
|
||||||
|
android:id="@+id/rbNew"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:checked="true"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/inNew"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/inNew"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/inNew" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/btnSave"
|
android:id="@+id/btnSave"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="12dp"
|
android:layout_marginTop="24dp"
|
||||||
android:text="@string/title_save"
|
android:text="@string/title_save"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/cbSemiTransparent" />
|
app:layout_constraintTop_toBottomOf="@id/clLayout" />
|
||||||
|
|
||||||
<eu.faircode.email.ContentLoadingProgressBar
|
<eu.faircode.email.ContentLoadingProgressBar
|
||||||
android:id="@+id/pbWait"
|
android:id="@+id/pbWait"
|
||||||
|
@ -57,5 +108,6 @@
|
||||||
android:id="@+id/grpReady"
|
android:id="@+id/grpReady"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
app:constraint_referenced_ids="tvAccount,spAccount,btnSave" />
|
app:constraint_referenced_ids="tvAccount,spAccount,cbSemiTransparent,clLayout,btnSave" />
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
</ScrollView>
|
|
@ -0,0 +1,58 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/widget"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@drawable/widget_background"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="3dp">
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:paddingBottom="3dp">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/ivMessage"
|
||||||
|
android:layout_width="36dp"
|
||||||
|
android:layout_height="32dp"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:contentDescription="@string/title_legend_count"
|
||||||
|
android:scaleType="fitXY"
|
||||||
|
android:src="@drawable/baseline_mail_24"
|
||||||
|
android:tint="@color/colorWidgetForeground" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvCount"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignEnd="@id/ivMessage"
|
||||||
|
android:layout_alignBottom="@id/ivMessage"
|
||||||
|
android:background="@drawable/widget_background_unread"
|
||||||
|
android:includeFontPadding="false"
|
||||||
|
android:lines="1"
|
||||||
|
android:paddingStart="3dp"
|
||||||
|
android:paddingEnd="3dp"
|
||||||
|
android:text="\?"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
android:textColor="@color/colorWidgetForeground"
|
||||||
|
android:textSize="12dp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<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>
|
Loading…
Reference in New Issue