From 0d2b20c032404406b03dd75c2222ec55f054d9a0 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 30 Jun 2016 23:41:24 -0500 Subject: [PATCH] Add dark toolbar theme --- .../ui/activity/TaskerSettingsActivity.java | 91 +++++++-------- .../astrid/actfm/FilterSettingsActivity.java | 68 +++++------ .../astrid/actfm/TagSettingsActivity.java | 86 ++++++-------- .../astrid/activity/BeastModePreferences.java | 24 ++-- .../astrid/activity/TaskEditFragment.java | 11 +- .../astrid/activity/TaskListFragment.java | 13 +-- .../todoroo/astrid/adapter/TaskAdapter.java | 4 + .../astrid/core/CustomFilterActivity.java | 43 +++---- .../tasks/fragments/CommentBarFragment.java | 18 ++- .../InjectingPreferenceActivity.java | 8 +- .../java/org/tasks/themes/ThemeCache.java | 10 +- .../java/org/tasks/themes/ThemeColor.java | 33 +++++- src/main/java/org/tasks/ui/MenuColorizer.java | 109 ++++-------------- .../ic_camera_alt_white_24dp.png | Bin 364 -> 0 bytes .../ic_camera_alt_white_24dp.png | Bin 446 -> 0 bytes .../ic_camera_alt_white_24dp.png | Bin 666 -> 0 bytes .../res/drawable/ic_camera_alt_black_24dp.xml | 6 + .../res/drawable/ic_camera_alt_white_24dp.png | Bin 240 -> 0 bytes src/main/res/layout/fragment_comment_bar.xml | 7 +- src/main/res/layout/toolbar.xml | 5 +- .../res/menu/menu_custom_filter_activity.xml | 6 - src/main/res/values/attrs.xml | 4 + src/main/res/values/colors.xml | 10 +- src/main/res/values/styles.xml | 31 +++-- src/main/res/values/theme_amber.xml | 2 +- src/main/res/values/theme_blue.xml | 2 +- src/main/res/values/theme_blue_grey.xml | 2 +- src/main/res/values/theme_brown.xml | 2 +- src/main/res/values/theme_cyan.xml | 2 +- src/main/res/values/theme_dark_grey.xml | 2 +- src/main/res/values/theme_deep_orange.xml | 2 +- src/main/res/values/theme_deep_purple.xml | 2 +- src/main/res/values/theme_green.xml | 2 +- src/main/res/values/theme_grey.xml | 2 +- src/main/res/values/theme_indigo.xml | 2 +- src/main/res/values/theme_light_blue.xml | 2 +- src/main/res/values/theme_light_green.xml | 2 +- src/main/res/values/theme_lime.xml | 2 +- src/main/res/values/theme_orange.xml | 2 +- src/main/res/values/theme_pink.xml | 2 +- src/main/res/values/theme_purple.xml | 2 +- src/main/res/values/theme_red.xml | 2 +- src/main/res/values/theme_teal.xml | 2 +- src/main/res/values/theme_yellow.xml | 2 +- 44 files changed, 278 insertions(+), 349 deletions(-) delete mode 100644 src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.png create mode 100644 src/main/res/drawable/ic_camera_alt_black_24dp.xml delete mode 100644 src/main/res/drawable/ic_camera_alt_white_24dp.png diff --git a/src/googleplay/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java b/src/googleplay/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java index d5418c269..31a38660c 100755 --- a/src/googleplay/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java +++ b/src/googleplay/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java @@ -2,13 +2,11 @@ package org.tasks.locale.ui.activity; import android.content.DialogInterface; import android.content.Intent; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; -import android.view.Menu; import android.view.MenuItem; +import android.view.View; import android.widget.TextView; import com.todoroo.astrid.api.Filter; @@ -32,7 +30,7 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -public final class TaskerSettingsActivity extends AbstractFragmentPluginAppCompatActivity implements PurchaseHelperCallback { +public final class TaskerSettingsActivity extends AbstractFragmentPluginAppCompatActivity implements PurchaseHelperCallback, Toolbar.OnMenuItemClickListener { private static final int REQUEST_SELECT_FILTER = 10124; private static final int REQUEST_PURCHASE = 10125; @@ -66,15 +64,33 @@ public final class TaskerSettingsActivity extends AbstractFragmentPluginAppCompa } updateView(); - setSupportActionBar(toolbar); - ActionBar supportActionBar = getSupportActionBar(); - if (supportActionBar != null) { - supportActionBar.setDisplayHomeAsUpEnabled(true); - Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_close_24dp)); - DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); - supportActionBar.setHomeAsUpIndicator(drawable); - supportActionBar.setDisplayShowTitleEnabled(false); - } + toolbar.setNavigationIcon(DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_close_24dp))); + toolbar.setOnMenuItemClickListener(this); + toolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (equalBundles(getResultBundle(), previousBundle)) { + cancel(); + } else { + dialogBuilder.newMessageDialog(R.string.discard_changes) + .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + cancel(); + } + }) + .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }) + .show(); + } + } + }); + toolbar.inflateMenu(R.menu.tasker_menu); + MenuColorizer.colorToolbar(this, toolbar); if (!preferences.hasPurchase(R.string.p_purchased_tasker) && !purchaseInitiated) { purchaseInitiated = purchaseHelper.purchase(dialogBuilder, this, getString(R.string.sku_tasker), getString(R.string.p_purchased_tasker), REQUEST_PURCHASE, this); @@ -110,45 +126,6 @@ public final class TaskerSettingsActivity extends AbstractFragmentPluginAppCompa return filter.listingTitle; } - @Override - public boolean onCreateOptionsMenu(final Menu menu) { - getMenuInflater().inflate(R.menu.tasker_menu, menu); - MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white)); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_save: - finish(); - break; - case android.R.id.home: - if (equalBundles(getResultBundle(), previousBundle)) { - cancel(); - } else { - dialogBuilder.newMessageDialog(R.string.discard_changes) - .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - cancel(); - } - }) - .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - - } - }) - .show(); - } - break; - default: - return super.onOptionsItemSelected(item); - } - return true; - } - private void cancel() { mIsCancelled = true; finish(); @@ -233,4 +210,14 @@ public final class TaskerSettingsActivity extends AbstractFragmentPluginAppCompa cancel(); } } + + @Override + public boolean onMenuItemClick(MenuItem item) { + switch (item.getItemId()) { + case R.id.menu_save: + finish(); + return true; + } + return super.onOptionsItemSelected(item); + } } diff --git a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java index 599263e0d..9299e952c 100644 --- a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java +++ b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java @@ -8,12 +8,9 @@ package com.todoroo.astrid.actfm; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; -import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.inputmethod.InputMethodManager; @@ -38,7 +35,7 @@ import butterknife.ButterKnife; import static android.text.TextUtils.isEmpty; -public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity { +public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity implements Toolbar.OnMenuItemClickListener { public static final String TOKEN_FILTER = "token_filter"; @@ -60,27 +57,23 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity { filter = getIntent().getParcelableExtra(TOKEN_FILTER); - setSupportActionBar(toolbar); - ActionBar supportActionBar = getSupportActionBar(); - if (supportActionBar != null) { - supportActionBar.setDisplayHomeAsUpEnabled(true); - final boolean backButtonSavesTask = preferences.backButtonSavesTask(); - Drawable drawable = DrawableCompat.wrap(getResources().getDrawable( - backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp)); - DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); - supportActionBar.setHomeAsUpIndicator(drawable); - supportActionBar.setTitle(filter.listingTitle); - toolbar.setNavigationOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (backButtonSavesTask) { - discard(); - } else { - save(); - } + final boolean backButtonSavesTask = preferences.backButtonSavesTask(); + toolbar.setNavigationIcon(DrawableCompat.wrap(getResources().getDrawable( + backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp))); + toolbar.setTitle(filter.listingTitle); + toolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (backButtonSavesTask) { + discard(); + } else { + save(); } - }); - } + } + }); + toolbar.inflateMenu(R.menu.tag_settings_activity); + toolbar.setOnMenuItemClickListener(this); + MenuColorizer.colorToolbar(this, toolbar); filterName.setText(filter.listingTitle); } @@ -116,13 +109,6 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity { super.finish(); } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.tag_settings_activity, menu); - MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white)); - return super.onCreateOptionsMenu(menu); - } - @Override public void onBackPressed() { if (preferences.backButtonSavesTask()) { @@ -132,16 +118,6 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity { } } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.delete: - deleteTag(); - break; - } - return super.onOptionsItemSelected(item); - } - private void deleteTag() { dialogBuilder.newMessageDialog(R.string.delete_tag_confirmation, filter.listingTitle) .setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() { @@ -172,4 +148,14 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity { .show(); } } + + @Override + public boolean onMenuItemClick(MenuItem item) { + switch (item.getItemId()) { + case R.id.delete: + deleteTag(); + break; + } + return super.onOptionsItemSelected(item); + } } diff --git a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java index 3e25d8f34..42fa658b5 100644 --- a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -9,12 +9,8 @@ import android.app.FragmentManager; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; -import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.inputmethod.InputMethodManager; @@ -43,7 +39,6 @@ import org.tasks.injection.ThemedInjectingAppCompatActivity; import org.tasks.preferences.Preferences; import org.tasks.themes.ThemeCache; import org.tasks.themes.ThemeColor; -import org.tasks.ui.MenuColorizer; import javax.inject.Inject; @@ -55,7 +50,7 @@ import timber.log.Timber; import static android.text.TextUtils.isEmpty; import static org.tasks.dialogs.ThemePickerDialog.newThemePickerDialog; -public class TagSettingsActivity extends ThemedInjectingAppCompatActivity implements ThemePickerDialog.ThemePickerCallback, PurchaseHelperCallback { +public class TagSettingsActivity extends ThemedInjectingAppCompatActivity implements ThemePickerDialog.ThemePickerCallback, PurchaseHelperCallback, Toolbar.OnMenuItemClickListener { private static final String FRAG_TAG_COLOR_PICKER = "frag_tag_color_picker"; @@ -98,27 +93,23 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity implem tagData.setUUID(UUIDHelper.newUUID()); } - setSupportActionBar(toolbar); - ActionBar supportActionBar = getSupportActionBar(); - if (supportActionBar != null) { - supportActionBar.setDisplayHomeAsUpEnabled(true); - final boolean backButtonSavesTask = preferences.backButtonSavesTask(); - Drawable drawable = DrawableCompat.wrap(getResources().getDrawable( - backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp)); - DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); - supportActionBar.setHomeAsUpIndicator(drawable); - supportActionBar.setTitle(isNewTag ? getString(R.string.new_tag) : tagData.getName()); - toolbar.setNavigationOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (backButtonSavesTask) { - discard(); - } else { - save(); - } + final boolean backButtonSavesTask = preferences.backButtonSavesTask(); + toolbar.setTitle(isNewTag ? getString(R.string.new_tag) : tagData.getName()); + toolbar.setNavigationIcon(getResources().getDrawable( + backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp)); + toolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (backButtonSavesTask) { + discard(); + } else { + save(); } - }); - } + } + }); + toolbar.inflateMenu(R.menu.tag_settings_activity); + toolbar.setOnMenuItemClickListener(this); + toolbar.showOverflowMenu(); tagName.setText(tagData.getName()); @@ -127,6 +118,7 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity implem tagName.setText(autopopulateName); getIntent().removeExtra(TOKEN_AUTOPOPULATE_NAME); } else if (isNewTag) { + toolbar.getMenu().findItem(R.id.delete).setVisible(false); tagName.requestFocus(); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.showSoftInput(tagName, InputMethodManager.SHOW_IMPLICIT); @@ -213,16 +205,6 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity implem super.finish(); } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.tag_settings_activity, menu); - MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white)); - if (isNewTag) { - menu.findItem(R.id.delete).setVisible(false); - } - return super.onCreateOptionsMenu(menu); - } - @Override public void onBackPressed() { if (preferences.backButtonSavesTask()) { @@ -232,16 +214,6 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity implem } } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.delete: - deleteTag(); - break; - } - return super.onOptionsItemSelected(item); - } - @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == REQUEST_PURCHASE) { @@ -292,19 +264,19 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity implem } private void updateTheme() { + ThemeColor color; if (selectedTheme < 0) { + color = themeColor; themeName.setText(R.string.none); - toolbar.setBackgroundColor(themeColor.getPrimaryColor()); - themeColor.applyStatusBarColor(this); clear.setVisibility(View.GONE); } else { - ThemeColor themeColor = themeCache.getThemeColor(selectedTheme); - toolbar.setBackgroundColor(themeColor.getPrimaryColor()); - themeColor.applyStatusBarColor(this); - themeName.setText(themeColor.getName()); + color = themeCache.getThemeColor(selectedTheme); + themeName.setText(color.getName()); clear.setVisibility(View.VISIBLE); } + color.apply(toolbar); + color.applyStatusBarColor(this); } @Override @@ -325,4 +297,14 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity implem } }); } + + @Override + public boolean onMenuItemClick(MenuItem item) { + switch (item.getItemId()) { + case R.id.delete: + deleteTag(); + break; + } + return super.onOptionsItemSelected(item); + } } diff --git a/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java b/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java index b30fc02ae..14fead088 100644 --- a/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java +++ b/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java @@ -29,6 +29,7 @@ import org.tasks.R; import org.tasks.injection.ActivityComponent; import org.tasks.injection.ThemedInjectingAppCompatActivity; import org.tasks.preferences.Preferences; +import org.tasks.ui.MenuColorizer; import java.util.ArrayList; import java.util.Collections; @@ -39,7 +40,7 @@ import javax.inject.Inject; import butterknife.BindView; import butterknife.ButterKnife; -public class BeastModePreferences extends ThemedInjectingAppCompatActivity { +public class BeastModePreferences extends ThemedInjectingAppCompatActivity implements Toolbar.OnMenuItemClickListener { @BindView(R.id.toolbar) Toolbar toolbar; @BindView(android.R.id.list) TouchListView touchList; @@ -63,21 +64,16 @@ public class BeastModePreferences extends ThemedInjectingAppCompatActivity { setContentView(R.layout.beast_mode_pref_activity); ButterKnife.bind(this); - setSupportActionBar(toolbar); - ActionBar supportActionBar = getSupportActionBar(); - if (supportActionBar != null) { - supportActionBar.setDisplayHomeAsUpEnabled(true); - supportActionBar.setDisplayShowTitleEnabled(false); - Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_arrow_back_24dp)); - DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); - supportActionBar.setHomeAsUpIndicator(drawable); - } + toolbar.setNavigationIcon(getResources().getDrawable(R.drawable.ic_arrow_back_24dp)); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); } }); + toolbar.inflateMenu(R.menu.beast_mode); + toolbar.setOnMenuItemClickListener(this); + MenuColorizer.colorToolbar(this, toolbar); prefsToDescriptions = new HashMap<>(); buildDescriptionMap(getResources()); @@ -116,13 +112,7 @@ public class BeastModePreferences extends ThemedInjectingAppCompatActivity { } @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.beast_mode, menu); - return super.onCreateOptionsMenu(menu); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { + public boolean onMenuItemClick(MenuItem item) { switch(item.getItemId()) { case R.id.menu_reset_to_defaults: resetToDefault(); diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index d532b1934..92e76b064 100755 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -131,10 +131,8 @@ public final class TaskEditFragment extends InjectingFragment implements Toolbar } final boolean backButtonSavesTask = preferences.backButtonSavesTask(); - Drawable drawable = DrawableCompat.wrap(getResources().getDrawable( - backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp)); - DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); - toolbar.setNavigationIcon(drawable); + toolbar.setNavigationIcon(DrawableCompat.wrap(getResources().getDrawable( + backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp))); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -146,11 +144,8 @@ public final class TaskEditFragment extends InjectingFragment implements Toolbar } }); toolbar.inflateMenu(R.menu.task_edit_fragment); - Menu menu = toolbar.getMenu(); - for (int i = 0 ; i < menu.size() ; i++) { - MenuColorizer.colorMenuItem(menu.getItem(i), getResources().getColor(android.R.color.white)); - } toolbar.setOnMenuItemClickListener(this); + MenuColorizer.colorToolbar(context, toolbar); notificationManager.cancel(model.getId()); diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 148658ae2..b0010d123 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -13,9 +13,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.database.Cursor; import android.database.sqlite.SQLiteException; -import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v4.view.MenuItemCompat; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.SearchView; @@ -254,9 +252,7 @@ public class TaskListFragment extends InjectingListFragment implements listView.setEmptyView(emptyView); toolbar.setTitle(filter.listingTitle); - Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_menu_24dp)); - DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); - toolbar.setNavigationIcon(drawable); + toolbar.setNavigationIcon(R.drawable.ic_menu_24dp); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -264,12 +260,9 @@ public class TaskListFragment extends InjectingListFragment implements } }); inflateMenu(toolbar); - Menu menu = toolbar.getMenu(); - for (int i = 0 ; i < menu.size() ; i++) { - MenuColorizer.colorMenuItem(menu.getItem(i), getResources().getColor(android.R.color.white)); - } + setupMenu(toolbar.getMenu()); toolbar.setOnMenuItemClickListener(this); - setupMenu(menu); + MenuColorizer.colorToolbar(context, toolbar); return parent; } diff --git a/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index 570160dfe..b759b42da 100644 --- a/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -10,12 +10,14 @@ import android.app.PendingIntent.CanceledException; import android.content.Context; import android.content.res.Resources; import android.database.Cursor; +import android.graphics.Color; import android.graphics.Paint; import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextUtils; import android.text.style.BackgroundColorSpan; +import android.text.style.ForegroundColorSpan; import android.util.DisplayMetrics; import android.util.TypedValue; import android.view.LayoutInflater; @@ -546,7 +548,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable { SpannableString string = new SpannableString(SPACE + tagName + SPACE); int themeIndex = tagData.getColor() >= 0 ? tagData.getColor() : 19; int backgroundColor = themeCache.getThemeColor(themeIndex).getPrimaryColor(); + int foregroundColor = themeCache.getThemeColor(themeIndex).getActionBarTint(); string.setSpan(new BackgroundColorSpan(backgroundColor), 0, string.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); + string.setSpan(new ForegroundColorSpan(foregroundColor), 0, string.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); return string; } }; diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java index e09454e30..174ce5320 100644 --- a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java @@ -10,14 +10,10 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.database.Cursor; -import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; -import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.View.OnCreateContextMenuListener; @@ -45,7 +41,6 @@ import org.tasks.R; import org.tasks.dialogs.DialogBuilder; import org.tasks.filters.FilterCriteriaProvider; import org.tasks.injection.ActivityComponent; -import org.tasks.injection.InjectingAppCompatActivity; import org.tasks.injection.ThemedInjectingAppCompatActivity; import org.tasks.ui.MenuColorizer; @@ -66,7 +61,7 @@ import static android.text.TextUtils.isEmpty; * @author Tim Su * */ -public class CustomFilterActivity extends ThemedInjectingAppCompatActivity { +public class CustomFilterActivity extends ThemedInjectingAppCompatActivity implements Toolbar.OnMenuItemClickListener { private static final String IDENTIFIER_UNIVERSE = "active"; //$NON-NLS-1$ @@ -152,16 +147,17 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity { setContentView(R.layout.custom_filter_activity); ButterKnife.bind(this); - setSupportActionBar(toolbar); - ActionBar supportActionBar = getSupportActionBar(); - if (supportActionBar != null) { - supportActionBar.setDisplayHomeAsUpEnabled(true); - Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_close_24dp)); - DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); - supportActionBar.setHomeAsUpIndicator(drawable); - supportActionBar.setTitle(R.string.FLA_new_filter); - } - + toolbar.setNavigationIcon(getResources().getDrawable(R.drawable.ic_close_24dp)); + toolbar.setTitle(R.string.FLA_new_filter); + toolbar.inflateMenu(R.menu.menu_custom_filter_activity); + toolbar.setOnMenuItemClickListener(this); + toolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + discard(); + } + }); + MenuColorizer.colorToolbar(this, toolbar); listView = (ListView) findViewById(android.R.id.list); database.openForReading(); @@ -352,22 +348,11 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity { } @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu_custom_filter_activity, menu); - MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white)); - menu.findItem(R.id.delete).setVisible(false); - return super.onCreateOptionsMenu(menu); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { + public boolean onMenuItemClick(MenuItem item) { switch (item.getItemId()) { - case android.R.id.home: - discard(); - break; case R.id.menu_save: saveAndView(); - break; + return true; } return super.onOptionsItemSelected(item); } diff --git a/src/main/java/org/tasks/fragments/CommentBarFragment.java b/src/main/java/org/tasks/fragments/CommentBarFragment.java index add3bc313..8f46e64a2 100644 --- a/src/main/java/org/tasks/fragments/CommentBarFragment.java +++ b/src/main/java/org/tasks/fragments/CommentBarFragment.java @@ -4,10 +4,13 @@ import android.app.Activity; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Bitmap; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.support.annotation.Nullable; +import android.support.v4.graphics.drawable.DrawableCompat; import android.text.TextUtils; +import android.util.TypedValue; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; @@ -64,8 +67,6 @@ public class CommentBarFragment extends TaskEditControlFragment { private static final String EXTRA_TEXT = "extra_text"; private static final String EXTRA_PICTURE = "extra_picture"; - private final int cameraButton = R.drawable.ic_camera_alt_white_24dp; - @Inject Activity activity; @Inject DialogBuilder dialogBuilder; @Inject Device device; @@ -113,6 +114,7 @@ public class CommentBarFragment extends TaskEditControlFragment { commentBar.setVisibility(View.GONE); } + resetPictureButton(); return view; } @@ -184,7 +186,7 @@ public class CommentBarFragment extends TaskEditControlFragment { @Override public void clearImage() { pendingCommentPicture = null; - pictureButton.setImageResource(cameraButton); + resetPictureButton(); } }); } @@ -233,10 +235,18 @@ public class CommentBarFragment extends TaskEditControlFragment { } pendingCommentPicture = null; - pictureButton.setImageResource(cameraButton); + resetPictureButton(); callback.addComment(message, actionCode, picture); } + private void resetPictureButton() { + TypedValue typedValue = new TypedValue(); + getContext().getTheme().resolveAttribute(R.attr.actionBarPrimaryText, typedValue, true); + Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_camera_alt_black_24dp)); + drawable.setTint(typedValue.data); + pictureButton.setImageDrawable(drawable); + } + private void showPictureLauncher(final ClearImageCallback clearImageOption) { final List runnables = new ArrayList<>(); List options = new ArrayList<>(); diff --git a/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java b/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java index 41cc3e4c9..cbd1d27ce 100644 --- a/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java +++ b/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java @@ -1,11 +1,9 @@ package org.tasks.injection; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceCategory; import android.preference.PreferenceGroup; -import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v7.widget.Toolbar; import android.view.View; import android.view.ViewGroup; @@ -15,6 +13,7 @@ import org.tasks.R; import org.tasks.analytics.Tracker; import org.tasks.preferences.AppCompatPreferenceActivity; import org.tasks.themes.Theme; +import org.tasks.ui.MenuColorizer; import javax.inject.Inject; @@ -48,15 +47,14 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct toolbar = (Toolbar) toolbarContainer.findViewById(R.id.toolbar); toolbar.setTitle(getTitle()); - Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_arrow_back_24dp)); - DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); - toolbar.setNavigationIcon(drawable); + toolbar.setNavigationIcon(getResources().getDrawable(R.drawable.ic_arrow_back_24dp)); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { finish(); } }); + MenuColorizer.colorToolbar(this, toolbar); } @Override diff --git a/src/main/java/org/tasks/themes/ThemeCache.java b/src/main/java/org/tasks/themes/ThemeCache.java index 06f03d409..e14f1ee3f 100644 --- a/src/main/java/org/tasks/themes/ThemeCache.java +++ b/src/main/java/org/tasks/themes/ThemeCache.java @@ -35,7 +35,9 @@ public class ThemeCache { colorNames[i], i, resolveAttribute(theme, R.attr.colorPrimary), - resolveAttribute(theme, R.attr.colorPrimaryDark))); + resolveAttribute(theme, R.attr.colorPrimaryDark), + resolveAttribute(theme, R.attr.actionBarPrimaryText), + resolveBoolean(theme, R.attr.dark_status_bar))); } String[] accentNames = resources.getStringArray(R.array.accents); for (int i = 0 ; i < ThemeAccent.ACCENTS.length ; i++) { @@ -64,4 +66,10 @@ public class ThemeCache { theme.resolveAttribute(attribute, typedValue, true); return typedValue.data; } + + private boolean resolveBoolean(Resources.Theme theme, int attribute) { + TypedValue typedValue = new TypedValue(); + theme.resolveAttribute(attribute, typedValue, false); + return typedValue.data != 0; + } } diff --git a/src/main/java/org/tasks/themes/ThemeColor.java b/src/main/java/org/tasks/themes/ThemeColor.java index 14261ff2f..883f7bd30 100644 --- a/src/main/java/org/tasks/themes/ThemeColor.java +++ b/src/main/java/org/tasks/themes/ThemeColor.java @@ -5,8 +5,12 @@ import android.app.ActivityManager; import android.content.Context; import android.content.res.Resources; import android.support.v4.widget.DrawerLayout; +import android.support.v7.widget.Toolbar; +import android.view.View; +import android.view.Window; import org.tasks.R; +import org.tasks.ui.MenuColorizer; import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop; @@ -37,30 +41,46 @@ public class ThemeColor { private final String name; private final int index; + private final int actionBarTint; private final int style; private final int colorPrimary; private final int colorPrimaryDark; + private final boolean isDark; - public ThemeColor(String name, int index, int colorPrimary, int colorPrimaryDark) { + public ThemeColor(String name, int index, int colorPrimary, int colorPrimaryDark, int actionBarTint, boolean isDark) { this.name = name; this.index = index; + this.actionBarTint = actionBarTint; this.style = COLORS[index]; this.colorPrimary = colorPrimary; this.colorPrimaryDark = colorPrimaryDark; + this.isDark = isDark; } public void applyStatusBarColor(Activity activity) { if (atLeastLollipop()) { - activity.getWindow().setStatusBarColor(getColorPrimaryDark()); + Window window = activity.getWindow(); + window.setStatusBarColor(getColorPrimaryDark()); + View decorView = window.getDecorView(); + int systemUiVisibility = applyLightStatusBarFlag(decorView.getSystemUiVisibility()); + decorView.setSystemUiVisibility(systemUiVisibility); } } public void applyStatusBarColor(DrawerLayout drawerLayout) { if (atLeastLollipop()) { drawerLayout.setStatusBarBackgroundColor(getColorPrimaryDark()); + int systemUiVisibility = applyLightStatusBarFlag(drawerLayout.getSystemUiVisibility()); + drawerLayout.setSystemUiVisibility(systemUiVisibility); } } + private int applyLightStatusBarFlag(int flag) { + return isDark + ? flag | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR + : flag & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR; + } + public void applyStyle(Context context) { applyStyle(context.getTheme()); } @@ -87,7 +107,16 @@ public class ThemeColor { return colorPrimary; } + public int getActionBarTint() { + return actionBarTint; + } + public int getColorPrimaryDark() { return colorPrimaryDark; } + + public void apply(Toolbar toolbar) { + toolbar.setBackgroundColor(getPrimaryColor()); + MenuColorizer.colorToolbar(toolbar, actionBarTint); + } } diff --git a/src/main/java/org/tasks/ui/MenuColorizer.java b/src/main/java/org/tasks/ui/MenuColorizer.java index a75bd61a8..e8bcb3260 100644 --- a/src/main/java/org/tasks/ui/MenuColorizer.java +++ b/src/main/java/org/tasks/ui/MenuColorizer.java @@ -15,17 +15,17 @@ */ package org.tasks.ui; -import android.annotation.SuppressLint; -import android.app.Activity; +import android.content.Context; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.os.Build; +import android.support.v4.graphics.drawable.DrawableCompat; +import android.support.v7.widget.Toolbar; +import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; import android.view.SubMenu; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageButton; + +import org.tasks.R; /** * Helper class to set the color and transparency for menu icons in an ActionBar/Toolbar.

@@ -52,105 +52,42 @@ public class MenuColorizer { private MenuColorizer() { } - /** Sets a color filter on all menu icons, including the overflow button (if it exists) */ - public static void colorMenu(final Activity activity, final Menu menu, final int color) { - colorMenu(activity, menu, color, 0); + public static void colorToolbar(Context context, Toolbar toolbar) { + TypedValue typedValue = new TypedValue(); + context.getTheme().resolveAttribute(R.attr.actionBarPrimaryText, typedValue, true); + colorToolbar(toolbar, typedValue.data); + } + + public static void colorToolbar(Toolbar toolbar, int color) { + Drawable wrapped = DrawableCompat.wrap(toolbar.getNavigationIcon()); + wrapped.setTint(color); + toolbar.setNavigationIcon(wrapped); + toolbar.setTitleTextColor(color); + colorMenu(toolbar.getMenu(), color); } /** Sets a color filter on all menu icons, including the overflow button (if it exists) */ - public static void colorMenu(final Activity activity, final Menu menu, final int color, - final int alpha) { + private static void colorMenu(final Menu menu, final int color) { for (int i = 0, size = menu.size(); i < size; i++) { final MenuItem menuItem = menu.getItem(i); - colorMenuItem(menuItem, color, alpha); + colorMenuItem(menuItem, color); if (menuItem.hasSubMenu()) { final SubMenu subMenu = menuItem.getSubMenu(); for (int j = 0; j < subMenu.size(); j++) { - colorMenuItem(subMenu.getItem(j), color, alpha); + colorMenuItem(subMenu.getItem(j), color); } } } - final View home = activity.findViewById(android.R.id.home); - if (home != null) { - home.post(new Runnable() { - - @Override - public void run() { - colorOverflow(activity, color, alpha); - } - }); - } } /** Sets a color filter on a {@link MenuItem} */ - public static void colorMenuItem(final MenuItem menuItem, final int color) { - colorMenuItem(menuItem, color, 0); - } - - /** Sets a color filter on a {@link MenuItem} */ - public static void colorMenuItem(final MenuItem menuItem, final int color, final int alpha) { + private static void colorMenuItem(final MenuItem menuItem, final int color) { final Drawable drawable = menuItem.getIcon(); if (drawable != null) { // If we don't mutate the drawable, then all drawable's with this id will have a color // filter applied to it. drawable.mutate(); - drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP); - if (alpha > 0) { - drawable.setAlpha(alpha); - } - } - } - - /** Sets a color filter on the OverflowMenuButton in an ActionBar or Toolbar */ - public static void colorOverflow(final Activity activity, final int color) { - colorOverflow(activity, color, 0); - } - - /** Sets a color filter on the OverflowMenuButton in an ActionBar or Toolbar */ - @SuppressLint("NewApi") - @SuppressWarnings("deprecation") - public static void colorOverflow(final Activity activity, final int color, final int alpha) { - final ImageButton overflow = getOverflowMenu(activity); - if (overflow != null) { - overflow.setColorFilter(color); - if (alpha > 0) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - overflow.setImageAlpha(alpha); - } else { - overflow.setAlpha(alpha); - } - } + drawable.setColorFilter(color, PorterDuff.Mode.SRC_IN); } } - - /* Find that OverflowMenuButton */ - private static ImageButton getOverflowMenu(final Activity activity, - final ViewGroup... viewGroup) { - final ViewGroup group; - if (viewGroup == null || viewGroup.length == 0) { - final int resId = activity.getResources().getIdentifier("action_bar", "id", "android"); - if (resId != 0) { - group = (ViewGroup) activity.findViewById(resId); - } else { - group = (ViewGroup) activity.findViewById(android.R.id.content).getRootView(); - } - } else { - group = viewGroup[0]; - } - ImageButton overflow = null; - for (int i = 0, l = group.getChildCount(); i < l; i++) { - final View v = group.getChildAt(i); - if (v instanceof ImageButton - && v.getClass().getSimpleName().equals("OverflowMenuButton")) { - overflow = (ImageButton) v; - } else if (v instanceof ViewGroup) { - overflow = getOverflowMenu(activity, (ViewGroup) v); - } - if (overflow != null) { - break; - } - } - return overflow; - } - } diff --git a/src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.png b/src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.png deleted file mode 100644 index 497c88ca82b139d8523f62d272569b97777cdec7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmV-y0h9iTP)S{uX;NkkS)#&21u+#OWT?<*8xnfup2(UyYu`|TWayHRle3^B=LUseC>Hz3 z2?03L6F2Y)Y1vJelVK0EWmn2Ql$Ly?Q}HYJ&`ey8O(uTi9vWT@jom{_aSLoF;#2pK zl4W-|8up!*EPLl3g1*=uhfkRYaWVLWw$#P9nUaw)p(W=g$}a?K8bsDKc?-L=1LM-h zsPJb*v0}uSlpQ7f(8IPT6#ZR~|J)2!gMLSvx$!&t+WdOxKlA~ZoD~H=l;~Ih0000< KMNUMnLSTYiKb+YB diff --git a/src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.png b/src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.png deleted file mode 100644 index be9fb226a53ce5ee4008cfafa0754f42284d51b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 446 zcmV;v0YUzWP)S3bFt5nS?tU*5U+ zuRv$a3fXL!qPq!nmZ-`S-6wEv!Im}!G@?dn#;*=rm4ZHT$3Hy5 zK#ky=d(UOmFsQV^o<2gJx=}eIwnA3W7xau83lN!8vECcV2)4w<^v@2~67MD11sAjh ztGUt}LA${P1=0J3E1eNGc`3L+Gf5t=WKEt5E{OV^X;qWQ4p$&rl*20-lc(iB^4yia zijQ0lF6anWaiv8;dol|xA!y6No&?ck78<-*{Fa&B9E#TSq3mYYuttQ*QZ*_=*n0M$ zV!JjJ9`z`_U5gAzIwsc`sys4xbSaS{W>lIoJ$6TM=qna%_I>f1qB5iXUVh&=cfY<* oSSx7G$evyZ)YnOH5*(G_7e~OF#v^w+0000007*qoM6N<$g3E)#tN;K2 diff --git a/src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.png deleted file mode 100644 index c8e69dcebb98d43695027fcc7e39a339c84dda51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 666 zcmV;L0%iS)P)y zDuP#FBS9M!QcYr?x(Xj5^OKhEOrZ0;%Xt?M^PS1$oUvkJVg?bG2*VOq|FP&lUkJx< zKARBwK%20%c&{z=j$iacgSVPOZ>ZBRKY6Vs^pYxn!v)X(MaU+{KDTId#}NxSK|*6x zFv$sHenK`COmmFwEtDe)3f@BdM8ToA&@EBW@D_@SSjd>rJ=jul4hPAn$ZYd zQ(^?GM-r@1H!ZY@i{+CPWphGpzG8()mbM9@HXpGBsG>9Ms~`YLf6Qp{EBmWamEC4dDr!XN=Tg=UR*LRnyXqu_l$^Po#V$T zj`&?_>IiL%W{Dt*qP?plloe0b6+u)P>h$wELg`L#hA>QZ`WYP|H+WzkLrdxi*`3}7 zVOSR<9(Dx^Vxd?l7V1BL0REY1s|}3R@&Et;07*qoM6N<$f_%9k Avj6}9 diff --git a/src/main/res/drawable/ic_camera_alt_black_24dp.xml b/src/main/res/drawable/ic_camera_alt_black_24dp.xml new file mode 100644 index 000000000..bd0236887 --- /dev/null +++ b/src/main/res/drawable/ic_camera_alt_black_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_camera_alt_white_24dp.png b/src/main/res/drawable/ic_camera_alt_white_24dp.png deleted file mode 100644 index e830522008b0a1b1f39fdde1156ff1bae3f955e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmVHkAXPXi!ebT=lL4K1x)6Wg_MY91 zzt7rrmFO;X_oUmq$FIPH+E8b!7Su|rTTt3JU}I)<+1$1SJPXOxL=vhYuo3Q@z)==< z{b1(CNz*~H=m#TH*Ja}&F!>pnOOBdeCCh%W6|%$U`K_?;2UJ3mWl4Bp2(Ys-zHDi) q+wWiFtfaRVtkebP_bn*je*_=o)*|^)1w=Uj0000 @@ -48,7 +47,7 @@ android:layout_weight="1" android:scaleType="center" android:src="@drawable/ic_add_24dp" - android:tint="@android:color/white" + android:tint="?attr/actionBarPrimaryText" android:visibility="gone" /> diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml index bd40561ba..a4cf2da49 100644 --- a/src/main/res/layout/toolbar.xml +++ b/src/main/res/layout/toolbar.xml @@ -5,7 +5,6 @@ android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:elevation="@dimen/elevation_toolbar" - app:toolbarStyle="@style/Toolbar" + app:toolbarStyle="@style/Widget.AppCompat.Toolbar" app:popupTheme="?attr/popup_theme" - app:theme="@style/ActionBarThemeOverlay" - app:titleTextAppearance="@style/ActionBar.TitleText" /> + app:theme="?attr/overlay_theme" /> diff --git a/src/main/res/menu/menu_custom_filter_activity.xml b/src/main/res/menu/menu_custom_filter_activity.xml index 5d37d3872..c0ee03f20 100644 --- a/src/main/res/menu/menu_custom_filter_activity.xml +++ b/src/main/res/menu/menu_custom_filter_activity.xml @@ -8,10 +8,4 @@ android:icon="@drawable/ic_save_24dp" app:showAsAction="always"/> - - \ No newline at end of file diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 9c2c59b3d..000c6946a 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -13,6 +13,10 @@ + + + + diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 23adb504a..0e37e6448 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -102,9 +102,16 @@ #fff #eee - #000 #535353 + #df000000 + #8c000000 + #60000000 + #1e000000 + + #ffffff + #b2ffffff + @color/red_500 @color/amber_500 @color/blue_500 @@ -114,7 +121,6 @@ @color/grey_800 - #1f78b4 #262626 diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 69ce3a43a..54f4b029c 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -1,5 +1,4 @@ - + @@ -25,10 +24,28 @@ ?attr/asTextColor - + + + + + + diff --git a/src/main/res/values/theme_amber.xml b/src/main/res/values/theme_amber.xml index 50eef2f50..06c8ae69e 100644 --- a/src/main/res/values/theme_amber.xml +++ b/src/main/res/values/theme_amber.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_blue.xml b/src/main/res/values/theme_blue.xml index b72416e0a..e7125f8fa 100644 --- a/src/main/res/values/theme_blue.xml +++ b/src/main/res/values/theme_blue.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_blue_grey.xml b/src/main/res/values/theme_blue_grey.xml index 7a6ed16fc..60f627517 100644 --- a/src/main/res/values/theme_blue_grey.xml +++ b/src/main/res/values/theme_blue_grey.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_brown.xml b/src/main/res/values/theme_brown.xml index c0e42e5ca..0bc3a4aaa 100644 --- a/src/main/res/values/theme_brown.xml +++ b/src/main/res/values/theme_brown.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_cyan.xml b/src/main/res/values/theme_cyan.xml index 2be14eb6c..0c1a86059 100644 --- a/src/main/res/values/theme_cyan.xml +++ b/src/main/res/values/theme_cyan.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_dark_grey.xml b/src/main/res/values/theme_dark_grey.xml index 7d80c461a..d114e3816 100644 --- a/src/main/res/values/theme_dark_grey.xml +++ b/src/main/res/values/theme_dark_grey.xml @@ -1,6 +1,6 @@ - diff --git a/src/main/res/values/theme_deep_orange.xml b/src/main/res/values/theme_deep_orange.xml index bc8d5d6cb..07d3ed15c 100644 --- a/src/main/res/values/theme_deep_orange.xml +++ b/src/main/res/values/theme_deep_orange.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_deep_purple.xml b/src/main/res/values/theme_deep_purple.xml index 3e96106da..74d62e344 100644 --- a/src/main/res/values/theme_deep_purple.xml +++ b/src/main/res/values/theme_deep_purple.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_green.xml b/src/main/res/values/theme_green.xml index cd4167ad6..9e4f43c92 100644 --- a/src/main/res/values/theme_green.xml +++ b/src/main/res/values/theme_green.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_grey.xml b/src/main/res/values/theme_grey.xml index 2a8274a26..69bd51678 100644 --- a/src/main/res/values/theme_grey.xml +++ b/src/main/res/values/theme_grey.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_indigo.xml b/src/main/res/values/theme_indigo.xml index 667903b38..58d6be59b 100644 --- a/src/main/res/values/theme_indigo.xml +++ b/src/main/res/values/theme_indigo.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_light_blue.xml b/src/main/res/values/theme_light_blue.xml index 8c8d3e471..f50f41d73 100644 --- a/src/main/res/values/theme_light_blue.xml +++ b/src/main/res/values/theme_light_blue.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_light_green.xml b/src/main/res/values/theme_light_green.xml index 0f97eb591..33237c988 100644 --- a/src/main/res/values/theme_light_green.xml +++ b/src/main/res/values/theme_light_green.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_lime.xml b/src/main/res/values/theme_lime.xml index 2e159745b..36c16cc2f 100644 --- a/src/main/res/values/theme_lime.xml +++ b/src/main/res/values/theme_lime.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_orange.xml b/src/main/res/values/theme_orange.xml index 1df1a78e4..cd5f54c97 100644 --- a/src/main/res/values/theme_orange.xml +++ b/src/main/res/values/theme_orange.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_pink.xml b/src/main/res/values/theme_pink.xml index 8dd74f52f..233708bfb 100644 --- a/src/main/res/values/theme_pink.xml +++ b/src/main/res/values/theme_pink.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_purple.xml b/src/main/res/values/theme_purple.xml index 420fe2bbf..7e2987c74 100644 --- a/src/main/res/values/theme_purple.xml +++ b/src/main/res/values/theme_purple.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_red.xml b/src/main/res/values/theme_red.xml index 9adbfc42f..9490e46a4 100644 --- a/src/main/res/values/theme_red.xml +++ b/src/main/res/values/theme_red.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_teal.xml b/src/main/res/values/theme_teal.xml index ce7194d11..950c87123 100644 --- a/src/main/res/values/theme_teal.xml +++ b/src/main/res/values/theme_teal.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/res/values/theme_yellow.xml b/src/main/res/values/theme_yellow.xml index c8b8dd869..bf455bb6e 100644 --- a/src/main/res/values/theme_yellow.xml +++ b/src/main/res/values/theme_yellow.xml @@ -1,7 +1,7 @@ -