diff --git a/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java b/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java index 23080e9..cc01aac 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java @@ -85,7 +85,7 @@ public class MainActivity extends AppCompatActivity { // Create the fragment TaskListsDialogFragment taskListFragment = TaskListsDialogFragment.newInstance( (MainFragment)fragmentManager.findFragmentById(R.id.fragment_main)); - String title = getString(R.string.action_edit_task); + String title = getString(R.string.task_list_edit); // Set the arguments Bundle args = new Bundle(); diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/DynamicDialogFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/DynamicDialogFragment.java index f3af2fc..d649bee 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/DynamicDialogFragment.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/DynamicDialogFragment.java @@ -3,6 +3,7 @@ package com.wismna.geoffroy.donext.fragments; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; +import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.support.annotation.NonNull; @@ -80,7 +81,7 @@ public abstract class DynamicDialogFragment extends DialogFragment { onNegativeButtonClick(); } }); - if (mButtonCount == 2) { + if (mButtonCount >= 2) { builder.setPositiveButton(args.getString("button_positive"), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { onPositiveButtonClick(view); @@ -111,7 +112,7 @@ public abstract class DynamicDialogFragment extends DialogFragment { Bundle args = getArguments(); assert args != null; // Show the neutral button if needed - if (mButtonCount < 3) { + if (mButtonCount == 2) { menu.removeItem(R.id.menu_neutral_button); } else { @@ -119,7 +120,7 @@ public abstract class DynamicDialogFragment extends DialogFragment { } // Show the positive button if needed - if (mButtonCount < 2) { + if (mButtonCount == 1) { menu.removeItem(R.id.menu_positive_button); } else { @@ -192,6 +193,19 @@ public abstract class DynamicDialogFragment extends DialogFragment { return getView().findViewById(id); } + + /** Helper method to clear focus by giving it to the parent layout */ + protected void clearFocus() { + View view = getView(); + if (view != null) { + view.requestFocus(); + + // Hide keyboard + InputMethodManager inputMethodManager = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE); + inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0); + } + } + /** Sets the title of the Fragment from the Tag */ private Toolbar setToolbarTitle(View view) { Toolbar toolbar = view.findViewById(R.id.dialog_toolbar); diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/MainFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/MainFragment.java index eba5927..6758bdd 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/MainFragment.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/MainFragment.java @@ -7,6 +7,8 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.annotation.NonNull; +import android.support.constraint.ConstraintLayout; +import android.support.constraint.Guideline; import android.support.design.widget.TabLayout; import android.support.v4.app.Fragment; import android.support.v4.view.ViewPager; @@ -152,10 +154,14 @@ public class MainFragment extends Fragment implements } } else { + // Move guideline to hide task list + Guideline guideline = mView.findViewById(R.id.center_guideline); + ConstraintLayout.LayoutParams lp = (ConstraintLayout.LayoutParams) guideline.getLayoutParams(); + lp.guidePercent = taskLists.size() == 1 && !isHistoryActivity ? 0 : (float) 0.2; + guideline.setLayoutParams(lp); + ListView listView = mView.findViewById(R.id.list); // Hide the list if there is only one task list - listView.setVisibility(taskLists.size() == 1 && !isHistoryActivity ? View.GONE : View.VISIBLE); - //listView.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, taskLists)); listView.setAdapter(new ArrayAdapter<>(activity, R.layout.list_tasklist_item, taskLists)); //listView.setSelection(lastOpenedList); listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskFormDialogFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskFormDialogFragment.java index 537132d..126fa4a 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskFormDialogFragment.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskFormDialogFragment.java @@ -78,6 +78,7 @@ public class TaskFormDialogFragment extends DynamicDialogFragment { } setTaskValues(activity); + clearFocus(); } @Override diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsDialogFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsDialogFragment.java index e138807..6d8f943 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsDialogFragment.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskListsDialogFragment.java @@ -198,18 +198,6 @@ public class TaskListsDialogFragment extends DynamicDialogFragment implements toggleVisibleCreateNewTaskListLayout(); } - /** Helper method to clear focus by giving it to the parent layout */ - private void clearFocus() { - View view = getView(); - if (view != null) { - view.requestFocus(); - - // Hide keyboard - InputMethodManager inputMethodManager = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE); - inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0); - } - } - private static class GetTaskListsTask extends AsyncTask> { private WeakReference fragmentReference; diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index bb89170..99ddc81 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -65,4 +65,5 @@ Tâche DoNext est un nouveau genre de gestionnaire de tâches, basé sur le principe que créer trop de tâches est contre-productif. Faites plutôt glisser vos tâches vers la gauche ou la droite pour les mettre à la fin de votre liste et travailler dessus plus tard ! Mes tâches + Editer les listes de tâches \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 078d0b2..61837b9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,6 +20,7 @@ Delete task list? Drag handle Create a new task list + Edit task lists OK diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1513978756.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1513978756.png deleted file mode 100644 index 5fc0f21..0000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1513978756.png and /dev/null differ