Browse Source

Move folders to navigation menu, navigate by account

main
M66B 6 years ago
parent
commit
d075f56e2d
167 changed files with 287 additions and 347 deletions
  1. +57
    -60
      app/src/main/java/eu/faircode/email/ActivityView.java
  2. +14
    -12
      app/src/main/java/eu/faircode/email/AdapterFolder.java
  3. +0
    -7
      app/src/main/java/eu/faircode/email/FragmentAbout.java
  4. +0
    -7
      app/src/main/java/eu/faircode/email/FragmentFolders.java
  5. BIN
      app/src/main/res/drawable-hdpi/baseline_help_black_18.png
  6. BIN
      app/src/main/res/drawable-hdpi/baseline_help_black_24.png
  7. BIN
      app/src/main/res/drawable-hdpi/baseline_help_black_36.png
  8. BIN
      app/src/main/res/drawable-hdpi/baseline_help_black_48.png
  9. BIN
      app/src/main/res/drawable-hdpi/baseline_help_white_18.png
  10. BIN
      app/src/main/res/drawable-hdpi/baseline_help_white_24.png
  11. BIN
      app/src/main/res/drawable-hdpi/baseline_help_white_36.png
  12. BIN
      app/src/main/res/drawable-hdpi/baseline_help_white_48.png
  13. BIN
      app/src/main/res/drawable-hdpi/baseline_question_answer_black_18.png
  14. BIN
      app/src/main/res/drawable-hdpi/baseline_question_answer_black_24.png
  15. BIN
      app/src/main/res/drawable-hdpi/baseline_question_answer_black_36.png
  16. BIN
      app/src/main/res/drawable-hdpi/baseline_question_answer_black_48.png
  17. BIN
      app/src/main/res/drawable-hdpi/baseline_question_answer_white_18.png
  18. BIN
      app/src/main/res/drawable-hdpi/baseline_question_answer_white_24.png
  19. BIN
      app/src/main/res/drawable-hdpi/baseline_question_answer_white_36.png
  20. BIN
      app/src/main/res/drawable-hdpi/baseline_question_answer_white_48.png
  21. BIN
      app/src/main/res/drawable-hdpi/baseline_settings_applications_black_18.png
  22. BIN
      app/src/main/res/drawable-hdpi/baseline_settings_applications_black_24.png
  23. BIN
      app/src/main/res/drawable-hdpi/baseline_settings_applications_black_36.png
  24. BIN
      app/src/main/res/drawable-hdpi/baseline_settings_applications_black_48.png
  25. BIN
      app/src/main/res/drawable-hdpi/baseline_settings_applications_white_18.png
  26. BIN
      app/src/main/res/drawable-hdpi/baseline_settings_applications_white_24.png
  27. BIN
      app/src/main/res/drawable-hdpi/baseline_settings_applications_white_36.png
  28. BIN
      app/src/main/res/drawable-hdpi/baseline_settings_applications_white_48.png
  29. BIN
      app/src/main/res/drawable-mdpi/baseline_help_black_18.png
  30. BIN
      app/src/main/res/drawable-mdpi/baseline_help_black_24.png
  31. BIN
      app/src/main/res/drawable-mdpi/baseline_help_black_36.png
  32. BIN
      app/src/main/res/drawable-mdpi/baseline_help_black_48.png
  33. BIN
      app/src/main/res/drawable-mdpi/baseline_help_white_18.png
  34. BIN
      app/src/main/res/drawable-mdpi/baseline_help_white_24.png
  35. BIN
      app/src/main/res/drawable-mdpi/baseline_help_white_36.png
  36. BIN
      app/src/main/res/drawable-mdpi/baseline_help_white_48.png
  37. BIN
      app/src/main/res/drawable-mdpi/baseline_question_answer_black_18.png
  38. BIN
      app/src/main/res/drawable-mdpi/baseline_question_answer_black_24.png
  39. BIN
      app/src/main/res/drawable-mdpi/baseline_question_answer_black_36.png
  40. BIN
      app/src/main/res/drawable-mdpi/baseline_question_answer_black_48.png
  41. BIN
      app/src/main/res/drawable-mdpi/baseline_question_answer_white_18.png
  42. BIN
      app/src/main/res/drawable-mdpi/baseline_question_answer_white_24.png
  43. BIN
      app/src/main/res/drawable-mdpi/baseline_question_answer_white_36.png
  44. BIN
      app/src/main/res/drawable-mdpi/baseline_question_answer_white_48.png
  45. BIN
      app/src/main/res/drawable-mdpi/baseline_settings_applications_black_18.png
  46. BIN
      app/src/main/res/drawable-mdpi/baseline_settings_applications_black_24.png
  47. BIN
      app/src/main/res/drawable-mdpi/baseline_settings_applications_black_36.png
  48. BIN
      app/src/main/res/drawable-mdpi/baseline_settings_applications_black_48.png
  49. BIN
      app/src/main/res/drawable-mdpi/baseline_settings_applications_white_18.png
  50. BIN
      app/src/main/res/drawable-mdpi/baseline_settings_applications_white_24.png
  51. BIN
      app/src/main/res/drawable-mdpi/baseline_settings_applications_white_36.png
  52. BIN
      app/src/main/res/drawable-mdpi/baseline_settings_applications_white_48.png
  53. BIN
      app/src/main/res/drawable-xhdpi/baseline_help_black_18.png
  54. BIN
      app/src/main/res/drawable-xhdpi/baseline_help_black_24.png
  55. BIN
      app/src/main/res/drawable-xhdpi/baseline_help_black_36.png
  56. BIN
      app/src/main/res/drawable-xhdpi/baseline_help_black_48.png
  57. BIN
      app/src/main/res/drawable-xhdpi/baseline_help_white_18.png
  58. BIN
      app/src/main/res/drawable-xhdpi/baseline_help_white_24.png
  59. BIN
      app/src/main/res/drawable-xhdpi/baseline_help_white_36.png
  60. BIN
      app/src/main/res/drawable-xhdpi/baseline_help_white_48.png
  61. BIN
      app/src/main/res/drawable-xhdpi/baseline_question_answer_black_18.png
  62. BIN
      app/src/main/res/drawable-xhdpi/baseline_question_answer_black_24.png
  63. BIN
      app/src/main/res/drawable-xhdpi/baseline_question_answer_black_36.png
  64. BIN
      app/src/main/res/drawable-xhdpi/baseline_question_answer_black_48.png
  65. BIN
      app/src/main/res/drawable-xhdpi/baseline_question_answer_white_18.png
  66. BIN
      app/src/main/res/drawable-xhdpi/baseline_question_answer_white_24.png
  67. BIN
      app/src/main/res/drawable-xhdpi/baseline_question_answer_white_36.png
  68. BIN
      app/src/main/res/drawable-xhdpi/baseline_question_answer_white_48.png
  69. BIN
      app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_18.png
  70. BIN
      app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_24.png
  71. BIN
      app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_36.png
  72. BIN
      app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_48.png
  73. BIN
      app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_18.png
  74. BIN
      app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_24.png
  75. BIN
      app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_36.png
  76. BIN
      app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_48.png
  77. BIN
      app/src/main/res/drawable-xxhdpi/baseline_help_black_18.png
  78. BIN
      app/src/main/res/drawable-xxhdpi/baseline_help_black_24.png
  79. BIN
      app/src/main/res/drawable-xxhdpi/baseline_help_black_36.png
  80. BIN
      app/src/main/res/drawable-xxhdpi/baseline_help_black_48.png
  81. BIN
      app/src/main/res/drawable-xxhdpi/baseline_help_white_18.png
  82. BIN
      app/src/main/res/drawable-xxhdpi/baseline_help_white_24.png
  83. BIN
      app/src/main/res/drawable-xxhdpi/baseline_help_white_36.png
  84. BIN
      app/src/main/res/drawable-xxhdpi/baseline_help_white_48.png
  85. BIN
      app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_18.png
  86. BIN
      app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_24.png
  87. BIN
      app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_36.png
  88. BIN
      app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_48.png
  89. BIN
      app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_18.png
  90. BIN
      app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_24.png
  91. BIN
      app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_36.png
  92. BIN
      app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_48.png
  93. BIN
      app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_18.png
  94. BIN
      app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_24.png
  95. BIN
      app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_36.png
  96. BIN
      app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_48.png
  97. BIN
      app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_18.png
  98. BIN
      app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_24.png
  99. BIN
      app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_36.png
  100. BIN
      app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_48.png

+ 57
- 60
app/src/main/java/eu/faircode/email/ActivityView.java View File

@ -38,18 +38,20 @@ import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.ActionBarDrawerToggle;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import java.text.Collator;
import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Locale;
public class ActivityView extends ActivityBase implements FragmentManager.OnBackStackChangedListener, SharedPreferences.OnSharedPreferenceChangeListener { public class ActivityView extends ActivityBase implements FragmentManager.OnBackStackChangedListener, SharedPreferences.OnSharedPreferenceChangeListener {
private boolean newIntent = false; private boolean newIntent = false;
@ -101,8 +103,8 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
DrawerItem item = (DrawerItem) parent.getAdapter().getItem(position); DrawerItem item = (DrawerItem) parent.getAdapter().getItem(position);
switch (item.getId()) { switch (item.getId()) {
case R.string.menu_folders:
onMenuFolders();
case -1:
onMenuFolders((long) item.getData());
break; break;
case R.string.menu_setup: case R.string.menu_setup:
onMenuSetup(); onMenuSetup();
@ -115,15 +117,39 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
break; break;
} }
if (!item.isCheckable())
drawerLayout.closeDrawer(drawerList);
drawerLayout.closeDrawer(drawerList);
} }
}); });
PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this); PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
getSupportFragmentManager().addOnBackStackChangedListener(this); getSupportFragmentManager().addOnBackStackChangedListener(this);
updateDrawer();
DB.getInstance(this).account().liveAccounts().observe(this, new Observer<List<EntityAccount>>() {
@Override
public void onChanged(@Nullable List<EntityAccount> accounts) {
ArrayAdapterDrawer drawerArray = new ArrayAdapterDrawer(ActivityView.this, R.layout.item_drawer);
final Collator collator = Collator.getInstance(Locale.getDefault());
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
Collections.sort(accounts, new Comparator<EntityAccount>() {
@Override
public int compare(EntityAccount a1, EntityAccount a2) {
return collator.compare(a1.name, a2.name);
}
});
for (EntityAccount account : accounts)
drawerArray.add(new DrawerItem(-1, R.drawable.baseline_folder_24, account.name, account.id));
drawerArray.add(new DrawerItem(ActivityView.this, R.drawable.baseline_settings_applications_24, R.string.menu_setup));
if (getIntentFAQ().resolveActivity(getPackageManager()) != null)
drawerArray.add(new DrawerItem(ActivityView.this, R.drawable.baseline_question_answer_24, R.string.menu_faq));
drawerArray.add(new DrawerItem(ActivityView.this, R.drawable.baseline_help_24, R.string.menu_about));
drawerList.setAdapter(drawerArray);
}
});
if (getSupportFragmentManager().getFragments().size() == 0) if (getSupportFragmentManager().getFragments().size() == 0)
init(); init();
@ -216,20 +242,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
init(); init();
} }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.menu_view, menu);
return true;
}
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
menu.findItem(R.id.menu_folders).setVisible(prefs.getBoolean("eula" , false));
return super.onPrepareOptionsMenu(menu);
}
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
if (drawerToggle.onOptionsItemSelected(item)) if (drawerToggle.onOptionsItemSelected(item))
@ -239,9 +251,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
case android.R.id.home: case android.R.id.home:
getSupportFragmentManager().popBackStack(); getSupportFragmentManager().popBackStack();
return true; return true;
case R.id.menu_folders:
onMenuFolders();
return true;
default: default:
return false; return false;
} }
@ -280,26 +289,23 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
} }
} }
public void updateDrawer() {
ArrayAdapterDrawer drawerArray = new ArrayAdapterDrawer(this, R.layout.item_drawer);
drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_setup));
if (getIntentFAQ().resolveActivity(getPackageManager()) != null)
drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_faq));
drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_about));
drawerList.setAdapter(drawerArray);
}
private Intent getIntentFAQ() { private Intent getIntentFAQ() {
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse("https://github.com/M66B/open-source-email/blob/master/FAQ.md")); intent.setData(Uri.parse("https://github.com/M66B/open-source-email/blob/master/FAQ.md"));
return intent; return intent;
} }
private void onMenuFolders() {
private void onMenuFolders(long account) {
getSupportFragmentManager().popBackStack("unified" , 0); getSupportFragmentManager().popBackStack("unified" , 0);
Bundle args = new Bundle();
args.putLong("account" , account);
FragmentFolders fragment = new FragmentFolders();
fragment.setArguments(args);
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentFolders()).addToBackStack("folders");
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("folders");
fragmentTransaction.commit(); fragmentTransaction.commit();
} }
@ -319,38 +325,29 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
private class DrawerItem { private class DrawerItem {
private int id; private int id;
private int icon;
private String title; private String title;
private boolean checkable;
private boolean checked;
private Object data;
DrawerItem(Context context, int title) {
DrawerItem(Context context, int icon, int title) {
this.id = title; this.id = title;
this.icon = icon;
this.title = context.getString(title); this.title = context.getString(title);
this.checkable = false;
this.checked = false;
} }
DrawerItem(Context context, int title, boolean checked) {
this.id = title;
this.title = context.getString(title);
this.checkable = true;
this.checked = checked;
DrawerItem(int id, int icon, String title, Object data) {
this.id = id;
this.icon = icon;
this.title = title;
this.data = data;
} }
public int getId() { public int getId() {
return this.id; return this.id;
} }
public String getTitle() {
return this.title;
}
public boolean isCheckable() {
return this.checkable;
}
public boolean isChecked() {
return this.checked;
public Object getData() {
return this.data;
} }
} }
@ -372,11 +369,11 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
DrawerItem item = getItem(position); DrawerItem item = getItem(position);
ImageView iv = row.findViewById(R.id.ivItem);
TextView tv = row.findViewById(R.id.tvItem); TextView tv = row.findViewById(R.id.tvItem);
CheckBox cb = row.findViewById(R.id.cbItem);
tv.setText(item.getTitle());
cb.setVisibility(item.isCheckable() ? View.VISIBLE : View.GONE);
cb.setChecked(item.isChecked());
iv.setImageResource(item.icon);
tv.setText(item.title);
return row; return row;
} }


+ 14
- 12
app/src/main/java/eu/faircode/email/AdapterFolder.java View File

@ -51,20 +51,20 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
implements View.OnClickListener, View.OnLongClickListener { implements View.OnClickListener, View.OnLongClickListener {
View itemView; View itemView;
TextView tvName; TextView tvName;
TextView tvMessages;
TextView tvType;
TextView tvAfter; TextView tvAfter;
ImageView ivSync; ImageView ivSync;
TextView tvAccount;
TextView tvType;
ViewHolder(View itemView) { ViewHolder(View itemView) {
super(itemView); super(itemView);
this.itemView = itemView; this.itemView = itemView;
tvName = itemView.findViewById(R.id.tvName); tvName = itemView.findViewById(R.id.tvName);
tvMessages = itemView.findViewById(R.id.tvMessages);
tvType = itemView.findViewById(R.id.tvType);
tvAfter = itemView.findViewById(R.id.tvAfter); tvAfter = itemView.findViewById(R.id.tvAfter);
ivSync = itemView.findViewById(R.id.ivSync); ivSync = itemView.findViewById(R.id.ivSync);
tvAccount = itemView.findViewById(R.id.tvAccount);
tvType = itemView.findViewById(R.id.tvType);
} }
private void wire() { private void wire() {
@ -79,23 +79,25 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
private void bindTo(TupleFolderEx folder) { private void bindTo(TupleFolderEx folder) {
String name = Helper.localizeFolderName(context, folder.name); String name = Helper.localizeFolderName(context, folder.name);
tvName.setText(context.getString(R.string.title_folder_unseen, name, folder.unseen, folder.messages));
if (folder.unseen > 0)
tvName.setText(context.getString(R.string.title_folder_unseen, name, folder.unseen));
else
tvName.setText(name);
tvName.setTypeface(null, folder.unseen > 0 ? Typeface.BOLD : Typeface.NORMAL); tvName.setTypeface(null, folder.unseen > 0 ? Typeface.BOLD : Typeface.NORMAL);
tvName.setTextColor(Helper.resolveColor(context, folder.unseen > 0 ? R.attr.colorUnread : android.R.attr.textColorSecondary)); tvName.setTextColor(Helper.resolveColor(context, folder.unseen > 0 ? R.attr.colorUnread : android.R.attr.textColorSecondary));
tvAfter.setText(Integer.toString(folder.after));
tvAfter.setVisibility(folder.synchronize ? View.VISIBLE : View.INVISIBLE);
ivSync.setVisibility(folder.synchronize ? View.VISIBLE : View.INVISIBLE);
tvAccount.setText(folder.accountName);
tvAccount.setVisibility(EntityFolder.TYPE_OUTBOX.equals(folder.type) ? View.GONE : View.VISIBLE);
tvMessages.setText(Integer.toString(folder.messages));
int resid = context.getResources().getIdentifier( int resid = context.getResources().getIdentifier(
"title_folder_" + folder.type.toLowerCase(), "title_folder_" + folder.type.toLowerCase(),
"string" , "string" ,
context.getPackageName()); context.getPackageName());
tvType.setText(resid > 0 ? context.getString(resid) : folder.type); tvType.setText(resid > 0 ? context.getString(resid) : folder.type);
tvAfter.setText(Integer.toString(folder.after));
tvAfter.setVisibility(folder.synchronize ? View.VISIBLE : View.INVISIBLE);
ivSync.setVisibility(folder.synchronize ? View.VISIBLE : View.INVISIBLE);
} }
@Override @Override


+ 0
- 7
app/src/main/java/eu/faircode/email/FragmentAbout.java View File

@ -25,7 +25,6 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
@ -45,7 +44,6 @@ public class FragmentAbout extends FragmentEx {
@Nullable @Nullable
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
setSubtitle(R.string.menu_about); setSubtitle(R.string.menu_about);
setHasOptionsMenu(true);
View view = inflater.inflate(R.layout.fragment_about, container, false); View view = inflater.inflate(R.layout.fragment_about, container, false);
@ -97,9 +95,4 @@ public class FragmentAbout extends FragmentEx {
return view; return view;
} }
@Override
public void onPrepareOptionsMenu(Menu menu) {
menu.clear();
}
} }

+ 0
- 7
app/src/main/java/eu/faircode/email/FragmentFolders.java View File

@ -28,7 +28,6 @@ import android.support.design.widget.FloatingActionButton;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ProgressBar; import android.widget.ProgressBar;
@ -48,7 +47,6 @@ public class FragmentFolders extends FragmentEx {
@Nullable @Nullable
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
setSubtitle(R.string.title_list_folders); setSubtitle(R.string.title_list_folders);
setHasOptionsMenu(true);
View view = inflater.inflate(R.layout.fragment_folders, container, false); View view = inflater.inflate(R.layout.fragment_folders, container, false);
@ -94,9 +92,4 @@ public class FragmentFolders extends FragmentEx {
return view; return view;
} }
@Override
public void onPrepareOptionsMenu(Menu menu) {
menu.clear();
}
} }

BIN
app/src/main/res/drawable-hdpi/baseline_help_black_18.png View File

Before After
Width: 27  |  Height: 27  |  Size: 362 B

BIN
app/src/main/res/drawable-hdpi/baseline_help_black_24.png View File

Before After
Width: 36  |  Height: 36  |  Size: 432 B

BIN
app/src/main/res/drawable-hdpi/baseline_help_black_36.png View File

Before After
Width: 54  |  Height: 54  |  Size: 642 B

BIN
app/src/main/res/drawable-hdpi/baseline_help_black_48.png View File

Before After
Width: 72  |  Height: 72  |  Size: 778 B

BIN
app/src/main/res/drawable-hdpi/baseline_help_white_18.png View File

Before After
Width: 27  |  Height: 27  |  Size: 359 B

BIN
app/src/main/res/drawable-hdpi/baseline_help_white_24.png View File

Before After
Width: 36  |  Height: 36  |  Size: 434 B

BIN
app/src/main/res/drawable-hdpi/baseline_help_white_36.png View File

Before After
Width: 54  |  Height: 54  |  Size: 638 B

BIN
app/src/main/res/drawable-hdpi/baseline_help_white_48.png View File

Before After
Width: 72  |  Height: 72  |  Size: 772 B

BIN
app/src/main/res/drawable-hdpi/baseline_question_answer_black_18.png View File

Before After
Width: 27  |  Height: 27  |  Size: 182 B

BIN
app/src/main/res/drawable-hdpi/baseline_question_answer_black_24.png View File

Before After
Width: 36  |  Height: 36  |  Size: 183 B

BIN
app/src/main/res/drawable-hdpi/baseline_question_answer_black_36.png View File

Before After
Width: 54  |  Height: 54  |  Size: 259 B

BIN
app/src/main/res/drawable-hdpi/baseline_question_answer_black_48.png View File

Before After
Width: 72  |  Height: 72  |  Size: 266 B

BIN
app/src/main/res/drawable-hdpi/baseline_question_answer_white_18.png View File

Before After
Width: 27  |  Height: 27  |  Size: 185 B

BIN
app/src/main/res/drawable-hdpi/baseline_question_answer_white_24.png View File

Before After
Width: 36  |  Height: 36  |  Size: 187 B

BIN
app/src/main/res/drawable-hdpi/baseline_question_answer_white_36.png View File

Before After
Width: 54  |  Height: 54  |  Size: 262 B

BIN
app/src/main/res/drawable-hdpi/baseline_question_answer_white_48.png View File

Before After
Width: 72  |  Height: 72  |  Size: 276 B

BIN
app/src/main/res/drawable-hdpi/baseline_settings_applications_black_18.png View File

Before After
Width: 27  |  Height: 27  |  Size: 300 B

BIN
app/src/main/res/drawable-hdpi/baseline_settings_applications_black_24.png View File

Before After
Width: 36  |  Height: 36  |  Size: 359 B

BIN
app/src/main/res/drawable-hdpi/baseline_settings_applications_black_36.png View File

Before After
Width: 54  |  Height: 54  |  Size: 505 B

BIN
app/src/main/res/drawable-hdpi/baseline_settings_applications_black_48.png View File

Before After
Width: 72  |  Height: 72  |  Size: 651 B

BIN
app/src/main/res/drawable-hdpi/baseline_settings_applications_white_18.png View File

Before After
Width: 27  |  Height: 27  |  Size: 303 B

BIN
app/src/main/res/drawable-hdpi/baseline_settings_applications_white_24.png View File

Before After
Width: 36  |  Height: 36  |  Size: 359 B

BIN
app/src/main/res/drawable-hdpi/baseline_settings_applications_white_36.png View File

Before After
Width: 54  |  Height: 54  |  Size: 516 B

BIN
app/src/main/res/drawable-hdpi/baseline_settings_applications_white_48.png View File

Before After
Width: 72  |  Height: 72  |  Size: 656 B

BIN
app/src/main/res/drawable-mdpi/baseline_help_black_18.png View File

Before After
Width: 18  |  Height: 18  |  Size: 260 B

BIN
app/src/main/res/drawable-mdpi/baseline_help_black_24.png View File

Before After
Width: 24  |  Height: 24  |  Size: 289 B

BIN
app/src/main/res/drawable-mdpi/baseline_help_black_36.png View File

Before After
Width: 36  |  Height: 36  |  Size: 432 B

BIN
app/src/main/res/drawable-mdpi/baseline_help_black_48.png View File

Before After
Width: 48  |  Height: 48  |  Size: 526 B

BIN
app/src/main/res/drawable-mdpi/baseline_help_white_18.png View File

Before After
Width: 18  |  Height: 18  |  Size: 253 B

BIN
app/src/main/res/drawable-mdpi/baseline_help_white_24.png View File

Before After
Width: 24  |  Height: 24  |  Size: 293 B

BIN
app/src/main/res/drawable-mdpi/baseline_help_white_36.png View File

Before After
Width: 36  |  Height: 36  |  Size: 434 B

BIN
app/src/main/res/drawable-mdpi/baseline_help_white_48.png View File

Before After
Width: 48  |  Height: 48  |  Size: 527 B

BIN
app/src/main/res/drawable-mdpi/baseline_question_answer_black_18.png View File

Before After
Width: 18  |  Height: 18  |  Size: 164 B

BIN
app/src/main/res/drawable-mdpi/baseline_question_answer_black_24.png View File

Before After
Width: 24  |  Height: 24  |  Size: 135 B

BIN
app/src/main/res/drawable-mdpi/baseline_question_answer_black_36.png View File

Before After
Width: 36  |  Height: 36  |  Size: 183 B

BIN
app/src/main/res/drawable-mdpi/baseline_question_answer_black_48.png View File

Before After
Width: 48  |  Height: 48  |  Size: 206 B

BIN
app/src/main/res/drawable-mdpi/baseline_question_answer_white_18.png View File

Before After
Width: 18  |  Height: 18  |  Size: 168 B

BIN
app/src/main/res/drawable-mdpi/baseline_question_answer_white_24.png View File

Before After
Width: 24  |  Height: 24  |  Size: 139 B

BIN
app/src/main/res/drawable-mdpi/baseline_question_answer_white_36.png View File

Before After
Width: 36  |  Height: 36  |  Size: 187 B

BIN
app/src/main/res/drawable-mdpi/baseline_question_answer_white_48.png View File

Before After
Width: 48  |  Height: 48  |  Size: 212 B

BIN
app/src/main/res/drawable-mdpi/baseline_settings_applications_black_18.png View File

Before After
Width: 18  |  Height: 18  |  Size: 208 B

BIN
app/src/main/res/drawable-mdpi/baseline_settings_applications_black_24.png View File

Before After
Width: 24  |  Height: 24  |  Size: 239 B

BIN
app/src/main/res/drawable-mdpi/baseline_settings_applications_black_36.png View File

Before After
Width: 36  |  Height: 36  |  Size: 359 B

BIN
app/src/main/res/drawable-mdpi/baseline_settings_applications_black_48.png View File

Before After
Width: 48  |  Height: 48  |  Size: 452 B

BIN
app/src/main/res/drawable-mdpi/baseline_settings_applications_white_18.png View File

Before After
Width: 18  |  Height: 18  |  Size: 211 B

BIN
app/src/main/res/drawable-mdpi/baseline_settings_applications_white_24.png View File

Before After
Width: 24  |  Height: 24  |  Size: 243 B

BIN
app/src/main/res/drawable-mdpi/baseline_settings_applications_white_36.png View File

Before After
Width: 36  |  Height: 36  |  Size: 359 B

BIN
app/src/main/res/drawable-mdpi/baseline_settings_applications_white_48.png View File

Before After
Width: 48  |  Height: 48  |  Size: 458 B

BIN
app/src/main/res/drawable-xhdpi/baseline_help_black_18.png View File

Before After
Width: 36  |  Height: 36  |  Size: 432 B

BIN
app/src/main/res/drawable-xhdpi/baseline_help_black_24.png View File

Before After
Width: 48  |  Height: 48  |  Size: 526 B

BIN
app/src/main/res/drawable-xhdpi/baseline_help_black_36.png View File

Before After
Width: 72  |  Height: 72  |  Size: 778 B

BIN
app/src/main/res/drawable-xhdpi/baseline_help_black_48.png View File

Before After
Width: 96  |  Height: 96  |  Size: 1.0 KiB

BIN
app/src/main/res/drawable-xhdpi/baseline_help_white_18.png View File

Before After
Width: 36  |  Height: 36  |  Size: 434 B

BIN
app/src/main/res/drawable-xhdpi/baseline_help_white_24.png View File

Before After
Width: 48  |  Height: 48  |  Size: 527 B

BIN
app/src/main/res/drawable-xhdpi/baseline_help_white_36.png View File

Before After
Width: 72  |  Height: 72  |  Size: 772 B

BIN
app/src/main/res/drawable-xhdpi/baseline_help_white_48.png View File

Before After
Width: 96  |  Height: 96  |  Size: 1.0 KiB

BIN
app/src/main/res/drawable-xhdpi/baseline_question_answer_black_18.png View File

Before After
Width: 36  |  Height: 36  |  Size: 183 B

BIN
app/src/main/res/drawable-xhdpi/baseline_question_answer_black_24.png View File

Before After
Width: 48  |  Height: 48  |  Size: 206 B

BIN
app/src/main/res/drawable-xhdpi/baseline_question_answer_black_36.png View File

Before After
Width: 72  |  Height: 72  |  Size: 266 B

BIN
app/src/main/res/drawable-xhdpi/baseline_question_answer_black_48.png View File

Before After
Width: 96  |  Height: 96  |  Size: 302 B

BIN
app/src/main/res/drawable-xhdpi/baseline_question_answer_white_18.png View File

Before After
Width: 36  |  Height: 36  |  Size: 187 B

BIN
app/src/main/res/drawable-xhdpi/baseline_question_answer_white_24.png View File

Before After
Width: 48  |  Height: 48  |  Size: 212 B

BIN
app/src/main/res/drawable-xhdpi/baseline_question_answer_white_36.png View File

Before After
Width: 72  |  Height: 72  |  Size: 276 B

BIN
app/src/main/res/drawable-xhdpi/baseline_question_answer_white_48.png View File

Before After
Width: 96  |  Height: 96  |  Size: 310 B

BIN
app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_18.png View File

Before After
Width: 36  |  Height: 36  |  Size: 359 B

BIN
app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_24.png View File

Before After
Width: 48  |  Height: 48  |  Size: 452 B

BIN
app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_36.png View File

Before After
Width: 72  |  Height: 72  |  Size: 651 B

BIN
app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_48.png View File

Before After
Width: 96  |  Height: 96  |  Size: 788 B

BIN
app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_18.png View File

Before After
Width: 36  |  Height: 36  |  Size: 359 B

BIN
app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_24.png View File

Before After
Width: 48  |  Height: 48  |  Size: 458 B

BIN
app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_36.png View File

Before After
Width: 72  |  Height: 72  |  Size: 656 B

BIN
app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_48.png View File

Before After
Width: 96  |  Height: 96  |  Size: 792 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_help_black_18.png View File

Before After
Width: 54  |  Height: 54  |  Size: 642 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_help_black_24.png View File

Before After
Width: 72  |  Height: 72  |  Size: 778 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_help_black_36.png View File

Before After
Width: 108  |  Height: 108  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable-xxhdpi/baseline_help_black_48.png View File

Before After
Width: 144  |  Height: 144  |  Size: 1.5 KiB

BIN
app/src/main/res/drawable-xxhdpi/baseline_help_white_18.png View File

Before After
Width: 54  |  Height: 54  |  Size: 638 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_help_white_24.png View File

Before After
Width: 72  |  Height: 72  |  Size: 772 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_help_white_36.png View File

Before After
Width: 108  |  Height: 108  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable-xxhdpi/baseline_help_white_48.png View File

Before After
Width: 144  |  Height: 144  |  Size: 1.5 KiB

BIN
app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_18.png View File

Before After
Width: 54  |  Height: 54  |  Size: 259 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_24.png View File

Before After
Width: 72  |  Height: 72  |  Size: 266 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_36.png View File

Before After
Width: 108  |  Height: 108  |  Size: 379 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_48.png View File

Before After
Width: 144  |  Height: 144  |  Size: 427 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_18.png View File

Before After
Width: 54  |  Height: 54  |  Size: 262 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_24.png View File

Before After
Width: 72  |  Height: 72  |  Size: 276 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_36.png View File

Before After
Width: 108  |  Height: 108  |  Size: 392 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_48.png View File

Before After
Width: 144  |  Height: 144  |  Size: 436 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_18.png View File

Before After
Width: 54  |  Height: 54  |  Size: 505 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_24.png View File

Before After
Width: 72  |  Height: 72  |  Size: 651 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_36.png View File

Before After
Width: 108  |  Height: 108  |  Size: 929 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_48.png View File

Before After
Width: 144  |  Height: 144  |  Size: 1.1 KiB

BIN
app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_18.png View File

Before After
Width: 54  |  Height: 54  |  Size: 516 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_24.png View File

Before After
Width: 72  |  Height: 72  |  Size: 656 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_36.png View File

Before After
Width: 108  |  Height: 108  |  Size: 935 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_48.png View File

Before After
Width: 144  |  Height: 144  |  Size: 1.1 KiB

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save