diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 9a56c22e4..8d7f009c9 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -5,8 +5,8 @@ --> + android:versionName="4.7.1" + android:versionCode="337"> diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 90ad38fd3..c63126e18 100755 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -188,6 +188,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { @InjectView(R.id.timer_container) LinearLayout timerShortcut; @InjectView(R.id.basic_controls) LinearLayout basicControls; @InjectView(R.id.edit_scroll) ScrollView scrollView; + @InjectView(R.id.commentField) EditText commentField; private final List controls = Collections.synchronizedList(new ArrayList()); @@ -874,6 +875,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { @Override public boolean onOptionsItemSelected(MenuItem item) { + hideKeyboard(); + switch (item.getItemId()) { case R.id.menu_save: saveButtonClick(); @@ -896,7 +899,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } else { saveButtonClick(); } - hideKeyboard(); return true; } @@ -1054,8 +1056,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } private void hideKeyboard() { - InputMethodManager imm = (InputMethodManager) getActivity().getSystemService( - Context.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(title.getWindowToken(), 0); + AndroidUtilities.hideSoftInputForViews(getActivity(), title, commentField); + title.setCursorVisible(false); + commentField.setCursorVisible(false); } } diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index 06c597db7..7e67ca10a 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -89,7 +89,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList DrawerLayout drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); navigationDrawer.setUp(drawerLayout); -// drawerLayout.setStatusBarBackgroundColor(getResources().getColor(android.R.color.holo_blue_bright)); initializeFragments(); diff --git a/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java b/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java index ab8ffcb5a..6ddc51b01 100644 --- a/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java +++ b/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java @@ -32,6 +32,7 @@ import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; import com.todoroo.andlib.data.Callback; +import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.actfm.ActFmCameraModule; import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback; @@ -170,14 +171,31 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene if (hasFocus) { timerView.setVisibility(View.GONE); commentButton.setVisibility(View.VISIBLE); - } - else { + } else { timerView.setVisibility(View.VISIBLE); commentButton.setVisibility(View.GONE); } } }); } + commentField.setHorizontallyScrolling(false); + commentField.setMaxLines(Integer.MAX_VALUE); + commentField.setOnKeyListener(new OnKeyListener() { + @Override + public boolean onKey(View v, int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_ENTER) { + AndroidUtilities.hideSoftInputForViews(activity, commentField); + return true; + } + return false; + } + }); + commentField.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + commentField.setCursorVisible(true); + } + }); commentField.addTextChangedListener(new TextWatcher() { @Override @@ -204,13 +222,16 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene commentField.setOnEditorActionListener(new OnEditorActionListener() { @Override public boolean onEditorAction(TextView view, int actionId, KeyEvent event) { - if (actionId == EditorInfo.IME_NULL && commentField.getText().length() > 0) { - addComment(); - return true; + if (commentField.getText().length() > 0) { + if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_NULL) { +// commentField.setCursorVisible(false); + addComment(); + } } return false; } }); + commentButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { @@ -362,6 +383,8 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene private void addComment() { addComment(commentField.getText().toString(), UserActivity.ACTION_TASK_COMMENT, task.getUuid(), true); + AndroidUtilities.hideSoftInputForViews(getContext(), commentField); + commentField.setCursorVisible(false); } private void addComment(String message, String actionCode, String uuid, boolean usePicture) { diff --git a/src/main/res/layout/control_set_title.xml b/src/main/res/layout/control_set_title.xml index 7ea140a74..aebabc292 100644 --- a/src/main/res/layout/control_set_title.xml +++ b/src/main/res/layout/control_set_title.xml @@ -35,7 +35,7 @@ android:capitalize="sentences" android:freezesText="true" android:hint="@string/TEA_title_hint" - android:inputType="textCapSentences" + android:inputType="textCapSentences|textNoSuggestions" android:scrollbars="vertical" android:imeOptions="flagNoExtractUi|actionDone" android:text="" diff --git a/src/main/res/layout/task_edit_activity.xml b/src/main/res/layout/task_edit_activity.xml index 6879b7f38..b9e4ce218 100644 --- a/src/main/res/layout/task_edit_activity.xml +++ b/src/main/res/layout/task_edit_activity.xml @@ -91,10 +91,11 @@ android:layout_marginBottom="2dip" android:layout_marginTop="2dip" android:layout_weight="100" + android:inputType="textCapSentences|textNoSuggestions" android:autoText="true" android:background="?attr/asEditTextBackground" android:capitalize="sentences" - android:imeOptions="flagNoExtractUi" + android:imeOptions="flagNoExtractUi|actionDone" android:hint="@string/TVA_add_comment" android:textColor="@color/white_text" android:textColorHint="@color/white_text_hint" diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 1a32d11b7..8effdee6d 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -5,6 +5,9 @@ ** See the file "LICENSE" for the full license governing this code. --> + #607d8b + #4d646f + #FFFB6666 #ff777777 #888888 diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index b73ad4035..6db3b4cc5 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -9,8 +9,8 @@