mirror of https://github.com/M66B/FairEmail.git
M66B
6 years ago
parent
33d23f909a
commit
5873f65974
@ -1,189 +0,0 @@
|
|||||||
package eu.faircode.email;
|
|
||||||
|
|
||||||
/*
|
|
||||||
This file is part of FairEmail.
|
|
||||||
|
|
||||||
FairEmail is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
FairEmail is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with FairEmail. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Copyright 2018-2019 by Marcel Bokhorst (M66B)
|
|
||||||
*/
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.lifecycle.LifecycleOwner;
|
|
||||||
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
|
|
||||||
import androidx.recyclerview.widget.DiffUtil;
|
|
||||||
import androidx.recyclerview.widget.ListUpdateCallback;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import java.text.DateFormat;
|
|
||||||
import java.text.SimpleDateFormat;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class AdapterRuleLog extends RecyclerView.Adapter<AdapterRuleLog.ViewHolder> {
|
|
||||||
private Context context;
|
|
||||||
private LifecycleOwner owner;
|
|
||||||
private LayoutInflater inflater;
|
|
||||||
|
|
||||||
private List<TupleRuleLogEx> items = new ArrayList<>();
|
|
||||||
|
|
||||||
private DateFormat DF = SimpleDateFormat.getDateTimeInstance();
|
|
||||||
|
|
||||||
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
|
|
||||||
private View view;
|
|
||||||
private TextView tvTime;
|
|
||||||
private TextView tvSubject;
|
|
||||||
|
|
||||||
ViewHolder(View itemView) {
|
|
||||||
super(itemView);
|
|
||||||
|
|
||||||
view = itemView.findViewById(R.id.clItem);
|
|
||||||
tvTime = itemView.findViewById(R.id.tvTime);
|
|
||||||
tvSubject = itemView.findViewById(R.id.tvSubject);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void wire() {
|
|
||||||
view.setOnClickListener(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void unwire() {
|
|
||||||
view.setOnClickListener(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void bindTo(TupleRuleLogEx log) {
|
|
||||||
tvTime.setText(DF.format(log.time));
|
|
||||||
tvSubject.setText(log.subject);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
int pos = getAdapterPosition();
|
|
||||||
if (pos == RecyclerView.NO_POSITION)
|
|
||||||
return;
|
|
||||||
|
|
||||||
TupleRuleLogEx rule = items.get(pos);
|
|
||||||
|
|
||||||
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
|
|
||||||
lbm.sendBroadcast(
|
|
||||||
new Intent(ActivityView.ACTION_VIEW_THREAD)
|
|
||||||
.putExtra("account", rule.account)
|
|
||||||
.putExtra("thread", rule.thread)
|
|
||||||
.putExtra("id", rule.message)
|
|
||||||
.putExtra("found", false));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
AdapterRuleLog(Context context, LifecycleOwner owner) {
|
|
||||||
this.context = context;
|
|
||||||
this.owner = owner;
|
|
||||||
this.inflater = LayoutInflater.from(context);
|
|
||||||
setHasStableIds(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void set(@NonNull List<TupleRuleLogEx> logs) {
|
|
||||||
Log.i("Set logs=" + logs.size());
|
|
||||||
|
|
||||||
DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(items, logs), false);
|
|
||||||
|
|
||||||
items = logs;
|
|
||||||
|
|
||||||
diff.dispatchUpdatesTo(new ListUpdateCallback() {
|
|
||||||
@Override
|
|
||||||
public void onInserted(int position, int count) {
|
|
||||||
Log.i("Inserted @" + position + " #" + count);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRemoved(int position, int count) {
|
|
||||||
Log.i("Removed @" + position + " #" + count);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMoved(int fromPosition, int toPosition) {
|
|
||||||
Log.i("Moved " + fromPosition + ">" + toPosition);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onChanged(int position, int count, Object payload) {
|
|
||||||
Log.i("Changed @" + position + " #" + count);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
diff.dispatchUpdatesTo(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
private class DiffCallback extends DiffUtil.Callback {
|
|
||||||
private List<TupleRuleLogEx> prev = new ArrayList<>();
|
|
||||||
private List<TupleRuleLogEx> next = new ArrayList<>();
|
|
||||||
|
|
||||||
DiffCallback(List<TupleRuleLogEx> prev, List<TupleRuleLogEx> next) {
|
|
||||||
this.prev.addAll(prev);
|
|
||||||
this.next.addAll(next);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getOldListSize() {
|
|
||||||
return prev.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getNewListSize() {
|
|
||||||
return next.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
|
|
||||||
TupleRuleLogEx r1 = prev.get(oldItemPosition);
|
|
||||||
TupleRuleLogEx r2 = next.get(newItemPosition);
|
|
||||||
return r1.id.equals(r2.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
|
|
||||||
TupleRuleLogEx r1 = prev.get(oldItemPosition);
|
|
||||||
TupleRuleLogEx r2 = next.get(newItemPosition);
|
|
||||||
return r1.equals(r2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public long getItemId(int position) {
|
|
||||||
return items.get(position).id;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getItemCount() {
|
|
||||||
return items.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
@NonNull
|
|
||||||
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
|
||||||
return new ViewHolder(inflater.inflate(R.layout.item_rule_log, parent, false));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
|
|
||||||
holder.unwire();
|
|
||||||
TupleRuleLogEx rule = items.get(position);
|
|
||||||
holder.bindTo(rule);
|
|
||||||
holder.wire();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,101 +0,0 @@
|
|||||||
package eu.faircode.email;
|
|
||||||
|
|
||||||
/*
|
|
||||||
This file is part of FairEmail.
|
|
||||||
|
|
||||||
FairEmail is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
FairEmail is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with FairEmail. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Copyright 2018-2019 by Marcel Bokhorst (M66B)
|
|
||||||
*/
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
import androidx.constraintlayout.widget.Group;
|
|
||||||
import androidx.lifecycle.Observer;
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class FragmentRuleLogs extends FragmentBase {
|
|
||||||
private RecyclerView rvRule;
|
|
||||||
private ContentLoadingProgressBar pbWait;
|
|
||||||
private Group grpReady;
|
|
||||||
|
|
||||||
private AdapterRuleLog adapter;
|
|
||||||
|
|
||||||
private long rule;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
|
|
||||||
// Get arguments
|
|
||||||
Bundle args = getArguments();
|
|
||||||
rule = args.getLong("rule", -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
@Nullable
|
|
||||||
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
|
||||||
setSubtitle(R.string.title_edit_rules);
|
|
||||||
|
|
||||||
View view = inflater.inflate(R.layout.fragment_rules, container, false);
|
|
||||||
|
|
||||||
// Get controls
|
|
||||||
rvRule = view.findViewById(R.id.rvRule);
|
|
||||||
pbWait = view.findViewById(R.id.pbWait);
|
|
||||||
grpReady = view.findViewById(R.id.grpReady);
|
|
||||||
|
|
||||||
// Wire controls
|
|
||||||
|
|
||||||
rvRule.setHasFixedSize(false);
|
|
||||||
LinearLayoutManager llm = new LinearLayoutManager(getContext());
|
|
||||||
rvRule.setLayoutManager(llm);
|
|
||||||
|
|
||||||
adapter = new AdapterRuleLog(getContext(), getViewLifecycleOwner());
|
|
||||||
rvRule.setAdapter(adapter);
|
|
||||||
|
|
||||||
// Initialize
|
|
||||||
grpReady.setVisibility(View.GONE);
|
|
||||||
pbWait.setVisibility(View.VISIBLE);
|
|
||||||
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
|
|
||||||
super.onActivityCreated(savedInstanceState);
|
|
||||||
|
|
||||||
DB db = DB.getInstance(getContext());
|
|
||||||
db.rulelog().liveRuleLogs(rule).observe(getViewLifecycleOwner(), new Observer<List<TupleRuleLogEx>>() {
|
|
||||||
@Override
|
|
||||||
public void onChanged(List<TupleRuleLogEx> rules) {
|
|
||||||
if (rules == null)
|
|
||||||
rules = new ArrayList<>();
|
|
||||||
|
|
||||||
adapter.set(rules);
|
|
||||||
|
|
||||||
pbWait.setVisibility(View.GONE);
|
|
||||||
grpReady.setVisibility(View.VISIBLE);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
package eu.faircode.email;
|
|
||||||
|
|
||||||
/*
|
|
||||||
This file is part of FairEmail.
|
|
||||||
|
|
||||||
FairEmail is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
FairEmail is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with FairEmail. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Copyright 2018-2019 by Marcel Bokhorst (M66B)
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class TupleRuleLogEx extends EntityRuleLog {
|
|
||||||
public long account;
|
|
||||||
public String thread;
|
|
||||||
public String subject;
|
|
||||||
}
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
tools:context=".ActivityView">
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
|
||||||
android:id="@+id/rvRule"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:clipToPadding="false"
|
|
||||||
android:paddingBottom="90dp"
|
|
||||||
android:scrollbarStyle="outsideOverlay"
|
|
||||||
android:scrollbars="vertical"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<eu.faircode.email.ContentLoadingProgressBar
|
|
||||||
android:id="@+id/pbWait"
|
|
||||||
style="@style/Base.Widget.AppCompat.ProgressBar"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:indeterminate="true"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Group
|
|
||||||
android:id="@+id/grpReady"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
app:constraint_referenced_ids="rvRule" />
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
|
||||||
android:id="@+id/clItem"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:background="?attr/activatableItemBackground"
|
|
||||||
android:foreground="?attr/selectableItemBackground"
|
|
||||||
android:padding="6dp">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/tvTime"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginEnd="6dp"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:text="12:34:56"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/tvSubject"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="6dp"
|
|
||||||
android:layout_marginEnd="6dp"
|
|
||||||
android:ellipsize="middle"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:text="Subject"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/tvTime"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
</FrameLayout>
|
|
||||||
Loading…
Reference in new issue