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

Use buttons for folder favorites

Browse Source
pull/194/merge
M66B 4 years ago
parent ee7faec82b
commit fecf5ccfc5
2 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File

27
app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
Unescape View File

@ -33,6 +33,7 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView; import android.widget.AutoCompleteTextView;
import android.widget.Button;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.TextView; import android.widget.TextView;
@ -87,9 +88,9 @@ public class FragmentDialogFolder extends FragmentDialogBase {
final AutoCompleteTextView etSearch = dview.findViewById(R.id.etSearch); final AutoCompleteTextView etSearch = dview.findViewById(R.id.etSearch);
final ImageButton ibNext = dview.findViewById(R.id.ibNext); final ImageButton ibNext = dview.findViewById(R.id.ibNext);
final TextView tvNoFolder = dview.findViewById(R.id.tvNoFolder); final TextView tvNoFolder = dview.findViewById(R.id.tvNoFolder);
final TextView tvFavorite1 = dview.findViewById(R.id.tvFavorite1); final Button btnFavorite1 = dview.findViewById(R.id.btnFavorite1);
final TextView tvFavorite2 = dview.findViewById(R.id.tvFavorite2); final Button btnFavorite2 = dview.findViewById(R.id.btnFavorite2);
final TextView tvFavorite3 = dview.findViewById(R.id.tvFavorite3); final Button btnFavorite3 = dview.findViewById(R.id.btnFavorite3);
final ImageButton ibResetFavorites = dview.findViewById(R.id.ibResetFavorites); final ImageButton ibResetFavorites = dview.findViewById(R.id.ibResetFavorites);
final RecyclerView rvFolder = dview.findViewById(R.id.rvFolder); final RecyclerView rvFolder = dview.findViewById(R.id.rvFolder);
final ContentLoadingProgressBar pbWait = dview.findViewById(R.id.pbWait); final ContentLoadingProgressBar pbWait = dview.findViewById(R.id.pbWait);
@ -163,9 +164,9 @@ public class FragmentDialogFolder extends FragmentDialogBase {
} }
}); });
tvFavorite1.setVisibility(View.GONE); btnFavorite1.setVisibility(View.GONE);
tvFavorite2.setVisibility(View.GONE); btnFavorite2.setVisibility(View.GONE);
tvFavorite3.setVisibility(View.GONE); btnFavorite3.setVisibility(View.GONE);
ibResetFavorites.setVisibility(View.GONE); ibResetFavorites.setVisibility(View.GONE);
View.OnClickListener listener = new View.OnClickListener() { View.OnClickListener listener = new View.OnClickListener() {
@ -184,16 +185,16 @@ public class FragmentDialogFolder extends FragmentDialogBase {
dismiss(); dismiss();
} }
}; };
tvFavorite1.setOnClickListener(listener); btnFavorite1.setOnClickListener(listener);
tvFavorite2.setOnClickListener(listener); btnFavorite2.setOnClickListener(listener);
tvFavorite3.setOnClickListener(listener); btnFavorite3.setOnClickListener(listener);
ibResetFavorites.setOnClickListener(new View.OnClickListener() { ibResetFavorites.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
tvFavorite1.setVisibility(View.GONE); btnFavorite1.setVisibility(View.GONE);
tvFavorite2.setVisibility(View.GONE); btnFavorite2.setVisibility(View.GONE);
tvFavorite3.setVisibility(View.GONE); btnFavorite3.setVisibility(View.GONE);
ibResetFavorites.setVisibility(View.GONE); ibResetFavorites.setVisibility(View.GONE);
final DB db = DB.getInstance(context); final DB db = DB.getInstance(context);
@ -306,7 +307,7 @@ public class FragmentDialogFolder extends FragmentDialogBase {
tvNoFolder.setVisibility(View.VISIBLE); tvNoFolder.setVisibility(View.VISIBLE);
else { else {
if (data.favorites != null && data.favorites.size() > 0) { if (data.favorites != null && data.favorites.size() > 0) {
TextView[] tv = new TextView[]{tvFavorite1, tvFavorite2, tvFavorite3}; TextView[] tv = new TextView[]{btnFavorite1, btnFavorite2, btnFavorite3};
for (int i = 0; i < data.favorites.size(); i++) { for (int i = 0; i < data.favorites.size(); i++) {
EntityFolder favorite = data.favorites.get(i); EntityFolder favorite = data.favorites.get(i);
tv[i].setTag(favorite.id); tv[i].setTag(favorite.id);

40
app/src/main/res/layout/dialog_folder_select.xml
Unescape View File

@ -41,58 +41,46 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/etSearch" /> app:layout_constraintTop_toBottomOf="@+id/etSearch" />
<eu.faircode.email.FixedTextView <Button
android:id="@+id/tvFavorite1" android:id="@+id/btnFavorite1"
style="?android:attr/buttonStyleSmall"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:ellipsize="start" android:ellipsize="start"
android:padding="6dp" android:padding="6dp"
android:singleLine="true" android:singleLine="true"
android:text="favorite1" android:text="favorite1"
android:textAlignment="center" app:layout_constraintEnd_toStartOf="@+id/btnFavorite2"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorLink"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/tvFavorite2"
app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvNoFolder" /> app:layout_constraintTop_toBottomOf="@id/tvNoFolder" />
<eu.faircode.email.FixedTextView <Button
android:id="@+id/tvFavorite2" android:id="@+id/btnFavorite2"
style="?android:attr/buttonStyleSmall"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:ellipsize="start" android:ellipsize="start"
android:padding="6dp" android:padding="6dp"
android:singleLine="true" android:singleLine="true"
android:text="favorite2" android:text="favorite2"
android:textAlignment="center" app:layout_constraintEnd_toStartOf="@+id/btnFavorite3"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorLink"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/tvFavorite3"
app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintStart_toEndOf="@id/tvFavorite1" app:layout_constraintStart_toEndOf="@id/btnFavorite1"
app:layout_constraintTop_toBottomOf="@id/tvNoFolder" /> app:layout_constraintTop_toBottomOf="@id/tvNoFolder" />
<eu.faircode.email.FixedTextView <Button
android:id="@+id/tvFavorite3" android:id="@+id/btnFavorite3"
style="?android:attr/buttonStyleSmall"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:ellipsize="start" android:ellipsize="start"
android:padding="6dp" android:padding="6dp"
android:singleLine="true" android:singleLine="true"
android:text="favorite3" android:text="favorite3"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorLink"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/ibResetFavorites" app:layout_constraintEnd_toStartOf="@+id/ibResetFavorites"
app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintStart_toEndOf="@id/tvFavorite2" app:layout_constraintStart_toEndOf="@id/btnFavorite2"
app:layout_constraintTop_toBottomOf="@id/tvNoFolder" /> app:layout_constraintTop_toBottomOf="@id/tvNoFolder" />
<eu.faircode.email.FixedImageButton <eu.faircode.email.FixedImageButton
@ -121,7 +109,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
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/tvFavorite1" /> app:layout_constraintTop_toBottomOf="@+id/btnFavorite1" />
<eu.faircode.email.ContentLoadingProgressBar <eu.faircode.email.ContentLoadingProgressBar
android:id="@+id/pbWait" android:id="@+id/pbWait"

Write Preview
Loading…
Cancel
Save