From f081650fefa9f1baab208699979260a2befaea8d Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 25 Apr 2016 12:53:20 +0200 Subject: [PATCH] first compileable version of ubilabs--rcapp--develop-update-libs branch with upgraded consumption of advrecyclerview-0.7.4 Change-Id: Iaaa96c2e5b66295d202de2b25fc04a2eab7bdd93 --- .../build.gradle | 2 +- .../com.sap.sailing.racecommittee.app/pom.xml | 2 +- .../project.properties | 10 +-- .../BaseDraggableSwipeViewHolder.java | 72 ------------------ .../app/ui/adapters/FinishListAdapter.java | 39 +++++----- .../coursedesign/CourseElementAdapter.java | 47 ++++++------ .../libs/internal_impl-22.2.1.jar | Bin 1708 -> 0 bytes 7 files changed, 48 insertions(+), 124 deletions(-) delete mode 100644 mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/BaseDraggableSwipeViewHolder.java delete mode 100644 mobile/google-android-support-v13/libs/internal_impl-22.2.1.jar diff --git a/mobile/com.sap.sailing.racecommittee.app/build.gradle b/mobile/com.sap.sailing.racecommittee.app/build.gradle index ff444e72e88..78e5e863cb1 100644 --- a/mobile/com.sap.sailing.racecommittee.app/build.gradle +++ b/mobile/com.sap.sailing.racecommittee.app/build.gradle @@ -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}" diff --git a/mobile/com.sap.sailing.racecommittee.app/pom.xml b/mobile/com.sap.sailing.racecommittee.app/pom.xml index 32064511831..e5c1627ea2f 100644 --- a/mobile/com.sap.sailing.racecommittee.app/pom.xml +++ b/mobile/com.sap.sailing.racecommittee.app/pom.xml @@ -35,7 +35,7 @@ com.h6ah4i.android.widget.advrecyclerview advrecyclerview - 0.6.2 + 0.7.4 aar diff --git a/mobile/com.sap.sailing.racecommittee.app/project.properties b/mobile/com.sap.sailing.racecommittee.app/project.properties index 280985d63c7..c16fb912f8d 100755 --- a/mobile/com.sap.sailing.racecommittee.app/project.properties +++ b/mobile/com.sap.sailing.racecommittee.app/project.properties @@ -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 diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/BaseDraggableSwipeViewHolder.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/BaseDraggableSwipeViewHolder.java deleted file mode 100644 index b9ed2bb06cd..00000000000 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/BaseDraggableSwipeViewHolder.java +++ /dev/null @@ -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; - } -} diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java index 4793a87b657..09625c7da3b 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java @@ -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 { private Context mContext; @@ -80,7 +81,7 @@ public class FinishListAdapter extends BaseDraggableSwipeAdapter { private final static String TAG = CourseElementAdapter.class.getName(); @@ -195,7 +195,7 @@ public class CourseElementAdapter extends BaseDraggableSwipeAdapter5_hy#O9 zACEq_qQvyv)Vvbs{M>@X5>Mw~z2uz4;^N)_U;jf60=3LHyw-kNDALmHe&EQlf+Gcr ziiVE12^Iyn4|RDj$i1c8X@9y~P3{llKaIzEidjnR<~QfgHUE5X&za-TZ(BF;Nr@F% zYz$~jUX-=S&0t-NeoFs@+-=8NV(e!WIwfk<)XiRFBX`$0f8~Tv1~WE2o#E>AJla5A z-qpuK-l$%THR;(gPYJe(CD*6RPH$ak-EpJlXzfk@FvZE&{{~JE=-RpGVV#lK#t%n= zPN+NW{i*wL_O-bg{$Csl%C2)hi#nZQY@!&kSfO)Sje^O8KQrq#CS<22^S5;dOPjrF zxwe0=aM!H&dNb|I-|u0a?{(;;UVN6ZZ>ntiiB+wyCkKZ2wi>OeTi3N@;y3LVmb&j( zU-vl3_371CbKVUF3zFiVwnrEFmu6cozFXn=tUY&WMrdKy%BIaP4+(OuWMy`pa_QjH zDaC(SQPb$tlSVb}z$j4$Mu`zAQQ{k92#J-c&{$Ch#!Ax(bMbx;9^Qu?51pJ$9DQ9Z z3!)Q_s$MY5eOO<4@kq1%0r}K9x-PZ_g_G~ztTcXq_W1Mbzu6naR*6kI5qV;9!lH~t zE(Us2S1;mI478RPniQL_#rbky(bKnCmeUS4OXy3S{I<6;Mu;LX&VFF`WN!FX@%&NEWOha zu=4MTKTEf{@6xYQ5-B^*sVSN_)uPa41KT~V87Jmla;OaF@7)=}E&bcTXG-pk6#{zy zj9C;HtIlaHNI!SCLQmbsF)zG+&r+%W24j_qpTFLGe0oY@#-HLFliXhAFPLsob6~w- zbLEmBTg^E)6r3X}JbsT3-JDVU zi#NcVkx7IZcPRsm8z2y1cioy5CGCO56Fb+f)y(Gbb|^Z2mt9m2V|n_1{F#8OaK*05CAfP37ERE znE)!F&`m)vpkU@KX|%#)3Xb9m-Ej1*hA{jrFuZX&5yNnJ#tZOfWdoVP0fa_C6H-_} FJOC<37-Rqd