Merge branches 'develop' and 'feature/issue_2/only_view_mode' of https://gitlab.cleveroad.com/open-source/android/table-layout into develop

Author: ivan_syabro_cr

library/src/main/java/com/cleveroad/adaptivetablelayout/AdaptiveTableLayout.java

@@ -140,6 +140,12 @@ public boolean isRTL() {
  return LayoutDirectionHelper.isRTL(this);
  }
 
+ @Override
+ public void setLayoutDirection(int layoutDirection) {
+ super.setLayoutDirection(layoutDirection);
+ mShadowHelper.onLayoutDirectionChanged();
+ }
+
  @Override
  protected void onLayout(boolean changed, int l, int t, int r, int b) {
  if (changed) {
@@ -161,6 +167,7 @@ private void initAttrs(Context context, AttributeSet attrs) {
  mSettings.setHeaderFixed(a.getBoolean(R.styleable.AdaptiveTableLayout_fixedHeaders, true));
  mSettings.setCellMargin(a.getDimensionPixelSize(R.styleable.AdaptiveTableLayout_cellMargin, 0));
  mSettings.setSolidRowHeader(a.getBoolean(R.styleable.AdaptiveTableLayout_solidRowHeaders, true));
+ mSettings.setDragAndDropEnabled(a.getBoolean(R.styleable.AdaptiveTableLayout_dragAndDropEnabled, true));
  } finally {
  a.recycle();
  }
@@ -1375,6 +1382,11 @@ public void onLongPress(MotionEvent e) {
  // search view holder by x, y
  ViewHolder viewHolder = getViewHolderByPosition((int) e.getX(), (int) e.getY());
  if (viewHolder != null) {
+
+ if (!mSettings.isDragAndDropEnabled()){
+ checkLongPressForItemAndFirstHeader(viewHolder);
+ return;
+ }
  // save start dragging touch position
  mDragAndDropPoints.setStart((int) (mState.getScrollX() + e.getX()), (int) (mState.getScrollY() + e.getY()));
  if (viewHolder.getItemType() == ViewHolderType.COLUMN_HEADER) {
@@ -1410,14 +1422,18 @@ public void onLongPress(MotionEvent e) {
  refreshViewHolders();
 
  } else {
- OnItemLongClickListener onItemClickListener = mAdapter.getOnItemLongClickListener();
- if (onItemClickListener != null) {
- if (viewHolder.getItemType() == ViewHolderType.ITEM) {
- onItemClickListener.onItemLongClick(viewHolder.getRowIndex(), viewHolder.getColumnIndex());
- } else if (viewHolder.getItemType() == ViewHolderType.FIRST_HEADER) {
- onItemClickListener.onLeftTopHeaderLongClick();
- }
- }
+ checkLongPressForItemAndFirstHeader(viewHolder);
+ }
+ }
+ }
+
+ private void checkLongPressForItemAndFirstHeader(ViewHolder viewHolder){
+ OnItemLongClickListener onItemClickListener = mAdapter.getOnItemLongClickListener();
+ if (onItemClickListener != null) {
+ if (viewHolder.getItemType() == ViewHolderType.ITEM) {
+ onItemClickListener.onItemLongClick(viewHolder.getRowIndex(), viewHolder.getColumnIndex());
+ } else if (viewHolder.getItemType() == ViewHolderType.FIRST_HEADER) {
+ onItemClickListener.onLeftTopHeaderLongClick();
  }
  }
  }
@@ -1682,6 +1698,14 @@ public void setSolidRowHeader(boolean solidRowHeader) {
  mSettings.setSolidRowHeader(solidRowHeader);
  }
 
+ public boolean isDragAndDropEnabled(){
+ return mSettings.isDragAndDropEnabled();
+ }
+
+ public void setDragAndDropEnabled(boolean enabled){
+ mSettings.setDragAndDropEnabled(enabled);
+ }
+
  private static class TableInstanceSaver implements Parcelable {
  public static final Creator<TableInstanceSaver> CREATOR = new Creator<TableInstanceSaver>() {
  @Override

library/src/main/java/com/cleveroad/adaptivetablelayout/AdaptiveTableLayoutSettings.java

@@ -24,6 +24,11 @@ class AdaptiveTableLayoutSettings {
  */
  private boolean mSolidRowHeader;
 
+ /**
+ * If true, then the table can be edited, otherwise it is impossible
+ */
+ private boolean mDragAndDropEnabled;
+
 
  AdaptiveTableLayoutSettings() {
  }
@@ -72,4 +77,12 @@ public AdaptiveTableLayoutSettings setSolidRowHeader(boolean solidRowHeader) {
  mSolidRowHeader = solidRowHeader;
  return this;
  }
+
+ public boolean isDragAndDropEnabled() {
+ return mDragAndDropEnabled;
+ }
+
+ public void setDragAndDropEnabled(boolean dragAndDropEnabled) {
+ mDragAndDropEnabled = dragAndDropEnabled;
+ }
 }

library/src/main/java/com/cleveroad/adaptivetablelayout/ShadowHelper.java

@@ -19,6 +19,7 @@ class ShadowHelper {
  private View mColumnsHeadersShadow;
  @Nullable
  private View mRowsHeadersShadow;
+
  private View mParentView;
 
  public ShadowHelper(View v) {
@@ -48,7 +49,7 @@ View getColumnsHeadersShadow() {
  View addRowsHeadersShadow(ViewGroup group) {
  if (mRowsHeadersShadow == null) {
  mRowsHeadersShadow = new View(group.getContext());
- mRowsHeadersShadow.setBackgroundResource(getLayoutDirection() == LayoutDirection.RTL
+ mRowsHeadersShadow.setBackgroundResource(getLayoutDirection() == LayoutDirection.LTR
  ? R.drawable.shadow_right
  : R.drawable.shadow_left);
  group.addView(mRowsHeadersShadow, 0);
@@ -156,4 +157,14 @@ void removeAllDragAndDropShadows(ViewGroup group) {
  mBottomShadow = null;
  }
  }
+
+ public void onLayoutDirectionChanged() {
+ if (getRowsHeadersShadow() != null) {
+ getRowsHeadersShadow().setBackgroundResource(
+ getLayoutDirection() == LayoutDirection.LTR
+ ? R.drawable.shadow_right
+ : R.drawable.shadow_left);
+ getRowsHeadersShadow().requestLayout();
+ }
+ }
 }

library/src/main/res/drawable-ldrtl/shadow_left.xml

@@ -4,5 +4,6 @@
  <attr name="fixedHeaders" format="boolean"/>
  <attr name="cellMargin" format="dimension"/>
  <attr name="solidRowHeaders" format="boolean"/>
+ <attr name="dragAndDropEnabled" format="boolean"/>
  </declare-styleable>
 </resources>

library/src/main/res/drawable-ldrtl/shadow_right.xml

@@ -94,14 +94,15 @@ public boolean onMenuItemClick(MenuItem item) {
  SettingsDialog.newInstance(
  mTableLayout.isHeaderFixed(),
  mTableLayout.isSolidRowHeader(),
- mTableLayout.isRTL())
+ mTableLayout.isRTL(),
+ mTableLayout.isDragAndDropEnabled())
  .show(getChildFragmentManager(), SettingsDialog.class.getSimpleName());
  }
  return true;
  }
  });
  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
- mTableLayout.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
+// mTableLayout.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
  }
  initAdapter();
 
@@ -154,6 +155,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
  data.getBooleanExtra(SettingsDialog.EXTRA_VALUE_RTL_DIRECTION, mTableLayout.isRTL())
  ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR);
  }
+ mTableLayout.setDragAndDropEnabled(data.getBooleanExtra(
+ SettingsDialog.EXTRA_VALUE_DRAG_AND_DROP_ENABLED, mTableLayout.isDragAndDropEnabled()));
  mTableAdapter.notifyDataSetChanged();
  }
  }

library/src/main/res/values/attrs.xml

@@ -22,6 +22,7 @@ public class SettingsDialog extends DialogFragment implements View.OnClickListen
  public static final String EXTRA_VALUE_SOLID_HEADER = "EXTRA_VALUE_SOLID_HEADER";
  public static final String EXTRA_VALUE_HEADER_FIXED = "EXTRA_VALUE_HEADER_FIXED";
  public static final String EXTRA_VALUE_RTL_DIRECTION = "EXTRA_VALUE_RTL_DIRECTION";
+ public static final String EXTRA_VALUE_DRAG_AND_DROP_ENABLED = "EXTRA_VALUE_DRAG_AND_DROP_ENABLED";
 
  /**
  * if true - value of row header fixed to the row. Fixed to the data
@@ -33,22 +34,25 @@ public class SettingsDialog extends DialogFragment implements View.OnClickListen
 
  private boolean mIsRtlDirection;
 
+ private boolean mIsDragAndDropEnabled;
+
  private SwitchCompat swSolidRow;
 
  private SwitchCompat swFixedHeaders;
 
  private SwitchCompat swRtlDirection;
 
- public static SettingsDialog newInstance(boolean isHeaderFixed, boolean solidRowHeader) {
- return newInstance(isHeaderFixed, solidRowHeader, false);
- }
+ private SwitchCompat swDragAndDropEnabled;
 
- public static SettingsDialog newInstance(boolean isHeaderFixed, boolean solidRowHeader, boolean isRtlDirection) {
+
+ public static SettingsDialog newInstance(boolean isHeaderFixed, boolean solidRowHeader,
+ boolean isRtlDirection ,boolean isDragAndDropEnabled) {
  SettingsDialog dialog = new SettingsDialog();
  Bundle args = new Bundle();
  args.putBoolean(EXTRA_VALUE_HEADER_FIXED, isHeaderFixed);
  args.putBoolean(EXTRA_VALUE_SOLID_HEADER, solidRowHeader);
  args.putBoolean(EXTRA_VALUE_RTL_DIRECTION, isRtlDirection);
+ args.putBoolean(EXTRA_VALUE_DRAG_AND_DROP_ENABLED, isDragAndDropEnabled);
  dialog.setArguments(args);
  return dialog;
  }
@@ -59,6 +63,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
  mSolidRowHeader = getArguments().getBoolean(EXTRA_VALUE_SOLID_HEADER);
  mIsHeaderFixed = getArguments().getBoolean(EXTRA_VALUE_HEADER_FIXED);
  mIsRtlDirection = getArguments().getBoolean(EXTRA_VALUE_RTL_DIRECTION);
+ mIsDragAndDropEnabled = getArguments().getBoolean(EXTRA_VALUE_DRAG_AND_DROP_ENABLED);
  }
 
  @Nullable
@@ -71,6 +76,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
  swSolidRow = (SwitchCompat) view.findViewById(R.id.swSolidRow);
  swFixedHeaders = (SwitchCompat) view.findViewById(R.id.swFixedHeaders);
  swRtlDirection = (SwitchCompat) view.findViewById(R.id.swRtlDirection);
+ swDragAndDropEnabled = (SwitchCompat) view.findViewById(R.id.swDragAndDropEnabled);
 
  return view;
  }
@@ -85,6 +91,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
  swFixedHeaders.setChecked(mIsHeaderFixed);
  swSolidRow.setChecked(mSolidRowHeader);
  swRtlDirection.setChecked(mIsRtlDirection);
+ swDragAndDropEnabled.setChecked(mIsDragAndDropEnabled);
 
  swFixedHeaders.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
  @Override
@@ -104,6 +111,12 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
  mIsRtlDirection = isChecked;
  }
  });
+ swDragAndDropEnabled.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
+ mIsDragAndDropEnabled = isChecked;
+ }
+ });
 
 
  }
@@ -130,6 +143,7 @@ public void onClick(View v) {
  intent.putExtra(EXTRA_VALUE_SOLID_HEADER, mSolidRowHeader);
  intent.putExtra(EXTRA_VALUE_HEADER_FIXED, mIsHeaderFixed);
  intent.putExtra(EXTRA_VALUE_RTL_DIRECTION, mIsRtlDirection);
+ intent.putExtra(EXTRA_VALUE_DRAG_AND_DROP_ENABLED, mIsDragAndDropEnabled);
  getParentFragment().onActivityResult(REQUEST_CODE_SETTINGS, Activity.RESULT_OK, intent);
  break;
  case R.id.bNegative:

sample/src/main/java/com/cleveroad/sample/ui/TableLayoutFragment.java

@@ -57,6 +57,16 @@
  android:textColor="@color/colorTextWhite"
  android:textSize="18sp"/>
 
+ <android.support.v7.widget.SwitchCompat
+ android:id="@+id/swDragAndDropEnabled"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/swRtlDirection"
+ android:layout_marginTop="16dp"
+ android:text="@string/settings_drag_and_drop_enabled"
+ android:textColor="@color/colorTextWhite"
+ android:textSize="18sp"/>
+
  <LinearLayout
  android:id="@+id/llButtonsContainer"
  android:layout_width="match_parent"

sample/src/main/java/com/cleveroad/sample/ui/dialogs/SettingsDialog.java

@@ -25,8 +25,9 @@
  android:layout_height="match_parent"
  android:layout_below="@+id/toolbar"
  app:cellMargin="1dp"
+ app:dragAndDropEnabled="true"
  app:fixedHeaders="true"
- app:solidRowHeaders="true" />
+ app:solidRowHeaders="true"/>
 
  <View
  android:id="@+id/separator"