From 799ec9a058b486d4069dfdb8fa084c2b2d884565 Mon Sep 17 00:00:00 2001 From: bg45 Date: Thu, 23 Mar 2017 17:55:38 -0400 Subject: [PATCH] Lots of code cleanup and improvements after inspection Load Today tasks in a AsyncTask Use of plurals instead of string Menu icons change No more tasks now displayed in the center of the screen --- DoNExt/app/build.gradle | 6 +- .../geoffroy/donext/ApplicationTest.java | 13 - DoNExt/app/src/main/AndroidManifest.xml | 1 - .../com/wismna/geoffroy/donext/DoNext.java | 1 + .../donext/activities/MainActivity.java | 14 - .../donext/activities/TodayActivity.java | 20 +- .../SmartFragmentStatePagerAdapter.java | 14 +- .../adapters/TaskListRecyclerViewAdapter.java | 4 +- .../adapters/TaskRecyclerViewAdapter.java | 4 +- .../donext/database/TaskDataAccess.java | 25 +- .../donext/database/TaskListDataAccess.java | 14 +- .../fragments/ConfirmDialogFragment.java | 4 +- .../fragments/DynamicDialogFragment.java | 6 +- .../donext/fragments/TaskDialogFragment.java | 256 ------------------ .../donext/fragments/TaskListsFragment.java | 3 +- .../donext/fragments/TasksFragment.java | 172 ++++++------ .../fragments/TodayFormDialogFragment.java | 40 ++- .../donext/helpers/TaskListTouchHelper.java | 2 +- .../donext/helpers/TaskTouchHelper.java | 2 +- .../listeners/RecyclerItemClickListener.java | 4 +- .../donext/widgets/DividerItemDecoration.java | 2 +- .../res/drawable-hdpi/ic_access_alarm.png | Bin 0 -> 1186 bytes .../app/src/main/res/drawable-hdpi/ic_add.png | Bin 0 -> 223 bytes .../res/drawable-hdpi/ic_add_white_24dp.png | Bin 127 -> 0 bytes .../ic_create_new_folder_dark.png | Bin 0 -> 335 bytes .../ic_create_new_folder_white_24dp.png | Bin 165 -> 0 bytes .../res/drawable-hdpi/ic_format_size_dark.png | Bin 0 -> 206 bytes .../drawable-hdpi/ic_forward_black_24dp.png | Bin 133 -> 0 bytes .../res/drawable-hdpi/ic_info_black_24dp.png | Bin 321 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 233 -> 0 bytes .../src/main/res/drawable-hdpi/ic_reorder.png | Bin 0 -> 166 bytes .../res/drawable-hdpi/ic_sync_black_24dp.png | Bin 368 -> 0 bytes .../drawable-hdpi/ic_view_list_white_24dp.png | Bin 120 -> 0 bytes .../res/drawable-mdpi/ic_access_alarm.png | Bin 0 -> 813 bytes .../app/src/main/res/drawable-mdpi/ic_add.png | Bin 0 -> 152 bytes .../res/drawable-mdpi/ic_add_white_24dp.png | Bin 88 -> 0 bytes .../ic_create_new_folder_dark.png | Bin 0 -> 242 bytes .../ic_create_new_folder_white_24dp.png | Bin 132 -> 0 bytes .../res/drawable-mdpi/ic_format_size_dark.png | Bin 0 -> 155 bytes .../drawable-mdpi/ic_forward_black_24dp.png | Bin 114 -> 0 bytes .../res/drawable-mdpi/ic_info_black_24dp.png | Bin 222 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 182 -> 0 bytes .../src/main/res/drawable-mdpi/ic_reorder.png | Bin 0 -> 131 bytes .../res/drawable-mdpi/ic_sync_black_24dp.png | Bin 250 -> 0 bytes .../drawable-mdpi/ic_view_list_white_24dp.png | Bin 85 -> 0 bytes .../res/drawable-v21/ic_info_black_24dp.xml | 9 - .../ic_notifications_black_24dp.xml | 9 - .../res/drawable-v21/ic_sync_black_24dp.xml | 9 - .../res/drawable-xhdpi/ic_access_alarm.png | Bin 0 -> 1525 bytes .../src/main/res/drawable-xhdpi/ic_add.png | Bin 0 -> 197 bytes .../res/drawable-xhdpi/ic_add_white_24dp.png | Bin 97 -> 0 bytes .../ic_create_new_folder_dark.png | Bin 0 -> 376 bytes .../ic_create_new_folder_white_24dp.png | Bin 188 -> 0 bytes .../drawable-xhdpi/ic_format_size_dark.png | Bin 0 -> 206 bytes .../drawable-xhdpi/ic_forward_black_24dp.png | Bin 150 -> 0 bytes .../res/drawable-xhdpi/ic_info_black_24dp.png | Bin 412 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 278 -> 0 bytes .../main/res/drawable-xhdpi/ic_reorder.png | Bin 0 -> 162 bytes .../res/drawable-xhdpi/ic_sync_black_24dp.png | Bin 467 -> 0 bytes .../ic_view_list_white_24dp.png | Bin 94 -> 0 bytes .../res/drawable-xxhdpi/ic_access_alarm.png | Bin 0 -> 2528 bytes .../src/main/res/drawable-xxhdpi/ic_add.png | Bin 0 -> 351 bytes .../res/drawable-xxhdpi/ic_add_white_24dp.png | Bin 97 -> 0 bytes .../ic_create_new_folder_dark.png | Bin 0 -> 611 bytes .../ic_create_new_folder_white_24dp.png | Bin 250 -> 0 bytes .../drawable-xxhdpi/ic_format_size_dark.png | Bin 0 -> 320 bytes .../drawable-xxhdpi/ic_forward_black_24dp.png | Bin 192 -> 0 bytes .../drawable-xxhdpi/ic_info_black_24dp.png | Bin 579 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 383 -> 0 bytes .../main/res/drawable-xxhdpi/ic_reorder.png | Bin 0 -> 237 bytes .../drawable-xxhdpi/ic_sync_black_24dp.png | Bin 669 -> 0 bytes .../ic_view_list_white_24dp.png | Bin 99 -> 0 bytes .../drawable-xxxhdpi/ic_add_white_24dp.png | Bin 102 -> 0 bytes .../ic_create_new_folder_white_24dp.png | Bin 313 -> 0 bytes .../ic_forward_black_24dp.png | Bin 231 -> 0 bytes .../drawable-xxxhdpi/ic_info_black_24dp.png | Bin 766 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 497 -> 0 bytes .../drawable-xxxhdpi/ic_sync_black_24dp.png | Bin 875 -> 0 bytes .../ic_view_list_white_24dp.png | Bin 100 -> 0 bytes .../drawable/ic_access_alarm_black_24dp.xml | 9 - .../res/drawable/ic_reorder_grey_500_24dp.png | Bin 153 -> 0 bytes .../main/res/layout-large/activity_main.xml | 3 +- .../app/src/main/res/layout/activity_main.xml | 2 +- .../src/main/res/layout/activity_today.xml | 2 +- .../res/layout/fragment_task_confirmation.xml | 1 - .../main/res/layout/fragment_task_form.xml | 112 -------- .../src/main/res/layout/fragment_tasklist.xml | 3 +- .../main/res/layout/fragment_tasklists.xml | 1 - .../src/main/res/layout/fragment_tasks.xml | 9 +- DoNExt/app/src/main/res/menu/menu_main.xml | 4 +- DoNExt/app/src/main/res/menu/menu_today.xml | 2 +- DoNExt/app/src/main/res/values-fr/arrays.xml | 4 - DoNExt/app/src/main/res/values-fr/plurals.xml | 15 + DoNExt/app/src/main/res/values-fr/strings.xml | 17 +- DoNExt/app/src/main/res/values/arrays.xml | 8 - DoNExt/app/src/main/res/values/plurals.xml | 15 + DoNExt/app/src/main/res/values/strings.xml | 18 +- 97 files changed, 196 insertions(+), 663 deletions(-) delete mode 100644 DoNExt/app/src/androidTest/java/com/wismna/geoffroy/donext/ApplicationTest.java delete mode 100644 DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskDialogFragment.java create mode 100644 DoNExt/app/src/main/res/drawable-hdpi/ic_access_alarm.png create mode 100644 DoNExt/app/src/main/res/drawable-hdpi/ic_add.png delete mode 100644 DoNExt/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-hdpi/ic_create_new_folder_dark.png delete mode 100644 DoNExt/app/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-hdpi/ic_format_size_dark.png delete mode 100644 DoNExt/app/src/main/res/drawable-hdpi/ic_forward_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-hdpi/ic_reorder.png delete mode 100644 DoNExt/app/src/main/res/drawable-hdpi/ic_sync_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-hdpi/ic_view_list_white_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-mdpi/ic_access_alarm.png create mode 100644 DoNExt/app/src/main/res/drawable-mdpi/ic_add.png delete mode 100644 DoNExt/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-mdpi/ic_create_new_folder_dark.png delete mode 100644 DoNExt/app/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-mdpi/ic_format_size_dark.png delete mode 100644 DoNExt/app/src/main/res/drawable-mdpi/ic_forward_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-mdpi/ic_info_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-mdpi/ic_reorder.png delete mode 100644 DoNExt/app/src/main/res/drawable-mdpi/ic_sync_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-mdpi/ic_view_list_white_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-v21/ic_info_black_24dp.xml delete mode 100644 DoNExt/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml delete mode 100644 DoNExt/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml create mode 100644 DoNExt/app/src/main/res/drawable-xhdpi/ic_access_alarm.png create mode 100644 DoNExt/app/src/main/res/drawable-xhdpi/ic_add.png delete mode 100644 DoNExt/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-xhdpi/ic_create_new_folder_dark.png delete mode 100644 DoNExt/app/src/main/res/drawable-xhdpi/ic_create_new_folder_white_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-xhdpi/ic_format_size_dark.png delete mode 100644 DoNExt/app/src/main/res/drawable-xhdpi/ic_forward_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-xhdpi/ic_reorder.png delete mode 100644 DoNExt/app/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-xhdpi/ic_view_list_white_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-xxhdpi/ic_access_alarm.png create mode 100644 DoNExt/app/src/main/res/drawable-xxhdpi/ic_add.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-xxhdpi/ic_create_new_folder_dark.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-xxhdpi/ic_format_size_dark.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxhdpi/ic_forward_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png create mode 100644 DoNExt/app/src/main/res/drawable-xxhdpi/ic_reorder.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxhdpi/ic_view_list_white_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxxhdpi/ic_forward_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxxhdpi/ic_sync_black_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable-xxxhdpi/ic_view_list_white_24dp.png delete mode 100644 DoNExt/app/src/main/res/drawable/ic_access_alarm_black_24dp.xml delete mode 100644 DoNExt/app/src/main/res/drawable/ic_reorder_grey_500_24dp.png delete mode 100644 DoNExt/app/src/main/res/layout/fragment_task_form.xml create mode 100644 DoNExt/app/src/main/res/values-fr/plurals.xml create mode 100644 DoNExt/app/src/main/res/values/plurals.xml diff --git a/DoNExt/app/build.gradle b/DoNExt/app/build.gradle index 4912e18..00bf023 100644 --- a/DoNExt/app/build.gradle +++ b/DoNExt/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.wismna.geoffroy.donext" minSdkVersion 19 targetSdkVersion 25 - versionCode 15 - versionName "1.4.0" + versionCode 16 + versionName "1.4.1" } buildTypes { release { @@ -26,7 +26,7 @@ dependencies { compile 'com.android.support:support-v4:25.3.0' compile 'com.android.support:percent:25.3.0' compile 'com.android.support:recyclerview-v7:25.3.0' - compile 'com.google.android.gms:play-services-ads:10.2.0' + compile 'com.google.android.gms:play-services-ads:10.2.1' compile 'net.danlew:android.joda:2.9.7' testCompile 'junit:junit:4.12' } diff --git a/DoNExt/app/src/androidTest/java/com/wismna/geoffroy/donext/ApplicationTest.java b/DoNExt/app/src/androidTest/java/com/wismna/geoffroy/donext/ApplicationTest.java deleted file mode 100644 index 81cfef3..0000000 --- a/DoNExt/app/src/androidTest/java/com/wismna/geoffroy/donext/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.wismna.geoffroy.donext; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/DoNExt/app/src/main/AndroidManifest.xml b/DoNExt/app/src/main/AndroidManifest.xml index be58329..742bf0a 100644 --- a/DoNExt/app/src/main/AndroidManifest.xml +++ b/DoNExt/app/src/main/AndroidManifest.xml @@ -22,7 +22,6 @@ - diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/DoNext.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/DoNext.java index ee5489e..ec24558 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/DoNext.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/DoNext.java @@ -6,6 +6,7 @@ import net.danlew.android.joda.JodaTimeAndroid; /** * Created by bg45 on 2017-03-15. + * Application class, used to initialize Joda Time */ public class DoNext extends Application { diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java index 8781d33..46c53b4 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java @@ -136,19 +136,7 @@ public class MainActivity extends AppCompatActivity implements TasksFragment.Tas @Override public boolean onPrepareOptionsMenu(Menu menu) { - // Handles layout change button - MenuItem displayLayoutItem = menu.findItem(R.id.action_changeLayout); - if (displayLayoutItem == null) return false; SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); - String layoutType = sharedPref.getString("pref_conf_task_layout", "1"); - switch (layoutType) { - case "1" : - displayLayoutItem.setIcon(R.drawable.ic_list_white_24dp); - break; - case "2" : - displayLayoutItem.setIcon(R.drawable.ic_view_list_white_24dp); - break; - } // Handles today list MenuItem todayListItem = menu.findItem(R.id.action_todayList); @@ -232,8 +220,6 @@ public class MainActivity extends AppCompatActivity implements TasksFragment.Tas // Update the ViewPagerAdapter to refresh all tabs mSectionsPagerAdapter.notifyDataSetChanged(); - // Invalidate the menu to redraw the icon - invalidateOptionsMenu(); } /** Called when the user clicks the Edit Lists button */ diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/TodayActivity.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/TodayActivity.java index bb65a08..a622d27 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/TodayActivity.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/TodayActivity.java @@ -49,23 +49,6 @@ public class TodayActivity extends AppCompatActivity return true; } - @Override - public boolean onPrepareOptionsMenu(Menu menu) { - MenuItem displayLayoutItem = menu.findItem(R.id.action_changeLayout); - if (displayLayoutItem == null) return false; - SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); - String layoutType = sharedPref.getString("pref_conf_task_layout", "1"); - switch (layoutType) { - case "1" : - displayLayoutItem.setIcon(R.drawable.ic_list_white_24dp); - break; - case "2" : - displayLayoutItem.setIcon(R.drawable.ic_view_list_white_24dp); - break; - } - return super.onPrepareOptionsMenu(menu); - } - /** Called when the user clicks on the Change Layout button */ public void changeLayout(MenuItem item) { SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); @@ -75,10 +58,9 @@ public class TodayActivity extends AppCompatActivity editor.putString("pref_conf_task_layout", String.valueOf(layoutType % 2 + 1)); editor.apply(); + // TODO: refresh the task list // Update the ViewPagerAdapter to refresh all tabs //mSectionsPagerAdapter.notifyDataSetChanged(); - // Invalidate the menu to redraw the icon - invalidateOptionsMenu(); } diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/SmartFragmentStatePagerAdapter.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/SmartFragmentStatePagerAdapter.java index a2e8b34..bae6059 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/SmartFragmentStatePagerAdapter.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/SmartFragmentStatePagerAdapter.java @@ -1,5 +1,11 @@ package com.wismna.geoffroy.donext.adapters; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentStatePagerAdapter; +import android.util.SparseArray; +import android.view.ViewGroup; + /** * Created by geoffroy on 15-11-28. * Extension of FragmentStatePagerAdapter which intelligently caches @@ -7,15 +13,9 @@ package com.wismna.geoffroy.donext.adapters; * Usage involves extending from SmartFragmentStatePagerAdapter as you would any other PagerAdapter. */ -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.util.SparseArray; -import android.view.ViewGroup; - public abstract class SmartFragmentStatePagerAdapter extends FragmentStatePagerAdapter { // Sparse array to keep track of registered fragments in memory - private SparseArray registeredFragments = new SparseArray<>(); + private final SparseArray registeredFragments = new SparseArray<>(); public SmartFragmentStatePagerAdapter(FragmentManager fragmentManager) { super(fragmentManager); diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java index af00110..ab05915 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskListRecyclerViewAdapter.java @@ -33,7 +33,7 @@ public class TaskListRecyclerViewAdapter extends RecyclerView.Adapter mValues; - private TaskListRecyclerViewAdapterListener mListener; + private final TaskListRecyclerViewAdapterListener mListener; public TaskListRecyclerViewAdapter(List items, TaskListRecyclerViewAdapterListener listener) { @@ -110,7 +110,7 @@ public class TaskListRecyclerViewAdapter extends RecyclerView.Adapter { private List mValues; - private int viewType; + private final int viewType; public TaskRecyclerViewAdapter(List items, int viewType) { mValues = items; @@ -52,7 +52,7 @@ public class TaskRecyclerViewAdapter extends RecyclerView.Adapter taskLists; - - public static TaskDialogFragment newInstance(Task task, List taskLists, NewTaskListener newTaskListener) { - TaskDialogFragment fragment = new TaskDialogFragment(); - fragment.task = task; - fragment.taskLists = taskLists; - fragment.mListener = newTaskListener; - fragment.setRetainInstance(true); - return fragment; - } - - @Nullable - @Override - public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - // This part is only needed on small layouts (large layouts use onCreateDialog) - if (!getArguments().getBoolean("layout")) { - View view = inflater.inflate(R.layout.fragment_task_form, container, false); - AppCompatActivity activity = (AppCompatActivity) getActivity(); - activity.setSupportActionBar(setToolbarTitle(view)); - - ActionBar actionBar = activity.getSupportActionBar(); - if (actionBar != null) { - actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setHomeButtonEnabled(true); - actionBar.setHomeAsUpIndicator(android.R.drawable.ic_menu_close_clear_cancel); - } - setHasOptionsMenu(true); - setTaskValues(view); - return view; - } - return super.onCreateView(inflater, container, savedInstanceState); - } - - @Override - @NonNull - public Dialog onCreateDialog(Bundle savedInstanceState) { - // Inflate and set the layout for the dialog - LayoutInflater inflater = getActivity().getLayoutInflater(); - final View view = inflater.inflate(R.layout.fragment_task_form, null); - setToolbarTitle(view); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - // Pass null as the parent view because its going in the dialog layout - builder.setView(view) - // Add action buttons - .setPositiveButton(R.string.new_task_save, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - onPositiveButtonClick(view); - } - }) - .setNegativeButton(R.string.new_task_cancel, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - // Send the negative button event back to the host activity - // Canceled creation, nothing to do - //dialog.cancel(); - onNegativeButtonClick(); - } - }); - if (task != null) { - builder.setNeutralButton(R.string.new_task_delete, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - onNeutralButtonClick(); - } - }); - } - setTaskValues(view); - return builder.create(); - } - - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - //super.onCreateOptionsMenu(menu, inflater); - menu.clear(); - getActivity().getMenuInflater().inflate(R.menu.menu_dynamic_fragment, menu); - } - - @Override - public void onPrepareOptionsMenu(Menu menu) { - if (task == null) { - menu.removeItem(R.id.menu_neutral_button); - } - super.onPrepareOptionsMenu(menu); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Determine which menu item was clicked - int id = item.getItemId(); - View view = getView(); - - // Hide the keyboard if present - if (view != null) { - InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Activity.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(getView().getWindowToken(), 0); - } - if (id == R.id.menu_positive_button) { - // handle save button click here - onPositiveButtonClick(view); - return true; - } - else if (id == R.id.menu_neutral_button) { - // handle delete button click here - onNeutralButtonClick(); - return true; - } - else if (id == android.R.id.home) { - // handle close button click here - onNegativeButtonClick(); - return true; - } - - return super.onOptionsItemSelected(item); - } - - @Override - public void onDestroyView() { - Dialog dialog = getDialog(); - // Stop the dialog from being dismissed on rotation, due to a bug with the compatibility library - // https://code.google.com/p/android/issues/detail?id=17423 - if (dialog != null && getRetainInstance()) { - dialog.setDismissMessage(null); - } - super.onDestroyView(); - } - - private void setTaskValues(View view) { - // Get date picker - final DatePicker dueDatePicker = (DatePicker) view.findViewById(R.id.new_task_due_date); - - // Populate spinner with task lists - Spinner spinner = (Spinner) view.findViewById(R.id.new_task_list); - // Create an ArrayAdapter using the string array and a default spinner layout - ArrayAdapter adapter = new ArrayAdapter<>( - getActivity(), android.R.layout.simple_spinner_item, taskLists); - // Specify the layout to use when the list of choices appears - adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - spinner.setAdapter(adapter); - - // Auto set list value to current tab - Bundle args = getArguments(); - int id = args.getInt("list"); - spinner.setSelection(id); - - CheckBox checkBox = (CheckBox) view.findViewById(R.id.new_task_today); - TextView todayLabel = (TextView) view.findViewById(R.id.new_task_today_label); - boolean isTodayActive = args.getBoolean("today"); - checkBox.setVisibility(isTodayActive ? View.VISIBLE : View.GONE); - todayLabel.setVisibility(isTodayActive ? View.VISIBLE : View.GONE); - - // Set other properties if they exist - if (task != null) { - - EditText titleText = (EditText) view.findViewById(R.id.new_task_name); - titleText.setText(task.getName()); - EditText descText = (EditText) view.findViewById(R.id.new_task_description); - descText.setText(task.getDescription()); - SeekBar seekBar = (SeekBar) view.findViewById(R.id.new_task_priority); - seekBar.setProgress(task.getPriority()); - - // Set Due Date - LocalDate dueDate = task.getDueDate(); - dueDatePicker.updateDate(dueDate.getYear(), dueDate.getMonthOfYear() - 1, dueDate.getDayOfMonth()); - - checkBox.setChecked(task.isToday()); - } - else { - // Disallow past dates on new tasks - dueDatePicker.setMinDate(LocalDate.now().toDate().getTime()); - } - } - - private Toolbar setToolbarTitle(View view) { - Toolbar toolbar = (Toolbar) view.findViewById(R.id.dialog_toolbar); - toolbar.setTitle(getTag()); - return toolbar; - } - - protected void onPositiveButtonClick(View view) { - if (view == null) return; - EditText titleText = (EditText) view.findViewById(R.id.new_task_name); - // handle confirmation button click hereEditText titleText = (EditText) d.findViewById(R.id.new_task_name); - if (titleText.getText().toString().matches("")) - titleText.setError(getResources().getString(R.string.new_task_name_error)); - else { - // Send the positive button event back to the host activity - mListener.onNewTaskDialogPositiveClick(TaskDialogFragment.this, view); - dismiss(); - } - } - - protected /*abstract*/ void onNeutralButtonClick() { - mListener.onNewTaskDialogNeutralClick(TaskDialogFragment.this); - } - - protected /*abstract*/ void onNegativeButtonClick() { - dismiss(); - } -} diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsFragment.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsFragment.java index 6fc7537..84bd8fb 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsFragment.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsFragment.java @@ -49,8 +49,7 @@ public class TaskListsFragment extends Fragment implements public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - taskListDataAccess = new TaskListDataAccess(getContext()); - taskListDataAccess.open(TaskListDataAccess.MODE.WRITE); + taskListDataAccess = new TaskListDataAccess(getContext(), TaskListDataAccess.MODE.WRITE); new GetTaskListsTask().execute(taskListDataAccess); } diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java index 0f018c0..68c9a16 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java @@ -187,21 +187,21 @@ public class TasksFragment extends Fragment implements int totalCycles = taskRecyclerViewAdapter.getCycleCount(); TextView totalCyclesView = (TextView) view.findViewById(R.id.total_task_cycles); if (totalCycles != 0) - totalCyclesView.setText(resources.getString(R.string.task_total_cycles, totalCycles, (totalCycles > 1 ? "s" : ""))); + totalCyclesView.setText(resources.getQuantityString(R.plurals.task_total_cycles, totalCycles, totalCycles)); else totalCyclesView.setText(""); // Update total tasks int totalTasks = taskRecyclerViewAdapter.getItemCount(); TextView totalTasksView = (TextView) view.findViewById(R.id.total_task_count); - if (totalTasks == 0) totalTasksView.setText(resources.getText(R.string.task_no_tasks)); - else totalTasksView.setText(resources.getString(R.string.task_total, totalTasks, (totalTasks > 1 ? "s" : ""))); + if (totalTasks == 0) view.findViewById(R.id.no_more_tasks).setVisibility(View.VISIBLE); + else totalTasksView.setText(resources.getQuantityString(R.plurals.task_total, totalTasks, totalTasks)); // Update remaining tasks TextView remainingTasksView = (TextView) view.findViewById(R.id.remaining_task_count); NoScrollingLayoutManager layoutManager = (NoScrollingLayoutManager) recyclerView.getLayoutManager(); int remainingTaskCount = totalTasks - layoutManager.findLastVisibleItemPosition() - 1; if (remainingTaskCount == 0) remainingTasksView.setText(""); - else remainingTasksView.setText(resources.getString(R.string.task_remaining, remainingTaskCount, (remainingTaskCount > 1 ? "s" : ""))); + else remainingTasksView.setText(resources.getQuantityString(R.plurals.task_remaining, remainingTaskCount, remainingTaskCount)); //recyclerView.getViewTreeObserver().removeOnPreDrawListener(this); return true; @@ -214,89 +214,8 @@ public class TasksFragment extends Fragment implements @Override public void onPause() { - super.onPause(); if (snackbar != null) snackbar.dismiss(); - } - - /** Performs an action on a task: done, next or delete */ - public void PerformTaskAction(final int itemPosition, final int direction) { - final long itemId = taskRecyclerViewAdapter.getItemId(itemPosition); - final Task task = taskRecyclerViewAdapter.getItem(itemPosition); - String action = ""; - Resources resources = getResources(); - - taskRecyclerViewAdapter.remove(itemPosition); - - switch (direction) - { - // Mark item as Done - case ItemTouchHelper.LEFT: - action = resources.getString(R.string.snackabar_action_done); - break; - // Increase task cycle count - case ItemTouchHelper.RIGHT: - action = resources.getString(R.string.snackabar_action_next); - task.setCycle(task.getCycle() + 1); - taskRecyclerViewAdapter.add(task, taskRecyclerViewAdapter.getItemCount()); - break; - case -1: - FragmentManager manager = getFragmentManager(); - DialogFragment dialog = (DialogFragment) manager.findFragmentByTag(getString(R.string.action_edit_task)); - if (dialog != null) dialog.dismiss(); - action = resources.getString(R.string.snackabar_action_deleted); - break; - } - - // Setup the snack bar - snackbar = Snackbar.make(view, resources.getString(R.string.snackabar_label, action), Snackbar.LENGTH_LONG) - .setAction(resources.getString(R.string.snackabar_button), new View.OnClickListener() { - @Override - public void onClick(View v) { - // Undo adapter changes - switch (direction) { - // Nothing special to do for done - case ItemTouchHelper.LEFT: - break; - // Remove the last item - case ItemTouchHelper.RIGHT: - taskRecyclerViewAdapter.remove(taskRecyclerViewAdapter.getItemCount() - 1); - task.setCycle(task.getCycle() - 1); - break; - // Nothing special to do for delete - case -1: - break; - } - // Reset the first item - taskRecyclerViewAdapter.add(task, itemPosition); - recyclerView.scrollToPosition(0); - } - }); - snackbar.addCallback(new Snackbar.Callback() { - @Override - public void onDismissed(Snackbar snackbar, int event) { - super.onDismissed(snackbar, event); - - // When clicked on undo, do not write to DB - if (event == DISMISS_EVENT_ACTION) return; - - // Commit the changes to DB - try (TaskDataAccess taskDataAccess = new TaskDataAccess(view.getContext(), TaskDataAccess.MODE.WRITE)) { - switch (direction) { - // Mark item as Done - case ItemTouchHelper.LEFT: - taskDataAccess.setDone(itemId); - break; - // Increase task cycle count - case ItemTouchHelper.RIGHT: - taskDataAccess.increaseCycle(task.getCycle(), itemId); - break; - case -1: - // Commit the changes to DB - taskDataAccess.deleteTask(itemId); - } - } - } - }).show(); + super.onPause(); } @Override @@ -456,4 +375,85 @@ public class TasksFragment extends Fragment implements } else PerformTaskAction(itemPosition, direction); } + + /** Performs an action on a task: done, next or delete */ + private void PerformTaskAction(final int itemPosition, final int direction) { + final long itemId = taskRecyclerViewAdapter.getItemId(itemPosition); + final Task task = taskRecyclerViewAdapter.getItem(itemPosition); + String action = ""; + Resources resources = getResources(); + + taskRecyclerViewAdapter.remove(itemPosition); + + switch (direction) + { + // Mark item as Done + case ItemTouchHelper.LEFT: + action = resources.getString(R.string.snackabar_action_done); + break; + // Increase task cycle count + case ItemTouchHelper.RIGHT: + action = resources.getString(R.string.snackabar_action_next); + task.setCycle(task.getCycle() + 1); + taskRecyclerViewAdapter.add(task, taskRecyclerViewAdapter.getItemCount()); + break; + case -1: + FragmentManager manager = getFragmentManager(); + DialogFragment dialog = (DialogFragment) manager.findFragmentByTag(getString(R.string.action_edit_task)); + if (dialog != null) dialog.dismiss(); + action = resources.getString(R.string.snackabar_action_deleted); + break; + } + + // Setup the snack bar + snackbar = Snackbar.make(view, resources.getString(R.string.snackabar_label, action), Snackbar.LENGTH_LONG) + .setAction(resources.getString(R.string.snackabar_button), new View.OnClickListener() { + @Override + public void onClick(View v) { + // Undo adapter changes + switch (direction) { + // Nothing special to do for done + case ItemTouchHelper.LEFT: + break; + // Remove the last item + case ItemTouchHelper.RIGHT: + taskRecyclerViewAdapter.remove(taskRecyclerViewAdapter.getItemCount() - 1); + task.setCycle(task.getCycle() - 1); + break; + // Nothing special to do for delete + case -1: + break; + } + // Reset the first item + taskRecyclerViewAdapter.add(task, itemPosition); + recyclerView.scrollToPosition(0); + } + }); + snackbar.addCallback(new Snackbar.Callback() { + @Override + public void onDismissed(Snackbar snackbar, int event) { + super.onDismissed(snackbar, event); + + // When clicked on undo, do not write to DB + if (event == DISMISS_EVENT_ACTION) return; + + // Commit the changes to DB + try (TaskDataAccess taskDataAccess = new TaskDataAccess(view.getContext(), TaskDataAccess.MODE.WRITE)) { + switch (direction) { + // Mark item as Done + case ItemTouchHelper.LEFT: + taskDataAccess.setDone(itemId); + break; + // Increase task cycle count + case ItemTouchHelper.RIGHT: + taskDataAccess.increaseCycle(task.getCycle(), itemId); + break; + case -1: + // Delete the task + taskDataAccess.deleteTask(itemId); + } + } + } + }).show(); + } } diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TodayFormDialogFragment.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TodayFormDialogFragment.java index 292570a..17d99b3 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TodayFormDialogFragment.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TodayFormDialogFragment.java @@ -18,6 +18,7 @@ import com.wismna.geoffroy.donext.database.TaskDataAccess; import org.joda.time.LocalDate; +import java.util.ArrayList; import java.util.List; /** @@ -34,16 +35,12 @@ public class TodayFormDialogFragment extends DynamicDialogFragment { void onTodayTasksUpdated(); } private TodayFormDialogFragment.TodayTaskListener mListener; - private List tasks; + private final List mUpdatedTasks = new ArrayList<>(); public static TodayFormDialogFragment newInstance(Context context, TodayTaskListener todayTaskListener) { TodayFormDialogFragment fragment = new TodayFormDialogFragment(); fragment.mListener = todayTaskListener; - // TODO: put this in an AsyncTask - try(TaskDataAccess taskDataAccess = new TaskDataAccess(context)) { - fragment.tasks = taskDataAccess.getAllTasks(); - } fragment.setRetainInstance(true); return fragment; } @@ -53,19 +50,15 @@ public class TodayFormDialogFragment extends DynamicDialogFragment { public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); mContentFragment = new TodayFormContentFragment(); + // Load the tasks asynchronously + new LoadTasks().execute(getActivity()); Bundle args = getArguments(); if (args != null) { mIsLargeLayout = args.getBoolean("layout"); } } - @Override - public void onStart() { - super.onStart(); - setLayoutValues(getView()); - } - - private void setLayoutValues(View view) { + private void setLayoutValues(View view, List tasks) { EditText editText = (EditText) view.findViewById(R.id.today_search); final ListView listView = (ListView) view.findViewById(R.id.today_tasks); final TodayArrayAdapter adapter = new TodayArrayAdapter(getActivity(), tasks); @@ -77,6 +70,10 @@ public class TodayFormDialogFragment extends DynamicDialogFragment { Task task = adapter.getItem(position); if (task == null) return; task.setTodayDate(task.isToday() ? "" : LocalDate.now().toString()); + // Maintain a list of actually updated tasks to commit to DB + if (!mUpdatedTasks.contains(task)) mUpdatedTasks.add(task); + else mUpdatedTasks.remove(task); + // Refresh the view adapter.notifyDataSetChanged(); } }); @@ -101,8 +98,8 @@ public class TodayFormDialogFragment extends DynamicDialogFragment { @Override protected void onPositiveButtonClick(View view) { mListener.onTodayTaskDialogPositiveClick(view); - // TODO: find a way to filter this list to only get changed tasks - new UpdateTasks().execute(tasks.toArray(new Task[tasks.size()])); + // Only commit the updated tasks to DB + new UpdateTasks().execute(mUpdatedTasks.toArray(new Task[mUpdatedTasks.size()])); dismiss(); } @@ -116,6 +113,21 @@ public class TodayFormDialogFragment extends DynamicDialogFragment { dismiss(); } + private class LoadTasks extends AsyncTask> { + @Override + protected List doInBackground(Context... params) { + try(TaskDataAccess taskDataAccess = new TaskDataAccess(params[0])) { + return taskDataAccess.getAllTasks(); + } + } + + @Override + protected void onPostExecute(List tasks) { + super.onPostExecute(tasks); + setLayoutValues(getView(), tasks); + } + } + private class UpdateTasks extends AsyncTask { @Override protected Integer doInBackground(Task... params) { diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskListTouchHelper.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskListTouchHelper.java index 627b959..80553d6 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskListTouchHelper.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskListTouchHelper.java @@ -11,7 +11,7 @@ import android.support.v7.widget.helper.ItemTouchHelper; public class TaskListTouchHelper extends ItemTouchHelper.SimpleCallback { public interface TaskListTouchHelperAdapter { - boolean onItemMove (int fromPosition, int toPosition); + boolean onItemMove(int fromPosition, int toPosition); } private final TaskListTouchHelperAdapter mAdapter; diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java index 8435562..311c90e 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/helpers/TaskTouchHelper.java @@ -22,7 +22,7 @@ public class TaskTouchHelper extends ItemTouchHelper.SimpleCallback { void onItemSwiped(int position, int direction); } - private TaskTouchHelperAdapter mAdapter; + private final TaskTouchHelperAdapter mAdapter; public TaskTouchHelper(TaskTouchHelperAdapter adapter){ // No drag moves, no swipes (except for 1st element, see getSwipeDirs method) diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/listeners/RecyclerItemClickListener.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/listeners/RecyclerItemClickListener.java index 00b8007..f161c52 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/listeners/RecyclerItemClickListener.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/listeners/RecyclerItemClickListener.java @@ -11,13 +11,13 @@ import android.view.View; * Listener class on RecyclerView to intercept touch events */ public class RecyclerItemClickListener implements RecyclerView.OnItemTouchListener { - private OnItemClickListener mListener; + private final OnItemClickListener mListener; public interface OnItemClickListener { void onItemClick(View view, int position); } - GestureDetector mGestureDetector; + private final GestureDetector mGestureDetector; public RecyclerItemClickListener(Context context, OnItemClickListener listener) { mListener = listener; diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/widgets/DividerItemDecoration.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/widgets/DividerItemDecoration.java index d62cb71..e2751b7 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/widgets/DividerItemDecoration.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/widgets/DividerItemDecoration.java @@ -15,7 +15,7 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration { private static final int[] ATTRS = new int[]{android.R.attr.listDivider}; - private Drawable mDivider; + private final Drawable mDivider; /** * Default divider will be used diff --git a/DoNExt/app/src/main/res/drawable-hdpi/ic_access_alarm.png b/DoNExt/app/src/main/res/drawable-hdpi/ic_access_alarm.png new file mode 100644 index 0000000000000000000000000000000000000000..debd50fb2e0bc721fb98dd451cc36aa738f6d455 GIT binary patch literal 1186 zcmV;T1YP@yP)BDxgE)5vf4J^=H}*o${! z8;wSH+vJ-{r4|y2#E4D4|Ba50jw9Rzv_)!bYa79I!~*LG3^J4lnCWo z2!0PtHVwi*msm}w(?_ws3-p-E;ky;kPepv5<2$b5S^>|!n15wZf_vZb4OI#UhR-BJ z%>BjR9?h_~w|6I8ox(;_>fM$X;#zz&Neh#Q_7>hfF!7<{SX<>uc*26#GB8;OWgOUT z04;eHIv)`}pvw-vUHE^)ux_foz5SqoPg|J^f&UMK z5#PGP36MC0#cNIrY0SoAu>&UWXdx7oZejf;hQh|i#$6;nbB=fhP3JjRWv?8;wVY5$}Oy+!;`~n`I4c?g6a6*=@r1!!mn*oFHV};VbhL2nHQ02+E zL5V&qi45?#A`dKMHZ4;q3`3~zDjBV~DZ%%kH-?ZM3ne^bv;p@yTFotwVBK#=My>L2 zE~-JxGQ@_eP{E+x5NT??BtpLmsBC^g9&C6b8K#t&7R&~`X7V5ksPi@~j5Zml>SY{u zT7%D=E4Bg*v2tG)d_k(vtib++pIR!Y0?PC6h3C71;Qy(U31as35-C6!-Im2%5Cs+m z7VAr;fGRtjd(Q=d(3-$uO{o-MMeNKy%q2lQu<0zN-D1B@1(*}`_j>>BRA9qzy<|lJ z2_Y|+36lc)d)^^*m02nXEs7{q=O+~6n>gr;IE<^Pt*+^7q}M~tJ9dx?bR=jP6-C{B zr#BQN<_kqNUW$YQPl9-$J7^-4gO?pxe#{9AJ~O@>nphDSYbtai1Cvt%hrD?m57~iB zNLW!=xv!N{LTxxJF#Is={erN9)q5D7C>)+Iir_IQyAgp~m~5lSavByoYvZCsSP`bq zIfh$VPP6Y6rfXbjx?~iigRDB#If4Bpw}|ECFgF?Q!!JWK7KQ@f*K!|tq`}Gt5O~O- z#HbBVs7w8rp^4RR+r0~U+Jdz~`4aP{_9TM`I~rCo%6M(+;V_!eTC(Hp)>6l}j~JQ_ z?UbCKvc)fyYCswd5GQdrCmxixpydzKKt zy{x4di}w3io+Q_lr!DBWGrg?(o{@@D4~9}EJGwq!$GJc!dxk$>75%4GpY4!t{(7mR z)2ibqrd2h^MnTq3Cwtoly`!7EHj`d?l!xW<555g0jS45-MgRZ+07*qoM6N<$f+mV6 A#sB~S literal 0 HcmV?d00001 diff --git a/DoNExt/app/src/main/res/drawable-hdpi/ic_add.png b/DoNExt/app/src/main/res/drawable-hdpi/ic_add.png new file mode 100644 index 0000000000000000000000000000000000000000..1ae5b2dc41be9b20a87e14da5270f22ef5c1c66b GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtWu7jMAr-gYPP67}b>Lyx`ss4V zz5gmo99(ASt=9?$ozU9B{qbQs+cKV%gsCc=Kn-sS&pnmiyj(ZFW3I)Dw~LihZU)Uc z5*e#p#KfV{zyKr;yx3;B*^Xm{(lg`NPygP2cBXLipI7=x*Z!4RRS1P=|9)~$=t8#3 zihn_do9C7~tP)&k7I$QYeA$bdgZWcH`hkY*le-XKcKeT_!rrU7%nS?#;bP~tVphA{ S`galN00vK2KbLh*2~7Y7N?0)f literal 0 HcmV?d00001 diff --git a/DoNExt/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/DoNExt/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png deleted file mode 100644 index 694179bd46b685e55da1b4dde2575bde0b2bfd64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;o2QFoh{y5d1PRu~4CX)Hf7s8+ zA**4&;-Nihno*#|1aQm z>{83>J*Gk zAaA+a7%MRNiOf-Ot*Gx%FC>lz3q)=9AsgauVDUUMR&6&^YvLqCGR@qG1K*nWz3lZh hW8+s7f*{CXc>;+9jL(%&3y}Z-002ovPDHLkV1ne;i46b% literal 0 HcmV?d00001 diff --git a/DoNExt/app/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png b/DoNExt/app/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png deleted file mode 100644 index 2d12a8917a1ee4633086fd8e68ef35fe3b60294a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8j;D)bNCo5DsoO;x40u>$A8y^t zSm@Wz*>_>$M0rWSy_>#VE&k~k{7@o!NuSoU2|EuR)LYk~9I#MamQ&+<(Ub2*Eq5kn z=CZr5dR)GxcD>>G@-O}M|D$ie{>8j;$I<8d3eu+nJKejKl>_bjm$FU2u*>oJiYHHi P_A+?7`njxgN@xNA=$S!y diff --git a/DoNExt/app/src/main/res/drawable-hdpi/ic_format_size_dark.png b/DoNExt/app/src/main/res/drawable-hdpi/ic_format_size_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..ea4d26d5c4e0d09670b0680cdef763b7853e75d4 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtsh%#5Ar-gY-mv9rFyL``xa)^` z=Xd)~4kuRi_aU$EIk8L*tKl~i`!g-Rz^}Cu#tiGLjx%d8R=j=&w26UXcKy8bdzisY5Mj@* wQf|i25S?~Ena$%}PD}c1t?#xjE-p)VG5pG()Kn~ySOHSz>FVdQ&MBb@0GBF7L;wH) literal 0 HcmV?d00001 diff --git a/DoNExt/app/src/main/res/drawable-hdpi/ic_forward_black_24dp.png b/DoNExt/app/src/main/res/drawable-hdpi/ic_forward_black_24dp.png deleted file mode 100644 index 13a912841c7b294a3bdbb66b21fed6fbb4d2b7bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;kEe@cNCo5DD~4PQ3OolK=Fgjd zTwfzaBWc%tg>A2I)`d(EO?8b744blj3cE9_ERX@@SDNxPOMJc2^J_wiceF!~RZfr9 ezcu$K=N{Z4_vhEFt@%K689ZJ6T-G@yGywo|uq?R% diff --git a/DoNExt/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png b/DoNExt/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png deleted file mode 100644 index da56077636546c97764fd2686daad67d7b529f59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmV-H0lxl;P)H-qjnO!mZF74z`KYHotZQj~G9OBG_t^ED_kIXRP z8;w~~Qsa5P=BYWdU__EBJMKte9gdtxYdq4khJueW&Pc>cvi{6361huX>Wn1p1Yv6= zaRmWW!dHC7;kXjM_MA66Bsd3vLxS6)G3IUxb&OD!2oiZTy*WyW7pRP32C|k0wldT1B8Lp22U5qkP61PXEvTZ6d>a8@UZ?1 zA+c-66fgaBRuc>lIKkqWwEBhLN~4B^=^YF1?lx0w{jkHlvNhq4U%kY(4%UYj${gxU zt{#`?C=^ypw+}YdKA#S3~g6)IW)n6udaq z+)GOiED3ODRoiN{EBVotiHBXj>?{2uy>wZi)V_=1zmDyj)K|Gw_IHc)r4T`te0NDl hwI^3XQhFp;iAM+Z&9%(1ZU(xY!PC{xWt~$(698`;Th;&o diff --git a/DoNExt/app/src/main/res/drawable-hdpi/ic_reorder.png b/DoNExt/app/src/main/res/drawable-hdpi/ic_reorder.png new file mode 100644 index 0000000000000000000000000000000000000000..d0371ecf2b60d96f22a45d44c026d4f5b5a2b1bb GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtTu&FrkcwMxZ*1gkP!M1ZkSZ0l zvPuZrS{NPMIAcQhzUhA$>x$W@3o+CLYNqy1dC0VOt8Gvl_m_L?J$|M(8UvY6=4|&c z44ZjYBJ@FOW7KOw&2J2wZT)Yk2K`}w!^nCd_Jo{)+uhbb>Bnh6NK+0$5`HOv#KS=tYj%F$hmx(`HEa6MGCz zVd+xXR3C*q>XmoYu)EvRqLNoKN9vrWebtl-5=snn|k0wldT1B8K;y{C&~h{y5d1PRu~3{3yb6%-~s zZ#Z+DQFeoL3(J9HLTtQ?*(PQSY)$H|dYNHzt!;th;-e=r42@QFO$;<}VPN>|u;7$O Shj};9C~D8amw-DuD#J`knf7OE|XHKkRlT9B$GYOD&r+SC`;f9p9g zw_KLZ?o8vy4qSG2_CC(c+_`f$mD+3xtynCcX|-D0TVF8#m zJQo0@KpUM@5K8F^uOvE;{6fC<4jDZ51AkyzCSjrAV9w0+i`BIOoF);n|ug*i3wx2 zV_6}8MQ2GlM9|P*)Z0ja^ojmu#z;&=o_i?2Q8Sqe8#bHGeb6ampHKF&Zz~WTr&@yL zy{V4ST+|W5Ol!t@JIV)bbnc*k!zy?tli8s%x0lUk_w-rnSODfIjzCr=`Et43cAM(w zE7Z4R_Bs&&8+69RA8l+3QCl*e`#dNBQ@GZ1$p*lZar{0Z+pPeYRrn}{C}pAiOKQRY z0>GkVbido=fE1D$8vxAoq>BcDAIiOAvjwXLz0w z6)cGZus5p_N-#~MCg+T_5vIyR?l$OnR+Ct%rU*j-f<%BYGM*Z|0?WAng) zf{{nu;kH2TDge`}u4Js}6t7}+`#JGCbAt{mKCmYDfiVFGqJ{LZ4Hq5%C6bSsnQ14)`!rwdpnolq reh=Ef@phX6Q=;&wa%}TQb|dW{AEkUBhzLc500000NkvXXu0mjf2TX>s literal 0 HcmV?d00001 diff --git a/DoNExt/app/src/main/res/drawable-mdpi/ic_add.png b/DoNExt/app/src/main/res/drawable-mdpi/ic_add.png new file mode 100644 index 0000000000000000000000000000000000000000..d51f0ddad6b6a666d799a4b0a018073ea0f95ff5 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJcuyC{kcwN$2@!5 zpYO=I039;{z5?b)#sP0^UNr==_gFPt`za%>=Tzjt$hb9W%C8AQZ){X#6&Ood^kSM) z90eJ-K3cpp;R@qoK8b036BcCJ$pg(h!oaYg`iFsH(V_&aj!VDzSo@fq7N>%r!;1bAd`3JYD@<);T3K0RTZ}7R&$u diff --git a/DoNExt/app/src/main/res/drawable-mdpi/ic_create_new_folder_dark.png b/DoNExt/app/src/main/res/drawable-mdpi/ic_create_new_folder_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..d716b24a7dd44e8476a81d3f742f817cf0b1ddf6 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJot`d^Ar-fh6C_v{Cm1yT|Ns9p zW1*D5cBVpUIT=sx(~%7ok^=J;g_Z~0W>iy&@T+xa;4M}=%(&!1u)`j%Cl?!w7Fr7|f*B%uc9uRRDT|!PC{xWt~$(6958CReS&d literal 0 HcmV?d00001 diff --git a/DoNExt/app/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png b/DoNExt/app/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png deleted file mode 100644 index 02167a9f0a463c96bb9f81bf0058331401a15bb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Z%-G;kP60R3B3pP7yeKGKhcqy zkyqfUO2$uro{F#b0t*{0K1>SX{m+@jaFSPw_r*hxO>GOGXC4y#-lg$XUqFiK|9+J< gfA;?`IC+ktgTe~DWM4f Dbwf84 literal 0 HcmV?d00001 diff --git a/DoNExt/app/src/main/res/drawable-mdpi/ic_forward_black_24dp.png b/DoNExt/app/src/main/res/drawable-mdpi/ic_forward_black_24dp.png deleted file mode 100644 index 8b185cb16930ac85e725d11bfa2dddbc63d877a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1OHUWakP61Tmlg^#1oALl)Si3p z`ycZ&Ts|FjO3e3P9%0fsC?xf8uiFL|?-wZ?MzvP^cHA|2^t{%@KC`^O^Sj}MW}qPq Mp00i_>zopr026B^*Z=?k diff --git a/DoNExt/app/src/main/res/drawable-mdpi/ic_info_black_24dp.png b/DoNExt/app/src/main/res/drawable-mdpi/ic_info_black_24dp.png deleted file mode 100644 index 5ef3dc0809e2030ac573605e4d50a1b15be283f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+irJgR1Ar*{!&pBo_7znsMbQe4M zmu2aqie+Lg_Z%-OYdThQ-1WK3yF`&wq~^cgljetCWtg?+{hpb=@c6_R&GITYJe^Gr zn+wS+w{7@Qu3Fze@l2LUOog?>hoS^g9uF~&xlN*)H`W{wZ;U+{TXN|u|AX!W%Mvu1 zCO7Tl*uo`~E>@u<#XBj|^}>ul|6C>19PJEUR$ER;nAhbpt#9Vs*Ef&3bU%Gs$9S4s WW8+=f3r;`>GkCiCxvXjCCUMHOLgs0@uOIM+hc=c_OeCtYY$lmfH>|_qY(a5Lp zBC`?BMt+0`nYqvz>4i$B5_%&SVO?^iM%c@|3GYT~gU&Mf*o80860LBx0>q!>QEKKS zbPhJ=;$MP1X$|6brX|#l&bsLVpmeTu&enbW0-8ozYX{n?_5c6?07*qoM6N<$f=D}Y AIRF3v diff --git a/DoNExt/app/src/main/res/drawable-mdpi/ic_view_list_white_24dp.png b/DoNExt/app/src/main/res/drawable-mdpi/ic_view_list_white_24dp.png deleted file mode 100644 index 4aca55c60e54bf66338495f406536714a802d1b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*18BZ6-5R22v2@)qC*o!Dcyh!+v iE%EisiskL{3=ADQbrV`_FCPP{WAJqKb6Mw<&;$TflNf;j diff --git a/DoNExt/app/src/main/res/drawable-v21/ic_info_black_24dp.xml b/DoNExt/app/src/main/res/drawable-v21/ic_info_black_24dp.xml deleted file mode 100644 index 34b8202..0000000 --- a/DoNExt/app/src/main/res/drawable-v21/ic_info_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/DoNExt/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml b/DoNExt/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml deleted file mode 100644 index e3400cf..0000000 --- a/DoNExt/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/DoNExt/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml b/DoNExt/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml deleted file mode 100644 index 3f0ac1c..0000000 --- a/DoNExt/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/DoNExt/app/src/main/res/drawable-xhdpi/ic_access_alarm.png b/DoNExt/app/src/main/res/drawable-xhdpi/ic_access_alarm.png new file mode 100644 index 0000000000000000000000000000000000000000..46eea0f3ad28bf9e0bca473f59d1942839edb5ab GIT binary patch literal 1525 zcmVI-mvg>rx9Dmd_pi*Rm^W}8;+Ywr7i%#30=P@Cnul5 z`afFuY6FDnR2CNtHDefD)WmjxMDgsmZZ~b&&x~OQe9PcVleR|8J4=aT6zKCl%YuL5c|}l@w(reHd7zEZjN@MLaL4pc zVs*e`a{`jrp?f>EnBcPxPwp3`Qj<8r9SCC|=c#b=JO8Ha#z~vE(IoLy)HdL6Mf~lS z@Y_!k+W_d-gHfN)P&XRyQ};2yiaRN8$mAhnJkJhpFix`Y{0w=GsN!=9?C^Pu2bCu9 zSD`$acQ&Vchi(R4A=aFaai5D(NeFEidFLKdF+lOut*FgAfbcb_$!o3yF|50r zDrk|0sU}k3Ksqp$M%&$9jHTdlT zMtk9;z9+Cvo9PM-Jls|i>t_Jv&kckxld%LI=3n+B>B&*YO;I4dl9$ahwl<;8ur%QY zQUMUL_Un==)M~YtecZ**O91FWQC0w`Lzy;3ey;NX+f91kC74bCpm)Oi7bPihnlCiP z+F<;Z9s_Vc`ZGwutg}oE7W`ehl%xRE831a%Wr4p{-{SvfzW{(W>JpDm)BrwuzocVn zLQK~H(DzHBGHngzX9Pai zT>x-XK(_7@fH0Awr@a$O>H(=><3a@jVc|x~o8`1*TfzvF!B-c2HeI`G<7u%7=_1z$ z-Cs0-z)Dn;_x=QYwuE&ST;u^hkaVl-OzVFce_fKYu*RqI{{t~=Y^1>x);N@!!BVL- zWVj0yUEQ__CSwbeT44SVtw#vrKWr$5q%V*%&u8!ia~`rzMzv6}e$yZU3sSj0S}#Z| zrb_}tfBMP*o74iq&ifK*h67q~$xu1#b{JhP@cFZJqHK*ZsLilzX0A##c;BsRp;}NX zgz$H()Vsinkn?^aR)7ss@SXSOBw?u9<+AH!jn&m)v%eY$ewZ}?IQ@@IJwmQrbjR*S zNy6J%Z637VHSyu2E~!hxoTVas(D&vU+*k^vP4DP4E-*!IVSK<=I8SuvEp)Fq^ZOm> z-xgb`nl4MS+9~MmiRn>XW8pSaBgC!`TkoJ!i!Zw^o+uZ{X3BFh9U?a{Uo7-uC_lW` zK`+lwjN%y2+gv8CHvv=my`Y1>qt%|b%&VS(O9|TC7`6s%VZr=D%?ql;4*&to`zYTVd z(D-2!7j0dfl9)3$$cWENr&liq0~tyNQ(U||u)L;jc}!-U=G9uY$nVPHe~F{GMG9(Gv~1^!q_PYrL}s&mtV)s8+^_--#^1E5v WGQRZ_>g|O(2k9e72RAzue1b}$OZA=Ncfr9S zMG|v0_ug~hjDi0@5JE1uRs#S40077&P1Cx(l}|E0!Uq?Zf0UncQ<4LhmhZ^F5|?); zf`+`5-xij4BZ3C(T3o*R5j5QB1OciWL4!?B6u_3hav@*kMTi0R{gO8!2QbcMBjfDTsnR|rhV)|Lqp!}E>0$nXl8AiYrb4|1^@s6fNZt_ W{b{~7B0whq0000Y;*3WG`@6O##`njLU$kN~)y?Kzc!GOo%;yGo$ zi;gxHz3S}+JnaR`cQv*)+}I^p@1%OAIdF?_nd-W@1z!c_46IVV^N1H*;)iXxQ{mg_k}`3S1Po+;+vbpCg9 iw5yK;El~07DrdTO<@oLg(~f@tsq%F7b6Mw<&;$Ur=0_s{ literal 0 HcmV?d00001 diff --git a/DoNExt/app/src/main/res/drawable-xhdpi/ic_forward_black_24dp.png b/DoNExt/app/src/main/res/drawable-xhdpi/ic_forward_black_24dp.png deleted file mode 100644 index ec952d43e9b8723917125145faebd92daa1c8e35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DSWg$nkP61P*Di7%P!M3bIAz~l z|15*V1Ff>$74nP9&quv>-pH84H2Z+s22LRLK>y%POLZ_4BGRwH5LA0|WnIR~e{UY~ p&$%~o=Bur$S63(NMc=<3rGGBk7>D5($61se024W16Y9PdLry5vdn5qWG7(8}rf#0;i^i3`Bz)3@LmB1SV3Ir;F zXA1R55y$7>4m@$40i?z@(7tAuhqf9h{9DK(kS9VPYq@pj?P({$*j*$70e+edaK1ul_2NP&A~Pg39!*_#v? zkeRk$7|4Mf$N?t@T-x(e!eI;N(w!F)7P$0*|EtF)>xk}V7O04Biy9mEOaUnp*K{AN cD9HYhcl4RW{G`P`$^ZZW07*qoM6N<$f+&V{8UO$Q diff --git a/DoNExt/app/src/main/res/drawable-xhdpi/ic_reorder.png b/DoNExt/app/src/main/res/drawable-xhdpi/ic_reorder.png new file mode 100644 index 0000000000000000000000000000000000000000..d3ad70b064d24b2b7f79aab28a139cac1e993bad GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=nVv3=Ar-gY-rC69V8G*gu%{(u zvmmeXMqTC$N3Xh`3zd#;n%?Ew`@~?_9o*#D{1M(O=UHx3v IIVCg!0J3W}6#xJL literal 0 HcmV?d00001 diff --git a/DoNExt/app/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png b/DoNExt/app/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png deleted file mode 100644 index 860a5db38b393009a7407ced8d9fec8da0b460e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 467 zcmV;^0WAKBP)Y8m235b4thfjq5s2xGL-&my=8Y}rO#iqNL_sAt7# zbGQi8aPN&dD}Q(UKmQ-YoO`)AM%MLWT`$)4VqGuR^3-I(3JalY4Vwc%W0i@p9B?ix{5h)DbUhjrRWQ zC$I66YjjKu6StQJ zPo5IU6w&jpC@59DAecvdaf&5rK~PjglW}m0Jwp-{q$)-COd;&Jrcaw1Qk^1WgA`Ad ziaHZcwhG9|xiJ$cDFbG#IB*wVAB%B4*7aD|V_lDRJ&d?8{sN$?X^Ds6w;2Ec002ov JPDHLkV1g1j%<2FD diff --git a/DoNExt/app/src/main/res/drawable-xhdpi/ic_view_list_white_24dp.png b/DoNExt/app/src/main/res/drawable-xhdpi/ic_view_list_white_24dp.png deleted file mode 100644 index b81d9102a41c99ab917ea414699ce9880824390e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA`BpB)|k7xlYrjj7PU+I70BD_fh{nb+@izvJuIZ*sY;Wi4x2%Uag5mbI*9tub47cXt!@E%icg zXJ_Xp0|NsuH3aiJIy%-6^MC2->3LWWLg?!1Y9~4$Q=e#UZGE-gXa4)t?-28!qSNQa z_V)ITq0-yi+xrpGxl}>#OXG+(BEAa@FAt_-P}iux7T{!AOZ`?gz0~Kae~K~H z4fkmo?}5sR7))6R=Z1%epACrl&r|;`f!_PHI(7!nco;4s`1`nlRP}GCr>CC@fad3j z!6Ooy>AK;zwze07Wd62o+g_)cKS_N>D1e83eSMn)nEgjK|D{3v0vokd4Z?%ULpLEv8b@!X2P7FssZ`qP zjqw;X5%MJrl$2-^)D0TvdpZFeuBX36iYJEX9%Iy}u-d54u!k~_&-~pLdd4Vyhim)b z^7i-lzpUXrw9xNvYY5>U{bsv!4+&laJ@}aBvi-GKEUs4F8`r?&pnLy}7((Y6QK}9M zg^>lLB)S`_g?{t9&NJxV2b_6z9NC`JnDr~vzk|@??ul6n6+qXGGt-{h=p5mmqUUrc zK@FgXg|?zG&M{hXt88N=8|Y!v8Uua=H3dT#bwA8VBK&jA(lj$&x3f2Mi^j7fj%k=M zP*Me08GnPx?C$r^lhXs6WuS=WRe5Mqvdo zD=D&#nE5wjj4dFFEjl{ZRVTVG!w5$Sf>y%E^#56ndo2^s`i*!xMATuaUgl+Z0YO>y zy;@pYUZiV|>j=_=5a7`riHdefRlN=WUq}4{l1b|!VaD#)Sk6C2xqTp>{&z7{#z*w? z6s5lzW3$Gk_n}p=&xDJb2V;|rBn%a#9TgBE=+X()qLwqOhhxyyP+{b%z5_(H9EjmF zzN2flBEqJDALn@Cev0QVMD1U|p};Ch;sCF%aEvfHtDxEP|#Qgm8~mLZNzW9E4&rEXVL<()f-V7*UOvBLZc^6&2d= z(AD=W%&*v$GZ|gxp$6&R2XzI32}E?2qHc=SUA^Z42PDb{8jAzU>IC>Xg0dLbt;8{a z7UNy)!vfxbAarma-cId`iQJ+3Zj{FXVA4AH2K^Qnz+gjL>NhhgdJ41CF`klV1b0H} z;X&QN9Zf(7PGUdV*#KgMvyRbD$*g|>gXwc;jG^e=QdNmqATHAN4z05{a#=W#J36SS z?M8<7Lz)nCQcw{wO>mp=aQ!5B4uToz%@oFT6$MJKRCZQ}sZ^L0=VEa2a8TUmQ2mL3 z`Pb8U2nd82_g|>$*K~0IBq&<4vxm5c1hy%djd)3j4z&ZnJk7JPR}kgBun?L|jEAH4 zIl)S}6vPHSjF>?6ESW$ET?l|}!sfUjt5Ov)it4X1HZrFo)KpH5D*==zmIQh>{amd^ z1nd*2o)J?nno9w&i+WlxzCka{XLxyD6}+U?`@RHF5#>Hm*|u7+s?-f|gTPSjHOvsF z0$>ksNT7;3oid*{Y9>`P!}KP#4*}qrDmw>NZ&G^&> zLI8&wRRB2Eqwt0fx_}?fBoRS@%V!NNfB}K?VSNSsq1fYXZd3sv??{3CPPu>}<`kz1 z*EOmDu#KuX{dv>H3Rw0P5&9MYXXGs>*uOa!D)=~n6DhLRHcO#r4<)mf-RL(%8IGV_ih(UojhG2xfx}mC6cUF

N1QX1(MJuFLsa$LwrigD=OHO=p@YWI(@kH1OVTppNV5-hm z1()Tb8v;OYIJnt^nXQ6rE1_Y2k3a||;c?1;leAzfO0os}b`2iLlC(q(dq+NnkmrDM zNyz*~>*Z+DHk=KR)(Ya~JmM5b`ERnk#U*A|q}5&MZ);t+aVUtYQ?Lp93xF+L7-;zI zKyy{`OGIg%Vy=!FmiFEn$`GUI=`I@}9^0rr5{NotPkA6$Pp>d33jv!QwbTjaB;Qf& ztnt1=zQ*UTfl6dZp(Z-G`fuGazY;I%uC;6>+laf^=ts5%j5dlZVS@zB1yqcV&-e}n zL4fT8Y@^>_Vnbh3O=?r`IS9r(lK9w~Z{S#FuLS+R$*Sup!d) z&I9A|-kIIDGO6pTan|#8l!Q!Ea9ikBPQp_P8I|=KJ0NY41E#YkguxptXE?xHpRria zR-kNHGoTHm5^~1d)$(hsD%{W+E;orcbDRNOj1`5LpM@gj_1KsT_#mGrvn9 qV|LcEmbI*9Eo)iJTGq0rZhr&BgsQXfg^p1G0000#~yo literal 0 HcmV?d00001 diff --git a/DoNExt/app/src/main/res/drawable-xxhdpi/ic_add.png b/DoNExt/app/src/main/res/drawable-xxhdpi/ic_add.png new file mode 100644 index 0000000000000000000000000000000000000000..75f192aab1284769d0643c9efc7a4613eb874b4b GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U{v#TaSW-r_4f8&u0sYQ4Hq9V zuefs8@x#r#F>^`+!@thWVv3ac#cV2ZyZAw#lcM~zuyvuVK;1y#aK+@T(iyEYyHclp zH1^YqZ?HOJcxGoRpJCJFQ{oB2&!nDRH8MPO%ac=qfr+Dmfk~l(fdhjXZ@*yQ-nkn$ za~HqnDB#?Dw&L%m?|p1<-uBF`IB>p?q5sRwnCtr0?=ueQKDxjBP4pa~Q9yH;I6mAy zej&JPLh?J?{)Oki%$xA~*GIwX&|lpVbN6vtrp;F>+1v5fC~p6}uksFmL=-_fz}oN- zlZ6sCG5-42ck15lnGOy6_Aah`{}$p=hMFp7pU@xsr+54m0Eu|I`njxgN@xNA2Qh_P literal 0 HcmV?d00001 diff --git a/DoNExt/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/DoNExt/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png deleted file mode 100644 index 0fdced8fce76a0f9a527388935adecebf63d0dae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc~YJ(jv*C{ s$r5`OFVdQ&MBb@07vc`*Z=?k diff --git a/DoNExt/app/src/main/res/drawable-xxhdpi/ic_create_new_folder_dark.png b/DoNExt/app/src/main/res/drawable-xxhdpi/ic_create_new_folder_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..2600b90703836eaebd9b08f3fbdd8ff11924fff4 GIT binary patch literal 611 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VAAq*aSW-r^>(hmwo9Ny`|%Vd zp2;_(5*$5$`lR*Fa5{PDR@lu*4@J*etuxq`{*ioUE&G19@}#`)v#Q@)KDP1yTPAhx zx5;tK^n2CI0)VE%zz6B%GYw1TB)X}%YW)rUV0Us&N@$VJ&PjJt=D4cVh|~uJO}Fu~ zvRtOSvNi6H;>oykt^a36ZFtWj`D53Uvl|=ACJ3b*2%eOF{3w69)g;FCl|g?#EK`e{grMK6}aOkfoWMo$oalW^WG{b zJl(u_NxC%$$6HQG76pYI#^g!aTtAT}>v)cO8Df>-LLz(?=e)tPYCs6Rf{JrqzQ+MBS ROuhjU@pScbS?83{1OS|}{W<^u literal 0 HcmV?d00001 diff --git a/DoNExt/app/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png b/DoNExt/app/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png deleted file mode 100644 index 54ca462da5b79a7d1035a1588fcbc23b07b1533f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw4tlychEy=Vy?K@KkO2eR!#!KQ zw@5$YHjsU1#Qv^Gr@=YscYb5t*N#9h&83&b>|CSPR4!jt>vv#=d9lNxWEKHwp~?n{ zi7TAfc$`rTQ#rRI+rOXdU-1Rj>%N?_&G!_3eq?gA%v<1h$Km#l#sYSs7ro4X*miNL zOmJXQ6-=>vBP_tgsWRd0^*Dt_79kBbh25Mfj9dC|7y0ySWZAQYb}V|dxp%teI_bwV yj|*C<^>W7L`%itj;b>X(Es>8sL0+0uH|4!yJ|uNAy|o|c83s>RKbLh*2~7Ykm|xNW diff --git a/DoNExt/app/src/main/res/drawable-xxhdpi/ic_format_size_dark.png b/DoNExt/app/src/main/res/drawable-xxhdpi/ic_format_size_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..fef9e590ad1449010a57ea1c1528ea7ca9434fd9 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U}X1naSW-r_4dw2u0sY4t`~3Z z4BfbU_WgIy9xds%dToD|#VDLPa?(8Rd|@VAr5lQ|>YkHSK{@PS2iEaZHWpJU0I*!QlHzIb{apJ{i v_uNm<;8l3tH}_Ebcg}-3Cb_}W#DIj-PezO z%gYJ%4ayQC(o2u;@5@a5+H(0)@xRR$@3Rtj%@Ya(+Q1l8UVU}WA=VW@Coy=s`njxg HN@xNA&=)~b diff --git a/DoNExt/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png b/DoNExt/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png deleted file mode 100644 index a81eeb9ee7ef8ab1662b5b6bc88cf74912e4cb5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 579 zcmV-J0=)f+P)YDX|Txx7F9T)MSz5C z%me$p#<(@Ec}8Mx!WA`)S?3W+u@6bG_Q+CN{iWZ6iFpgn8im7?Un+GeL)QF6AA4ghWDNXmU%KBG@?RmKM)K1 zMojBSqWw=2twt=5)`ISdVGXesBvgrXZ8hkU2o;{K22Jn?b%0n667~qyLM-o&5Jdv( zL4TP?X$x_%4U`&Af{svXIte;OspBN5jZz=6{@DvXl!i`%1}Ftig2q!9G`&wY{XgoC zlb|+AO(#JoC^eh}9ip`9BT! zt3hvwp=B+|Cze%9K`*Qj(>Y>cXT-L|$au~Wj|A$*gSJWNv(cQ7Bv#Y(JK#w*j9P*Yqa=F};`Uf%+Z6V(b RSUCUy002ovPDHLkV1jt6`k4R# diff --git a/DoNExt/app/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png b/DoNExt/app/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png deleted file mode 100644 index ab8a9c464c6c30f54a49d18e1d48b3b8637a9295..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmV-_0f7FAP)z9Eb5|s``^)CE_}yje)z64pu{@M5;_j>;{9|U?dVTN(BQGf?Y^x(n#9o)!|G% zjU4BEPu~u|&vOG0CJAFqk!rUBLt&b8T-X^?co*)3o#I&$*V6)CRU<=Ncojs30vigA zQsRV0WT?S0E94odF?RXD{n0zygPU6B6&Ist78!sYI=Gm%sgSV)+&|kVLp5B2*2%~c zokT+|3ZOU68!lmw`W^j}en-C~ z-w`ZncLYl=0<4vB2$j%)(JeuRaXJ-b_M%dt*X16+J datt|R%rC40J4*F-*<%0z002ovPDHLkV1n31phf@y diff --git a/DoNExt/app/src/main/res/drawable-xxhdpi/ic_reorder.png b/DoNExt/app/src/main/res/drawable-xxhdpi/ic_reorder.png new file mode 100644 index 0000000000000000000000000000000000000000..817adb5994e5dbd2dc5d159650d6742c7566b995 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoTRdGHLn>~)y<^SQY9Qhom@TM2 z=@XlghhTR4?|Te;QbQg^6}WAXwpY2#0#pqIALN!!Ir^!TUqEp7)7Nqfu2n_ZF|r6a zFaU{!2Mp~Xv8~&p?AE_xVCXqy1~q-l(fC(ANvn^1_pyg|2MzO`T36H zflR|^#(k_a!AfQ@$a4d2;4e_0@Vn^`zrlPZ76V2gx+9+Qj=RVXY&`?RgIoM_b8apR S&!6A~67h8Pb6Mw<&;$S!oK95$ literal 0 HcmV?d00001 diff --git a/DoNExt/app/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png b/DoNExt/app/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png deleted file mode 100644 index f7990080d1d7d7e30b1844c18be8928128af147c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 669 zcmV;O0%HA%P)Ri)#A+rN#ZV}M#KrnQ=uoUdx&}e)B(84V)X*Zhb`j|=Sg}(VanQLY z)jde5NeBw@b}N@>BJX?O$-+X_Zyy1Q~JX9W8v!)}~bi|sDSkn<}I$}*ntm%j~ z9kHe(+;B;meM-zT*nOQ~j#(ySLPw>+CRr0gDs@&#*-{ct8MUTVV>WrE=cE~@z!sG@ zN-c^>D`}?Kp%s)$S}DjF2Y0^GOt&A`B27f)iji)gA9<>X$_XjF_`tB|ftCv>t>D2c zYFva=>dYif^r{>pGMfkzQt3Vx5tVf!(nkXct#m(!=r=AyBtEK=GClZ^L+_;}B5|xL zzT(TSYC9qVSwtm|FVm{+mI0huPzAs6=LzSkaSmrbtML+Xu&o+5aOQ^^e@7hXZ@z~! zzt#9_;$T8Gp5aVQjlU!g`c-2UXKvN_Q{tdkHD2S)4f-04gC6v4WI#|=enhvb-FnQ!32goiP%3qR|00000NkvXXu0mjf DBY7@j diff --git a/DoNExt/app/src/main/res/drawable-xxhdpi/ic_view_list_white_24dp.png b/DoNExt/app/src/main/res/drawable-xxhdpi/ic_view_list_white_24dp.png deleted file mode 100644 index f0a2bbc7446b69199bc589681f2db30c57615d51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc`}|Zjv*C{ t$r4K%{_p?u9|$f^H+`ig6wxfqz%Xsc&V_#qd2>O!Jzf1=);T3K0RZF#9T$m`Z~Df*BafCZDwc^5i{T978G? xlN*`>5BzUTIj7P7-(I3-fns}2dtZ?oBSS_(`pg9u0+k>GJYD@<);T3K0RZru9Krwq diff --git a/DoNExt/app/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png b/DoNExt/app/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png deleted file mode 100644 index 2e5dd8223896a122d8a3d8ee7ed0a4c3656191cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z{ud~;uuoF`1a<}&{jhchKFzB zvJQGLVYyS~7u4=!`(LxxBD4|mCR4^IW#o9Y526}KD!Sqhk(KY?F2R;<>2r$@jm+*h{yuY7giHF z1r#2*0|}t=dz>%kHWYsAepjtj{@E~L{)yaro`|J_TaOj}wBYNw<@eJkQhiHxmSIDzBR5Gx?9_*Nwm+VeoYIb6Mw<&;$T3 CsDw2D diff --git a/DoNExt/app/src/main/res/drawable-xxxhdpi/ic_forward_black_24dp.png b/DoNExt/app/src/main/res/drawable-xxxhdpi/ic_forward_black_24dp.png deleted file mode 100644 index 2187b5fe8cbc94a0aeac8d106ff21735371e02b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeG3?%1&o4*=JaR&H=xB_ViXik240LWr03GxeO zXqc_-CjsPjd%8G=R4~51vQhAmg9vk=S8!)|i_kW&pbux*x(X7Oa@|Y#_wwtLeVwAm zyP`gBV{$fNK|wo|YE;8yw6l)#Hz`V>qL_(WU-YE^ZJcYLbj^O%XTucR9p~I-Yb}CG w>gGhUFZg^SMRwD<DuaOF?qdkw!ZaV?`>xjy6gVLBv5If;S){v5mCXA=Y@H1rfw?2k|s36`TsO zNHkbQ$!A*+5eLd!$4>T2_S$>D#r=D(;16rBEP_R$P$(1%^^m2=ItNs!^UUj8&(x`~ z&l*LtbfZ#|309~g2Axu3oCHcl$g<57(qs*`7$HKSIw(*>Ty)MH?F1shPyB;e=#~ZI z_$<#QVzCQy_@bx0J~enA3k6_=)wfSbaFejbp3yC+S{ z_7DY?X;B_gQjQiRTt1lJbNASe)3hHEH3Nk2X;KG&s~Yf`BuyzGss;$NVD1ZQ>IR$< z!B`eiH$cc>Y+L1kO$;S@QaRv}I7TKArHx@^1yR}(MyiO?PB74eD6Y%=3f0*#j*5ul z=5e%+D6WK~14MDVII194dQYr$jH9~h0XH~$Rz0ABqgT}fUjFw3KEM%D{t z0UH<_Q90l{j72zCH=xQV%rU2Kzzj`k=T_B#ItiMzplU#Yrp38XGoVI{7UU2mP12$= zqM+YsSs!;u!2L@vF65Db%i+>05@0{$T9iX1pnj(f3sO{(06L`;O9r??eD0Do77h74 z;V-_%vH{L~JUnSU(9NMwpKd1}iL!=x+!AegYKnUge|2;CAWhk$H%~9V$#H>L?3_t_ z7Uu^(BNnPtAVwgP%(}c>tIUufP!Te0^4P-PR2zKDCzOaY#u9%b231&Olo%?d7-pUl wyBu>vgO|4&+;Gee%M{4ag*Bm2C=?3)2UQ-CT`xs~ZvX%Q07*qoM6N<$g2UHD;{X5v diff --git a/DoNExt/app/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png b/DoNExt/app/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png deleted file mode 100644 index 86f89d75000ada881e4c14891ceec47c27c7fb0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 497 zcmVtWS;T; zaYBz`tPu^nL@|bq0naE#)fn)NVnp*CkjTQsfCVzQ#5%jgl8xP!>8N(0U!w=NC1j@$!jz5g diff --git a/DoNExt/app/src/main/res/drawable-xxxhdpi/ic_sync_black_24dp.png b/DoNExt/app/src/main/res/drawable-xxxhdpi/ic_sync_black_24dp.png deleted file mode 100644 index b9f56f327d6346a39fa6f69d8827ff0be7a4337d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 875 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z-;8{;uuoF_;%J_Z=H0J_W3g( z>AlH{ab;?9Jg@dus zS3Fj^r{zaz$Fn8&d}%W(?;Egx`}y_xAGvkbzxP>-ufMV)F!@|n?Z&wHHP^*oe?5wo z*(xr#vgi7N3?sowUJv(kS~`R% zow7(}bPUo|SvZet(WVAxsUOmwD<|~i{SA0Jjcv|H-KHfW9;dh#88sV!vHwuMW4TLc z?n;3NEp{$XwQCG|SA2Qc5^DNw7L%QZ&`RIc7LN4~*FWgi-TG35eT$OT-5-m@12Ywk z4`)4*|DpUKDpy*`xI61f|BsaL+}Y~JzxMp#wVN4q``d{#ol-yL=JTw|J)YuLzqh8z z|JK!Q+(w^QxJ~=ux%t*NhqQlz%FH!E0k`L!Jj4B~TyB2LueVLV?H8)me44mVe)oTY z?GGoLeV0%ADLma@Wb+3-&*@0 zm+`E+S*O?kbK^c8_wV_OIqO#k&$L$k;39r3-p+pV|bchu(99KY6clnh~I|v&r15vZHo?-24CqcCN)9K3XN}A}1OT zxve=QtUaZ}y=d`*_!BEbW-dFCt&-2h$|v|pc%!R+qu7c0hwMJNt-G1p<#;P|S;Lb+ z#T4F?6J#_FaD2ZeYGtu$oq&;BN;IQX6N%zUvB3!n~xic v+kD7bYbW*k>&7^F?8L|D{cgQd|C!2ftO$D&n7s#>i5NUx{an^LB{Ts5h>e~y diff --git a/DoNExt/app/src/main/res/drawable-xxxhdpi/ic_view_list_white_24dp.png b/DoNExt/app/src/main/res/drawable-xxxhdpi/ic_view_list_white_24dp.png deleted file mode 100644 index 7c3bdda78d7ac1f8d159e10c1984ea7c245c7d9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^2_Vb}Bp6OT_L>T$m`Z~Df*BafCZDwc@? - - diff --git a/DoNExt/app/src/main/res/drawable/ic_reorder_grey_500_24dp.png b/DoNExt/app/src/main/res/drawable/ic_reorder_grey_500_24dp.png deleted file mode 100644 index b2ebf0244aec301f6afa5be0d7432b9341fec3c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHh!DkC3F*`woS9Kp{0x7sn8f @@ -24,7 +23,7 @@ android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_margin" android:onClick="onNewTaskClick" - android:src="@drawable/ic_add_white_24dp" /> + android:src="@drawable/ic_add" /> + android:src="@drawable/ic_add" /> diff --git a/DoNExt/app/src/main/res/layout/activity_today.xml b/DoNExt/app/src/main/res/layout/activity_today.xml index eaf8934..467768c 100644 --- a/DoNExt/app/src/main/res/layout/activity_today.xml +++ b/DoNExt/app/src/main/res/layout/activity_today.xml @@ -30,6 +30,6 @@ android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_margin" android:onClick="onNewTaskClick" - android:src="@drawable/ic_add_white_24dp" /> + android:src="@drawable/ic_add" /> diff --git a/DoNExt/app/src/main/res/layout/fragment_task_confirmation.xml b/DoNExt/app/src/main/res/layout/fragment_task_confirmation.xml index ce1fa6d..bfb17db 100644 --- a/DoNExt/app/src/main/res/layout/fragment_task_confirmation.xml +++ b/DoNExt/app/src/main/res/layout/fragment_task_confirmation.xml @@ -7,7 +7,6 @@ android:id="@+id/task_confirmation_never" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/text_margin" android:layout_marginStart="@dimen/text_margin" android:layout_marginTop="10dp" android:text="@string/task_confirmation_never_button" /> diff --git a/DoNExt/app/src/main/res/layout/fragment_task_form.xml b/DoNExt/app/src/main/res/layout/fragment_task_form.xml deleted file mode 100644 index cec27bf..0000000 --- a/DoNExt/app/src/main/res/layout/fragment_task_form.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/DoNExt/app/src/main/res/layout/fragment_tasklist.xml b/DoNExt/app/src/main/res/layout/fragment_tasklist.xml index 2a73470..1b27656 100644 --- a/DoNExt/app/src/main/res/layout/fragment_tasklist.xml +++ b/DoNExt/app/src/main/res/layout/fragment_tasklist.xml @@ -9,7 +9,7 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical|start" android:scaleType="center" - android:src="@drawable/ic_reorder_grey_500_24dp" + android:src="@drawable/ic_reorder" android:contentDescription="@string/task_list_drag_handle"/>