From ef39a99ef827802db488ad2203e742ca58053696 Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Sat, 10 Mar 2018 13:23:28 +0530 Subject: [PATCH] FixedCompilingIssues+more Fixed issue #566 opened 16 days ago by @gipsyblues +Upgraded to the latest available sdks & library as per the requirement of Android Studio Version. 3.0.3 +Refactored code, especially redundant Casting --- build.gradle | 8 ++-- demo/extras/build.gradle | 19 ++++----- demo/stock/build.gradle | 8 ++-- extra/extra-dragdrop/build.gradle | 6 +-- extra/extra-staggeredgrid/build.gradle | 6 +-- extra/extra-twoway/build.gradle | 6 +-- gradle/wrapper/gradle-wrapper.properties | 4 +- library-cards/build.gradle | 8 ++-- .../library/cards/base/BaseMaterialCard.java | 2 +- .../material/MaterialLargeImageCard.java | 4 +- .../MaterialLargeImageCardThumbnail.java | 2 +- .../cards/topcolored/TopColoredCard.java | 8 ++-- library-core/build.gradle | 17 +++++--- library-core/src/main/AndroidManifest.xml | 3 +- .../cardslib/library/internal/Card.java | 39 +++++++------------ .../library/internal/CardArrayAdapter.java | 5 +-- .../library/internal/CardCursorAdapter.java | 10 ++--- .../cardslib/library/internal/CardExpand.java | 2 +- .../internal/CardExpandableListAdapter.java | 6 +-- .../internal/CardGridArrayAdapter.java | 4 +- .../internal/CardGridCursorAdapter.java | 10 ++--- .../cardslib/library/internal/CardHeader.java | 14 +++---- .../internal/base/BaseCardArrayAdapter.java | 9 ++--- .../internal/base/BaseCardCursorAdapter.java | 11 ++---- .../internal/base/CardUIInferface.java | 4 +- .../MultiChoiceAdapterHelperBase.java | 7 +--- .../library/prototypes/CardWithList.java | 36 +++++++---------- .../prototypes/SectionedCardAdapter.java | 2 +- .../cardslib/library/view/BaseCardView.java | 2 +- .../cardslib/library/view/CardView.java | 12 +++--- .../cardslib/library/view/CardViewNative.java | 10 ++--- .../library/view/ForegroundLinearLayout.java | 6 +-- .../library/view/base/CardViewInterface.java | 2 +- .../library/view/base/CardViewWrapper.java | 6 +-- .../view/component/CardHeaderView.java | 8 ++-- .../view/component/CardThumbnailView.java | 11 +++--- .../view/listener/UndoBarController.java | 26 ++++++------- .../view/listener/dismiss/Dismissable.java | 4 +- library-core/src/main/res/values/attrs.xml | 6 +-- library-recyclerview/build.gradle | 9 +++-- 40 files changed, 165 insertions(+), 197 deletions(-) diff --git a/build.gradle b/build.gradle index c43416d5..e2b693ca 100644 --- a/build.gradle +++ b/build.gradle @@ -2,16 +2,17 @@ buildscript { repositories { mavenCentral() + google() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.0' + classpath 'com.android.tools.build:gradle:3.0.1' } } ext { - compileSdkVersion = 22 - buildToolsVersion = "22.0.1" + compileSdkVersion = 27 + buildToolsVersion = "27.0.2" } def isReleaseBuild() { @@ -24,6 +25,7 @@ allprojects { repositories { mavenCentral() + google() } } diff --git a/demo/extras/build.gradle b/demo/extras/build.gradle index 28598719..5840c357 100644 --- a/demo/extras/build.gradle +++ b/demo/extras/build.gradle @@ -11,8 +11,8 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 + minSdkVersion 16 + targetSdkVersion 27 versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) } @@ -49,22 +49,22 @@ dependencies { compile project(':extra:extra-dragdrop') // Support Libraries - compile 'com.android.support:support-v4:22.1.1' - compile 'com.android.support:appcompat-v7:22.1.1' + compile 'com.android.support:support-v4:27.0.2' + compile 'com.android.support:appcompat-v7:27.0.2' //OkHttp //temporary patch for android-L for Okio packaging problem (see https://gist.github.com/JakeWharton/017738659d4f38adedc2) //compile fileTree(dir: 'libs', include: 'repackaged-*.jar') - compile 'com.squareup.okhttp:okhttp:2.0.0' + compile 'com.squareup.okhttp:okhttp:2.7.2' compile 'com.squareup.okhttp:okhttp-urlconnection:2.0.0' //Picasso - compile 'com.squareup.picasso:picasso:2.3.4' + compile 'com.squareup.picasso:picasso:2.5.2' //Ion //compile 'com.koushikdutta.ion:ion:1.3.1' //universal-image-loader - compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.1' + compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' //Actionbar pull to refresh compile 'com.github.chrisbanes.actionbarpulltorefresh:library:0.9.9' @@ -83,7 +83,8 @@ dependencies { compile ('se.emilsjolander:stickylistheaders:2.5.0') //Weather Lib - compile 'com.survivingwithandroid:weatherlib:1.3.2' +// compile 'com.survivingwithandroid:weatherlib:1.3.2' + compile 'com.survivingwithandroid:weatherlib:1.6.0' // Fading ActionBar //compile 'com.github.manuelpeinado.fadingactionbar:fadingactionbar:3.0.0' @@ -94,7 +95,7 @@ dependencies { compile 'com.github.castorflex.smoothprogressbar:library-circular:1.0.1' //FAB - compile 'com.melnykov:floatingactionbutton:1.0.6' + compile 'com.melnykov:floatingactionbutton:1.3.0' } diff --git a/demo/stock/build.gradle b/demo/stock/build.gradle index f571fa8c..9a34ac72 100644 --- a/demo/stock/build.gradle +++ b/demo/stock/build.gradle @@ -9,8 +9,8 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 + minSdkVersion 16 + targetSdkVersion 27 versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) @@ -46,8 +46,8 @@ dependencies { compile project(':library-cards') compile project(':library-recyclerview') // Support Libraries - compile 'com.android.support:support-v4:22.1.1' - compile 'com.android.support:appcompat-v7:22.1.1' + compile 'com.android.support:support-v4:27.0.2' + compile 'com.android.support:appcompat-v7:27.0.2' //androidTestCompile 'com.jakewharton.espresso:espresso:1.1-r2' } diff --git a/extra/extra-dragdrop/build.gradle b/extra/extra-dragdrop/build.gradle index 4d909f90..e2164655 100644 --- a/extra/extra-dragdrop/build.gradle +++ b/extra/extra-dragdrop/build.gradle @@ -9,8 +9,8 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 + minSdkVersion 16 + targetSdkVersion 27 versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) } @@ -31,4 +31,4 @@ dependencies { } // Used to update in Maven -//apply from: '../../maven_push.gradle' \ No newline at end of file +apply from: '../../maven_push.gradle' \ No newline at end of file diff --git a/extra/extra-staggeredgrid/build.gradle b/extra/extra-staggeredgrid/build.gradle index b6e728c1..331e02e9 100644 --- a/extra/extra-staggeredgrid/build.gradle +++ b/extra/extra-staggeredgrid/build.gradle @@ -9,8 +9,8 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 + minSdkVersion 16 + targetSdkVersion 27 versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) } @@ -30,4 +30,4 @@ dependencies { } // Used to update in Maven -//apply from: '../../maven_push.gradle' \ No newline at end of file +apply from: '../../maven_push.gradle' \ No newline at end of file diff --git a/extra/extra-twoway/build.gradle b/extra/extra-twoway/build.gradle index a10f96a2..7b971a9a 100644 --- a/extra/extra-twoway/build.gradle +++ b/extra/extra-twoway/build.gradle @@ -11,8 +11,8 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 + minSdkVersion 16 + targetSdkVersion 27 versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) } @@ -35,4 +35,4 @@ dependencies { } // Used to update in Maven -//apply from: '../maven_push.gradle' \ No newline at end of file +apply from: '../../maven_push.gradle' \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c04e8970..c6d4081a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jan 14 23:06:53 CET 2015 +#Wed Mar 07 18:47:06 IST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/library-cards/build.gradle b/library-cards/build.gradle index 8f39c8ab..9c178185 100644 --- a/library-cards/build.gradle +++ b/library-cards/build.gradle @@ -9,8 +9,8 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 + minSdkVersion 16 + targetSdkVersion 27 versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) } @@ -26,8 +26,8 @@ dependencies { compile project(':library-core') //Annotation - compile 'com.android.support:support-annotations:22.1.1' + compile 'com.android.support:support-annotations:27.1.0' } // Used to update in Maven -//apply from: '../maven_push.gradle' \ No newline at end of file +apply from: '../maven_push.gradle' \ No newline at end of file diff --git a/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/base/BaseMaterialCard.java b/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/base/BaseMaterialCard.java index 767fb92e..9d0d2d01 100644 --- a/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/base/BaseMaterialCard.java +++ b/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/base/BaseMaterialCard.java @@ -74,7 +74,7 @@ public BaseMaterialCard(Context context, int innerLayout) { protected View buildSupplementalActions() { if (getLayout_supplemental_actions_id() != INVALID_SUPPLEMENTAL_ACTIONS_LAYOUT) { - ViewStub stub = (ViewStub) ((View) getCardView()).findViewById(R.id.card_supplemental_actions_vs); + ViewStub stub = ((View) getCardView()).findViewById(R.id.card_supplemental_actions_vs); if (stub != null) { stub.setLayoutResource(getLayout_supplemental_actions_id()); return stub.inflate(); diff --git a/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/material/MaterialLargeImageCard.java b/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/material/MaterialLargeImageCard.java index 7498d585..ced02e3c 100644 --- a/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/material/MaterialLargeImageCard.java +++ b/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/material/MaterialLargeImageCard.java @@ -67,7 +67,7 @@ public class MaterialLargeImageCard extends BaseMaterialCard { */ protected CharSequence mSubTitle; - public static interface DrawableExternal{ + public interface DrawableExternal{ void setupInnerViewElements(ViewGroup parent, View viewImage); } @@ -215,7 +215,7 @@ public void setupInnerViewElements(ViewGroup parent, View view) { //Add a simple subtitle if (view != null) { - TextView mTitleView = (TextView) view.findViewById(R.id.card_main_inner_simple_subtitle); + TextView mTitleView = view.findViewById(R.id.card_main_inner_simple_subtitle); if (mTitleView != null) mTitleView.setText(mSubTitle); } diff --git a/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/material/MaterialLargeImageCardThumbnail.java b/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/material/MaterialLargeImageCardThumbnail.java index 82d26958..6c573ac1 100644 --- a/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/material/MaterialLargeImageCardThumbnail.java +++ b/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/material/MaterialLargeImageCardThumbnail.java @@ -81,7 +81,7 @@ public void setupInnerViewElements(ViewGroup parent, View imageView) { } //Title over the image - mTitleOverImageView = (TextView) parent.findViewById(default_text_id); + mTitleOverImageView = parent.findViewById(default_text_id); buildTextOverImage(); } diff --git a/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/topcolored/TopColoredCard.java b/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/topcolored/TopColoredCard.java index 8e26946e..4a9d4099 100644 --- a/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/topcolored/TopColoredCard.java +++ b/library-cards/src/main/java/it/gmariotti/cardslib/library/cards/topcolored/TopColoredCard.java @@ -186,9 +186,9 @@ public void setupInnerViewElements(ViewGroup parent, View view) { ViewHolder holder = (ViewHolder) view.getTag(); if (holder == null) { holder = new ViewHolder(); - holder.mLinearLayoutContainer = (LinearLayout) view.findViewById(R.id.card_main_inner_topcolored_layout); - holder.mTitleView = (TextView) view.findViewById(R.id.card_main_inner_topcolored_title); - holder.mSubTitleView = (TextView) view.findViewById(R.id.card_main_inner_topcolored_subtitle); + holder.mLinearLayoutContainer = view.findViewById(R.id.card_main_inner_topcolored_layout); + holder.mTitleView = view.findViewById(R.id.card_main_inner_topcolored_title); + holder.mSubTitleView = view.findViewById(R.id.card_main_inner_topcolored_subtitle); View viewStub = ((View)getCardView()).findViewById(R.id.card_halfcolored_secondhalf); if (viewStub != null) { ((ViewStub)viewStub).setLayoutResource(mSecondHalfViewStubLayoutId); @@ -250,7 +250,7 @@ protected void setupInnerViewElementsSecondHalf(View secondHalfView){ if (mOnSetupInnerElements != null) mOnSetupInnerElements.setupInnerViewElementsSecondHalf(secondHalfView); - }; + } /** diff --git a/library-core/build.gradle b/library-core/build.gradle index 042374a5..20806aa6 100644 --- a/library-core/build.gradle +++ b/library-core/build.gradle @@ -9,8 +9,8 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 + minSdkVersion 16 + targetSdkVersion 27 versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) } @@ -19,18 +19,23 @@ android { lintOptions { abortOnError false } + buildToolsVersion '26.0.3' } dependencies { //CardView - compile 'com.android.support:cardview-v7:22.1.1' + //noinspection GradleCompatible + compile 'com.android.support:cardview-v7:27.1.0' //Support lib - compile 'com.android.support:support-v4:22.1.1' + compile 'com.android.support:support-v4:27.1.0' //Annotation - compile 'com.android.support:support-annotations:22.1.1' + compile 'com.android.support:support-annotations:27.1.0' + compile 'com.survivingwithandroid:weatherlib:1.6.0' + compile 'com.survivingwithandroid:weatherlib_volleyclient:1.6.0' + compile 'com.mcxiaoke.volley:library:1.0.6@aar' } // Used to update in Maven -//apply from: '../maven_push.gradle' \ No newline at end of file +apply from: '../maven_push.gradle' \ No newline at end of file diff --git a/library-core/src/main/AndroidManifest.xml b/library-core/src/main/AndroidManifest.xml index 7540072b..d241816c 100644 --- a/library-core/src/main/AndroidManifest.xml +++ b/library-core/src/main/AndroidManifest.xml @@ -17,9 +17,10 @@ --> - + diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/Card.java b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/Card.java index b2d06090..a5027d86 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/Card.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/Card.java @@ -310,7 +310,7 @@ public void setupInnerViewElements(ViewGroup parent, View view) { //Add simple title to header if (view != null) { - TextView mTitleView = (TextView) view.findViewById(R.id.card_main_inner_simple_title); + TextView mTitleView = view.findViewById(R.id.card_main_inner_simple_title); if (mTitleView != null) mTitleView.setText(mTitle); } @@ -415,7 +415,7 @@ public void setupSupplementalActions() { * Interface to listen for any callbacks when card is swiped. */ public interface OnSwipeListener { - public void onSwipe(Card card); + void onSwipe(Card card); } /** @@ -444,10 +444,7 @@ public OnSwipeListener getOnSwipeListener() { * @param onSwipeListener listener */ public void setOnSwipeListener(OnSwipeListener onSwipeListener) { - if (onSwipeListener != null) - mIsSwipeable = true; - else - mIsSwipeable = false; + mIsSwipeable = onSwipeListener != null; this.mOnSwipeListener = onSwipeListener; } @@ -459,14 +456,14 @@ public void setOnSwipeListener(OnSwipeListener onSwipeListener) { * Interface to listen for any callbacks when card is swiped in a List */ public interface OnUndoSwipeListListener { - public void onUndoSwipe(Card card); + void onUndoSwipe(Card card); } /** * Interface to listen for when the Undo controller hides the Undo Bar */ public interface OnUndoHideSwipeListListener { - public void onUndoHideSwipe(Card card); + void onUndoHideSwipe(Card card); } /** @@ -522,7 +519,7 @@ public void setOnUndoHideSwipeListListener(OnUndoHideSwipeListListener onUndoHid * Interface to listen for any callbacks when card is clicked */ public interface OnCardClickListener { - public void onClick(Card card, View view); + void onClick(Card card, View view); } /** @@ -541,10 +538,7 @@ public OnCardClickListener getOnClickListener() { * @param onClickListener listener */ public void setOnClickListener(OnCardClickListener onClickListener) { - if (onClickListener != null) - mIsClickable = true; - else - mIsClickable = false; + mIsClickable = onClickListener != null; mOnClickListener = onClickListener; } @@ -556,7 +550,7 @@ public void setOnClickListener(OnCardClickListener onClickListener) { * Interface to listen for any callbacks when card is long clicked */ public interface OnLongCardClickListener { - public boolean onLongClick(Card card, View view); + boolean onLongClick(Card card, View view); } /** @@ -580,10 +574,7 @@ public OnLongCardClickListener getOnLongClickListener() { * @param onLongClickListener */ public void setOnLongClickListener(OnLongCardClickListener onLongClickListener) { - if (onLongClickListener != null) - mIsLongClickable = true; - else - mIsLongClickable = false; + mIsLongClickable = onLongClickListener != null; mOnLongClickListener = onLongClickListener; } @@ -595,7 +586,7 @@ public void setOnLongClickListener(OnLongCardClickListener onLongClickListener) * Interface to listen any callbacks when expand animation ends */ public interface OnExpandAnimatorEndListener { - public void onExpandEnd(Card card); + void onExpandEnd(Card card); } /** @@ -629,7 +620,7 @@ public void setOnExpandAnimatorEndListener(OnExpandAnimatorEndListener onExpandA * Interface to listen any callbacks when expand animation starts */ public interface OnExpandAnimatorStartListener { - public void onExpandStart(Card card); + void onExpandStart(Card card); } /** @@ -667,7 +658,7 @@ public void setOnExpandAnimatorStartListener(OnExpandAnimatorStartListener onExp * Interface to listen any callbacks when expand animation ends */ public interface OnCollapseAnimatorEndListener { - public void onCollapseEnd(Card card); + void onCollapseEnd(Card card); } /** @@ -701,7 +692,7 @@ public void setOnCollapseAnimatorEndListener(OnCollapseAnimatorEndListener onCol * Interface to listen any callbacks when collapse animation starts */ public interface OnCollapseAnimatorStartListener { - public void onCollapseStart(Card card); + void onCollapseStart(Card card); } /** @@ -750,9 +741,7 @@ public void doToogleExpand(){ * @return true if card has a header */ public boolean hasHeader() { - if (getCardHeader() != null) - return true; - else return false; + return getCardHeader() != null; } // ------------------------------------------------------------- diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardArrayAdapter.java b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardArrayAdapter.java index 428ca42e..8eb424da 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardArrayAdapter.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardArrayAdapter.java @@ -38,7 +38,6 @@ import it.gmariotti.cardslib.library.internal.base.BaseCardArrayAdapter; import it.gmariotti.cardslib.library.view.CardListView; import it.gmariotti.cardslib.library.view.base.CardViewWrapper; -import it.gmariotti.cardslib.library.view.CardView; import it.gmariotti.cardslib.library.view.listener.SwipeDismissListViewTouchListener; import it.gmariotti.cardslib.library.view.listener.SwipeOnScrollListener; import it.gmariotti.cardslib.library.view.listener.UndoBarController; @@ -141,7 +140,7 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); //Retrieve card from items - mCard = (Card) getItem(position); + mCard = getItem(position); if (mCard != null) { int layout = mRowLayoutId; @@ -156,7 +155,7 @@ public View getView(int position, View convertView, ViewGroup parent) { } //Setup card - mCardView = (CardViewWrapper) view.findViewById(R.id.list_cardId); + mCardView = view.findViewById(R.id.list_cardId); if (mCardView != null) { //It is important to set recycle value for inner layout elements mCardView.setForceReplaceInnerLayout(Card.equalsInnerLayout(mCardView.getCard(),mCard)); diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardCursorAdapter.java b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardCursorAdapter.java index c2693391..e421f0b9 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardCursorAdapter.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardCursorAdapter.java @@ -94,11 +94,7 @@ protected CardCursorAdapter(Context context, Cursor c, int flags) { @Override public View getView(int position, View convertView, ViewGroup parent) { //Check for recycle - if (convertView == null) { - recycle = false; - } else { - recycle = true; - } + recycle = convertView != null; return super.getView(position, convertView, parent); } @@ -115,9 +111,9 @@ public void bindView(View view, Context context, Cursor cursor) { CardViewWrapper mCardView; Card mCard; - mCard = (Card) getCardFromCursor(cursor); + mCard = getCardFromCursor(cursor); if (mCard != null) { - mCardView = (CardViewWrapper) view.findViewById(R.id.list_cardId); + mCardView = view.findViewById(R.id.list_cardId); if (mCardView != null) { //It is important to set recycle value for inner layout elements mCardView.setForceReplaceInnerLayout(Card.equalsInnerLayout(mCardView.getCard(),mCard)); diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardExpand.java b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardExpand.java index 200b7b1e..0e85d232 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardExpand.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardExpand.java @@ -162,7 +162,7 @@ public void setupInnerViewElements(ViewGroup parent, View view) { //Add simple title to expand area if (view!=null){ - TextView mTitleView=(TextView) view.findViewById(R.id.card_expand_inner_simple_title); + TextView mTitleView= view.findViewById(R.id.card_expand_inner_simple_title); if (mTitleView!=null) mTitleView.setText(mTitle); } diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardExpandableListAdapter.java b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardExpandableListAdapter.java index edf5659a..bc78b3f8 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardExpandableListAdapter.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardExpandableListAdapter.java @@ -115,7 +115,7 @@ public View getGroupView(int groupPosition, boolean isExpanded, View convertView View view = convertView; CardViewWrapper mCardView; - Card mCard = (Card) getGroup(groupPosition); + Card mCard = getGroup(groupPosition); if (mCard != null) { int layout = mGroupLayoutId; boolean recycle = false; @@ -129,7 +129,7 @@ public View getGroupView(int groupPosition, boolean isExpanded, View convertView } //Setup card - mCardView = (CardViewWrapper) view.findViewById(R.id.list_cardId); + mCardView = view.findViewById(R.id.list_cardId); if (mCardView != null) { //It is important to set recycle value for inner layout elements mCardView.setForceReplaceInnerLayout(Card.equalsInnerLayout(mCardView.getCard(), mCard)); @@ -159,7 +159,7 @@ public View getChildView(int groupPosition, int childPosition, boolean isLastChi if (convertView == null) { convertView = mInflater.inflate(mChildLayoutId, null); } - text = (TextView) convertView.findViewById(R.id.card_children_simple_title); + text = convertView.findViewById(R.id.card_children_simple_title); text.setText(children); registerClickListener(convertView, obj, groupPosition, childPosition); diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardGridArrayAdapter.java b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardGridArrayAdapter.java index 4f3b177d..1936e1d9 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardGridArrayAdapter.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardGridArrayAdapter.java @@ -115,7 +115,7 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); //Retrieve card from items - mCard = (Card) getItem(position); + mCard = getItem(position); if (mCard != null) { int layout = mRowLayoutId; @@ -130,7 +130,7 @@ public View getView(int position, View convertView, ViewGroup parent) { } //Setup card - mCardView = (CardViewWrapper) view.findViewById(R.id.list_cardId); + mCardView = view.findViewById(R.id.list_cardId); if (mCardView != null) { //It is important to set recycle value for inner layout elements mCardView.setForceReplaceInnerLayout(Card.equalsInnerLayout(mCardView.getCard(),mCard)); diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardGridCursorAdapter.java b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardGridCursorAdapter.java index fcca2ba7..8c47ce53 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardGridCursorAdapter.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardGridCursorAdapter.java @@ -83,11 +83,7 @@ protected CardGridCursorAdapter(Context context, Cursor c, int flags) { @Override public View getView(int position, View convertView, ViewGroup parent) { //Check for recycle - if (convertView == null) { - recycle = false; - } else { - recycle = true; - } + recycle = convertView != null; return super.getView(position, convertView, parent); } @@ -104,9 +100,9 @@ public void bindView(View view, Context context, Cursor cursor) { CardViewWrapper mCardView; Card mCard; - mCard = (Card) getCardFromCursor(cursor); + mCard = getCardFromCursor(cursor); if (mCard != null) { - mCardView = (CardViewWrapper) view.findViewById(R.id.list_cardId); + mCardView = view.findViewById(R.id.list_cardId); if (mCardView != null) { //It is important to set recycle value for inner layout elements mCardView.setForceReplaceInnerLayout(Card.equalsInnerLayout(mCardView.getCard(),mCard)); diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardHeader.java b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardHeader.java index 51803a18..fa0954e7 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardHeader.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/CardHeader.java @@ -205,7 +205,7 @@ public CardHeader(Context context,int innerLayout) { * Interface to handle any callback when a item in popup menu is clicked */ public interface OnClickCardHeaderPopupMenuListener { - public void onMenuItemClick(BaseCard card, MenuItem item); + void onMenuItemClick(BaseCard card, MenuItem item); } /** @@ -224,14 +224,14 @@ public interface OnPrepareCardHeaderPopupMenuListener { * @return You must return true for the menu to be displayed; * if you return false it will not be shown. */ - public boolean onPreparePopupMenu(BaseCard card, PopupMenu popupMenu); + boolean onPreparePopupMenu(BaseCard card, PopupMenu popupMenu); } /** * Interface to handle callbacks when Other Button is clicked */ public interface OnClickCardHeaderOtherButtonListener { - public void onButtonItemClick(Card card, View view); + void onButtonItemClick(Card card, View view); } @@ -301,11 +301,7 @@ public CustomOverflowAnimation getCustomOverflowAnimation() { public void setCustomOverflowAnimation(CustomOverflowAnimation customAnimation) { this.mCustomOverflowAnimation = customAnimation; - if (mCustomOverflowAnimation==null){ - mIsButtonOverflowVisible=false; - }else{ - mIsButtonOverflowVisible=true; - } + mIsButtonOverflowVisible = mCustomOverflowAnimation != null; } @@ -377,7 +373,7 @@ public void setupInnerViewElements(ViewGroup parent,View view){ //Add simple title to header if (view!=null){ - TextView mTitleView=(TextView) view.findViewById(R.id.card_header_inner_simple_title); + TextView mTitleView= view.findViewById(R.id.card_header_inner_simple_title); if (mTitleView!=null) mTitleView.setText(mTitle); } diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/base/BaseCardArrayAdapter.java b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/base/BaseCardArrayAdapter.java index 281adc17..fcd518c1 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/base/BaseCardArrayAdapter.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/base/BaseCardArrayAdapter.java @@ -82,18 +82,15 @@ public int getViewTypeCount() { @Override public int getItemViewType(int position) { - Card card = (Card) getItem(position); + Card card = getItem(position); return card.getType(); } @Override public boolean isEnabled(int position) { //Disable card if it is not clickable or longClickable - Card card = (Card) getItem(position); - if (card.isClickable() || card.isLongClickable()) - return true; - else - return false; + Card card = getItem(position); + return card.isClickable() || card.isLongClickable(); } /** diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/base/BaseCardCursorAdapter.java b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/base/BaseCardCursorAdapter.java index ec679c08..e502421e 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/base/BaseCardCursorAdapter.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/base/BaseCardCursorAdapter.java @@ -81,18 +81,15 @@ public int getViewTypeCount() { @Override public int getItemViewType(int position) { - Card card = (Card) getItem(position); + Card card = getItem(position); return card.getType(); } @Override public boolean isEnabled(int position) { //Disable card if it is not clickable or longClickable - Card card = (Card) getItem(position); - if (card.isClickable() || card.isLongClickable()) - return true; - else - return false; + Card card = getItem(position); + return card.isClickable() || card.isLongClickable(); } /** @@ -108,7 +105,7 @@ protected void setupMultichoice(View view,Card mCard,CardViewWrapper mCardView,l public Card getItem(int position) { Object obj = super.getItem(position); if (obj instanceof Cursor) - return (Card) getCardFromCursor((Cursor) obj); + return getCardFromCursor((Cursor) obj); else return null; } diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/base/CardUIInferface.java b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/base/CardUIInferface.java index 1def7af4..481423d5 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/base/CardUIInferface.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/base/CardUIInferface.java @@ -37,7 +37,7 @@ public interface CardUIInferface { * @param parent parent view * @return layout view */ - public View getInnerView(Context context,ViewGroup parent); + View getInnerView(Context context, ViewGroup parent); /** @@ -46,7 +46,7 @@ public interface CardUIInferface { * @param parent parent view * @param view view */ - public void setupInnerViewElements(ViewGroup parent,View view); + void setupInnerViewElements(ViewGroup parent, View view); } diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/multichoice/MultiChoiceAdapterHelperBase.java b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/multichoice/MultiChoiceAdapterHelperBase.java index 339a160b..ca0fa27b 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/internal/multichoice/MultiChoiceAdapterHelperBase.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/internal/multichoice/MultiChoiceAdapterHelperBase.java @@ -305,10 +305,7 @@ protected void onItemSelectedStateChanged(ActionMode mode) { * @return */ public boolean isActionModeStarted() { - if (actionMode != null) { - return true; - } - return false; + return actionMode != null; } @@ -328,7 +325,7 @@ public ArrayList getSelectedCards() { for (int i = checked.size()-1; i>=0; i--) { if (checked.valueAt(i) == true) { - items.add( adapter.getItem((int) checked.keyAt(i))); + items.add( adapter.getItem(checked.keyAt(i))); } } diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/prototypes/CardWithList.java b/library-core/src/main/java/it/gmariotti/cardslib/library/prototypes/CardWithList.java index 9b8fdfdd..d492a003 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/prototypes/CardWithList.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/prototypes/CardWithList.java @@ -302,7 +302,7 @@ protected void setupInnerLayout() { @Override public void setupInnerViewElements(ViewGroup parent, View view) { - mListView = (LinearListView) view.findViewById(getListViewId()); + mListView = view.findViewById(getListViewId()); if (mListView != null) { internalSetupProgressBar(parent, view); @@ -343,7 +343,7 @@ private void internalSetupChildren() { @SuppressWarnings("UnusedParameters") private void internalSetupEmptyView(ViewGroup parent, View view) { if (useEmptyView) { - mEmptyView = (View) parent.findViewById(getEmptyViewId()); + mEmptyView = parent.findViewById(getEmptyViewId()); if (mEmptyView != null) { if (mEmptyView instanceof ViewStub) ((ViewStub) mEmptyView).setLayoutResource(getEmptyViewViewStubLayoutId()); @@ -361,7 +361,7 @@ private void internalSetupEmptyView(ViewGroup parent, View view) { @SuppressWarnings("UnusedParameters") private void internalSetupProgressBar(ViewGroup parent, View view) { if (useProgressBar) { - mProgressView = (View) parent.findViewById(getProgressBarId()); + mProgressView = parent.findViewById(getProgressBarId()); mListShown=true; if (mProgressView != null) { if (mProgressView instanceof ViewStub) @@ -394,12 +394,12 @@ public interface ListObject { * * @return */ - public String getObjectId(); + String getObjectId(); /** * Returns the parent card */ - public Card getParentCard(); + Card getParentCard(); /** * Register a callback to be invoked when an item in this LinearListView has @@ -408,32 +408,32 @@ public interface ListObject { * @return The callback to be invoked with an item in this LinearListView has * been clicked, or null id no callback has been set. */ - public void setOnItemClickListener(OnItemClickListener onItemClickListener); + void setOnItemClickListener(OnItemClickListener onItemClickListener); /** * @return The callback to be invoked with an item in this LinearListView has * been clicked, or null id no callback has been set. */ - public OnItemClickListener getOnItemClickListener(); + OnItemClickListener getOnItemClickListener(); /** * Indicates if the item is swipeable */ - public boolean isSwipeable(); + boolean isSwipeable(); /** * Set the item as swipeable * * @param isSwipeable */ - public void setSwipeable(boolean isSwipeable); + void setSwipeable(boolean isSwipeable); /** * Returns the callback to be invoked when item has been swiped * * @return listener */ - public OnItemSwipeListener getOnItemSwipeListener(); + OnItemSwipeListener getOnItemSwipeListener(); /** * Register a callback to be invoked when an item in this LinearListView has @@ -441,7 +441,7 @@ public interface ListObject { * * @param onSwipeListener listener */ - public void setOnItemSwipeListener(OnItemSwipeListener onSwipeListener); + void setOnItemSwipeListener(OnItemSwipeListener onSwipeListener); } @@ -489,7 +489,7 @@ public interface OnItemSwipeListener { * * @param object The object that was clicked. */ - public void onItemSwipe(ListObject object,boolean dismissRight); + void onItemSwipe(ListObject object, boolean dismissRight); } @@ -510,10 +510,7 @@ public OnSwipeListener getOnSwipeListener() { * @param onSwipeListener listener */ public void setOnSwipeListener(OnSwipeListener onSwipeListener) { - if (onSwipeListener != null) - mIsSwipeable = true; - else - mIsSwipeable = false; + mIsSwipeable = onSwipeListener != null; this.mOnSwipeListener = onSwipeListener; } @@ -604,10 +601,7 @@ public OnItemSwipeListener getOnItemSwipeListener() { @Override public void setOnItemSwipeListener(OnItemSwipeListener onItemSwipeListener) { - if (onItemSwipeListener != null) - mItemSwipeable = true; - else - mItemSwipeable = false; + mItemSwipeable = onItemSwipeListener != null; this.mOnItemSwipeListener = onItemSwipeListener; } @@ -624,7 +618,7 @@ public void setOnItemSwipeListener(OnItemSwipeListener onItemSwipeListener) { public void setEmptyView(View emptyView) { mEmptyView = emptyView; - useEmptyView = emptyView != null ? true : false; + useEmptyView = emptyView != null; final LinearListAdapter adapter = getLinearListAdapter(); final boolean empty = ((adapter == null) || adapter.isEmpty()); diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/prototypes/SectionedCardAdapter.java b/library-core/src/main/java/it/gmariotti/cardslib/library/prototypes/SectionedCardAdapter.java index 1899c197..52115d9e 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/prototypes/SectionedCardAdapter.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/prototypes/SectionedCardAdapter.java @@ -276,7 +276,7 @@ protected View internalSectionView(int position, View convertView, ViewGroup par */ protected View getSectionView(int position, View view, ViewGroup parent) { - TextView textView = (TextView) view.findViewById(R.id.card_section_simple_title); + TextView textView = view.findViewById(R.id.card_section_simple_title); if (textView != null) textView.setText(mCardSections.get(position).title); diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/view/BaseCardView.java b/library-core/src/main/java/it/gmariotti/cardslib/library/view/BaseCardView.java index fca1c4c7..cc0d7536 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/view/BaseCardView.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/view/BaseCardView.java @@ -210,7 +210,7 @@ protected void setupShadowView() { protected void retrieveLayoutIDs() { // Get Shadow Layout - mInternalShadowLayout = (CardShadowView) findViewById(R.id.card_shadow_layout); + mInternalShadowLayout = findViewById(R.id.card_shadow_layout); } //-------------------------------------------------------------------------- diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/view/CardView.java b/library-core/src/main/java/it/gmariotti/cardslib/library/view/CardView.java index 69ee2f37..ff8f641a 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/view/CardView.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/view/CardView.java @@ -44,8 +44,6 @@ import it.gmariotti.cardslib.library.internal.CardThumbnail; import it.gmariotti.cardslib.library.internal.ViewToClickToExpand; import it.gmariotti.cardslib.library.view.base.CardViewWrapper; -import it.gmariotti.cardslib.library.view.component.CardHeaderView; -import it.gmariotti.cardslib.library.view.component.CardThumbnailView; import it.gmariotti.cardslib.library.view.listener.SwipeDismissViewTouchListener; /** @@ -310,19 +308,19 @@ protected void retrieveLayoutIDs(){ super.retrieveLayoutIDs(); //Main Layout - mInternalMainCardLayout = (View) findViewById(R.id.card_main_layout); + mInternalMainCardLayout = findViewById(R.id.card_main_layout); //Get HeaderLayout - mInternalHeaderLayout = (CardHeaderView) findViewById(R.id.card_header_layout); + mInternalHeaderLayout = findViewById(R.id.card_header_layout); //Get ExpandHiddenView - mInternalExpandLayout = (View) findViewById(R.id.card_content_expand_layout); + mInternalExpandLayout = findViewById(R.id.card_content_expand_layout); //Get ContentLayout - mInternalContentLayout = (View) findViewById(R.id.card_main_content_layout); + mInternalContentLayout = findViewById(R.id.card_main_content_layout); //Get ThumbnailLayout - mInternalThumbnailLayout = (CardThumbnailView) findViewById(R.id.card_thumbnail_layout); + mInternalThumbnailLayout = findViewById(R.id.card_thumbnail_layout); } /** diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/view/CardViewNative.java b/library-core/src/main/java/it/gmariotti/cardslib/library/view/CardViewNative.java index 25a05e45..623ba855 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/view/CardViewNative.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/view/CardViewNative.java @@ -399,19 +399,19 @@ protected void buildUI() { protected void retrieveLayoutIDs(){ //Main Layout - mInternalMainCardLayout = (View) findViewById(R.id.card_main_layout); + mInternalMainCardLayout = findViewById(R.id.card_main_layout); //Get HeaderLayout - mInternalHeaderLayout = (CardHeaderView) findViewById(R.id.card_header_layout); + mInternalHeaderLayout = findViewById(R.id.card_header_layout); //Get ExpandHiddenView - mInternalExpandLayout = (View) findViewById(R.id.card_content_expand_layout); + mInternalExpandLayout = findViewById(R.id.card_content_expand_layout); //Get ContentLayout - mInternalContentLayout = (View) findViewById(R.id.card_main_content_layout); + mInternalContentLayout = findViewById(R.id.card_main_content_layout); //Get ThumbnailLayout - mInternalThumbnailLayout = (CardThumbnailView) findViewById(R.id.card_thumbnail_layout); + mInternalThumbnailLayout = findViewById(R.id.card_thumbnail_layout); } /** diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/view/ForegroundLinearLayout.java b/library-core/src/main/java/it/gmariotti/cardslib/library/view/ForegroundLinearLayout.java index 19eb2ace..334021cd 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/view/ForegroundLinearLayout.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/view/ForegroundLinearLayout.java @@ -62,15 +62,15 @@ public ForegroundLinearLayout(Context context, AttributeSet attrs, int defStyle) defStyle, 0); mForegroundGravity = a.getInt( - R.styleable.ForegroundLinearLayout_android_foregroundGravity, mForegroundGravity); + R.styleable.ForegroundLinearLayout_foregroundGravity, mForegroundGravity); - final Drawable d = a.getDrawable(R.styleable.ForegroundLinearLayout_android_foreground); + final Drawable d = a.getDrawable(R.styleable.ForegroundLinearLayout_foreground); if (d != null) { setForeground(d); } mForegroundInPadding = a.getBoolean( - R.styleable.ForegroundLinearLayout_android_foregroundInsidePadding, true); + R.styleable.ForegroundLinearLayout_foregroundInsidePadding, true); a.recycle(); diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/view/base/CardViewInterface.java b/library-core/src/main/java/it/gmariotti/cardslib/library/view/base/CardViewInterface.java index 50c93713..15043259 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/view/base/CardViewInterface.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/view/base/CardViewInterface.java @@ -32,7 +32,7 @@ public interface CardViewInterface { * * @return outer view */ - public View getInternalOuterView(); + View getInternalOuterView(); } diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/view/base/CardViewWrapper.java b/library-core/src/main/java/it/gmariotti/cardslib/library/view/base/CardViewWrapper.java index eaaccb82..96183268 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/view/base/CardViewWrapper.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/view/base/CardViewWrapper.java @@ -62,9 +62,9 @@ public interface CardViewWrapper { /** * Interface to listen any callbacks when expand/collapse animation starts */ - public interface OnExpandListAnimatorListener { - public void onExpandStart(CardViewWrapper viewCard,View expandingLayout); - public void onCollapseStart(CardViewWrapper viewCard,View expandingLayout); + interface OnExpandListAnimatorListener { + void onExpandStart(CardViewWrapper viewCard, View expandingLayout); + void onCollapseStart(CardViewWrapper viewCard, View expandingLayout); } /** diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/view/component/CardHeaderView.java b/library-core/src/main/java/it/gmariotti/cardslib/library/view/component/CardHeaderView.java index 49684717..fbe5be97 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/view/component/CardHeaderView.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/view/component/CardHeaderView.java @@ -209,9 +209,9 @@ protected void initView() { mInternalOuterView = inflater.inflate(card_header_layout_resourceID, this, true); //Get buttons from layout - mImageButtonExpand = (ImageButton) findViewById(R.id.card_header_button_expand); - mImageButtonOverflow = (ImageButton) findViewById(R.id.card_header_button_overflow); - mImageButtonOther = (ImageButton) findViewById(R.id.card_header_button_other); + mImageButtonExpand = findViewById(R.id.card_header_button_expand); + mImageButtonOverflow = findViewById(R.id.card_header_button_overflow); + mImageButtonOther = findViewById(R.id.card_header_button_other); //Get frames mFrameInner = (FrameLayout) findViewById(R.id.card_header_inner_frame); @@ -395,7 +395,7 @@ protected void addPopup() { if (mImageButtonOverflow != null) { // allow dynamic customization on popup menu - boolean prepareMenu = mCardHeader.getPopupMenu() > CardHeader.NO_POPUP_MENU ? true : false; + boolean prepareMenu = mCardHeader.getPopupMenu() > CardHeader.NO_POPUP_MENU; if (mCardHeader.getPopupMenuPrepareListener() != null) { //Build the popupMenu diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/view/component/CardThumbnailView.java b/library-core/src/main/java/it/gmariotti/cardslib/library/view/component/CardThumbnailView.java index 66e91ce7..6a1216b1 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/view/component/CardThumbnailView.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/view/component/CardThumbnailView.java @@ -42,12 +42,11 @@ import java.net.URL; import it.gmariotti.cardslib.library.Constants; +import it.gmariotti.cardslib.library.R; import it.gmariotti.cardslib.library.internal.CardThumbnail; import it.gmariotti.cardslib.library.utils.CacheUtil; import it.gmariotti.cardslib.library.view.base.CardViewInterface; -import it.gmariotti.cardslib.library.R; - /** * Compound View for Thumbnail Component. *

@@ -172,7 +171,7 @@ protected void initView() { mInternalOuterView = inflater.inflate(card_thumbnail_layout_resourceID,this,true); //Get ImageVIew - mImageView= (ImageView) findViewById(R.id.card_thumbnail_image); + mImageView= findViewById(R.id.card_thumbnail_image); // Get max available VM memory, exceeding this amount will throw an @@ -503,7 +502,7 @@ protected Bitmap doInBackground(Integer... params) { addBitmapToMemoryCache(String.valueOf(params[0]), bitmap); return bitmap; }else{ - return (Bitmap)null; + return null; } } @@ -558,7 +557,7 @@ protected Bitmap doInBackground(String... params) { addBitmapToMemoryCache(String.valueOf(params[0]), bitmap); return bitmap; }else - return (Bitmap) null; + return null; } // Once complete, see if ImageView is still around and set bitmap. @@ -610,7 +609,7 @@ protected Bitmap doInBackground(CardThumbnail.CustomSource... params) { addBitmapToMemoryCache(customSource.getTag(), bitmap); return bitmap; }else{ - return (Bitmap)null; + return null; } } diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/view/listener/UndoBarController.java b/library-core/src/main/java/it/gmariotti/cardslib/library/view/listener/UndoBarController.java index c108f944..9c76c2d1 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/view/listener/UndoBarController.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/view/listener/UndoBarController.java @@ -91,7 +91,7 @@ public UndoBarController(View undoBarView, UndoListener undoListener,UndoBarUIEl undoBarUIElements = new DefaultUndoBarUIElements(); mUndoBarUIElements = undoBarUIElements; - mMessageView = (TextView) mBarView.findViewById(mUndoBarUIElements.getUndoBarMessageId()); + mMessageView = mBarView.findViewById(mUndoBarUIElements.getUndoBarMessageId()); mBarView.findViewById(mUndoBarUIElements.getUndoBarButtonId()) .setOnClickListener(new View.OnClickListener() { @Override @@ -307,21 +307,21 @@ public interface UndoBarUIElements{ * UndoBar id * @return */ - public int getUndoBarId(); + int getUndoBarId(); /** * TextView Id which displays message * * @return */ - public int getUndoBarMessageId(); + int getUndoBarMessageId(); /** * UndoButton Id * * @return */ - public int getUndoBarButtonId(); + int getUndoBarButtonId(); /** * UndoMessage. @@ -335,32 +335,32 @@ public interface UndoBarUIElements{ * @param itemPositions position of removed items * @return */ - public String getMessageUndo(CardArrayAdapter cardArrayAdapter,String[] itemIds,int[] itemPositions); + String getMessageUndo(CardArrayAdapter cardArrayAdapter, String[] itemIds, int[] itemPositions); /** * Define the swipe action to remove the undobar. * @return */ - public SwipeDirectionEnabled isEnabledUndoBarSwipeAction(); + SwipeDirectionEnabled isEnabledUndoBarSwipeAction(); /** * Define the animation type for the undobar when it appears. * @return */ - public AnimationType getAnimationType(); + AnimationType getAnimationType(); /** * Enum to define the animation type of the undobar.

* Use the {@link AnimationType#ALPHA} for an alpha animation, or {@link AnimationType#TOPBOTTOM} for a translation from bottom to top. */ - public enum AnimationType { + enum AnimationType { ALPHA(0), TOPBOTTOM(1); private final int mValue; - private AnimationType(int value) { + AnimationType(int value) { mValue = value; } @@ -375,14 +375,14 @@ public int getValue() { * You can use {@link SwipeDirectionEnabled#NONE} to disable the swipe action or {@link SwipeDirectionEnabled#LEFTRIGHT} to enable an action in left-right direction * or {@link SwipeDirectionEnabled#TOPBOTTOM} to define a swipe action from top to bottom. */ - public enum SwipeDirectionEnabled { + enum SwipeDirectionEnabled { NONE(0), LEFTRIGHT(1), TOPBOTTOM(2); private final int mValue; - private SwipeDirectionEnabled(int value) { + SwipeDirectionEnabled(int value) { mValue = value; } @@ -419,7 +419,7 @@ public int getValue() { */ public static class DefaultUndoBarUIElements implements UndoBarUIElements { - public DefaultUndoBarUIElements(){}; + public DefaultUndoBarUIElements(){} @Override public int getUndoBarId() { @@ -456,7 +456,7 @@ public AnimationType getAnimationType() { return AnimationType.ALPHA; } - }; + } /** diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/view/listener/dismiss/Dismissable.java b/library-core/src/main/java/it/gmariotti/cardslib/library/view/listener/dismiss/Dismissable.java index a6303c7f..0adaf7d0 100644 --- a/library-core/src/main/java/it/gmariotti/cardslib/library/view/listener/dismiss/Dismissable.java +++ b/library-core/src/main/java/it/gmariotti/cardslib/library/view/listener/dismiss/Dismissable.java @@ -41,14 +41,14 @@ public interface Dismissable { void setAdapter(Adapter adapter); - public enum SwipeDirection { + enum SwipeDirection { BOTH(0), LEFT(1), RIGHT(2); private final int mValue; - private SwipeDirection(int value) { + SwipeDirection(int value) { mValue = value; } diff --git a/library-core/src/main/res/values/attrs.xml b/library-core/src/main/res/values/attrs.xml index b33ea395..2525fc34 100644 --- a/library-core/src/main/res/values/attrs.xml +++ b/library-core/src/main/res/values/attrs.xml @@ -42,9 +42,9 @@ - - - + + + diff --git a/library-recyclerview/build.gradle b/library-recyclerview/build.gradle index 05a44534..f7574e53 100644 --- a/library-recyclerview/build.gradle +++ b/library-recyclerview/build.gradle @@ -9,8 +9,8 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - minSdkVersion 14 - targetSdkVersion 22 + minSdkVersion 16 + targetSdkVersion 27 versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) } @@ -19,6 +19,7 @@ android { lintOptions { abortOnError false } + buildToolsVersion '26.0.3' } dependencies { @@ -26,9 +27,9 @@ dependencies { compile project(':library-core') //Annotation - compile 'com.android.support:support-annotations:22.1.1' + compile 'com.android.support:support-annotations:27.1.0' //Recycler View - compile 'com.android.support:recyclerview-v7:22.1.1' + compile 'com.android.support:recyclerview-v7:27.1.0' } // Used to update in Maven