From fde3b04e68bbec795fc2cb03c99d6a682407c7e7 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 8 Apr 2016 02:03:54 -0400 Subject: [PATCH 01/24] Moved MessageList to separate activity --- QKSMS/src/main/AndroidManifest.xml | 1 + .../java/com/moez/QKSMS/ui/MainActivity.java | 23 +------ .../QKSMS/ui/compose/ComposeFragment.java | 3 +- .../ConversationListFragment.java | 7 +- .../ui/messagelist/MessageListActivity.java | 68 +++++++++++++++++++ .../ui/messagelist/MessageListFragment.java | 4 +- .../moez/QKSMS/ui/search/SearchFragment.java | 5 +- QKSMS/src/main/res/anim/slide_in.xml | 7 ++ QKSMS/src/main/res/anim/slide_out.xml | 7 ++ .../src/main/res/layout/activity_fragment.xml | 25 +++++++ 10 files changed, 120 insertions(+), 30 deletions(-) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java create mode 100644 QKSMS/src/main/res/anim/slide_in.xml create mode 100644 QKSMS/src/main/res/anim/slide_out.xml create mode 100644 QKSMS/src/main/res/layout/activity_fragment.xml diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 4fff7025..d026a8f1 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -88,6 +88,7 @@ + + + + \ No newline at end of file diff --git a/QKSMS/src/main/res/anim/slide_out.xml b/QKSMS/src/main/res/anim/slide_out.xml new file mode 100644 index 00000000..568b703d --- /dev/null +++ b/QKSMS/src/main/res/anim/slide_out.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/QKSMS/src/main/res/layout/activity_fragment.xml b/QKSMS/src/main/res/layout/activity_fragment.xml new file mode 100644 index 00000000..67d5b6fd --- /dev/null +++ b/QKSMS/src/main/res/layout/activity_fragment.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + \ No newline at end of file From 7f6d1a3b2c36decf7f315e4aae41020791eb976a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 8 Apr 2016 02:10:00 -0400 Subject: [PATCH 02/24] Show menu for MessageListActivity --- .../QKSMS/ui/messagelist/MessageListActivity.java | 14 ++++++++++++++ .../QKSMS/ui/messagelist/MessageListFragment.java | 3 +-- .../menu/{conversation.xml => message_list.xml} | 0 3 files changed, 15 insertions(+), 2 deletions(-) rename QKSMS/src/main/res/menu/{conversation.xml => message_list.xml} (100%) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index 75de62e6..be1f6d03 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -2,8 +2,11 @@ package com.moez.QKSMS.ui.messagelist; import android.content.Intent; import android.os.Bundle; +import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import com.moez.QKSMS.R; +import com.moez.QKSMS.common.DonationManager; import com.moez.QKSMS.ui.base.QKActivity; public class MessageListActivity extends QKActivity { @@ -49,12 +52,23 @@ public class MessageListActivity extends QKActivity { .commitAllowingStateLoss(); } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.message_list, menu); + return super.onCreateOptionsMenu(menu); + } + @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case android.R.id.home: onBackPressed(); return true; + + case R.id.menu_donate: + DonationManager.getInstance(this).showDonateDialog(); + return true; } return false; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index 23cb605d..130a08f0 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -1,6 +1,5 @@ package com.moez.QKSMS.ui.messagelist; -import android.app.Activity; import android.app.AlertDialog; import android.app.LoaderManager; import android.content.ContentResolver; @@ -649,7 +648,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa @Override public void inflateToolbar(Menu menu, MenuInflater inflater, Context context) { - inflater.inflate(R.menu.conversation, menu); + inflater.inflate(R.menu.message_list, menu); setTitle(); ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(context, mThreadId); diff --git a/QKSMS/src/main/res/menu/conversation.xml b/QKSMS/src/main/res/menu/message_list.xml similarity index 100% rename from QKSMS/src/main/res/menu/conversation.xml rename to QKSMS/src/main/res/menu/message_list.xml From da8a5fcba4ff403e1da46035527774ef538ba287 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 8 Apr 2016 03:56:08 -0400 Subject: [PATCH 03/24] Added swipe back support in MessageList --- .../com/moez/QKSMS/ui/SwipeBackLayout.java | 510 ++++++++++++++++++ .../QKSMS/ui/base/QKSwipeBackActivity.java | 32 ++ .../ui/messagelist/MessageListActivity.java | 3 +- .../main/res/drawable-xhdpi/shadow_bottom.png | Bin 0 -> 2868 bytes .../main/res/drawable-xhdpi/shadow_left.png | Bin 0 -> 2865 bytes QKSMS/src/main/res/layout/view_swipeback.xml | 5 + QKSMS/src/main/res/values/themes.xml | 2 + 7 files changed, 551 insertions(+), 1 deletion(-) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKSwipeBackActivity.java create mode 100644 QKSMS/src/main/res/drawable-xhdpi/shadow_bottom.png create mode 100644 QKSMS/src/main/res/drawable-xhdpi/shadow_left.png create mode 100644 QKSMS/src/main/res/layout/view_swipeback.xml diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java new file mode 100644 index 00000000..8d8f88b6 --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java @@ -0,0 +1,510 @@ +package com.moez.QKSMS.ui; + +import android.app.Activity; +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.graphics.Rect; +import android.graphics.drawable.Drawable; +import android.support.v4.view.ViewCompat; +import android.support.v4.widget.ViewDragHelper; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.view.View; +import android.view.ViewGroup; +import android.widget.FrameLayout; +import com.moez.QKSMS.R; + +import java.util.ArrayList; +import java.util.List; + +/** + * Modified version of https://github.com/ikew0ng/SwipeBackLayout + */ +public class SwipeBackLayout extends FrameLayout { + private final String TAG = "SwipeBackLayout"; + + private static final int MIN_FLING_VELOCITY = 400; // dips per second + private static final int DEFAULT_SCRIM_COLOR = 0x99000000; + private static final int FULL_ALPHA = 255; + private static final float DEFAULT_SCROLL_THRESHOLD = 0.3f; + private static final int OVERSCROLL_DISTANCE = 10; + + public static final int EDGE_LEFT = ViewDragHelper.EDGE_LEFT; + public static final int EDGE_BOTTOM = ViewDragHelper.EDGE_BOTTOM; + public static final int EDGE_ALL = EDGE_LEFT | EDGE_BOTTOM; + + public static final int STATE_IDLE = ViewDragHelper.STATE_IDLE; + public static final int STATE_DRAGGING = ViewDragHelper.STATE_DRAGGING; + public static final int STATE_SETTLING = ViewDragHelper.STATE_SETTLING; + + + private static final int[] EDGE_FLAGS = { + EDGE_LEFT, EDGE_BOTTOM, EDGE_ALL + }; + + private int mEdgeFlag; + + /** + * Threshold of scroll, we will close the activity, when scrollPercent over + * this value; + */ + private float mScrollThreshold = DEFAULT_SCROLL_THRESHOLD; + + private Activity mActivity; + + private boolean mEnable = true; + + private View mContentView; + + private ViewDragHelper mDragHelper; + + private float mScrollPercent; + + private int mContentLeft; + private int mContentTop; + + /** + * The set of listeners to be sent events through. + */ + private List mListeners; + + private Drawable mShadowLeft; + private Drawable mShadowRight; + private Drawable mShadowBottom; + + private float mScrimOpacity; + private int mScrimColor = DEFAULT_SCRIM_COLOR; + + private boolean mInLayout; + private Rect mTmpRect = new Rect(); + + /** + * Edge being dragged + */ + private int mTrackingEdge = EDGE_LEFT; + + public SwipeBackLayout(Context context) { + this(context, null); + } + + public SwipeBackLayout(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public SwipeBackLayout(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs); + mDragHelper = ViewDragHelper.create(this, 1.0f, new ViewDragCallback()); + + int shadowLeft = R.drawable.shadow_left; + int shadowBottom = R.drawable.shadow_bottom; + setShadow(shadowLeft, EDGE_LEFT); + setShadow(shadowBottom, EDGE_BOTTOM); + final float density = getResources().getDisplayMetrics().density; + final float minVel = MIN_FLING_VELOCITY * density; + mDragHelper.setMinVelocity(minVel); + } + + /** + * Set up contentView which will be moved by user gesture + * + * @param view + */ + private void setContentView(View view) { + mContentView = view; + } + + public void setEnableGesture(boolean enable) { + mEnable = enable; + } + + /** + * Enable edge tracking for the selected edges of the parent view. The + * callback's + * {@link android.support.v4.widget.ViewDragHelper.Callback#onEdgeTouched(int, int)} + * and + * {@link android.support.v4.widget.ViewDragHelper.Callback#onEdgeDragStarted(int, int)} + * methods will only be invoked for edges for which edge tracking has been + * enabled. + * + * @param edgeFlags Combination of edge flags describing the edges to watch + * @see #EDGE_LEFT + * @see #EDGE_BOTTOM + */ + public void setEdgeTrackingEnabled(int edgeFlags) { + mEdgeFlag = edgeFlags; + mDragHelper.setEdgeTrackingEnabled(mEdgeFlag); + } + + /** + * Set a color to use for the scrim that obscures primary content while a + * drawer is open. + * + * @param color Color to use in 0xAARRGGBB format. + */ + public void setScrimColor(int color) { + mScrimColor = color; + invalidate(); + } + + /** + * Register a callback to be invoked when a swipe event is sent to this + * view. + * + * @param listener the swipe listener to attach to this view + * @deprecated use {@link #addSwipeListener} instead + */ + @Deprecated + public void setSwipeListener(SwipeListener listener) { + addSwipeListener(listener); + } + + /** + * Add a callback to be invoked when a swipe event is sent to this view. + * + * @param listener the swipe listener to attach to this view + */ + public void addSwipeListener(SwipeListener listener) { + if (mListeners == null) { + mListeners = new ArrayList(); + } + mListeners.add(listener); + } + + /** + * Removes a listener from the set of listeners + * + * @param listener + */ + public void removeSwipeListener(SwipeListener listener) { + if (mListeners == null) { + return; + } + mListeners.remove(listener); + } + + public interface SwipeListener { + /** + * Invoke when state change + * + * @param state flag to describe scroll state + * @param scrollPercent scroll percent of this view + * @see #STATE_IDLE + * @see #STATE_DRAGGING + * @see #STATE_SETTLING + */ + void onScrollStateChange(int state, float scrollPercent); + + /** + * Invoke when edge touched + * + * @param edgeFlag edge flag describing the edge being touched + * @see #EDGE_LEFT + * @see #EDGE_BOTTOM + */ + void onEdgeTouch(int edgeFlag); + + /** + * Invoke when scroll percent over the threshold for the first time + */ + void onScrollOverThreshold(); + } + + /** + * Set scroll threshold, we will close the activity, when scrollPercent over + * this value + * + * @param threshold + */ + public void setScrollThresHold(float threshold) { + if (threshold >= 1.0f || threshold <= 0) { + throw new IllegalArgumentException("Threshold value should be between 0 and 1.0"); + } + mScrollThreshold = threshold; + } + + /** + * Set a drawable used for edge shadow. + * + * @param shadow Drawable to use + * @param edgeFlags Combination of edge flags describing the edge to set + * @see #EDGE_LEFT + * @see #EDGE_BOTTOM + */ + public void setShadow(Drawable shadow, int edgeFlag) { + if ((edgeFlag & EDGE_LEFT) != 0) { + mShadowLeft = shadow; + } else if ((edgeFlag & EDGE_BOTTOM) != 0) { + mShadowBottom = shadow; + } + invalidate(); + } + + /** + * Set a drawable used for edge shadow. + * + * @param resId Resource of drawable to use + * @param edgeFlags Combination of edge flags describing the edge to set + * @see #EDGE_LEFT + * @see #EDGE_BOTTOM + */ + public void setShadow(int resId, int edgeFlag) { + setShadow(getResources().getDrawable(resId), edgeFlag); + } + + /** + * Scroll out contentView and finish the activity + */ + public void scrollToFinishActivity() { + final int childWidth = mContentView.getWidth(); + final int childHeight = mContentView.getHeight(); + + int left = 0, top = 0; + if ((mEdgeFlag & EDGE_LEFT) != 0) { + left = childWidth + mShadowLeft.getIntrinsicWidth() + OVERSCROLL_DISTANCE; + mTrackingEdge = EDGE_LEFT; + } else if ((mEdgeFlag & EDGE_BOTTOM) != 0) { + top = -childHeight - mShadowBottom.getIntrinsicHeight() - OVERSCROLL_DISTANCE; + mTrackingEdge = EDGE_BOTTOM; + } + + mDragHelper.smoothSlideViewTo(mContentView, left, top); + invalidate(); + } + + @Override + public boolean onInterceptTouchEvent(MotionEvent event) { + if (!mEnable) { + return false; + } + try { + return mDragHelper.shouldInterceptTouchEvent(event); + } catch (ArrayIndexOutOfBoundsException e) { + // FIXME: handle exception + // issues #9 + return false; + } + } + + @Override + public boolean onTouchEvent(MotionEvent event) { + if (!mEnable) { + return false; + } + mDragHelper.processTouchEvent(event); + return true; + } + + @Override + protected void onLayout(boolean changed, int left, int top, int right, int bottom) { + mInLayout = true; + if (mContentView != null) + mContentView.layout(mContentLeft, mContentTop, + mContentLeft + mContentView.getMeasuredWidth(), + mContentTop + mContentView.getMeasuredHeight()); + mInLayout = false; + } + + @Override + public void requestLayout() { + if (!mInLayout) { + super.requestLayout(); + } + } + + @Override + protected boolean drawChild(Canvas canvas, View child, long drawingTime) { + final boolean drawContent = child == mContentView; + + boolean ret = super.drawChild(canvas, child, drawingTime); + if (mScrimOpacity > 0 && drawContent + && mDragHelper.getViewDragState() != ViewDragHelper.STATE_IDLE) { + drawShadow(canvas, child); + drawScrim(canvas, child); + } + return ret; + } + + private void drawScrim(Canvas canvas, View child) { + final int baseAlpha = (mScrimColor & 0xff000000) >>> 24; + final int alpha = (int) (baseAlpha * mScrimOpacity); + final int color = alpha << 24 | (mScrimColor & 0xffffff); + + if ((mTrackingEdge & EDGE_LEFT) != 0) { + canvas.clipRect(0, 0, child.getLeft(), getHeight()); + } else if ((mTrackingEdge & EDGE_BOTTOM) != 0) { + canvas.clipRect(child.getLeft(), child.getBottom(), getRight(), getHeight()); + } + canvas.drawColor(color); + } + + private void drawShadow(Canvas canvas, View child) { + final Rect childRect = mTmpRect; + child.getHitRect(childRect); + + if ((mEdgeFlag & EDGE_LEFT) != 0) { + mShadowLeft.setBounds(childRect.left - mShadowLeft.getIntrinsicWidth(), childRect.top, + childRect.left, childRect.bottom); + mShadowLeft.setAlpha((int) (mScrimOpacity * FULL_ALPHA)); + mShadowLeft.draw(canvas); + } + + if ((mEdgeFlag & EDGE_BOTTOM) != 0) { + mShadowBottom.setBounds(childRect.left, childRect.bottom, childRect.right, + childRect.bottom + mShadowBottom.getIntrinsicHeight()); + mShadowBottom.setAlpha((int) (mScrimOpacity * FULL_ALPHA)); + mShadowBottom.draw(canvas); + } + } + + public void attachToActivity(Activity activity) { + mActivity = activity; + TypedArray a = activity.getTheme().obtainStyledAttributes(new int[]{ + android.R.attr.windowBackground + }); + int background = a.getResourceId(0, 0); + a.recycle(); + + ViewGroup decor = (ViewGroup) activity.getWindow().getDecorView(); + ViewGroup decorChild = (ViewGroup) decor.getChildAt(0); + decorChild.setBackgroundResource(background); + decor.removeView(decorChild); + addView(decorChild); + setContentView(decorChild); + decor.addView(this); + } + + @Override + public void computeScroll() { + mScrimOpacity = 1 - mScrollPercent; + if (mDragHelper.continueSettling(true)) { + ViewCompat.postInvalidateOnAnimation(this); + } + } + + private class ViewDragCallback extends ViewDragHelper.Callback { + private boolean mIsScrollOverValid; + + @Override + public void onEdgeDragStarted(int edgeFlags, int pointerId) { + super.onEdgeDragStarted(edgeFlags, pointerId); + } + + @Override + public boolean tryCaptureView(View view, int i) { + boolean ret = mDragHelper.isEdgeTouched(mEdgeFlag, i); + if (ret) { + if (mDragHelper.isEdgeTouched(EDGE_LEFT, i)) { + mTrackingEdge = EDGE_LEFT; + } else if (mDragHelper.isEdgeTouched(EDGE_BOTTOM, i)) { + mTrackingEdge = EDGE_BOTTOM; + } + if (mListeners != null && !mListeners.isEmpty()) { + for (SwipeListener listener : mListeners) { + listener.onEdgeTouch(mTrackingEdge); + } + } + mIsScrollOverValid = true; + } + boolean directionCheck = false; + if (mEdgeFlag == EDGE_LEFT) { + directionCheck = !mDragHelper.checkTouchSlop(ViewDragHelper.DIRECTION_VERTICAL, i); + } else if (mEdgeFlag == EDGE_BOTTOM) { + directionCheck = !mDragHelper + .checkTouchSlop(ViewDragHelper.DIRECTION_HORIZONTAL, i); + } else if (mEdgeFlag == EDGE_ALL) { + directionCheck = true; + } + return ret & directionCheck; + } + + @Override + public int getViewHorizontalDragRange(View child) { + return mEdgeFlag & (EDGE_LEFT); + } + + @Override + public int getViewVerticalDragRange(View child) { + return mEdgeFlag & EDGE_BOTTOM; + } + + @Override + public void onViewPositionChanged(View changedView, int left, int top, int dx, int dy) { + super.onViewPositionChanged(changedView, left, top, dx, dy); + if ((mTrackingEdge & EDGE_LEFT) != 0) { + mScrollPercent = Math.abs((float) left + / (mContentView.getWidth() + mShadowLeft.getIntrinsicWidth())); + } else if ((mTrackingEdge & EDGE_BOTTOM) != 0) { + mScrollPercent = Math.abs((float) top + / (mContentView.getHeight() + mShadowBottom.getIntrinsicHeight())); + } + mContentLeft = left; + mContentTop = top; + invalidate(); + if (mScrollPercent < mScrollThreshold && !mIsScrollOverValid) { + mIsScrollOverValid = true; + } + if (mListeners != null && !mListeners.isEmpty() + && mDragHelper.getViewDragState() == STATE_DRAGGING + && mScrollPercent >= mScrollThreshold && mIsScrollOverValid) { + mIsScrollOverValid = false; + for (SwipeListener listener : mListeners) { + listener.onScrollOverThreshold(); + } + } + + if (mScrollPercent >= 1) { + if (!mActivity.isFinishing()) { + mActivity.finish(); + mActivity.overridePendingTransition(0, 0); + } + } + } + + @Override + public void onViewReleased(View releasedChild, float xvel, float yvel) { + final int childWidth = releasedChild.getWidth(); + final int childHeight = releasedChild.getHeight(); + + int left = 0, top = 0; + if ((mTrackingEdge & EDGE_LEFT) != 0) { + left = xvel > 0 || xvel == 0 && mScrollPercent > mScrollThreshold ? childWidth + + mShadowLeft.getIntrinsicWidth() + OVERSCROLL_DISTANCE : 0; + } else if ((mTrackingEdge & EDGE_BOTTOM) != 0) { + top = yvel < 0 || yvel == 0 && mScrollPercent > mScrollThreshold ? -(childHeight + + mShadowBottom.getIntrinsicHeight() + OVERSCROLL_DISTANCE) : 0; + } + + mDragHelper.settleCapturedViewAt(left, top); + invalidate(); + } + + @Override + public int clampViewPositionHorizontal(View child, int left, int dx) { + int ret = 0; + if ((mTrackingEdge & EDGE_LEFT) != 0) { + ret = Math.min(child.getWidth(), Math.max(left, 0)); + } + return ret; + } + + @Override + public int clampViewPositionVertical(View child, int top, int dy) { + int ret = 0; + if ((mTrackingEdge & EDGE_BOTTOM) != 0) { + ret = Math.min(0, Math.max(top, -child.getHeight())); + } + return ret; + } + + @Override + public void onViewDragStateChanged(int state) { + super.onViewDragStateChanged(state); + if (mListeners != null && !mListeners.isEmpty()) { + for (SwipeListener listener : mListeners) { + listener.onScrollStateChange(state, mScrollPercent); + } + } + } + } +} \ No newline at end of file diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKSwipeBackActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKSwipeBackActivity.java new file mode 100644 index 00000000..1ea51225 --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKSwipeBackActivity.java @@ -0,0 +1,32 @@ +package com.moez.QKSMS.ui.base; + +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.os.Bundle; +import android.view.LayoutInflater; +import com.moez.QKSMS.R; +import com.moez.QKSMS.ui.SwipeBackLayout; + +public abstract class QKSwipeBackActivity extends QKActivity { + + private SwipeBackLayout mSwipeBackLayout; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + getWindow().getDecorView().setBackgroundDrawable(null); + mSwipeBackLayout = (SwipeBackLayout) LayoutInflater.from(this).inflate(R.layout.view_swipeback, null); + + mSwipeBackLayout.setEdgeTrackingEnabled(SwipeBackLayout.EDGE_LEFT); + mSwipeBackLayout.setEnableGesture(true); + } + + + @Override + protected void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + mSwipeBackLayout.attachToActivity(this); + } +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index be1f6d03..c7182a0c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -8,8 +8,9 @@ import android.view.MenuItem; import com.moez.QKSMS.R; import com.moez.QKSMS.common.DonationManager; import com.moez.QKSMS.ui.base.QKActivity; +import com.moez.QKSMS.ui.base.QKSwipeBackActivity; -public class MessageListActivity extends QKActivity { +public class MessageListActivity extends QKSwipeBackActivity { public static final String ARG_THREAD_ID = "threadId"; public static final String ARG_ROW_ID = "rowId"; diff --git a/QKSMS/src/main/res/drawable-xhdpi/shadow_bottom.png b/QKSMS/src/main/res/drawable-xhdpi/shadow_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..4569174a101045744e2d952c938f2890601600bd GIT binary patch literal 2868 zcmV-43(NG0P)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z0AWc)K~#9!?AXB(fG`XLL3yA}`fmba3emcQ+^jyCBu|R(PIB4KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z0A5K%K~#9!?9MR?z%UF0Kso9Ezw9m#sw9%V$4s zjC|lAARr(hARr(hARr(hARr(hARr(hARr(hARr(hARzvVxB&nF|NjF3ER+M?iLvGh P00000NkvXXu0mjfWSMC2 literal 0 HcmV?d00001 diff --git a/QKSMS/src/main/res/layout/view_swipeback.xml b/QKSMS/src/main/res/layout/view_swipeback.xml new file mode 100644 index 00000000..711f47fc --- /dev/null +++ b/QKSMS/src/main/res/layout/view_swipeback.xml @@ -0,0 +1,5 @@ + + diff --git a/QKSMS/src/main/res/values/themes.xml b/QKSMS/src/main/res/values/themes.xml index 01c003cd..31678b2c 100644 --- a/QKSMS/src/main/res/values/themes.xml +++ b/QKSMS/src/main/res/values/themes.xml @@ -50,6 +50,7 @@ @color/grey_light_mega_ultra @color/grey_material @color/grey_light_mega_ultra + true From f40eb0068886ec48a5ef591880d290bb2b5e0ee8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 8 Apr 2016 18:00:39 -0400 Subject: [PATCH 04/24] Fix scaling when in inputmode --- QKSMS/src/main/AndroidManifest.xml | 4 +++- QKSMS/src/main/res/layout/activity_fragment.xml | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index d026a8f1..fdac01da 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -88,7 +88,9 @@ - + + android:layout_height="0dp" + android:layout_weight="1"> Date: Fri, 8 Apr 2016 18:14:29 -0400 Subject: [PATCH 05/24] Use SwipeBackLayout to dismiss on back pressed --- .../main/java/com/moez/QKSMS/ui/base/QKSwipeBackActivity.java | 2 +- .../com/moez/QKSMS/ui/messagelist/MessageListActivity.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKSwipeBackActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKSwipeBackActivity.java index 1ea51225..47a67c17 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKSwipeBackActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKSwipeBackActivity.java @@ -9,7 +9,7 @@ import com.moez.QKSMS.ui.SwipeBackLayout; public abstract class QKSwipeBackActivity extends QKActivity { - private SwipeBackLayout mSwipeBackLayout; + protected SwipeBackLayout mSwipeBackLayout; @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index c7182a0c..c3fb3e7e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -77,7 +77,6 @@ public class MessageListActivity extends QKSwipeBackActivity { @Override public void onBackPressed() { - finish(); - overridePendingTransition(android.R.anim.fade_in, R.anim.slide_out); + mSwipeBackLayout.scrollToFinishActivity(); } } From 9a4073a84a0f6b34aee4d79942269a7b5e8b00e5 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 9 Apr 2016 01:24:17 -0400 Subject: [PATCH 06/24] Launch MessageListActivity directly from intent --- QKSMS/src/main/AndroidManifest.xml | 15 +++-- .../transaction/NotificationManager.java | 7 ++- .../java/com/moez/QKSMS/ui/MainActivity.java | 61 ------------------- .../ui/messagelist/MessageListActivity.java | 47 +++++++++++--- .../ui/messagelist/MessageListFragment.java | 2 +- 5 files changed, 54 insertions(+), 78 deletions(-) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index fdac01da..3b226063 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -72,14 +72,20 @@ android:logo="@color/transparent" android:windowSoftInputMode="stateUnchanged|adjustResize"> - - - + + + + + + + @@ -88,9 +94,6 @@ - - * onNewIntent() is called every time the homescreen shortcut is tapped, even if the app - * is already running in the background. It's also called when the app is launched via other - * intents - *

- * Docs: - * http://developer.android.com/guide/components/tasks-and-back-stack.html#TaskLaunchModes - */ - @Override - public void onNewIntent(Intent intent) { - // onNewIntent doesn't change the result of getIntent() by default, so here we set it since - // that makes the most sense. - setIntent(intent); - - // This method is called whenever a MainActivity intent is started. Sometimes this is from a - // notification; other times it's from the user clicking on the app icon in the home screen - long threadId = intent.getLongExtra(EXTRA_THREAD_ID, -1); - - // The activity can also be launched by clicking on the message button from the contacts app - // Check for {sms,mms}{,to}: schemes, in which case we know to open a conversation - if (intent.getData() != null) { - String data = intent.getData().toString(); - String scheme = intent.getData().getScheme(); - - if (scheme.startsWith("smsto") || scheme.startsWith("mmsto")) { - String address = data.replace("smsto:", "").replace("mmsto:", ""); - threadId = Utils.getThreadId(this, formatPhoneNumber(address)); - } else if (scheme.startsWith("sms") || (scheme.startsWith("mms"))) { - String address = data.replace("sms:", "").replace("mms:", ""); - threadId = Utils.getThreadId(this, formatPhoneNumber(address)); - } - } - - // If it has a thread id, then we know it's from a notification and we can set the - // conversation. - if (threadId != -1) { - Log.v(TAG, "Opening thread: " + threadId); - MessageListActivity.launch(this, threadId, -1, null, true); - mSlidingMenu.showContent(); - } - - // Otherwise we'll just resume what was previously there, which doesn't require any code. - } - - private String formatPhoneNumber(String address) { - address = URLDecoder.decode(address); - address = "" + Html.fromHtml(address); - address = PhoneNumberUtils.formatNumber(address); - return address; - } - private void beginMmsSetup() { if (!mPrefs.getBoolean(MMS_SETUP_DONT_ASK_AGAIN, false) && TextUtils.isEmpty(mPrefs.getString(SettingsFragment.MMSC_URL, "")) && diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index c3fb3e7e..0f7c3741 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -2,17 +2,24 @@ package com.moez.QKSMS.ui.messagelist; import android.content.Intent; import android.os.Bundle; +import android.telephony.PhoneNumberUtils; +import android.text.Html; +import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import com.moez.QKSMS.R; import com.moez.QKSMS.common.DonationManager; +import com.moez.QKSMS.mmssms.Utils; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.base.QKSwipeBackActivity; -public class MessageListActivity extends QKSwipeBackActivity { +import java.net.URLDecoder; - public static final String ARG_THREAD_ID = "threadId"; +public class MessageListActivity extends QKSwipeBackActivity { + private final String TAG = "MessageListActivity"; + + public static final String ARG_THREAD_ID = "thread_id"; public static final String ARG_ROW_ID = "rowId"; public static final String ARG_HIGHLIGHT = "highlight"; public static final String ARG_SHOW_IMMEDIATE = "showImmediate"; @@ -44,13 +51,39 @@ public class MessageListActivity extends QKSwipeBackActivity { mRowId = intent.getLongExtra(ARG_ROW_ID, -1); mHighlight = intent.getStringExtra(ARG_HIGHLIGHT); mShowImmediate = intent.getBooleanExtra(ARG_SHOW_IMMEDIATE, false); + + if (mThreadId == -1 && intent.getData() != null) { + String data = intent.getData().toString(); + String scheme = intent.getData().getScheme(); + + String address = null; + if (scheme.startsWith("smsto") || scheme.startsWith("mmsto")) { + address = data.replace("smsto:", "").replace("mmsto:", ""); + } else if (scheme.startsWith("sms") || (scheme.startsWith("mms"))) { + address = data.replace("sms:", "").replace("mms:", ""); + } + + mThreadId = Utils.getOrCreateThreadId(this, formatPhoneNumber(address)); + } } - MessageListFragment fragment = MessageListFragment.getInstance(mThreadId, mRowId, mHighlight, mShowImmediate); - getFragmentManager() - .beginTransaction() - .replace(R.id.content_frame, fragment) - .commitAllowingStateLoss(); + if (mThreadId != -1) { + Log.v(TAG, "Opening thread: " + mThreadId); + MessageListFragment fragment = MessageListFragment.getInstance(mThreadId, mRowId, mHighlight, mShowImmediate); + getFragmentManager() + .beginTransaction() + .replace(R.id.content_frame, fragment) + .commitAllowingStateLoss(); + } else { + // TODO log crashlytics event and show toast + } + } + + private String formatPhoneNumber(String address) { + address = URLDecoder.decode(address); + address = "" + Html.fromHtml(address); + address = PhoneNumberUtils.formatNumber(address); + return address; } @Override diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index 130a08f0..1be50e4b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -133,7 +133,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa private long mLastMessageId; private BackgroundQueryHandler mBackgroundQueryHandler; - public static final String ARG_THREAD_ID = "threadId"; + public static final String ARG_THREAD_ID = "thread_id"; public static final String ARG_ROW_ID = "rowId"; public static final String ARG_HIGHLIGHT = "highlight"; public static final String ARG_SHOW_IMMEDIATE = "showImmediate"; From 14473537bd0d3fba626c7973ec821c92fb16a9c6 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 9 Apr 2016 01:32:22 -0400 Subject: [PATCH 07/24] Fix launching via various intents --- QKSMS/src/main/AndroidManifest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 3b226063..a34eecd4 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -87,6 +87,8 @@ + + From 9422ec6cbd81a09858dac28388dd391cc7550f61 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 9 Apr 2016 02:28:39 -0400 Subject: [PATCH 08/24] Remove unnecessary method --- .../QKSMS/ui/messagelist/MessageListActivity.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index 0f7c3741..4bb59ac4 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -63,7 +63,10 @@ public class MessageListActivity extends QKSwipeBackActivity { address = data.replace("sms:", "").replace("mms:", ""); } - mThreadId = Utils.getOrCreateThreadId(this, formatPhoneNumber(address)); + address = URLDecoder.decode(address); + address = "" + Html.fromHtml(address); + address = PhoneNumberUtils.formatNumber(address); + mThreadId = Utils.getOrCreateThreadId(this, address); } } @@ -79,13 +82,6 @@ public class MessageListActivity extends QKSwipeBackActivity { } } - private String formatPhoneNumber(String address) { - address = URLDecoder.decode(address); - address = "" + Html.fromHtml(address); - address = PhoneNumberUtils.formatNumber(address); - return address; - } - @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); From 6abbcfc0d20337b67195de1d87a085a76931bc28 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 10 Apr 2016 00:10:34 -0400 Subject: [PATCH 09/24] Use single instance of MessageListActivity --- QKSMS/src/main/AndroidManifest.xml | 3 +- .../ui/messagelist/MessageListActivity.java | 41 ++++++++++--------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index a34eecd4..ef93f972 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -81,7 +81,8 @@ + android:windowSoftInputMode="adjustResize" + android:launchMode="singleTask"> diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index 4bb59ac4..8cfc4deb 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -45,29 +45,32 @@ public class MessageListActivity extends QKSwipeBackActivity { 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); + onNewIntent(getIntent()); + } - if (mThreadId == -1 && intent.getData() != null) { - String data = intent.getData().toString(); - String scheme = intent.getData().getScheme(); + @Override + protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); + 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); - String address = null; - if (scheme.startsWith("smsto") || scheme.startsWith("mmsto")) { - address = data.replace("smsto:", "").replace("mmsto:", ""); - } else if (scheme.startsWith("sms") || (scheme.startsWith("mms"))) { - address = data.replace("sms:", "").replace("mms:", ""); - } + if (mThreadId == -1 && intent.getData() != null) { + String data = intent.getData().toString(); + String scheme = intent.getData().getScheme(); - address = URLDecoder.decode(address); - address = "" + Html.fromHtml(address); - address = PhoneNumberUtils.formatNumber(address); - mThreadId = Utils.getOrCreateThreadId(this, address); + String address = null; + if (scheme.startsWith("smsto") || scheme.startsWith("mmsto")) { + address = data.replace("smsto:", "").replace("mmsto:", ""); + } else if (scheme.startsWith("sms") || (scheme.startsWith("mms"))) { + address = data.replace("sms:", "").replace("mms:", ""); } + + address = URLDecoder.decode(address); + address = "" + Html.fromHtml(address); + address = PhoneNumberUtils.formatNumber(address); + mThreadId = Utils.getOrCreateThreadId(this, address); } if (mThreadId != -1) { From f751ec36cb53bac4f235cba4ca85c253bf7b81d8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 10 Apr 2016 02:13:10 -0400 Subject: [PATCH 10/24] Error handling for conversation that can't be opened --- .../ui/messagelist/MessageListActivity.java | 24 ++++++++++++++++++- QKSMS/src/main/res/values/strings.xml | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index 8cfc4deb..6796acdf 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -8,6 +8,7 @@ import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import com.crashlytics.android.Crashlytics; import com.moez.QKSMS.R; import com.moez.QKSMS.common.DonationManager; import com.moez.QKSMS.mmssms.Utils; @@ -81,7 +82,28 @@ public class MessageListActivity extends QKSwipeBackActivity { .replace(R.id.content_frame, fragment) .commitAllowingStateLoss(); } else { - // TODO log crashlytics event and show toast + String msg = "Couldn't open conversation: {action:"; + msg += intent.getAction(); + msg += ", data:"; + msg += intent.getData() == null ? "null" : intent.getData().toString(); + msg += ", scheme:"; + msg += intent.getData() == null ? "null" : intent.getData().getScheme(); + msg += ", extras:{"; + Object[] keys = intent.getExtras().keySet().toArray(); + for (int i = 0; i < keys.length; i++) { + String key = keys[i].toString(); + msg += keys[i].toString(); + msg += ":"; + msg += intent.getExtras().get(key); + if (i < keys.length - 1) { + msg += ", "; + } + } + msg += "}}"; + Log.d(TAG, msg); + Crashlytics.log(msg); + makeToast(R.string.toast_conversation_error); + finish(); } } diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index 7b085cff..e1f5f123 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -632,6 +632,7 @@ EndlessJabber is not installed, opening Google Play Couldn\'t load the changelog. Please try again later + Couldn\'t open conversation Thank you for donating! You\'re my new best friend. From 70b9d8a3c4a98d321c11bde9dc110f9f5911cf8b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 10 Apr 2016 03:45:51 -0400 Subject: [PATCH 11/24] Migrate settings to separate activity --- QKSMS/src/main/AndroidManifest.xml | 2 + .../java/com/moez/QKSMS/ui/MainActivity.java | 22 +------ .../com/moez/QKSMS/ui/base/QKActivity.java | 29 ++++++++- .../QKSMS/ui/base/QKSwipeBackActivity.java | 19 ++++++ .../ui/messagelist/MessageListActivity.java | 14 +---- .../ui/messagelist/MessageListFragment.java | 2 +- .../QKSMS/ui/settings/SettingsActivity.java | 35 +++++++++++ .../QKSMS/ui/settings/SettingsFragment.java | 62 +++++-------------- 8 files changed, 105 insertions(+), 80 deletions(-) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsActivity.java diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index ef93f972..7a1b44dd 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -98,6 +98,8 @@ + + cls) { + Intent intent = new Intent(this, cls); + startActivity(intent); + } + public boolean isScreenOn() { PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE); if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKSwipeBackActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKSwipeBackActivity.java index 47a67c17..4f814965 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKSwipeBackActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKSwipeBackActivity.java @@ -4,6 +4,7 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.LayoutInflater; +import android.view.MenuItem; import com.moez.QKSMS.R; import com.moez.QKSMS.ui.SwipeBackLayout; @@ -14,6 +15,7 @@ public abstract class QKSwipeBackActivity extends QKActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setContentView(R.layout.activity_fragment); getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); getWindow().getDecorView().setBackgroundDrawable(null); @@ -21,12 +23,29 @@ public abstract class QKSwipeBackActivity extends QKActivity { mSwipeBackLayout.setEdgeTrackingEnabled(SwipeBackLayout.EDGE_LEFT); mSwipeBackLayout.setEnableGesture(true); + + showBackButton(true); } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + onBackPressed(); + return true; + } + + return super.onOptionsItemSelected(item); + } @Override protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); mSwipeBackLayout.attachToActivity(this); } + + @Override + public void onBackPressed() { + mSwipeBackLayout.scrollToFinishActivity(); + } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index 6796acdf..014b6ac3 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -43,9 +43,6 @@ public class MessageListActivity extends QKSwipeBackActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_fragment); - showBackButton(true); - onNewIntent(getIntent()); } @@ -117,20 +114,11 @@ public class MessageListActivity extends QKSwipeBackActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case android.R.id.home: - onBackPressed(); - return true; - case R.id.menu_donate: DonationManager.getInstance(this).showDonateDialog(); return true; } - return false; - } - - @Override - public void onBackPressed() { - mSwipeBackLayout.scrollToFinishActivity(); + return super.onOptionsItemSelected(item); } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index 1be50e4b..d265e5c0 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -143,7 +143,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa private String mHighlight; private boolean mShowImmediate; - public static MessageListFragment getInstance(long threadId, long rowId, String highlight, boolean showImmediate) { + protected static MessageListFragment getInstance(long threadId, long rowId, String highlight, boolean showImmediate) { Bundle args = new Bundle(); args.putLong(ARG_THREAD_ID, threadId); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsActivity.java new file mode 100644 index 00000000..b7458458 --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsActivity.java @@ -0,0 +1,35 @@ +package com.moez.QKSMS.ui.settings; + +import android.app.FragmentManager; +import android.os.Bundle; +import com.moez.QKSMS.R; +import com.moez.QKSMS.ui.base.QKSwipeBackActivity; + +public class SettingsActivity extends QKSwipeBackActivity { + + private SettingsFragment mSettingsFragment; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + FragmentManager fm = getFragmentManager(); + mSettingsFragment = (SettingsFragment) fm.findFragmentById(R.id.content_frame); + if (mSettingsFragment == null) { + mSettingsFragment = SettingsFragment.newInstance(R.xml.settings_main); + } + + fm.beginTransaction() + .replace(R.id.content_frame, mSettingsFragment) + .commit(); + } + + @Override + public void onBackPressed() { + if (getFragmentManager().getBackStackEntryCount() > 0) { + getFragmentManager().popBackStack(); + } else { + super.onBackPressed(); + } + } +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java index ec0b8a83..2c82c0ea 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java @@ -35,17 +35,16 @@ import com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.DonationManager; import com.moez.QKSMS.common.ListviewHelper; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.DateFormatter; import com.moez.QKSMS.common.utils.KeyboardUtils; import com.moez.QKSMS.common.utils.PackageUtils; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.receiver.NightModeAutoReceiver; import com.moez.QKSMS.transaction.EndlessJabber; import com.moez.QKSMS.transaction.NotificationManager; 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.QKActivity; import com.moez.QKSMS.ui.dialog.BlockedNumberDialog; import com.moez.QKSMS.ui.dialog.BubblePreferenceDialog; import com.moez.QKSMS.ui.dialog.QKDialog; @@ -65,7 +64,7 @@ import java.util.Set; import java.util.Stack; public class SettingsFragment extends PreferenceFragment implements Preference.OnPreferenceChangeListener, - Preference.OnPreferenceClickListener, ContentFragment { + Preference.OnPreferenceClickListener { private final String TAG = "PreferenceFragment"; public static final String CATEGORY_APPEARANCE = "pref_key_category_appearance"; @@ -163,7 +162,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O public static final String GITHUB_URL = "https://github.com/qklabs/qksms"; public static final String CROWDIN_URL = "https://crowdin.com/project/qksms"; - private MainActivity mContext; + private QKActivity mContext; private PreferenceManager mPreferenceManager; private SharedPreferences mPrefs; private Resources mRes; @@ -186,7 +185,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O private int mResource; - public static SettingsFragment newInstance(int category) { + protected static SettingsFragment newInstance(int category) { SettingsFragment fragment = new SettingsFragment(); Bundle args = new Bundle(); @@ -200,11 +199,14 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Bundle args = getArguments(); + setHasOptionsMenu(true); - mContext = (MainActivity) getActivity(); + mContext = (QKActivity) getActivity(); mPrefs = mContext.getPrefs(); mRes = mContext.getResources(); + mContext.setTitle(R.string.title_settings); + mResource = args.getInt("category", R.xml.settings); addPreferencesFromResource(mResource); @@ -333,6 +335,12 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O } } + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + inflater.inflate(R.menu.settings, menu); + super.onCreateOptionsMenu(menu, inflater); + } + /** * Removed top level preferences from the layout */ @@ -431,9 +439,6 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O case NIGHT_START: updateAlarmManager(mContext, true); break; - case SLIDING_TAB: - mContext.setSlidingTabEnabled((Boolean) newValue); - break; case YAPPY: if ((Boolean) newValue) { try { @@ -520,6 +525,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O Fragment fragment = SettingsFragment.newInstance(resId); getFragmentManager() .beginTransaction() + .addToBackStack(null) .replace(R.id.content_frame, fragment, CATEGORY_TAG) .commit(); } @@ -704,40 +710,4 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O alarmManager.cancel(nightIntent); } } - - @Override - public void onContentOpening() { - - } - - @Override - public void onContentOpened() { - - } - - @Override - public void onContentClosing() { - - } - - @Override - public void onContentClosed() { - - } - - @Override - public void onMenuChanging(float percentOpen) { - - } - - @Override - public void inflateToolbar(Menu menu, MenuInflater inflater, Context context) { - if (mContext == null) { - mContext = (MainActivity) context; - mPrefs = mContext.getPrefs(); - } - - inflater.inflate(R.menu.settings, menu); - mContext.setTitle(R.string.title_settings); - } } From 31e4b92aa0a0939cc24cdbf097d48e7e4cb5eedf Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 10 Apr 2016 14:04:57 -0400 Subject: [PATCH 12/24] Moved search to new activity --- QKSMS/src/main/AndroidManifest.xml | 1 + .../java/com/moez/QKSMS/ui/MainActivity.java | 4 +- .../moez/QKSMS/ui/search/SearchActivity.java | 35 +++++++++ .../moez/QKSMS/ui/search/SearchFragment.java | 75 +++++++------------ 4 files changed, 63 insertions(+), 52 deletions(-) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/search/SearchActivity.java diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 7a1b44dd..5671656b 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -99,6 +99,7 @@ + { +public class SearchFragment extends QKFragment implements RecyclerCursorAdapter.ItemClickListener { private AsyncQueryHandler mQueryHandler; // Track which TextView's show which Contact objects so that we can update @@ -47,6 +43,10 @@ public class SearchFragment extends QKContentFragment implements RecyclerCursorA private SearchAdapter mAdapter; private Pattern mPattern; + public SearchFragment() { + + } + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -68,27 +68,21 @@ public class SearchFragment extends QKContentFragment implements RecyclerCursorA View view = inflater.inflate(R.layout.fragment_search, container, false); mQuery = (QKEditText) view.findViewById(R.id.search_query); - mQuery.setTextChangedListener(new QKEditText.TextChangedListener() { - @Override - public void onTextChanged(CharSequence s) { - mSearchString = s.toString(); - query(); - } + mQuery.setTextChangedListener(s -> { + mSearchString = s.toString(); + query(); }); - mQuery.setOnEditorActionListener(new QKTextView.OnEditorActionListener() { - @Override - public boolean onEditorAction(android.widget.TextView v, int actionId, KeyEvent event) { - if (actionId == EditorInfo.IME_ACTION_SEARCH) { - mSearchString = mQuery.getText().toString(); - query(); + mQuery.setOnEditorActionListener((v, actionId, event) -> { + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + mSearchString = mQuery.getText().toString(); + query(); - // Hide the keyboard when the user makes a query - mQuery.clearFocus(); - KeyboardUtils.hide(mContext, mQuery); - return true; - } - return false; + // Hide the keyboard when the user makes a query + mQuery.clearFocus(); + KeyboardUtils.hide(mContext, mQuery); + return true; } + return false; }); mLayoutManager = new LinearLayoutManager(mContext); @@ -100,6 +94,7 @@ public class SearchFragment extends QKContentFragment implements RecyclerCursorA mRecyclerView.setLayoutManager(mLayoutManager); mRecyclerView.setAdapter(mAdapter); + new Handler().postDelayed(() -> KeyboardUtils.showAndFocus(mContext, mQuery), 50); return view; } @@ -114,12 +109,10 @@ public class SearchFragment extends QKContentFragment implements RecyclerCursorA } - Contact.UpdateListener mContactListener = new Contact.UpdateListener() { - public void onUpdate(Contact updated) { - QKTextView tv = mContactMap.get(updated); - if (tv != null) { - tv.setText(updated.getNameAndNumber()); - } + Contact.UpdateListener mContactListener = updated -> { + QKTextView tv = mContactMap.get(updated); + if (tv != null) { + tv.setText(updated.getNameAndNumber()); } }; @@ -129,28 +122,10 @@ public class SearchFragment extends QKContentFragment implements RecyclerCursorA Contact.removeListener(mContactListener); } - @Override - public void onContentOpened() { - // Show the keyboard and focus on the query text when the fragment is opened. - KeyboardUtils.showAndFocus(mContext, mQuery); - } - - @Override - public void onMenuChanging(float percentOpen) { - - } - - @Override - public void inflateToolbar(Menu menu, MenuInflater inflater, Context context) { - inflater.inflate(R.menu.search, menu); - ((QKActivity) context).setTitle(R.string.title_search); - - super.onCreateOptionsMenu(menu, inflater); - } - @Override public void onItemClick(SearchData data, View view) { MessageListActivity.launch(mContext, data.threadId, data.rowId, mSearchString, true); + mContext.finish(); } @Override From 154dfc1e9c2237da5c335aef157b04ada7c2f56d Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 16 Apr 2016 17:50:43 -0400 Subject: [PATCH 13/24] Move ComposeFragment to new activity --- QKSMS/src/main/AndroidManifest.xml | 15 +- .../java/com/moez/QKSMS/ui/MainActivity.java | 9 -- .../QKSMS/ui/compose/ComposeActivity.java | 35 +++++ .../QKSMS/ui/compose/ComposeFragment.java | 137 +----------------- .../ConversationListFragment.java | 16 +- 5 files changed, 54 insertions(+), 158 deletions(-) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeActivity.java 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(); From 566d405942f847868cfa1331beef719cbe9d1e03 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 16 Apr 2016 19:08:56 -0400 Subject: [PATCH 14/24] Remove slidingmenu --- .../com/moez/QKSMS/common/DialogHelper.java | 7 +- .../com/moez/QKSMS/enums/QKPreference.java | 1 - .../java/com/moez/QKSMS/ui/MainActivity.java | 146 +-- .../QKSMS/ui/compose/ComposeFragment.java | 5 +- .../ui/messagelist/MessageListFragment.java | 6 +- .../QKSMS/ui/settings/SettingsFragment.java | 1 - .../ui/view/slidingmenu/CustomViewAbove.java | 866 ------------------ .../ui/view/slidingmenu/CustomViewBehind.java | 162 ---- .../ui/view/slidingmenu/SlidingMenu.java | 300 ------ .../src/main/res/layout/activity_fragment.xml | 3 +- QKSMS/src/main/res/layout/activity_main.xml | 27 - QKSMS/src/main/res/values/strings.xml | 2 - QKSMS/src/main/res/xml/settings.xml | 3 - .../src/main/res/xml/settings_appearance.xml | 7 - 14 files changed, 20 insertions(+), 1516 deletions(-) delete mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/CustomViewAbove.java delete mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/CustomViewBehind.java delete mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/SlidingMenu.java delete mode 100644 QKSMS/src/main/res/layout/activity_main.xml diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java index 4a7e4a00..9f1baa39 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java @@ -12,6 +12,7 @@ import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.dialog.DefaultSmsHelper; import com.moez.QKSMS.ui.dialog.QKDialog; +import com.moez.QKSMS.ui.messagelist.MessageListActivity; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -30,7 +31,7 @@ public class DialogHelper { showDeleteConversationsDialog(context, threadIds); } - public static void showDeleteConversationsDialog(final MainActivity context, final Set threadIds) { + public static void showDeleteConversationsDialog(final QKActivity context, final Set threadIds) { new DefaultSmsHelper(context, R.string.not_default_delete).showIfNotDefault(null); Set threads = new HashSet<>(threadIds); // Make a copy so the list isn't reset when multi-select is disabled @@ -43,7 +44,9 @@ public class DialogHelper { Conversation.ConversationQueryHandler handler = new Conversation.ConversationQueryHandler(context.getContentResolver()); Conversation.startDelete(handler, 0, false, threads); Conversation.asyncDeleteObsoleteThreads(handler, 0); - context.showMenu(); + if (context instanceof MessageListActivity) { + context.onBackPressed(); + } }) .setNegativeButton(R.string.cancel, null) .show(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java index f09950ca..747684ed 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java @@ -32,7 +32,6 @@ public enum QKPreference { AVATAR_RECEIVED("pref_key_avatar_received", true), MESSAGE_COUNT("pref_key_message_count", false), - SLIDING_TAB("pref_key_sliding_tab", false), TIMESTAMPS_24H("pref_key_24h", false), // General diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java index f6c68b6e..98f297b3 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -15,7 +15,6 @@ import android.os.Bundle; import android.provider.ContactsContract; import android.support.v4.content.ContextCompat; import android.text.TextUtils; -import android.util.Log; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuInflater; @@ -32,9 +31,7 @@ import com.moez.QKSMS.common.DonationManager; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.QKRateSnack; import com.moez.QKSMS.common.google.DraftCache; -import com.moez.QKSMS.common.utils.KeyboardUtils; import com.moez.QKSMS.common.utils.MessageUtils; -import com.moez.QKSMS.common.utils.Units; import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.receiver.IconColorReceiver; @@ -50,7 +47,6 @@ import com.moez.QKSMS.ui.messagelist.MessageListFragment; import com.moez.QKSMS.ui.popup.QKReplyActivity; import com.moez.QKSMS.ui.search.SearchActivity; import com.moez.QKSMS.ui.settings.SettingsFragment; -import com.moez.QKSMS.ui.view.slidingmenu.SlidingMenu; import com.moez.QKSMS.ui.welcome.WelcomeActivity; import org.ligi.snackengage.SnackEngage; import org.ligi.snackengage.snacks.BaseSnack; @@ -58,7 +54,7 @@ import org.ligi.snackengage.snacks.BaseSnack; import java.util.Collection; -public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuListener { +public class MainActivity extends QKActivity { private final String TAG = "MainActivity"; public final static String EXTRA_THREAD_ID = "thread_id"; @@ -74,7 +70,6 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL public static final String MMS_SETUP_DONT_ASK_AGAIN = "mmsSetupDontAskAgain"; @Bind(R.id.root) View mRoot; - @Bind(R.id.sliding_menu) SlidingMenu mSlidingMenu; private ConversationListFragment mConversationList; private ContentFragment mContent; @@ -92,25 +87,18 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL super.onCreate(savedInstanceState); launchWelcomeActivity(); - setContentView(R.layout.activity_main); + setContentView(R.layout.activity_fragment); setTitle(R.string.title_conversation_list); ButterKnife.bind(this); - setSlidingTabEnabled(mPrefs.getBoolean(SettingsFragment.SLIDING_TAB, false)); - mSlidingMenu.setListener(this); - mSlidingMenu.setContent(); - mSlidingMenu.setMenu(); - mSlidingMenu.showContent(false); - mSlidingMenu.showMenu(false); - FragmentManager fm = getFragmentManager(); - mConversationList = (ConversationListFragment) fm.findFragmentById(R.id.menu_frame); + mConversationList = (ConversationListFragment) fm.findFragmentById(R.id.content_frame); if (mConversationList == null) { mConversationList = new ConversationListFragment(); } FragmentTransaction menuTransaction = fm.beginTransaction(); - menuTransaction.replace(R.id.menu_frame, mConversationList); + menuTransaction.replace(R.id.content_frame, mConversationList); menuTransaction.commit(); onNewIntent(getIntent()); @@ -178,39 +166,13 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL startActivityForResult(welcomeIntent, WelcomeActivity.WELCOME_REQUEST_CODE); } - public void showMenu() { - mSlidingMenu.showMenu(); - } - - public SlidingMenu getSlidingMenu() { - return mSlidingMenu; - } - - /** - * Configured the sliding menu view to peek the content or not. - * - * @param slidingTabEnabled true to peek the content - */ - public void setSlidingTabEnabled(boolean slidingTabEnabled) { - if (slidingTabEnabled) { - mSlidingMenu.setBehindOffset(Units.dpToPx(this, 48)); - } else { - mSlidingMenu.setBehindOffset(0); - } - } - @Override public boolean onPrepareOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); menu.clear(); - if (mSlidingMenu.isMenuShowing() || mContent == null) { - showBackButton(false); - mConversationList.inflateToolbar(menu, inflater, this); - } else { - showBackButton(true); - mContent.inflateToolbar(menu, inflater, this); - } + showBackButton(false); + mConversationList.inflateToolbar(menu, inflater, this); return super.onPrepareOptionsMenu(menu); } @@ -283,15 +245,10 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL @Override public boolean onKeyUp(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { - if (!mSlidingMenu.isMenuShowing()) { - mSlidingMenu.showMenu(); - return true; + if (mConversationList.isShowingBlocked()) { + mConversationList.setShowingBlocked(false); } else { - if (mConversationList.isShowingBlocked()) { - mConversationList.setShowingBlocked(false); - } else { - finish(); - } + finish(); } } @@ -302,9 +259,6 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL protected void onPause() { super.onPause(); sThreadShowing = 0; - if (!mSlidingMenu.isMenuShowing()) { - mContent.onContentClosed(); - } } @Override @@ -324,10 +278,6 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL protected void onResume() { super.onResume(); - if (!mSlidingMenu.isMenuShowing()) { - mContent.onContentOpened(); - } - if (mContent != null && mContent instanceof MessageListFragment) { sThreadShowing = ((MessageListFragment) mContent).getThreadId(); QKReplyActivity.dismiss(sThreadShowing); @@ -373,84 +323,6 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL } } - public void switchContent(ContentFragment fragment, boolean animate) { - // Make sure that the activity isn't destroyed before making fragment transactions. - if (fragment != null && !mIsDestroyed) { - KeyboardUtils.hide(this); - - mContent = fragment; - FragmentManager m = getFragmentManager(); - - // Only do a replace if it is a different fragment. - if (fragment != m.findFragmentById(R.id.content_frame)) { - getFragmentManager() - .beginTransaction() - .replace(R.id.content_frame, (Fragment) fragment) - .commitAllowingStateLoss(); - } - - mSlidingMenu.showContent(animate); - invalidateOptionsMenu(); - - } else { - Log.w(TAG, "Null fragment, can't switch content"); - } - } - - @Override - public void onOpen() { - invalidateOptionsMenu(); - sThreadShowing = 0; - - // Notify the content that it is being closed, since the menu (i.e. conversation list) is being opened. - if (mContent != null) mContent.onContentClosing(); - - // Hide the soft keyboard - KeyboardUtils.hide(this, getCurrentFocus()); - - showBackButton(false); - } - - @Override - public void onClose() { - invalidateOptionsMenu(); - - // Notify the content that it is being opened, since the menu (i.e. conversation list) is being closed. - if (mContent != null) { - mContent.onContentOpening(); - } - - if (mContent != null && mContent instanceof MessageListFragment) { - sThreadShowing = ((MessageListFragment) mContent).getThreadId(); - } else { - sThreadShowing = 0; - } - - // Hide the soft keyboard - KeyboardUtils.hide(this, getCurrentFocus()); - - showBackButton(true); - } - - @Override - public void onOpened() { - // When the menu (i.e. the conversation list) has been opened, the content has been opened. - // So notify the content fragment. - if (mContent != null) mContent.onContentClosed(); - } - - @Override - public void onClosed() { - // When the menu (i.e. the conversation list) has been closed, the content has been opened. - // So notify the content fragment. - if (mContent != null && ((Fragment) mContent).isAdded()) mContent.onContentOpened(); - } - - @Override - public void onChanging(float percentOpen) { - if (mContent != null) mContent.onMenuChanging(percentOpen); - } - /** * Build and show the proper delete thread dialog. The UI is slightly different * depending on whether there are locked messages in the thread(s) and whether we're diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java index 90ef1a47..b19f3c8d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/compose/ComposeFragment.java @@ -13,7 +13,6 @@ import com.moez.QKSMS.common.utils.PhoneNumberUtils; import com.moez.QKSMS.interfaces.ActivityLauncher; import com.moez.QKSMS.interfaces.RecipientProvider; import com.moez.QKSMS.mmssms.Utils; -import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.base.QKFragment; import com.moez.QKSMS.ui.messagelist.MessageListActivity; import com.moez.QKSMS.ui.view.AutoCompleteContactView; @@ -59,10 +58,10 @@ public class ComposeFragment extends QKFragment implements ActivityLauncher, Rec @Override public void onSend(String[] recipients, String body) { long threadId = Utils.getOrCreateThreadId(mContext, recipients[0]); - if (recipients.length == 1) { + if (threadId != 0) { MessageListActivity.launch(mContext, threadId, -1, null, true); } else { - ((MainActivity) mContext).showMenu(); + mContext.onBackPressed(); } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index d265e5c0..b8964a72 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -964,9 +964,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa conv.clearThreadId(); conv.setDraftState(false); } - // The last message in this converation was just deleted. Send the user - // to the conversation list. - ((MainActivity) mContext).showMenu(); + mContext.onBackPressed(); } cursor.close(); } @@ -1009,7 +1007,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa Conversation.init(mContext); // Go back to the conversation list - ((MainActivity) mContext).showMenu(); + mContext.onBackPressed(); } else if (token == DELETE_MESSAGE_TOKEN) { // Check to see if we just deleted the last message startMsgListQuery(MESSAGE_LIST_QUERY_AFTER_DELETE_TOKEN); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java index 2c82c0ea..b23f1269 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java @@ -99,7 +99,6 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O public static final String FONT_SIZE = "pref_key_font_size"; public static final String FONT_WEIGHT = "pref_key_font_weight"; public static final String MESSAGE_COUNT = "pref_key_message_count"; - public static final String SLIDING_TAB = "pref_key_sliding_tab"; public static final String PROXIMITY_CALLING = "pref_key_prox_sensor_calling"; public static final String DELIVERY_REPORTS = "pref_key_delivery"; public static final String DELIVERY_TOAST = "pref_key_delivery_toast"; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/CustomViewAbove.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/CustomViewAbove.java deleted file mode 100644 index bec8be98..00000000 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/CustomViewAbove.java +++ /dev/null @@ -1,866 +0,0 @@ -package com.moez.QKSMS.ui.view.slidingmenu; - -import android.content.Context; -import android.graphics.Canvas; -import android.support.v4.view.KeyEventCompat; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.VelocityTrackerCompat; -import android.support.v4.view.ViewConfigurationCompat; -import android.util.AttributeSet; -import android.util.FloatMath; -import android.util.Log; -import android.view.FocusFinder; -import android.view.KeyEvent; -import android.view.MotionEvent; -import android.view.SoundEffectConstants; -import android.view.VelocityTracker; -import android.view.View; -import android.view.ViewConfiguration; -import android.view.ViewGroup; -import android.view.animation.Interpolator; -import android.widget.Scroller; - -public class CustomViewAbove extends ViewGroup { - - private static final String TAG = "CustomViewAbove"; - private static final boolean DEBUG = false; - - private static final boolean USE_CACHE = false; - - private static final int MAX_SETTLE_DURATION = 350; // ms - private static final int MIN_DISTANCE_FOR_FLING = 25; // dips - - private static final Interpolator sInterpolator = t -> (float) Math.pow(0.63 * t - 1.0f, 5) + 1.0f; - - private View mContent; - - private int mCurItem; - private Scroller mScroller; - - private boolean mScrollingCacheEnabled; - - private boolean mScrolling; - - private boolean mIsBeingDragged; - private boolean mIsUnableToDrag; - private int mTouchSlop; - private float mInitialMotionX; - /** - * Position of the last motion event. - */ - private float mLastMotionX; - private float mLastMotionY; - /** - * ID of the active pointer. This is used to retain consistency during - * drags/flings if multiple pointers are used. - */ - protected int mActivePointerId = INVALID_POINTER; - /** - * Sentinel value for no current active pointer. - * Used by {@link #mActivePointerId}. - */ - private static final int INVALID_POINTER = -1; - - /** - * Determines speed during touch scrolling - */ - protected VelocityTracker mVelocityTracker; - private int mMinimumVelocity; - protected int mMaximumVelocity; - private int mFlingDistance; - - private CustomViewBehind mViewBehind; - - private OnPageChangeListener mOnPageChangeListener; - private OnPageChangeListener mInternalPageChangeListener; - - private SlidingMenu.SlidingMenuListener mListener; - - /** - * Callback interface for responding to changing state of the selected page. - */ - public interface OnPageChangeListener { - - /** - * This method will be invoked when the current page is scrolled, either as part - * of a programmatically initiated smooth scroll or a user initiated touch scroll. - * - * @param position Position index of the first page currently being displayed. - * Page position+1 will be visible if positionOffset is nonzero. - * @param positionOffset Value from [0, 1) indicating the offset from the page at position. - * @param positionOffsetPixels Value in pixels indicating the offset from position. - */ - void onPageScrolled(int position, float positionOffset, int positionOffsetPixels); - - /** - * This method will be invoked when a new page becomes selected. Animation is not - * necessarily complete. - * - * @param position Position index of the new selected page. - */ - void onPageSelected(int position, boolean anim); - - } - - /** - * Simple implementation of the {@link OnPageChangeListener} interface with stub - * implementations of each method. Extend this if you do not intend to override - * every method of {@link OnPageChangeListener}. - */ - public static class SimpleOnPageChangeListener implements OnPageChangeListener { - - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - // This space for rent - } - - public void onPageSelected(int position, boolean anim) { - // This space for rent - } - - } - - public CustomViewAbove(Context context) { - this(context, null); - } - - public CustomViewAbove(Context context, AttributeSet attrs) { - super(context, attrs); - initCustomViewAbove(); - } - - void initCustomViewAbove() { - setWillNotDraw(false); - setDescendantFocusability(FOCUS_AFTER_DESCENDANTS); - setFocusable(true); - final Context context = getContext(); - mScroller = new Scroller(context, sInterpolator); - final ViewConfiguration configuration = ViewConfiguration.get(context); - mTouchSlop = ViewConfigurationCompat.getScaledPagingTouchSlop(configuration); - mMinimumVelocity = configuration.getScaledMinimumFlingVelocity(); - mMaximumVelocity = configuration.getScaledMaximumFlingVelocity(); - setInternalPageChangeListener(new SimpleOnPageChangeListener() { - public void onPageSelected(int position, boolean anim) { - if (mViewBehind != null) { - switch (position) { - case 0: - case 2: - mViewBehind.setChildrenEnabled(true); - break; - case 1: - mViewBehind.setChildrenEnabled(false); - break; - } - } - } - }); - - final float density = context.getResources().getDisplayMetrics().density; - mFlingDistance = (int) (MIN_DISTANCE_FOR_FLING * density); - } - - /** - * Set the currently selected page. If the CustomViewPager has already been through its first - * layout there will be a smooth animated transition between the current item and the - * specified item. - * - * @param item Item index to select - */ - public void setCurrentItem(int item) { - setCurrentItem(item, true); - } - - /** - * Set the currently selected page. - * - * @param item Item index to select - * @param smoothScroll True to smoothly scroll to the new item, false to transition immediately - */ - public void setCurrentItem(int item, boolean smoothScroll) { - setCurrentItem(item, smoothScroll, false); - } - - /** - * Set the currently selected page. - * - * @param item Item index to select - * @param smoothScroll True to smoothly scroll to the new item, false to transition immediately - * @param notify True if the open and close listeners should be notified. - */ - public void setCurrentItem(int item, boolean smoothScroll, boolean notify) { - setCurrentItemInternal(item, smoothScroll, false, 0, notify); - } - - public int getCurrentItem() { - return mCurItem; - } - - void setCurrentItemInternal(int item, boolean smoothScroll, boolean always) { - setCurrentItemInternal(item, smoothScroll, always, 0); - } - - void setCurrentItemInternal(int item, boolean smoothScroll, boolean always, int velocity) { - setCurrentItemInternal(item, smoothScroll, always, velocity, false); - } - - void setCurrentItemInternal(int item, boolean smoothScroll, boolean always, int velocity, boolean notify) { - if (!always && mCurItem == item) { - setScrollingCacheEnabled(false); - - if (notify) { - // Notify the listeners here, because the client has switched content. - if (isMenuOpen()) { - if (mListener != null) - mListener.onOpened(); - } else { - if (mListener != null) - mListener.onClosed(); - } - } - - return; - } - - item = mViewBehind.getMenuPage(item); - - final boolean dispatchSelected = mCurItem != item; - mCurItem = item; - final int destX = getDestScrollX(mCurItem); - if (dispatchSelected && mOnPageChangeListener != null) { - mOnPageChangeListener.onPageSelected(item, smoothScroll); - } - if (dispatchSelected && mInternalPageChangeListener != null) { - mInternalPageChangeListener.onPageSelected(item, smoothScroll); - } - if (smoothScroll) { - smoothScrollTo(destX, 0, velocity); - } else { - completeScroll(); - scrollTo(destX, 0); - } - } - - /** - * Set a listener that will be invoked whenever the page changes or is incrementally - * scrolled. See {@link OnPageChangeListener}. - * - * @param listener Listener to set - */ - public void setOnPageChangeListener(OnPageChangeListener listener) { - mOnPageChangeListener = listener; - } - - public void setListener(SlidingMenu.SlidingMenuListener listener) { - mListener = listener; - } - - /** - * Set a separate OnPageChangeListener for internal use by the support library. - * - * @param listener Listener to set - * @return The old listener that was set, if any. - */ - OnPageChangeListener setInternalPageChangeListener(OnPageChangeListener listener) { - OnPageChangeListener oldListener = mInternalPageChangeListener; - mInternalPageChangeListener = listener; - return oldListener; - } - - // We want the duration of the page snap animation to be influenced by the distance that - // the screen has to travel, however, we don't want this duration to be effected in a - // purely linear fashion. Instead, we use this method to moderate the effect that the distance - // of travel has on the overall snap duration. - float distanceInfluenceForSnapDuration(float f) { - f -= 0.5f; // center the values about 0. - f *= 0.3f * Math.PI / 2.0f; - return FloatMath.sin(f); - } - - public int getDestScrollX(int page) { - switch (page) { - case 0: - case 2: - return mViewBehind.getMenuLeft(mContent, page); - case 1: - return mContent.getLeft(); - } - return 0; - } - - private int getLeftBound() { - return mViewBehind.getAbsLeftBound(mContent); - } - - private int getRightBound() { - return mViewBehind.getAbsRightBound(mContent); - } - - public boolean isMenuOpen() { - return mCurItem == 0 || mCurItem == 2; - } - - public int getBehindWidth() { - if (mViewBehind == null) { - return 0; - } else { - return mViewBehind.getBehindWidth(); - } - } - - /** - * Like {@link View#scrollBy}, but scroll smoothly instead of immediately. - * - * @param x the number of pixels to scroll by on the X axis - * @param y the number of pixels to scroll by on the Y axis - * @param velocity the velocity associated with a fling, if applicable. (0 otherwise) - */ - void smoothScrollTo(int x, int y, int velocity) { - if (getChildCount() == 0) { - // Nothing to do. - setScrollingCacheEnabled(false); - return; - } - int sx = getScrollX(); - int sy = getScrollY(); - int dx = x - sx; - int dy = y - sy; - if (dx == 0 && dy == 0) { - completeScroll(); - if (isMenuOpen()) { - if (mListener != null) - mListener.onOpened(); - } else { - if (mListener != null) - mListener.onClosed(); - } - return; - } - - setScrollingCacheEnabled(true); - mScrolling = true; - - final int width = getBehindWidth(); - final int halfWidth = width / 2; - final float distanceRatio = Math.min(1f, 1.0f * Math.abs(dx) / width); - final float distance = halfWidth + halfWidth * - distanceInfluenceForSnapDuration(distanceRatio); - - int duration = 0; - velocity = Math.abs(velocity); - if (velocity > 0) { - duration = 4 * Math.round(1000 * Math.abs(distance / velocity)); - } else { - duration = MAX_SETTLE_DURATION; - } - duration = Math.min(duration, MAX_SETTLE_DURATION); - - mScroller.startScroll(sx, sy, dx, dy, duration); - invalidate(); - } - - public void setContent(View v) { - if (mContent != null) - this.removeView(mContent); - mContent = v; - addView(mContent); - } - - public View getContent() { - return mContent; - } - - public void setCustomViewBehind(CustomViewBehind cvb) { - mViewBehind = cvb; - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - - int width = getDefaultSize(0, widthMeasureSpec); - int height = getDefaultSize(0, heightMeasureSpec); - setMeasuredDimension(width, height); - - final int contentWidth = getChildMeasureSpec(widthMeasureSpec, 0, width); - final int contentHeight = getChildMeasureSpec(heightMeasureSpec, 0, height); - mContent.measure(contentWidth, contentHeight); - } - - @Override - protected void onSizeChanged(int w, int h, int oldw, int oldh) { - super.onSizeChanged(w, h, oldw, oldh); - // Make sure scroll position is set correctly. - if (w != oldw) { - // [ChrisJ] - This fixes the onConfiguration change for orientation issue.. - // maybe worth having a look why the recomputeScroll pos is screwing up? - completeScroll(); - scrollTo(getDestScrollX(mCurItem), getScrollY()); - } - } - - @Override - protected void onLayout(boolean changed, int l, int t, int r, int b) { - final int width = r - l; - final int height = b - t; - mContent.layout(0, 0, width, height); - } - - - @Override - public void computeScroll() { - if (!mScroller.isFinished()) { - if (mScroller.computeScrollOffset()) { - int oldX = getScrollX(); - int oldY = getScrollY(); - int x = mScroller.getCurrX(); - int y = mScroller.getCurrY(); - - if (oldX != x || oldY != y) { - scrollTo(x, y); - pageScrolled(x); - } - - // Keep on drawing until the animation has finished. - invalidate(); - return; - } - } - - // Done with scroll, clean up state. - completeScroll(); - } - - private void pageScrolled(int xpos) { - final int widthWithMargin = getWidth(); - final int position = xpos / widthWithMargin; - final int offsetPixels = xpos % widthWithMargin; - final float offset = (float) offsetPixels / widthWithMargin; - - onPageScrolled(position, offset, offsetPixels); - } - - /** - * This method will be invoked when the current page is scrolled, either as part - * of a programmatically initiated smooth scroll or a user initiated touch scroll. - * If you override this method you must call through to the superclass implementation - * (e.g. super.onPageScrolled(position, offset, offsetPixels)) before onPageScrolled - * returns. - * - * @param position Position index of the first page currently being displayed. - * Page position+1 will be visible if positionOffset is nonzero. - * @param offset Value from [0, 1) indicating the offset from the page at position. - * @param offsetPixels Value in pixels indicating the offset from position. - */ - protected void onPageScrolled(int position, float offset, int offsetPixels) { - if (mOnPageChangeListener != null) { - mOnPageChangeListener.onPageScrolled(position, offset, offsetPixels); - } - if (mInternalPageChangeListener != null) { - mInternalPageChangeListener.onPageScrolled(position, offset, offsetPixels); - } - } - - private void completeScroll() { - boolean needPopulate = mScrolling; - if (needPopulate) { - // Done with scroll, no longer want to cache view drawing. - setScrollingCacheEnabled(false); - mScroller.abortAnimation(); - int oldX = getScrollX(); - int oldY = getScrollY(); - int x = mScroller.getCurrX(); - int y = mScroller.getCurrY(); - if (oldX != x || oldY != y) { - scrollTo(x, y); - } - if (isMenuOpen()) { - if (mListener != null) - mListener.onOpened(); - } else { - if (mListener != null) - mListener.onClosed(); - } - } - mScrolling = false; - } - - private boolean thisTouchAllowed(MotionEvent ev) { - return !isMenuOpen(); - } - - private boolean thisSlideAllowed(float dx) { - boolean allowed; - if (isMenuOpen()) { - allowed = mViewBehind.menuOpenSlideAllowed(dx); - } else { - allowed = mViewBehind.menuClosedSlideAllowed(dx); - } - if (DEBUG) - Log.v(TAG, "this slide allowed " + allowed + " dx: " + dx); - return allowed; - } - - private int getPointerIndex(MotionEvent ev, int id) { - int activePointerIndex = MotionEventCompat.findPointerIndex(ev, id); - if (activePointerIndex == -1) - mActivePointerId = INVALID_POINTER; - return activePointerIndex; - } - - /** - * True if the user has tapped DOWN, and so tapping UP means that the drawer should open. - */ - private boolean mQuickReturn = false; - - @Override - public boolean onInterceptTouchEvent(MotionEvent ev) { - - final int action = ev.getAction() & MotionEventCompat.ACTION_MASK; - - if (DEBUG) - if (action == MotionEvent.ACTION_DOWN) - Log.v(TAG, "Received ACTION_DOWN"); - - if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP - || (action != MotionEvent.ACTION_DOWN && mIsUnableToDrag)) { - endDrag(); - return false; - } - - switch (action) { - case MotionEvent.ACTION_MOVE: - determineDrag(ev); - break; - case MotionEvent.ACTION_DOWN: - int index = MotionEventCompat.getActionIndex(ev); - mActivePointerId = MotionEventCompat.getPointerId(ev, index); - if (mActivePointerId == INVALID_POINTER) - break; - mLastMotionX = mInitialMotionX = MotionEventCompat.getX(ev, index); - mLastMotionY = MotionEventCompat.getY(ev, index); - if (thisTouchAllowed(ev)) { - mIsBeingDragged = false; - mIsUnableToDrag = false; - if (isMenuOpen() && mViewBehind.menuTouchInQuickReturn(mContent, ev.getX() + mScrollX)) { - mQuickReturn = true; - } - } else { - mIsUnableToDrag = true; - } - break; - case MotionEventCompat.ACTION_POINTER_UP: - onSecondaryPointerUp(ev); - break; - } - - if (!mIsBeingDragged) { - if (mVelocityTracker == null) { - mVelocityTracker = VelocityTracker.obtain(); - } - mVelocityTracker.addMovement(ev); - } - return mIsBeingDragged || mQuickReturn; - } - - - @Override - public boolean onTouchEvent(MotionEvent ev) { - - if (!mIsBeingDragged && !thisTouchAllowed(ev)) - return false; - - final int action = ev.getAction(); - - if (mVelocityTracker == null) { - mVelocityTracker = VelocityTracker.obtain(); - } - mVelocityTracker.addMovement(ev); - - switch (action & MotionEventCompat.ACTION_MASK) { - case MotionEvent.ACTION_DOWN: - /* - * If being flinged and user touches, stop the fling. isFinished - * will be false if being flinged. - */ - completeScroll(); - - // Remember where the motion event started - int index = MotionEventCompat.getActionIndex(ev); - mActivePointerId = MotionEventCompat.getPointerId(ev, index); - mLastMotionX = mInitialMotionX = ev.getX(); - break; - case MotionEvent.ACTION_MOVE: - if (!mIsBeingDragged) { - determineDrag(ev); - if (mIsUnableToDrag) - return false; - } - if (mIsBeingDragged) { - // Scroll to follow the motion event - final int activePointerIndex = getPointerIndex(ev, mActivePointerId); - if (mActivePointerId == INVALID_POINTER) - break; - final float x = MotionEventCompat.getX(ev, activePointerIndex); - final float deltaX = mLastMotionX - x; - mLastMotionX = x; - float oldScrollX = getScrollX(); - float scrollX = oldScrollX + deltaX; - final float leftBound = getLeftBound(); - final float rightBound = getRightBound(); - if (scrollX < leftBound) { - scrollX = leftBound; - } else if (scrollX > rightBound) { - scrollX = rightBound; - } - // Don't lose the rounded component - mLastMotionX += scrollX - (int) scrollX; - scrollTo((int) scrollX, getScrollY()); - pageScrolled((int) scrollX); - } - break; - case MotionEvent.ACTION_UP: - if (mIsBeingDragged) { - final VelocityTracker velocityTracker = mVelocityTracker; - velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity); - int initialVelocity = (int) VelocityTrackerCompat.getXVelocity( - velocityTracker, mActivePointerId); - final int scrollX = getScrollX(); - final float pageOffset = (float) (scrollX - getDestScrollX(mCurItem)) / getBehindWidth(); - final int activePointerIndex = getPointerIndex(ev, mActivePointerId); - if (mActivePointerId != INVALID_POINTER) { - final float x = MotionEventCompat.getX(ev, activePointerIndex); - final int totalDelta = (int) (x - mInitialMotionX); - int nextPage = determineTargetPage(pageOffset, initialVelocity, totalDelta); - setCurrentItemInternal(nextPage, true, true, initialVelocity); - } else { - setCurrentItemInternal(mCurItem, true, true, initialVelocity); - } - mActivePointerId = INVALID_POINTER; - endDrag(); - } else if (mQuickReturn && mViewBehind.menuTouchInQuickReturn(mContent, ev.getX() + mScrollX)) { - // close the menu - setCurrentItem(1); - endDrag(); - } - break; - case MotionEvent.ACTION_CANCEL: - if (mIsBeingDragged) { - setCurrentItemInternal(mCurItem, true, true); - mActivePointerId = INVALID_POINTER; - endDrag(); - } - break; - case MotionEventCompat.ACTION_POINTER_DOWN: { - final int indexx = MotionEventCompat.getActionIndex(ev); - mLastMotionX = MotionEventCompat.getX(ev, indexx); - mActivePointerId = MotionEventCompat.getPointerId(ev, indexx); - break; - } - case MotionEventCompat.ACTION_POINTER_UP: - onSecondaryPointerUp(ev); - int pointerIndex = getPointerIndex(ev, mActivePointerId); - if (mActivePointerId == INVALID_POINTER) - break; - mLastMotionX = MotionEventCompat.getX(ev, pointerIndex); - break; - } - return true; - } - - private void determineDrag(MotionEvent ev) { - final int activePointerId = mActivePointerId; - final int pointerIndex = getPointerIndex(ev, activePointerId); - if (activePointerId == INVALID_POINTER || pointerIndex == INVALID_POINTER) - return; - final float x = MotionEventCompat.getX(ev, pointerIndex); - final float dx = x - mLastMotionX; - final float xDiff = Math.abs(dx); - final float y = MotionEventCompat.getY(ev, pointerIndex); - final float dy = y - mLastMotionY; - final float yDiff = Math.abs(dy); - if (xDiff > (isMenuOpen() ? mTouchSlop / 2 : mTouchSlop) && xDiff > yDiff && thisSlideAllowed(dx)) { - startDrag(); - mLastMotionX = x; - mLastMotionY = y; - setScrollingCacheEnabled(true); - // TODO add back in touch slop check - } else if (xDiff > mTouchSlop) { - mIsUnableToDrag = true; - } - } - - @Override - public void scrollTo(int x, int y) { - super.scrollTo(x, y); - float percentOpen = getPercentOpen(); - mScrollX = x; - mViewBehind.scrollBehindTo(mContent, x, y); - ((SlidingMenu) getParent()).manageLayers(percentOpen); - if (mListener != null) { - mListener.onChanging(percentOpen); - } - } - - private int determineTargetPage(float pageOffset, int velocity, int deltaX) { - int targetPage = mCurItem; - if (Math.abs(deltaX) > mFlingDistance && Math.abs(velocity) > mMinimumVelocity) { - if (velocity > 0 && deltaX > 0) { - targetPage -= 1; - } else if (velocity < 0 && deltaX < 0) { - targetPage += 1; - } - } else { - targetPage = Math.round(mCurItem + pageOffset); - } - return targetPage; - } - - protected float getPercentOpen() { - return Math.abs(mScrollX - mContent.getLeft()) / getBehindWidth(); - } - - @Override - protected void dispatchDraw(Canvas canvas) { - super.dispatchDraw(canvas); - // Draw the margin drawable if needed. - mViewBehind.drawShadow(mContent, canvas); - } - - // variables for drawing - private float mScrollX = 0.0f; - - private void onSecondaryPointerUp(MotionEvent ev) { - if (DEBUG) Log.v(TAG, "onSecondaryPointerUp called"); - final int pointerIndex = MotionEventCompat.getActionIndex(ev); - final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex); - if (pointerId == mActivePointerId) { - // This was our active pointer going up. Choose a new - // active pointer and adjust accordingly. - final int newPointerIndex = pointerIndex == 0 ? 1 : 0; - mLastMotionX = MotionEventCompat.getX(ev, newPointerIndex); - mActivePointerId = MotionEventCompat.getPointerId(ev, newPointerIndex); - if (mVelocityTracker != null) { - mVelocityTracker.clear(); - } - } - } - - private void startDrag() { - mIsBeingDragged = true; - mQuickReturn = false; - } - - private void endDrag() { - mQuickReturn = false; - mIsBeingDragged = false; - mIsUnableToDrag = false; - mActivePointerId = INVALID_POINTER; - - if (mVelocityTracker != null) { - mVelocityTracker.recycle(); - mVelocityTracker = null; - } - } - - private void setScrollingCacheEnabled(boolean enabled) { - if (mScrollingCacheEnabled != enabled) { - mScrollingCacheEnabled = enabled; - if (USE_CACHE) { - final int size = getChildCount(); - for (int i = 0; i < size; ++i) { - final View child = getChildAt(i); - if (child.getVisibility() != GONE) { - child.setDrawingCacheEnabled(enabled); - } - } - } - } - } - - - @Override - public boolean dispatchKeyEvent(KeyEvent event) { - // Let the focused view and/or our descendants get the key first - return super.dispatchKeyEvent(event) || executeKeyEvent(event); - } - - /** - * You can call this function yourself to have the scroll view perform - * scrolling from a key event, just as if the event had been dispatched to - * it by the view hierarchy. - * - * @param event The key event to execute. - * @return Return true if the event was handled, else false. - */ - public boolean executeKeyEvent(KeyEvent event) { - boolean handled = false; - if (event.getAction() == KeyEvent.ACTION_DOWN) { - switch (event.getKeyCode()) { - case KeyEvent.KEYCODE_DPAD_LEFT: - handled = arrowScroll(FOCUS_LEFT); - break; - case KeyEvent.KEYCODE_DPAD_RIGHT: - handled = arrowScroll(FOCUS_RIGHT); - break; - case KeyEvent.KEYCODE_TAB: - // The focus finder had a bug handling FOCUS_FORWARD and FOCUS_BACKWARD - // before Android 3.0. Ignore the tab key on those devices. - if (KeyEventCompat.hasNoModifiers(event)) { - handled = arrowScroll(FOCUS_FORWARD); - } else if (KeyEventCompat.hasModifiers(event, KeyEvent.META_SHIFT_ON)) { - handled = arrowScroll(FOCUS_BACKWARD); - } - break; - } - } - return handled; - } - - public boolean arrowScroll(int direction) { - View currentFocused = findFocus(); - if (currentFocused == this) currentFocused = null; - - boolean handled = false; - - View nextFocused = FocusFinder.getInstance().findNextFocus(this, currentFocused, - direction); - if (nextFocused != null && nextFocused != currentFocused) { - if (direction == View.FOCUS_LEFT) { - handled = nextFocused.requestFocus(); - } else if (direction == View.FOCUS_RIGHT) { - // If there is nothing to the right, or this is causing us to - // jump to the left, then what we really want to do is page right. - if (currentFocused != null && nextFocused.getLeft() <= currentFocused.getLeft()) { - handled = pageRight(); - } else { - handled = nextFocused.requestFocus(); - } - } - } else if (direction == FOCUS_LEFT || direction == FOCUS_BACKWARD) { - // Trying to move left and nothing there; try to page. - handled = pageLeft(); - } else if (direction == FOCUS_RIGHT || direction == FOCUS_FORWARD) { - // Trying to move right and nothing there; try to page. - handled = pageRight(); - } - if (handled) { - playSoundEffect(SoundEffectConstants.getContantForFocusDirection(direction)); - } - return handled; - } - - boolean pageLeft() { - if (mCurItem > 0) { - setCurrentItem(mCurItem - 1, true); - return true; - } - return false; - } - - boolean pageRight() { - if (mCurItem < 1) { - setCurrentItem(mCurItem + 1, true); - return true; - } - return false; - } - -} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/CustomViewBehind.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/CustomViewBehind.java deleted file mode 100644 index 05a3c2f1..00000000 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/CustomViewBehind.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.moez.QKSMS.ui.view.slidingmenu; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.drawable.Drawable; -import android.util.AttributeSet; -import android.view.MotionEvent; -import android.view.View; -import android.view.ViewGroup; -import com.moez.QKSMS.common.utils.Units; - -public class CustomViewBehind extends ViewGroup { - private static final String TAG = "CustomViewBehind"; - - private View mContent; - private int mWidthOffset; - private boolean mChildrenEnabled; - - private float mScrollScale; - private Drawable mShadowDrawable; - private int mShadowWidth; - - public CustomViewBehind(Context context) { - this(context, null); - } - - public CustomViewBehind(Context context, AttributeSet attrs) { - super(context, attrs); - mShadowWidth = Units.dpToPx(getContext(), 8); - } - - public void setWidthOffset(int i) { - mWidthOffset = i; - requestLayout(); - } - - public int getBehindWidth() { - return mContent.getWidth(); - } - - public void setContent(View v) { - if (mContent != null) { - removeView(mContent); - } - mContent = v; - addView(mContent); - } - - public View getContent() { - return mContent; - } - - public void setChildrenEnabled(boolean enabled) { - mChildrenEnabled = enabled; - } - - @Override - public void scrollTo(int x, int y) { - super.scrollTo(x, y); - } - - @Override - public boolean onInterceptTouchEvent(MotionEvent e) { - return !mChildrenEnabled; - } - - @Override - public boolean onTouchEvent(MotionEvent e) { - return !mChildrenEnabled; - } - - @Override - protected void dispatchDraw(Canvas canvas) { - super.dispatchDraw(canvas); - } - - @Override - protected void onLayout(boolean changed, int l, int t, int r, int b) { - final int width = r - l; - final int height = b - t; - mContent.layout(0, 0, width - mWidthOffset, height); - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - int width = getDefaultSize(0, widthMeasureSpec); - int height = getDefaultSize(0, heightMeasureSpec); - setMeasuredDimension(width, height); - final int contentWidth = getChildMeasureSpec(widthMeasureSpec, 0, width - mWidthOffset); - final int contentHeight = getChildMeasureSpec(heightMeasureSpec, 0, height); - mContent.measure(contentWidth, contentHeight); - } - - public void setScrollScale(float scrollScale) { - mScrollScale = scrollScale; - } - - public void setShadowDrawable(Drawable shadow) { - mShadowDrawable = shadow; - invalidate(); - } - - public int getMenuPage(int page) { - page = (page > 1) ? 2 : ((page < 1) ? 0 : page); - if (page > 1) { - return 0; - } else { - return page; - } - } - - public void scrollBehindTo(View content, int x, int y) { - int vis = View.VISIBLE; - if (x >= content.getLeft()) vis = View.INVISIBLE; - scrollTo((int) ((x + getBehindWidth()) * mScrollScale), y); - setVisibility(vis); - } - - public int getMenuLeft(View content, int page) { - switch (page) { - case 0: - return content.getLeft() - getBehindWidth(); - case 2: - return content.getLeft(); - } - return content.getLeft(); - } - - public int getAbsLeftBound(View content) { - return content.getLeft() - getBehindWidth(); - } - - public int getAbsRightBound(View content) { - return content.getLeft(); - } - - /** - * Returns whether x is on a menu. - * - * @param content content - * @param x the position of the touch - */ - public boolean menuTouchInQuickReturn(View content, float x) { - return x >= content.getLeft(); - } - - public boolean menuClosedSlideAllowed(float dx) { - return dx > 0; - } - - public boolean menuOpenSlideAllowed(float dx) { - return dx < 0; - } - - public void drawShadow(View content, Canvas canvas) { - if (mShadowDrawable == null || mShadowWidth <= 0) return; - int left = content.getLeft() - mShadowWidth; - mShadowDrawable.setBounds(left, 0, left + mShadowWidth, getHeight()); - mShadowDrawable.draw(canvas); - } - -} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/SlidingMenu.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/SlidingMenu.java deleted file mode 100644 index c6d025f9..00000000 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/SlidingMenu.java +++ /dev/null @@ -1,300 +0,0 @@ -package com.moez.QKSMS.ui.view.slidingmenu; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.graphics.Rect; -import android.os.Build; -import android.os.Parcel; -import android.os.Parcelable; -import android.support.v4.content.ContextCompat; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.RelativeLayout; -import com.moez.QKSMS.R; -import com.moez.QKSMS.ui.view.slidingmenu.CustomViewAbove.OnPageChangeListener; - -/** - * Stripped down version of Jeremy Feinstein's SlidingMenu library - */ -public class SlidingMenu extends RelativeLayout { - private static final String TAG = "SlidingMenu"; - - private boolean mActionbarOverlay = false; - - private CustomViewAbove mViewAbove; - private CustomViewBehind mViewBehind; - - private SlidingMenuListener mListener; - - public interface SlidingMenuListener { - void onOpen(); - - void onOpened(); - - void onClose(); - - void onClosed(); - - void onChanging(float percentOpen); - } - - /** - * Instantiates a new SlidingMenu. - * - * @param context the associated Context - */ - public SlidingMenu(Context context) { - this(context, null); - } - - /** - * Instantiates a new SlidingMenu. - * - * @param context the associated Context - * @param attrs the attrs - */ - public SlidingMenu(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - /** - * Instantiates a new SlidingMenu. - * - * @param context the associated Context - * @param attrs the attrs - * @param defStyle the def style - */ - public SlidingMenu(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - - LayoutParams behindParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); - mViewBehind = new CustomViewBehind(context); - addView(mViewBehind, behindParams); - LayoutParams aboveParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); - mViewAbove = new CustomViewAbove(context); - addView(mViewAbove, aboveParams); - mViewBehind.setScrollScale(0.5f); - mViewBehind.setShadowDrawable(ContextCompat.getDrawable(getContext(), R.drawable.shadow_slidingmenu)); - mViewAbove.setCustomViewBehind(mViewBehind); - mViewAbove.setOnPageChangeListener(new OnPageChangeListener() { - public static final int POSITION_OPEN = 0; - public static final int POSITION_CLOSE = 1; - - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - } - - public void onPageSelected(int position, boolean anim) { - if (position == POSITION_OPEN && mListener != null && anim) { - mListener.onOpen(); - } else if (position == POSITION_OPEN && mListener != null) { - mListener.onOpened(); - } else if (position == POSITION_CLOSE && mListener != null && anim) { - mListener.onClose(); - } else if (position == POSITION_CLOSE && mListener != null) { - mListener.onClosed(); - } - } - }); - - } - - /** - * Set the above view content from a layout resource. The resource will be inflated, adding all top-level views - * to the above view. - */ - public void setContent() { - mViewAbove.setContent(LayoutInflater.from(getContext()).inflate(R.layout.content_frame, null)); - } - - /** - * Retrieves the current content. - * - * @return the current content - */ - public View getContent() { - return mViewAbove.getContent(); - } - - /** - * Set the behind view (menu) content from a layout resource. The resource will be inflated, adding all top-level views - * to the behind view. - */ - public void setMenu() { - mViewBehind.setContent(LayoutInflater.from(getContext()).inflate(R.layout.menu_frame, null)); - } - - /** - * Retrieves the main menu. - * - * @return the main menu - */ - public View getMenu() { - return mViewBehind.getContent(); - } - - /** - * Opens the menu and shows the menu view. - */ - public void showMenu() { - showMenu(true); - } - - /** - * Opens the menu and shows the menu view. - * - * @param animate true to animate the transition, false to ignore animation - */ - public void showMenu(boolean animate) { - mViewAbove.setCurrentItem(0, animate, true); - } - - /** - * Closes the menu and shows the above view. - */ - public void showContent() { - showContent(true); - } - - /** - * Closes the menu and shows the above view. - * - * @param animate true to animate the transition, false to ignore animation - */ - public void showContent(boolean animate) { - mViewAbove.setCurrentItem(1, animate, true); - } - - /** - * Toggle the SlidingMenu. If it is open, it will be closed, and vice versa. - */ - public void toggle() { - toggle(true); - } - - /** - * Toggle the SlidingMenu. If it is open, it will be closed, and vice versa. - * - * @param animate true to animate the transition, false to ignore animation - */ - public void toggle(boolean animate) { - if (isMenuShowing()) { - showContent(animate); - } else { - showMenu(animate); - } - } - - /** - * Checks if is the behind view showing. - * - * @return Whether or not the behind view is showing - */ - public boolean isMenuShowing() { - return mViewAbove.getCurrentItem() == 0 || mViewAbove.getCurrentItem() == 2; - } - - /** - * Sets the behind offset. - * - * @param i The margin, in pixels, on the right of the screen that the behind view scrolls to. - */ - public void setBehindOffset(int i) { - mViewBehind.setWidthOffset(i); - } - - public void setListener(SlidingMenuListener listener) { - mListener = listener; - mViewAbove.setListener(listener); - } - - public static class SavedState extends BaseSavedState { - - private final int mItem; - - public SavedState(Parcelable superState, int item) { - super(superState); - mItem = item; - } - - private SavedState(Parcel in) { - super(in); - mItem = in.readInt(); - } - - public int getItem() { - return mItem; - } - - /* (non-Javadoc) - * @see android.view.AbsSavedState#writeToParcel(android.os.Parcel, int) - */ - public void writeToParcel(Parcel out, int flags) { - super.writeToParcel(out, flags); - out.writeInt(mItem); - } - - public static final Creator CREATOR = - new Creator() { - public SavedState createFromParcel(Parcel in) { - return new SavedState(in); - } - - public SavedState[] newArray(int size) { - return new SavedState[size]; - } - }; - - } - - /* (non-Javadoc) - * @see android.view.View#onSaveInstanceState() - */ - @Override - protected Parcelable onSaveInstanceState() { - Parcelable superState = super.onSaveInstanceState(); - SavedState ss = new SavedState(superState, mViewAbove.getCurrentItem()); - return ss; - } - - /* (non-Javadoc) - * @see android.view.View#onRestoreInstanceState(android.os.Parcelable) - */ - @Override - protected void onRestoreInstanceState(Parcelable state) { - SavedState ss = (SavedState) state; - super.onRestoreInstanceState(ss.getSuperState()); - mViewAbove.setCurrentItem(ss.getItem()); - } - - /* (non-Javadoc) - * @see android.view.ViewGroup#fitSystemWindows(android.graphics.Rect) - */ - @SuppressLint("NewApi") - @Override - protected boolean fitSystemWindows(Rect insets) { - int leftPadding = insets.left; - int rightPadding = insets.right; - int topPadding = insets.top; - int bottomPadding = insets.bottom; - if (!mActionbarOverlay) { - setPadding(leftPadding, topPadding, rightPadding, bottomPadding); - } - return true; - } - - public void manageLayers(float percentOpen) { - if (Build.VERSION.SDK_INT < 11) return; - - boolean layer = percentOpen > 0.0f && percentOpen < 1.0f; - final int layerType = layer ? View.LAYER_TYPE_HARDWARE : View.LAYER_TYPE_NONE; - - if (layerType != getContent().getLayerType()) { - getHandler().post(() -> { - getContent().setLayerType(layerType, null); - getMenu().setLayerType(layerType, null); - }); - } - } - -} diff --git a/QKSMS/src/main/res/layout/activity_fragment.xml b/QKSMS/src/main/res/layout/activity_fragment.xml index 93bbfa0e..380efaa3 100644 --- a/QKSMS/src/main/res/layout/activity_fragment.xml +++ b/QKSMS/src/main/res/layout/activity_fragment.xml @@ -1,5 +1,6 @@ - diff --git a/QKSMS/src/main/res/layout/activity_main.xml b/QKSMS/src/main/res/layout/activity_main.xml deleted file mode 100644 index c14961bb..00000000 --- a/QKSMS/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index e1f5f123..7a77e7f3 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -152,8 +152,6 @@ Font weight Message count Show the number of messages for each conversation - Sliding panel tab - Sliding tab that allows you to quickly view your last conversation Sent timestamps Show the timestamp for when a message was sent, not received diff --git a/QKSMS/src/main/res/xml/settings.xml b/QKSMS/src/main/res/xml/settings.xml index 9069905c..2c934944 100644 --- a/QKSMS/src/main/res/xml/settings.xml +++ b/QKSMS/src/main/res/xml/settings.xml @@ -44,9 +44,6 @@ - diff --git a/QKSMS/src/main/res/xml/settings_appearance.xml b/QKSMS/src/main/res/xml/settings_appearance.xml index 219266fb..f99286db 100644 --- a/QKSMS/src/main/res/xml/settings_appearance.xml +++ b/QKSMS/src/main/res/xml/settings_appearance.xml @@ -135,13 +135,6 @@ android:summary="@string/pref_message_count_summary" android:title="@string/pref_message_count" android:widgetLayout="@layout/view_switch" /> - Date: Sun, 17 Apr 2016 00:42:15 -0400 Subject: [PATCH 15/24] Launch Conversation from intent through MainActivity, so it always exists in stack --- QKSMS/src/main/AndroidManifest.xml | 16 +++----- .../transaction/NotificationManager.java | 12 +++--- .../java/com/moez/QKSMS/ui/MainActivity.java | 39 +++++++++++++++++-- .../ui/messagelist/MessageListActivity.java | 2 +- .../ui/messagelist/MessageListFragment.java | 2 +- .../moez/QKSMS/ui/popup/QKReplyActivity.java | 3 +- .../moez/QKSMS/ui/widget/WidgetService.java | 3 +- 7 files changed, 54 insertions(+), 23 deletions(-) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index b8204b87..748d6c3c 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -72,21 +72,14 @@ android:logo="@color/transparent" android:windowSoftInputMode="stateUnchanged|adjustResize"> + + + - - - - - - - @@ -97,6 +90,9 @@ + { @@ -288,6 +287,40 @@ public class MainActivity extends QKActivity { NotificationManager.initQuickCompose(this, false, false); } + /** + * MainActivity has a "singleTask" launch mode, which means that if it is currently running + * and another intent is launched to open it, instead of creating a new MainActivity it + * just opens the current MainActivity. We use this so that when you click on notifications, + * only one main activity is ever used. + *

+ * onNewIntent() is called every time the homescreen shortcut is tapped, even if the app + * is already running in the background. It's also called when the app is launched via other + * intents + *

+ * Docs: + * http://developer.android.com/guide/components/tasks-and-back-stack.html#TaskLaunchModes + */ + @Override + public void onNewIntent(Intent intent) { + // onNewIntent doesn't change the result of getIntent() by default, so here we set it since + // that makes the most sense. + setIntent(intent); + + boolean shouldOpenConversation = intent.hasExtra(MessageListActivity.ARG_THREAD_ID); + + // The activity can also be launched by clicking on the message button from the contacts app + // Check for {sms,mms}{,to}: schemes, in which case we know to open a conversation + if (intent.getData() != null) { + String scheme = intent.getData().getScheme(); + shouldOpenConversation = shouldOpenConversation || scheme.startsWith("sms") || scheme.startsWith("mms"); + } + + if (shouldOpenConversation) { + intent.setClass(this, MessageListActivity.class); + startActivity(intent); + } + } + private void beginMmsSetup() { if (!mPrefs.getBoolean(MMS_SETUP_DONT_ASK_AGAIN, false) && TextUtils.isEmpty(mPrefs.getString(SettingsFragment.MMSC_URL, "")) && diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index 014b6ac3..018661ad 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -2,7 +2,6 @@ package com.moez.QKSMS.ui.messagelist; import android.content.Intent; import android.os.Bundle; -import android.telephony.PhoneNumberUtils; import android.text.Html; import android.util.Log; import android.view.Menu; @@ -11,6 +10,7 @@ import android.view.MenuItem; import com.crashlytics.android.Crashlytics; import com.moez.QKSMS.R; import com.moez.QKSMS.common.DonationManager; +import com.moez.QKSMS.common.utils.PhoneNumberUtils; import com.moez.QKSMS.mmssms.Utils; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.base.QKSwipeBackActivity; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index b8964a72..15d84a68 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -133,7 +133,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa private long mLastMessageId; private BackgroundQueryHandler mBackgroundQueryHandler; - public static final String ARG_THREAD_ID = "thread_id"; + 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"; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyActivity.java index eb681102..24666ec8 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyActivity.java @@ -28,6 +28,7 @@ import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.base.QKPopupActivity; import com.moez.QKSMS.ui.messagelist.MessageColumns; +import com.moez.QKSMS.ui.messagelist.MessageListActivity; import com.moez.QKSMS.ui.view.ComposeView; public class QKReplyActivity extends QKPopupActivity implements DialogInterface.OnDismissListener, @@ -190,7 +191,7 @@ public class QKReplyActivity extends QKPopupActivity implements DialogInterface. case R.id.menu_open_thread: Intent threadIntent = new Intent(this, MainActivity.class); - threadIntent.putExtra(MainActivity.EXTRA_THREAD_ID, mConversationLegacy.getThreadId()); + threadIntent.putExtra(MessageListActivity.ARG_THREAD_ID, mConversationLegacy.getThreadId()); startActivity(threadIntent); finish(); return true; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java index cbfdbe54..1bce49bc 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java @@ -41,6 +41,7 @@ import com.moez.QKSMS.data.ContactHelper; import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; +import com.moez.QKSMS.ui.messagelist.MessageListActivity; public class WidgetService extends RemoteViewsService { private static final String TAG = "WidgetService"; @@ -205,7 +206,7 @@ public class WidgetService extends RemoteViewsService { // On click intent. Intent clickIntent = new Intent(); - clickIntent.putExtra(MainActivity.EXTRA_THREAD_ID, conversation.getThreadId()); + clickIntent.putExtra(MessageListActivity.ARG_THREAD_ID, conversation.getThreadId()); remoteViews.setOnClickFillInIntent(R.id.conversation, clickIntent); return remoteViews; From 41b5524caede655a0afc1c95efad853868cca7d1 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 17 Apr 2016 16:07:09 -0400 Subject: [PATCH 16/24] Fix edge detection for swipe back --- .../com/moez/QKSMS/ui/SwipeBackLayout.java | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java index 8d8f88b6..26f9ad46 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java @@ -94,7 +94,7 @@ public class SwipeBackLayout extends FrameLayout { public SwipeBackLayout(Context context, AttributeSet attrs, int defStyle) { super(context, attrs); - mDragHelper = ViewDragHelper.create(this, 1.0f, new ViewDragCallback()); + mDragHelper = ViewDragHelper.create(this, 0.2f, new ViewDragCallback()); int shadowLeft = R.drawable.shadow_left; int shadowBottom = R.drawable.shadow_bottom; @@ -317,8 +317,7 @@ public class SwipeBackLayout extends FrameLayout { final boolean drawContent = child == mContentView; boolean ret = super.drawChild(canvas, child, drawingTime); - if (mScrimOpacity > 0 && drawContent - && mDragHelper.getViewDragState() != ViewDragHelper.STATE_IDLE) { + if (mScrimOpacity > 0 && drawContent && mDragHelper.getViewDragState() != ViewDragHelper.STATE_IDLE) { drawShadow(canvas, child); drawScrim(canvas, child); } @@ -392,30 +391,22 @@ public class SwipeBackLayout extends FrameLayout { @Override public boolean tryCaptureView(View view, int i) { - boolean ret = mDragHelper.isEdgeTouched(mEdgeFlag, i); - if (ret) { - if (mDragHelper.isEdgeTouched(EDGE_LEFT, i)) { - mTrackingEdge = EDGE_LEFT; - } else if (mDragHelper.isEdgeTouched(EDGE_BOTTOM, i)) { - mTrackingEdge = EDGE_BOTTOM; + mTrackingEdge = EDGE_LEFT; + if (mListeners != null && !mListeners.isEmpty()) { + for (SwipeListener listener : mListeners) { + listener.onEdgeTouch(mTrackingEdge); } - if (mListeners != null && !mListeners.isEmpty()) { - for (SwipeListener listener : mListeners) { - listener.onEdgeTouch(mTrackingEdge); - } - } - mIsScrollOverValid = true; } + mIsScrollOverValid = true; boolean directionCheck = false; if (mEdgeFlag == EDGE_LEFT) { directionCheck = !mDragHelper.checkTouchSlop(ViewDragHelper.DIRECTION_VERTICAL, i); } else if (mEdgeFlag == EDGE_BOTTOM) { - directionCheck = !mDragHelper - .checkTouchSlop(ViewDragHelper.DIRECTION_HORIZONTAL, i); + directionCheck = !mDragHelper.checkTouchSlop(ViewDragHelper.DIRECTION_HORIZONTAL, i); } else if (mEdgeFlag == EDGE_ALL) { directionCheck = true; } - return ret & directionCheck; + return directionCheck; } @Override From 448d744406c005dd182b95936dc2089cb20b843c Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 17 Apr 2016 17:15:20 -0400 Subject: [PATCH 17/24] Better control of shadow --- QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java index 26f9ad46..3dcceff9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java @@ -375,7 +375,7 @@ public class SwipeBackLayout extends FrameLayout { @Override public void computeScroll() { - mScrimOpacity = 1 - mScrollPercent; + mScrimOpacity = mScrollPercent < 0.8f ? 0.4f : (1f - mScrollPercent) * 2f; if (mDragHelper.continueSettling(true)) { ViewCompat.postInvalidateOnAnimation(this); } From 5c40323ce0bcce4d2f71c7b19e4990fc9ccf2acc Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 17 Apr 2016 17:36:22 -0400 Subject: [PATCH 18/24] Fix per-conversation themeing --- .../com/moez/QKSMS/ui/SwipeBackLayout.java | 21 ++++++++++++++----- .../ui/messagelist/MessageListActivity.java | 1 + .../ui/messagelist/MessageListFragment.java | 13 ++++++++---- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java index 3dcceff9..6a4c6b59 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java @@ -24,6 +24,10 @@ import java.util.List; public class SwipeBackLayout extends FrameLayout { private final String TAG = "SwipeBackLayout"; + public interface ScrollChangedListener { + void onScrollChanged(float scrollPercent); + } + private static final int MIN_FLING_VELOCITY = 400; // dips per second private static final int DEFAULT_SCRIM_COLOR = 0x99000000; private static final int FULL_ALPHA = 255; @@ -68,9 +72,9 @@ public class SwipeBackLayout extends FrameLayout { * The set of listeners to be sent events through. */ private List mListeners; + private ScrollChangedListener mScrollChangedListener; private Drawable mShadowLeft; - private Drawable mShadowRight; private Drawable mShadowBottom; private float mScrimOpacity; @@ -183,6 +187,10 @@ public class SwipeBackLayout extends FrameLayout { mListeners.remove(listener); } + public void setScrollChangedListener(ScrollChangedListener listener) { + mScrollChangedListener = listener; + } + public interface SwipeListener { /** * Invoke when state change @@ -423,12 +431,15 @@ public class SwipeBackLayout extends FrameLayout { public void onViewPositionChanged(View changedView, int left, int top, int dx, int dy) { super.onViewPositionChanged(changedView, left, top, dx, dy); if ((mTrackingEdge & EDGE_LEFT) != 0) { - mScrollPercent = Math.abs((float) left - / (mContentView.getWidth() + mShadowLeft.getIntrinsicWidth())); + mScrollPercent = Math.abs((float) left / (mContentView.getWidth() + mShadowLeft.getIntrinsicWidth())); } else if ((mTrackingEdge & EDGE_BOTTOM) != 0) { - mScrollPercent = Math.abs((float) top - / (mContentView.getHeight() + mShadowBottom.getIntrinsicHeight())); + mScrollPercent = Math.abs((float) top / (mContentView.getHeight() + mShadowBottom.getIntrinsicHeight())); } + + if (mScrollChangedListener != null) { + mScrollChangedListener.onScrollChanged(mScrollPercent); + } + mContentLeft = left; mContentTop = top; invalidate(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index 018661ad..8c09d075 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -74,6 +74,7 @@ public class MessageListActivity extends QKSwipeBackActivity { if (mThreadId != -1) { Log.v(TAG, "Opening thread: " + mThreadId); MessageListFragment fragment = MessageListFragment.getInstance(mThreadId, mRowId, mHighlight, mShowImmediate); + mSwipeBackLayout.setScrollChangedListener(fragment); getFragmentManager() .beginTransaction() .replace(R.id.content_frame, fragment) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index 15d84a68..b4544cb9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -45,6 +45,7 @@ import com.moez.QKSMS.common.CIELChEvaluator; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.LiveViewManager; +import com.moez.QKSMS.ui.SwipeBackLayout; import com.moez.QKSMS.ui.dialog.conversationdetails.ConversationDetailsDialog; import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.KeyboardUtils; @@ -80,7 +81,7 @@ import java.util.HashSet; import java.util.List; public class MessageListFragment extends QKContentFragment implements ActivityLauncher, SensorEventListener, - LoaderManager.LoaderCallbacks, RecyclerCursorAdapter.MultiSelectListener, + LoaderManager.LoaderCallbacks, RecyclerCursorAdapter.MultiSelectListener, SwipeBackLayout.ScrollChangedListener, RecyclerCursorAdapter.ItemClickListener { private final String TAG = "MessageListFragment"; @@ -641,9 +642,6 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa @Override public void onMenuChanging(float percentOpen) { - if (mConversationPrefs != null) { - ThemeManager.setActiveColor(mCIELChEvaluator.evaluate(percentOpen)); - } } @Override @@ -706,6 +704,13 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa } + @Override + public void onScrollChanged(float scrollPercent) { + if (mConversationPrefs != null) { + ThemeManager.setActiveColor(mCIELChEvaluator.evaluate(scrollPercent)); + } + } + private class DeleteMessageListener implements DialogInterface.OnClickListener { private final MessageItem mMessageItem; From 74f37eeada3f4cea7c8c1fe96ebb8f72c78070f8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 17 Apr 2016 19:03:23 -0400 Subject: [PATCH 19/24] Remove QKContentFragment, fix lifecycle issues --- .../moez/QKSMS/ui/base/QKContentFragment.java | 83 ------------ .../ui/messagelist/MessageListFragment.java | 120 +++++------------- 2 files changed, 31 insertions(+), 172 deletions(-) delete mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKContentFragment.java diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKContentFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKContentFragment.java deleted file mode 100644 index b1135369..00000000 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKContentFragment.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.moez.QKSMS.ui.base; - -import android.os.Bundle; -import com.moez.QKSMS.ui.ContentFragment; - -/** - * Base class for Fragments. QKSMS uses the recycle pattern as an optimization, and our fragment - * system has been built to help accommodate this. - *

- * Functions: - * - Exposes a new API around fragment arguments update. updateArguments(Bundle) can be used to - * reconfigure a recycled fragment, and onNewArguments() will be called whenever - * updateArguments(Bundle) is called. - *

- * - Gives callbacks for the content animations. - *

- * - Manages the current state of the fragment in terms of the animation, i.e. opening, fully - * opened, etc. - */ -public abstract class QKContentFragment extends QKFragment implements ContentFragment { - - /** - * It's not strictly necessary, but subclasses should call through to super() in their - * constructor. - */ - public QKContentFragment() { - setArguments(new Bundle()); - } - - /** - * Called whenever setArguments is called, so any setup that uses the new configurations can be - * implemented in this method. - */ - public void onNewArguments() { - } - - public void updateArguments(Bundle args) { - // Ensure that args is not null. - args = args == null ? new Bundle() : args; - - // The fragment's arguments can only be set before onAttach is called. - if (getActivity() == null) { - // If the fragment hasn't been attached to its activity yet, call the super method to - // actually set this Bundle as the arguments. - super.setArguments(args); - - } else { - // Otherwise, replace all the values in the old args with the values in the new args. - Bundle oldArgs = getArguments() == null ? new Bundle() : getArguments(); - oldArgs.clear(); - oldArgs.putAll(args); - } - - // Notify that the arguments have been changed. - onNewArguments(); - } - - /** - * Called when the content is being opened with an animation. - */ - public void onContentOpening() { - } - - /** - * Called when the content has been opened, i.e. a opening animation has finished or it had - * been opened immediately. - */ - public void onContentOpened() { - } - - /** - * Called when the content is being closed with an animation. - */ - public void onContentClosing() { - } - - /** - * Called when the content has been closed, i.e. a closing animation has finished or it had - * been closed immediately. - */ - public void onContentClosed() { - } -} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index b4544cb9..b60dd720 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -21,6 +21,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Vibrator; import android.provider.Telephony; +import android.support.annotation.IntegerRes; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.SpannableString; @@ -45,9 +46,6 @@ import com.moez.QKSMS.common.CIELChEvaluator; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.ui.SwipeBackLayout; -import com.moez.QKSMS.ui.dialog.conversationdetails.ConversationDetailsDialog; -import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.KeyboardUtils; import com.moez.QKSMS.common.utils.MessageUtils; import com.moez.QKSMS.common.vcard.ContactOperations; @@ -56,18 +54,21 @@ import com.moez.QKSMS.data.ContactList; import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.data.ConversationLegacy; import com.moez.QKSMS.data.Message; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.interfaces.ActivityLauncher; import com.moez.QKSMS.transaction.NotificationManager; import com.moez.QKSMS.transaction.SmsHelper; import com.moez.QKSMS.ui.MainActivity; +import com.moez.QKSMS.ui.SwipeBackLayout; import com.moez.QKSMS.ui.ThemeManager; -import com.moez.QKSMS.ui.base.QKContentFragment; +import com.moez.QKSMS.ui.base.QKFragment; import com.moez.QKSMS.ui.base.RecyclerCursorAdapter; import com.moez.QKSMS.ui.delivery.DeliveryReportHelper; import com.moez.QKSMS.ui.delivery.DeliveryReportItem; import com.moez.QKSMS.ui.dialog.AsyncDialog; import com.moez.QKSMS.ui.dialog.ConversationSettingsDialog; import com.moez.QKSMS.ui.dialog.QKDialog; +import com.moez.QKSMS.ui.dialog.conversationdetails.ConversationDetailsDialog; import com.moez.QKSMS.ui.settings.SettingsFragment; import com.moez.QKSMS.ui.view.ComposeView; import com.moez.QKSMS.ui.view.MessageListRecyclerView; @@ -80,7 +81,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; -public class MessageListFragment extends QKContentFragment implements ActivityLauncher, SensorEventListener, +public class MessageListFragment extends QKFragment implements ActivityLauncher, SensorEventListener, LoaderManager.LoaderCallbacks, RecyclerCursorAdapter.MultiSelectListener, SwipeBackLayout.ScrollChangedListener, RecyclerCursorAdapter.ItemClickListener { @@ -118,7 +119,6 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa private Conversation mConversation; private ConversationLegacy mConversationLegacy; - private boolean mOpened; private Sensor mProxSensor; private SensorManager mSensorManager; private AsyncDialog mAsyncDialog; @@ -153,7 +153,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa args.putBoolean(ARG_SHOW_IMMEDIATE, showImmediate); MessageListFragment fragment = new MessageListFragment(); - fragment.updateArguments(args); + fragment.setArguments(args); return fragment; } @@ -166,6 +166,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + loadFromArguments(); if (savedInstanceState != null) { mThreadId = savedInstanceState.getLong(ARG_THREAD_ID, -1); mRowId = savedInstanceState.getLong(ARG_ROW_ID, -1); @@ -176,6 +177,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa mConversationPrefs = new ConversationPrefsHelper(mContext, mThreadId); mIsSmsEnabled = MmsConfig.isSmsEnabled(mContext); mConversationDetailsDialog = new ConversationDetailsDialog(mContext, getFragmentManager()); + onOpenConversation(); setHasOptionsMenu(true); LiveViewManager.registerView(QKPreference.CONVERSATION_THEME, this, key -> { @@ -193,12 +195,6 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa mBackgroundQueryHandler = new BackgroundQueryHandler(mContext.getContentResolver()); } - // This is called by BaseContentFragment when updateArguments is called. - @Override - public void onNewArguments() { - loadFromArguments(); - } - public void loadFromArguments() { // Save the fields from the arguments Bundle args = getArguments(); @@ -214,8 +210,6 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa View view = inflater.inflate(R.layout.fragment_conversation, container, false); mRecyclerView = (MessageListRecyclerView) view.findViewById(R.id.conversation); - mOpened = true; // TODO - mAdapter = new MessageListAdapter(mContext); mAdapter.setItemClickListener(this); mAdapter.setMultiSelectListener(this); @@ -262,12 +256,11 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa public void onResume() { super.onResume(); - // All the data about the conversation, such as the thread ID and the row ID to skip to, is - // stored in the arguments. So, calling this method will set up all the fields and then - // perform initialization such as set up the Conversation object, make a query in the - // adapter, etc. - loadFromArguments(); - onOpenConversation(); + if (mContext.getBoolean(QKPreference.PROXIMITY_SENSOR)) { + mSensorManager.registerListener(this, mProxSensor, SensorManager.SENSOR_DELAY_NORMAL); + } + + ThemeManager.setActiveColor(mConversationPrefs.getColor()); } @Override @@ -481,9 +474,8 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa return true; case R.id.menu_notifications: - ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(mContext, mThreadId); - boolean notificationMuted = conversationPrefs.getNotificationsEnabled(); - conversationPrefs.putBoolean(SettingsFragment.NOTIFICATIONS, !notificationMuted); + boolean notificationMuted = mConversationPrefs.getNotificationsEnabled(); + mConversationPrefs.putBoolean(SettingsFragment.NOTIFICATIONS, !notificationMuted); mContext.invalidateOptionsMenu(); vibrateOnConversationStateChanged(notificationMuted); return true; @@ -598,64 +590,33 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa } @Override - public void onContentOpening() { - super.onContentOpening(); - mOpened = false; // We're animating the fragment in, this flag warns us not to do anything heavy - } - - @Override - public void onContentOpened() { - super.onContentOpened(); - mOpened = true; // The fragment has finished animating in - - if (mContext.getBoolean(QKPreference.PROXIMITY_SENSOR)) { - mSensorManager.registerListener(this, mProxSensor, SensorManager.SENSOR_DELAY_NORMAL); - } - - ThemeManager.setActiveColor(mConversationPrefs.getColor()); - } - - @Override - public void onContentClosing() { - } - - @Override - public void onContentClosed() { + public void onPause() { + super.onPause(); if (mSensorManager != null) { mSensorManager.unregisterListener(this); } - if (mOpened) { - if (mConversationLegacy != null) { - mConversationLegacy.markRead(); - } + if (mConversationLegacy != null) { + mConversationLegacy.markRead(); + } - if (mConversation != null) { - mConversation.blockMarkAsRead(true); - mConversation.markAsRead(); - mComposeView.saveDraft(); - } + if (mConversation != null) { + mConversation.blockMarkAsRead(true); + mConversation.markAsRead(); + mComposeView.saveDraft(); } ThemeManager.setActiveColor(ThemeManager.getThemeColor()); } @Override - public void onMenuChanging(float percentOpen) { - } - - @Override - public void inflateToolbar(Menu menu, MenuInflater inflater, Context context) { - inflater.inflate(R.menu.message_list, menu); - setTitle(); - - ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(context, mThreadId); - menu.findItem(R.id.menu_notifications).setTitle(conversationPrefs.getNotificationsEnabled() ? - R.string.menu_notifications : R.string.menu_notifications_off); - menu.findItem(R.id.menu_notifications).setIcon(conversationPrefs.getNotificationsEnabled() ? - R.drawable.ic_notifications : R.drawable.ic_notifications_muted); - + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); + + menu.findItem(R.id.menu_notifications).setTitle(mConversationPrefs.getNotificationsEnabled() ? + R.string.menu_notifications : R.string.menu_notifications_off); + menu.findItem(R.id.menu_notifications).setIcon(mConversationPrefs.getNotificationsEnabled() ? + R.drawable.ic_notifications : R.drawable.ic_notifications_muted); } @Override @@ -1038,25 +999,6 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa mConversation.blockMarkAsRead(true); mConversation.markAsRead(); - // Delay the thread until the fragment has finished opening. If it waits longer than - // 10 seconds, then something is wrong, so cancel it. This happens when the fragment is closed before - // it opens, or the screen is rotated, and then "mOpened" never gets changed to true, - // leaving this thread running forever. This issue is actually what caused the great - // QKSMS battery drain of 2015 - long time = System.currentTimeMillis(); - while (!mOpened) { - try { - Thread.sleep(100); - } catch (InterruptedException e) { - e.printStackTrace(); - } - if (System.currentTimeMillis() - time > 10000) { - Log.w(TAG, "Task running for over 10 seconds, something is wrong"); - cancel(true); - break; - } - } - return null; } From 79a6f06566f801480f4f23d1d6988bd5b10e6903 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 18 Apr 2016 01:11:21 -0400 Subject: [PATCH 20/24] Adjust manifest flags --- QKSMS/src/main/AndroidManifest.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 748d6c3c..57472685 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -68,9 +68,8 @@ android:name=".ui.MainActivity" android:icon="@mipmap/ic_launcher_teal" android:label="@string/app_name" - android:launchMode="singleTask" android:logo="@color/transparent" - android:windowSoftInputMode="stateUnchanged|adjustResize"> + android:windowSoftInputMode="adjustResize"> From 69a5404423b0eb3a69614a04f563c244c453fef2 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 18 Apr 2016 01:32:32 -0400 Subject: [PATCH 21/24] Lifecycle fixes --- .../java/com/moez/QKSMS/ui/MainActivity.java | 1 - .../ui/messagelist/MessageListActivity.java | 16 ++++-- .../ui/messagelist/MessageListFragment.java | 55 +++++++------------ 3 files changed, 31 insertions(+), 41 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java index b50c9039..4e750fe3 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -92,7 +92,6 @@ public class MainActivity extends QKActivity { ButterKnife.bind(this); FragmentManager fm = getFragmentManager(); - mConversationList = (ConversationListFragment) fm.findFragmentById(R.id.content_frame); if (mConversationList == null) { mConversationList = new ConversationListFragment(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index 8c09d075..164625b5 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -1,5 +1,7 @@ package com.moez.QKSMS.ui.messagelist; +import android.app.FragmentManager; +import android.app.FragmentTransaction; import android.content.Intent; import android.os.Bundle; import android.text.Html; @@ -73,12 +75,14 @@ public class MessageListActivity extends QKSwipeBackActivity { if (mThreadId != -1) { Log.v(TAG, "Opening thread: " + mThreadId); - MessageListFragment fragment = MessageListFragment.getInstance(mThreadId, mRowId, mHighlight, mShowImmediate); - mSwipeBackLayout.setScrollChangedListener(fragment); - getFragmentManager() - .beginTransaction() - .replace(R.id.content_frame, fragment) - .commitAllowingStateLoss(); + FragmentManager fm = getFragmentManager(); + MessageListFragment fragment = (MessageListFragment) fm.findFragmentById(R.id.content_frame); + if (fragment == null) { + fragment = MessageListFragment.getInstance(mThreadId, mRowId, mHighlight, mShowImmediate); + } + FragmentTransaction menuTransaction = fm.beginTransaction(); + menuTransaction.replace(R.id.content_frame, fragment); + menuTransaction.commit(); } else { String msg = "Couldn't open conversation: {action:"; msg += intent.getAction(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index b60dd720..3f56f55b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -134,11 +134,6 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher, private long mLastMessageId; private BackgroundQueryHandler mBackgroundQueryHandler; - 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; @@ -147,10 +142,10 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher, protected static MessageListFragment getInstance(long threadId, long rowId, String highlight, boolean showImmediate) { Bundle args = new Bundle(); - args.putLong(ARG_THREAD_ID, threadId); - args.putLong(ARG_ROW_ID, rowId); - args.putString(ARG_HIGHLIGHT, highlight); - args.putBoolean(ARG_SHOW_IMMEDIATE, showImmediate); + args.putLong(MessageListActivity.ARG_THREAD_ID, threadId); + args.putLong(MessageListActivity.ARG_ROW_ID, rowId); + args.putString(MessageListActivity.ARG_HIGHLIGHT, highlight); + args.putBoolean(MessageListActivity.ARG_SHOW_IMMEDIATE, showImmediate); MessageListFragment fragment = new MessageListFragment(); fragment.setArguments(args); @@ -166,12 +161,17 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher, public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - loadFromArguments(); - if (savedInstanceState != null) { - mThreadId = savedInstanceState.getLong(ARG_THREAD_ID, -1); - mRowId = savedInstanceState.getLong(ARG_ROW_ID, -1); - mHighlight = savedInstanceState.getString(ARG_HIGHLIGHT, null); - mShowImmediate = savedInstanceState.getBoolean(ARG_SHOW_IMMEDIATE, false); + if (getArguments() != null) { + Bundle args = getArguments(); + mThreadId = args.getLong(MessageListActivity.ARG_THREAD_ID, -1); + mRowId = args.getLong(MessageListActivity.ARG_ROW_ID, -1); + mHighlight = args.getString(MessageListActivity.ARG_HIGHLIGHT, null); + mShowImmediate = args.getBoolean(MessageListActivity.ARG_SHOW_IMMEDIATE, false); + } else if (savedInstanceState != null) { + mThreadId = savedInstanceState.getLong(MessageListActivity.ARG_THREAD_ID, -1); + mRowId = savedInstanceState.getLong(MessageListActivity.ARG_ROW_ID, -1); + mHighlight = savedInstanceState.getString(MessageListActivity.ARG_HIGHLIGHT, null); + mShowImmediate = savedInstanceState.getBoolean(MessageListActivity.ARG_SHOW_IMMEDIATE, false); } mConversationPrefs = new ConversationPrefsHelper(mContext, mThreadId); @@ -195,15 +195,6 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher, mBackgroundQueryHandler = new BackgroundQueryHandler(mContext.getContentResolver()); } - public void loadFromArguments() { - // Save the fields from the arguments - Bundle args = getArguments(); - mThreadId = args.getLong(ARG_THREAD_ID, -1); - mRowId = args.getLong(ARG_ROW_ID, -1); - mHighlight = args.getString(ARG_HIGHLIGHT, null); - mShowImmediate = args.getBoolean(ARG_SHOW_IMMEDIATE, false); - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -263,18 +254,12 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher, ThemeManager.setActiveColor(mConversationPrefs.getColor()); } - @Override - public void onDestroy() { - super.onDestroy(); - mComposeView.saveDraft(); - } - @Override public void onSaveInstanceState(Bundle outState) { - outState.putLong(ARG_THREAD_ID, mThreadId); - outState.putLong(ARG_ROW_ID, mRowId); - outState.putString(ARG_HIGHLIGHT, mHighlight); - outState.putBoolean(ARG_SHOW_IMMEDIATE, mShowImmediate); + outState.putLong(MessageListActivity.ARG_THREAD_ID, mThreadId); + outState.putLong(MessageListActivity.ARG_ROW_ID, mRowId); + outState.putString(MessageListActivity.ARG_HIGHLIGHT, mHighlight); + outState.putBoolean(MessageListActivity.ARG_SHOW_IMMEDIATE, mShowImmediate); } public long getThreadId() { @@ -592,6 +577,8 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher, @Override public void onPause() { super.onPause(); + mComposeView.saveDraft(); + if (mSensorManager != null) { mSensorManager.unregisterListener(this); } From 3488955e62dc89f5d7289cbbc2249f6bfb5336d8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 24 Apr 2016 14:58:57 -0400 Subject: [PATCH 22/24] Fixed MessageListActivity launch mode --- QKSMS/src/main/AndroidManifest.xml | 1 + build.gradle | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 57472685..6b7f8d52 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -91,6 +91,7 @@ Date: Sun, 24 Apr 2016 18:05:07 -0400 Subject: [PATCH 23/24] Remove unnecessary menu logic --- .../QKSMS/ui/messagelist/MessageListActivity.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index 164625b5..de766f5e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -8,10 +8,8 @@ import android.text.Html; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; -import android.view.MenuItem; import com.crashlytics.android.Crashlytics; import com.moez.QKSMS.R; -import com.moez.QKSMS.common.DonationManager; import com.moez.QKSMS.common.utils.PhoneNumberUtils; import com.moez.QKSMS.mmssms.Utils; import com.moez.QKSMS.ui.base.QKActivity; @@ -115,15 +113,4 @@ public class MessageListActivity extends QKSwipeBackActivity { inflater.inflate(R.menu.message_list, menu); return super.onCreateOptionsMenu(menu); } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_donate: - DonationManager.getInstance(this).showDonateDialog(); - return true; - } - - return super.onOptionsItemSelected(item); - } } From 303a292a3b150530c2c7676ea09d7973338b2dc0 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 24 Apr 2016 18:43:05 -0400 Subject: [PATCH 24/24] Fixed weird animations --- .../com/moez/QKSMS/ui/messagelist/MessageListActivity.java | 2 +- QKSMS/src/main/res/anim/slide_in.xml | 7 ------- QKSMS/src/main/res/anim/slide_out.xml | 7 ------- 3 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 QKSMS/src/main/res/anim/slide_in.xml delete mode 100644 QKSMS/src/main/res/anim/slide_out.xml diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java index de766f5e..fc1442c6 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListActivity.java @@ -37,7 +37,6 @@ public class MessageListActivity extends QKSwipeBackActivity { 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 @@ -78,6 +77,7 @@ public class MessageListActivity extends QKSwipeBackActivity { if (fragment == null) { fragment = MessageListFragment.getInstance(mThreadId, mRowId, mHighlight, mShowImmediate); } + mSwipeBackLayout.setScrollChangedListener(fragment); FragmentTransaction menuTransaction = fm.beginTransaction(); menuTransaction.replace(R.id.content_frame, fragment); menuTransaction.commit(); diff --git a/QKSMS/src/main/res/anim/slide_in.xml b/QKSMS/src/main/res/anim/slide_in.xml deleted file mode 100644 index cb11c506..00000000 --- a/QKSMS/src/main/res/anim/slide_in.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/QKSMS/src/main/res/anim/slide_out.xml b/QKSMS/src/main/res/anim/slide_out.xml deleted file mode 100644 index 568b703d..00000000 --- a/QKSMS/src/main/res/anim/slide_out.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file