diff --git a/richpath/src/main/java/com/richpath/pathparser/PathParser.kt b/richpath/src/main/java/com/richpath/pathparser/PathParser.kt index dc776e0..103393d 100644 --- a/richpath/src/main/java/com/richpath/pathparser/PathParser.kt +++ b/richpath/src/main/java/com/richpath/pathparser/PathParser.kt @@ -1,7 +1,7 @@ package com.richpath.pathparser import android.graphics.Path -import android.os.Build +import androidx.core.graphics.PathParser object PathParser { @@ -10,11 +10,7 @@ object PathParser { * @return the generated Path object. */ fun createPathFromPathData(pathData: String?): Path { - return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - PathParserCompatApi21.createPathFromPathData(pathData) ?: Path() - } else { - PathParserCompat.createPathFromPathData(pathData) - } + return PathParser.createPathFromPathData(pathData) ?: Path() } } \ No newline at end of file diff --git a/richpath/src/main/java/com/richpath/pathparser/PathParserCompatApi21.kt b/richpath/src/main/java/com/richpath/pathparser/PathParserCompatApi21.kt deleted file mode 100644 index 2b8bbff..0000000 --- a/richpath/src/main/java/com/richpath/pathparser/PathParserCompatApi21.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.richpath.pathparser - -import android.graphics.Path -import java.lang.reflect.InvocationTargetException -import java.lang.reflect.Method - -object PathParserCompatApi21 { - - /** - * @param pathData The string representing a path, the same as "d" string in svg file. - * @return the generated Path object. - */ - fun createPathFromPathData(pathData: String?): Path? { - try { - val method = getCreatePathFromPathDataMethod() ?: return null - val obj = method.invoke(null, pathData) - return obj as? Path - } catch (e: InvocationTargetException) { - e.printStackTrace() - } catch (e: IllegalAccessException) { - e.printStackTrace() - } - return null - } - - private fun getCreatePathFromPathDataMethod(): Method? { - try { - return Class.forName("android.util.PathParser") - .getDeclaredMethod("createPathFromPathData", String::class.java) - } catch (e: ClassNotFoundException) { - e.printStackTrace() - } catch (e: NoSuchMethodException) { - e.printStackTrace() - } - return null - } -} \ No newline at end of file