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

Refactoring

Browse Source
pull/147/head
M66B 6 years ago
parent f6cb1d5495
commit 9a1a043bd9
4 changed files with 120 additions and 128 deletions
Show Stats Download Patch File Download Diff File

7
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -807,11 +807,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
private void onShowSnoozed(TupleMessageEx message) {
if (message.ui_snoozed != null) {
DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.MEDIUM, SimpleDateFormat.SHORT);
String display = new SimpleDateFormat("E").format(message.ui_snoozed) + " " + df.format(message.ui_snoozed);
Toast.makeText(context, display, Toast.LENGTH_LONG).show();
}
if (message.ui_snoozed != null)
Toast.makeText(context, DialogDuration.formatTime(message.ui_snoozed), Toast.LENGTH_LONG).show();
}
private void onToggleFlag(TupleMessageEx message) {

81
app/src/main/java/eu/faircode/email/DialogDuration.java
Unescape View File

@ -0,0 +1,81 @@
package eu.faircode.email;
import android.content.Context;
import android.content.DialogInterface;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.NumberPicker;
import android.widget.TextView;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import androidx.lifecycle.LifecycleOwner;
public class DialogDuration {
private static final long HOUR_MS = 3600L * 1000L;
static void show(Context context, LifecycleOwner owner, int title, final IDialogDuration intf) {
final View dview = LayoutInflater.from(context).inflate(R.layout.dialog_duration, null);
final NumberPicker npHours = dview.findViewById(R.id.npHours);
final NumberPicker npDays = dview.findViewById(R.id.npDays);
final TextView tvTime = dview.findViewById(R.id.tvTime);
final long now = new Date().getTime() / HOUR_MS * HOUR_MS;
npHours.setMinValue(0);
npHours.setMaxValue(24);
npDays.setMinValue(0);
npDays.setMaxValue(90);
NumberPicker.OnValueChangeListener valueChanged = new NumberPicker.OnValueChangeListener() {
@Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
int hours = npHours.getValue();
int days = npDays.getValue();
long duration = (hours + days * 24) * HOUR_MS;
long time = now + duration;
DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.MEDIUM, SimpleDateFormat.SHORT);
tvTime.setText(formatTime(time));
tvTime.setVisibility(duration == 0 ? View.INVISIBLE : View.VISIBLE);
}
};
npHours.setOnValueChangedListener(valueChanged);
npDays.setOnValueChangedListener(valueChanged);
valueChanged.onValueChange(null, 0, 0);
new DialogBuilderLifecycle(context, owner)
.setTitle(title)
.setView(dview)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
int hours = npHours.getValue();
int days = npDays.getValue();
long duration = (hours + days * 24) * HOUR_MS;
long time = now + duration;
intf.onDurationSelected(duration, time);
}
})
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
intf.onDismiss();
}
})
.show();
}
static String formatTime(long time) {
DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.MEDIUM, SimpleDateFormat.SHORT);
return new SimpleDateFormat("E").format(time) + " " + df.format(time);
}
interface IDialogDuration {
void onDurationSelected(long duration, long time);
void onDismiss();
}
}

58
app/src/main/java/eu/faircode/email/FragmentCompose.java
Unescape View File

@ -78,7 +78,6 @@ import android.widget.FilterQueryProvider;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.MultiAutoCompleteTextView;
import android.widget.NumberPicker;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
@ -101,8 +100,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@ -708,48 +705,10 @@ public class FragmentCompose extends FragmentEx {
}
private void onMenuSendAfter() {
final View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_duration, null);
final NumberPicker npHours = dview.findViewById(R.id.npHours);
final NumberPicker npDays = dview.findViewById(R.id.npDays);
final TextView tvTime = dview.findViewById(R.id.tvTime);
final long HOUR_MS = 3600L * 1000L;
final long now = new Date().getTime() / HOUR_MS * HOUR_MS;
npHours.setMinValue(0);
npHours.setMaxValue(24);
npDays.setMinValue(0);
npDays.setMaxValue(90);
NumberPicker.OnValueChangeListener valueChanged = new NumberPicker.OnValueChangeListener() {
@Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
int hours = npHours.getValue();
int days = npDays.getValue();
long duration = (hours + days * 24) * HOUR_MS;
long time = now + duration;
DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.MEDIUM, SimpleDateFormat.SHORT);
tvTime.setText(new SimpleDateFormat("E").format(time) + " " + df.format(time));
tvTime.setVisibility(duration == 0 ? View.INVISIBLE : View.VISIBLE);
}
};
npHours.setOnValueChangedListener(valueChanged);
npDays.setOnValueChangedListener(valueChanged);
valueChanged.onValueChange(null, 0, 0);
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setTitle(R.string.title_send_after)
.setView(dview)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
DialogDuration.show(getContext(), getViewLifecycleOwner(), R.string.title_send_after,
new DialogDuration.IDialogDuration() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (Helper.isPro(getContext())) {
int hours = npHours.getValue();
int days = npDays.getValue();
long duration = (hours + days * 24) * HOUR_MS;
long time = now + duration;
public void onDurationSelected(long duration, long time) {
Bundle args = new Bundle();
args.putLong("id", working);
args.putLong("wakeup", time);
@ -776,14 +735,13 @@ public class FragmentCompose extends FragmentEx {
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
}
}.execute(FragmentCompose.this, args, "compose:send:after");
} else {
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
}
@Override
public void onDismiss() {
}
})
.show();
});
}
private void onMenuZoom() {

60
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -44,7 +44,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
import android.widget.ImageButton;
import android.widget.NumberPicker;
import android.widget.TextView;
import com.google.android.material.bottomnavigation.BottomNavigationView;
@ -52,10 +51,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;
import java.io.Serializable;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -1198,58 +1194,21 @@ public class FragmentMessages extends FragmentEx {
}
private void onActionSnooze() {
final View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_duration, null);
final NumberPicker npHours = dview.findViewById(R.id.npHours);
final NumberPicker npDays = dview.findViewById(R.id.npDays);
final TextView tvTime = dview.findViewById(R.id.tvTime);
final long HOUR_MS = 3600L * 1000L;
final long now = new Date().getTime() / HOUR_MS * HOUR_MS;
npHours.setMinValue(0);
npHours.setMaxValue(24);
npDays.setMinValue(0);
npDays.setMaxValue(90);
NumberPicker.OnValueChangeListener valueChanged = new NumberPicker.OnValueChangeListener() {
@Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
int hours = npHours.getValue();
int days = npDays.getValue();
long duration = (hours + days * 24) * HOUR_MS;
long time = now + duration;
DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.MEDIUM, SimpleDateFormat.SHORT);
tvTime.setText(new SimpleDateFormat("E").format(time) + " " + df.format(time));
tvTime.setVisibility(duration == 0 ? View.INVISIBLE : View.VISIBLE);
}
};
npHours.setOnValueChangedListener(valueChanged);
npDays.setOnValueChangedListener(valueChanged);
valueChanged.onValueChange(null, 0, 0);
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setTitle(R.string.title_snooze)
.setView(dview)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
DialogDuration.show(getContext(), getViewLifecycleOwner(), R.string.title_snooze,
new DialogDuration.IDialogDuration() {
@Override
public void onClick(DialogInterface dialog, int which) {
public void onDurationSelected(long duration, long time) {
if (Helper.isPro(getContext())) {
int hours = npHours.getValue();
int days = npDays.getValue();
long duration = (hours + days * 24) * HOUR_MS;
long time = now + duration;
Bundle args = new Bundle();
args.putLongArray("ids", getSelection());
args.putLong("wakeup", duration == 0 ? 0 : time);
args.putLong("wakeup", duration == 0 ? -1 : time);
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long[] ids = args.getLongArray("ids");
Long wakeup = args.getLong("wakeup");
if (wakeup == 0)
if (wakeup < 0)
wakeup = null;
DB db = DB.getInstance(context);
@ -1279,14 +1238,12 @@ public class FragmentMessages extends FragmentEx {
fragmentTransaction.commit();
}
}
})
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
public void onDismiss() {
selectionTracker.clearSelection();
}
})
.show();
});
}
});
@ -1992,7 +1949,6 @@ public class FragmentMessages extends FragmentEx {
}
}.execute(FragmentMessages.this, args, "messages:navigation");
}
}
Log.i("Submit messages=" + messages.size());

Write Preview
Loading…
Cancel
Save