From 8ee7e8ba6cb24d7017eff930cc5385756fb512f3 Mon Sep 17 00:00:00 2001 From: kenmeidearu Date: Fri, 17 Nov 2017 18:40:18 +0700 Subject: [PATCH] new commit --- sample/build.gradle | 2 +- .../ListAdapterSpinner.java | 59 +++++++++---------- .../spinner_item_code_with_image.xml | 1 - 3 files changed, 29 insertions(+), 33 deletions(-) diff --git a/sample/build.gradle b/sample/build.gradle index 2a1a362..9524b4c 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -29,7 +29,7 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:25.4.0' - compile 'com.github.kenmeidearu:SearchableSpinner:1.5.4-8' + compile 'com.github.kenmeidearu:SearchableSpinner:1.5.4-9' //compile project(':searchablespinnerlibrary') //compile project(path: ':searchablespinnerlibrary', configuration: 'default') } diff --git a/searchablespinnerlibrary/src/main/java/com/kenmeidearu/searchablespinnerlibrary/ListAdapterSpinner.java b/searchablespinnerlibrary/src/main/java/com/kenmeidearu/searchablespinnerlibrary/ListAdapterSpinner.java index 67df1ca..a1b348a 100644 --- a/searchablespinnerlibrary/src/main/java/com/kenmeidearu/searchablespinnerlibrary/ListAdapterSpinner.java +++ b/searchablespinnerlibrary/src/main/java/com/kenmeidearu/searchablespinnerlibrary/ListAdapterSpinner.java @@ -2,9 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; -import android.net.Uri; import android.text.TextUtils; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -94,40 +92,39 @@ public View getView(int position, View convertView, ViewGroup parent) { } holder = new ViewHolder(); v.setTag(holder); - }else{ - holder = (ViewHolder) v.getTag(); - } - - if (type == 0) { - holder.images=(ImageView)v.findViewById(R.id.images); - holder.nilai1 = (TextView) v.findViewById(R.id.spinnerHead); - holder.nilai2 = (TextView) v.findViewById(R.id.sub); - } else if (type == 1) { - holder.nilai1 = (TextView) v.findViewById(R.id.spinnerHead); - } else if (type == 2) { - holder.nilai1 = (TextView) v.findViewById(R.id.spinnerHead); - holder.nilai2 = (TextView) v.findViewById(R.id.sub); - } else if (type == 3) { - holder.nilai1 = (TextView) v.findViewById(R.id.spinnerHead); - holder.nilai2 = (TextView) v.findViewById(R.id.sub); - holder.nilai3 = (TextView) v.findViewById(R.id.sideHead); - } else if (type == 4) { - holder.nilai1 = (TextView) v.findViewById(R.id.spinnerHead); - holder.nilai2 = (TextView) v.findViewById(R.id.sub); - holder.nilai3 = (TextView) v.findViewById(R.id.sideHead); - holder.nilai4 = (TextView) v.findViewById(R.id.sideSub); } else { - holder.nilai1 = (TextView) v.findViewById(R.id.spinnerHead); + holder = (ViewHolder) v.getTag(); } - mListString p = getItem(position); if (p != null) { - String val1, val2, val3, val4,valImage; + if (type == 0) { + holder.images = (ImageView) v.findViewById(R.id.images); + holder.nilai1 = (TextView) v.findViewById(R.id.spinnerHead); + holder.nilai2 = (TextView) v.findViewById(R.id.sub); + } else if (type == 1) { + holder.nilai1 = (TextView) v.findViewById(R.id.spinnerHead); + } else if (type == 2) { + holder.nilai1 = (TextView) v.findViewById(R.id.spinnerHead); + holder.nilai2 = (TextView) v.findViewById(R.id.sub); + } else if (type == 3) { + holder.nilai1 = (TextView) v.findViewById(R.id.spinnerHead); + holder.nilai2 = (TextView) v.findViewById(R.id.sub); + holder.nilai3 = (TextView) v.findViewById(R.id.sideHead); + } else if (type == 4) { + holder.nilai1 = (TextView) v.findViewById(R.id.spinnerHead); + holder.nilai2 = (TextView) v.findViewById(R.id.sub); + holder.nilai3 = (TextView) v.findViewById(R.id.sideHead); + holder.nilai4 = (TextView) v.findViewById(R.id.sideSub); + } else { + holder.nilai1 = (TextView) v.findViewById(R.id.spinnerHead); + } + + String val1, val2, val3, val4, valImage; val1 = p.getNilai1(); val2 = p.getNilai2(); val3 = p.getNilai3(); val4 = p.getNilai4(); - valImage=p.getImageName(); + valImage = p.getImageName(); if (holder.nilai1 != null) { holder.nilai1.setText(val1); @@ -141,7 +138,7 @@ public View getView(int position, View convertView, ViewGroup parent) { if (holder.nilai4 != null) { holder.nilai4.setText(val4); } - if(holder.images!=null){ + if (holder.images != null) { Picasso.with(mContext).setLoggingEnabled(true); Picasso.with(mContext) @@ -159,7 +156,7 @@ public View getView(int position, View convertView, ViewGroup parent) { .placeholder(R.drawable.noimage) .error(R.drawable.noimage) .into(holder.images);*/ - Log.e("isi image",val1 +" image:"+valImage); + // Log.e("isi image",val1 +" image:"+valImage); } } @@ -169,7 +166,7 @@ public View getView(int position, View convertView, ViewGroup parent) { public class ViewHolder { public TextView nilai1, nilai2 = null, nilai3 = null, nilai4 = null; - public ImageView images=null; + public ImageView images = null; } // Filter Class diff --git a/searchablespinnerlibrary/src/main/res/layout-large/spinner_item_code_with_image.xml b/searchablespinnerlibrary/src/main/res/layout-large/spinner_item_code_with_image.xml index 2875869..09cf40f 100644 --- a/searchablespinnerlibrary/src/main/res/layout-large/spinner_item_code_with_image.xml +++ b/searchablespinnerlibrary/src/main/res/layout-large/spinner_item_code_with_image.xml @@ -42,5 +42,4 @@ android:text="detail" android:textSize="14sp" /> -