From 07e562175834a936859e602fca805b6d6869e0fe Mon Sep 17 00:00:00 2001 From: jaeger Date: Fri, 9 Sep 2016 11:24:21 +0800 Subject: [PATCH] fix package name --- .../src/main/java/com/jaeger/library/L.java | 2 +- .../com/jaeger/library/OnSelectListener.java | 2 +- .../java/com/jaeger/library/SelectUtil.java | 2 +- .../jaeger/library/SelectableTextHelper.java | 28 +++++++++++-------- .../com/jaeger/library/SelectionInfo.java | 2 +- sample/src/main/AndroidManifest.xml | 1 - .../selectabletexthelper/MainActivity.java | 17 +++-------- 7 files changed, 25 insertions(+), 29 deletions(-) diff --git a/library/src/main/java/com/jaeger/library/L.java b/library/src/main/java/com/jaeger/library/L.java index e6f56d7..a47da87 100644 --- a/library/src/main/java/com/jaeger/library/L.java +++ b/library/src/main/java/com/jaeger/library/L.java @@ -1,4 +1,4 @@ -package com.jaeger.selectabletexthelper; +package com.jaeger.library; import android.util.Log; diff --git a/library/src/main/java/com/jaeger/library/OnSelectListener.java b/library/src/main/java/com/jaeger/library/OnSelectListener.java index c601b32..0d70dba 100644 --- a/library/src/main/java/com/jaeger/library/OnSelectListener.java +++ b/library/src/main/java/com/jaeger/library/OnSelectListener.java @@ -1,4 +1,4 @@ -package com.jaeger.selectabletexthelper; +package com.jaeger.library; /** * Created by Jaeger on 16/8/30. diff --git a/library/src/main/java/com/jaeger/library/SelectUtil.java b/library/src/main/java/com/jaeger/library/SelectUtil.java index 1b7d6dd..4833df0 100644 --- a/library/src/main/java/com/jaeger/library/SelectUtil.java +++ b/library/src/main/java/com/jaeger/library/SelectUtil.java @@ -1,4 +1,4 @@ -package com.jaeger.selectabletexthelper; +package com.jaeger.library; import android.content.Context; import android.text.Layout; diff --git a/library/src/main/java/com/jaeger/library/SelectableTextHelper.java b/library/src/main/java/com/jaeger/library/SelectableTextHelper.java index bb83354..9d6c9df 100644 --- a/library/src/main/java/com/jaeger/library/SelectableTextHelper.java +++ b/library/src/main/java/com/jaeger/library/SelectableTextHelper.java @@ -1,5 +1,7 @@ package com.jaeger.library; +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; @@ -28,13 +30,13 @@ public class SelectableTextHelper { private final static String TAG = SelectableTextHelper.class.getSimpleName(); private final static int DEFAULT_SELECT_LENGTH = 1; - private static final int DEFAULT_SHOW_DURATION = 200; + private static final int DEFAULT_SHOW_DURATION = 100; private CursorHandle mStartHandle; private CursorHandle mEndHandle; private OperateWindow mOperateWindow; - private com.jaeger.selectabletexthelper.SelectionInfo mSelectionInfo = new com.jaeger.selectabletexthelper.SelectionInfo(); - private com.jaeger.selectabletexthelper.OnSelectListener mSelectListener; + private SelectionInfo mSelectionInfo = new SelectionInfo(); + private OnSelectListener mSelectListener; private Context mContext; private TextView mTextView; @@ -180,7 +182,7 @@ private void show(int x, int y) { if (mStartHandle == null) mStartHandle = new CursorHandle(mTextView, true); if (mEndHandle == null) mEndHandle = new CursorHandle(mTextView, false); - int startOffset = com.jaeger.selectabletexthelper.SelectUtil.getPreciseOffset(mTextView, x, y); + int startOffset = SelectUtil.getPreciseOffset(mTextView, x, y); int endOffset = startOffset + DEFAULT_SELECT_LENGTH; if (mTextView.getText() instanceof Spannable) { mSpannable = (Spannable) mTextView.getText(); @@ -223,7 +225,7 @@ private void selectText(int startPos, int endPos) { } } - public void setSelectListener(com.jaeger.selectabletexthelper.OnSelectListener selectListener) { + public void setSelectListener(OnSelectListener selectListener) { mSelectListener = selectListener; } @@ -258,10 +260,12 @@ public OperateWindow(final Context context) { contentView.findViewById(R.id.tv_copy).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + ClipboardManager clip = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE); + clip.setPrimaryClip( + ClipData.newPlainText(mSelectionInfo.mSelectionContent, mSelectionInfo.mSelectionContent)); if (mSelectListener != null) { mSelectListener.onTextSelected(mSelectionInfo.mSelectionContent); } - //Toast.makeText(context, mSelectionInfo.mSelectionContent, Toast.LENGTH_SHORT).show(); SelectableTextHelper.this.removeSelect(); SelectableTextHelper.this.hideSelect(); } @@ -281,8 +285,8 @@ public void show() { int posY = layout.getLineTop(layout.getLineForOffset(mSelectionInfo.mStart)) + mTempCoors[1] - mHeight - 16; if (posX <= 0) posX = 16; if (posY < 0) posY = 16; - if (posX + mWidth > com.jaeger.selectabletexthelper.SelectUtil.getScreenWidth(mContext)) { - posX = com.jaeger.selectabletexthelper.SelectUtil.getScreenWidth(mContext) - mWidth - 16; + if (posX + mWidth > SelectUtil.getScreenWidth(mContext)) { + posX = SelectUtil.getScreenWidth(mContext) - mWidth - 16; } mWindow.showAtLocation(mTextView, Gravity.NO_GRAVITY, posX, posY); } @@ -393,7 +397,7 @@ public void update(int x, int y) { //x += mTempCoors[0] - mTextView.getPaddingLeft(); y = y - mTempCoors[1]; - int offset = com.jaeger.selectabletexthelper.SelectUtil.getHysteresisOffset(mTextView, x, y, oldOffset); + int offset = SelectUtil.getHysteresisOffset(mTextView, x, y, oldOffset); if (offset != oldOffset) { removeSelect(); @@ -440,10 +444,12 @@ private void updateCursor() { } public void show(int x, int y) { - com.jaeger.selectabletexthelper.L.d("show x is " + x + " show y is " + y); mTextView.getLocationInWindow(mTempCoors); int offset = isLeft ? mWidth : 0; - mPopupWindow.showAtLocation(mTextView, Gravity.NO_GRAVITY, +x - offset + getExtraX(), y + getExtraY()); + if (isLeft) { + L.d("y is " + y + "extra y is " + getExtraY()); + } + mPopupWindow.showAtLocation(mTextView, Gravity.NO_GRAVITY, x - offset + getExtraX(), y + getExtraY()); } public int getExtraX() { diff --git a/library/src/main/java/com/jaeger/library/SelectionInfo.java b/library/src/main/java/com/jaeger/library/SelectionInfo.java index 8f1481f..36e1f6a 100644 --- a/library/src/main/java/com/jaeger/library/SelectionInfo.java +++ b/library/src/main/java/com/jaeger/library/SelectionInfo.java @@ -1,4 +1,4 @@ -package com.jaeger.selectabletexthelper; +package com.jaeger.library; /** * Created by Jaeger on 16/8/30. diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 6cb357e..a524c31 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -11,7 +11,6 @@ - diff --git a/sample/src/main/java/com/jaeger/selectabletexthelper/MainActivity.java b/sample/src/main/java/com/jaeger/selectabletexthelper/MainActivity.java index 7671f24..3c4374d 100644 --- a/sample/src/main/java/com/jaeger/selectabletexthelper/MainActivity.java +++ b/sample/src/main/java/com/jaeger/selectabletexthelper/MainActivity.java @@ -1,12 +1,11 @@ package com.jaeger.selectabletexthelper; -import android.content.ClipData; -import android.content.Context; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import android.widget.TextView; +import com.jaeger.library.OnSelectListener; import com.jaeger.library.SelectableTextHelper; public class MainActivity extends AppCompatActivity { @@ -29,20 +28,12 @@ protected void onCreate(Bundle savedInstanceState) { //mTvTest.setTextIsSelectable(true); mSelectableText = new SelectableTextHelper(mTvTest); - mSelectableText.setSelectListener(new com.jaeger.selectabletexthelper.OnSelectListener() { + mSelectableText.setSelectListener(new OnSelectListener() { @Override public void onTextSelected(CharSequence content) { - android.content.ClipboardManager clip = - (android.content.ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); - clip.setPrimaryClip(ClipData.newPlainText(content, content)); - //Toast.makeText(MainActivity.this, content.toString(), Toast.LENGTH_SHORT).show(); + + } }); } - - @Override - protected void onPause() { - //mSelectableText.destroy(); - super.onPause(); - } }