mirror of https://github.com/M66B/FairEmail.git
parent
5b9a2446b5
commit
9dc265468a
|
@ -385,8 +385,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
private ImageButton ibRemove;
|
private ImageButton ibRemove;
|
||||||
private ImageButton ibMore;
|
private ImageButton ibMore;
|
||||||
private TextView tvSignedData;
|
private TextView tvSignedData;
|
||||||
private ImageButton ibActionBarHint;
|
|
||||||
private Group grpActionBarHint;
|
|
||||||
|
|
||||||
private TextView tvBody;
|
private TextView tvBody;
|
||||||
private View wvBody;
|
private View wvBody;
|
||||||
|
@ -570,8 +568,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
ibRemove = vsBody.findViewById(R.id.ibRemove);
|
ibRemove = vsBody.findViewById(R.id.ibRemove);
|
||||||
ibMore = vsBody.findViewById(R.id.ibMore);
|
ibMore = vsBody.findViewById(R.id.ibMore);
|
||||||
tvSignedData = vsBody.findViewById(R.id.tvSignedData);
|
tvSignedData = vsBody.findViewById(R.id.tvSignedData);
|
||||||
ibActionBarHint = vsBody.findViewById(R.id.ibActionBarHint);
|
|
||||||
grpActionBarHint = vsBody.findViewById(R.id.grpActionBarHint);
|
|
||||||
|
|
||||||
tvBody = vsBody.findViewById(R.id.tvBody);
|
tvBody = vsBody.findViewById(R.id.tvBody);
|
||||||
wvBody = vsBody.findViewById(R.id.wvBody);
|
wvBody = vsBody.findViewById(R.id.wvBody);
|
||||||
|
@ -649,7 +645,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
ibUndo.setOnClickListener(this);
|
ibUndo.setOnClickListener(this);
|
||||||
ibRemove.setOnClickListener(this);
|
ibRemove.setOnClickListener(this);
|
||||||
ibMore.setOnClickListener(this);
|
ibMore.setOnClickListener(this);
|
||||||
ibActionBarHint.setOnClickListener(this);
|
|
||||||
|
|
||||||
ibDownloading.setOnClickListener(this);
|
ibDownloading.setOnClickListener(this);
|
||||||
|
|
||||||
|
@ -718,7 +713,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
ibUndo.setOnClickListener(null);
|
ibUndo.setOnClickListener(null);
|
||||||
ibRemove.setOnClickListener(null);
|
ibRemove.setOnClickListener(null);
|
||||||
ibMore.setOnClickListener(null);
|
ibMore.setOnClickListener(null);
|
||||||
ibActionBarHint.setOnClickListener(null);
|
|
||||||
|
|
||||||
ibDownloading.setOnClickListener(null);
|
ibDownloading.setOnClickListener(null);
|
||||||
|
|
||||||
|
@ -1147,7 +1141,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
ibRemove.setVisibility(View.GONE);
|
ibRemove.setVisibility(View.GONE);
|
||||||
ibMore.setVisibility(View.GONE);
|
ibMore.setVisibility(View.GONE);
|
||||||
tvSignedData.setVisibility(View.GONE);
|
tvSignedData.setVisibility(View.GONE);
|
||||||
grpActionBarHint.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
tvBody.setVisibility(View.GONE);
|
tvBody.setVisibility(View.GONE);
|
||||||
wvBody.setVisibility(View.GONE);
|
wvBody.setVisibility(View.GONE);
|
||||||
|
@ -1301,7 +1294,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
ibRemove.setVisibility(EntityFolder.OUTBOX.equals(message.folderType) || message.folderReadOnly ? View.GONE : View.VISIBLE);
|
ibRemove.setVisibility(EntityFolder.OUTBOX.equals(message.folderType) || message.folderReadOnly ? View.GONE : View.VISIBLE);
|
||||||
ibMore.setVisibility(EntityFolder.OUTBOX.equals(message.folderType) ? View.GONE : View.VISIBLE);
|
ibMore.setVisibility(EntityFolder.OUTBOX.equals(message.folderType) ? View.GONE : View.VISIBLE);
|
||||||
tvSignedData.setVisibility(View.GONE);
|
tvSignedData.setVisibility(View.GONE);
|
||||||
grpActionBarHint.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
// Addresses
|
// Addresses
|
||||||
ibExpanderAddress.setImageLevel(show_addresses ? 0 /* less */ : 1 /* more */);
|
ibExpanderAddress.setImageLevel(show_addresses ? 0 /* less */ : 1 /* more */);
|
||||||
|
@ -1826,10 +1818,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
|
|
||||||
boolean signed_data = args.getBoolean("signed_data");
|
boolean signed_data = args.getBoolean("signed_data");
|
||||||
tvSignedData.setVisibility(signed_data ? View.VISIBLE : View.GONE);
|
tvSignedData.setVisibility(signed_data ? View.VISIBLE : View.GONE);
|
||||||
|
|
||||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
|
||||||
boolean message_bar_removed = prefs.getBoolean("message_bar_removed", true);
|
|
||||||
grpActionBarHint.setVisibility(message_bar_removed ? View.GONE : View.VISIBLE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -2295,9 +2283,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
case R.id.ibMore:
|
case R.id.ibMore:
|
||||||
onActionMore(message);
|
onActionMore(message);
|
||||||
break;
|
break;
|
||||||
case R.id.ibActionBarHint:
|
|
||||||
onActionBarHint();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case R.id.ibDownloading:
|
case R.id.ibDownloading:
|
||||||
Helper.viewFAQ(context, 15);
|
Helper.viewFAQ(context, 15);
|
||||||
|
@ -3245,12 +3230,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
popupMenu.show();
|
popupMenu.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onActionBarHint() {
|
|
||||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
|
||||||
prefs.edit().putBoolean("message_bar_removed", true).apply();
|
|
||||||
grpActionBarHint.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
|
|
||||||
private class TouchHandler extends ArrowKeyMovementMethod {
|
private class TouchHandler extends ArrowKeyMovementMethod {
|
||||||
private TupleMessageEx message;
|
private TupleMessageEx message;
|
||||||
|
|
||||||
|
|
|
@ -249,7 +249,6 @@ public class ApplicationEx extends Application {
|
||||||
editor.remove("first");
|
editor.remove("first");
|
||||||
} else if (version < 999) {
|
} else if (version < 999) {
|
||||||
editor.remove("actionbar");
|
editor.remove("actionbar");
|
||||||
editor.putBoolean("message_bar_removed", false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (BuildConfig.DEBUG && false) {
|
if (BuildConfig.DEBUG && false) {
|
||||||
|
|
|
@ -151,36 +151,5 @@
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/ibFull" />
|
app:layout_constraintTop_toBottomOf="@id/ibVerify" />
|
||||||
|
|
||||||
<ImageButton
|
|
||||||
android:id="@+id/ibActionBarHint"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:background="?android:attr/selectableItemBackgroundBorderless"
|
|
||||||
android:contentDescription="@string/title_no_format"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/tvActionBarHint"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/tvActionBarHint"
|
|
||||||
app:srcCompat="@drawable/baseline_close_24" />
|
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
|
||||||
android:id="@+id/tvActionBarHint"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="6dp"
|
|
||||||
android:layout_marginTop="6dp"
|
|
||||||
android:layout_marginEnd="6dp"
|
|
||||||
android:text="@string/title_message_bar_hint"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
|
||||||
android:textStyle="italic"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/ibActionBarHint"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvSignedData" />
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Group
|
|
||||||
android:id="@+id/grpActionBarHint"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
app:constraint_referenced_ids="ibActionBarHint,tvActionBarHint" />
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
|
@ -734,7 +734,7 @@
|
||||||
<string name="title_ask_help">Help improve FairEmail</string>
|
<string name="title_ask_help">Help improve FairEmail</string>
|
||||||
<string name="title_ask_reporting">Send error reports?</string>
|
<string name="title_ask_reporting">Send error reports?</string>
|
||||||
<string name="title_reporting_why">Error reporting will help improve FairEmail</string>
|
<string name="title_reporting_why">Error reporting will help improve FairEmail</string>
|
||||||
<string name="title_message_bar_hint">The actions for archiving and trashing messages were merged in the bottom action bar and all answer actions have been made available via the answer button</string>
|
<string name="title_reply_hint">You can reply to all, forward, etc via the double arrow action menu just below the message header</string>
|
||||||
|
|
||||||
<string name="title_ask_review">Please review FairEmail</string>
|
<string name="title_ask_review">Please review FairEmail</string>
|
||||||
<string name="title_ask_review_rationale">
|
<string name="title_ask_review_rationale">
|
||||||
|
|
Loading…
Reference in New Issue