diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fce13bc5b..ee219d0b2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,11 +86,11 @@ @@ -132,20 +132,6 @@ android:name=".sync.SynchronizationPreferences" android:theme="@style/Tasks"/> - - - - - - - - - - - - @@ -466,7 +452,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/ic_launcher_blue_grey-web.png b/app/src/main/ic_launcher_blue_grey-web.png new file mode 100644 index 000000000..19d751b52 Binary files /dev/null and b/app/src/main/ic_launcher_blue_grey-web.png differ diff --git a/app/src/main/ic_launcher_brown-web.png b/app/src/main/ic_launcher_brown-web.png new file mode 100644 index 000000000..5aab9be1c Binary files /dev/null and b/app/src/main/ic_launcher_brown-web.png differ diff --git a/app/src/main/ic_launcher_cyan-web.png b/app/src/main/ic_launcher_cyan-web.png new file mode 100644 index 000000000..9eb2facc9 Binary files /dev/null and b/app/src/main/ic_launcher_cyan-web.png differ diff --git a/app/src/main/ic_launcher_dark_grey-web.png b/app/src/main/ic_launcher_dark_grey-web.png new file mode 100644 index 000000000..26b5dc38c Binary files /dev/null and b/app/src/main/ic_launcher_dark_grey-web.png differ diff --git a/app/src/main/ic_launcher_deep_orange-web.png b/app/src/main/ic_launcher_deep_orange-web.png new file mode 100644 index 000000000..ecc3531f3 Binary files /dev/null and b/app/src/main/ic_launcher_deep_orange-web.png differ diff --git a/app/src/main/ic_launcher_deep_purple-web.png b/app/src/main/ic_launcher_deep_purple-web.png new file mode 100644 index 000000000..fbd637f53 Binary files /dev/null and b/app/src/main/ic_launcher_deep_purple-web.png differ diff --git a/app/src/main/ic_launcher_green-web.png b/app/src/main/ic_launcher_green-web.png new file mode 100644 index 000000000..fe0571317 Binary files /dev/null and b/app/src/main/ic_launcher_green-web.png differ diff --git a/app/src/main/ic_launcher_grey-web.png b/app/src/main/ic_launcher_grey-web.png new file mode 100644 index 000000000..929e7862b Binary files /dev/null and b/app/src/main/ic_launcher_grey-web.png differ diff --git a/app/src/main/ic_launcher_indigo-web.png b/app/src/main/ic_launcher_indigo-web.png new file mode 100644 index 000000000..69f7c9d0d Binary files /dev/null and b/app/src/main/ic_launcher_indigo-web.png differ diff --git a/app/src/main/ic_launcher_light_blue-web.png b/app/src/main/ic_launcher_light_blue-web.png new file mode 100644 index 000000000..fa42db7ad Binary files /dev/null and b/app/src/main/ic_launcher_light_blue-web.png differ diff --git a/app/src/main/ic_launcher_light_green-web.png b/app/src/main/ic_launcher_light_green-web.png new file mode 100644 index 000000000..aea696e68 Binary files /dev/null and b/app/src/main/ic_launcher_light_green-web.png differ diff --git a/app/src/main/ic_launcher_lime-web.png b/app/src/main/ic_launcher_lime-web.png new file mode 100644 index 000000000..e526fb65a Binary files /dev/null and b/app/src/main/ic_launcher_lime-web.png differ diff --git a/app/src/main/ic_launcher_orange-web.png b/app/src/main/ic_launcher_orange-web.png new file mode 100644 index 000000000..4e0bb19f2 Binary files /dev/null and b/app/src/main/ic_launcher_orange-web.png differ diff --git a/app/src/main/ic_launcher_pink-web.png b/app/src/main/ic_launcher_pink-web.png new file mode 100644 index 000000000..fdf8c685d Binary files /dev/null and b/app/src/main/ic_launcher_pink-web.png differ diff --git a/app/src/main/ic_launcher_purple-web.png b/app/src/main/ic_launcher_purple-web.png new file mode 100644 index 000000000..03784a965 Binary files /dev/null and b/app/src/main/ic_launcher_purple-web.png differ diff --git a/app/src/main/ic_launcher_red-web.png b/app/src/main/ic_launcher_red-web.png new file mode 100644 index 000000000..180fc678a Binary files /dev/null and b/app/src/main/ic_launcher_red-web.png differ diff --git a/app/src/main/ic_launcher_teal-web.png b/app/src/main/ic_launcher_teal-web.png new file mode 100644 index 000000000..4d47ae529 Binary files /dev/null and b/app/src/main/ic_launcher_teal-web.png differ diff --git a/app/src/main/ic_launcher_yellow-web.png b/app/src/main/ic_launcher_yellow-web.png new file mode 100644 index 000000000..e172f63ff Binary files /dev/null and b/app/src/main/ic_launcher_yellow-web.png differ diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java similarity index 98% rename from app/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java rename to app/src/main/java/com/todoroo/astrid/activity/MainActivity.java index f3201b304..4c1716eac 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java @@ -52,7 +52,6 @@ import org.tasks.data.TagData; import org.tasks.data.TagDataDao; import org.tasks.dialogs.SortDialog; import org.tasks.fragments.CommentBarFragment; -import org.tasks.gtasks.RemoteListSelectionHandler; import org.tasks.injection.ActivityComponent; import org.tasks.injection.InjectingAppCompatActivity; import org.tasks.intents.TaskIntents; @@ -72,7 +71,7 @@ import org.tasks.ui.PriorityControlSet; import org.tasks.ui.TaskListViewModel; import timber.log.Timber; -public class TaskListActivity extends InjectingAppCompatActivity +public class MainActivity extends InjectingAppCompatActivity implements OnFilterItemClickedListener, TaskListFragment.TaskListFragmentCallbackHandler, PriorityControlSet.OnPriorityChanged, @@ -282,7 +281,7 @@ public class TaskListActivity extends InjectingAppCompatActivity public void restart() { Intent intent = getIntent(); - intent.putExtra(TaskListActivity.OPEN_FILTER, filter); + intent.putExtra(MainActivity.OPEN_FILTER, filter); finish(); startActivity(intent); } @@ -383,7 +382,7 @@ public class TaskListActivity extends InjectingAppCompatActivity if (intent.hasExtra(TOKEN_CREATE_NEW_LIST_NAME)) { final String listName = intent.getStringExtra(TOKEN_CREATE_NEW_LIST_NAME); intent.removeExtra(TOKEN_CREATE_NEW_LIST_NAME); - Intent activityIntent = new Intent(TaskListActivity.this, TagSettingsActivity.class); + Intent activityIntent = new Intent(MainActivity.this, TagSettingsActivity.class); activityIntent.putExtra(TagSettingsActivity.TOKEN_AUTOPOPULATE_NAME, listName); startActivityForResult(activityIntent, NavigationDrawerFragment.REQUEST_NEW_LIST); } diff --git a/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java b/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java index 07327406f..a3cecc02d 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java +++ b/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java @@ -1,4 +1,4 @@ -/** TODO: make this lightweight, don't extend the entire TaskListActivity */ +/** TODO: make this lightweight, don't extend the entire MainActivity */ package com.todoroo.astrid.activity; import static org.tasks.intents.TaskIntents.getEditTaskStack; diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java b/app/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java index 089fca271..bfcfcfbee 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java @@ -14,8 +14,8 @@ public class TaskEditActivity extends Activity { final long taskId = getIntent().getLongExtra(TOKEN_ID, 0); - Intent intent = new Intent(this, TaskListActivity.class); - intent.putExtra(TaskListActivity.OPEN_TASK, taskId); + Intent intent = new Intent(this, MainActivity.class); + intent.putExtra(MainActivity.OPEN_TASK, taskId); startActivity(intent); finish(); diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 96a51ad21..436812f8e 100755 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -213,9 +213,9 @@ public final class TaskEditFragment extends InjectingFragment } if (isNewTask) { - ((TaskListActivity) getActivity()).getTaskListFragment().onTaskCreated(model.getUuid()); + ((MainActivity) getActivity()).getTaskListFragment().onTaskCreated(model.getUuid()); } else { - ((TaskListActivity) getActivity()).getTaskListFragment().onTaskSaved(); + ((MainActivity) getActivity()).getTaskListFragment().onTaskSaved(); } callback.taskEditFinished(); } else { diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 1e14bfca9..671a62aba 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -266,7 +266,7 @@ public class TaskListFragment extends InjectingFragment Criterion.or( Task.NOTES.like("%" + query + "%"), Task.TITLE.like("%" + query + "%"))))); - ((TaskListActivity) getActivity()).onFilterItemClicked(savedFilter); + ((MainActivity) getActivity()).onFilterItemClicked(savedFilter); MenuItemCompat.collapseActionView(item); return true; } @@ -488,7 +488,7 @@ public class TaskListFragment extends InjectingFragment } protected void onTaskDelete(Task task) { - TaskListActivity activity = (TaskListActivity) getActivity(); + MainActivity activity = (MainActivity) getActivity(); TaskEditFragment tef = activity.getTaskEditFragment(); if (tef != null) { if (task.getId() == tef.model.getId()) { @@ -515,14 +515,14 @@ public class TaskListFragment extends InjectingFragment } else if (requestCode == REQUEST_EDIT_FILTER) { if (resultCode == RESULT_OK) { String action = data.getAction(); - TaskListActivity activity = (TaskListActivity) getActivity(); + MainActivity activity = (MainActivity) getActivity(); if (FilterSettingsActivity.ACTION_FILTER_DELETED.equals(action)) { activity.onFilterItemClicked(null); } else if (FilterSettingsActivity.ACTION_FILTER_RENAMED.equals(action)) { activity .getIntent() .putExtra( - TaskListActivity.OPEN_FILTER, + MainActivity.OPEN_FILTER, (Filter) data.getParcelableExtra(FilterSettingsActivity.TOKEN_FILTER)); activity.recreate(); } diff --git a/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java index 7fca6568d..591155407 100644 --- a/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java @@ -27,7 +27,7 @@ import com.todoroo.andlib.data.Property.CountProperty; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.UnaryCriterion; import com.todoroo.andlib.utility.AndroidUtilities; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.api.CustomFilter; import com.todoroo.astrid.api.CustomFilterCriterion; import com.todoroo.astrid.api.Filter; @@ -253,7 +253,7 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity Filter filter = new CustomFilter( title, sql.toString(), values, storeObject.getId(), storeObject.getCriterion()); - setResult(RESULT_OK, new Intent().putExtra(TaskListActivity.OPEN_FILTER, filter)); + setResult(RESULT_OK, new Intent().putExtra(MainActivity.OPEN_FILTER, filter)); finish(); } diff --git a/app/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/app/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java index 69b009c28..8e851830c 100644 --- a/app/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java +++ b/app/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java @@ -8,7 +8,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.TextView; import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import javax.inject.Inject; import org.tasks.R; import org.tasks.dialogs.DialogBuilder; @@ -142,8 +142,8 @@ public class CalendarReminderActivity extends ThemedInjectingAppCompatActivity { } private void createNewList(final String name) { - Intent intent = new Intent(CalendarReminderActivity.this, TaskListActivity.class); - intent.putExtra(TaskListActivity.TOKEN_CREATE_NEW_LIST_NAME, name); + Intent intent = new Intent(CalendarReminderActivity.this, MainActivity.class); + intent.putExtra(MainActivity.TOKEN_CREATE_NEW_LIST_NAME, name); startActivity(intent); dismissButton.performClick(); // finish with animation } diff --git a/app/src/main/java/org/tasks/Notifier.java b/app/src/main/java/org/tasks/Notifier.java index a7ed7953d..5ad394070 100644 --- a/app/src/main/java/org/tasks/Notifier.java +++ b/app/src/main/java/org/tasks/Notifier.java @@ -10,7 +10,7 @@ import android.content.Context; import android.content.Intent; import android.support.v4.app.NotificationCompat; import com.todoroo.andlib.utility.AndroidUtilities; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; @@ -67,9 +67,9 @@ public class Notifier { return; } - Intent intent = new Intent(context, TaskListActivity.class); + Intent intent = new Intent(context, MainActivity.class); intent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_MULTIPLE_TASK); - intent.putExtra(TaskListActivity.OPEN_FILTER, filter); + intent.putExtra(MainActivity.OPEN_FILTER, filter); PendingIntent pendingIntent = PendingIntent.getActivity( context, filter.listingTitle.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT); diff --git a/app/src/main/java/org/tasks/activities/ColorPickerActivity.java b/app/src/main/java/org/tasks/activities/ColorPickerActivity.java index e3c38b009..ac043cbbb 100644 --- a/app/src/main/java/org/tasks/activities/ColorPickerActivity.java +++ b/app/src/main/java/org/tasks/activities/ColorPickerActivity.java @@ -6,12 +6,14 @@ import android.content.Intent; import android.os.Bundle; import java.util.List; import javax.inject.Inject; +import org.tasks.R; import org.tasks.billing.BillingClient; import org.tasks.billing.Inventory; import org.tasks.billing.PurchaseActivity; import org.tasks.dialogs.ColorPickerDialog; import org.tasks.injection.ActivityComponent; import org.tasks.injection.ThemedInjectingAppCompatActivity; +import org.tasks.preferences.Preferences; import org.tasks.themes.Theme; import org.tasks.themes.ThemeCache; @@ -27,6 +29,7 @@ public class ColorPickerActivity extends ThemedInjectingAppCompatActivity @Inject ThemeCache themeCache; @Inject BillingClient billingClient; @Inject Inventory inventory; + @Inject Preferences preferences; private ColorPalette palette; @@ -55,6 +58,7 @@ public class ColorPickerActivity extends ThemedInjectingAppCompatActivity case ACCENTS: return themeCache.getAccents(); case COLORS: + case LAUNCHER: return themeCache.getColors(); case THEMES: return themeCache.getThemes(); @@ -106,6 +110,8 @@ public class ColorPickerActivity extends ThemedInjectingAppCompatActivity return theme.getThemeColor().getIndex(); case ACCENTS: return theme.getThemeAccent().getIndex(); + case LAUNCHER: + return preferences.getInt(R.string.p_theme_launcher, 7); default: return theme.getThemeBase().getIndex(); } @@ -115,6 +121,7 @@ public class ColorPickerActivity extends ThemedInjectingAppCompatActivity THEMES, COLORS, ACCENTS, + LAUNCHER, WIDGET_BACKGROUND } } diff --git a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java index 12a7cbb4c..5b0724bce 100644 --- a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java +++ b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java @@ -20,7 +20,7 @@ import butterknife.ButterKnife; import butterknife.OnClick; import butterknife.OnFocusChange; import com.google.api.services.tasks.model.TaskList; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.gtasks.GtasksListService; import com.todoroo.astrid.service.TaskDeleter; @@ -183,7 +183,7 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi setResult( RESULT_OK, new Intent(ACTION_RELOAD) - .putExtra(TaskListActivity.OPEN_FILTER, new GtasksFilter(gtasksList))); + .putExtra(MainActivity.OPEN_FILTER, new GtasksFilter(gtasksList))); } finish(); } @@ -268,7 +268,7 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi gtasksList.setId(googleTaskListDao.insertOrReplace(gtasksList)); setResult( RESULT_OK, - new Intent().putExtra(TaskListActivity.OPEN_FILTER, new GtasksFilter(gtasksList))); + new Intent().putExtra(MainActivity.OPEN_FILTER, new GtasksFilter(gtasksList))); finish(); } @@ -289,7 +289,7 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi setResult( RESULT_OK, new Intent(ACTION_RELOAD) - .putExtra(TaskListActivity.OPEN_FILTER, new GtasksFilter(gtasksList))); + .putExtra(MainActivity.OPEN_FILTER, new GtasksFilter(gtasksList))); finish(); } diff --git a/app/src/main/java/org/tasks/activities/TagSettingsActivity.java b/app/src/main/java/org/tasks/activities/TagSettingsActivity.java index ad1e56ea3..5cc0945e8 100644 --- a/app/src/main/java/org/tasks/activities/TagSettingsActivity.java +++ b/app/src/main/java/org/tasks/activities/TagSettingsActivity.java @@ -22,7 +22,7 @@ import butterknife.ButterKnife; import butterknife.OnClick; import butterknife.OnFocusChange; import butterknife.OnTextChanged; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.api.TagFilter; import com.todoroo.astrid.helper.UUIDHelper; import com.todoroo.astrid.tags.TagService; @@ -190,7 +190,7 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity tagData.setColor(selectedTheme); tagDataDao.createNew(tagData); setResult( - RESULT_OK, new Intent().putExtra(TaskListActivity.OPEN_FILTER, new TagFilter(tagData))); + RESULT_OK, new Intent().putExtra(MainActivity.OPEN_FILTER, new TagFilter(tagData))); } else if (hasChanges()) { tagData.setName(newName); tagData.setColor(selectedTheme); @@ -199,7 +199,7 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity tagDao.rename(tagData.getRemoteId(), newName); setResult( RESULT_OK, - new Intent(ACTION_RELOAD).putExtra(TaskListActivity.OPEN_FILTER, new TagFilter(tagData))); + new Intent(ACTION_RELOAD).putExtra(MainActivity.OPEN_FILTER, new TagFilter(tagData))); } finish(); diff --git a/app/src/main/java/org/tasks/analytics/Tracking.java b/app/src/main/java/org/tasks/analytics/Tracking.java index 27ebc1831..9824ddbc4 100644 --- a/app/src/main/java/org/tasks/analytics/Tracking.java +++ b/app/src/main/java/org/tasks/analytics/Tracking.java @@ -11,6 +11,7 @@ public class Tracking { SET_THEME(R.string.tracking_category_preferences, R.string.p_theme), SET_COLOR(R.string.tracking_category_preferences, R.string.p_theme_color), SET_ACCENT(R.string.tracking_category_preferences, R.string.p_theme_accent), + SET_LAUNCHER(R.string.tracking_category_preferences, R.string.p_theme_launcher), SET_TAG_COLOR(R.string.tracking_category_tags, R.string.p_theme_color), WIDGET_ADD(R.string.tracking_category_widget, R.string.tracking_action_add), TIMER_START(R.string.tracking_category_timer, R.string.tracking_action_start), diff --git a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java index bd3efad46..f8aa50da0 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java +++ b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java @@ -23,7 +23,7 @@ import butterknife.ButterKnife; import butterknife.OnClick; import butterknife.OnFocusChange; import butterknife.OnTextChanged; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.api.CaldavFilter; import com.todoroo.astrid.helper.UUIDHelper; import com.todoroo.astrid.service.TaskDeleter; @@ -259,7 +259,7 @@ public class CaldavCalendarSettingsActivity extends ThemedInjectingAppCompatActi tracker.reportEvent(Events.CALDAV_LIST_ADDED); setResult( RESULT_OK, - new Intent().putExtra(TaskListActivity.OPEN_FILTER, new CaldavFilter(caldavCalendar))); + new Intent().putExtra(MainActivity.OPEN_FILTER, new CaldavFilter(caldavCalendar))); finish(); } @@ -270,7 +270,7 @@ public class CaldavCalendarSettingsActivity extends ThemedInjectingAppCompatActi setResult( RESULT_OK, new Intent(ACTION_RELOAD) - .putExtra(TaskListActivity.OPEN_FILTER, new CaldavFilter(caldavCalendar))); + .putExtra(MainActivity.OPEN_FILTER, new CaldavFilter(caldavCalendar))); finish(); } diff --git a/app/src/main/java/org/tasks/caldav/CaldavListFragment.java b/app/src/main/java/org/tasks/caldav/CaldavListFragment.java index 8a00546e2..4d739e3f2 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavListFragment.java +++ b/app/src/main/java/org/tasks/caldav/CaldavListFragment.java @@ -6,7 +6,7 @@ import android.content.Intent; import android.os.Bundle; import android.support.v7.widget.Toolbar; import android.view.MenuItem; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.api.CaldavFilter; import com.todoroo.astrid.api.Filter; @@ -59,7 +59,7 @@ public class CaldavListFragment extends TaskListFragment { public void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == REQUEST_ACCOUNT_SETTINGS) { if (resultCode == RESULT_OK) { - TaskListActivity activity = (TaskListActivity) getActivity(); + MainActivity activity = (MainActivity) getActivity(); String action = data.getAction(); if (CaldavCalendarSettingsActivity.ACTION_DELETED.equals(action)) { activity.onFilterItemClicked(null); @@ -67,8 +67,8 @@ public class CaldavListFragment extends TaskListFragment { activity .getIntent() .putExtra( - TaskListActivity.OPEN_FILTER, - (Filter) data.getParcelableExtra(TaskListActivity.OPEN_FILTER)); + MainActivity.OPEN_FILTER, + (Filter) data.getParcelableExtra(MainActivity.OPEN_FILTER)); activity.recreate(); } } diff --git a/app/src/main/java/org/tasks/dashclock/DashClockExtension.java b/app/src/main/java/org/tasks/dashclock/DashClockExtension.java index a46a1748c..d31aaffd4 100644 --- a/app/src/main/java/org/tasks/dashclock/DashClockExtension.java +++ b/app/src/main/java/org/tasks/dashclock/DashClockExtension.java @@ -4,7 +4,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import com.google.android.apps.dashclock.api.ExtensionData; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; @@ -64,8 +64,8 @@ public class DashClockExtension extends com.google.android.apps.dashclock.api.Da if (count == 0) { publish(null); } else { - Intent clickIntent = new Intent(this, TaskListActivity.class); - clickIntent.putExtra(TaskListActivity.LOAD_FILTER, filterPreference); + Intent clickIntent = new Intent(this, MainActivity.class); + clickIntent.putExtra(MainActivity.LOAD_FILTER, filterPreference); ExtensionData extensionData = new ExtensionData() .visible(true) diff --git a/app/src/main/java/org/tasks/injection/ActivityComponent.java b/app/src/main/java/org/tasks/injection/ActivityComponent.java index 5a871e661..63fc0ed4a 100644 --- a/app/src/main/java/org/tasks/injection/ActivityComponent.java +++ b/app/src/main/java/org/tasks/injection/ActivityComponent.java @@ -1,8 +1,8 @@ package org.tasks.injection; import com.todoroo.astrid.activity.BeastModePreferences; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.activity.ShareLinkActivity; -import com.todoroo.astrid.activity.TaskListActivity; import com.todoroo.astrid.core.CustomFilterActivity; import com.todoroo.astrid.core.DefaultsPreferences; import com.todoroo.astrid.core.OldTaskPreferences; @@ -76,7 +76,7 @@ public interface ActivityComponent { void inject(ShareLinkActivity shareLinkActivity); - void inject(TaskListActivity taskListActivity); + void inject(MainActivity mainActivity); void inject(BeastModePreferences beastModePreferences); diff --git a/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java b/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java index 229007f87..6e336395f 100644 --- a/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java +++ b/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java @@ -16,7 +16,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; import com.jakewharton.processphoenix.ProcessPhoenix; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.api.Filter; import javax.inject.Inject; import org.tasks.R; @@ -128,8 +128,8 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct R.string.restart_now, (dialogInterface, i) -> { Intent nextIntent = - new Intent(InjectingPreferenceActivity.this, TaskListActivity.class); - nextIntent.putExtra(TaskListActivity.OPEN_FILTER, (Filter) null); + new Intent(InjectingPreferenceActivity.this, MainActivity.class); + nextIntent.putExtra(MainActivity.OPEN_FILTER, (Filter) null); ProcessPhoenix.triggerRebirth(InjectingPreferenceActivity.this, nextIntent); }) .setNegativeButton(R.string.restart_later, null) diff --git a/app/src/main/java/org/tasks/intents/TaskIntents.java b/app/src/main/java/org/tasks/intents/TaskIntents.java index f3c0b3e1b..9602a0614 100644 --- a/app/src/main/java/org/tasks/intents/TaskIntents.java +++ b/app/src/main/java/org/tasks/intents/TaskIntents.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.support.v4.app.TaskStackBuilder; import com.google.common.base.Strings; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.data.Task; @@ -12,14 +12,14 @@ public class TaskIntents { public static TaskStackBuilder getEditTaskStack(Context context, final Filter filter, Task task) { Intent intent = getTaskListIntent(context, filter); - intent.putExtra(TaskListActivity.OPEN_NEW_TASK, task); + intent.putExtra(MainActivity.OPEN_NEW_TASK, task); return TaskStackBuilder.create(context).addNextIntent(intent); } public static TaskStackBuilder getEditTaskStack( Context context, final Filter filter, final long taskId) { Intent intent = getTaskListIntent(context, filter); - intent.putExtra(TaskListActivity.OPEN_TASK, taskId); + intent.putExtra(MainActivity.OPEN_TASK, taskId); return TaskStackBuilder.create(context).addNextIntent(intent); } @@ -29,22 +29,22 @@ public class TaskIntents { public static Intent getEditTaskIntent(Context context, String filterId, long taskId) { Intent taskListIntent = getTaskListByIdIntent(context, filterId); - taskListIntent.putExtra(TaskListActivity.OPEN_TASK, taskId); + taskListIntent.putExtra(MainActivity.OPEN_TASK, taskId); return taskListIntent; } public static Intent getTaskListIntent(Context context, final Filter filter) { - Intent intent = new Intent(context, TaskListActivity.class); + Intent intent = new Intent(context, MainActivity.class); if (filter != null) { - intent.putExtra(TaskListActivity.OPEN_FILTER, filter); + intent.putExtra(MainActivity.OPEN_FILTER, filter); } return intent; } public static Intent getTaskListByIdIntent(Context context, final String filterId) { - Intent intent = new Intent(context, TaskListActivity.class); + Intent intent = new Intent(context, MainActivity.class); if (!Strings.isNullOrEmpty(filterId)) { - intent.putExtra(TaskListActivity.LOAD_FILTER, filterId); + intent.putExtra(MainActivity.LOAD_FILTER, filterId); } return intent; } diff --git a/app/src/main/java/org/tasks/preferences/BasicPreferences.java b/app/src/main/java/org/tasks/preferences/BasicPreferences.java index e9eb6aecd..259396232 100644 --- a/app/src/main/java/org/tasks/preferences/BasicPreferences.java +++ b/app/src/main/java/org/tasks/preferences/BasicPreferences.java @@ -4,9 +4,12 @@ import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1; import static org.tasks.dialogs.ExportTasksDialog.newExportTasksDialog; import static org.tasks.dialogs.ImportTasksDialog.newImportTasksDialog; import static org.tasks.locale.LocalePickerDialog.newLocalePickerDialog; +import static org.tasks.themes.ThemeColor.LAUNCHERS; import android.app.Activity; +import android.content.ComponentName; import android.content.Intent; +import android.content.pm.PackageManager; import android.os.Bundle; import android.preference.Preference; import com.google.common.base.Strings; @@ -17,8 +20,10 @@ import javax.inject.Inject; import org.tasks.BuildConfig; import org.tasks.R; import org.tasks.activities.ColorPickerActivity; +import org.tasks.activities.ColorPickerActivity.ColorPalette; import org.tasks.analytics.Tracker; import org.tasks.analytics.Tracking; +import org.tasks.analytics.Tracking.Events; import org.tasks.billing.BillingClient; import org.tasks.billing.Inventory; import org.tasks.dialogs.DialogBuilder; @@ -45,6 +50,7 @@ public class BasicPreferences extends InjectingPreferenceActivity private static final int REQUEST_ACCENT_PICKER = 10004; private static final int REQUEST_CODE_BACKUP_DIR = 10005; private static final int REQUEST_PICKER = 10006; + private static final int REQUEST_LAUNCHER_PICKER = 10007; @Inject Tracker tracker; @Inject Preferences preferences; @Inject ThemeBase themeBase; @@ -78,8 +84,7 @@ public class BasicPreferences extends InjectingPreferenceActivity themePreference.setOnPreferenceClickListener( preference -> { Intent intent = new Intent(BasicPreferences.this, ColorPickerActivity.class); - intent.putExtra( - ColorPickerActivity.EXTRA_PALETTE, ColorPickerActivity.ColorPalette.THEMES); + intent.putExtra(ColorPickerActivity.EXTRA_PALETTE, ColorPalette.THEMES); startActivityForResult(intent, REQUEST_THEME_PICKER); return false; }); @@ -88,8 +93,7 @@ public class BasicPreferences extends InjectingPreferenceActivity colorPreference.setOnPreferenceClickListener( preference -> { Intent intent = new Intent(BasicPreferences.this, ColorPickerActivity.class); - intent.putExtra( - ColorPickerActivity.EXTRA_PALETTE, ColorPickerActivity.ColorPalette.COLORS); + intent.putExtra(ColorPickerActivity.EXTRA_PALETTE, ColorPalette.COLORS); startActivityForResult(intent, REQUEST_COLOR_PICKER); return false; }); @@ -98,11 +102,21 @@ public class BasicPreferences extends InjectingPreferenceActivity accentPreference.setOnPreferenceClickListener( preference -> { Intent intent = new Intent(BasicPreferences.this, ColorPickerActivity.class); - intent.putExtra( - ColorPickerActivity.EXTRA_PALETTE, ColorPickerActivity.ColorPalette.ACCENTS); + intent.putExtra(ColorPickerActivity.EXTRA_PALETTE, ColorPalette.ACCENTS); startActivityForResult(intent, REQUEST_ACCENT_PICKER); return false; }); + Preference launcherPreference = findPreference(getString(R.string.p_theme_launcher)); + ThemeColor launcherColor = + themeCache.getThemeColor(preferences.getInt(R.string.p_theme_launcher, 7)); + launcherPreference.setSummary(launcherColor.getName()); + launcherPreference.setOnPreferenceClickListener( + preference -> { + Intent intent = new Intent(BasicPreferences.this, ColorPickerActivity.class); + intent.putExtra(ColorPickerActivity.EXTRA_PALETTE, ColorPalette.LAUNCHER); + startActivityForResult(intent, REQUEST_LAUNCHER_PICKER); + return false; + }); Preference languagePreference = findPreference(getString(R.string.p_language)); updateLocale(); languagePreference.setOnPreferenceClickListener( @@ -202,6 +216,14 @@ public class BasicPreferences extends InjectingPreferenceActivity result.putBoolean(AppearancePreferences.EXTRA_RESTART, true); recreate(); } + } else if (requestCode == REQUEST_LAUNCHER_PICKER) { + if (resultCode == RESULT_OK) { + int index = data.getIntExtra(ColorPickerActivity.EXTRA_THEME_INDEX, 0); + setLauncherIcon(index); + preferences.setInt(R.string.p_theme_launcher, index); + tracker.reportEvent(Events.SET_LAUNCHER, Integer.toString(index)); + recreate(); + } } else if (requestCode == RC_PREFS) { if (resultCode == Activity.RESULT_OK && data != null) { result.putAll(data.getExtras()); @@ -273,6 +295,20 @@ public class BasicPreferences extends InjectingPreferenceActivity return dir == null ? "" : dir.getAbsolutePath(); } + private void setLauncherIcon(int index) { + PackageManager packageManager = getPackageManager(); + for (int i = 0; i < LAUNCHERS.length; i++) { + ComponentName componentName = + new ComponentName(this, "com.todoroo.astrid.activity.TaskListActivity" + LAUNCHERS[i]); + packageManager.setComponentEnabledSetting( + componentName, + index == i + ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED + : PackageManager.COMPONENT_ENABLED_STATE_DISABLED, + PackageManager.DONT_KILL_APP); + } + } + @Override public void inject(ActivityComponent component) { component.inject(this); diff --git a/app/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java b/app/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java index a48d74779..1ecc33d8f 100644 --- a/app/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java +++ b/app/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java @@ -6,7 +6,7 @@ import android.content.Context; import android.content.Intent; import com.google.ical.values.RRule; import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.dao.TaskDao; @@ -33,8 +33,8 @@ public class RepeatConfirmationReceiver extends BroadcastReceiver { @Override public void onReceive(final Context context, final Intent intent) { TaskListFragment taskListFragment = null; - if (activity instanceof TaskListActivity) { - taskListFragment = ((TaskListActivity) activity).getTaskListFragment(); + if (activity instanceof MainActivity) { + taskListFragment = ((MainActivity) activity).getTaskListFragment(); } if (taskListFragment == null) { Timber.d("No task list fragment"); diff --git a/app/src/main/java/org/tasks/tasklist/ActionModeProvider.java b/app/src/main/java/org/tasks/tasklist/ActionModeProvider.java index 4a890571d..7f8d0fd6b 100644 --- a/app/src/main/java/org/tasks/tasklist/ActionModeProvider.java +++ b/app/src/main/java/org/tasks/tasklist/ActionModeProvider.java @@ -8,7 +8,7 @@ import android.support.v7.view.ActionMode; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.api.Filter; @@ -61,7 +61,7 @@ public class ActionModeProvider { TaskAdapter adapter, TaskListFragment taskList, TaskListRecyclerAdapter taskListRecyclerAdapter) { - return ((TaskListActivity) context) + return ((MainActivity) context) .startSupportActionMode( new ActionMode.Callback() { @Override diff --git a/app/src/main/java/org/tasks/tasklist/GtasksListFragment.java b/app/src/main/java/org/tasks/tasklist/GtasksListFragment.java index 1addbb5bd..fa7e242d6 100644 --- a/app/src/main/java/org/tasks/tasklist/GtasksListFragment.java +++ b/app/src/main/java/org/tasks/tasklist/GtasksListFragment.java @@ -6,7 +6,7 @@ import android.content.Intent; import android.os.Bundle; import android.support.v7.widget.Toolbar; import android.view.MenuItem; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.GtasksFilter; @@ -65,7 +65,7 @@ public class GtasksListFragment extends TaskListFragment { public void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == REQUEST_LIST_SETTINGS) { if (resultCode == RESULT_OK) { - TaskListActivity activity = (TaskListActivity) getActivity(); + MainActivity activity = (MainActivity) getActivity(); String action = data.getAction(); if (GoogleTaskListSettingsActivity.ACTION_DELETED.equals(action)) { activity.onFilterItemClicked(null); @@ -73,8 +73,8 @@ public class GtasksListFragment extends TaskListFragment { activity .getIntent() .putExtra( - TaskListActivity.OPEN_FILTER, - (Filter) data.getParcelableExtra(TaskListActivity.OPEN_FILTER)); + MainActivity.OPEN_FILTER, + (Filter) data.getParcelableExtra(MainActivity.OPEN_FILTER)); activity.recreate(); } } diff --git a/app/src/main/java/org/tasks/tasklist/TagListFragment.java b/app/src/main/java/org/tasks/tasklist/TagListFragment.java index 48a023c61..ea07b3ad2 100644 --- a/app/src/main/java/org/tasks/tasklist/TagListFragment.java +++ b/app/src/main/java/org/tasks/tasklist/TagListFragment.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.os.Bundle; import android.support.v7.widget.Toolbar; import android.view.MenuItem; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.TagFilter; @@ -60,15 +60,15 @@ public class TagListFragment extends TaskListFragment { if (requestCode == REQUEST_EDIT_TAG) { if (resultCode == Activity.RESULT_OK) { String action = data.getAction(); - TaskListActivity activity = (TaskListActivity) getActivity(); + MainActivity activity = (MainActivity) getActivity(); if (TagSettingsActivity.ACTION_DELETED.equals(action)) { activity.onFilterItemClicked(null); } else if (TagSettingsActivity.ACTION_RELOAD.equals(action)) { activity .getIntent() .putExtra( - TaskListActivity.OPEN_FILTER, - (Filter) data.getParcelableExtra(TaskListActivity.OPEN_FILTER)); + MainActivity.OPEN_FILTER, + (Filter) data.getParcelableExtra(MainActivity.OPEN_FILTER)); activity.recreate(); } } diff --git a/app/src/main/java/org/tasks/themes/ThemeColor.java b/app/src/main/java/org/tasks/themes/ThemeColor.java index 6c306051e..19da54b65 100644 --- a/app/src/main/java/org/tasks/themes/ThemeColor.java +++ b/app/src/main/java/org/tasks/themes/ThemeColor.java @@ -19,6 +19,30 @@ import org.tasks.ui.MenuColorizer; public class ThemeColor implements ColorPickerDialog.Pickable { + public static final String[] LAUNCHERS = + new String[] { + ".BlueGrey", + ".DarkGrey", + ".Red", + ".Pink", + ".Purple", + ".DeepPurple", + ".Indigo", + "", + ".LightBlue", + ".Cyan", + ".Teal", + ".Green", + ".LightGreen", + ".Lime", + ".Yellow", + ".Amber", + ".Orange", + ".DeepOrange", + ".Brown", + ".Grey" + }; + static final int[] COLORS = new int[] { R.style.BlueGrey, @@ -42,6 +66,7 @@ public class ThemeColor implements ColorPickerDialog.Pickable { R.style.Brown, R.style.Grey }; + public static Creator CREATOR = new Creator() { @Override diff --git a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java index 86c32bf6f..685067cad 100644 --- a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java +++ b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java @@ -14,7 +14,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ListView; -import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.adapter.FilterAdapter; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterListItem; @@ -68,19 +68,19 @@ public class NavigationDrawerFragment extends InjectingFragment { if (requestCode == FilterAdapter.REQUEST_SETTINGS) { if (resultCode == Activity.RESULT_OK && data != null) { if (data.getBooleanExtra(AppearancePreferences.EXTRA_RESTART, false)) { - ((TaskListActivity) getActivity()).restart(); + ((MainActivity) getActivity()).restart(); } } } else if (requestCode == FilterAdapter.REQUEST_PURCHASE) { if (resultCode == Activity.RESULT_OK) { - ((TaskListActivity) getActivity()).restart(); + ((MainActivity) getActivity()).restart(); } } else if (requestCode == REQUEST_NEW_LIST || requestCode == ACTIVITY_REQUEST_NEW_FILTER || requestCode == REQUEST_NEW_GTASK_LIST || requestCode == REQUEST_NEW_CALDAV_COLLECTION) { if (resultCode == RESULT_OK && data != null) { - Filter newList = data.getParcelableExtra(TaskListActivity.OPEN_FILTER); + Filter newList = data.getParcelableExtra(MainActivity.OPEN_FILTER); if (newList != null) { mCallbacks.onFilterItemClicked(newList); } diff --git a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java index f75d2624e..7cf930b1c 100644 --- a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java +++ b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java @@ -50,7 +50,7 @@ public class ShortcutConfigActivity extends InjectingAppCompatActivity { Intent intent = new Intent(); intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent); intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, filter.listingTitle); - Drawable launcher = ContextCompat.getDrawable(this, R.mipmap.ic_launcher_round); + Drawable launcher = ContextCompat.getDrawable(this, R.mipmap.ic_launcher_blue); if (launcher instanceof BitmapDrawable) { intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, ((BitmapDrawable) launcher).getBitmap()); } else if (atLeastOreo() && launcher instanceof AdaptiveIconDrawable) { diff --git a/app/src/main/res/layout/astrid_calendar_reminder_view.xml b/app/src/main/res/layout/astrid_calendar_reminder_view.xml index 56aa349d5..9205041f7 100644 --- a/app/src/main/res/layout/astrid_calendar_reminder_view.xml +++ b/app/src/main/res/layout/astrid_calendar_reminder_view.xml @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="5dip" android:scaleType="fitCenter" - android:src="@mipmap/ic_launcher_round"/> + android:src="@mipmap/ic_launcher_blue"/> + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml similarity index 68% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml index 578e6ac72..869d89e52 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml new file mode 100644 index 000000000..b730ee3bb --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml new file mode 100644 index 000000000..d95ccee41 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml new file mode 100644 index 000000000..d9c863760 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_dark_grey.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_dark_grey.xml new file mode 100644 index 000000000..ab4a11c64 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_dark_grey.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml new file mode 100644 index 000000000..7ca24d6e6 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml new file mode 100644 index 000000000..45f5fb08c --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml new file mode 100644 index 000000000..446108fc0 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey.xml new file mode 100644 index 000000000..038af7891 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml new file mode 100644 index 000000000..1de8bc24e --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml new file mode 100644 index 000000000..316d25310 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml new file mode 100644 index 000000000..26b7c52e2 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml new file mode 100644 index 000000000..85b21c88b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml new file mode 100644 index 000000000..ccec30daa --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml new file mode 100644 index 000000000..c4affeaee --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml new file mode 100644 index 000000000..cecd537c1 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml new file mode 100644 index 000000000..4c91e3c38 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml new file mode 100644 index 000000000..755e8a261 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml new file mode 100644 index 000000000..b8dac003e --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png new file mode 100644 index 000000000..ea60d049c Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-hdpi/ic_launcher_blue.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png new file mode 100644 index 000000000..3420b0b20 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png new file mode 100644 index 000000000..2c094f852 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png new file mode 100644 index 000000000..2fdbfb2eb Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_dark_grey.png b/app/src/main/res/mipmap-hdpi/ic_launcher_dark_grey.png new file mode 100644 index 000000000..e85c31369 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_dark_grey.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png new file mode 100644 index 000000000..796ed554e Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png new file mode 100644 index 000000000..53da44291 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_green.png b/app/src/main/res/mipmap-hdpi/ic_launcher_green.png new file mode 100644 index 000000000..dfb206836 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_green.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_grey.png b/app/src/main/res/mipmap-hdpi/ic_launcher_grey.png new file mode 100644 index 000000000..f7121588d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_grey.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png new file mode 100644 index 000000000..f4cd1b686 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png new file mode 100644 index 000000000..9534e9fc0 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png new file mode 100644 index 000000000..8ac11206b Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png new file mode 100644 index 000000000..2b9ae78e3 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_orange.png b/app/src/main/res/mipmap-hdpi/ic_launcher_orange.png new file mode 100644 index 000000000..3d1557ba2 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_orange.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png new file mode 100644 index 000000000..102d62199 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png new file mode 100644 index 000000000..f90061f55 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_red.png b/app/src/main/res/mipmap-hdpi/ic_launcher_red.png new file mode 100644 index 000000000..54d23c15f Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_red.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png new file mode 100644 index 000000000..1092d6e54 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png new file mode 100644 index 000000000..637dbe3f0 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-mdpi/ic_launcher_amber.png new file mode 100644 index 000000000..0c7edac4f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_amber.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_blue.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-mdpi/ic_launcher_blue.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.png new file mode 100644 index 000000000..971895956 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-mdpi/ic_launcher_brown.png new file mode 100644 index 000000000..1ca787e14 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_brown.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.png new file mode 100644 index 000000000..3056bd2dc Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_dark_grey.png b/app/src/main/res/mipmap-mdpi/ic_launcher_dark_grey.png new file mode 100644 index 000000000..3f15519d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_dark_grey.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.png new file mode 100644 index 000000000..70eb6a425 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.png new file mode 100644 index 000000000..c43faacaa Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_green.png b/app/src/main/res/mipmap-mdpi/ic_launcher_green.png new file mode 100644 index 000000000..e1feeaa96 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_green.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_grey.png b/app/src/main/res/mipmap-mdpi/ic_launcher_grey.png new file mode 100644 index 000000000..a96ab3565 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_grey.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.png new file mode 100644 index 000000000..35467c104 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.png new file mode 100644 index 000000000..036e79ec5 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.png new file mode 100644 index 000000000..ef5a2812c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-mdpi/ic_launcher_lime.png new file mode 100644 index 000000000..91fa871c0 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_lime.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_orange.png b/app/src/main/res/mipmap-mdpi/ic_launcher_orange.png new file mode 100644 index 000000000..59027cd81 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_orange.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-mdpi/ic_launcher_pink.png new file mode 100644 index 000000000..7a0fa075f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_pink.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-mdpi/ic_launcher_purple.png new file mode 100644 index 000000000..ca910efa6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_purple.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_red.png b/app/src/main/res/mipmap-mdpi/ic_launcher_red.png new file mode 100644 index 000000000..760241505 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_red.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-mdpi/ic_launcher_teal.png new file mode 100644 index 000000000..0903b2b36 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_teal.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.png new file mode 100644 index 000000000..c63469b46 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png new file mode 100644 index 000000000..0e970d3e1 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png new file mode 100644 index 000000000..39be2a79e Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png new file mode 100644 index 000000000..1672a9845 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png new file mode 100644 index 000000000..b50fedfdd Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_dark_grey.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_dark_grey.png new file mode 100644 index 000000000..dbed0c481 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_dark_grey.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png new file mode 100644 index 000000000..3007c2f42 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png new file mode 100644 index 000000000..a449254cc Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png new file mode 100644 index 000000000..2b5fea06d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey.png new file mode 100644 index 000000000..2f07da5fe Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png new file mode 100644 index 000000000..74026a0eb Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png new file mode 100644 index 000000000..ed03e646d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png new file mode 100644 index 000000000..6e6cb2aaa Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png new file mode 100644 index 000000000..b2dc52e33 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.png new file mode 100644 index 000000000..16f29824b Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png new file mode 100644 index 000000000..c39d2ecf9 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png new file mode 100644 index 000000000..1086a8275 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png new file mode 100644 index 000000000..a6aa1e750 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png new file mode 100644 index 000000000..985909aff Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png new file mode 100644 index 000000000..7d47bd99b Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png new file mode 100644 index 000000000..ed7958876 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png new file mode 100644 index 000000000..1314a2f13 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png new file mode 100644 index 000000000..18505a189 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png new file mode 100644 index 000000000..2ffbe75ea Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_dark_grey.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_dark_grey.png new file mode 100644 index 000000000..53c24803d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_dark_grey.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png new file mode 100644 index 000000000..5acdbecbe Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png new file mode 100644 index 000000000..cdb123da6 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png new file mode 100644 index 000000000..bfab34816 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey.png new file mode 100644 index 000000000..5415f968a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png new file mode 100644 index 000000000..151752e89 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png new file mode 100644 index 000000000..4f473b9ec Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png new file mode 100644 index 000000000..579c4342f Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png new file mode 100644 index 000000000..7602c2f00 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.png new file mode 100644 index 000000000..88061b553 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png new file mode 100644 index 000000000..285236f65 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png new file mode 100644 index 000000000..6d52afd6d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png new file mode 100644 index 000000000..ca5c5a08b Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png new file mode 100644 index 000000000..d943e6e09 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png new file mode 100644 index 000000000..33eef1b08 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png new file mode 100644 index 000000000..47e430626 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png new file mode 100644 index 000000000..c589422a3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png new file mode 100644 index 000000000..d342f75ee Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png new file mode 100644 index 000000000..e767ff038 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_dark_grey.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_dark_grey.png new file mode 100644 index 000000000..92fa57c14 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_dark_grey.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png new file mode 100644 index 000000000..5ff40ddfa Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png new file mode 100644 index 000000000..7b5c5a16e Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png new file mode 100644 index 000000000..47d74024f Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey.png new file mode 100644 index 000000000..06e1b71dd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png new file mode 100644 index 000000000..48af8f88d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png new file mode 100644 index 000000000..3aa7ae20e Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png new file mode 100644 index 000000000..6763f46ef Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png new file mode 100644 index 000000000..46ac1cd91 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.png new file mode 100644 index 000000000..15c881665 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png new file mode 100644 index 000000000..1eed1d337 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png new file mode 100644 index 000000000..42d7bc6dd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png new file mode 100644 index 000000000..b915535fa Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png new file mode 100644 index 000000000..d99ae5f0c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png new file mode 100644 index 000000000..bb0a1c974 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml deleted file mode 100644 index cc9e64123..000000000 --- a/app/src/main/res/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #2196F3 - \ No newline at end of file diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index 6908f1c66..2a06931eb 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -260,6 +260,7 @@ theme_style theme_color theme_accent + theme_launcher language layout_direction led_notificatiWCAon diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dddaaf95d..8bf3880c0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -78,7 +78,7 @@ File %1$s contained %2$s.\n\n Click to set - + There are no tasks here. @@ -762,6 +762,7 @@ File %1$s contained %2$s.\n\n Theme Color Accent + Launcher icon Red Pink Purple diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 50721f4d5..32ffe6e8f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -72,7 +72,7 @@ ?attr/asTextColor - +