mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-20 20:58:54 +01:00
Moved MessageList to separate activity
This commit is contained in:
@@ -88,6 +88,7 @@
|
|||||||
<data android:scheme="sms_body" />
|
<data android:scheme="sms_body" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
<activity android:name=".ui.messagelist.MessageListActivity" />
|
||||||
|
|
||||||
<activity-alias
|
<activity-alias
|
||||||
android:name=".ui.MainActivity-Teal"
|
android:name=".ui.MainActivity-Teal"
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ import com.moez.QKSMS.ui.dialog.ConversationSettingsDialog;
|
|||||||
import com.moez.QKSMS.ui.dialog.DefaultSmsHelper;
|
import com.moez.QKSMS.ui.dialog.DefaultSmsHelper;
|
||||||
import com.moez.QKSMS.ui.dialog.QKDialog;
|
import com.moez.QKSMS.ui.dialog.QKDialog;
|
||||||
import com.moez.QKSMS.ui.dialog.mms.MMSSetupFragment;
|
import com.moez.QKSMS.ui.dialog.mms.MMSSetupFragment;
|
||||||
|
import com.moez.QKSMS.ui.messagelist.MessageListActivity;
|
||||||
import com.moez.QKSMS.ui.messagelist.MessageListFragment;
|
import com.moez.QKSMS.ui.messagelist.MessageListFragment;
|
||||||
import com.moez.QKSMS.ui.popup.QKReplyActivity;
|
import com.moez.QKSMS.ui.popup.QKReplyActivity;
|
||||||
import com.moez.QKSMS.ui.search.SearchFragment;
|
import com.moez.QKSMS.ui.search.SearchFragment;
|
||||||
@@ -409,7 +410,7 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL
|
|||||||
// conversation.
|
// conversation.
|
||||||
if (threadId != -1) {
|
if (threadId != -1) {
|
||||||
Log.v(TAG, "Opening thread: " + threadId);
|
Log.v(TAG, "Opening thread: " + threadId);
|
||||||
setConversation(threadId);
|
MessageListActivity.launch(this, threadId, -1, null, true);
|
||||||
mSlidingMenu.showContent();
|
mSlidingMenu.showContent();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -482,26 +483,6 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setConversation(long threadId) {
|
|
||||||
setConversation(threadId, -1, null, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setConversation(long threadId, long rowId) {
|
|
||||||
setConversation(threadId, rowId, null, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setConversation(long threadId, long rowId, String pattern) {
|
|
||||||
setConversation(threadId, rowId, pattern, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setConversation(long threadId, long rowId, String pattern, boolean animate) {
|
|
||||||
MessageListFragment fragment = MessageListFragment.getInstance(threadId, rowId, pattern, !animate);
|
|
||||||
|
|
||||||
// Save the thread ID here and switch the content
|
|
||||||
sThreadShowing = threadId;
|
|
||||||
switchContent(fragment, animate);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onOpen() {
|
public void onOpen() {
|
||||||
invalidateOptionsMenu();
|
invalidateOptionsMenu();
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import com.moez.QKSMS.mmssms.Utils;
|
|||||||
import com.moez.QKSMS.ui.MainActivity;
|
import com.moez.QKSMS.ui.MainActivity;
|
||||||
import com.moez.QKSMS.ui.base.QKActivity;
|
import com.moez.QKSMS.ui.base.QKActivity;
|
||||||
import com.moez.QKSMS.ui.base.QKContentFragment;
|
import com.moez.QKSMS.ui.base.QKContentFragment;
|
||||||
|
import com.moez.QKSMS.ui.messagelist.MessageListActivity;
|
||||||
import com.moez.QKSMS.ui.view.AutoCompleteContactView;
|
import com.moez.QKSMS.ui.view.AutoCompleteContactView;
|
||||||
import com.moez.QKSMS.ui.view.ComposeView;
|
import com.moez.QKSMS.ui.view.ComposeView;
|
||||||
import com.moez.QKSMS.ui.view.StarredContactsView;
|
import com.moez.QKSMS.ui.view.StarredContactsView;
|
||||||
@@ -130,7 +131,7 @@ public class ComposeFragment extends QKContentFragment implements ActivityLaunch
|
|||||||
public void onSend(String[] recipients, String body) {
|
public void onSend(String[] recipients, String body) {
|
||||||
long threadId = Utils.getOrCreateThreadId(mContext, recipients[0]);
|
long threadId = Utils.getOrCreateThreadId(mContext, recipients[0]);
|
||||||
if (recipients.length == 1) {
|
if (recipients.length == 1) {
|
||||||
((MainActivity) mContext).setConversation(threadId);
|
MessageListActivity.launch(mContext, threadId, -1, null, true);
|
||||||
} else {
|
} else {
|
||||||
((MainActivity) mContext).showMenu();
|
((MainActivity) mContext).showMenu();
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-3
@@ -26,11 +26,10 @@ import com.moez.QKSMS.R;
|
|||||||
import com.moez.QKSMS.common.BlockedConversationHelper;
|
import com.moez.QKSMS.common.BlockedConversationHelper;
|
||||||
import com.moez.QKSMS.common.DialogHelper;
|
import com.moez.QKSMS.common.DialogHelper;
|
||||||
import com.moez.QKSMS.common.LiveViewManager;
|
import com.moez.QKSMS.common.LiveViewManager;
|
||||||
import com.moez.QKSMS.ui.dialog.conversationdetails.ConversationDetailsDialog;
|
|
||||||
import com.moez.QKSMS.enums.QKPreference;
|
|
||||||
import com.moez.QKSMS.common.utils.ColorUtils;
|
import com.moez.QKSMS.common.utils.ColorUtils;
|
||||||
import com.moez.QKSMS.data.Conversation;
|
import com.moez.QKSMS.data.Conversation;
|
||||||
import com.moez.QKSMS.data.ConversationLegacy;
|
import com.moez.QKSMS.data.ConversationLegacy;
|
||||||
|
import com.moez.QKSMS.enums.QKPreference;
|
||||||
import com.moez.QKSMS.transaction.SmsHelper;
|
import com.moez.QKSMS.transaction.SmsHelper;
|
||||||
import com.moez.QKSMS.ui.ContentFragment;
|
import com.moez.QKSMS.ui.ContentFragment;
|
||||||
import com.moez.QKSMS.ui.MainActivity;
|
import com.moez.QKSMS.ui.MainActivity;
|
||||||
@@ -38,6 +37,8 @@ import com.moez.QKSMS.ui.ThemeManager;
|
|||||||
import com.moez.QKSMS.ui.base.QKFragment;
|
import com.moez.QKSMS.ui.base.QKFragment;
|
||||||
import com.moez.QKSMS.ui.base.RecyclerCursorAdapter;
|
import com.moez.QKSMS.ui.base.RecyclerCursorAdapter;
|
||||||
import com.moez.QKSMS.ui.compose.ComposeFragment;
|
import com.moez.QKSMS.ui.compose.ComposeFragment;
|
||||||
|
import com.moez.QKSMS.ui.dialog.conversationdetails.ConversationDetailsDialog;
|
||||||
|
import com.moez.QKSMS.ui.messagelist.MessageListActivity;
|
||||||
import com.moez.QKSMS.ui.settings.SettingsFragment;
|
import com.moez.QKSMS.ui.settings.SettingsFragment;
|
||||||
|
|
||||||
import java.util.Observable;
|
import java.util.Observable;
|
||||||
@@ -250,7 +251,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage
|
|||||||
if (mAdapter.isInMultiSelectMode()) {
|
if (mAdapter.isInMultiSelectMode()) {
|
||||||
mAdapter.toggleSelection(conversation.getThreadId(), conversation);
|
mAdapter.toggleSelection(conversation.getThreadId(), conversation);
|
||||||
} else {
|
} else {
|
||||||
((MainActivity) mContext).setConversation(conversation.getThreadId(), -1, null, true);
|
MessageListActivity.launch(mContext, conversation.getThreadId(), -1, null, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,68 @@
|
|||||||
|
package com.moez.QKSMS.ui.messagelist;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
import com.moez.QKSMS.R;
|
||||||
|
import com.moez.QKSMS.ui.base.QKActivity;
|
||||||
|
|
||||||
|
public class MessageListActivity extends QKActivity {
|
||||||
|
|
||||||
|
public static final String ARG_THREAD_ID = "threadId";
|
||||||
|
public static final String ARG_ROW_ID = "rowId";
|
||||||
|
public static final String ARG_HIGHLIGHT = "highlight";
|
||||||
|
public static final String ARG_SHOW_IMMEDIATE = "showImmediate";
|
||||||
|
|
||||||
|
private long mThreadId;
|
||||||
|
private long mRowId;
|
||||||
|
private String mHighlight;
|
||||||
|
private boolean mShowImmediate;
|
||||||
|
|
||||||
|
public static void launch(QKActivity context, long threadId, long rowId, String pattern, boolean showImmediate) {
|
||||||
|
Intent intent = new Intent(context, MessageListActivity.class);
|
||||||
|
intent.putExtra(ARG_THREAD_ID, threadId);
|
||||||
|
intent.putExtra(ARG_ROW_ID, rowId);
|
||||||
|
intent.putExtra(ARG_HIGHLIGHT, pattern);
|
||||||
|
intent.putExtra(ARG_SHOW_IMMEDIATE, showImmediate);
|
||||||
|
context.startActivity(intent);
|
||||||
|
context.overridePendingTransition(R.anim.slide_in, android.R.anim.fade_out);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_fragment);
|
||||||
|
showBackButton(true);
|
||||||
|
|
||||||
|
Intent intent = getIntent();
|
||||||
|
if (intent != null) {
|
||||||
|
mThreadId = intent.getLongExtra(ARG_THREAD_ID, -1);
|
||||||
|
mRowId = intent.getLongExtra(ARG_ROW_ID, -1);
|
||||||
|
mHighlight = intent.getStringExtra(ARG_HIGHLIGHT);
|
||||||
|
mShowImmediate = intent.getBooleanExtra(ARG_SHOW_IMMEDIATE, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
MessageListFragment fragment = MessageListFragment.getInstance(mThreadId, mRowId, mHighlight, mShowImmediate);
|
||||||
|
getFragmentManager()
|
||||||
|
.beginTransaction()
|
||||||
|
.replace(R.id.content_frame, fragment)
|
||||||
|
.commitAllowingStateLoss();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
|
switch (item.getItemId()) {
|
||||||
|
case android.R.id.home:
|
||||||
|
onBackPressed();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBackPressed() {
|
||||||
|
finish();
|
||||||
|
overridePendingTransition(android.R.anim.fade_in, R.anim.slide_out);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -214,7 +214,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa
|
|||||||
View view = inflater.inflate(R.layout.fragment_conversation, container, false);
|
View view = inflater.inflate(R.layout.fragment_conversation, container, false);
|
||||||
mRecyclerView = (MessageListRecyclerView) view.findViewById(R.id.conversation);
|
mRecyclerView = (MessageListRecyclerView) view.findViewById(R.id.conversation);
|
||||||
|
|
||||||
mOpened = !((MainActivity) mContext).getSlidingMenu().isMenuShowing();
|
mOpened = true; // TODO
|
||||||
|
|
||||||
mAdapter = new MessageListAdapter(mContext);
|
mAdapter = new MessageListAdapter(mContext);
|
||||||
mAdapter.setItemClickListener(this);
|
mAdapter.setItemClickListener(this);
|
||||||
@@ -299,7 +299,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void setTitle() {
|
private void setTitle() {
|
||||||
if (mContext != null && mConversation != null && !((MainActivity) mContext).getSlidingMenu().isMenuShowing()) {
|
if (mContext != null && mConversation != null) {
|
||||||
mContext.setTitle(mConversation.getRecipients().formatNames(", "));
|
mContext.setTitle(mConversation.getRecipients().formatNames(", "));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,10 +19,10 @@ import android.view.inputmethod.EditorInfo;
|
|||||||
import com.moez.QKSMS.R;
|
import com.moez.QKSMS.R;
|
||||||
import com.moez.QKSMS.common.utils.KeyboardUtils;
|
import com.moez.QKSMS.common.utils.KeyboardUtils;
|
||||||
import com.moez.QKSMS.data.Contact;
|
import com.moez.QKSMS.data.Contact;
|
||||||
import com.moez.QKSMS.ui.MainActivity;
|
|
||||||
import com.moez.QKSMS.ui.base.QKActivity;
|
import com.moez.QKSMS.ui.base.QKActivity;
|
||||||
import com.moez.QKSMS.ui.base.QKContentFragment;
|
import com.moez.QKSMS.ui.base.QKContentFragment;
|
||||||
import com.moez.QKSMS.ui.base.RecyclerCursorAdapter;
|
import com.moez.QKSMS.ui.base.RecyclerCursorAdapter;
|
||||||
|
import com.moez.QKSMS.ui.messagelist.MessageListActivity;
|
||||||
import com.moez.QKSMS.ui.view.MessageListRecyclerView;
|
import com.moez.QKSMS.ui.view.MessageListRecyclerView;
|
||||||
import com.moez.QKSMS.ui.view.QKEditText;
|
import com.moez.QKSMS.ui.view.QKEditText;
|
||||||
import com.moez.QKSMS.ui.view.QKTextView;
|
import com.moez.QKSMS.ui.view.QKTextView;
|
||||||
@@ -150,8 +150,7 @@ public class SearchFragment extends QKContentFragment implements RecyclerCursorA
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onItemClick(SearchData data, View view) {
|
public void onItemClick(SearchData data, View view) {
|
||||||
MainActivity mainActivity = (MainActivity) mContext;
|
MessageListActivity.launch(mContext, data.threadId, data.rowId, mSearchString, true);
|
||||||
mainActivity.setConversation(data.threadId, data.rowId, mSearchString);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<translate
|
||||||
|
android:duration="200"
|
||||||
|
android:fromXDelta="100%p"
|
||||||
|
android:toXDelta="0" />
|
||||||
|
</set>
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<translate
|
||||||
|
android:duration="200"
|
||||||
|
android:fromXDelta="0"
|
||||||
|
android:toXDelta="100%p" />
|
||||||
|
</set>
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<include layout="@layout/view_toolbar" />
|
||||||
|
|
||||||
|
<FrameLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<FrameLayout
|
||||||
|
android:id="@+id/content_frame"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="8dp"
|
||||||
|
android:background="@drawable/ab_shadow" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
Reference in New Issue
Block a user