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

Compose image buttons

This commit is contained in:
M66B 2019-09-01 18:42:07 +02:00
parent b6b9b0c253
commit 5583455e13
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,6 @@ import android.widget.ArrayAdapter;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FilterQueryProvider; import android.widget.FilterQueryProvider;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.MultiAutoCompleteTextView; import android.widget.MultiAutoCompleteTextView;
import android.widget.Spinner; import android.widget.Spinner;
@ -161,13 +160,13 @@ public class FragmentCompose extends FragmentBase {
private EditText etExtra; private EditText etExtra;
private TextView tvDomain; private TextView tvDomain;
private MultiAutoCompleteTextView etTo; private MultiAutoCompleteTextView etTo;
private ImageView ivToAdd; private ImageButton ibToAdd;
private MultiAutoCompleteTextView etCc; private MultiAutoCompleteTextView etCc;
private ImageView ivCcAdd; private ImageButton ibCcAdd;
private MultiAutoCompleteTextView etBcc; private MultiAutoCompleteTextView etBcc;
private ImageView ivBccAdd; private ImageButton ibBccAdd;
private EditText etSubject; private EditText etSubject;
private ImageView ivCcBcc; private ImageButton ibCcBcc;
private RecyclerView rvAttachment; private RecyclerView rvAttachment;
private TextView tvNoInternetAttachments; private TextView tvNoInternetAttachments;
private EditTextCompose etBody; private EditTextCompose etBody;
@ -254,13 +253,13 @@ public class FragmentCompose extends FragmentBase {
etExtra = view.findViewById(R.id.etExtra); etExtra = view.findViewById(R.id.etExtra);
tvDomain = view.findViewById(R.id.tvDomain); tvDomain = view.findViewById(R.id.tvDomain);
etTo = view.findViewById(R.id.etTo); etTo = view.findViewById(R.id.etTo);
ivToAdd = view.findViewById(R.id.ivToAdd); ibToAdd = view.findViewById(R.id.ivToAdd);
etCc = view.findViewById(R.id.etCc); etCc = view.findViewById(R.id.etCc);
ivCcAdd = view.findViewById(R.id.ivCcAdd); ibCcAdd = view.findViewById(R.id.ivCcAdd);
etBcc = view.findViewById(R.id.etBcc); etBcc = view.findViewById(R.id.etBcc);
ivBccAdd = view.findViewById(R.id.ivBccAdd); ibBccAdd = view.findViewById(R.id.ivBccAdd);
etSubject = view.findViewById(R.id.etSubject); etSubject = view.findViewById(R.id.etSubject);
ivCcBcc = view.findViewById(R.id.ivCcBcc); ibCcBcc = view.findViewById(R.id.ivCcBcc);
rvAttachment = view.findViewById(R.id.rvAttachment); rvAttachment = view.findViewById(R.id.rvAttachment);
tvNoInternetAttachments = view.findViewById(R.id.tvNoInternetAttachments); tvNoInternetAttachments = view.findViewById(R.id.tvNoInternetAttachments);
etBody = view.findViewById(R.id.etBody); etBody = view.findViewById(R.id.etBody);
@ -299,7 +298,7 @@ public class FragmentCompose extends FragmentBase {
etSubject.setMaxLines(Integer.MAX_VALUE); etSubject.setMaxLines(Integer.MAX_VALUE);
etSubject.setHorizontallyScrolling(false); etSubject.setHorizontallyScrolling(false);
ivCcBcc.setOnClickListener(new View.OnClickListener() { ibCcBcc.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
onMenuAddresses(); onMenuAddresses();
@ -332,9 +331,9 @@ public class FragmentCompose extends FragmentBase {
} }
}; };
ivToAdd.setOnClickListener(onPick); ibToAdd.setOnClickListener(onPick);
ivCcAdd.setOnClickListener(onPick); ibCcAdd.setOnClickListener(onPick);
ivBccAdd.setOnClickListener(onPick); ibBccAdd.setOnClickListener(onPick);
setZoom(); setZoom();
@ -437,7 +436,7 @@ public class FragmentCompose extends FragmentBase {
grpHeader.setVisibility(View.GONE); grpHeader.setVisibility(View.GONE);
grpExtra.setVisibility(View.GONE); grpExtra.setVisibility(View.GONE);
grpAddresses.setVisibility(View.GONE); grpAddresses.setVisibility(View.GONE);
ivCcBcc.setVisibility(View.GONE); ibCcBcc.setVisibility(View.GONE);
grpAttachments.setVisibility(View.GONE); grpAttachments.setVisibility(View.GONE);
tvNoInternet.setVisibility(View.GONE); tvNoInternet.setVisibility(View.GONE);
grpBody.setVisibility(View.GONE); grpBody.setVisibility(View.GONE);
@ -2339,7 +2338,7 @@ public class FragmentCompose extends FragmentBase {
grpHeader.setVisibility(View.VISIBLE); grpHeader.setVisibility(View.VISIBLE);
grpAddresses.setVisibility("reply_all".equals(action) ? View.VISIBLE : View.GONE); grpAddresses.setVisibility("reply_all".equals(action) ? View.VISIBLE : View.GONE);
ivCcBcc.setVisibility(View.VISIBLE); ibCcBcc.setVisibility(View.VISIBLE);
bottom_navigation.getMenu().findItem(R.id.action_undo).setVisible(draft.revision != null && draft.revision > 1); bottom_navigation.getMenu().findItem(R.id.action_undo).setVisible(draft.revision != null && draft.revision > 1);
bottom_navigation.getMenu().findItem(R.id.action_redo).setVisible(draft.revision != null && !draft.revision.equals(draft.revisions)); bottom_navigation.getMenu().findItem(R.id.action_redo).setVisible(draft.revision != null && !draft.revision.equals(draft.revisions));

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

@ -64,12 +64,13 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etExtra" /> app:layout_constraintTop_toBottomOf="@id/etExtra" />
<ImageView <ImageButton
android:id="@+id/ivToAdd" android:id="@+id/ivToAdd"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_pick" android:contentDescription="@string/title_legend_pick"
app:layout_constraintBottom_toBottomOf="@id/etTo" app:layout_constraintBottom_toBottomOf="@id/etTo"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -90,12 +91,13 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/etTo" /> app:layout_constraintTop_toBottomOf="@+id/etTo" />
<ImageView <ImageButton
android:id="@+id/ivCcAdd" android:id="@+id/ivCcAdd"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_pick" android:contentDescription="@string/title_legend_pick"
app:layout_constraintBottom_toBottomOf="@id/etCc" app:layout_constraintBottom_toBottomOf="@id/etCc"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -116,12 +118,13 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/etCc" /> app:layout_constraintTop_toBottomOf="@+id/etCc" />
<ImageView <ImageButton
android:id="@+id/ivBccAdd" android:id="@+id/ivBccAdd"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_pick" android:contentDescription="@string/title_legend_pick"
app:layout_constraintBottom_toBottomOf="@id/etBcc" app:layout_constraintBottom_toBottomOf="@id/etBcc"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -142,12 +145,13 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/etBcc" /> app:layout_constraintTop_toBottomOf="@+id/etBcc" />
<ImageView <ImageButton
android:id="@+id/ivCcBcc" android:id="@+id/ivCcBcc"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_show_addresses" android:contentDescription="@string/title_show_addresses"
app:layout_constraintBottom_toBottomOf="@id/etSubject" app:layout_constraintBottom_toBottomOf="@id/etSubject"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"