From c0c784c18aaeb0431b5bb5a44a06145a9c07fae7 Mon Sep 17 00:00:00 2001 From: xingxing Date: Wed, 17 Jan 2018 00:31:06 +0800 Subject: [PATCH] update image selector library --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../java/org/houxg/leamonax/Leamonax.java | 10 ++++++ .../leamonax/ui/edit/EditorFragment.java | 31 ++++++++++--------- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 78ce713..3257744 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -94,7 +94,7 @@ dependencies { compile 'com.github.bumptech.glide:glide:3.7.0' compile 'jp.wasabeef:glide-transformations:2.0.1' compile 'com.android.support:support-v13:26.1.0' - compile 'com.yuyh.imgsel:library:1.3.2' + compile 'com.yuyh.imgsel:library:2.0.2' compile 'com.facebook.stetho:stetho:1.4.2' compile 'com.facebook.stetho:stetho-okhttp3:1.4.2' compile 'com.github.houxg:FlexLayout:1.2' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 29cac41..0c27164 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -78,7 +78,7 @@ diff --git a/app/src/main/java/org/houxg/leamonax/Leamonax.java b/app/src/main/java/org/houxg/leamonax/Leamonax.java index 9ec4c74..1298410 100644 --- a/app/src/main/java/org/houxg/leamonax/Leamonax.java +++ b/app/src/main/java/org/houxg/leamonax/Leamonax.java @@ -5,7 +5,9 @@ import android.app.Application; import android.content.Context; import android.content.res.Resources; import android.text.TextUtils; +import android.widget.ImageView; +import com.bumptech.glide.Glide; import com.elvishew.xlog.LogLevel; import com.elvishew.xlog.XLog; import com.facebook.stetho.Stetho; @@ -15,6 +17,8 @@ import com.raizlabs.android.dbflow.config.FlowConfig; import com.raizlabs.android.dbflow.config.FlowManager; import com.tencent.bugly.Bugly; import com.tencent.bugly.beta.Beta; +import com.yuyh.library.imgsel.ISNav; +import com.yuyh.library.imgsel.common.ImageLoader; import net.danlew.android.joda.JodaTimeAndroid; @@ -48,6 +52,12 @@ public class Leamonax extends Application { if (BuildConfig.DEBUG) { Stetho.initializeWithDefaults(this); } + ISNav.getInstance().init(new ImageLoader() { + @Override + public void displayImage(Context context, String path, ImageView imageView) { + Glide.with(context).load(path).into(imageView); + } + }); } private void initBugly() { diff --git a/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java b/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java index 8761d03..5f32135 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java +++ b/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java @@ -6,6 +6,7 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; +import android.graphics.Color; import android.net.Uri; import android.os.Bundle; import android.support.annotation.NonNull; @@ -21,14 +22,13 @@ import android.view.ViewGroup; import android.view.WindowManager; import android.webkit.WebView; import android.widget.EditText; -import android.widget.ImageView; import android.widget.PopupWindow; import android.widget.TextView; -import com.bumptech.glide.Glide; import com.elvishew.xlog.XLog; -import com.yuyh.library.imgsel.ImgSelActivity; -import com.yuyh.library.imgsel.ImgSelConfig; +import com.yuyh.library.imgsel.ISNav; +import com.yuyh.library.imgsel.config.ISListConfig; +import com.yuyh.library.imgsel.ui.ISListActivity; import org.houxg.leamonax.R; import org.houxg.leamonax.editor.Editor; @@ -196,21 +196,22 @@ public class EditorFragment extends Fragment implements Editor.EditorListener { } private void openImageSelector(boolean supportSelfie) { - ImgSelConfig config = new ImgSelConfig.Builder( - getActivity(), - new com.yuyh.library.imgsel.ImageLoader() { - @Override - public void displayImage(Context context, String path, ImageView imageView) { - Glide.with(context).load(path).into(imageView); - } - }) + ISListConfig config = new ISListConfig.Builder() .multiSelect(false) + .rememberSelected(false) + .btnBgColor(Color.GRAY) + .btnTextColor(Color.BLUE) + .statusBarColor(Color.parseColor("#3F51B5")) .backResId(R.drawable.ic_arrow_back_white) - .needCrop(true) +// .title("选择图片") + .titleColor(Color.WHITE) + .titleBgColor(Color.parseColor("#3F51B5")) .cropSize(1, 1, 200, 200) + .needCrop(true) .needCamera(supportSelfie) + .maxNum(9) .build(); - ImgSelActivity.startActivity(this, config, REQ_SELECT_IMAGE); + ISNav.getInstance().toListActivity(this, config, REQ_SELECT_IMAGE); } @OnClick(R.id.btn_link) @@ -313,7 +314,7 @@ public class EditorFragment extends Fragment implements Editor.EditorListener { && resultCode == Activity.RESULT_OK && data != null && mListener != null) { - List pathList = data.getStringArrayListExtra(ImgSelActivity.INTENT_RESULT); + List pathList = data.getStringArrayListExtra(ISListActivity.INTENT_RESULT); if (CollectionUtils.isNotEmpty(pathList)) { String path = pathList.get(0); XLog.i(TAG + "path=" + path);