Merge pull request Blankj#806 from Blankj/1.23.0

see 01/18 log

Author: Blankj

lib/base/build.gradle

@@ -15,5 +15,5 @@ dependencies {
     api dep.free_proguard
     api 'com.r0adkll:slidableactivity:2.0.5'
     compileOnly dep.leakcanary.android_no_op
-//    api 'com.blankj:utilcode:1.22.11'
+//    api 'com.blankj:utilcode:1.23.0'
 }

utilcode/README-CN.md

@@ -385,13 +385,14 @@ setBackground         : 设置背景
 
 * ### Gson 相关 -> [GsonUtils.java][gson.java] -> [Test][gson.test]
 ```
-getGson          : 获取 Gson 对象
-toJson           : 对象转 Json 串
-fromJson         : Json 串转对象
-getCollectionType: 获取集合类型
-getMapType       : 获取字典类型
-getArrayType     : 获取数组类型
-getType          : 获取类型
+getGson     : 获取 Gson 对象
+toJson      : 对象转 Json 串
+fromJson    : Json 串转对象
+getListType : 获取链表类型
+getSetType  : 获取集合类型
+getMapType  : 获取字典类型
+getArrayType: 获取数组类型
+getType     : 获取类型
 ```
 
 * ### 图片相关 -> [ImageUtils.java][image.java] -> [Demo][image.demo]

utilcode/README.md

@@ -388,7 +388,8 @@ setBackground
 getGson
 toJson
 fromJson
-getCollectionType
+getListType
+getSetType
 getMapType
 getArrayType
 getType

utilcode/lib/src/main/java/com/blankj/utilcode/util/ColorUtils.java

@@ -202,6 +202,6 @@ public static int getRandomColor() {
      */
     public static int getRandomColor(final boolean supportAlpha) {
         int high = supportAlpha ? (int) (Math.random() * 0xFF) << 24 : 0xFF000000;
-        return high | (int) (Math.random() * 0xFF0000);
+        return high | (int) (Math.random() * 0xFFFFFF);
     }
 }

utilcode/lib/src/main/java/com/blankj/utilcode/util/GsonUtils.java

@@ -6,8 +6,9 @@
 
 import java.io.Reader;
 import java.lang.reflect.Type;
-import java.util.Collection;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 
 /**
@@ -114,13 +115,23 @@ public static <T> T fromJson(final Reader reader, final Type type) {
     }
 
     /**
-     * Return the type of collection with the {@code type}.
+     * Return the type of {@link List} with the {@code type}.
      *
      * @param type The type.
-     * @return the type of collection with the {@code type}
+     * @return the type of {@link List} with the {@code type}
      */
-    public static Type getCollectionType(final Type type) {
-        return TypeToken.getParameterized(Collection.class, type).getType();
+    public static Type getListType(final Type type) {
+        return TypeToken.getParameterized(List.class, type).getType();
+    }
+
+    /**
+     * Return the type of {@link Set} with the {@code type}.
+     *
+     * @param type The type.
+     * @return the type of {@link Set} with the {@code type}
+     */
+    public static Type getSetType(final Type type) {
+        return TypeToken.getParameterized(Set.class, type).getType();
     }
 
     /**

utilcode/lib/src/test/java/com/blankj/utilcode/util/GsonUtilsTest.java

@@ -48,7 +48,7 @@ public void fromJson() {
                 GsonUtils.toJson(
                         GsonUtils.fromJson(
                                 GsonUtils.toJson(result),
-                                GsonUtils.getType(Result.class, GsonUtils.getCollectionType(Person.class))
+                                GsonUtils.getType(Result.class, GsonUtils.getListType(Person.class))
                         )
                 )
         );
@@ -58,7 +58,7 @@ public void fromJson() {
     public void getType() {
         Assert.assertEquals(
                 "java.util.Collection<java.lang.String>",
-                GsonUtils.getCollectionType(String.class).toString()
+                GsonUtils.getListType(String.class).toString()
         );
         Assert.assertEquals(
                 "java.util.Map<java.lang.String, java.lang.Integer>",
@@ -74,7 +74,7 @@ public void getType() {
         );
         Assert.assertEquals(
                 "java.util.Map<java.lang.String, java.util.Collection<java.lang.String>>",
-                GsonUtils.getMapType(String.class, GsonUtils.getCollectionType(String.class)).toString()
+                GsonUtils.getMapType(String.class, GsonUtils.getListType(String.class)).toString()
         );
     }
 

utilcode/lib/src/test/java/com/blankj/utilcode/util/LogUtilsTest.java

@@ -166,7 +166,7 @@ public void testObject() {
         LogUtils.d((Object) TWO_D_ARRAY);
         LogUtils.d(LIST);
         LogUtils.d(MAP);
-        Object o = GsonUtils.fromJson(GsonUtils.toJson(LIST), GsonUtils.getCollectionType(String.class));
+        Object o = GsonUtils.fromJson(GsonUtils.toJson(LIST), GsonUtils.getListType(String.class));
         System.out.println(o);
 
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/CoreUtilActivity.java

@@ -170,7 +170,7 @@ public void snackbarClick(View view) {
     }
 
     public void spStaticClick(View view) {
-        SPStaticActivity.start(this);
+        SPStaticActivity.Companion.start(this);
     }
 
     public void spannableClick(View view) {

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/spStatic/SPStaticActivity.java

@@ -0,0 +1,78 @@
+package com.blankj.utilcode.pkg.feature.spStatic
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import com.blankj.lib.base.BaseBackActivity
+import com.blankj.utilcode.pkg.R
+import com.blankj.utilcode.util.SPStaticUtils
+import kotlinx.android.synthetic.main.activity_sp.*
+
+/**
+ * ```
+ * author: Blankj
+ * blog  : http://blankj.com
+ * time  : 2018/01/08
+ * desc  : demo about SPUtils
+ * ```
+ */
+class SPStaticActivity : BaseBackActivity() {
+
+    override fun initData(bundle: Bundle?) {
+
+    }
+
+    override fun bindLayout(): Int {
+        return R.layout.activity_sp
+    }
+
+    override fun initView(savedInstanceState: Bundle?, contentView: View) {
+        spPutStringBtn.setOnClickListener(this)
+        spPutIntBtn.setOnClickListener(this)
+        spPutLongBtn.setOnClickListener(this)
+        spPutFloatBtn.setOnClickListener(this)
+        spPutBooleanBtn.setOnClickListener(this)
+        spClearBtn.setOnClickListener(this)
+    }
+
+    override fun doBusiness() {
+        updateAboutSp()
+    }
+
+    override fun onWidgetClick(view: View) {
+        when (view.id) {
+            R.id.spPutStringBtn -> SPStaticUtils.put("STRING", "string")
+            R.id.spPutIntBtn -> SPStaticUtils.put("INT", 21)
+            R.id.spPutLongBtn -> SPStaticUtils.put("LONG", java.lang.Long.MAX_VALUE)
+            R.id.spPutFloatBtn -> SPStaticUtils.put("FLOAT", Math.PI.toFloat())
+            R.id.spPutBooleanBtn -> SPStaticUtils.put("BOOLEAN", true)
+            R.id.spClearBtn -> SPStaticUtils.clear()
+        }
+        updateAboutSp()
+    }
+
+    private fun updateAboutSp() {
+        aboutSpTv!!.text = sp2String()
+    }
+
+    companion object {
+
+        fun start(context: Context) {
+            val starter = Intent(context, SPStaticActivity::class.java)
+            context.startActivity(starter)
+        }
+
+        fun sp2String(): String {
+            val sb = StringBuilder()
+            val map = SPStaticUtils.getAll()
+            for ((key, value) in map) {
+                sb.append(key)
+                        .append(": ")
+                        .append(value)
+                        .append("\n")
+            }
+            return sb.toString()
+        }
+    }
+}

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/spStatic/SPStaticActivity.kt

@@ -11,48 +11,48 @@
     android:paddingTop="@dimen/spacing_16">
 
     <TextView
-        android:id="@+id/tv_about_sp"
+        android:id="@+id/aboutSpTv"
         style="@style/TextStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
     <Button
-        android:id="@+id/btn_sp_put_string"
+        android:id="@+id/spPutStringBtn"
         style="@style/WideBtnStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/sp_put_string" />
 
     <Button
-        android:id="@+id/btn_sp_put_int"
+        android:id="@+id/spPutIntBtn"
         style="@style/WideBtnStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/sp_put_int" />
 
     <Button
-        android:id="@+id/btn_sp_put_long"
+        android:id="@+id/spPutLongBtn"
         style="@style/WideBtnStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/sp_put_long" />
 
     <Button
-        android:id="@+id/btn_sp_put_float"
+        android:id="@+id/spPutFloatBtn"
         style="@style/WideBtnStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/sp_put_float" />
 
     <Button
-        android:id="@+id/btn_sp_put_boolean"
+        android:id="@+id/spPutBooleanBtn"
         style="@style/WideBtnStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/sp_put_boolean" />
 
     <Button
-        android:id="@+id/btn_sp_clear"
+        android:id="@+id/spClearBtn"
         style="@style/WideBtnStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"