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

Added compact folder view

Browse Source
pull/162/head
M66B 5 years ago
parent 7d501acf96
commit e405bcd8f9
5 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File

36
app/src/main/java/eu/faircode/email/AdapterFolder.java
Unescape View File

@ -45,6 +45,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.appcompat.widget.PopupMenu;
import androidx.constraintlayout.widget.Group;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
@ -68,6 +69,7 @@ import static android.app.Activity.RESULT_OK;
public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder> {
private Fragment parentFragment;
private long account;
private boolean show_compact;
private boolean show_hidden;
private IFolderSelectedListener listener;
@ -118,6 +120,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
private TextView tvError;
private Button btnHelp;
private Group grpExtended;
private TwoStateOwner powner = new TwoStateOwner(owner, "FolderPopup");
ViewHolder(View itemView) {
@ -149,6 +153,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
tvKeywords = itemView.findViewById(R.id.tvKeywords);
tvError = itemView.findViewById(R.id.tvError);
btnHelp = itemView.findViewById(R.id.btnHelp);
grpExtended = itemView.findViewById(R.id.grpExtended);
}
private void wire() {
@ -209,7 +215,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
? View.VISIBLE : View.INVISIBLE);
if (folder.selectable)
ivReadOnly.setVisibility(folder.read_only ? View.VISIBLE : View.GONE);
ivReadOnly.setVisibility(!show_compact && folder.read_only ? View.VISIBLE : View.GONE);
}
ViewGroup.LayoutParams lp = vwLevel.getLayoutParams();
@ -254,11 +260,11 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
? R.drawable.baseline_mail_24 : R.drawable.baseline_mail_outline_24);
}
if (folder.selectable) {
ivType.setVisibility(View.VISIBLE);
if (folder.selectable)
ivType.setImageResource(EntityFolder.getIcon(folder.type));
} else if (listener != null)
ivType.setVisibility(View.GONE);
if (listener != null)
ivType.setVisibility(folder.selectable ? View.VISIBLE : View.GONE);
if (listener == null && folder.selectable) {
if (account < 0)
@ -300,6 +306,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
tvError.setVisibility(folder.error != null ? View.VISIBLE : View.GONE);
if (btnHelp != null)
btnHelp.setVisibility(folder.error == null ? View.GONE : View.VISIBLE);
grpExtended.setVisibility(show_compact ? View.GONE : View.VISIBLE);
}
}
@ -679,13 +687,14 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
}
}
AdapterFolder(Fragment parentFragment, long account, boolean show_hidden, IFolderSelectedListener listener) {
this(parentFragment.getContext(), parentFragment.getViewLifecycleOwner(), account, show_hidden, listener);
AdapterFolder(Fragment parentFragment, long account, boolean show_compact, boolean show_hidden, IFolderSelectedListener listener) {
this(parentFragment.getContext(), parentFragment.getViewLifecycleOwner(), account, show_compact, show_hidden, listener);
this.parentFragment = parentFragment;
}
AdapterFolder(Context context, LifecycleOwner owner, long account, boolean show_hidden, IFolderSelectedListener listener) {
AdapterFolder(Context context, LifecycleOwner owner, long account, boolean show_compact, boolean show_hidden, IFolderSelectedListener listener) {
this.account = account;
this.show_compact = show_compact;
this.show_hidden = show_hidden;
this.listener = listener;
@ -725,6 +734,13 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
});
}
void setCompact(boolean compact) {
if (this.show_compact != compact) {
this.show_compact = compact;
notifyDataSetChanged();
}
}
void setShowHidden(boolean show_hidden) {
if (this.show_hidden != show_hidden) {
this.show_hidden = show_hidden;
@ -904,9 +920,9 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
@Override
public int getItemViewType(int position) {
if (listener == null) {
if (listener == null)
return (items.get(position).selectable ? R.layout.item_folder : R.layout.item_folder_unselectable);
} else
else
return R.layout.item_folder_select;
}

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

@ -54,7 +54,7 @@ public class FragmentDialogFolder extends FragmentDialogBase {
rvFolder.setLayoutManager(llm);
final AdapterFolder adapter = new AdapterFolder(getContext(), getViewLifecycleOwner(),
account, false, new AdapterFolder.IFolderSelectedListener() {
account, false, false, new AdapterFolder.IFolderSelectedListener() {
@Override
public void onFolderSelected(TupleFolderEx folder) {
Bundle args = getArguments();

18
app/src/main/java/eu/faircode/email/FragmentFolders.java
Unescape View File

@ -69,6 +69,7 @@ public class FragmentFolders extends FragmentBase {
private FloatingActionButton fabError;
private boolean cards;
private boolean compact;
private long account;
private boolean show_hidden = false;
@ -89,6 +90,7 @@ public class FragmentFolders extends FragmentBase {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
cards = prefs.getBoolean("cards", true);
compact = prefs.getBoolean("compact_folders", false);
setTitle(R.string.page_folders);
}
@ -160,7 +162,7 @@ public class FragmentFolders extends FragmentBase {
rvFolder.addItemDecoration(itemDecorator);
}
adapter = new AdapterFolder(this, account, show_hidden, null);
adapter = new AdapterFolder(this, account, compact, show_hidden, null);
rvFolder.setAdapter(adapter);
fab.setOnClickListener(new View.OnClickListener() {
@ -397,6 +399,7 @@ public class FragmentFolders extends FragmentBase {
@Override
public void onPrepareOptionsMenu(Menu menu) {
menu.findItem(R.id.menu_compact).setChecked(compact);
menu.findItem(R.id.menu_show_hidden).setChecked(show_hidden);
super.onPrepareOptionsMenu(menu);
}
@ -404,6 +407,9 @@ public class FragmentFolders extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_compact:
onMenuCompact();
return true;
case R.id.menu_show_hidden:
onMenuShowHidden();
return true;
@ -412,6 +418,16 @@ public class FragmentFolders extends FragmentBase {
}
}
private void onMenuCompact() {
compact = !compact;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
prefs.edit().putBoolean("compact_folders", compact).apply();
getActivity().invalidateOptionsMenu();
adapter.setCompact(compact);
}
private void onMenuShowHidden() {
show_hidden = !show_hidden;
getActivity().invalidateOptionsMenu();

6
app/src/main/res/layout/item_folder.xml
Unescape View File

@ -262,6 +262,12 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnHelp" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpExtended"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="ivType,tvType,tvTotal,tvAfter,ivSync" />
</androidx.constraintlayout.widget.ConstraintLayout>
</eu.faircode.email.ViewCardOptional>
</FrameLayout>

6
app/src/main/res/menu/menu_folders.xml
Unescape View File

@ -9,6 +9,12 @@
app:actionViewClass="eu.faircode.email.SearchViewEx"
app:showAsAction="collapseActionView|always" />
<item
android:id="@+id/menu_compact"
android:checkable="true"
android:title="@string/title_compact"
app:showAsAction="never" />
<item
android:id="@+id/menu_show_hidden"
android:checkable="true"

Write Preview
Loading…
Cancel
Save