diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml
index 5671656b..b8204b87 100644
--- a/QKSMS/src/main/AndroidManifest.xml
+++ b/QKSMS/src/main/AndroidManifest.xml
@@ -81,8 +81,8 @@
+ android:launchMode="singleTask"
+ android:windowSoftInputMode="adjustResize">
@@ -98,8 +98,15 @@
-
-
+
+
+
KeyboardUtils.showAndFocus(mContext, mRecipients), 100);
+
return view;
}
- @Override
- public void onActivityResult(int requestCode, int resultCode, Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
-
- boolean handledByComposeView = mComposeView.onActivityResult(requestCode, resultCode, data);
- if (!handledByComposeView) {
- // ...
- }
- }
-
@Override
public void onSend(String[] recipients, String body) {
long threadId = Utils.getOrCreateThreadId(mContext, recipients[0]);
@@ -137,47 +66,6 @@ public class ComposeFragment extends QKContentFragment implements ActivityLaunch
}
}
- @Override
- public void onContentOpened() {
- setupInput();
- }
-
- /**
- * Shows the keyboard and focuses on the recipients text view.
- */
- public void setupInput() {
- Bundle args = getArguments() == null ? new Bundle() : getArguments();
-
- if (mPendingFocus) {
- if (args.getBoolean(ARG_SHOW_KEYBOARD, false)) {
- KeyboardUtils.show(mContext);
- }
-
- String focus = args.getString(ARG_FOCUS, FOCUS_NOTHING);
- if (FOCUS_RECIPIENTS.equals(focus)) {
- mRecipients.requestFocus();
- } else if (FOCUS_REPLY.equals(focus)) {
- mComposeView.requestReplyTextFocus();
- }
- }
- }
-
- @Override
- public void onContentClosing() {
- // Clear the focus from this fragment.
- if (getActivity() != null && getActivity().getCurrentFocus() != null) {
- getActivity().getCurrentFocus().clearFocus();
- }
- }
-
- @Override
- public void onContentClosed() {
- super.onContentClosed();
- if (mComposeView != null) {
- mComposeView.saveDraft();
- }
- }
-
@Override
public void onDestroy() {
super.onDestroy();
@@ -186,19 +74,6 @@ public class ComposeFragment extends QKContentFragment implements ActivityLaunch
}
}
- @Override
- public void onMenuChanging(float percentOpen) {
-
- }
-
- @Override
- public void inflateToolbar(Menu menu, MenuInflater inflater, Context context) {
- inflater.inflate(R.menu.compose, menu);
- ((QKActivity) context).setTitle(R.string.title_compose);
-
- super.onCreateOptionsMenu(menu, inflater);
- }
-
/**
* @return the addresses of all the contacts in the AutoCompleteContactsView.
*/
diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java
index 5892225b..84cbe58e 100644
--- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java
+++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java
@@ -1,6 +1,5 @@
package com.moez.QKSMS.ui.conversationlist;
-import android.app.Fragment;
import android.app.LoaderManager;
import android.content.Context;
import android.content.CursorLoader;
@@ -31,12 +30,11 @@ import com.moez.QKSMS.data.Conversation;
import com.moez.QKSMS.data.ConversationLegacy;
import com.moez.QKSMS.enums.QKPreference;
import com.moez.QKSMS.transaction.SmsHelper;
-import com.moez.QKSMS.ui.ContentFragment;
import com.moez.QKSMS.ui.MainActivity;
import com.moez.QKSMS.ui.ThemeManager;
import com.moez.QKSMS.ui.base.QKFragment;
import com.moez.QKSMS.ui.base.RecyclerCursorAdapter;
-import com.moez.QKSMS.ui.compose.ComposeFragment;
+import com.moez.QKSMS.ui.compose.ComposeActivity;
import com.moez.QKSMS.ui.dialog.conversationdetails.ConversationDetailsDialog;
import com.moez.QKSMS.ui.messagelist.MessageListActivity;
import com.moez.QKSMS.ui.settings.SettingsFragment;
@@ -112,13 +110,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage
if (mAdapter.isInMultiSelectMode()) {
mAdapter.disableMultiSelectMode(true);
} else {
- // Show the compose fragment, showing the keyboard and focusing on the recipients edittext.
- Bundle args = new Bundle();
- args.putBoolean(ComposeFragment.ARG_SHOW_KEYBOARD, true);
- args.putString(ComposeFragment.ARG_FOCUS, ComposeFragment.FOCUS_RECIPIENTS);
-
- Fragment content = getFragmentManager().findFragmentById(R.id.content_frame);
- switchFragment(ComposeFragment.getInstance(args, content));
+ mContext.startActivity(ComposeActivity.class);
}
});
@@ -275,10 +267,6 @@ public class ConversationListFragment extends QKFragment implements LoaderManage
getLoaderManager().restartLoader(0, null, this);
}
- private void switchFragment(ContentFragment fragment) {
- ((MainActivity) getActivity()).switchContent(fragment, true);
- }
-
@Override
public void onDestroy() {
super.onDestroy();