加入置顶功能

graffiti/src/main/java/cn/hzw/graffiti/GraffitiActivity.java

@@ -459,6 +459,7 @@ private void initView() {
  findViewById(R.id.btn_undo).setOnClickListener(mOnClickListener);
  findViewById(R.id.graffiti_selectable_edit).setOnClickListener(mOnClickListener);
  findViewById(R.id.graffiti_selectable_remove).setOnClickListener(mOnClickListener);
+ findViewById(R.id.graffiti_selectable_top).setOnClickListener(mOnClickListener);
  mShapeModeContainer = findViewById(R.id.bar_shape_mode);
  mSelectedTextEditContainer = findViewById(R.id.graffiti_selectable_edit_container);
  mEditContainer = findViewById(R.id.graffiti_edit_container);
@@ -800,6 +801,9 @@ public void onClick(View v) {
  } else if (v.getId() == R.id.graffiti_selectable_remove) {
  mGraffitiView.removeSelectedItem();
  mDone = true;
+ } else if (v.getId() == R.id.graffiti_selectable_top) {
+ mGraffitiView.topSelectedItem();
+ mDone = true;
  }
  if (mDone) {
  return;

graffiti/src/main/java/cn/hzw/graffiti/GraffitiView.java

@@ -791,6 +791,12 @@ public final void removeSelectableItem(GraffitiSelectableItem item) {
  mUndoStack.remove(item);
  }
 
+ public final void topSelectableItem(GraffitiSelectableItem item) {
+ removeSelectableItem(item);
+ mSelectableStack.add(item);
+ mUndoStack.add(item);
+ }
+
  private void initCanvas() {
  if (mGraffitiBitmap != null) {
  mGraffitiBitmap.recycle();
@@ -1205,6 +1211,14 @@ public void removeSelectedItem() {
  invalidate();
  }
 
+ public void topSelectedItem() {
+ if (mSelectedItem == null) {
+ throw new NullPointerException("Selected item is null!");
+ }
+ topSelectableItem(mSelectedItem);
+ invalidate();
+ }
+
  public float getOriginalPivotX() {
  return mOriginalPivotX;
  }

graffiti/src/main/java/cn/hzw/graffiti/imagepicker/ImageLoader.java

@@ -38,7 +38,7 @@ private ImageLoader(Context context) {
  mImageLoaderGroup = new ImageLoaderGroup(context, memoryCacheSize, 25 * 1024 * 1024);
  mImageLoaderGroup.addImageLoader(new LocalImagerLoader(context));
  ImageLoaderConfig config = mImageLoaderGroup.getImageLoaderConfig();
- config.setLoadingDrawable(context.getResources().getDrawable(R.drawable.imageselector_loading));
+ config.setLoadingDrawable(context.getResources().getDrawable(R.drawable.graffit_imageselector_loading));
  config.setLoadFailedDrawable(new ColorDrawable(Color.RED));
  }
 

graffiti/src/main/java/cn/hzw/graffiti/imagepicker/ImageSelectorAdapter.java

@@ -73,7 +73,7 @@ public long getItemId(int position) {
  public View getView(int position, View convertView, ViewGroup parent) {
  ViewHolder holder;
  if (convertView == null) {
- convertView = View.inflate(mContext, R.layout.imageselector_item, null);
+ convertView = View.inflate(mContext, R.layout.graffiti_imageselector_item, null);
  holder = new ViewHolder();
  holder.mImage = (ImageView) convertView.findViewById(R.id.image);
  holder.mImageSelected = (ImageView) convertView.findViewById(R.id.image_selected);

graffiti/src/main/java/cn/hzw/graffiti/imagepicker/ImageSelectorView.java

@@ -54,7 +54,7 @@ public class ImageSelectorView extends FrameLayout implements View.OnClickListen
 
  public ImageSelectorView(Context context, boolean isMultipleChoice, int maxCount, final List<String> pathList, ImageSelectorListener listener) {
  super(context);
- View view = LayoutInflater.from(getContext()).inflate(R.layout.activity_image_selector, null);
+ View view = LayoutInflater.from(getContext()).inflate(R.layout.graffit_layout_image_selector, null);
  addView(view, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
 
  mIsMultipleChoice = isMultipleChoice;

graffiti/src/main/res/layout/imageselector_item.xml → graffiti/src/main/res/layout/graffiti_imageselector_item.xml

@@ -21,6 +21,6 @@
  android:layout_marginRight="10dp"
  android:layout_marginTop="10dp"
  android:scaleType="fitXY"
- android:src="@drawable/imageselector_image_selected"
+ android:src="@drawable/graffiti_imageselector_image_selected"
  />
 </RelativeLayout>

graffiti/src/main/res/layout/layout_graffiti.xml

@@ -381,7 +381,18 @@
  android:layout_weight="1"
  android:background="@drawable/graffiti_btn_effect_rect_pressed_black"
  android:gravity="center"
- android:text="编辑"
+ android:text="@string/graffiti_edit"
+ android:textColor="#ffffff"
+ android:textSize="16dp"/>
+
+ <TextView
+ android:id="@+id/graffiti_selectable_top"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="@drawable/graffiti_btn_effect_rect_pressed_black"
+ android:gravity="center"
+ android:text="@string/graffiti_top"
  android:textColor="#ffffff"
  android:textSize="16dp"/>
 
@@ -392,7 +403,7 @@
  android:layout_weight="1"
  android:background="@drawable/graffiti_btn_effect_rect_pressed_black"
  android:gravity="center"
- android:text="移除"
+ android:text="@string/graffiti_remove"
  android:textColor="#ffffff"
  android:textSize="16dp"/>
  </LinearLayout>

graffiti/src/main/res/values/strings.xml

@@ -9,4 +9,8 @@
  <string name="graffiti_cancel">取消</string>
  <string name="graffiti_success">成功</string>
  <string name="graffiti_failed">失败</string>
+
+ <string name="graffiti_edit">编辑</string>
+ <string name="graffiti_remove">移除</string>
+ <string name="graffiti_top">置顶</string>
 </resources>