diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/RecyclerCursorAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/RecyclerCursorAdapter.java index 8d786043..319d2337 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/RecyclerCursorAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/RecyclerCursorAdapter.java @@ -65,7 +65,7 @@ public abstract class RecyclerCursorAdapter 0 ? mCursor.getCount() - 1 : 0; - manager.smoothScrollToPosition(mRecyclerView, null, position); - } - }); + mAdapter = new QKReplyAdapter(this); - mRecyclerView = (MessageListRecyclerView) findViewById(R.id.popup_messages); - mRecyclerView.setLayoutManager(mLayoutManager); - mRecyclerView.setAdapter(mAdapter); + mListView = (ListView) findViewById(R.id.popup_messages); + mListView.setAdapter(mAdapter); // Disable the compose view for the welcome screen (so that they can't send texts to nobody) if (extras.getLong(EXTRA_THREAD_ID) == DemoConversationCursorLoader.THREAD_ID_WELCOME_SCREEN) { @@ -278,8 +262,6 @@ public class QKReplyActivity extends QKPopupActivity implements DialogInterface. mAdapter.changeCursor(data); } mCursor = data; - - mRecyclerView.scrollToPosition(CursorUtils.isValid(mCursor) && mCursor.getCount() > 0 ? mCursor.getCount() - 1 : 0); } public void onLoaderReset(Loader loader) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyAdapter.java new file mode 100644 index 00000000..f8b8db27 --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyAdapter.java @@ -0,0 +1,60 @@ +package com.moez.QKSMS.ui.popup; + +import android.database.Cursor; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; + +import com.moez.QKSMS.ui.base.QKActivity; +import com.moez.QKSMS.ui.messagelist.MessageListAdapter; +import com.moez.QKSMS.ui.messagelist.MessageListViewHolder; + +/** + * ArrayAdapter wrapper of MessageListAdapter to allow regular ListView usage in QKReplyActivity + * RecyclerView in variable-height windows causes a lot of issues + */ +public class QKReplyAdapter extends ArrayAdapter { + + private MessageListAdapter mMessageListAdapter; + + public QKReplyAdapter(QKActivity context) { + super(context, 0); + mMessageListAdapter = new MessageListAdapter(context); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + MessageListViewHolder holder; + + if (convertView == null) { + holder = mMessageListAdapter.onCreateViewHolder(parent, getItemViewType(position)); + convertView = holder.itemView; + convertView.setTag(holder); + } else { + holder = (MessageListViewHolder) convertView.getTag(); + } + + mMessageListAdapter.bindViewHolder(holder, position); + return holder.itemView; + } + + @Override + public int getCount() { + return mMessageListAdapter != null ? mMessageListAdapter.getCount() : 0; + } + + @Override + public int getItemViewType(int position) { + return mMessageListAdapter.getItemViewType(position); + } + + @Override + public int getViewTypeCount() { + return 2; + } + + public void changeCursor(Cursor cursor) { + mMessageListAdapter.changeCursor(cursor); + notifyDataSetChanged(); + } +} diff --git a/QKSMS/src/main/res/layout/activity_qkreply.xml b/QKSMS/src/main/res/layout/activity_qkreply.xml index 8bb4bd37..d83896d9 100644 --- a/QKSMS/src/main/res/layout/activity_qkreply.xml +++ b/QKSMS/src/main/res/layout/activity_qkreply.xml @@ -23,7 +23,7 @@ android:clipToPadding="false" android:foreground="@drawable/ab_shadow"> -