eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-31 00:07:14 +00:00
Code Activity

first compileable version of ubilabs--rcapp--develop-update-libs branch with upgraded consumption of advrecyclerview-0.7.4

Browse Source 
Change-Id: Iaaa96c2e5b66295d202de2b25fc04a2eab7bdd93
This commit is contained in:
Axel Uhl committed 2016-04-25 12:53:20 +02:00
1 parent 50be7ce4b5
commit f081650fef
7 files changed
+48 -124
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.racecommittee.app/build.gradle
+1 -1
View File
@@ -72,7 +72,7 @@ android {
}
dependencies {
compile "com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.6.2"
compile "com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.7.4"
/* support libraries */
compile "com.android.support:appcompat-v7:${rootProject.ext.support}"
mobile/com.sap.sailing.racecommittee.app/pom.xml
+1 -1
View File
@@ -35,7 +35,7 @@
<dependency>
<groupId>com.h6ah4i.android.widget.advrecyclerview</groupId>
<artifactId>advrecyclerview</artifactId>
<version>0.6.2</version>
<version>0.7.4</version>
<type>aar</type>
<exclusions>
<exclusion>
mobile/com.sap.sailing.racecommittee.app/project.properties
+5 -5
View File
@@ -12,9 +12,9 @@
# Project target.
target=Google Inc.:Google APIs:22
android.library.reference.1=../google-play-services_lib
android.library.reference.2=../com.sap.sailing.android.shared
android.library.reference.3=../google-android-support-v7-recyclerview_lib
android.library.reference.4=../github-advrecyclerview_lib
android.library.reference.5=../licensesdialog_lib/de.psdev.licensesdialog
android.library.reference.1=..\\google-play-services_lib
android.library.reference.2=..\\com.sap.sailing.android.shared
android.library.reference.3=..\\google-android-support-v7-recyclerview_lib
android.library.reference.4=..\\github-advrecyclerview_lib
android.library.reference.5=..\\licensesdialog_lib\\de.psdev.licensesdialog
android.library.reference.6=../google-android-support-v13
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/BaseDraggableSwipeViewHolder.java
-72
View File
@@ -1,72 +0,0 @@
package com.sap.sailing.racecommittee.app.ui.adapters;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemViewHolder;
import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager;
import com.h6ah4i.android.widget.advrecyclerview.swipeable.SwipeableItemViewHolder;
public abstract class BaseDraggableSwipeViewHolder extends RecyclerView.ViewHolder
implements DraggableItemViewHolder, SwipeableItemViewHolder {
private int mDragStateFlags;
private int mSwipeStateFlags;
private int mSwipeResult = RecyclerViewSwipeManager.RESULT_NONE;
private int mAfterSwipeReaction = RecyclerViewSwipeManager.AFTER_SWIPE_REACTION_DEFAULT;
private float mSwipeAmount;
public BaseDraggableSwipeViewHolder(View itemView) {
super(itemView);
}
@Override
public void setDragStateFlags(int flags) {
mDragStateFlags = flags;
}
@Override
public int getDragStateFlags() {
return mDragStateFlags;
}
@Override
public void setSwipeStateFlags(int flags) {
mSwipeStateFlags = flags;
}
@Override
public int getSwipeStateFlags() {
return mSwipeStateFlags;
}
@Override
public void setSwipeResult(int result) {
mSwipeResult = result;
}
@Override
public int getSwipeResult() {
return mSwipeResult;
}
@Override
public void setAfterSwipeReaction(int reaction) {
mAfterSwipeReaction = reaction;
}
@Override
public int getAfterSwipeReaction() {
return mAfterSwipeReaction;
}
@Override
public void setSwipeItemSlideAmount(float amount) {
mSwipeAmount = amount;
}
@Override
public float getSwipeItemSlideAmount() {
return mSwipeAmount;
}
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java
+19 -20
View File
@@ -2,6 +2,17 @@ package com.sap.sailing.racecommittee.app.ui.adapters;
import java.util.List;
import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange;
import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager;
import com.h6ah4i.android.widget.advrecyclerview.utils.AbstractDraggableSwipeableItemViewHolder;
import com.sap.sailing.android.shared.util.BitmapHelper;
import com.sap.sailing.android.shared.util.ViewHelper;
import com.sap.sailing.domain.common.MaxPointsReason;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.domain.impl.CompetitorResultWithIdImpl;
import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.support.v4.view.ViewCompat;
@@ -10,16 +21,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange;
import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager;
import com.sap.sailing.android.shared.util.BitmapHelper;
import com.sap.sailing.android.shared.util.ViewHelper;
import com.sap.sailing.domain.common.MaxPointsReason;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.domain.impl.CompetitorResultWithIdImpl;
import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapter.ViewHolder> {
private Context mContext;
@@ -80,7 +81,7 @@ public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapt
}
@Override
public boolean onCheckCanStartDrag(ViewHolder holder, int x, int y) {
public boolean onCheckCanStartDrag(ViewHolder holder, int position, int x, int y) {
// x, y --- relative from the itemView's top-left
View containerView = holder.container;
View dragHandleView = holder.dragHandle;
@@ -92,7 +93,7 @@ public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapt
}
@Override
public ItemDraggableRange onGetItemDraggableRange(ViewHolder viewHolder) {
public ItemDraggableRange onGetItemDraggableRange(ViewHolder viewHolder, int position) {
return null;
}
@@ -113,8 +114,8 @@ public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapt
}
@Override
public int onGetSwipeReactionType(ViewHolder holder, int x, int y) {
if (onCheckCanStartDrag(holder, x, y)) {
public int onGetSwipeReactionType(ViewHolder holder, int position, int x, int y) {
if (onCheckCanStartDrag(holder, position, x, y)) {
return RecyclerViewSwipeManager.REACTION_CAN_NOT_SWIPE_BOTH;
} else {
return RecyclerViewSwipeManager.REACTION_CAN_SWIPE_BOTH;
@@ -122,7 +123,7 @@ public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapt
}
@Override
public void onSetSwipeBackground(ViewHolder viewHolder, int type) {
public void onSetSwipeBackground(ViewHolder viewHolder, int position, int type) {
int bgRes = 0;
switch (type) {
case RecyclerViewSwipeManager.DRAWABLE_SWIPE_NEUTRAL_BACKGROUND:
@@ -142,7 +143,7 @@ public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapt
}
@Override
public int onSwipeItem(ViewHolder viewHolder, int result) {
public int onSwipeItem(ViewHolder viewHolder, int position, int result) {
switch (result) {
case RecyclerViewSwipeManager.RESULT_SWIPED_LEFT:
case RecyclerViewSwipeManager.RESULT_SWIPED_RIGHT:
@@ -154,11 +155,9 @@ public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapt
}
@Override
public void onPerformAfterSwipeReaction(ViewHolder holder, int result, int reaction) {
public void onPerformAfterSwipeReaction(ViewHolder holder, int position, int result, int reaction) {
switch (reaction) {
case RecyclerViewSwipeManager.AFTER_SWIPE_REACTION_REMOVE_ITEM:
int position = holder.getAdapterPosition();
if (mListener != null) {
mListener.onItemRemoved(mCompetitor.get(position));
mCompetitor.remove(position);
@@ -181,7 +180,7 @@ public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapt
void onEditItem(CompetitorResultWithIdImpl item, int position);
}
public class ViewHolder extends BaseDraggableSwipeViewHolder implements View.OnLongClickListener {
public class ViewHolder extends AbstractDraggableSwipeableItemViewHolder implements View.OnLongClickListener {
public View container;
public View dragHandle;
public View editItem;
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/CourseElementAdapter.java
+22 -25
View File
@@ -3,6 +3,20 @@ package com.sap.sailing.racecommittee.app.ui.adapters.coursedesign;
import java.util.ArrayList;
import java.util.List;
import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange;
import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager;
import com.h6ah4i.android.widget.advrecyclerview.utils.AbstractDraggableSwipeableItemViewHolder;
import com.sap.sailing.android.shared.logging.ExLog;
import com.sap.sailing.android.shared.util.BitmapHelper;
import com.sap.sailing.android.shared.util.ViewHelper;
import com.sap.sailing.domain.common.PassingInstruction;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.domain.impl.CourseListDataElementWithIdImpl;
import com.sap.sailing.racecommittee.app.ui.adapters.BaseDraggableSwipeAdapter;
import com.sap.sailing.racecommittee.app.ui.utils.MarkImageHelper;
import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.support.v4.view.ViewCompat;
@@ -13,20 +27,6 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange;
import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager;
import com.sap.sailing.android.shared.logging.ExLog;
import com.sap.sailing.android.shared.util.BitmapHelper;
import com.sap.sailing.android.shared.util.ViewHelper;
import com.sap.sailing.domain.common.PassingInstruction;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.domain.impl.CourseListDataElementWithIdImpl;
import com.sap.sailing.racecommittee.app.ui.adapters.BaseDraggableSwipeAdapter;
import com.sap.sailing.racecommittee.app.ui.adapters.BaseDraggableSwipeViewHolder;
import com.sap.sailing.racecommittee.app.ui.utils.MarkImageHelper;
import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
public class CourseElementAdapter extends BaseDraggableSwipeAdapter<RecyclerView.ViewHolder> {
private final static String TAG = CourseElementAdapter.class.getName();
@@ -195,7 +195,7 @@ public class CourseElementAdapter extends BaseDraggableSwipeAdapter<RecyclerView
}
@Override
public boolean onCheckCanStartDrag(RecyclerView.ViewHolder holder, int x, int y) {
public boolean onCheckCanStartDrag(RecyclerView.ViewHolder holder, int position, int x, int y) {
if (holder instanceof ItemViewHolder) {
ItemViewHolder itemHolder = (ItemViewHolder) holder;
// x, y --- relative from the itemView's top-left
@@ -212,7 +212,7 @@ public class CourseElementAdapter extends BaseDraggableSwipeAdapter<RecyclerView
}
@Override
public ItemDraggableRange onGetItemDraggableRange(RecyclerView.ViewHolder holder) {
public ItemDraggableRange onGetItemDraggableRange(RecyclerView.ViewHolder holder, int position) {
if (mElements == null) {
return null;
}
@@ -233,8 +233,8 @@ public class CourseElementAdapter extends BaseDraggableSwipeAdapter<RecyclerView
}
@Override
public int onGetSwipeReactionType(RecyclerView.ViewHolder holder, int x, int y) {
if (onCheckCanStartDrag(holder, x, y)) {
public int onGetSwipeReactionType(RecyclerView.ViewHolder holder, int position, int x, int y) {
if (onCheckCanStartDrag(holder, position, x, y)) {
return RecyclerViewSwipeManager.REACTION_CAN_NOT_SWIPE_BOTH;
} else {
return RecyclerViewSwipeManager.REACTION_CAN_SWIPE_BOTH;
@@ -242,7 +242,7 @@ public class CourseElementAdapter extends BaseDraggableSwipeAdapter<RecyclerView
}
@Override
public void onSetSwipeBackground(RecyclerView.ViewHolder holder, int type) {
public void onSetSwipeBackground(RecyclerView.ViewHolder holder, int position, int type) {
if (holder instanceof ItemViewHolder) {
int bgRes = 0;
switch (type) {
@@ -265,7 +265,7 @@ public class CourseElementAdapter extends BaseDraggableSwipeAdapter<RecyclerView
}
@Override
public int onSwipeItem(RecyclerView.ViewHolder holder, int result) {
public int onSwipeItem(RecyclerView.ViewHolder holder, int position, int result) {
if (holder instanceof ItemViewHolder) {
switch (result) {
case RecyclerViewSwipeManager.RESULT_SWIPED_LEFT:
@@ -281,12 +281,9 @@ public class CourseElementAdapter extends BaseDraggableSwipeAdapter<RecyclerView
}
@Override
public void onPerformAfterSwipeReaction(RecyclerView.ViewHolder holder, int result, int reaction) {
public void onPerformAfterSwipeReaction(RecyclerView.ViewHolder holder, int position, int result, int reaction) {
ExLog.i(mContext, TAG, "onPerformAfterSwipeReaction() called with: " + "holder = [" + holder + "], result = [" + result + "], reaction = [" + reaction + "]");
int position = holder.getAdapterPosition();
CourseListDataElementWithIdImpl element = mElements.get(position);
switch (reaction) {
case RecyclerViewSwipeManager.AFTER_SWIPE_REACTION_REMOVE_ITEM:
mElements.remove(element);
@@ -335,7 +332,7 @@ public class CourseElementAdapter extends BaseDraggableSwipeAdapter<RecyclerView
}
}
public class ItemViewHolder extends BaseDraggableSwipeViewHolder implements View.OnClickListener {
public class ItemViewHolder extends AbstractDraggableSwipeableItemViewHolder implements View.OnClickListener {
public ViewGroup container;
public View dragHandle;
mobile/google-android-support-v13/libs/internal_impl-22.2.1.jar
BIN
View File
Binary file not shown.