mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move Cc/Bcc toggle after subject

This commit is contained in:
M66B 2019-04-30 19:24:07 +02:00
parent 1146117e57
commit 5a403f9979
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,6 +152,7 @@ public class FragmentCompose extends FragmentBase {
private MultiAutoCompleteTextView etBcc;
private ImageView ivBccAdd;
private EditText etSubject;
private ImageView ivCcBcc;
private RecyclerView rvAttachment;
private TextView tvNoInternetAttachments;
private EditText etBody;
@ -222,6 +223,7 @@ public class FragmentCompose extends FragmentBase {
etBcc = view.findViewById(R.id.etBcc);
ivBccAdd = view.findViewById(R.id.ivBccAdd);
etSubject = view.findViewById(R.id.etSubject);
ivCcBcc = view.findViewById(R.id.ivCcBcc);
rvAttachment = view.findViewById(R.id.rvAttachment);
tvNoInternetAttachments = view.findViewById(R.id.tvNoInternetAttachments);
etBody = view.findViewById(R.id.etBody);
@ -300,6 +302,13 @@ public class FragmentCompose extends FragmentBase {
etSubject.setMaxLines(Integer.MAX_VALUE);
etSubject.setHorizontallyScrolling(false);
ivCcBcc.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onMenuAddresses();
}
});
View.OnClickListener onPick = new View.OnClickListener() {
@Override
public void onClick(View view) {
@ -781,7 +790,8 @@ public class FragmentCompose extends FragmentBase {
public void onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
menu.findItem(R.id.menu_addresses).setVisible(working >= 0);
menu.findItem(R.id.menu_addresses).setVisible(false);
//menu.findItem(R.id.menu_addresses).setVisible(working >= 0);
menu.findItem(R.id.menu_zoom).setVisible(state == State.LOADED);
menu.findItem(R.id.menu_style_toolbar).setVisible(state == State.LOADED);
menu.findItem(R.id.menu_image).setVisible(state == State.LOADED && !style);

16
app/src/main/res/layout/fragment_compose.xml
View File

@ -134,15 +134,27 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:hint="@string/title_subject"
android:imeOptions="actionNext"
android:inputType="textEmailSubject|textCapSentences|textAutoCorrect"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toStartOf="@+id/ivCcBcc"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/etBcc" />
<ImageView
android:id="@+id/ivCcBcc"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_pick"
android:src="@drawable/baseline_people_24"
app:layout_constraintBottom_toBottomOf="@id/etSubject"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/etSubject"
app:layout_constraintTop_toTopOf="@+id/etSubject" />
<View
android:id="@+id/vSeparatorAttachments"
android:layout_width="match_parent"