Update libraries version & Show chiba icon when it is slow express

Signed-off-by: Fung <fython@163.com>

Author: fython

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext.kotlin_version = '1.1.4-2'
-    ext.android_support_lib_version = '26.0.0'
+    ext.android_support_lib_version = '26.1.0'
     ext.kotlinyan_version = '0.2.2.1'
     repositories {
         jcenter()

mobile/build.gradle

@@ -58,7 +58,7 @@ dependencies {
     compile project(':libraries:StatusBarCompat')
     compile 'de.hdodenhof:circleimageview:2.1.0'
     compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.3'
-    compile 'moe.feng:MaterialStepperView:0.2.1'
+    compile 'moe.feng:MaterialStepperView:0.2.2'
     compile 'com.getkeepsafe.taptargetview:taptargetview:1.9.1'
     compile 'me.dm7.barcodescanner:zxing:1.9'
 

mobile/src/main/java/info/papdt/express/helper/ui/items/DetailsStatusItemBinder.java

@@ -1,6 +1,7 @@
 package info.papdt.express.helper.ui.items;
 
 import android.content.Intent;
+import android.graphics.Color;
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.AppCompatTextView;
@@ -12,6 +13,7 @@
 import android.view.ViewGroup;
 import android.view.animation.OvershootInterpolator;
 import info.papdt.express.helper.R;
+import info.papdt.express.helper.drawable.TextDrawable;
 import info.papdt.express.helper.model.Package;
 import info.papdt.express.helper.view.VerticalStepIconView;
 import info.papdt.express.helper.view.VerticalStepLineView;
@@ -21,6 +23,7 @@ public class DetailsStatusItemBinder extends ItemViewBinder<Package.Status, Deta
 
 	private Package mPackage;
 	private boolean isShowed[] = new boolean[1000];
+	public boolean showChiba = false; // 是否为慢递
 
 	public void setData(Package src) {
 		mPackage = src;
@@ -127,6 +130,13 @@ void setData(Package.Status newData) {
 				}
 				stepIcon.setPointColorResource(pointColorResId);
 				stepIcon.setCenterIcon(pointIconResId);
+                if (showChiba) {
+                    stepIcon.setCenterIcon(TextDrawable.Companion.builder()
+                            .beginConfig()
+                            .fullSizeFont()
+                            .endConfig()
+                            .buildRound("\uD83D\uDC22", Color.TRANSPARENT));
+                }
 			} else {
 				stepIcon.setIsMini(true);
 				stepIcon.setPointColorResource(R.color.blue_grey_500);

mobile/src/main/kotlin/info/papdt/express/helper/drawable/TextDrawable.kt

@@ -22,13 +22,15 @@ class TextDrawable private constructor(builder: Builder) : ShapeDrawable(builder
 	private val fontSize: Int
 	private val radius: Float
 	private val borderThickness: Int
+	private val fullSizeFont: Boolean
 
 	init {
 		// shape properties
 		shape = builder.shape
 		height = builder.height
 		width = builder.width
 		radius = builder.radius
+		fullSizeFont = builder.fullSizeFont
 
 		// text and color
 		text = if (builder.toUpperCase) builder.text!!.toUpperCase() else builder.text
@@ -80,7 +82,11 @@ class TextDrawable private constructor(builder: Builder) : ShapeDrawable(builder
 		// draw text
 		val width = if (this.width < 0) r.width() else this.width
 		val height = if (this.height < 0) r.height() else this.height
-		val fontSize = if (this.fontSize < 0) Math.min(width, height) / 2 else this.fontSize
+		val fontSize = if (fullSizeFont) {
+			if (this.fontSize < 0) Math.min(width, height) else this.fontSize
+		} else {
+			if (this.fontSize < 0) Math.min(width, height) / 2 else this.fontSize
+		}
 		textPaint.textSize = fontSize.toFloat()
 		canvas.drawText(text, (width / 2).toFloat(), height / 2 - (textPaint.descent() + textPaint.ascent()) / 2, textPaint)
 
@@ -119,7 +125,7 @@ class TextDrawable private constructor(builder: Builder) : ShapeDrawable(builder
 		return height
 	}
 
-	class Builder () : IConfigBuilder, IShapeBuilder, IBuilder {
+	class Builder : IConfigBuilder, IShapeBuilder, IBuilder {
 
 		var text: String? = null
 		var color: Int = 0
@@ -133,6 +139,7 @@ class TextDrawable private constructor(builder: Builder) : ShapeDrawable(builder
 		var isBold: Boolean = false
 		var toUpperCase: Boolean = false
 		var radius: Float = 0.toFloat()
+		var fullSizeFont: Boolean = false
 
 		init {
 			text = ""
@@ -233,6 +240,11 @@ class TextDrawable private constructor(builder: Builder) : ShapeDrawable(builder
 			this.text = text
 			return TextDrawable(this)
 		}
+
+		override fun fullSizeFont(): IConfigBuilder {
+			this.fullSizeFont = true
+			return this
+		}
 	}
 
 	interface IConfigBuilder {
@@ -244,6 +256,7 @@ class TextDrawable private constructor(builder: Builder) : ShapeDrawable(builder
 		fun fontSize(size: Int): IConfigBuilder
 		fun bold(): IConfigBuilder
 		fun toUpperCase(): IConfigBuilder
+		fun fullSizeFont(): IConfigBuilder
 		fun endConfig(): IShapeBuilder
 	}
 

mobile/src/main/kotlin/info/papdt/express/helper/ui/DetailsActivity.kt

@@ -312,6 +312,7 @@ class DetailsActivity : AbsActivity() {
 		override fun onPostExecute(items: Items) {
 			mStatusBinder.setData(data)
 			mAdapter.items = items
+			mStatusBinder.showChiba = data?.data?.find { it.context.contains("佛山") || it.context.contains("广州") } != null
 			mAdapter.notifyDataSetChanged()
 
 			val color: Int = when (state) {

mobile/src/main/kotlin/info/papdt/express/helper/view/VerticalStepIconView.kt

@@ -12,9 +12,10 @@ import android.util.AttributeSet
 import android.view.View
 import info.papdt.express.helper.R
 import info.papdt.express.helper.support.ScreenUtils
+import moe.feng.kotlinyan.common.AndroidExtensions
 
 class VerticalStepIconView @JvmOverloads
-constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : View(context, attrs, defStyleAttr) {
+constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : View(context, attrs, defStyleAttr), AndroidExtensions {
 
 	private var mPaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
 	private var mCirclePaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
@@ -111,7 +112,11 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 			val bitmap: Bitmap = if (d is ColorDrawable) {
 				Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
 			} else {
-				Bitmap.createBitmap(d.intrinsicWidth, d.intrinsicHeight, Bitmap.Config.ARGB_8888)
+				Bitmap.createBitmap(
+						Math.max(24f.dpToPx(context).toInt(), d.intrinsicWidth),
+						Math.max(24f.dpToPx(context).toInt(), d.intrinsicHeight),
+						Bitmap.Config.ARGB_8888
+				)
 			}
 
 			val canvas = Canvas(bitmap)