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

Folder done

This commit is contained in:
M66B 2020-09-28 19:06:14 +02:00
parent ca884e520f
commit 67761051c5
7 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/AdapterNavAccount.java
View File

@ -90,8 +90,8 @@ public class AdapterNavAccount extends RecyclerView.Adapter<AdapterNavAccount.Vi
private void bindTo(TupleAccountEx account) {
ivItem.setImageResource("connected".equals(account.state)
? account.primary ? R.drawable.baseline_folder_special_24 : R.drawable.baseline_folder_24
: R.drawable.twotone_folder_open_24);
? account.primary ? R.drawable.twotone_folder_special_24 : R.drawable.twotone_folder_done_24
: R.drawable.twotone_folder_24);
if (account.color == null)
ivItem.clearColorFilter();

4
app/src/main/java/eu/faircode/email/AdapterNavFolder.java
View File

@ -102,8 +102,8 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
ivItem.setImageResource(R.drawable.twotone_dns_24);
else
ivItem.setImageResource("connected".equals(folder.state)
? R.drawable.baseline_folder_24
: R.drawable.twotone_folder_open_24);
? R.drawable.twotone_folder_done_24
: R.drawable.twotone_folder_24);
if (folder.accountColor == null || !ActivityBilling.isPro(context))
ivItem.clearColorFilter();

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

@ -3783,7 +3783,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
menu.findItem(R.id.menu_folders).setActionView(R.layout.action_button);
ImageButton ib = (ImageButton) menu.findItem(R.id.menu_folders).getActionView();
ib.setImageResource(R.drawable.twotone_folder_open_24);
ib.setImageResource(R.drawable.twotone_folder_24);
ib.setContentDescription(getString(R.string.title_legend_section_folders));
ib.setOnClickListener(new View.OnClickListener() {
@Override
@ -3834,7 +3834,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
menu.findItem(R.id.menu_folders).setVisible(viewType == AdapterMessage.ViewType.UNIFIED && primary >= 0);
ImageButton ib = (ImageButton) menu.findItem(R.id.menu_folders).getActionView();
ib.setImageResource(connected
? R.drawable.baseline_folder_special_24 : R.drawable.twotone_folder_open_24);
? R.drawable.baseline_folder_special_24 : R.drawable.twotone_folder_24);
menu.findItem(R.id.menu_sort_on).setVisible(viewType != AdapterMessage.ViewType.SEARCH);

22
app/src/main/res/drawable/twotone_folder_done_24.xml Normal file
View File

@ -0,0 +1,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillAlpha="0.3"
android:fillColor="@android:color/white"
android:pathData="M11.17,8l-0.58,-0.59L9.17,6H4v12h16V8h-8z"
android:strokeAlpha="0.3" />
<path
android:fillColor="@android:color/white"
android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,6h5.17l1.41,1.41 0.59,0.59L20,8v10z" />
<group
android:translateX="0.5"
android:translateY="0.0">
<path
android:fillColor="@android:color/white"
android:pathData="M10,14.18l-2.09,-2.09L6.5,13.5 10,17l6.01,-6.01 -1.41,-1.41z" />
</group>
</vector>

15
app/src/main/res/drawable/twotone_folder_open_24.xml
View File

@ -1,15 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M4,8h16v10H4z"
android:strokeAlpha="0.3"
android:fillAlpha="0.3"/>
<path
android:fillColor="@android:color/white"
android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/>
</vector>

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

@ -38,18 +38,18 @@
android:id="@+id/ivPrimaryConnected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/title_legend_primary_connected"
android:contentDescription="@string/title_legend_folder_connected"
android:padding="12dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivOAuth"
app:srcCompat="@drawable/baseline_folder_24" />
app:srcCompat="@drawable/twotone_folder_done_24" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvPrimaryConnected"
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center_vertical"
android:text="@string/title_legend_primary_connected"
android:text="@string/title_legend_folder_connected"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintBottom_toBottomOf="@id/ivPrimaryConnected"
app:layout_constraintEnd_toEndOf="parent"
@ -60,18 +60,18 @@
android:id="@+id/ivPrimaryDisconnected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/title_legend_primary_disconnected"
android:contentDescription="@string/title_legend_folder_disconnected"
android:padding="12dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivPrimaryConnected"
app:srcCompat="@drawable/twotone_folder_open_24" />
app:srcCompat="@drawable/twotone_folder_24" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvPrimaryDisconnected"
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center_vertical"
android:text="@string/title_legend_primary_disconnected"
android:text="@string/title_legend_folder_disconnected"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintBottom_toBottomOf="@id/ivPrimaryDisconnected"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/values/strings.xml
View File

@ -1173,8 +1173,8 @@
<string name="title_legend_section_keyboard">Keyboard</string>
<string name="title_legend_oauth">OAuth authorization</string>
<string name="title_legend_primary_connected">Account connected</string>
<string name="title_legend_primary_disconnected">Account disconnected</string>
<string name="title_legend_folder_connected">Folder connected</string>
<string name="title_legend_folder_disconnected">Folder disconnected</string>
<string name="title_legend_download_on">Download message content automatically</string>
<string name="title_legend_download_off">Download message content on demand</string>
<string name="title_legend_synchronize_on">Synchronize on</string>