Replace asThemeTextColor with colorAccent

pull/413/head
Alex Baker 10 years ago
parent 1539feb252
commit dfd52c5866

@ -91,7 +91,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
@Override @Override
public void setUpUiComponents() { public void setUpUiComponents() {
TypedValue tv = new TypedValue(); TypedValue tv = new TypedValue();
getActivity().getTheme().resolveAttribute(R.attr.asThemeTextColor, tv, false); getActivity().getTheme().resolveAttribute(R.attr.colorAccent, tv, false);
getTouchListView().setDragndropBackgroundColor(tv.data); getTouchListView().setDragndropBackgroundColor(tv.data);
getTouchListView().setDropListener(dropListener); getTouchListView().setDropListener(dropListener);
getTouchListView().setClickListener(rowClickListener); getTouchListView().setClickListener(rowClickListener);

@ -16,11 +16,11 @@ import com.todoroo.astrid.service.StartupService;
import org.tasks.R; import org.tasks.R;
import org.tasks.dialogs.DialogBuilder; import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.ActivityComponent; import org.tasks.injection.ActivityComponent;
import org.tasks.injection.InjectingAppCompatActivity;
import org.tasks.injection.ThemedInjectingAppCompatActivity; import org.tasks.injection.ThemedInjectingAppCompatActivity;
import org.tasks.preferences.BasicPreferences; import org.tasks.preferences.BasicPreferences;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
import org.tasks.preferences.ResourceResolver; import org.tasks.preferences.ResourceResolver;
import org.tasks.preferences.ThemeManager;
import org.tasks.scheduling.AlarmManager; import org.tasks.scheduling.AlarmManager;
import org.tasks.scheduling.CalendarNotificationIntentService; import org.tasks.scheduling.CalendarNotificationIntentService;
@ -44,6 +44,7 @@ public class CalendarReminderActivity extends ThemedInjectingAppCompatActivity {
@Inject ResourceResolver resourceResolver; @Inject ResourceResolver resourceResolver;
@Inject DialogBuilder dialogBuilder; @Inject DialogBuilder dialogBuilder;
@Inject AlarmManager alarmManager; @Inject AlarmManager alarmManager;
@Inject ThemeManager themeManager;
private String eventName; private String eventName;
private long endTime; private long endTime;
@ -137,7 +138,7 @@ public class CalendarReminderActivity extends ThemedInjectingAppCompatActivity {
dialogView.setText(speechText); dialogView.setText(speechText);
createListButton.setBackgroundColor(resourceResolver.getData(R.attr.asThemeTextColor)); createListButton.setBackgroundColor(themeManager.getAccentTheme().getAccentColor());
if (fromPostpone) { if (fromPostpone) {
postponeButton.setVisibility(View.GONE); postponeButton.setVisibility(View.GONE);

@ -82,7 +82,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
@Override @Override
public void setUpUiComponents() { public void setUpUiComponents() {
TypedValue tv = new TypedValue(); TypedValue tv = new TypedValue();
getActivity().getTheme().resolveAttribute(R.attr.asThemeTextColor, tv, false); getActivity().getTheme().resolveAttribute(R.attr.colorAccent, tv, false);
DraggableListView draggableListView = (DraggableListView) fragment.getListView(); DraggableListView draggableListView = (DraggableListView) fragment.getListView();
draggableListView.setDragndropBackgroundColor(tv.data); draggableListView.setDragndropBackgroundColor(tv.data);
draggableListView.setDropListener(dropListener); draggableListView.setDropListener(dropListener);

@ -17,7 +17,6 @@
<attr name="asDueDateCompletedColor" format="color" /> <attr name="asDueDateCompletedColor" format="color" />
<attr name="asSeparator" format="color" /> <attr name="asSeparator" format="color" />
<attr name="asListDividerColor" format="color" /> <attr name="asListDividerColor" format="color" />
<attr name="asThemeTextColor" format="color" />
<attr name="asEditTextBackground" format="reference" /> <attr name="asEditTextBackground" format="reference" />
<attr name="separatorHeight" format="dimension" /> <attr name="separatorHeight" format="dimension" />
<attr name="popup_theme" format="reference" /> <attr name="popup_theme" format="reference" />

@ -17,7 +17,6 @@
<item name="asDetailsColor">#6666aa</item> <item name="asDetailsColor">#6666aa</item>
<item name="asDueDateColor">#c3c3c3</item> <item name="asDueDateColor">#c3c3c3</item>
<item name="asListDividerColor">#dddddd</item> <item name="asListDividerColor">#dddddd</item>
<item name="asThemeTextColor">@color/dark_blue_theme_color</item>
<item name="task_edit_divider">@color/task_edit_divider</item> <item name="task_edit_divider">@color/task_edit_divider</item>
<item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item> <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
<item name="android:actionModeBackground">?attr/colorPrimary</item> <item name="android:actionModeBackground">?attr/colorPrimary</item>
@ -30,7 +29,6 @@
<style name="DialogBaseDark" parent="@style/Theme.AppCompat.Dialog"> <style name="DialogBaseDark" parent="@style/Theme.AppCompat.Dialog">
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item> <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item> <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
<item name="asThemeTextColor">@color/dark_blue_theme_color</item>
<item name="asTextColor">@android:color/white</item> <item name="asTextColor">@android:color/white</item>
<item name="asListDividerColor">#dddddd</item> <item name="asListDividerColor">#dddddd</item>
</style> </style>

@ -17,7 +17,6 @@
<item name="asDetailsColor">#6666aa</item> <item name="asDetailsColor">#6666aa</item>
<item name="asDueDateColor">#878787</item> <item name="asDueDateColor">#878787</item>
<item name="asListDividerColor">#dddddd</item> <item name="asListDividerColor">#dddddd</item>
<item name="asThemeTextColor">@color/dark_blue_theme_color</item>
<item name="task_edit_divider">@color/task_edit_divider</item> <item name="task_edit_divider">@color/task_edit_divider</item>
<item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item> <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
<item name="android:actionModeBackground">?attr/colorPrimary</item> <item name="android:actionModeBackground">?attr/colorPrimary</item>
@ -30,7 +29,6 @@
<style name="LightDialogBase" parent="@style/Theme.AppCompat.Light.Dialog"> <style name="LightDialogBase" parent="@style/Theme.AppCompat.Light.Dialog">
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item> <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item> <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
<item name="asThemeTextColor">@color/dark_blue_theme_color</item>
<item name="asTextColor">@android:color/black</item> <item name="asTextColor">@android:color/black</item>
<item name="asListDividerColor">#dddddd</item> <item name="asListDividerColor">#dddddd</item>
</style> </style>

Loading…
Cancel
Save