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

Rule UI improvements

Browse Source
pull/147/head
M66B 7 years ago
parent 5cacec0670
commit 699d1be7ec
8 changed files with 85 additions and 57 deletions
Show Stats Download Patch File Download Diff File

3
app/src/main/java/eu/faircode/email/AdapterRule.java
Unescape View File

@ -55,7 +55,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
ViewHolder(View itemView) { ViewHolder(View itemView) {
super(itemView); super(itemView);
this.itemView = itemView; this.itemView = itemView.findViewById(R.id.clItem);
tvName = itemView.findViewById(R.id.tvName); tvName = itemView.findViewById(R.id.tvName);
} }
@ -68,6 +68,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
} }
private void bindTo(EntityRule rule) { private void bindTo(EntityRule rule) {
itemView.setActivated(!rule.enabled);
tvName.setText(rule.name); tvName.setText(rule.name);
} }

2
app/src/main/java/eu/faircode/email/DB.java
Unescape View File

@ -445,9 +445,9 @@ public abstract class DB extends RoomDatabase {
" `folder` INTEGER NOT NULL," + " `folder` INTEGER NOT NULL," +
" `name` TEXT NOT NULL," + " `name` TEXT NOT NULL," +
" `order` INTEGER NOT NULL," + " `order` INTEGER NOT NULL," +
" `enabled` INTEGER NOT NULL," +
" `condition` TEXT NOT NULL," + " `condition` TEXT NOT NULL," +
" `action` TEXT NOT NULL," + " `action` TEXT NOT NULL," +
" `enabled` INTEGER NOT NULL," +
" FOREIGN KEY(`folder`) REFERENCES `folder`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE)"); " FOREIGN KEY(`folder`) REFERENCES `folder`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE)");
db.execSQL("CREATE INDEX `index_rule_folder` ON `rule` (`folder`)"); db.execSQL("CREATE INDEX `index_rule_folder` ON `rule` (`folder`)");
db.execSQL("CREATE INDEX `index_rule_order` ON `rule` (`order`)"); db.execSQL("CREATE INDEX `index_rule_order` ON `rule` (`order`)");

6
app/src/main/java/eu/faircode/email/DaoRule.java
Unescape View File

@ -29,7 +29,9 @@ import androidx.room.Update;
@Dao @Dao
public interface DaoRule { public interface DaoRule {
@Query("SELECT * FROM rule WHERE folder = :folder") @Query("SELECT * FROM rule" +
" WHERE folder = :folder" +
" ORDER BY `order`")
List<EntityRule> getRules(long folder); List<EntityRule> getRules(long folder);
@Query("SELECT rule.*, folder.account FROM rule" + @Query("SELECT rule.*, folder.account FROM rule" +
@ -37,7 +39,7 @@ public interface DaoRule {
" WHERE rule.id = :id") " WHERE rule.id = :id")
TupleRuleEx getRule(long id); TupleRuleEx getRule(long id);
@Query("SELECT * FROM rule") @Query("SELECT * FROM rule ORDER BY `order`")
LiveData<List<EntityRule>> liveRules(); LiveData<List<EntityRule>> liveRules();
@Insert @Insert

9
app/src/main/java/eu/faircode/email/EntityRule.java
Unescape View File

@ -57,11 +57,11 @@ public class EntityRule {
@NonNull @NonNull
public int order; public int order;
@NonNull @NonNull
public boolean enabled;
@NonNull
public String condition; public String condition;
@NonNull @NonNull
public String action; public String action;
@NonNull
public boolean enabled;
static final int TYPE_SEEN = 1; static final int TYPE_SEEN = 1;
static final int TYPE_UNSEEN = 2; static final int TYPE_UNSEEN = 2;
@ -135,9 +135,10 @@ public class EntityRule {
EntityRule other = (EntityRule) obj; EntityRule other = (EntityRule) obj;
return this.folder.equals(other.folder) && return this.folder.equals(other.folder) &&
this.name.equals(other.name) && this.name.equals(other.name) &&
this.order == other.order &&
this.enabled == other.enabled &&
this.condition.equals(other.condition) && this.condition.equals(other.condition) &&
this.action.equals(other.action) && this.action.equals(other.action);
this.enabled == other.enabled;
} else } else
return false; return false;
} }

11
app/src/main/java/eu/faircode/email/FragmentRule.java
Unescape View File

@ -50,9 +50,10 @@ import androidx.lifecycle.Lifecycle;
public class FragmentRule extends FragmentBase { public class FragmentRule extends FragmentBase {
private ViewGroup view; private ViewGroup view;
private EditText etName; private EditText etName;
private EditText etOrder;
private CheckBox cbEnabled;
private Spinner spAccount; private Spinner spAccount;
private Spinner spFolder; private Spinner spFolder;
private EditText etOrder;
private EditText etSender; private EditText etSender;
private EditText etSubject; private EditText etSubject;
private EditText etText; private EditText etText;
@ -86,9 +87,10 @@ public class FragmentRule extends FragmentBase {
// Get controls // Get controls
etName = view.findViewById(R.id.etName); etName = view.findViewById(R.id.etName);
etOrder = view.findViewById(R.id.etOrder);
cbEnabled = view.findViewById(R.id.cbEnabled);
spAccount = view.findViewById(R.id.spAccount); spAccount = view.findViewById(R.id.spAccount);
spFolder = view.findViewById(R.id.spFolder); spFolder = view.findViewById(R.id.spFolder);
etOrder = view.findViewById(R.id.etOrder);
etSender = view.findViewById(R.id.etSender); etSender = view.findViewById(R.id.etSender);
etSubject = view.findViewById(R.id.etSubject); etSubject = view.findViewById(R.id.etSubject);
etText = view.findViewById(R.id.etText); etText = view.findViewById(R.id.etText);
@ -199,6 +201,7 @@ public class FragmentRule extends FragmentBase {
etName.setText(rule == null ? null : rule.name); etName.setText(rule == null ? null : rule.name);
etOrder.setText(rule == null ? null : Integer.toString(rule.order)); etOrder.setText(rule == null ? null : Integer.toString(rule.order));
cbEnabled.setChecked(rule == null ? true : rule.enabled);
etSender.setText(jcondition.optString("sender")); etSender.setText(jcondition.optString("sender"));
etSubject.setText(jcondition.optString("subject")); etSubject.setText(jcondition.optString("subject"));
etText.setText(jcondition.optString("text")); etText.setText(jcondition.optString("text"));
@ -357,6 +360,7 @@ public class FragmentRule extends FragmentBase {
args.putLong("folder", folder == null ? -1 : folder.id); args.putLong("folder", folder == null ? -1 : folder.id);
args.putString("name", etName.getText().toString()); args.putString("name", etName.getText().toString());
args.putString("order", etOrder.getText().toString()); args.putString("order", etOrder.getText().toString());
args.putBoolean("enabled", cbEnabled.isChecked());
args.putString("condition", jcondition.toString()); args.putString("condition", jcondition.toString());
args.putString("action", jaction.toString()); args.putString("action", jaction.toString());
@ -377,6 +381,7 @@ public class FragmentRule extends FragmentBase {
long folder = args.getLong("folder"); long folder = args.getLong("folder");
String name = args.getString("name"); String name = args.getString("name");
String order = args.getString("order"); String order = args.getString("order");
boolean enabled = args.getBoolean("enabled");
String condition = args.getString("condition"); String condition = args.getString("condition");
String action = args.getString("action"); String action = args.getString("action");
@ -392,6 +397,7 @@ public class FragmentRule extends FragmentBase {
rule.folder = folder; rule.folder = folder;
rule.name = name; rule.name = name;
rule.order = Integer.parseInt(order); rule.order = Integer.parseInt(order);
rule.enabled = enabled;
rule.condition = condition; rule.condition = condition;
rule.action = action; rule.action = action;
rule.id = db.rule().insertRule(rule); rule.id = db.rule().insertRule(rule);
@ -400,6 +406,7 @@ public class FragmentRule extends FragmentBase {
rule.folder = folder; rule.folder = folder;
rule.name = name; rule.name = name;
rule.order = Integer.parseInt(order); rule.order = Integer.parseInt(order);
rule.enabled = enabled;
rule.condition = condition; rule.condition = condition;
rule.action = action; rule.action = action;
db.rule().updateRule(rule); db.rule().updateRule(rule);

55
app/src/main/res/layout/fragment_rule.xml
Unescape View File

@ -37,6 +37,36 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvName" /> app:layout_constraintTop_toBottomOf="@id/tvName" />
<TextView
android:id="@+id/tvOrder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_rule_order"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etName" />
<EditText
android:id="@+id/etOrder"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:hint="1"
android:inputType="number"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvOrder" />
<CheckBox
android:id="@+id/cbEnabled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_rule_enabled"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etOrder" />
<!-- account --> <!-- account -->
<TextView <TextView
@ -47,7 +77,7 @@
android:text="@string/title_rule_account" android:text="@string/title_rule_account"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etName" /> app:layout_constraintTop_toBottomOf="@id/cbEnabled" />
<Spinner <Spinner
android:id="@+id/spAccount" android:id="@+id/spAccount"
@ -87,27 +117,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/spFolder" /> app:layout_constraintTop_toBottomOf="@id/spFolder" />
<TextView
android:id="@+id/tvOrder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_rule_order"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvFolderRemark" />
<EditText
android:id="@+id/etOrder"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:hint="1"
android:inputType="number"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvOrder" />
<!-- condition --> <!-- condition -->
<TextView <TextView
@ -118,7 +127,7 @@
android:text="@string/title_rule_sender" android:text="@string/title_rule_sender"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etOrder" /> app:layout_constraintTop_toBottomOf="@id/tvFolderRemark" />
<EditText <EditText
android:id="@+id/etSender" android:id="@+id/etSender"

55
app/src/main/res/layout/item_rule.xml
Unescape View File

@ -1,31 +1,38 @@
<?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" <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:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/tvName" android:id="@+id/clItem"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:background="?attr/drawableItemBackground">
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:ellipsize="end"
android:maxLines="1"
android:text="Name"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View <TextView
android:id="@+id/vSeparator" android:id="@+id/tvName"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginStart="6dp"
android:layout_marginBottom="6dp" android:layout_marginTop="6dp"
android:background="?attr/colorSeparator" android:layout_marginEnd="6dp"
app:layout_constraintStart_toStartOf="parent" android:ellipsize="end"
app:layout_constraintTop_toBottomOf="@id/tvName" /> android:maxLines="1"
</androidx.constraintlayout.widget.ConstraintLayout> android:text="Name"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/vSeparator"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:background="?attr/colorSeparator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvName" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

1
app/src/main/res/values/strings.xml
Unescape View File

@ -386,6 +386,7 @@
<string name="title_rule_folder">Folder</string> <string name="title_rule_folder">Folder</string>
<string name="title_rule_folder_remark">The texts of messages in the selected folder will always be downloaded</string> <string name="title_rule_folder_remark">The texts of messages in the selected folder will always be downloaded</string>
<string name="title_rule_order">Order</string> <string name="title_rule_order">Order</string>
<string name="title_rule_enabled">Enabled</string>
<string name="title_rule_sender">Sender</string> <string name="title_rule_sender">Sender</string>
<string name="title_rule_subject">Subject</string> <string name="title_rule_subject">Subject</string>
<string name="title_rule_text">Text</string> <string name="title_rule_text">Text</string>

Write Preview
Loading…
Cancel
Save